Skip to content

Commit

Permalink
feat(core): move MatchMedia to internal scope (#998)
Browse files Browse the repository at this point in the history
BREAKING CHANGE:

`MediaObserver` is the only supported mechanism to watch breakpoint activations outside the library. Developers should not use `MatchMedia`.

*  MatchMedia is no longer exported as a public utility. 
*  ServerMatchMedia is no longer exported at all
  • Loading branch information
CaerusKaru authored and ThomasBurleson committed Jan 15, 2019
1 parent c45f2ae commit 53a6ebb
Show file tree
Hide file tree
Showing 26 changed files with 72 additions and 71 deletions.
1 change: 0 additions & 1 deletion src/lib/core/match-media/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,3 @@

export * from './match-media';
export * from './mock/mock-match-media';
export * from './server-match-media';
6 changes: 5 additions & 1 deletion src/lib/core/public-api.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,11 @@ export * from './add-alias';

export * from './base/index';
export * from './breakpoints/index';
export * from './match-media/index';
export {
MatchMedia as ɵMatchMedia,
MockMatchMedia as ɵMockMatchMedia,
MockMatchMediaProvider as ɵMockMatchMediaProvider,
} from './match-media/index';
export * from './media-observer/index';
export * from './utils/index';

Expand Down
6 changes: 3 additions & 3 deletions src/lib/extended/class/class.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@ import {CommonModule, isPlatformServer} from '@angular/common';
import {ComponentFixture, TestBed, fakeAsync, flush, inject} from '@angular/core/testing';
import {MatButtonModule} from '@angular/material/button';
import {
MatchMedia,
ɵMatchMedia as MatchMedia,
CoreModule,
MockMatchMedia,
MockMatchMediaProvider,
ɵMockMatchMedia as MockMatchMedia,
ɵMockMatchMediaProvider as MockMatchMediaProvider,
} from '@angular/flex-layout/core';

import {customMatchers, expect} from '../../utils/testing/custom-matchers';
Expand Down
6 changes: 3 additions & 3 deletions src/lib/extended/img-src/img-src.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ import {Component, PLATFORM_ID} from '@angular/core';
import {CommonModule, isPlatformServer} from '@angular/common';
import {ComponentFixture, TestBed, inject} from '@angular/core/testing';
import {
MatchMedia,
MockMatchMedia,
MockMatchMediaProvider,
ɵMatchMedia as MatchMedia,
ɵMockMatchMedia as MockMatchMedia,
ɵMockMatchMediaProvider as MockMatchMediaProvider,
SERVER_TOKEN,
StyleUtils,
} from '@angular/flex-layout/core';
Expand Down
6 changes: 3 additions & 3 deletions src/lib/extended/show-hide/hide.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ import {Component, OnInit} from '@angular/core';
import {CommonModule} from '@angular/common';
import {ComponentFixture, TestBed, inject} from '@angular/core/testing';
import {
MatchMedia,
MockMatchMedia,
MockMatchMediaProvider,
ɵMatchMedia as MatchMedia,
ɵMockMatchMedia as MockMatchMedia,
ɵMockMatchMediaProvider as MockMatchMediaProvider,
MediaObserver,
SERVER_TOKEN,
StyleUtils
Expand Down
6 changes: 3 additions & 3 deletions src/lib/extended/show-hide/show.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ import {Component, Directive, OnInit, PLATFORM_ID} from '@angular/core';
import {CommonModule, isPlatformBrowser} from '@angular/common';
import {ComponentFixture, TestBed, inject} from '@angular/core/testing';
import {
MatchMedia,
MockMatchMedia,
MockMatchMediaProvider,
ɵMatchMedia as MatchMedia,
ɵMockMatchMedia as MockMatchMedia,
ɵMockMatchMediaProvider as MockMatchMediaProvider,
MediaObserver,
SERVER_TOKEN,
StyleUtils,
Expand Down
6 changes: 3 additions & 3 deletions src/lib/extended/style/style.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@ import {Component} from '@angular/core';
import {CommonModule} from '@angular/common';
import {ComponentFixture, TestBed, inject} from '@angular/core/testing';
import {
MatchMedia,
ɵMatchMedia as MatchMedia,
CoreModule,
MockMatchMedia,
MockMatchMediaProvider,
ɵMockMatchMedia as MockMatchMedia,
ɵMockMatchMediaProvider as MockMatchMediaProvider,
StyleUtils,
} from '@angular/flex-layout/core';
import {DefaultLayoutDirective} from '@angular/flex-layout/flex';
Expand Down
2 changes: 1 addition & 1 deletion src/lib/flex/flex-offset/flex-offset.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import {CommonModule, isPlatformServer} from '@angular/common';
import {ComponentFixture, inject, TestBed} from '@angular/core/testing';
import {DIR_DOCUMENT} from '@angular/cdk/bidi';
import {
MockMatchMediaProvider,
ɵMockMatchMediaProvider as MockMatchMediaProvider,
SERVER_TOKEN,
StyleBuilder,
StyleUtils,
Expand Down
6 changes: 3 additions & 3 deletions src/lib/flex/flex-order/flex-order.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ import {Component} from '@angular/core';
import {ComponentFixture, inject, TestBed} from '@angular/core/testing';
import {CommonModule} from '@angular/common';
import {
MatchMedia,
MockMatchMedia,
MockMatchMediaProvider,
ɵMatchMedia as MatchMedia,
ɵMockMatchMedia as MockMatchMedia,
ɵMockMatchMediaProvider as MockMatchMediaProvider,
SERVER_TOKEN,
StyleUtils,
} from '@angular/flex-layout/core';
Expand Down
6 changes: 3 additions & 3 deletions src/lib/flex/flex/flex.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ import {CommonModule, isPlatformServer} from '@angular/common';
import {ComponentFixture, TestBed, inject, fakeAsync} from '@angular/core/testing';
import {Platform} from '@angular/cdk/platform';
import {
MatchMedia,
MockMatchMedia,
MockMatchMediaProvider,
ɵMatchMedia as MatchMedia,
ɵMockMatchMedia as MockMatchMedia,
ɵMockMatchMediaProvider as MockMatchMediaProvider,
StyleBuilder,
StyleUtils,
} from '@angular/flex-layout/core';
Expand Down
6 changes: 3 additions & 3 deletions src/lib/flex/layout-align/layout-align.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ import {CommonModule} from '@angular/common';
import {ComponentFixture, TestBed, inject} from '@angular/core/testing';
import {Platform} from '@angular/cdk/platform';
import {
MatchMedia,
MockMatchMedia,
MockMatchMediaProvider,
ɵMatchMedia as MatchMedia,
ɵMockMatchMedia as MockMatchMedia,
ɵMockMatchMediaProvider as MockMatchMediaProvider,
SERVER_TOKEN,
StyleBuilder,
StyleUtils,
Expand Down
6 changes: 3 additions & 3 deletions src/lib/flex/layout-gap/layout-gap.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ import {CommonModule, isPlatformServer} from '@angular/common';
import {TestBed, ComponentFixture, inject, async} from '@angular/core/testing';
import {DIR_DOCUMENT} from '@angular/cdk/bidi';
import {
MatchMedia,
MockMatchMedia,
MockMatchMediaProvider,
ɵMatchMedia as MatchMedia,
ɵMockMatchMedia as MockMatchMedia,
ɵMockMatchMediaProvider as MockMatchMediaProvider,
SERVER_TOKEN,
StyleBuilder,
StyleUtils,
Expand Down
6 changes: 3 additions & 3 deletions src/lib/flex/layout/layout.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ import {Component, Injectable, OnInit} from '@angular/core';
import {CommonModule} from '@angular/common';
import {ComponentFixture, TestBed, inject} from '@angular/core/testing';
import {
MatchMedia,
MockMatchMedia,
MockMatchMediaProvider,
ɵMatchMedia as MatchMedia,
ɵMockMatchMedia as MockMatchMedia,
ɵMockMatchMediaProvider as MockMatchMediaProvider,
SERVER_TOKEN,
StyleBuilder,
StyleUtils,
Expand Down
6 changes: 3 additions & 3 deletions src/lib/grid/align-columns/align-columns.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ import {CommonModule} from '@angular/common';
import {ComponentFixture, TestBed, inject} from '@angular/core/testing';
import {Platform} from '@angular/cdk/platform';
import {
MatchMedia,
MockMatchMedia,
MockMatchMediaProvider,
ɵMatchMedia as MatchMedia,
ɵMockMatchMedia as MockMatchMedia,
ɵMockMatchMediaProvider as MockMatchMediaProvider,
StyleUtils,
} from '@angular/flex-layout/core';

Expand Down
6 changes: 3 additions & 3 deletions src/lib/grid/align-rows/align-rows.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ import {Component, OnInit} from '@angular/core';
import {CommonModule} from '@angular/common';
import {ComponentFixture, TestBed, inject} from '@angular/core/testing';
import {
MatchMedia,
MockMatchMedia,
MockMatchMediaProvider,
ɵMatchMedia as MatchMedia,
ɵMockMatchMedia as MockMatchMedia,
ɵMockMatchMediaProvider as MockMatchMediaProvider,
StyleUtils,
} from '@angular/flex-layout/core';

Expand Down
6 changes: 3 additions & 3 deletions src/lib/grid/area/area.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ import {CommonModule} from '@angular/common';
import {TestBed, ComponentFixture, inject} from '@angular/core/testing';
import {Platform} from '@angular/cdk/platform';
import {
MatchMedia,
MockMatchMedia,
MockMatchMediaProvider,
ɵMatchMedia as MatchMedia,
ɵMockMatchMedia as MockMatchMedia,
ɵMockMatchMediaProvider as MockMatchMediaProvider,
SERVER_TOKEN,
StyleUtils,
} from '@angular/flex-layout/core';
Expand Down
6 changes: 3 additions & 3 deletions src/lib/grid/areas/areas.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ import {CommonModule} from '@angular/common';
import {TestBed, ComponentFixture, inject} from '@angular/core/testing';
import {Platform} from '@angular/cdk/platform';
import {
MatchMedia,
MockMatchMedia,
MockMatchMediaProvider,
ɵMatchMedia as MatchMedia,
ɵMockMatchMedia as MockMatchMedia,
ɵMockMatchMediaProvider as MockMatchMediaProvider,
SERVER_TOKEN,
StyleUtils,
} from '@angular/flex-layout/core';
Expand Down
6 changes: 3 additions & 3 deletions src/lib/grid/auto/auto.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ import {CommonModule} from '@angular/common';
import {TestBed, ComponentFixture, inject} from '@angular/core/testing';
import {Platform} from '@angular/cdk/platform';
import {
MatchMedia,
MockMatchMedia,
MockMatchMediaProvider,
ɵMatchMedia as MatchMedia,
ɵMockMatchMedia as MockMatchMedia,
ɵMockMatchMediaProvider as MockMatchMediaProvider,
SERVER_TOKEN,
StyleUtils,
} from '@angular/flex-layout/core';
Expand Down
6 changes: 3 additions & 3 deletions src/lib/grid/column/column.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ import {CommonModule} from '@angular/common';
import {TestBed, ComponentFixture, inject} from '@angular/core/testing';
import {Platform} from '@angular/cdk/platform';
import {
MatchMedia,
MockMatchMedia,
MockMatchMediaProvider,
ɵMatchMedia as MatchMedia,
ɵMockMatchMedia as MockMatchMedia,
ɵMockMatchMediaProvider as MockMatchMediaProvider,
SERVER_TOKEN,
StyleUtils,
} from '@angular/flex-layout/core';
Expand Down
6 changes: 3 additions & 3 deletions src/lib/grid/columns/columns.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ import {CommonModule} from '@angular/common';
import {TestBed, ComponentFixture, inject} from '@angular/core/testing';
import {Platform} from '@angular/cdk/platform';
import {
MatchMedia,
MockMatchMedia,
MockMatchMediaProvider,
ɵMatchMedia as MatchMedia,
ɵMockMatchMedia as MockMatchMedia,
ɵMockMatchMediaProvider as MockMatchMediaProvider,
SERVER_TOKEN,
StyleUtils,
} from '@angular/flex-layout/core';
Expand Down
6 changes: 3 additions & 3 deletions src/lib/grid/gap/gap.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ import {CommonModule} from '@angular/common';
import {TestBed, ComponentFixture, inject} from '@angular/core/testing';
import {Platform} from '@angular/cdk/platform';
import {
MatchMedia,
MockMatchMedia,
MockMatchMediaProvider,
ɵMatchMedia as MatchMedia,
ɵMockMatchMedia as MockMatchMedia,
ɵMockMatchMediaProvider as MockMatchMediaProvider,
SERVER_TOKEN,
StyleUtils,
} from '@angular/flex-layout/core';
Expand Down
6 changes: 3 additions & 3 deletions src/lib/grid/grid-align/grid-align.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ import {CommonModule} from '@angular/common';
import {ComponentFixture, TestBed, inject} from '@angular/core/testing';
import {Platform} from '@angular/cdk/platform';
import {
MatchMedia,
MockMatchMedia,
MockMatchMediaProvider,
ɵMatchMedia as MatchMedia,
ɵMockMatchMedia as MockMatchMedia,
ɵMockMatchMediaProvider as MockMatchMediaProvider,
SERVER_TOKEN,
StyleUtils,
} from '@angular/flex-layout/core';
Expand Down
6 changes: 3 additions & 3 deletions src/lib/grid/row/row.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ import {CommonModule} from '@angular/common';
import {TestBed, ComponentFixture, inject} from '@angular/core/testing';
import {Platform} from '@angular/cdk/platform';
import {
MatchMedia,
MockMatchMedia,
MockMatchMediaProvider,
ɵMatchMedia as MatchMedia,
ɵMockMatchMedia as MockMatchMedia,
ɵMockMatchMediaProvider as MockMatchMediaProvider,
SERVER_TOKEN,
StyleUtils,
} from '@angular/flex-layout/core';
Expand Down
6 changes: 3 additions & 3 deletions src/lib/grid/rows/rows.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ import {CommonModule} from '@angular/common';
import {TestBed, ComponentFixture, inject} from '@angular/core/testing';
import {Platform} from '@angular/cdk/platform';
import {
MatchMedia,
MockMatchMedia,
MockMatchMediaProvider,
ɵMatchMedia as MatchMedia,
ɵMockMatchMedia as MockMatchMedia,
ɵMockMatchMediaProvider as MockMatchMediaProvider,
SERVER_TOKEN,
StyleUtils,
} from '@angular/flex-layout/core';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,7 @@
*/
import {DOCUMENT} from '@angular/common';
import {Inject, Injectable, NgZone, PLATFORM_ID} from '@angular/core';

import {BreakPoint} from '../breakpoints/break-point';
import {MatchMedia} from './match-media';
import {BreakPoint, ɵMatchMedia as MatchMedia} from '@angular/flex-layout/core';

/**
* Special server-only class to simulate a MediaQueryList and
Expand Down
4 changes: 2 additions & 2 deletions src/lib/server/server-provider.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@ import {
CLASS_NAME,
SERVER_TOKEN,
BreakPoint,
MatchMedia,
ɵMatchMedia as MatchMedia,
StylesheetMap,
ServerMatchMedia,
sortAscendingPriority
} from '@angular/flex-layout/core';

import {ServerMatchMedia} from './server-match-media';

/**
* Activate all of the registered breakpoints in sequence, and then
Expand Down

0 comments on commit 53a6ebb

Please sign in to comment.