1.0.99

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@designestate/dees-domtools",
-  "version": "1.0.78",
+  "version": "1.0.99",
   "private": false,
   "description": "tools to simplify complex css structures",
   "main": "dist_ts/index.js",
@@ -13,26 +13,27 @@
     "format": "(gitzone format)"
   },
   "devDependencies": {
-    "@gitzone/tsbuild": "^2.1.25",
-    "@gitzone/tsbundle": "^1.0.78",
-    "@gitzone/tstest": "^1.0.52",
-    "@pushrocks/tapbundle": "^3.2.9",
-    "@types/node": "^14.14.10",
+    "@gitzone/tsbuild": "^2.1.28",
+    "@gitzone/tsbundle": "^1.0.88",
+    "@gitzone/tstest": "^1.0.60",
+    "@pushrocks/tapbundle": "^3.2.14",
+    "@types/node": "^16.11.9",
     "tslint": "^6.1.3",
     "tslint-config-prettier": "^1.15.0"
   },
   "dependencies": {
-    "@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.6",
+    "@apiglobal/typedrequest": "^1.0.65",
+    "@designestate/dees-comms": "^1.0.11",
+    "@pushrocks/lik": "^5.0.0",
+    "@pushrocks/smartdelay": "^2.0.13",
+    "@pushrocks/smartpromise": "^3.1.6",
+    "@pushrocks/smartrouter": "^1.0.11",
+    "@pushrocks/smartrx": "^2.0.19",
     "@pushrocks/smartstate": "^1.0.21",
     "@pushrocks/webrequest": "^2.0.13",
-    "@pushrocks/websetup": "^3.0.11",
+    "@pushrocks/websetup": "^3.0.15",
     "@pushrocks/webstore": "^1.0.16",
-    "lit-element": "^2.4.0",
+    "lit-element": "^3.0.2",
     "sweet-scroll": "^4.0.0"
   },
   "files": [

ts/domtools.breakpoints.ts

@@ -1,5 +1,7 @@
 import { DomTools } from './domtools.classes.domtools';
 
+import { CSSResult, unsafeCSS } from 'lit-element';
+
 export const desktop = 1240;
 export const tablet = 1024;
 export const phablet = 600;
@@ -7,65 +9,35 @@ export const phone = 400;
 
 export type TViewport = 'native' | 'desktop' | 'tablet' | 'phablet' | 'phone';
 
-export const getEnvironment = (): TViewport => {
-  if (
-    globalThis.deesDomTools &&
-    globalThis.deesDomTools.domToolsStatePart.getState().virtualViewport
-  ) {
-    return globalThis.deesDomTools.domToolsStatePart.getState().virtualViewport;
-  } else {
-    return 'native';
+export const cssForTablet = (cssArg: CSSResult) => {
+  return unsafeCSS(`
+    @container wccToolsViewport (min-width: ${tablet}px) {
+      ${cssArg.cssText}
     }
+    @media (min-width: ${tablet}px) {
+      ${cssArg.cssText}
+    }
+  `);
 };
 
-export const cssForTablet = (contentArg) => {
-  if (getEnvironment() === 'native' || getEnvironment() === 'desktop') {
-    return `
-      @media (max-width: ${tablet}px) {
-        ${contentArg}
+export const cssForPhablet = (cssArg: CSSResult) => {
+  return unsafeCSS(`
+    @container wccToolsViewport (min-width: ${phablet}px) {
+      ${cssArg.cssText}
     }
-    `;
-  } else if (
-    getEnvironment() === 'tablet' ||
-    getEnvironment() === 'phablet' ||
-    getEnvironment() === 'phone'
-  ) {
-    return `
-      @media (min-width: 0px) {
-        ${contentArg}
-      }
-    `;
+    @media (min-width: ${phablet}px) {
+      ${cssArg.cssText}
     }
+  `);
 };
 
-export const cssForPhablet = (contentArg) => {
-  if (getEnvironment() === 'native' || getEnvironment() === 'desktop') {
-    return `
-      @media (max-width: ${phablet}px) {
-        ${contentArg}
+export const cssForPhone = (cssArg: CSSResult) => {
+  return unsafeCSS(`
+    @container wccToolsViewport (min-width: ${phone}px) {
+      ${cssArg.cssText}
     }
-    `;
-  } else if (getEnvironment() === 'phablet' || getEnvironment() === 'phone') {
-    return `
-      @media (min-width: 0px) {
-        ${contentArg}
-      }
-    `;
-  }
-};
-
-export const cssForPhone = (contentArg) => {
-  if (getEnvironment() === 'native' || getEnvironment() === 'desktop') {
-    return `
-      @media (max-width: ${phone}px) {
-        ${contentArg}
-      }
-    `;
-  } else if (getEnvironment() === 'phone') {
-    return `
-      @media (min-width: 0px) {
-        ${contentArg}
-      }
-    `;
+    @media (min-width: ${phone}px) {
+      ${cssArg.cssText}
     }
+  `);
 };

ts/domtools.classes.domtools.ts

@@ -4,9 +4,7 @@ import { FastMap } from '@pushrocks/lik/dist_ts/lik.fastmap';
 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 {
@@ -82,18 +80,17 @@ export class DomTools {
   });
 
   public convenience = {
+    typedrequest: plugins.typedrequest,
     smartdelay: plugins.smartdelay,
   };
 
-  
-  public elementInstrumenter = new ElementInstrumenter();
   public deesComms = new plugins.deesComms.DeesComms();
   public scroller = new plugins.SweetScroll({
     /* some options */
   }); // TODO: switch to scroller class
   public themeManager = new ThemeManager(this);
 
-  private actionSetVirtualViewport = this.domToolsStatePart.createAction<TViewport>(
+  /* private actionSetVirtualViewport = this.domToolsStatePart.createAction<TViewport>(
     async (statePart, payload) => {
       const currentState = statePart.getState();
       currentState.virtualViewport = payload;
@@ -101,6 +98,10 @@ export class DomTools {
     }
   );
 
+  public setVirtualViewport(environmentArg: TViewport) {
+    this.domToolsStatePart.dispatchAction(this.actionSetVirtualViewport, environmentArg);
+  } */
+
   public domToolsReady = plugins.smartpromise.defer();
   public domReady = plugins.smartpromise.defer();
   public globalStylesReady = plugins.smartpromise.defer();
@@ -151,9 +152,7 @@ export class DomTools {
     document.head.append(cssTag);
   }
 
-  public setVirtualViewport(environmentArg: TViewport) {
-    this.domToolsStatePart.dispatchAction(this.actionSetVirtualViewport, environmentArg);
-  }
+  
 
   public async setWebsiteInfo(optionsArg: plugins.websetup.IWebSetupConstructorOptions) {
     await this.websetup.setup(optionsArg);

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

@@ -8,34 +8,25 @@ export class ThemeManager {
   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;
 
-    // lets take care of elements being added that need to know of the current theme
-    this.domtoolsRef.elementInstrumenter.connectedElements.eventSubject.subscribe(async eventData => {
-      await this.setThemeStatusForElement(eventData.payload, this.goBrightBoolean);
-    });
-
     // lets care
     this.goBrightBoolean = this.preferredColorSchemeMediaMatch.matches;
-    this.preferredColorSchemeMediaMatch.addEventListener('change', eventArg => {
+    this.preferredColorSchemeMediaMatch.addEventListener('change', (eventArg) => {
       this.goBrightBoolean = eventArg.matches;
       this.updateAllConnectedElements();
     });
-  }
-
-  private async setThemeStatusForElement (elementArg: LitElement, goBrightBool: boolean) {
-    const goBright = (elementArg as any).goBright;
-    if (typeof goBright === 'boolean') {
-      (elementArg as any).goBright = goBrightBool;
-    }
+    this.updateAllConnectedElements();
   }
 
   private async updateAllConnectedElements() {
+    if (document.body && document.body.style) {
       document.body.style.background = this.goBrightBoolean ? '#fff' : '#000';
-    this.domtoolsRef.elementInstrumenter.forEachelement(async elementArg => {
-      await this.setThemeStatusForElement(elementArg, this.goBrightBoolean);
-    });
+    }
+    this.themeObservable.next(this.goBrightBoolean);
   }
 
   public goBright() {

ts/domtools.css.theme.ts

@@ -4,7 +4,9 @@ import { DomTools } from './domtools.classes.domtools';
  * changes scrollbar styles to be consistent across OS borders
  */
 export const scrollBarStyles = (() => {
-  const returnStyles = navigator.userAgent.indexOf("Windows") !== -1 ? `
+  const returnStyles =
+    navigator.userAgent.indexOf('Windows') !== -1
+      ? `
   /* width */
   ::-webkit-scrollbar {
     width: 8px;
@@ -24,5 +26,6 @@ export const scrollBarStyles = (() => {
   ::-webkit-scrollbar-thumb:hover {
     background: #777; 
   }
-` : ``;
+`
+      : ``;
 })();

ts/domtools.elementbasic.ts

@@ -2,7 +2,20 @@ import * as plugins from './domtools.plugins';
 import { DomTools } from './domtools.classes.domtools';
 import { scrollBarStyles } from './domtools.css.theme';
 
-import { html, LitElement } from 'lit-element';
+import { html, LitElement, css, unsafeCSS } from 'lit-element';
+
+export const staticStyles = css`
+  * {
+    transition: background 0.1s, color 0.1s;
+    box-sizing: border-box;
+  }
+
+  :host {
+    font-family: 'Roboto', sans-serif;
+  }
+
+  ${unsafeCSS(scrollBarStyles)}
+`;
 
 /**
  * styles to be included in every webcomponent
@@ -11,10 +24,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 +43,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 () => {
@@ -56,9 +73,6 @@ export const setup = async (elementArg?: LitElement): Promise<DomTools> => {
       @import url('https://fonts.googleapis.com/css2?family=Roboto+Mono:wght@100;300;400');
     `);
 
-    // font awesome brands
-    domTools.setExternalCss('https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.15.1/css/brands.min.css');
-
     // scrollbars
     domTools.setGlobalStyles(`
       ${scrollBarStyles}

ts/domtools.plugins.ts

@@ -1,9 +1,7 @@
 // designestate scope
 import * as deesComms from '@designestate/dees-comms';
 
-export {
-  deesComms
-};
+export { deesComms };
 
 // apiglobal scope
 import * as typedrequest from '@apiglobal/typedrequest';
@@ -14,6 +12,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';
@@ -22,10 +21,20 @@ import * as webstore from '@pushrocks/webstore';
 // subscope lik
 import { ObjectMap } from '@pushrocks/lik/dist_ts/lik.objectmap';
 const lik = {
-  ObjectMap
+  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,9 +7,14 @@ 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';
+export { rxjs } from '@pushrocks/smartrx';
 
 import * as allPlugins from './domtools.plugins';
 
 export const plugins = {
+  smartdelay: allPlugins.smartdelay,
   smartpromise: allPlugins.smartpromise,
+  SweetScroll: allPlugins.SweetScroll,
+  smartstate: allPlugins.smartstate
 };