refactor(router): separate nav and router-outlet into two seperate directives

2025-08-22 21:48:42 +08:00 · 2018-02-06 00:50:00 -06:00
parent 97baabde93
commit 73ce15f7da
14 changed files with 69 additions and 172 deletions
--- a/packages/angular/src/directives/ion-nav.ts
+++ b/packages/angular/src/directives/ion-nav.ts
@ -0,0 +1,48 @@
+import {
+  ComponentFactoryResolver,
+  Directive,
+  ElementRef,
+  Injector,
+  Type,
+} from '@angular/core';
+
+
+import { FrameworkDelegate } from '@ionic/core';
+
+import { AngularComponentMounter, AngularEscapeHatch } from '..';
+
+let id = 0;
+
+@Directive({
+  selector: 'ion-nav',
+})
+export class IonNav implements FrameworkDelegate {
+
+  constructor(
+    public elementRef: ElementRef,
+    protected angularComponentMounter: AngularComponentMounter,
+    protected cfr: ComponentFactoryResolver,
+    protected injector: Injector) {
+
+    this.elementRef.nativeElement.delegate = this;
+
+  }
+
+  attachViewToDom(elementOrContainerToMountTo: HTMLIonNavElement,
+    elementOrComponentToMount: Type<any>,
+    data?: any,
+    classesToAdd?: string[],
+    escapeHatch: AngularEscapeHatch = {}): Promise<any> {
+
+    // wrap whatever the user provides in an ion-page
+    const cfr = escapeHatch.cfr || this.cfr;
+    const injector = escapeHatch.injector || this.injector;
+    return this.angularComponentMounter.attachViewToDom(elementOrContainerToMountTo,
+      null, elementOrComponentToMount, cfr, injector, data, classesToAdd);
+  }
+
+  removeViewFromDom(parentElement: HTMLElement, childElement: HTMLElement) {
+    return this.angularComponentMounter.removeViewFromDom(parentElement, childElement);
+  }
+
+}
--- a/packages/angular/src/directives/menu-toggle.ts
+++ b/packages/angular/src/directives/menu-toggle.ts
@ -1,114 +0,0 @@
-import { Directive, HostListener, Input } from '@angular/core';
-
-
-import { MenuController } from '../providers/menu-controller';
-
-/**
- * @name MenuToggle
- * @description
- * The `menuToggle` directive can be placed on any button to toggle a menu open or closed.
- * If it is added to the [NavBar](../../toolbar/Navbar) of a page, the button will only appear
- * when the page it's in is currently a root page. See the [Menu Navigation Bar Behavior](../Menu#navigation-bar-behavior)
- * docs for more information.
- *
- *
- * @usage
- *
- * A simple `menuToggle` button can be added using the following markup:
- *
- * ```html
- * <button ion-button menuToggle>Toggle Menu</button>
- * ```
- *
- * To toggle a specific menu by its id or side, give the `menuToggle`
- * directive a value.
- *
- * ```html
- * <button ion-button menuToggle="right">Toggle Right Menu</button>
- * ```
- *
- * If placing the `menuToggle` in a navbar or toolbar, it should be
- * placed as a child of the `<ion-navbar>` or `<ion-toolbar>`, and not in
- * the `<ion-buttons>` element:
- *
- * ```html
- * <ion-header>
- *
- *   <ion-navbar>
- *     <ion-buttons start>
- *       <button ion-button>
- *         <ion-icon name="contact"></ion-icon>
- *       </button>
- *     </ion-buttons>
- *     <button ion-button menuToggle>
- *       <ion-icon name="menu"></ion-icon>
- *     </button>
- *     <ion-title>
- *       Title
- *     </ion-title>
- *     <ion-buttons end>
- *       <button ion-button (click)="doClick()">
- *         <ion-icon name="more"></ion-icon>
- *       </button>
- *     </ion-buttons>
- *   </ion-navbar>
- *
- * </ion-header>
- * ```
- *
- * Similar to `<ion-buttons>`, the `menuToggle` can be positioned using
- * `start`, `end`, `left`, or `right`:
- *
- * ```html
- * <ion-toolbar>
- *   <button ion-button menuToggle right>
- *     <ion-icon name="menu"></ion-icon>
- *   </button>
- *   <ion-title>
- *     Title
- *   </ion-title>
- *   <ion-buttons end>
- *     <button ion-button (click)="doClick()">
- *       <ion-icon name="more"></ion-icon>
- *     </button>
- *   </ion-buttons>
- * </ion-toolbar>
- * ```
- *
- * See the [Toolbar API docs](../../toolbar/Toolbar) for more information
- * on the different positions.
- *
- * @demo /docs/demos/src/menu/
- * @see {@link /docs/components#menus Menu Component Docs}
- * @see {@link ../../menu/Menu Menu API Docs}
- */
-@Directive({
-  selector: '[menuToggle]',
-  host: {
-    '[hidden]': 'isHidden'
-  }
-})
-export class MenuToggle {
-
-  /**
-   * @hidden
-   */
-  @Input() menuToggle: string;
-
-
-  constructor(
-    private _menu: MenuController,
-  ) {
-
-  }
-
-  /**
-  * @hidden
-  */
-  @HostListener('click')
-  toggle() {
-    const menu = this._menu.get(this.menuToggle);
-    menu && menu.toggle();
-  }
-
-}