javascript/ionic-framework
1
0
Fork 0
mirror of https://github.com/ionic-team/ionic-framework.git synced 2025-08-19 03:32:21 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(menu): menu registers itself before it's ready

Browse Source
This commit is contained in:
Manu Mtz.-Almeida
2018-10-01 18:18:39 +02:00
parent a5c2cc1835
commit 08beee3393
4 changed files with 25 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
core/src/components/menu/menu.tsx
View File

@ -136,15 +136,10 @@ export class Menu implements ComponentInterface, MenuI {
if (this.isServer) {
this.disabled = true;
} else {
this.menuCtrl = await this.lazyMenuCtrl.componentOnReady().then(p => p._getInstance());
}
}
async componentDidLoad() {
if (this.isServer) {
return;
}
const menuCtrl = this.menuCtrl = await this.lazyMenuCtrl.componentOnReady().then(p => p._getInstance());
const el = this.el;
const parent = el.parentNode as any;
const content = this.contentId !== undefined
@ -166,17 +161,8 @@ export class Menu implements ComponentInterface, MenuI {
this.typeChanged(this.type, undefined);
this.sideChanged();
let isEnabled = !this.disabled;
if (isEnabled) {
const menus = await this.menuCtrl!.getMenus();
isEnabled = !menus.some((m: any) => {
return m.side === this.side && !m.disabled;
});
}
// register this menu with the app's menu controller
this.menuCtrl!._register(this);
this.ionMenuChange.emit({ disabled: !isEnabled, open: this._isOpen });
menuCtrl!._register(this);
this.gesture = (await import('../../utils/gesture/gesture')).createGesture({
el: this.doc,
@ -190,12 +176,13 @@ export class Menu implements ComponentInterface, MenuI {
onMove: ev => this.onMove(ev),
onEnd: ev => this.onEnd(ev),
});
// mask it as enabled / disabled
this.disabled = !isEnabled;
this.updateState();
}
componentDidLoad() {
this.ionMenuChange.emit({ disabled: this.disabled, open: this._isOpen });
}
componentDidUnload() {
this.blocker.destroy();
this.menuCtrl!._unregister(this);