chore(api): repackage API classes

* repackage API classes to easily distinguish flexbox APIs and  extended responsive APIs
* update testing classes with improved matchers

LICENSE

@@ -10,7 +10,7 @@ copies of the Software, and to permit persons to whom the Software is
 furnished to do so, subject to the following conditions:
 
 The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
+all copies or substantial portions of the  Software.
 
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

src/lib/flexbox/api/base-adapter.ts → src/lib/api/core/base-adapter.ts

@@ -8,7 +8,7 @@
 import {ElementRef, Renderer2} from '@angular/core';
 
 import {BaseFxDirective} from './base';
-import {ResponsiveActivation} from './../responsive/responsive-activation';
+import {ResponsiveActivation} from './responsive-activation';
 import {MediaQuerySubscriber} from '../../media-query/media-change';
 import {MediaMonitor} from '../../media-query/media-monitor';
 

src/lib/flexbox/api/base.ts → src/lib/api/core/base.ts

@@ -19,7 +19,7 @@ import {
   applyStyleToElements
 } from '../../utils/style-utils';
 
-import {ResponsiveActivation, KeyOptions} from '../responsive/responsive-activation';
+import {ResponsiveActivation, KeyOptions} from '../core/responsive-activation';
 import {MediaMonitor} from '../../media-query/media-monitor';
 import {MediaQuerySubscriber} from '../../media-query/media-change';
 
@@ -78,6 +78,10 @@ export abstract class BaseFxDirective implements OnDestroy, OnChanges {
     return this._elementRef.nativeElement.parentNode;
   }
 
+  protected get nativeElement(): any {
+    return this._elementRef.nativeElement;
+  }
+
   /**
    * Access the current value (if any) of the @Input property.
    */
@@ -130,7 +134,7 @@ export abstract class BaseFxDirective implements OnDestroy, OnChanges {
    * and optional restore it when the mediaQueries deactivate
    */
   protected _getDisplayStyle(source?: HTMLElement): string {
-    let element: HTMLElement = source || this._elementRef.nativeElement;
+    let element: HTMLElement = source || this.nativeElement;
     return lookupStyle(element, 'display');
   }
 
@@ -161,7 +165,7 @@ export abstract class BaseFxDirective implements OnDestroy, OnChanges {
   protected _applyStyleToElement(style: StyleDefinition,
                                  value?: string | number,
                                  nativeElement?: any) {
-    let element = nativeElement || this._elementRef.nativeElement;
+    let element = nativeElement || this.nativeElement;
     applyStyleToElement(this._renderer, element, style, value);
   }
 
@@ -209,7 +213,7 @@ export abstract class BaseFxDirective implements OnDestroy, OnChanges {
    * Special accessor to query for all child 'element' nodes regardless of type, class, etc.
    */
   protected get childrenNodes() {
-    const obj = this._elementRef.nativeElement.children;
+    const obj = this.nativeElement.children;
     const buffer = [];
 
     // iterate backwards ensuring that length is an UInt32

src/lib/flexbox/responsive/responsive-activation.ts → src/lib/api/core/responsive-activation.ts

@@ -43,16 +43,28 @@ export class KeyOptions {
 export class ResponsiveActivation {
   private _subscribers: SubscriptionList = [];
   private _activatedInputKey: string;
+  private _registryMap: BreakPointX[];
 
   /**
    * Constructor
    */
   constructor(private _options: KeyOptions,
               private _mediaMonitor: MediaMonitor,
               private _onMediaChanges: MediaQuerySubscriber) {
+    this._registryMap = this._buildRegistryMap();
     this._subscribers = this._configureChangeObservers();
   }
 
+  /**
+   * Get a readonly sorted list of the breakpoints corresponding to the directive properties
+   * defined in the HTML markup: the sorting is done from largest to smallest. The order is
+   * important when several media queries are 'registered' and from which, the browser uses the
+   * first matching media query.
+   */
+  get registryFromLargest(): BreakPointX[] {
+    return [...this._registryMap].reverse();
+  }
+
   /**
    * Accessor to the DI'ed directive property
    * Each directive instance has a reference to the MediaMonitor which is
@@ -107,7 +119,7 @@ export class ResponsiveActivation {
   private _configureChangeObservers(): SubscriptionList {
     let subscriptions = [];
 
-    this._buildRegistryMap().forEach((bp: BreakPointX) => {
+    this._registryMap.forEach((bp: BreakPointX) => {
       if (this._keyInUse(bp.key)) {
         // Inject directive default property key name: to let onMediaChange() calls
         // know which property is being triggered...

src/lib/flexbox/api/class.ts → src/lib/api/ext/class.ts

@@ -22,8 +22,8 @@ import {
 } from '@angular/core';
 import {NgClass} from '@angular/common';
 
-import {BaseFxDirective} from './base';
-import {BaseFxDirectiveAdapter} from './base-adapter';
+import {BaseFxDirective} from '../core/base';
+import {BaseFxDirectiveAdapter} from '../core/base-adapter';
 import {MediaChange} from '../../media-query/media-change';
 import {MediaMonitor} from '../../media-query/media-monitor';
 

src/lib/flexbox/api/hide.spec.ts → src/lib/api/ext/hide.spec.ts

@@ -69,38 +69,38 @@ describe('hide directive', () => {
 
     it('should initial with component not visible as default', () => {
       createTestComponent(`<div fxHide></div>`);
-      expectNativeEl(fixture).toHaveCssStyle({'display': 'none'});
+      expectNativeEl(fixture).toHaveStyle({'display': 'none'});
     });
 
     it('should initial with component visible when set to `false`', () => {
       createTestComponent(`<div fxHide="false"></div>`);
-      expectNativeEl(fixture).toHaveCssStyle({'display': 'block'});
+      expectNativeEl(fixture).toHaveStyle({'display': 'block'});
     });
 
     it('should initial with component visible when set to `0`', () => {
       createTestComponent(`<div [fxHide]="isVisible"></div>`);
-      expectNativeEl(fixture, {isVisible: 0}).toHaveCssStyle({'display': 'block'});
+      expectNativeEl(fixture, {isVisible: 0}).toHaveStyle({'display': 'block'});
     });
 
     it('should update styles with binding changes', () => {
       createTestComponent(`<div [fxHide]="menuHidden"></div>`);
-      expectNativeEl(fixture).toHaveCssStyle({'display': 'none'});
+      expectNativeEl(fixture).toHaveStyle({'display': 'none'});
       fixture.componentInstance.toggleMenu();
-      expectNativeEl(fixture).toHaveCssStyle({'display': 'block'});
+      expectNativeEl(fixture).toHaveStyle({'display': 'block'});
       fixture.componentInstance.toggleMenu();
-      expectNativeEl(fixture).toHaveCssStyle({'display': 'none'});
+      expectNativeEl(fixture).toHaveStyle({'display': 'none'});
     });
 
     it('should use "block" display style when not explicitly defined', () => {
       createTestComponent(`<button [fxHide]="isHidden"></button>`);
-      expectNativeEl(fixture, {isHidden: true}).toHaveCssStyle({'display': 'none'});
-      expectNativeEl(fixture, {isHidden: false}).toHaveCssStyle({'display': 'inline-block'});
+      expectNativeEl(fixture, {isHidden: true}).toHaveStyle({'display': 'none'});
+      expectNativeEl(fixture, {isHidden: false}).toHaveStyle({'display': 'inline-block'});
     });
 
     it('should use "flex" display style when the element also has an fxLayout', () => {
       createTestComponent(`<div fxLayout [fxHide]="isHidden"></div>`);
-      expectNativeEl(fixture, {isHidden: true}).toHaveCssStyle({'display': 'none'});
-      expectNativeEl(fixture, {isHidden: false}).toHaveCssStyle({'display': 'block'});
+      expectNativeEl(fixture, {isHidden: true}).toHaveStyle({'display': 'none'});
+      expectNativeEl(fixture, {isHidden: false}).toHaveStyle({'display': 'block'});
     });
 
 
@@ -111,73 +111,73 @@ describe('hide directive', () => {
     it('should show on `xs` viewports only when the default is included', () => {
       createTestComponent(`<div fxHide="" fxHide.xs="false"></div>`);
 
-      expectNativeEl(fixture).toHaveCssStyle({'display': 'none'});
+      expectNativeEl(fixture).toHaveStyle({'display': 'none'});
       matchMedia.activate('xs');
-      expectNativeEl(fixture).toHaveCssStyle({'display': 'block'});
+      expectNativeEl(fixture).toHaveStyle({'display': 'block'});
       matchMedia.activate('md');
-      expectNativeEl(fixture).toHaveCssStyle({'display': 'none'});
+      expectNativeEl(fixture).toHaveStyle({'display': 'none'});
     });
 
     it('should preserve display and update only on activated mediaQuery', () => {
       createTestComponent(`<div [fxHide.xs]="isHidden" style="display:inline-block"></div>`);
-      expectNativeEl(fixture).toHaveCssStyle({'display': 'inline-block'});
+      expectNativeEl(fixture).toHaveStyle({'display': 'inline-block'});
 
       // should hide with this activation
       matchMedia.activate('xs');
-      expectNativeEl(fixture).toHaveCssStyle({'display': 'none'});
+      expectNativeEl(fixture).toHaveStyle({'display': 'none'});
 
       // should reset to original display style
       matchMedia.activate('md');
-      expectNativeEl(fixture).toHaveCssStyle({'display': 'inline-block'});
+      expectNativeEl(fixture).toHaveStyle({'display': 'inline-block'});
     });
 
     it('should restore original display when disabled', () => {
       createTestComponent(`<div [fxHide.xs]="isHidden" style="display:inline-block"></div>`);
-      expectNativeEl(fixture).toHaveCssStyle({'display': 'inline-block'});
+      expectNativeEl(fixture).toHaveStyle({'display': 'inline-block'});
 
       // should hide with this activation
       matchMedia.activate('xs');
-      expectNativeEl(fixture).toHaveCssStyle({'display': 'none'});
+      expectNativeEl(fixture).toHaveStyle({'display': 'none'});
 
       // should reset to original display style
       fixture.componentInstance.isHidden = false;
-      expectNativeEl(fixture).toHaveCssStyle({'display': 'inline-block'});
+      expectNativeEl(fixture).toHaveStyle({'display': 'inline-block'});
     });
 
     it('should restore original display when the mediaQuery deactivates', () => {
       let originalDisplay = {'display': 'table'};
       createTestComponent(`<div [fxHide.xs]="isHidden" style="display:table"></div>`);
-      expectNativeEl(fixture).toHaveCssStyle(originalDisplay);
+      expectNativeEl(fixture).toHaveStyle(originalDisplay);
 
       // should hide with this activation
       matchMedia.activate('xs');
-      expectNativeEl(fixture).toHaveCssStyle({'display': 'none'});
+      expectNativeEl(fixture).toHaveStyle({'display': 'none'});
 
       // should reset to original display style
       matchMedia.activate('md');
-      expectNativeEl(fixture).toHaveCssStyle(originalDisplay);
+      expectNativeEl(fixture).toHaveStyle(originalDisplay);
     });
 
     it('should support use of the `media` observable in templates ', () => {
       createTestComponent(`<div [fxHide]="media.isActive('xs')"></div>`);
-      expectNativeEl(fixture).toHaveCssStyle({'display': 'block'});
+      expectNativeEl(fixture).toHaveStyle({'display': 'block'});
 
       matchMedia.activate('xs');
-      expectNativeEl(fixture).toHaveCssStyle({'display': 'none'});
+      expectNativeEl(fixture).toHaveStyle({'display': 'none'});
 
       matchMedia.activate('lg');
-      expectNativeEl(fixture).toHaveCssStyle({'display': 'block'});
+      expectNativeEl(fixture).toHaveStyle({'display': 'block'});
     });
 
     it('should support use of the `media` observable in adaptive templates ', () => {
       createTestComponent(`<div fxHide="false" [fxHide.md]="media.isActive('xs')"></div>`);
-      expectNativeEl(fixture).toHaveCssStyle({'display': 'block'});
+      expectNativeEl(fixture).toHaveStyle({'display': 'block'});
 
       matchMedia.activate('xs');
-      expectNativeEl(fixture).toHaveCssStyle({'display': 'block'});
+      expectNativeEl(fixture).toHaveStyle({'display': 'block'});
 
       matchMedia.activate('md');
-      expectNativeEl(fixture).toHaveCssStyle({'display': 'block'});
+      expectNativeEl(fixture).toHaveStyle({'display': 'block'});
     });
 
     it('should hide when used with fxLayout and the ".md" breakpoint activates', () => {
@@ -198,8 +198,8 @@ describe('hide directive', () => {
         `;
       let expectActivation = makeExpectWithActivation(createTestComponent(template), '.hideOnMd');
 
-      expectActivation().toHaveCssStyle({'display': 'block'});
-      expectActivation('md').toHaveCssStyle({'display': 'none'});
+      expectActivation().toHaveStyle({'display': 'block'});
+      expectActivation('md').toHaveStyle({'display': 'none'});
     });
 
     it('should restore proper display mode when not hiding', () => {
@@ -210,9 +210,9 @@ describe('hide directive', () => {
            `;
       let expectActivation = makeExpectWithActivation(createTestComponent(template), '.hideOnXs');
 
-      expectActivation().toHaveCssStyle({'display': 'inline'});
-      expectActivation('xs').toHaveCssStyle({'display': 'none'});
-      expectActivation('md').toHaveCssStyle({'display': 'inline'});
+      expectActivation().toHaveStyle({'display': 'inline'});
+      expectActivation('xs').toHaveStyle({'display': 'none'});
+      expectActivation('md').toHaveStyle({'display': 'inline'});
     });
   });
 
@@ -222,13 +222,13 @@ describe('hide directive', () => {
         This content to be shown ONLY when gt-sm
       </div>
     `);
-    expectNativeEl(fixture).toHaveCssStyle({'display': 'inline-block'});
+    expectNativeEl(fixture).toHaveStyle({'display': 'inline-block'});
 
     matchMedia.activate('md', true);
-    expectNativeEl(fixture).toHaveCssStyle({'display': 'none'});
+    expectNativeEl(fixture).toHaveStyle({'display': 'none'});
 
     matchMedia.activate('xs', true);
-    expectNativeEl(fixture).toHaveCssStyle({'display': 'inline-block'});
+    expectNativeEl(fixture).toHaveStyle({'display': 'inline-block'});
   });
 
 });

src/lib/flexbox/api/show-hide.ts → src/lib/api/ext/show-hide.ts

@@ -20,10 +20,10 @@ import {
 
 import {Subscription} from 'rxjs/Subscription';
 
-import {BaseFxDirective} from './base';
+import {BaseFxDirective} from '../core/base';
 import {MediaChange} from '../../media-query/media-change';
 import {MediaMonitor} from '../../media-query/media-monitor';
-import {LayoutDirective} from './layout';
+import {LayoutDirective} from '../flexbox/layout';
 
 const FALSY = ['false', false, 0];