1.0.99

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@designestate/dees-domtools",
-  "version": "1.0.89",
+  "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/tsbundle": "^1.0.80",
-    "@gitzone/tstest": "^1.0.52",
+    "@gitzone/tsbuild": "^2.1.28",
+    "@gitzone/tsbundle": "^1.0.88",
+    "@gitzone/tstest": "^1.0.60",
     "@pushrocks/tapbundle": "^3.2.14",
-    "@types/node": "^14.14.33",
+    "@types/node": "^16.11.9",
     "tslint": "^6.1.3",
     "tslint-config-prettier": "^1.15.0"
   },
   "dependencies": {
-    "@apiglobal/typedrequest": "^1.0.56",
-    "@designestate/dees-comms": "^1.0.9",
-    "@pushrocks/lik": "^4.0.20",
-    "@pushrocks/smartdelay": "^2.0.10",
-    "@pushrocks/smartpromise": "^3.1.3",
-    "@pushrocks/smartrouter": "^1.0.7",
+    "@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.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}
-      }
-    `;
-  } else if (
-    getEnvironment() === 'tablet' ||
-    getEnvironment() === 'phablet' ||
-    getEnvironment() === 'phone'
-  ) {
-    return `
-      @media (min-width: 0px) {
-        ${contentArg}
-      }
-    `;
-  }
+export const cssForPhablet = (cssArg: CSSResult) => {
+  return unsafeCSS(`
+    @container wccToolsViewport (min-width: ${phablet}px) {
+      ${cssArg.cssText}
+    }
+    @media (min-width: ${phablet}px) {
+      ${cssArg.cssText}
+    }
+  `);
 };
 
-export const cssForPhablet = (contentArg) => {
-  if (getEnvironment() === 'native' || getEnvironment() === 'desktop') {
-    return `
-      @media (max-width: ${phablet}px) {
-        ${contentArg}
-      }
-    `;
-  } 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}
-      }
-    `;
-  }
+export const cssForPhone = (cssArg: CSSResult) => {
+  return unsafeCSS(`
+    @container wccToolsViewport (min-width: ${phone}px) {
+      ${cssArg.cssText}
+    }
+    @media (min-width: ${phone}px) {
+      ${cssArg.cssText}
+    }
+  `);
 };

ts/domtools.classes.domtools.ts

@@ -80,7 +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/index.ts

@@ -15,4 +15,6 @@ import * as allPlugins from './domtools.plugins';
 export const plugins = {
   smartdelay: allPlugins.smartdelay,
   smartpromise: allPlugins.smartpromise,
+  SweetScroll: allPlugins.SweetScroll,
+  smartstate: allPlugins.smartstate
 };