2.0.15

package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "@designestate/dees-domtools",
-  "version": "2.0.9",
+  "version": "2.0.15",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "@designestate/dees-domtools",
-      "version": "2.0.9",
+      "version": "2.0.15",
       "license": "MIT",
       "dependencies": {
         "@apiglobal/typedrequest": "^2.0.3",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@designestate/dees-domtools",
-  "version": "2.0.9",
+  "version": "2.0.15",
   "private": false,
   "description": "tools to simplify complex css structures",
   "main": "dist_ts/index.js",

ts/domtools.classes.domtools.ts

@@ -6,13 +6,17 @@ import { TViewport } from './domtools.css.breakpoints.js';
 import { Scroller } from './domtools.classes.scroller.js';
 import { WebSetup } from '@pushrocks/websetup';
 import { ThemeManager } from './domtools.classes.thememanager.js';
-import { Keyboard, Key } from './domtools.classes.keyboard.js';
+import { Keyboard } from './domtools.classes.keyboard.js';
 
 export interface IDomToolsState {
   virtualViewport: TViewport;
   jwt: string;
 }
 
+export interface IDomToolsContructorOptions {
+  ignoreGlobal?: boolean;
+}
+
 export class DomTools {
   // ======
   // STATIC
@@ -20,10 +24,10 @@ export class DomTools {
   /**
    * setups domtools
    */
-  public static async setupDomTools() {
+  public static async setupDomTools(optionsArg: IDomToolsContructorOptions = {}) {
     let domToolsInstance: DomTools;
-    if (!globalThis.deesDomTools) {
+    if (!globalThis.deesDomTools && !optionsArg.ignoreGlobal) {
-      globalThis.deesDomTools = new DomTools();
+      globalThis.deesDomTools = new DomTools(optionsArg);
       domToolsInstance = globalThis.deesDomTools;
 
       // lets make sure the dom is ready
@@ -36,6 +40,8 @@ export class DomTools {
       };
       document.addEventListener('readystatechange', readyStateChangedFunc);
       domToolsInstance.domToolsReady.resolve();
+    } else if (optionsArg.ignoreGlobal) {
+      domToolsInstance = new DomTools(optionsArg);
     } else {
       domToolsInstance = globalThis.deesDomTools;
     }
@@ -75,7 +81,7 @@ export class DomTools {
   public smartstate = new plugins.smartstate.Smartstate();
   public domToolsStatePart = this.smartstate.getStatePart<IDomToolsState>('domtools', {
     virtualViewport: 'native',
-    jwt: null
+    jwt: null,
   });
 
   public router = new plugins.smartrouter.SmartRouter({
@@ -93,13 +99,12 @@ export class DomTools {
   }); // TODO: switch to scroller class
   public themeManager = new ThemeManager(this);
   public keyboard = new Keyboard(document.body);
-  
 
   public domToolsReady = plugins.smartpromise.defer();
   public domReady = plugins.smartpromise.defer();
   public globalStylesReady = plugins.smartpromise.defer();
 
-  constructor() {}
+  constructor(optionsArg: IDomToolsContructorOptions) {}
 
   private runOnceTrackerStringMap = new Stringmap();
   private runOnceResultMap = new FastMap();

ts/domtools.classes.keyboard.ts

@@ -1,3 +1,5 @@
+import * as plugins from './domtools.plugins.js';
+
 export enum Key {
   Backspace = 8,
   Tab = 9,
@@ -123,102 +125,78 @@ export enum Key {
 
   OpenBracket = 219,
   ClosedBracket = 221,
-  Quote = 222
+  Quote = 222,
 }
 
-type KeyCombo = Array<Key>
+type KeyCombo = Array<Key>;
-
-/**
- * @param {KeyboardEvent} event - pressed key event, in case of multi-key combos
- *  the last pressed key event is passed to this handler
- */
-type Handler = (event: KeyboardEvent) => void
 
 export class Keyboard {
-  private mapCombosToHandlers = new Map<number[], Handler[]>();
+  private mapCombosToHandlers = new Map<number[], plugins.smartrx.rxjs.Subject<KeyboardEvent>>();
   private pressedKeys = new Set<Key>();
 
-  constructor(
+  constructor(private domNode: Element | Document) {
-      private domNode: Element | Document
+    this.startListening();
-  ) {
-      this.startListening()
   }
 
-  on(keys: Key[] | KeyCombo[], callback: Handler) {
+  public keyEnum = Key;
-      const combos = this.toCombos(keys)
 
-      combos.forEach(combo => {
+  public on(keys: Key[]) {
-          this.registerComboCallback(combo, callback)
+    const subject = new plugins.smartrx.rxjs.Subject<KeyboardEvent>();
-      })
+    this.registerKeys(keys, subject);
+    return subject;
   }
 
-  startListening() {
+  public startListening() {
-      this.domNode.addEventListener('keydown', this.handleKeyDown)
+    this.domNode.addEventListener('keydown', this.handleKeyDown);
-      this.domNode.addEventListener('keyup', this.handleKeyUp)
+    this.domNode.addEventListener('keyup', this.handleKeyUp);
   }
 
-  stopListening() {
+  public stopListening() {
-      this.domNode.removeEventListener('keydown', this.handleKeyDown)
+    this.domNode.removeEventListener('keydown', this.handleKeyDown);
-      this.domNode.removeEventListener('keyup', this.handleKeyUp)
+    this.domNode.removeEventListener('keyup', this.handleKeyUp);
   }
 
-  clear() {
+  public clear() {
-      this.stopListening()
+    this.stopListening();
-      this.mapCombosToHandlers.clear()
+    this.mapCombosToHandlers.clear();
-      this.pressedKeys.clear()
+    this.pressedKeys.clear();
   }
 
   private handleKeyDown = (event: KeyboardEvent) => {
-      this.pressedKeys.add(event.keyCode)
+    this.pressedKeys.add(event.keyCode);
 
-      this.mapCombosToHandlers.forEach((handlers, combo) => {
+    this.mapCombosToHandlers.forEach((subjectArg, keysArg) => {
-          if (this.isComboPressed(combo)) {
+      if (this.areAllKeysPressed(keysArg)) {
-              handlers.forEach(handler => handler(event))
+        subjectArg.next(event);
-          }
+      }
-      })
+    });
-  }
+  };
 
   private handleKeyUp = (event: KeyboardEvent) => {
-      this.pressedKeys.delete(event.keyCode)
+    this.pressedKeys.delete(event.keyCode);
-  }
+  };
 
-  private isComboPressed(combo: number[]) {
+  private areAllKeysPressed(combo: number[]) {
-      let result = true
+    let result = true;
 
-      combo.forEach(key => {
+    combo.forEach((key) => {
-          if (!this.pressedKeys.has(key)) {
+      if (!this.pressedKeys.has(key)) {
-              result = false
+        result = false;
-          }
-      })
-
-      return result
-  }
-
-  private registerComboCallback(combo: Array<Key>, callback: Handler) {
-      if (!this.mapCombosToHandlers.has(combo)) {
-          this.mapCombosToHandlers.set(combo, [])
       }
+    });
 
-      const handlers = this.mapCombosToHandlers.get(combo)
+    return result;
-
-      handlers!.push(callback)
   }
 
-  private toCombos(keys: KeyCombo[] | Key[]) {
+  private registerKeys(
-      if (keys.length === 0) {
+    keysArg: Array<Key>,
-          return []
+    subjectArg: plugins.smartrx.rxjs.Subject<KeyboardEvent>
-      }
+  ) {
-
+    if (!this.mapCombosToHandlers.has(keysArg)) {
-      const isKeys = !Array.isArray(keys[0])
+      this.mapCombosToHandlers.set(keysArg, subjectArg);
-      let combos: KeyCombo[] = []
+    } else {
-
+      const subject = this.mapCombosToHandlers.get(keysArg);
-      if (isKeys) {
+      return subject;
-          combos = (keys as Key[]).map(key => [key])
+    }
-      } else {
-          combos = keys as KeyCombo[]
-          combos = combos.filter(combo => combo.length > 0)
-      }
-
-      return combos
   }
-}
+}

ts/domtools.elementbasic.ts

@@ -1,5 +1,5 @@
 import * as plugins from './domtools.plugins.js';
-import { DomTools } from './domtools.classes.domtools.js';
+import { DomTools, IDomToolsContructorOptions } from './domtools.classes.domtools.js';
 import { scrollBarStyles, globalBaseStyles } from './domtools.css.basestyles.js';
 
 import { html, LitElement, css, unsafeCSS } from 'lit';
@@ -40,8 +40,8 @@ export const styles = html`
  * a basic setup for elements
  * makes sure everything is in check
  */
-export const setup = async (elementArg?: LitElement): Promise<DomTools> => {
+export const setup = async (elementArg?: LitElement, optionsArg: IDomToolsContructorOptions = {}): Promise<DomTools> => {
-  const domTools = await DomTools.setupDomTools();
+  const domTools = await DomTools.setupDomTools(optionsArg);
 
   if (elementArg) {
     // lets do something with the element

ts/index.ts

@@ -5,7 +5,7 @@ import * as breakpoints from './domtools.css.breakpoints.js';
 import * as css from './domtools.css.js';
 
 export { css, breakpoints, elementBasic };
-export { DomTools } from './domtools.classes.domtools.js';
+export { DomTools, IDomToolsContructorOptions } from './domtools.classes.domtools.js';
 export { TypedRequest } from '@apiglobal/typedrequest';
 export { IWebSetupConstructorOptions } from '@pushrocks/websetup';
 export { rxjs } from '@pushrocks/smartrx';