Merge branch '0.6.0'

lVlyke · Jun 16, 2021 · 65bc339 · 65bc339
2 parents 6a62ad5 + 1be194a
commit 65bc339
Show file tree

Hide file tree

Showing 3 changed files with 1,522 additions and 833 deletions.
diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
   "$schema": "./node_modules/ng-packagr/package.schema.json",
   "name": "@lithiumjs/ngx-material-theming",
   "description": "Dynamic and customizable Angular Material theming made easy.",
-  "version": "0.5.0",
+  "version": "0.6.0",
   "license": "MIT",
   "private": false,
   "repository": "https://github.com/lVlyke/lithium-ngx-material-theming",
@@ -33,35 +33,35 @@
     "build:js": "node ./scripts/build.js"
   },
   "peerDependencies": {
-    "@angular/cdk": ">=6.0.0 <10.0.0",
-    "@angular/common": ">=6.0.0 <10.0.0",
-    "@angular/core": ">=6.0.0 <10.0.0",
-    "@angular/material": ">=6.0.0 <10.0.0",
-    "@lithiumjs/angular": ">=3.0.0",
+    "@angular/cdk": ">=6.0.0 <12.0.0",
+    "@angular/common": ">=6.0.0 <12.0.0",
+    "@angular/core": ">=6.0.0 <12.0.0",
+    "@angular/material": ">=6.0.0 <12.0.0",
+    "@lithiumjs/angular": ">=5.0.0",
     "rxjs": "6.x.x"
   },
   "devDependencies": {
-    "@angular/animations": "9.0.0",
-    "@angular/cdk": "9.0.0",
-    "@angular/common": "9.0.0",
-    "@angular/compiler": "9.0.0",
-    "@angular/compiler-cli": "9.0.0",
-    "@angular/core": "9.0.0",
-    "@angular/forms": "9.0.0",
-    "@angular/material": "9.0.0",
-    "@angular/platform-browser": "9.0.0",
-    "@lithiumjs/angular": "5.1.0",
-    "@lithiumjs/ngx-material-theming-templates": "0.5.0",
+    "@angular/animations": "^11.0.0",
+    "@angular/cdk": "^11.0.0",
+    "@angular/common": "^11.0.0",
+    "@angular/compiler": "^11.0.0",
+    "@angular/compiler-cli": "^11.0.0",
+    "@angular/core": "^11.0.0",
+    "@angular/forms": "^11.0.0",
+    "@angular/material": "^11.0.0",
+    "@angular/platform-browser": "^11.0.0",
+    "@lithiumjs/angular": "^6.0.0",
+    "@lithiumjs/ngx-material-theming-templates": "0.6.0",
     "@types/chroma-js": "^1.4.0",
     "@types/node": "^10.12.9",
     "chroma-js": "^2.0.0",
     "fs-extra": "^7.0.1",
-    "ng-packagr": "^9.0.0",
+    "ng-packagr": "^11.0.0",
     "rxjs": "^6.5.3",
     "sass": "^1.22.12",
-    "tslib": "^1.10.0",
-    "typescript": "~3.7.4",
-    "zone.js": "^0.10.2"
+    "tslib": "^2.0.0",
+    "typescript": "~4.0.2",
+    "zone.js": "^0.10.3"
   },
   "dependencies": {},
   "ngPackage": {

diff --git a/src/directives/theme-container.directive.ts b/src/directives/theme-container.directive.ts
@@ -22,20 +22,29 @@ export class ThemeContainer extends LiComponent {
     private readonly onDestroy$: Observable<void>;
 
     @Input("theme")
-    @StateEmitter({ initialValue: DEFAULT_THEME_NAME })
+    public theme: string;
+
+    @StateEmitter({ propertyName: "theme", initialValue: DEFAULT_THEME_NAME })
     public readonly theme$: Subject<string>;
 
     /** @deprecated `disabled` has been deprecated in favor of the `active` input parameter. */
     @Input("disabled")
-    @StateEmitter({ initialValue: false, writeOnly: true })
+    public disabled: boolean;
+
+    /** @deprecated `disabled$` has been deprecated in favor of the `active$` input parameter. */
+    @StateEmitter({ propertyName: "disabled", initialValue: false, writeOnly: true })
     public readonly disabled$: Subject<boolean>;
 
     @Input("active")
-    @StateEmitter({ initialValue: true })
+    public active: boolean;
+
+    @StateEmitter({ propertyName: "active", initialValue: true })
     public readonly active$: Subject<boolean>;
 
     @Input("manageOverlay")
-    @StateEmitter({ writeOnly: true })
+    public manageOverlay: boolean;
+
+    @StateEmitter({ propertyName: "manageOverlay", writeOnly: true })
     public readonly manageOverlay$: Subject<boolean>;
 
     constructor(