react-ui-basics 0.0.210 → 0.0.212

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-ui-basics",
-  "version": "0.0.210",
+  "version": "0.0.212",
   "description": "",
   "module": "index.js",
   "_main": "index.cjs.js",

package/src/Scrollable.js

@@ -244,17 +244,18 @@ class Scrollable extends PureComponent {
             const updateVerticalScrollbar = () => {
                 const scrollHeight = scrollHeightOf(viewport);
                 const scrollbarHeight = offsetHeightOf(scrollbar);
+                const containerHeight = offsetHeightOf(container);
 
                 !adjustedScrollWidth && adjustScrollWidth();
 
                 const newRatio = scrollHeight / scrollbarHeight;
-                if ((ratio === newRatio && Number.isFinite(newRatio)) || Number.isNaN(newRatio)) return;
+                if (!containerHeight || (ratio === newRatio && Number.isFinite(newRatio)) || Number.isNaN(newRatio)) return;
 
                 const offsetHeight = offsetHeightOf(viewport);
                 const horizontalScrollBarOffset = statusH() !== WITHOUT_SCROLL ? __clientHeight(scrollbarH) + Math.max(NATIVE_SCROLL_HEIGHT, 0) : 0;
 
-                let containerOffsetHeight = offsetHeightOf(container) + horizontalScrollBarOffset;
-                if (containerOffsetHeight === scrollHeight && status() === WITHOUT_SCROLL)
+                let containerOffsetHeight = containerHeight + horizontalScrollBarOffset;
+                if (containerOffsetHeight > scrollHeight && status() === WITHOUT_SCROLL)
                     return;
 
                 if (props().autoScrollTop && scrollHeight - offsetHeight - __scrollTop(viewport) <= 20 && newRatio < ratio && Number.isFinite(newRatio) && Number.isFinite(ratio)) {
@@ -262,10 +263,11 @@ class Scrollable extends PureComponent {
                 }
 
                 ratio = newRatio;
-                styleOf(thumb).height = (scrollbarHeight / newRatio) + 'px';
+                if (newRatio > 1.02)
+                    styleOf(thumb).height = (scrollbarHeight / newRatio) + 'px';
 
                 styleOf(container).height = scrollHeight - horizontalScrollBarOffset + 'px';
-                containerOffsetHeight = offsetHeightOf(container) + horizontalScrollBarOffset;
+                containerOffsetHeight = containerHeight + horizontalScrollBarOffset;
 
                 if (scrollBarModeOf(props()) === SCROLLBAR_MODE_HIDDEN) {
                     if (status() !== WITHOUT_SCROLL)
@@ -274,7 +276,7 @@ class Scrollable extends PureComponent {
                     return
                 }
 
-                if (containerOffsetHeight < scrollHeight) {
+                if (containerOffsetHeight <= scrollHeight) {
                     adjustedScrollWidth = false;
                     showScrollbar(scrollbar, viewport, adjustScrollWidth);
                 } else {
@@ -289,25 +291,25 @@ class Scrollable extends PureComponent {
             };
 
             const updateHorizontalScrollbar = () => {
-
                 const scrollWidth = scrollWidthOf(viewport);
                 const scrollbarWidth = offsetWidthOf(scrollbarH);
+                const containerWidth = offsetWidthOf(container);
 
                 !adjustedScrollWidth && adjustScrollWidth();
 
                 const newRatio = scrollWidth / scrollbarWidth;
-                if ((ratioH === newRatio && Number.isFinite(newRatio)) || Number.isNaN(newRatio)) return;
+                if (!containerWidth || (ratioH === newRatio && Number.isFinite(newRatio)) || Number.isNaN(newRatio)) return;
 
                 const offsetWidth = offsetWidthOf(viewport);
-
                 const verticalScrollBarOffset = status() !== WITHOUT_SCROLL ? __clientWidth(scrollbar) + Math.max(NATIVE_SCROLL_WIDTH, 0) : 0;
-                let containerOffsetWidth = offsetWidthOf(container) + verticalScrollBarOffset;
 
-                if (containerOffsetWidth === scrollWidth && statusH() === WITHOUT_SCROLL)
+                let containerOffsetWidth = containerWidth + verticalScrollBarOffset;
+                if (containerOffsetWidth > scrollWidth && statusH() === WITHOUT_SCROLL)
                     return;
 
                 ratioH = newRatio;
-                styleOf(thumbH).width = (scrollbarWidth / newRatio) + 'px';
+                if (newRatio > 1.02)
+                    styleOf(thumbH).width = (scrollbarWidth / newRatio) + 'px';
 
 
                 if (horizontalScrollBarModeOf(props()) === SCROLLBAR_MODE_HIDDEN) {
@@ -318,9 +320,9 @@ class Scrollable extends PureComponent {
                 }
 
                 styleOf(container).width = (scrollWidth - verticalScrollBarOffset) + 'px';
-                containerOffsetWidth = offsetWidthOf(container) + verticalScrollBarOffset;
+                containerOffsetWidth = containerWidth + verticalScrollBarOffset;
 
-                if (containerOffsetWidth < scrollWidth) {
+                if (containerOffsetWidth <= scrollWidth) {
                     adjustedScrollWidth = false;
                     showHorizontalScrollbar(scrollbarH, viewport, adjustScrollWidth);
                 } else {
@@ -341,12 +343,14 @@ class Scrollable extends PureComponent {
                 };
             } else if (sbm !== SCROLLBAR_RESIZE_DISABLED)
                 update = updateVerticalScrollbar
-            else
-                update = updateVerticalScrollbar
+            else if (hsbm !== SCROLLBAR_RESIZE_DISABLED)
+                update = updateHorizontalScrollbar
 
-            initTimeout = setTimeout(() => {
-                resizeInterval = setInterval(update, 50);
-            }, 200)
+            if (update) {
+                initTimeout = setTimeout(() => {
+                    resizeInterval = setInterval(update, 50);
+                }, 200)
+            }
         };
 
         that[ReactConstants[0]] = init;

package/src/Tools.ts

@@ -17,7 +17,7 @@ export const NOOP = () => {
 
 export const orNoop = <T>(f: (...a: any) => T) => f || NOOP;
 
-export const getRandomId = (prefix:string) => prefix + Math.random();
+export const getRandomId = (prefix: string) => prefix + Math.random();
 
 export const ref = (name, component) => {
     const refKey = "__" + name;
@@ -105,6 +105,8 @@ export const isFunction = (v) => typeOf(v) === 'function';
 export const isString = (v) => typeOf(v) === 'string';
 export const isObject = (v) => typeOf(v) === 'object';
 
+export const deleteKey = (obj: object, key: string | symbol) => delete obj[key];
+
 const FALSE = false;
 const TRUE = true;
 

package/src/store/ProxyTools.test.js

@@ -1,5 +1,10 @@
 import ReactConstants from "./ReactConstants"; import {clientHeight as __clientHeight, clientWidth as __clientWidth, createAccessor as __createAccessor, data as __data, height as __height, left as __left, length as __length, pageX as __pageX, pageY as __pageY, props as __props, scrollLeft as __scrollLeft, scrollTop as __scrollTop, state as __state, style as __style, target as __target, top as __top, value as __value, width as __width} from "./CommonFields"; import {toConsumableArray as __toConsumableArray} from "./_virtual/_rollupPluginBabelHelpers"; import {extends as __extends} from "./_virtual/_rollupPluginBabelHelpers"; import {inherits as __inherits} from "./_virtual/_rollupPluginBabelHelpers"; import {createProxy} from "./ProxyTools";
 
+it('test proxy null', () => {
+    const p = createProxy(null);
+    expect(p).toBe(null);
+});
+
 it('test proxy noop', () => {
     const user = {name: 'Bob'};
     const p = createProxy(user);
@@ -19,7 +24,10 @@ it('test proxy add property', () => {
     const user = {name: 'Bob'};
     const p = createProxy(user);
     p.age = 16
+    expect(p.age).toEqual(16);
+
     p.age = 32
+    expect(p.age).toEqual(32);
 
     expect(user).toEqual({name: 'Bob'});
     expect(p.bake()).toEqual({name: 'Bob', age: 32});
@@ -29,6 +37,7 @@ it('test proxy delete property', () => {
     const user = {name: 'Bob'};
     const p = createProxy(user);
     delete p.name;
+    expect(p.name).toBe(undefined);
 
     expect(user).toEqual({name: 'Bob'});
     expect(p.bake()).toEqual({});
@@ -59,6 +68,7 @@ it('test proxy change inner properties', () => {
     const p = createProxy(user);
 
     p.hobbies.push('poker');
+    expect(p.hobbies).toEqual(['chess', 'poker']);
 
     expect(user).toEqual({name: 'Bob', hobbies: ['chess']});
     expect(p.bake()).toEqual({name: 'Bob', hobbies: ['chess', 'poker']});

package/src/store/ProxyTools.ts

@@ -0,0 +1,85 @@
+import {UNDEFINED, isObject, deleteKey} from "../Tools";
+
+const FIELD_CHANGED = '__changed';
+const FIELD_BAKE = 'bake';
+
+export const createProxy = <T extends object>(target: T) => {
+    if (!target)
+        return target
+
+    let changedValue = UNDEFINED;
+    let deletedKeys = UNDEFINED;
+    let innerProxies = UNDEFINED
+    const isChanged = () => changedValue || (innerProxies && Object.values(innerProxies).some(it => it[FIELD_CHANGED]));
+    const initChangedValue = (target) => {
+        !changedValue && (changedValue = Array.isArray(target) ? [...target] : {...target})
+    };
+    return new Proxy<T>(target, {
+        get: (target: T, prop: string | symbol) => {
+            if (prop === FIELD_CHANGED)
+                return isChanged();
+            if (prop === FIELD_BAKE) {
+                return () => {
+                    // console.log('bake', changedValue, innerProxies)
+                    if (!isChanged())
+                        return target
+
+                    if (changedValue && !innerProxies)
+                        return changedValue
+
+                    let result = changedValue || (Array.isArray(target) ? [...target] : {...target});
+                    for (let key in innerProxies) {
+                        result[key] = innerProxies[key][FIELD_BAKE]()
+                    }
+                    return result
+                }
+            }
+
+            // console.log('get', {target, prop})
+            const innerProxy = innerProxies && innerProxies[prop];
+            if (innerProxy)
+                return innerProxy
+
+            const changed = changedValue && changedValue[prop]
+            if (changed !== UNDEFINED)
+                return changed
+
+            if (deletedKeys && deletedKeys[prop])
+                return UNDEFINED
+
+            const value = target[prop];
+            if (value && isObject(value)) {
+                !innerProxies && (innerProxies = {})
+                return innerProxies[prop] = createProxy(value)
+            }
+
+            return value;
+        },
+        set: (target: T, prop, newval) => {
+            // console.log('set', {target, prop, newval})
+            initChangedValue(target);
+
+            if (newval && isObject(newval)) {
+                !innerProxies && (innerProxies = {})
+                innerProxies[prop] = newval = createProxy(newval)
+            } else {
+                innerProxies && deleteKey(innerProxies, prop)
+            }
+            changedValue[prop] = newval
+            // console.log('changedValue', changedValue)
+            return true;
+        },
+        deleteProperty: (target: T, prop) => {
+            // console.log('delete', {target, prop})
+            initChangedValue(target);
+
+            if (prop in changedValue) {
+                deleteKey(changedValue, prop)
+                innerProxies && deleteKey(innerProxies, prop)
+                !deletedKeys && (deletedKeys = {})
+                deletedKeys[prop] = true;
+            }
+            return true;
+        }
+    })
+}

package/src/store/Store.ts

@@ -8,46 +8,56 @@ interface Stores {
 let STORES: Stores = {}
 let COUNTER = 0
 
-export class Store<T> {
-    private name: string
-    private listeners: Array<() => void> = []
-    private initialState: T
-    private index: number
+abstract class AbstractStore<T> {
+    get: () => T;
+    set: (mutator: (oldState: T) => T | void) => void;
+    reset: () => void;
+    subscribe: (fn: () => void) => void;
+    unsubscribe: (fn: () => void) => void;
+    toString: () => string;
+}
+
+export class Store<T> extends AbstractStore<T> {
 
     constructor(initialState: T, name?: string) {
+        super()
         let that = this;
-        that.name = name;
-        that.initialState = initialState;
+        let listeners: Array<() => void> = []
+
         const index = COUNTER++;
-        that.index = index;
         STORES[index] = initialState
-    }
 
-    get = (): T => STORES[this.index]
-    set = (mutator: (oldState: T) => T | void) => {
-        const proxy = createProxy(STORES[this.index]);
-        const result = mutator(proxy);
-        if (!result || result === proxy)
-            STORES[this.index] = proxy.bake()
-        else
-            STORES[this.index] = result
+        that.unsubscribe = (fn: () => void) => {
+            listeners = listeners.filter(f => f !== fn)
+        }
+        that.get = (): T => STORES[index]
 
-        this.listeners.forEach(fn => fn())
-    }
+        const runListeners = () => {
+            listeners.forEach(fn => fn())
+        };
 
-    reset = () => {
-        STORES[this.index] = this.initialState
-    }
+        that.set = (mutator: (oldState: T) => T | void) => {
+            const proxy = createProxy(STORES[index]);
+            const result = mutator(proxy);
+            if (!result || result === proxy)
+                STORES[index] = proxy.bake()
+            else
+                STORES[index] = result
 
-    subscribe = (fn: () => void) => {
-        this.listeners.push(fn)
-    }
+            runListeners();
+        }
 
-    unsubscribe = (fn: () => void) => {
-        this.listeners = this.listeners.filter(f => f !== fn)
-    }
+        that.reset = () => {
+            STORES[index] = initialState
+            runListeners();
+        }
 
-    toString = (): string => this.name;
+        that.subscribe = (fn: () => void) => {
+            listeners.push(fn)
+        }
+
+        that.toString = (): string => name;
+    }
 }
 
 export default Store;

package/store/ProxyTools.d.ts

@@ -0,0 +1 @@
+export declare const createProxy: <T extends object>(target: T) => any;

package/store/ProxyTools.js

@@ -1,66 +1,77 @@
-import ReactConstants from "./../ReactConstants"; import {clientHeight as __clientHeight, clientWidth as __clientWidth, createAccessor as __createAccessor, data as __data, height as __height, left as __left, length as __length, pageX as __pageX, pageY as __pageY, props as __props, scrollLeft as __scrollLeft, scrollTop as __scrollTop, state as __state, style as __style, target as __target, top as __top, value as __value, width as __width} from "./../CommonFields"; import {toConsumableArray as __toConsumableArray} from "./../_virtual/_rollupPluginBabelHelpers"; import {extends as __extends} from "./../_virtual/_rollupPluginBabelHelpers"; import {inherits as __inherits} from "./../_virtual/_rollupPluginBabelHelpers"; import { typeof as _typeof, toConsumableArray as _toConsumableArray, objectSpread2 as _objectSpread2 } from '../_virtual/_rollupPluginBabelHelpers.js';
-import { UNDEFINED } from '../Tools.js';
+import ReactConstants from "./../ReactConstants"; import {clientHeight as __clientHeight, clientWidth as __clientWidth, createAccessor as __createAccessor, data as __data, height as __height, left as __left, length as __length, pageX as __pageX, pageY as __pageY, props as __props, scrollLeft as __scrollLeft, scrollTop as __scrollTop, state as __state, style as __style, target as __target, top as __top, value as __value, width as __width} from "./../CommonFields"; import {toConsumableArray as __toConsumableArray} from "./../_virtual/_rollupPluginBabelHelpers"; import {extends as __extends} from "./../_virtual/_rollupPluginBabelHelpers"; import {inherits as __inherits} from "./../_virtual/_rollupPluginBabelHelpers"; import { isObject, deleteKey, UNDEFINED } from '../Tools.js';
 
-var createProxy = function createProxy(target) {
-  if (!target) return target;
-  if (target.__isProxy) return target;
-  var changedValue = UNDEFINED;
-  var deletedKeys = UNDEFINED;
-  var innerProxies = UNDEFINED;
-  var isChanged = function isChanged() {
-    return changedValue || innerProxies && Object.values(innerProxies).some(function (it) {
-      return it.__changed;
-    });
-  };
-  return new Proxy(target, {
-    get: function get(target, prop) {
-      if (prop === '__isProxy') return true;
-      if (prop === '__changed') return isChanged();
-      if (prop === 'bake') return function () {
-        if (!isChanged()) return target;
-        if (changedValue && !innerProxies) return changedValue;
-        if (innerProxies) {
-          var result = changedValue || (Array.isArray(target) ? _toConsumableArray(target) : _objectSpread2({}, target));
-          for (var key in innerProxies) {
-            result[key] = innerProxies[key].bake();
-          }
-          return result;
+const FIELD_CHANGED = '__changed';
+const FIELD_BAKE = 'bake';
+const createProxy = (target) => {
+    if (!target)
+        return target;
+    let changedValue = UNDEFINED;
+    let deletedKeys = UNDEFINED;
+    let innerProxies = UNDEFINED;
+    const isChanged = () => changedValue || (innerProxies && Object.values(innerProxies).some(it => it[FIELD_CHANGED]));
+    const initChangedValue = (target) => {
+        !changedValue && (changedValue = Array.isArray(target) ? [...target] : __extends({}, target));
+    };
+    return new Proxy(target, {
+        get: (target, prop) => {
+            if (prop === FIELD_CHANGED)
+                return isChanged();
+            if (prop === FIELD_BAKE) {
+                return () => {
+                    // console.log('bake', changedValue, innerProxies)
+                    if (!isChanged())
+                        return target;
+                    if (changedValue && !innerProxies)
+                        return changedValue;
+                    let result = changedValue || (Array.isArray(target) ? [...target] : __extends({}, target));
+                    for (let key in innerProxies) {
+                        result[key] = innerProxies[key][FIELD_BAKE]();
+                    }
+                    return result;
+                };
+            }
+            // console.log('get', {target, prop})
+            const innerProxy = innerProxies && innerProxies[prop];
+            if (innerProxy)
+                return innerProxy;
+            const changed = changedValue && changedValue[prop];
+            if (changed !== UNDEFINED)
+                return changed;
+            if (deletedKeys && deletedKeys[prop])
+                return UNDEFINED;
+            const value = target[prop];
+            if (value && isObject(value)) {
+                !innerProxies && (innerProxies = {});
+                return innerProxies[prop] = createProxy(value);
+            }
+            return value;
+        },
+        set: (target, prop, newval) => {
+            // console.log('set', {target, prop, newval})
+            initChangedValue(target);
+            if (newval && isObject(newval)) {
+                !innerProxies && (innerProxies = {});
+                innerProxies[prop] = newval = createProxy(newval);
+            }
+            else {
+                innerProxies && deleteKey(innerProxies, prop);
+            }
+            changedValue[prop] = newval;
+            // console.log('changedValue', changedValue)
+            return true;
+        },
+        deleteProperty: (target, prop) => {
+            // console.log('delete', {target, prop})
+            initChangedValue(target);
+            if (prop in changedValue) {
+                deleteKey(changedValue, prop);
+                innerProxies && deleteKey(innerProxies, prop);
+                !deletedKeys && (deletedKeys = {});
+                deletedKeys[prop] = true;
+            }
+            return true;
         }
-        throw new Error('state not implemented yet');
-      };
-      var innerProxy = innerProxies && innerProxies[prop];
-      if (innerProxy) return innerProxy;
-      var changed = changedValue && changedValue[prop];
-      if (changed !== UNDEFINED) return changed;
-      if (deletedKeys && deletedKeys[prop]) return null;
-      var value = target[prop];
-      if (value && _typeof(value) === 'object') {
-        !innerProxies && (innerProxies = {});
-        return innerProxies[prop] = createProxy(value);
-      }
-      return value;
-    },
-    set: function set(target, prop, newval) {
-      if (!changedValue) changedValue = Array.isArray(target) ? _toConsumableArray(target) : _objectSpread2({}, target);
-      if (newval && _typeof(newval) === 'object') {
-        !innerProxies && (innerProxies = {});
-        innerProxies[prop] = newval = createProxy(newval);
-      } else {
-        innerProxies && delete innerProxies[prop];
-      }
-      changedValue[prop] = newval;
-      return true;
-    },
-    deleteProperty: function deleteProperty(target, prop) {
-      !changedValue && (changedValue = Array.isArray(target) ? _toConsumableArray(target) : _objectSpread2({}, target));
-      if (!prop in changedValue) return false;
-      delete changedValue[prop];
-      innerProxies && delete innerProxies[prop];
-      !deletedKeys && (deletedKeys = {});
-      deletedKeys[prop] = true;
-      return true;
-    }
-  });
+    });
 };
 
 export { createProxy };

package/store/ProxyTools.js.map

@@ -1 +1 @@
-{"version":3,"file":"ProxyTools.js","sources":["../src/store/ProxyTools.js"],"sourcesContent":["import {UNDEFINED} from \"../Tools\";\n\nexport const createProxy = (target) => {\n    if(!target)\n        return target\n    if (target.__isProxy)\n        return target;\n\n    let changedValue = UNDEFINED;\n    let deletedKeys = UNDEFINED;\n    let innerProxies = UNDEFINED\n    const isChanged = () => changedValue || (innerProxies && Object.values(innerProxies).some(it => it.__changed));\n\n    return new Proxy(target, {\n        get: function (target, prop) {\n            if (prop === '__isProxy')\n                return true\n            if (prop === '__changed')\n                return isChanged();\n            if (prop === 'bake')\n                return () => {\n                    // console.log('bake', changedValue, innerProxies)\n                    if (!isChanged())\n                        return target\n\n                    if (changedValue && !innerProxies)\n                        return changedValue\n\n                    if (innerProxies) {\n                        const result = changedValue || (Array.isArray(target) ? [...target] : {...target});\n\n                        for (let key in innerProxies) {\n                            result[key] = innerProxies[key].bake()\n                        }\n                        return result\n                    }\n\n                    throw new Error('state not implemented yet')\n                }\n\n            // console.log('get', {target, prop})\n            const innerProxy = innerProxies && innerProxies[prop];\n            if (innerProxy)\n                return innerProxy\n\n            const changed = changedValue && changedValue[prop]\n            if (changed !== UNDEFINED)\n                return changed\n\n            if (deletedKeys && deletedKeys[prop])\n                return null\n\n            const value = target[prop];\n            if (value && typeof value === 'object') {\n                !innerProxies && (innerProxies = {})\n                return innerProxies[prop] = createProxy(value)\n            }\n\n            return value;\n        },\n        set: function (target, prop, newval) {\n            // console.log('set', {target, prop, newval})\n            if (!changedValue) changedValue = Array.isArray(target) ? [...target] : {...target}\n\n            if (newval && typeof newval === 'object') {\n                !innerProxies && (innerProxies = {})\n                innerProxies[prop] = newval = createProxy(newval)\n            } else {\n                innerProxies && (delete innerProxies[prop])\n            }\n            changedValue[prop] = newval\n            // console.log('changedValue', changedValue)\n            return true;\n        },\n        deleteProperty: function (target, prop) {\n            // console.log('delete', {target, prop})\n            !changedValue && (changedValue = Array.isArray(target) ? [...target] : {...target})\n\n            if (!prop in changedValue)\n                return false;\n\n            delete changedValue[prop]\n            innerProxies && delete innerProxies[prop]\n            !deletedKeys && (deletedKeys = {})\n            deletedKeys[prop] = true;\n            return true;\n        }\n    })\n}\n"],"names":["createProxy","target","__isProxy","changedValue","UNDEFINED","deletedKeys","innerProxies","isChanged","Object","values","some","it","__changed","Proxy","get","prop","result","Array","isArray","_toConsumableArray","_objectSpread","key","bake","Error","innerProxy","changed","value","_typeof","set","newval","deleteProperty"],"mappings":"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"}
+{"version":3,"file":"ProxyTools.js","sources":["../src/store/ProxyTools.ts"],"sourcesContent":[null],"names":[],"mappings":"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"}

package/store/Store.d.ts

@@ -1,12 +1,7 @@
 interface Stores {
     [index: number]: any;
 }
-export declare class Store<T> {
-    private name;
-    private listeners;
-    private initialState;
-    private index;
-    constructor(initialState: T, name?: string);
+declare abstract class AbstractStore<T> {
     get: () => T;
     set: (mutator: (oldState: T) => T | void) => void;
     reset: () => void;
@@ -14,6 +9,9 @@ export declare class Store<T> {
     unsubscribe: (fn: () => void) => void;
     toString: () => string;
 }
+export declare class Store<T> extends AbstractStore<T> {
+    constructor(initialState: T, name?: string);
+}
 export default Store;
 export declare function getGlobalState(): Stores;
 export declare function resetGlobalState(): void;

package/store/Store.js

@@ -3,35 +3,39 @@ import { createProxy } from './ProxyTools.js';
 
 let STORES = {};
 let COUNTER = 0;
-class Store {
+class AbstractStore {
+}
+class Store extends AbstractStore {
     constructor(initialState, name) {
-        this.listeners = [];
-        this.get = () => STORES[this.index];
-        this.set = (mutator) => {
-            const proxy = createProxy(STORES[this.index]);
+        super();
+        let that = this;
+        let listeners = [];
+        const index = COUNTER++;
+        STORES[index] = initialState;
+        that.unsubscribe = (fn) => {
+            listeners = listeners.filter(f => f !== fn);
+        };
+        that.get = () => STORES[index];
+        const runListeners = () => {
+            listeners.forEach(fn => fn());
+        };
+        that.set = (mutator) => {
+            const proxy = createProxy(STORES[index]);
             const result = mutator(proxy);
             if (!result || result === proxy)
-                STORES[this.index] = proxy.bake();
+                STORES[index] = proxy.bake();
             else
-                STORES[this.index] = result;
-            this.listeners.forEach(fn => fn());
-        };
-        this.reset = () => {
-            STORES[this.index] = this.initialState;
+                STORES[index] = result;
+            runListeners();
         };
-        this.subscribe = (fn) => {
-            this.listeners.push(fn);
+        that.reset = () => {
+            STORES[index] = initialState;
+            runListeners();
         };
-        this.unsubscribe = (fn) => {
-            this.listeners = this.listeners.filter(f => f !== fn);
+        that.subscribe = (fn) => {
+            listeners.push(fn);
         };
-        this.toString = () => this.name;
-        let that = this;
-        that.name = name;
-        that.initialState = initialState;
-        const index = COUNTER++;
-        that.index = index;
-        STORES[index] = initialState;
+        that.toString = () => name;
     }
 }
 function getGlobalState() {

package/store/Store.js.map

@@ -1 +1 @@
-{"version":3,"file":"Store.js","sources":["../src/store/Store.ts"],"sourcesContent":[null],"names":[],"mappings":"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"}
+{"version":3,"file":"Store.js","sources":["../src/store/Store.ts"],"sourcesContent":[null],"names":[],"mappings":"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"}