From 05a22599b8a73410dc709408a8bbc39dd637713e Mon Sep 17 00:00:00 2001 From: Phil Kunz Date: Wed, 3 Jun 2020 09:07:31 +0000 Subject: [PATCH] fix(core): update --- package-lock.json | 5 +++++ package.json | 3 ++- ts/domtools.breakpoints.ts | 4 ++-- ts/domtools.classes.domtools.ts | 34 +++++++++++++++++++++++---------- ts/domtools.classes.router.ts | 1 - ts/domtools.move.ts | 1 + 6 files changed, 34 insertions(+), 14 deletions(-) delete mode 100644 ts/domtools.classes.router.ts create mode 100644 ts/domtools.move.ts diff --git a/package-lock.json b/package-lock.json index a6c9b06..55391aa 100644 --- a/package-lock.json +++ b/package-lock.json @@ -3169,6 +3169,11 @@ "has-flag": "^3.0.0" } }, + "sweet-scroll": { + "version": "4.0.0", + "resolved": "https://verdaccio.lossless.one/sweet-scroll/-/sweet-scroll-4.0.0.tgz", + "integrity": "sha512-mR6fRsAQANtm3zpzhUE73KAOt2aT4ZsWzNSggiEsSqdO6Zh4gM7ioJG81EngrZEl0XAc3ZvzEfhxggOoEBc8jA==" + }, "symbol-tree": { "version": "3.2.4", "resolved": "https://verdaccio.lossless.one/symbol-tree/-/symbol-tree-3.2.4.tgz", diff --git a/package.json b/package.json index f681e16..8e7bb1c 100644 --- a/package.json +++ b/package.json @@ -25,7 +25,8 @@ "@pushrocks/lik": "^4.0.13", "@pushrocks/smartpromise": "^3.0.6", "@pushrocks/smartstate": "^1.0.16", - "lit-element": "^2.3.1" + "lit-element": "^2.3.1", + "sweet-scroll": "^4.0.0" }, "files": [ "ts/**/*", diff --git a/ts/domtools.breakpoints.ts b/ts/domtools.breakpoints.ts index d2156ee..0fa7eee 100644 --- a/ts/domtools.breakpoints.ts +++ b/ts/domtools.breakpoints.ts @@ -1,8 +1,8 @@ import { DomTools } from './domtools.classes.domtools'; export const desktop = 1240; -export const tablet = 700; -export const phablet = 500; +export const tablet = 1024; +export const phablet = 600; export const phone = 400; export type TViewport = 'native' | 'desktop' | 'tablet' | 'phablet' | 'phone'; diff --git a/ts/domtools.classes.domtools.ts b/ts/domtools.classes.domtools.ts index 117692d..d4ec40b 100644 --- a/ts/domtools.classes.domtools.ts +++ b/ts/domtools.classes.domtools.ts @@ -2,12 +2,19 @@ import * as plugins from './domtools.plugins'; import { Stringmap } from '@pushrocks/lik/dist_ts/lik.stringmap'; import { FastMap } from '@pushrocks/lik/dist_ts/lik.fastmap'; import { TViewport } from './domtools.breakpoints'; +import { DomToolsRouter } from './domtools.classes.router'; export interface IDomToolsState { virtualViewport: TViewport; } export class DomTools { + // ====== + // STATIC + // ====== + /** + * setups domtools + */ public static async setupDomTools() { let domToolsInstance: DomTools; if (!globalThis.deesDomTools) { @@ -30,17 +37,26 @@ export class DomTools { return domToolsInstance; } + // ======== + // INSTANCE + // ======== public smartstate = new plugins.smartstate.Smartstate(); public domToolsStatePart = this.smartstate.getStatePart('domtools', { - virtualViewport: 'native' + virtualViewport: 'native', }); - public actionSetVirtualViewport = this.domToolsStatePart.createAction(async (statePart, payload) => { - const currentState = statePart.getState(); - currentState.virtualViewport = payload; - return currentState; + public router = new DomToolsRouter({ + debug: false }); + private actionSetVirtualViewport = this.domToolsStatePart.createAction( + async (statePart, payload) => { + const currentState = statePart.getState(); + currentState.virtualViewport = payload; + return currentState; + } + ); + public domToolsReady = plugins.smartpromise.defer(); public domReady = plugins.smartpromise.defer(); public globalStylesReady = plugins.smartpromise.defer(); @@ -51,12 +67,10 @@ export class DomTools { bodyElement: HTMLElement; } = { headElement: null, - bodyElement: null + bodyElement: null, }; - constructor() { - - } + constructor() {} public async setGlobalStyles(stylesText: string) { await this.domReady.promise; @@ -83,7 +97,7 @@ export class DomTools { this.runOnceTrackerStringMap.removeString(runningId); } return await this.runOnceTrackerStringMap.registerUntilTrue( - stringMap => { + (stringMap) => { return !stringMap.includes(runningId); }, () => { diff --git a/ts/domtools.classes.router.ts b/ts/domtools.classes.router.ts deleted file mode 100644 index 9759a87..0000000 --- a/ts/domtools.classes.router.ts +++ /dev/null @@ -1 +0,0 @@ -import * as plugins from './domtools.plugins'; diff --git a/ts/domtools.move.ts b/ts/domtools.move.ts new file mode 100644 index 0000000..c189c02 --- /dev/null +++ b/ts/domtools.move.ts @@ -0,0 +1 @@ +import * as plugins from './domtools.plugins'; \ No newline at end of file