Skip to content

Add optional prop to not dismiss Callout on focus loss #5092

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dzearing merged 4 commits into from
Jun 5, 2018
Merged

Add optional prop to not dismiss Callout on focus loss #5092

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6a7f881
Add optional prop to not dismiss Callout on focus loss
jetao-msft Jun 4, 2018
6af7308
Change file
jetao-msft Jun 4, 2018
8d80c10
Merge branch 'master' into no-dismiss-callout
jetao-msft Jun 4, 2018
dba2a0b
Update no-dismiss-callout_2018-06-04-21-44.json
dzearing Jun 5, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions common/changes/office-ui-fabric-react/no-dismiss-callout_2018-06-04-21-44.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"changes": [
{
"packageName": "office-ui-fabric-react",
"comment": "Callout: Add `preventDismissOnLostFocus` prop.",
"type": "minor"
}
],
"packageName": "office-ui-fabric-react",
"email": "jetao@microsoft.com"
}
8 changes: 7 additions & 1 deletion packages/office-ui-fabric-react/src/components/Callout/Callout.types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,11 +73,17 @@ export interface ICalloutProps {
isBeakVisible?: boolean;

/**
* If true then the onClose will not not dismiss on scroll
* If true then the callout will not dismiss on scroll
* @default false
*/
preventDismissOnScroll?: boolean;

/**
* If true then the callout will not dismiss when it loses focus
* @default false
*/
preventDismissOnLostFocus?: boolean;

/**
* If true the position returned will have the menu element cover the target.
* If false then it will position next to the target;
Expand Down
7 changes: 5 additions & 2 deletions packages/office-ui-fabric-react/src/components/Callout/CalloutContent.base.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ export interface ICalloutState {
@customizable('CalloutContent', ['theme'])
export class CalloutContentBase extends BaseComponent<ICalloutProps, ICalloutState> {
public static defaultProps = {
preventDismissOnLostFocus: false,
preventDismissOnScroll: false,
isBeakVisible: true,
beakWidth: 16,
Expand Down Expand Up @@ -234,13 +235,15 @@ export class CalloutContentBase extends BaseComponent<ICalloutProps, ICalloutSta
protected _dismissOnLostFocus(ev: Event) {
const target = ev.target as HTMLElement;
const clickedOutsideCallout = this._hostElement.current && !elementContains(this._hostElement.current, target);
const { preventDismissOnLostFocus } = this.props;

if (
(!this._target && clickedOutsideCallout) ||
!preventDismissOnLostFocus &&
((!this._target && clickedOutsideCallout) ||
(ev.target !== this._targetWindow &&
clickedOutsideCallout &&
((this._target as MouseEvent).stopPropagation ||
(!this._target || (target !== this._target && !elementContains(this._target as HTMLElement, target)))))
(!this._target || (target !== this._target && !elementContains(this._target as HTMLElement, target))))))
) {
this.dismiss(ev);
}
Expand Down