1.0.85

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@designestate/dees-domtools",
-  "version": "1.0.73",
+  "version": "1.0.85",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -1949,9 +1949,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"
       }
@@ -1991,34 +1991,22 @@
       }
     },
     "@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"
       },
       "dependencies": {
-        "@pushrocks/smartrx": {
-          "version": "2.0.18",
-          "resolved": "https://verdaccio.lossless.one/@pushrocks%2fsmartrx/-/smartrx-2.0.18.tgz",
-          "integrity": "sha512-DqUmtS7mONO6bvWEZmSLy4M9hlxNWysMYc7XOZLr50BMaa0HUNYWI1myUFCMNcbUUOxuQNig01XqR1smfIN69g==",
+        "rxjs": {
+          "version": "6.6.3",
+          "resolved": "https://verdaccio.lossless.one/rxjs/-/rxjs-6.6.3.tgz",
+          "integrity": "sha512-trsQc+xYYXZ3urjOiJOuCOa5N3jAZ3eiSpQB5hIT8zGlL2QfnHLJ2r7GMkBGuIausdJN1OneaI6gQlsqNHHmZQ==",
           "requires": {
-            "@pushrocks/lik": "^4.0.14",
-            "@pushrocks/smartpromise": "^3.0.6",
-            "rxjs": "^6.6.0"
-          },
-          "dependencies": {
-            "rxjs": {
-              "version": "6.6.0",
-              "resolved": "https://verdaccio.lossless.one/rxjs/-/rxjs-6.6.0.tgz",
-              "integrity": "sha512-3HMA8z/Oz61DUHe+SdOiQyzIf4tOx5oQHmMir7IZEu6TMqCLHT4LRcmNaUS0NwOz8VLvmmBduMsoaUvMaIiqzg==",
-              "requires": {
-                "tslib": "^1.9.0"
-              }
-            }
+            "tslib": "^1.9.0"
           }
         }
       }
@@ -2146,9 +2134,9 @@
       }
     },
     "@pushrocks/websetup": {
-      "version": "3.0.11",
-      "resolved": "https://verdaccio.lossless.one/@pushrocks%2fwebsetup/-/websetup-3.0.11.tgz",
-      "integrity": "sha512-5nQqrQSiP5/WUv5pLsmjYAkfGosi2DqEH1mNrliOTr6iA8syGQ7bOQk4JY7jApjk64wO5L7l8qBGvKJuZ+p9Dw==",
+      "version": "3.0.13",
+      "resolved": "https://verdaccio.lossless.one/@pushrocks%2fwebsetup/-/websetup-3.0.13.tgz",
+      "integrity": "sha512-H2v0vaMfh7s/r7gVgSvdOXJHfuPW5TvZ1ZjEH3YpNIp21kR1W8VFn+Vr5wdCcZ5jf2zqfdu0FFUS257f3lfIIA==",
       "requires": {
         "@pushrocks/smartdelay": "^2.0.10",
         "@pushrocks/smartpromise": "^3.1.3",
@@ -2458,9 +2446,9 @@
       "integrity": "sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA=="
     },
     "@types/node": {
-      "version": "14.14.9",
-      "resolved": "https://verdaccio.lossless.one/@types%2fnode/-/node-14.14.9.tgz",
-      "integrity": "sha512-JsoLXFppG62tWTklIoO4knA+oDTYsmqWxHRvd4lpmfQRNhX6osheUOWETP2jMoV/2bEHuMra8Pp3Dmo/stBFcw=="
+      "version": "14.14.10",
+      "resolved": "https://verdaccio.lossless.one/@types%2fnode/-/node-14.14.10.tgz",
+      "integrity": "sha512-J32dgx2hw8vXrSbu4ZlVhn1Nm3GbeCFNw2FWL8S5QKucHGY0cyNwjdQdO+KMBZ4wpmC7KhLCiNsdk1RFRIYUQQ=="
     },
     "@types/parcel-bundler": {
       "version": "1.12.1",
@@ -8425,9 +8413,9 @@
       "dev": true
     },
     "path-to-regexp": {
-      "version": "6.1.0",
-      "resolved": "https://verdaccio.lossless.one/path-to-regexp/-/path-to-regexp-6.1.0.tgz",
-      "integrity": "sha512-h9DqehX3zZZDCEm+xbfU0ZmwCGFCAAraPJWMXJ4+v32NjZJilVg3k1TcKsRgIb8IQ/izZSaydDc1OhJCZvs2Dw=="
+      "version": "6.2.0",
+      "resolved": "https://verdaccio.lossless.one/path-to-regexp/-/path-to-regexp-6.2.0.tgz",
+      "integrity": "sha512-f66KywYG6+43afgE/8j/GoiNyygk/bnoCbps++3ErRKsIYkGGupyv07R2Ok5m9i67Iqc+T2g1eAUGUPzWhYTyg=="
     },
     "pathval": {
       "version": "1.1.0",
@@ -9741,6 +9729,7 @@
       "version": "6.5.5",
       "resolved": "https://verdaccio.lossless.one/rxjs/-/rxjs-6.5.5.tgz",
       "integrity": "sha512-WfQI+1gohdf0Dai/Bbmk5L5ItH5tYqm3ki2c5GdWhKjalzjg93N3avFjVStyZZz+A2Em+ZxKH5bNghw9UeylGQ==",
+      "dev": true,
       "requires": {
         "tslib": "^1.9.0"
       }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@designestate/dees-domtools",
-  "version": "1.0.73",
+  "version": "1.0.85",
   "private": false,
   "description": "tools to simplify complex css structures",
   "main": "dist_ts/index.js",
@@ -17,7 +17,7 @@
     "@gitzone/tsbundle": "^1.0.78",
     "@gitzone/tstest": "^1.0.52",
     "@pushrocks/tapbundle": "^3.2.9",
-    "@types/node": "^14.14.9",
+    "@types/node": "^14.14.10",
     "tslint": "^6.1.3",
     "tslint-config-prettier": "^1.15.0"
   },
@@ -27,10 +27,11 @@
     "@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.7",
+    "@pushrocks/smartrx": "^2.0.19",
+    "@pushrocks/smartstate": "^1.0.21",
     "@pushrocks/webrequest": "^2.0.13",
-    "@pushrocks/websetup": "^3.0.11",
+    "@pushrocks/websetup": "^3.0.13",
     "@pushrocks/webstore": "^1.0.16",
     "lit-element": "^2.4.0",
     "sweet-scroll": "^4.0.0"

ts/domtools.classes.domtools.ts

@@ -6,7 +6,6 @@ import { TViewport } from './domtools.breakpoints';
 import { Scroller } from './domtools.classes.scroller';
 import { delayForRandom } from '@pushrocks/smartdelay';
 import { WebSetup } from '@pushrocks/websetup';
-import { ElementInstrumenter } from './domtools.classes.elementinstrumenter';
 import { ThemeManager } from './domtools.classes.thememanager';
 
 export interface IDomToolsState {
@@ -85,8 +84,6 @@ export class DomTools {
     smartdelay: plugins.smartdelay,
   };
 
-  
-  public elementInstrumenter = new ElementInstrumenter();
   public deesComms = new plugins.deesComms.DeesComms();
   public scroller = new plugins.SweetScroll({
     /* some options */
@@ -143,6 +140,14 @@ export class DomTools {
     this.elements.headElement.appendChild(styleElement);
   }
 
+  public async setExternalCss(cssLinkArg: string) {
+    const cssTag = document.createElement('link');
+    cssTag.rel = 'stylesheet';
+    cssTag.crossOrigin = 'anonymous';
+    cssTag.href = cssLinkArg;
+    document.head.append(cssTag);
+  }
+
   public setVirtualViewport(environmentArg: TViewport) {
     this.domToolsStatePart.dispatchAction(this.actionSetVirtualViewport, environmentArg);
   }

ts/domtools.classes.elementinstrumenter.ts

@@ -1,29 +0,0 @@
-import * as plugins from './domtools.plugins';
-import { LitElement } from 'lit-element';
-
-export class ElementInstrumenter {
-  connectedElements = new plugins.lik.ObjectMap<LitElement>();
-
-  public instrumentElement(elementArg: LitElement) {
-    const addToConnectedElementsFunc = (eventArg: CustomEvent) => {
-      this.connectedElements.add(elementArg);
-    };
-    const removeFromConnectedElementsFunc = eventArg => {
-      this.connectedElements.remove(elementArg);
-      elementArg.removeEventListener('domtools-connected', addToConnectedElementsFunc);
-      elementArg.removeEventListener('domtools-disconnected', removeFromConnectedElementsFunc);
-    };
-    elementArg.addEventListener('domtools-connected', addToConnectedElementsFunc);
-    elementArg.addEventListener('domtools-disconnected', removeFromConnectedElementsFunc);
-
-    if (elementArg.parentElement) {
-      this.connectedElements.add(elementArg); 
-    }
-  }
-
-  public async forEachelement(eachFuncArg: (elementArg: LitElement) => Promise<void>) {
-    for (const elementArg of this.connectedElements.getArray()) {
-      await eachFuncArg(elementArg);
-    }
-  }
-}

ts/domtools.classes.thememanager.ts

@@ -6,25 +6,27 @@ export class ThemeManager {
   public domtoolsRef: DomTools;
 
   public goBrightBoolean = false;
+  public preferredColorSchemeMediaMatch = window.matchMedia('(prefers-color-scheme: light)');
+
+  public themeObservable = new plugins.smartrx.rxjs.ReplaySubject<boolean>(1);
 
   constructor(domtoolsRefArg: DomTools) {
     this.domtoolsRef = domtoolsRefArg;
-    this.domtoolsRef.elementInstrumenter.connectedElements.eventSubject.subscribe(async eventData => {
-      await this.setThemeStatusForElement(eventData.payload, this.goBrightBoolean);
-    });
-  }
 
-  private async setThemeStatusForElement (elementArg: LitElement, goBrightBool: boolean) {
-    const goBright = (elementArg as any).goBright;
-    if (typeof goBright === 'boolean') {
-      (elementArg as any).goBright = goBrightBool;
-    }
+    // lets care
+    this.goBrightBoolean = this.preferredColorSchemeMediaMatch.matches;
+    this.preferredColorSchemeMediaMatch.addEventListener('change', (eventArg) => {
+      this.goBrightBoolean = eventArg.matches;
+      this.updateAllConnectedElements();
+    });
+    this.updateAllConnectedElements();
   }
 
   private async updateAllConnectedElements() {
-    this.domtoolsRef.elementInstrumenter.forEachelement(async elementArg => {
-      await this.setThemeStatusForElement(elementArg, this.goBrightBoolean);
-    });
+    if (document.body && document.body.style) {
+      document.body.style.background = this.goBrightBoolean ? '#fff' : '#000';
+    }
+    this.themeObservable.next(this.goBrightBoolean);
   }
 
   public goBright() {

ts/domtools.elementbasic.ts

@@ -11,10 +11,13 @@ export const styles = html`
   <style>
     * {
       transition: background 0.1s, color 0.1s;
-      font-family: 'Roboto', sans-serif;
       box-sizing: border-box;
     }
 
+    :host {
+      font-family: 'Roboto', sans-serif;
+    }
+
     ${scrollBarStyles}
   </style>
 `;
@@ -27,7 +30,8 @@ export const setup = async (elementArg?: LitElement): Promise<DomTools> => {
   const domTools = await DomTools.setupDomTools();
 
   if (elementArg) {
-    domTools.elementInstrumenter.instrumentElement(elementArg);
+    // lets do something with the element
+    // not used right now
   }
 
   domTools.runOnce('elementBasicSetup', async () => {

ts/domtools.plugins.ts

@@ -14,6 +14,7 @@ export { typedrequest };
 import * as smartdelay from '@pushrocks/smartdelay';
 import * as smartpromise from '@pushrocks/smartpromise';
 import * as smartrouter from '@pushrocks/smartrouter';
+import * as smartrx from '@pushrocks/smartrx';
 import * as smartstate from '@pushrocks/smartstate';
 import * as webrequest from '@pushrocks/webrequest';
 import * as websetup from '@pushrocks/websetup';
@@ -25,7 +26,7 @@ const lik = {
   ObjectMap
 };
 
-export { lik, smartdelay, smartpromise, smartrouter, smartstate, webrequest, websetup, webstore };
+export { lik, smartdelay, smartpromise, smartrouter, smartrx, smartstate, webrequest, websetup, webstore };
 
 // third party scope
 import SweetScroll from 'sweet-scroll';

ts/index.ts

@@ -7,6 +7,7 @@ import * as css from './domtools.css';
 export { css, breakpoints, elementBasic };
 export { DomTools } from './domtools.classes.domtools';
 export { TypedRequest } from '@apiglobal/typedrequest';
+export { IWebSetupConstructorOptions } from '@pushrocks/websetup';
 
 import * as allPlugins from './domtools.plugins';