1.0.99

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@designestate/dees-domtools",
-  "version": "1.0.85",
+  "version": "1.0.99",
   "private": false,
   "description": "tools to simplify complex css structures",
   "main": "dist_ts/index.js",
@@ -13,27 +13,27 @@
     "format": "(gitzone format)"
   },
   "devDependencies": {
-    "@gitzone/tsbuild": "^2.1.25",
+    "@gitzone/tsbuild": "^2.1.28",
-    "@gitzone/tsbundle": "^1.0.78",
+    "@gitzone/tsbundle": "^1.0.88",
-    "@gitzone/tstest": "^1.0.52",
+    "@gitzone/tstest": "^1.0.60",
-    "@pushrocks/tapbundle": "^3.2.9",
+    "@pushrocks/tapbundle": "^3.2.14",
-    "@types/node": "^14.14.10",
+    "@types/node": "^16.11.9",
     "tslint": "^6.1.3",
     "tslint-config-prettier": "^1.15.0"
   },
   "dependencies": {
-    "@apiglobal/typedrequest": "^1.0.54",
+    "@apiglobal/typedrequest": "^1.0.65",
-    "@designestate/dees-comms": "^1.0.7",
+    "@designestate/dees-comms": "^1.0.11",
-    "@pushrocks/lik": "^4.0.20",
+    "@pushrocks/lik": "^5.0.0",
-    "@pushrocks/smartdelay": "^2.0.10",
+    "@pushrocks/smartdelay": "^2.0.13",
-    "@pushrocks/smartpromise": "^3.1.3",
+    "@pushrocks/smartpromise": "^3.1.6",
-    "@pushrocks/smartrouter": "^1.0.7",
+    "@pushrocks/smartrouter": "^1.0.11",
     "@pushrocks/smartrx": "^2.0.19",
     "@pushrocks/smartstate": "^1.0.21",
     "@pushrocks/webrequest": "^2.0.13",
-    "@pushrocks/websetup": "^3.0.13",
+    "@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 => {
+export const cssForTablet = (cssArg: CSSResult) => {
-  if (
+  return unsafeCSS(`
-    globalThis.deesDomTools &&
+    @container wccToolsViewport (min-width: ${tablet}px) {
-    globalThis.deesDomTools.domToolsStatePart.getState().virtualViewport
+      ${cssArg.cssText}
-  ) {
+    }
-    return globalThis.deesDomTools.domToolsStatePart.getState().virtualViewport;
+    @media (min-width: ${tablet}px) {
-  } else {
+      ${cssArg.cssText}
-    return 'native';
+    }
-  }
+  `);
 };
 
-export const cssForTablet = (contentArg) => {
+export const cssForPhablet = (cssArg: CSSResult) => {
-  if (getEnvironment() === 'native' || getEnvironment() === 'desktop') {
+  return unsafeCSS(`
-    return `
+    @container wccToolsViewport (min-width: ${phablet}px) {
-      @media (max-width: ${tablet}px) {
+      ${cssArg.cssText}
-        ${contentArg}
+    }
-      }
+    @media (min-width: ${phablet}px) {
-    `;
+      ${cssArg.cssText}
-  } else if (
+    }
-    getEnvironment() === 'tablet' ||
+  `);
-    getEnvironment() === 'phablet' ||
-    getEnvironment() === 'phone'
-  ) {
-    return `
-      @media (min-width: 0px) {
-        ${contentArg}
-      }
-    `;
-  }
 };
 
-export const cssForPhablet = (contentArg) => {
+export const cssForPhone = (cssArg: CSSResult) => {
-  if (getEnvironment() === 'native' || getEnvironment() === 'desktop') {
+  return unsafeCSS(`
-    return `
+    @container wccToolsViewport (min-width: ${phone}px) {
-      @media (max-width: ${phablet}px) {
+      ${cssArg.cssText}
-        ${contentArg}
+    }
-      }
+    @media (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}
-      }
-    `;
-  }
 };

ts/domtools.classes.domtools.ts

@@ -4,7 +4,6 @@ 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 { ThemeManager } from './domtools.classes.thememanager';
 
@@ -81,6 +80,7 @@ export class DomTools {
   });
 
   public convenience = {
+    typedrequest: plugins.typedrequest,
     smartdelay: plugins.smartdelay,
   };
 
@@ -90,7 +90,7 @@ export class DomTools {
   }); // 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;
@@ -98,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();
@@ -148,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.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

ts/domtools.plugins.ts

@@ -1,9 +1,7 @@
 // designestate scope
 import * as deesComms from '@designestate/dees-comms';
 
-export {
+export { deesComms };
-  deesComms
-};
 
 // apiglobal scope
 import * as typedrequest from '@apiglobal/typedrequest';
@@ -21,12 +19,22 @@ import * as websetup from '@pushrocks/websetup';
 import * as webstore from '@pushrocks/webstore';
 
 // subscope lik
-import { ObjectMap } from '@pushrocks/lik/dist_ts/lik.objectmap';  
+import { ObjectMap } from '@pushrocks/lik/dist_ts/lik.objectmap';
 const lik = {
-  ObjectMap
+  ObjectMap,
 };
 
-export { lik, smartdelay, smartpromise, smartrouter, smartrx, 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

@@ -8,9 +8,13 @@ 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
 };