From 6301d827e1605b946f4921ecea64e377d53c0c05 Mon Sep 17 00:00:00 2001 From: Phil Kunz Date: Mon, 7 Dec 2020 03:30:59 +0000 Subject: [PATCH] fix(core): update --- package-lock.json | 37 +++++++++++++++++++------------------ package.json | 3 ++- ts/dees-element.plugins.ts | 8 ++++++++ ts/index.ts | 12 ++++++++++-- 4 files changed, 39 insertions(+), 21 deletions(-) diff --git a/package-lock.json b/package-lock.json index d70c3a4..fa93b5a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1119,17 +1119,18 @@ } }, "@designestate/dees-domtools": { - "version": "1.0.70", - "resolved": "https://verdaccio.lossless.one/@designestate%2fdees-domtools/-/dees-domtools-1.0.70.tgz", - "integrity": "sha512-kpppQycHqEA6UG5/Pf2WrbSNC5Pz9r88JfxbxyWSW2hHddreYmzHBJ3GM/n/7emPK8iDaW8AIhMapVMOVPQKfw==", + "version": "1.0.80", + "resolved": "https://verdaccio.lossless.one/@designestate%2fdees-domtools/-/dees-domtools-1.0.80.tgz", + "integrity": "sha512-Lm6BLL/F8YKLviO5XHNJbuxPdqh2FsJlHL0nMLVH95A5SzXnT071OW+Nj9CXLMpoFa+0RZGQz4fJK+P/AxPGNQ==", "requires": { "@apiglobal/typedrequest": "^1.0.54", "@designestate/dees-comms": "^1.0.7", "@pushrocks/lik": "^4.0.20", "@pushrocks/smartdelay": "^2.0.10", "@pushrocks/smartpromise": "^3.1.3", - "@pushrocks/smartrouter": "^1.0.4", - "@pushrocks/smartstate": "^1.0.17", + "@pushrocks/smartrouter": "^1.0.6", + "@pushrocks/smartrx": "^2.0.19", + "@pushrocks/smartstate": "^1.0.21", "@pushrocks/webrequest": "^2.0.13", "@pushrocks/websetup": "^3.0.11", "@pushrocks/webstore": "^1.0.16", @@ -1953,9 +1954,9 @@ } }, "@pushrocks/smartrouter": { - "version": "1.0.4", - "resolved": "https://verdaccio.lossless.one/@pushrocks%2fsmartrouter/-/smartrouter-1.0.4.tgz", - "integrity": "sha512-6ahtHvZvwH/IQh7EtachXJkHxfQZe3i/TqCxmzFdhppDTWek+v8E/fpHit0av/568tLmC6Jc2B+WHPge6whVhg==", + "version": "1.0.7", + "resolved": "https://verdaccio.lossless.one/@pushrocks%2fsmartrouter/-/smartrouter-1.0.7.tgz", + "integrity": "sha512-ns4ye4uyzjpFUDr/vciOZog4y5QDsFBxwnYmXkSMxCA7hwiL0Fn64lvCexjez05t6Gz54ge5yflWSvyv63X0kA==", "requires": { "path-to-regexp": "^6.1.0" }, @@ -2005,14 +2006,14 @@ } }, "@pushrocks/smartstate": { - "version": "1.0.17", - "resolved": "https://verdaccio.lossless.one/@pushrocks%2fsmartstate/-/smartstate-1.0.17.tgz", - "integrity": "sha512-lzcN6zeGXdDxG67cJPSgC2Of0Up7iQf7hKI0KMAxricYCQp514DJYdfrv82SAEoTqB4eG4bOVqq5M9IYkvEfZw==", + "version": "1.0.21", + "resolved": "https://verdaccio.lossless.one/@pushrocks%2fsmartstate/-/smartstate-1.0.21.tgz", + "integrity": "sha512-uyrnTrBoIP6Ka3pYAMZFZVZ4AOgFSTPgM5sURWMNogC5Fncx1A7PuDL5nE1oRJIZOl5U/kH3vq+/81gmPn4QbA==", "requires": { - "@pushrocks/lik": "^4.0.12", - "@pushrocks/smartpromise": "^3.0.6", - "@pushrocks/smartrx": "^2.0.15", - "rxjs": "^6.5.5" + "@pushrocks/lik": "^4.0.20", + "@pushrocks/smartpromise": "^3.1.3", + "@pushrocks/smartrx": "^2.0.19", + "rxjs": "^6.6.3" } }, "@pushrocks/smartstring": { @@ -6586,9 +6587,9 @@ "dev": true }, "idb": { - "version": "5.0.7", - "resolved": "https://verdaccio.lossless.one/idb/-/idb-5.0.7.tgz", - "integrity": "sha512-tXkkEtzOEolCKNLpxEvE5ctPqUhgTEi+wPWVWIWavl/Z0/NjSJx0o/79z4/etJWpEpVjhbQNZ7fvmp/UFv/Yog==" + "version": "5.0.8", + "resolved": "https://verdaccio.lossless.one/idb/-/idb-5.0.8.tgz", + "integrity": "sha512-K9xInRkVbT3ZsYimD2KVj6B4E93IBvOjEQTryu99WuuN7G+7x3SzA79+yubbX0QRN9V64Gi+L+ulG5QYTVydOg==" }, "ieee754": { "version": "1.2.1", diff --git a/package.json b/package.json index 4473cfe..72ceebe 100644 --- a/package.json +++ b/package.json @@ -21,7 +21,8 @@ "tslint-config-prettier": "^1.15.0" }, "dependencies": { - "@designestate/dees-domtools": "^1.0.70", + "@designestate/dees-domtools": "^1.0.80", + "@pushrocks/smartrx": "^2.0.19", "lit-element": "^2.4.0" }, "browserslist": [ diff --git a/ts/dees-element.plugins.ts b/ts/dees-element.plugins.ts index d84caf4..8ea0b94 100644 --- a/ts/dees-element.plugins.ts +++ b/ts/dees-element.plugins.ts @@ -1,3 +1,11 @@ +// pushrocks scope +import * as smartrx from '@pushrocks/smartrx'; + +export { + smartrx +}; + +// third party scope import { LitElement, property } from 'lit-element'; const litElement = { LitElement, diff --git a/ts/index.ts b/ts/index.ts index 7552db9..674b23c 100644 --- a/ts/index.ts +++ b/ts/index.ts @@ -15,13 +15,21 @@ export class DeesElement extends plugins.litElement.LitElement { public goBright: boolean = false; public domtoolsPromise = plugins.domtools.elementBasic.setup(this); + private themeSubscription: plugins.smartrx.rxjs.Subscription; + public connectedCallback() { super.connectedCallback(); - this.dispatchEvent(new CustomEvent('domtools-connected')); + this.domtoolsPromise.then(async (domtools) => { + this.themeSubscription = domtools.themeManager.themeObservable.subscribe(goBrightArg => { + this.goBright = goBrightArg; + }); + }); + this.dispatchEvent(new CustomEvent('deesElementConnected')); } public disconnectedCallback() { super.disconnectedCallback(); - this.dispatchEvent(new CustomEvent('domtools-disconnected')); + this.themeSubscription.unsubscribe(); + this.dispatchEvent(new CustomEvent('deesElementDisconnected')); } } \ No newline at end of file