refactor(): restructure components to loosen coupling, move overlay-p…

…ortal, click-block, menu-controller and other app-level functionality to app directory. The motivation for this change is logical grouping, decoupling components from each other, and improving the ability to drop more unused components from bundle

src/components/app/app-root.ts

@@ -4,7 +4,7 @@ import { App } from './app';
 import { assert } from '../../util/util';
 import { Config } from '../../config/config';
 import { Ion } from '../ion';
-import { OverlayPortal } from '../nav/overlay-portal';
+import { OverlayPortal } from './overlay-portal';
 import { Platform } from '../../platform/platform';
 import * as Constants from './app-constants';
 
@@ -42,7 +42,7 @@ export class IonicApp extends Ion implements OnInit {
     private _plt: Platform,
     app: App
   ) {
-    super(config, elementRef, renderer);
+    super(config, elementRef, renderer, 'app-root');
     // register with App that this is Ionic's appRoot component. tada!
     app._appRoot = this;
     this._stopScrollPlugin = (<any>window)['IonicStopScroll'];

src/components/app/app.ts

@@ -3,11 +3,11 @@ import { Title, DOCUMENT } from '@angular/platform-browser';
 
 import { IonicApp } from './app-root';
 import * as Constants from './app-constants';
-import { ClickBlock } from '../click-block/click-block';
+import { ClickBlock } from './click-block';
 import { runInDev } from '../../util/util';
 import { Config } from '../../config/config';
 import { isNav, NavOptions, DIRECTION_FORWARD, DIRECTION_BACK } from '../../navigation/nav-util';
-import { MenuController } from '../menu/menu-controller';
+import { MenuController } from './menu-controller';
 import { NavController } from '../../navigation/nav-controller';
 import { Platform } from '../../platform/platform';
 import { ViewController } from '../../navigation/view-controller';

src/components/menu/menu-controller.ts → src/components/app/menu-controller.ts

@@ -1,5 +1,4 @@
-import { Menu } from './menu';
-import { MenuType } from './menu-types';
+import { Menu, MenuType } from './menu-interface';
 import { Platform } from '../../platform/platform';
 import { removeArrayItem, assert } from '../../util/util';
 
@@ -343,3 +342,5 @@ export class MenuController {
 }
 
 let menuTypes: { [name: string]: new(...args: any[]) => MenuType } = {};
+
+

src/components/app/menu-interface.ts

@@ -0,0 +1,31 @@
+import { Animation } from '../../animations/animation';
+
+export interface Menu {
+  setOpen(shouldOpen: boolean, animated: boolean): Promise<boolean>;
+  open(): Promise<boolean>;
+  close(): Promise<boolean>;
+  toggle(): Promise<boolean>;
+  enable(shouldEnable: boolean, menuId?: string): Menu;
+  swipeEnable(shouldEnable: boolean): Menu;
+  isOpen: boolean;
+  enabled: boolean;
+  side: string;
+  id: string;
+  isAnimating(): boolean;
+  width(): number;
+  getContentElement(): HTMLElement;
+  getMenuElement(): HTMLElement;
+  getBackdropElement(): HTMLElement;
+  _canOpen(): boolean;
+  persistent: boolean;
+};
+
+export interface MenuType {
+  ani: Animation;
+  isOpening: boolean;
+  setOpen(shouldOpen: boolean, animated: boolean, done: Function): void;
+  setProgressStart(isOpen: boolean): void;
+  setProgessStep(stepValue: number): void;
+  setProgressEnd(shouldComplete: boolean, currentStepValue: number, velocity: number, done: Function): void;
+  destroy(): void;
+};

src/components/nav/overlay-portal.ts → src/components/app/overlay-portal.ts

@@ -1,6 +1,6 @@
 import { ComponentFactoryResolver, Directive, ElementRef, ErrorHandler, forwardRef, Inject, Input, NgZone, Optional, Renderer, ViewContainerRef } from '@angular/core';
 
-import { App } from '../app/app';
+import { App } from './app';
 import { Config } from '../../config/config';
 import { DeepLinker } from '../../navigation/deep-linker';
 import { DomController } from '../../platform/dom-controller';
@@ -55,4 +55,3 @@ export class OverlayPortal extends NavControllerBase {
   }
 
 }
-

src/components/app/test/app.spec.ts

@@ -1,8 +1,8 @@
 import { App } from '../app';
-import { ClickBlock } from '../../click-block/click-block';
+import { ClickBlock } from '../click-block';
 import { Config } from '../../../config/config';
 import { mockApp, mockConfig, mockElementRef, mockNavController, mockPlatform, MockPlatform, mockRenderer, mockTab, mockTabs, mockView, mockViews } from '../../../util/mock-providers';
-import { OverlayPortal } from '../../nav/overlay-portal';
+import { OverlayPortal } from '../overlay-portal';
 import { PORTAL_MODAL } from '../app-constants';
 
 

src/components/avatar/avatar.ts

@@ -12,5 +12,6 @@ import { Directive } from '@angular/core';
   selector: 'ion-avatar'
 })
 export class Avatar {
-
+  constructor() {
+  }
 }

src/components/backdrop/backdrop.ts

@@ -12,11 +12,8 @@ import { Directive, ElementRef, Renderer } from '@angular/core';
   },
 })
 export class Backdrop {
-
-  constructor(
-    private _elementRef: ElementRef,
-    private _renderer: Renderer
-  ) { }
+  constructor(private _elementRef: ElementRef, private _renderer: Renderer) {
+  }
 
   getNativeElement(): HTMLElement {
     return this._elementRef.nativeElement;

src/components/badge/badge.ts

@@ -19,5 +19,4 @@ export class Badge extends Ion {
   constructor(config: Config, elementRef: ElementRef, renderer: Renderer) {
     super(config, elementRef, renderer, 'badge');
   }
-
 }

src/components/checkbox/checkbox.ts

@@ -1,4 +1,4 @@
-import { AfterViewInit, ChangeDetectorRef, Component, ElementRef, forwardRef, HostListener, Input, OnDestroy, Optional, Renderer, ViewEncapsulation } from '@angular/core';
+import { AfterViewInit, ChangeDetectorRef, Component, ElementRef, HostListener, Input, OnDestroy, Optional, Renderer, ViewEncapsulation } from '@angular/core';
 import { NG_VALUE_ACCESSOR } from '@angular/forms';
 
 import { Config } from '../../config/config';
@@ -7,12 +7,6 @@ import { Form, IonicTapInput } from '../../util/form';
 import { BaseInput } from '../../util/base-input';
 import { Item } from '../item/item';
 
-export const CHECKBOX_VALUE_ACCESSOR: any = {
-  provide: NG_VALUE_ACCESSOR,
-  useExisting: forwardRef(() => Checkbox),
-  multi: true
-};
-
 /**
  * @name Checkbox
  * @module ionic
@@ -69,7 +63,7 @@ export const CHECKBOX_VALUE_ACCESSOR: any = {
   host: {
     '[class.checkbox-disabled]': '_disabled'
   },
-  providers: [CHECKBOX_VALUE_ACCESSOR],
+  providers: [ { provide: NG_VALUE_ACCESSOR, useExisting: Checkbox, multi: true } ],
   encapsulation: ViewEncapsulation.None,
 })
 export class Checkbox extends BaseInput<boolean> implements IonicTapInput, AfterViewInit, OnDestroy {