react-ui-basics 0.0.213 → 0.0.215

package/package.json

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

package/src/Checkbox.tsx

@@ -6,8 +6,8 @@ import {PureComponent, render, propsGetter} from "./ReactConstants";
 
 export interface CheckboxProps {
     value: boolean,
-    onChange: ChangeEventHandler,
-    label: string | ReactElement,
+    onChange: ChangeEventHandler<HTMLInputElement>,
+    label?: string | ReactElement,
     name?: string,
     id?: string | number,
     disabled?: boolean,

package/src/DropFileInput.tsx

@@ -9,7 +9,7 @@ export interface DropFileInputProps {
     icon?: MaterialIconType,
     label?: string | ReactElement,
     droppable?: boolean,
-    onDrop?: DragEventHandler,
+    onDrop?: (files: File[]) => void,
     multiple?: boolean,
     accept?: string,
 }

package/src/{Dropzone.js → Dropzone.tsx}

@@ -1,4 +1,4 @@
-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 './Dropzone.css'; import React from 'react';
+import React, {ReactElement, ReactNode} from 'react';
 import PropTypes from "prop-types";
 import ReactCreateElement from './ReactCreateElement';
 import './Dropzone.css'
@@ -10,7 +10,7 @@ const toArray = (o) => {
         return o;
 
     const l = [];
-    for (let i = 0; i < __length(o); i++) {
+    for (let i = 0; i < o.length; i++) {
         l.push(o[i])
     }
     return l;
@@ -30,7 +30,19 @@ const ignoredTypes = setOf([
 
 const ignore = dt => dt && (!dt.types[0] || ignoredTypes[dt.types[0]]);
 
-class Dropzone extends PureComponent {
+export interface DropzoneProps {
+    onDrop: (files: File[]) => void,
+    className?: string,
+    overlayLabel?: string | ReactElement,
+    clickable?: boolean,
+    droppable?: boolean,
+    multiple?: boolean,
+    disabled?: boolean,
+    accept?: string,
+    children?: ReactNode
+}
+
+class Dropzone extends PureComponent<DropzoneProps> {
 
     constructor(properties) {
         super(properties);
@@ -40,11 +52,11 @@ class Dropzone extends PureComponent {
         let entries = [];
 
         const props = propsGetter(that);
-        const isDragging = stateGS(that);
+        const isDragging = stateGS<boolean>(that);
 
         const onDrop = (e) => {
             const dt = e.dataTransfer;
-            const files = toArray(dt && dt.files || __target(e).files);
+            const files = toArray(dt && dt.files || e.target.files);
             props().onDrop(files);
             isDragging(false);
             entries = [];
@@ -61,8 +73,9 @@ class Dropzone extends PureComponent {
         const onDragEnter = (e) => {
             const dt = e.dataTransfer;
             if (ignore(dt)) return;
-            if (entries.indexOf(__target(e)) === -1) {
-                entries.push(__target(e))
+
+            if (entries.indexOf(e.target) === -1) {
+                entries.push(e.target)
             }
 
             dt && (dt.dropEffect = 'copy');
@@ -70,9 +83,9 @@ class Dropzone extends PureComponent {
             prevent(e);
         };
         const onDragLeave = (e) => {
-            entries = entries.filter(el => el !== __target(e));
+            entries = entries.filter(el => el !== e.target);
 
-            if (__length(entries) === 0)
+            if (entries.length === 0)
                 isDragging(false);
 
             prevent(e)
@@ -80,8 +93,17 @@ class Dropzone extends PureComponent {
 
         const inputRef = createRef()
 
-        that[ReactConstants[3]] = () => {
-            const {children, className, disabled, clickable, multiple, droppable, overlayLabel, accept} = props();
+        that[render] = () => {
+            const {
+                children,
+                className,
+                disabled,
+                clickable = true,
+                multiple = true,
+                droppable = true,
+                overlayLabel,
+                accept
+            } = props();
 
             return <div className={classNames('Dropzone', className, isDragging() && 'dragging')}
                         onDragLeave={!disabled && droppable && onDragLeave || UNDEFINED}
@@ -109,26 +131,4 @@ class Dropzone extends PureComponent {
     }
 }
 
-Dropzone.defaultProps = {
-    clickable: true,
-    multiple: true,
-    droppable: true,
-};
-
-if (process.env.NODE_ENV !== 'production') {
-    Dropzone.propTypes = {
-        [ReactConstants[5]]: PropTypes.string,
-        overlayLabel: PropTypes.oneOfType([
-            PropTypes.string,
-            PropTypes.element
-        ]),
-        clickable: PropTypes.bool,
-        droppable: PropTypes.bool,
-        multiple: PropTypes.bool,
-        disabled: PropTypes.bool,
-        onDrop: PropTypes.func.isRequired,
-        accept: PropTypes.string,
-    };
-}
-
 export default Dropzone;

package/src/store/ProxyTools.ts

@@ -1,6 +1,6 @@
 import {UNDEFINED, isObject, deleteKey} from "../Tools";
 
-const FIELD_CHANGED = '__changed';
+const FIELD_CHANGED = Symbol();
 const FIELD_BAKE = 'bake';
 
 export const createProxy = <T extends object>(target: T) => {
@@ -14,46 +14,62 @@ export const createProxy = <T extends object>(target: T) => {
     const initChangedValue = (target) => {
         !changedValue && (changedValue = Array.isArray(target) ? [...target] : {...target})
     };
+    const compile = (changedValue, innerProxies) => {
+        let result = changedValue || (Array.isArray(target) ? [...target] : {...target});
+        for (let key in innerProxies) {
+            result[key] = innerProxies[key][FIELD_BAKE]()
+        }
+        return result
+    }
     return new Proxy<T>(target, {
+        // get: (target: T, prop: string | symbol) => {
+        //     if (prop === FIELD_CHANGED)
+        //         return isChanged();
+        //     if (prop === FIELD_BAKE) {
+        //         return () =>
+        //             !isChanged() ? target : (
+        //                 changedValue && !innerProxies ?
+        //                     changedValue :
+        //                     compile(changedValue, innerProxies)
+        //             )
+        //     }
+        //
+        //     // 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;
+        // },
         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;
+            let value;
+            return prop === FIELD_CHANGED ? isChanged() : prop === FIELD_BAKE ? (() => !isChanged() ? target : (
+                changedValue && !innerProxies ?
+                    changedValue :
+                    compile(changedValue, innerProxies)
+            )) : (value = innerProxies && innerProxies[prop]) ?
+                value
+                : (value = changedValue && changedValue[prop]) !== UNDEFINED ?
+                    value
+                    : deletedKeys && deletedKeys[prop] ?
+                        UNDEFINED
+                        : ((value = target[prop]) && isObject(value) ?
+                                (!innerProxies && (innerProxies = {}), innerProxies[prop] = createProxy(value))
+                                : value
+                        );
         },
         set: (target: T, prop, newval) => {
             // console.log('set', {target, prop, newval})

package/src/store/Store.ts

@@ -91,9 +91,9 @@ export type Selector<T, R> = (t: T) => R;
 
 export const defaultSelector = <T>(store: T): T => store;
 
-export function useStore<T, R>(store: Store<T>, selector: Selector<T, R>): R
-export function useStore<T>(store: Store<T>, selector?: undefined): T
-export function useStore<T, R>(store: Store<T>, selector?: Selector<T, R>): R {
+export function useStore<T, R>(store: Store<T>, selector: Selector<T, R>, selectorDependencies: ReadonlyArray<any>): R
+export function useStore<T>(store: Store<T>, selector?: undefined, selectorDependencies?: undefined): T
+export function useStore<T, R>(store: Store<T>, selector?: Selector<T, R>, selectorDependencies: ReadonlyArray<any> = []): R {
     if (!selector)
         selector = (defaultSelector as Selector<T, R>)
 
@@ -103,12 +103,12 @@ export function useStore<T, R>(store: Store<T>, selector?: Selector<T, R>): R {
         const updateState = () => {
             setState(selector(store.get()))
         };
-
+        updateState()
         store.subscribe(updateState)
         return () => {
             store.unsubscribe(updateState);
         }
-    }, [])
+    }, selectorDependencies)
 
     return state
 }

package/store/ProxyTools.js

@@ -1,6 +1,6 @@
-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';
+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 { UNDEFINED, isObject, deleteKey } from '../Tools.js';
 
-const FIELD_CHANGED = '__changed';
+const FIELD_CHANGED = Symbol();
 const FIELD_BAKE = 'bake';
 const createProxy = (target) => {
     if (!target)
@@ -12,39 +12,59 @@ const createProxy = (target) => {
     const initChangedValue = (target) => {
         !changedValue && (changedValue = Array.isArray(target) ? [...target] : __extends({}, target));
     };
+    const compile = (changedValue, innerProxies) => {
+        let result = changedValue || (Array.isArray(target) ? [...target] : __extends({}, target));
+        for (let key in innerProxies) {
+            result[key] = innerProxies[key][FIELD_BAKE]();
+        }
+        return result;
+    };
     return new Proxy(target, {
+        // get: (target: T, prop: string | symbol) => {
+        //     if (prop === FIELD_CHANGED)
+        //         return isChanged();
+        //     if (prop === FIELD_BAKE) {
+        //         return () =>
+        //             !isChanged() ? target : (
+        //                 changedValue && !innerProxies ?
+        //                     changedValue :
+        //                     compile(changedValue, innerProxies)
+        //             )
+        //     }
+        //
+        //     // 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;
+        // },
         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;
+            let value;
+            return prop === FIELD_CHANGED ? isChanged() : prop === FIELD_BAKE ? (() => !isChanged() ? target : (changedValue && !innerProxies ?
+                changedValue :
+                compile(changedValue, innerProxies))) : (value = innerProxies && innerProxies[prop]) ?
+                value
+                : (value = changedValue && changedValue[prop]) !== UNDEFINED ?
+                    value
+                    : deletedKeys && deletedKeys[prop] ?
+                        UNDEFINED
+                        : ((value = target[prop]) && isObject(value) ?
+                            (!innerProxies && (innerProxies = {}), innerProxies[prop] = createProxy(value))
+                            : value);
         },
         set: (target, prop, newval) => {
             // console.log('set', {target, prop, newval})

package/store/ProxyTools.js.map

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

@@ -19,5 +19,5 @@ export declare function resetGlobalState(): void;
 export declare function replaceGlobalState(state: any): void;
 export declare type Selector<T, R> = (t: T) => R;
 export declare const defaultSelector: <T>(store: T) => T;
-export declare function useStore<T, R>(store: Store<T>, selector: Selector<T, R>): R;
-export declare function useStore<T>(store: Store<T>, selector?: undefined): T;
+export declare function useStore<T, R>(store: Store<T>, selector: Selector<T, R>, selectorDependencies: ReadonlyArray<any>): R;
+export declare function useStore<T>(store: Store<T>, selector?: undefined, selectorDependencies?: undefined): T;

package/store/Store.js

@@ -62,7 +62,7 @@ function replaceGlobalState(state) {
     STORES = state;
 }
 const defaultSelector = (store) => store;
-function useStore(store, selector) {
+function useStore(store, selector, selectorDependencies = []) {
     if (!selector)
         selector = defaultSelector;
     const [state, setState] = useState(() => selector(store.get()));
@@ -70,11 +70,12 @@ function useStore(store, selector) {
         const updateState = () => {
             setState(selector(store.get()));
         };
+        updateState();
         store.subscribe(updateState);
         return () => {
             store.unsubscribe(updateState);
         };
-    }, []);
+    }, selectorDependencies);
     return state;
 }
 

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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"}