fix(module: locale-provider): make locale-provider available cross mo…

…dules; (NG-ZORRO#113)
fisherspy · Nov 19, 2018 · e09f0a3 · e09f0a3
1 parent 722ee27
commit e09f0a3
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 3 deletions.
diff --git a/components/locale-provider/locale-provider.module.ts b/components/locale-provider/locale-provider.module.ts
@@ -2,12 +2,12 @@ import { NgModule } from '@angular/core';
 import zh_CN from './languages/zh_CN';
 import { LocaleProviderPipe } from './locale-provider.pipe';
 import { LOCAL_PROVIDER_TOKEN } from './locale-provider.token';
-import { LocaleProviderService } from './locale-provider.service';
+import { LOCALE_PROVIDER_SERVICE_PROVIDER } from './locale-provider.service';
 
 @NgModule({
   imports: [],
   declarations: [LocaleProviderPipe],
   exports: [LocaleProviderPipe],
-  providers: [{ provide: LOCAL_PROVIDER_TOKEN, useValue: zh_CN }, LocaleProviderService]
+  providers: [{ provide: LOCAL_PROVIDER_TOKEN, useValue: zh_CN }, LOCALE_PROVIDER_SERVICE_PROVIDER]
 })
 export class LocaleProviderModule {}
diff --git a/components/locale-provider/locale-provider.service.ts b/components/locale-provider/locale-provider.service.ts
@@ -1,4 +1,4 @@
-import { Inject, Injectable } from '@angular/core';
+import { Inject, Injectable, Provider, Optional, SkipSelf } from '@angular/core';
 import { LOCAL_PROVIDER_TOKEN } from './locale-provider.token';
 import { BehaviorSubject, Observable } from 'rxjs';
 import zh_CN from './languages/zh_CN';
@@ -59,3 +59,13 @@ export class LocaleProviderService {
     return index === depth ? res : null;
   }
 }
+
+export function LOCALE_PROVIDER_SERVICE_FACTORY(exist: LocaleProviderService, locale: any): LocaleProviderService {
+  return exist || new LocaleProviderService(locale);
+}
+
+export const LOCALE_PROVIDER_SERVICE_PROVIDER: Provider = {
+  provide   : LocaleProviderService,
+  useFactory: LOCALE_PROVIDER_SERVICE_FACTORY,
+  deps      : [ [ new Optional(), new SkipSelf(), LocaleProviderService ], LOCAL_PROVIDER_TOKEN]
+};