Skip to content

Added public openMenu method and cleaned up open/close functions #4241

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
micahgodbolt merged 4 commits into from
Mar 19, 2018
Merged

Added public openMenu method and cleaned up open/close functions #4241

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
5843227
Added public openMenu method and cleaned up open/close functions
micahgodbolt Mar 12, 2018
f497982
Change file
micahgodbolt Mar 12, 2018
53a120c
Merge branch 'master' into button-openMenu
micahgodbolt Mar 19, 2018
b9cc6c9
Update BaseButton.tsx
micahgodbolt Mar 19, 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/button-openMenu_2018-03-12-20-15.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": "Button: Added public openMenu method and cleaned up open/close functions",
"type": "minor"
}
],
"packageName": "office-ui-fabric-react",
"email": "mgodbolt@microsoft.com"
}
15 changes: 12 additions & 3 deletions packages/office-ui-fabric-react/src/components/Button/BaseButton.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,7 +206,11 @@ export class BaseButton extends BaseComponent<IBaseButtonProps, IBaseButtonState
}

public dismissMenu(): void {
this.setState({ menuProps: null });
this._dismissMenu();
}

public openMenu(): void {
this._openMenu();
}

private _onRenderContent(tag: any, buttonProps: IButtonProps): JSX.Element {
Expand Down Expand Up @@ -398,10 +402,15 @@ export class BaseButton extends BaseComponent<IBaseButtonProps, IBaseButtonState
this.setState({ menuProps: null });
}

private _openMenu = (): void => {
if (this.props.menuProps) {
this.setState({ menuProps: this.props.menuProps });
}
}

private _onToggleMenu = (): void => {
const { menuProps } = this.props;
const currentMenuProps = this.state.menuProps;
this.setState({ menuProps: currentMenuProps ? null : menuProps });
currentMenuProps ? this._dismissMenu() : this._openMenu();
}

private _onRenderSplitButtonContent(tag: any, buttonProps: IButtonProps): JSX.Element {
Expand Down
5 changes: 5 additions & 0 deletions packages/office-ui-fabric-react/src/components/Button/Button.types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,11 @@ export interface IButton {
* If there is a menu associated with this button and it is visible, this will dismiss the menu
*/
dismissMenu: () => void;

/**
* If there is a menu associated with this button and it is visible, this will open the menu
*/
openMenu: () => void;
}

export interface IButtonProps extends React.AllHTMLAttributes<HTMLAnchorElement | HTMLButtonElement | HTMLDivElement | BaseButton | Button> {
Expand Down