self-hosted/focalboard
1
0
Fork 0
mirror of https://github.com/mattermost/focalboard.git synced 2025-01-23 18:34:02 +02:00
Code Issues Releases Activity

Allow nested MenuWrappers to close on item click

Browse Source
This commit is contained in:
Chen-I Lim 2020-11-10 11:24:07 -08:00
parent 289f8f9d30
commit 6445231737
4 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
webapp/src/widgets/menu/colorOption.tsx
View File

@ -11,7 +11,8 @@ type ColorOptionProps = MenuOptionProps & {
} }
export default class ColorOption extends React.PureComponent<ColorOptionProps> { export default class ColorOption extends React.PureComponent<ColorOptionProps> {
private handleOnClick = (): void => { private handleOnClick = (e: React.MouseEvent): void => {
e.target.dispatchEvent(new Event('menuItemClicked'))
this.props.onClick(this.props.id) this.props.onClick(this.props.id)
} }

3
webapp/src/widgets/menu/switchOption.tsx
View File

@ -12,7 +12,8 @@ type SwitchOptionProps = MenuOptionProps & {
} }
export default class SwitchOption extends React.PureComponent<SwitchOptionProps> { export default class SwitchOption extends React.PureComponent<SwitchOptionProps> {
private handleOnClick = (): void => { private handleOnClick = (e: React.MouseEvent): void => {
e.target.dispatchEvent(new Event('menuItemClicked'))
this.props.onClick(this.props.id) this.props.onClick(this.props.id)
} }

3
webapp/src/widgets/menu/textOption.tsx
View File

@ -10,7 +10,8 @@ type TextOptionProps = MenuOptionProps & {
} }
export default class TextOption extends React.PureComponent<TextOptionProps> { export default class TextOption extends React.PureComponent<TextOptionProps> {
private handleOnClick = (): void => { private handleOnClick = (e: React.MouseEvent): void => {
e.target.dispatchEvent(new Event('menuItemClicked'))
this.props.onClick(this.props.id) this.props.onClick(this.props.id)
} }

2
webapp/src/widgets/menuWrapper.tsx
View File

@ -32,11 +32,13 @@ export default class MenuWrapper extends React.PureComponent<Props, State> {
} }
public componentDidMount() { public componentDidMount() {
document.addEventListener('menuItemClicked', this.close, true)
document.addEventListener('click', this.closeOnBlur, true) document.addEventListener('click', this.closeOnBlur, true)
document.addEventListener('keyup', this.keyboardClose, true) document.addEventListener('keyup', this.keyboardClose, true)
} }
public componentWillUnmount() { public componentWillUnmount() {
document.removeEventListener('menuItemClicked', this.close, true)
document.removeEventListener('click', this.closeOnBlur, true) document.removeEventListener('click', this.closeOnBlur, true)
document.removeEventListener('keyup', this.keyboardClose, true) document.removeEventListener('keyup', this.keyboardClose, true)
} }