fix(cdk): fix cdk mappings duplicates (#2068)

BREAKING CHANGE: NbPlatform and NbScrollStrategyOptions from theme/components/cdk/overlay/mapping.ts removed. Use NbPlatform from theme/components/cdk/platform/platform-service.ts and NbScrollStrategyOptions from theme/components/cdk/adapter/block-scroll-strategy-adapter.ts. NbPlatformModule removed.
akveo · Dec 6, 2019 · 8179a02 · 8179a02
1 parent 1c5323d
commit 8179a02
Show file tree

Hide file tree

Showing 9 changed files with 13 additions and 25 deletions.
diff --git a/src/framework/theme/components/cdk/adapter/scroll-dispatcher-adapter.ts b/src/framework/theme/components/cdk/adapter/scroll-dispatcher-adapter.ts
@@ -2,7 +2,7 @@ import { Injectable, NgZone } from '@angular/core';
 import { CdkScrollable, ScrollDispatcher } from '@angular/cdk/overlay';
 import { Observable } from 'rxjs';
 
-import { NbPlatform } from '../overlay/mapping';
+import { NbPlatform } from '../platform/platform-service';
 import { NbLayoutScrollService } from '../../../services/scroll.service';
 
 @Injectable()

diff --git a/src/framework/theme/components/cdk/adapter/viewport-ruler-adapter.ts b/src/framework/theme/components/cdk/adapter/viewport-ruler-adapter.ts
@@ -2,7 +2,7 @@ import { Injectable, NgZone } from '@angular/core';
 import { ViewportRuler } from '@angular/cdk/overlay';
 import { map } from 'rxjs/operators';
 
-import { NbPlatform } from '../overlay/mapping';
+import { NbPlatform } from '../platform/platform-service';
 import { NbLayoutRulerService } from '../../../services/ruler.service';
 import { NbLayoutScrollService, NbScrollPosition } from '../../../services/scroll.service';
 

diff --git a/src/framework/theme/components/cdk/overlay/mapping.ts b/src/framework/theme/components/cdk/overlay/mapping.ts
@@ -29,9 +29,8 @@ import {
   OverlayRef,
   PositionStrategy,
   ScrollStrategy,
-  ScrollStrategyOptions,
 } from '@angular/cdk/overlay';
-import { Platform } from '@angular/cdk/platform';
+import { NbScrollStrategyOptions } from '../adapter/block-scroll-strategy-adapter';
 
 
 @Directive({ selector: '[nbPortal]' })
@@ -47,10 +46,7 @@ export class NbComponentPortal<T = any> extends ComponentPortal<T> {
 
 @Injectable()
 export class NbOverlay extends Overlay {
-}
-
-@Injectable()
-export class NbPlatform extends Platform {
+  scrollStrategies: NbScrollStrategyOptions;
 }
 
 @Injectable()
@@ -80,7 +76,6 @@ export type NbConnectedPosition = ConnectedPosition;
 export type NbConnectedOverlayPositionChange = ConnectedOverlayPositionChange;
 export type NbConnectionPositionPair = ConnectionPositionPair;
 export type NbOverlayConfig = OverlayConfig;
-export type NbScrollStrategyOptions = ScrollStrategyOptions;
 export type NbScrollStrategy = ScrollStrategy;
 
 const CDK_MODULES = [OverlayModule, PortalModule];
@@ -104,7 +99,6 @@ export class NbCdkMappingModule {
       ngModule: NbCdkMappingModule,
       providers: [
         NbOverlay,
-        NbPlatform,
         NbOverlayPositionBuilder,
       ],
     };

diff --git a/src/framework/theme/components/cdk/overlay/overlay-position.ts b/src/framework/theme/components/cdk/overlay/overlay-position.ts
@@ -11,9 +11,9 @@ import {
   NbFlexibleConnectedPositionStrategy,
   NbOverlayPositionBuilder,
   NbOverlayRef,
-  NbPlatform,
   NbPositionStrategy,
 } from './mapping';
+import { NbPlatform } from '../platform/platform-service';
 import { NbOverlayContainerAdapter } from '../adapter/overlay-container-adapter';
 import { NbViewportRulerAdapter } from '../adapter/viewport-ruler-adapter';
 import { NbGlobalLogicalPosition } from './position-helper';

diff --git a/src/framework/theme/components/cdk/overlay/overlay-service.ts b/src/framework/theme/components/cdk/overlay/overlay-service.ts
@@ -6,8 +6,8 @@ import {
   NbOverlay,
   NbOverlayConfig,
   NbOverlayRef,
-  NbScrollStrategyOptions,
 } from './mapping';
+import { NbScrollStrategyOptions } from '../adapter/block-scroll-strategy-adapter';
 import { NbLayoutDirectionService } from '../../../services/direction.service';
 
 

diff --git a/src/framework/theme/components/cdk/platform/platform-service.ts b/src/framework/theme/components/cdk/platform/platform-service.ts
@@ -1,3 +1,8 @@
 import { Platform } from '@angular/cdk/platform';
+import { Injectable } from '@angular/core';
 
+@Injectable({
+  providedIn: 'root',
+  useClass: Platform,
+})
 export class NbPlatform extends Platform {}
diff --git a/src/framework/theme/components/cdk/platform/platform.module.ts b/src/framework/theme/components/cdk/platform/platform.module.ts
diff --git a/src/framework/theme/components/cdk/table/table.module.ts b/src/framework/theme/components/cdk/table/table.module.ts
@@ -2,7 +2,6 @@ import { Attribute, ChangeDetectorRef, ElementRef, Inject, IterableDiffers, NgMo
 import { CdkTable, CdkTableModule } from '@angular/cdk/table';
 import { NbBidiModule } from '../bidi/bidi.module';
 import { NbDirectionality } from '../bidi/bidi-service';
-import { NbPlatformModule } from '../platform/platform.module';
 import { NbPlatform } from '../platform/platform-service';
 import { NB_DOCUMENT } from '../../../theme.options';
 import {
@@ -76,7 +75,7 @@ const COMPONENTS = [
 ];
 
 @NgModule({
-  imports: [ NbBidiModule, NbPlatformModule ],
+  imports: [ NbBidiModule ],
   declarations: [ ...COMPONENTS ],
   exports: [ ...COMPONENTS ],
 })

diff --git a/src/framework/theme/public_api.ts b/src/framework/theme/public_api.ts
@@ -135,6 +135,7 @@ export * from './components/cdk/overlay/mapping';
 export * from './components/cdk/overlay/position-helper';
 export * from './components/cdk/overlay/dynamic/dynamic-overlay';
 export * from './components/cdk/overlay/dynamic/dynamic-overlay-handler';
+export * from './components/cdk/platform/platform-service';
 export * from './components/cdk/a11y/a11y.module';
 export * from './components/cdk/a11y/focus-trap';
 export * from './components/cdk/adapter/adapter.module';
@@ -144,7 +145,6 @@ export * from './components/cdk/adapter/scroll-dispatcher-adapter';
 export * from './components/cdk/adapter/viewport-ruler-adapter';
 export * from './components/cdk/bidi/bidi-service';
 export * from './components/cdk/bidi/bidi.module';
-export * from './components/cdk/platform/platform.module';
 export * from './components/cdk/table/cell';
 export * from './components/cdk/table/data-source';
 export * from './components/cdk/table/row';