@evlop/commons 1.0.206 → 1.0.207

package/dist/src/components/hoc/withSettings.native.d.ts

@@ -1,19 +1,18 @@
 import React, { PropsWithChildren, PropsWithoutRef, RefAttributes } from 'react';
-import { Action } from '../../hooks';
-declare type SettingProp = {
+declare type ModalProps = {
     model?: string;
     dataModel?: string;
     configModel?: string;
-    action?: Action;
 };
-export declare type ComponentWithSettings<P extends Object> = React.ForwardRefExoticComponent<PropsWithoutRef<PropsWithChildren<P & SettingProp>> & RefAttributes<any>>;
-export declare const withSettings: ({ valueOptions, configurationOptions }: {
-    valueOptions?: any[];
-    configurationOptions?: any[];
-}) => <P extends Object>(BaseComponent: React.ComponentType<P>) => React.ForwardRefExoticComponent<React.PropsWithoutRef<React.PropsWithChildren<P & SettingProp>> & React.RefAttributes<any>>;
-export declare const withToolbar: ({ valueOptions, configurationOptions }: {
-    valueOptions?: any[];
-    configurationOptions?: any[];
-}) => <P extends Object>(BaseComponent: React.ComponentType<P>) => React.ForwardRefExoticComponent<React.PropsWithoutRef<React.PropsWithChildren<P & SettingProp>> & React.RefAttributes<any>>;
+export declare type ComponentWithSettings<P extends Object> = React.ForwardRefExoticComponent<PropsWithoutRef<PropsWithChildren<P & ModalProps>> & RefAttributes<any>>;
+export declare type SettingOptions = {
+    valueOptions: any[];
+    configurationOptions: any[];
+};
+export declare const withSettings: (settingOptions: SettingOptions) => <P extends Object>(BaseComponent: React.ComponentType<P>) => React.ForwardRefExoticComponent<React.PropsWithoutRef<React.PropsWithChildren<P & ModalProps>> & React.RefAttributes<any>>;
+export declare const withModelPropsLoader: (settingOptions: SettingOptions) => <P extends Object>(BaseComponent: React.ComponentType<P>) => (props: P & ModalProps & {
+    _innerRef: any;
+}) => JSX.Element;
+export declare const withToolbar: (settingOptions: SettingOptions) => <P extends Object>(BaseComponent: React.ComponentType<P>) => React.ForwardRefExoticComponent<React.PropsWithoutRef<React.PropsWithChildren<P & ModalProps>> & React.RefAttributes<any>>;
 export default withSettings;
 //# sourceMappingURL=withSettings.native.d.ts.map

package/dist/src/components/hoc/withSettings.native.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"withSettings.native.d.ts","sourceRoot":"","sources":["../../../../src/components/hoc/withSettings.native.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,EAAc,iBAAiB,EAAE,eAAe,EAAE,aAAa,EAAW,MAAM,OAAO,CAAC;AACtG,OAAO,EAAE,MAAM,EAA+B,MAAM,aAAa,CAAC;AAElE,aAAK,WAAW,GAAG;IAAC,KAAK,CAAC,EAAE,MAAM,CAAC;IAAC,SAAS,CAAC,EAAE,MAAM,CAAC;IAAC,WAAW,CAAC,EAAE,MAAM,CAAC;IAAC,MAAM,CAAC,EAAE,MAAM,CAAA;CAAE,CAAA;AAE/F,oBAAY,qBAAqB,CAAC,CAAC,SAAS,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,eAAe,CAAC,iBAAiB,CAAC,CAAC,GAAG,WAAW,CAAC,CAAC,GAAG,aAAa,CAAC,GAAG,CAAC,CAAC,CAAA;AAE/J,eAAO,MAAM,YAAY;;;8LAsCvB,CAAC;AAGH,eAAO,MAAM,WAAW;;;8LAAe,CAAC;AACxC,eAAe,YAAY,CAAC"}
+{"version":3,"file":"withSettings.native.d.ts","sourceRoot":"","sources":["../../../../src/components/hoc/withSettings.native.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,EAAc,iBAAiB,EAAE,eAAe,EAAE,aAAa,EAAW,MAAM,OAAO,CAAC;AAGtG,aAAK,UAAU,GAAG;IAAC,KAAK,CAAC,EAAE,MAAM,CAAC;IAAC,SAAS,CAAC,EAAE,MAAM,CAAC;IAAC,WAAW,CAAC,EAAE,MAAM,CAAA;CAAE,CAAA;AAE7E,oBAAY,qBAAqB,CAAC,CAAC,SAAS,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,eAAe,CAAC,iBAAiB,CAAC,CAAC,GAAG,UAAU,CAAC,CAAC,GAAG,aAAa,CAAC,GAAG,CAAC,CAAC,CAAA;AAE9J,oBAAY,cAAc,GAAG;IAAC,YAAY,EAAE,GAAG,EAAE,CAAC;IAAC,oBAAoB,EAAE,GAAG,EAAE,CAAA;CAAC,CAAC;AAEhF,eAAO,MAAM,YAAY,mBAAoB,cAAc,4LAkB1D,CAAA;AAGD,eAAO,MAAM,oBAAoB,mBAAkB,cAAc;eAAwG,GAAG;iBAiB3K,CAAC;AAGF,eAAO,MAAM,WAAW,mBAzCqB,cAAc,4LAyCpB,CAAC;AACxC,eAAe,YAAY,CAAC"}

package/dist/src/components/hoc/withSettings.native.js

@@ -30,36 +30,33 @@ var __rest = (this && this.__rest) || function (s, e) {
     return t;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.withToolbar = exports.withSettings = void 0;
+exports.withToolbar = exports.withModelPropsLoader = exports.withSettings = void 0;
 const lodash_1 = require("lodash");
 const react_1 = __importStar(require("react"));
 const hooks_1 = require("../../hooks");
-const withSettings = ({ valueOptions = [], configurationOptions = [] }) => (BaseComponent) => react_1.forwardRef((props, forwardedRef) => {
-    const { model, dataModel = model, configModel = dataModel && `${dataModel}_config`, action: actionProp, onPress } = props, remainingProps = __rest(props, ["model", "dataModel", "configModel", "action", "onPress"]);
+const withSettings = (settingOptions) => (BaseComponent) => {
+    const ComponentWithModalPropsLoader = exports.withModelPropsLoader(settingOptions)(BaseComponent);
+    return react_1.forwardRef((props, forwardedRef) => {
+        const { model, dataModel = model, configModel = dataModel && `${dataModel}_config` } = props, remainingProps = __rest(props, ["model", "dataModel", "configModel"]);
+        if (dataModel || configModel) {
+            return react_1.default.createElement(ComponentWithModalPropsLoader, Object.assign({ _innerRef: forwardedRef, dataModel: dataModel, configModel: configModel }, remainingProps));
+        }
+        else {
+            return react_1.default.createElement(BaseComponent, Object.assign({ ref: forwardedRef }, props));
+        }
+    });
+};
+exports.withSettings = withSettings;
+const withModelPropsLoader = (settingOptions) => (BaseComponent) => (props) => {
+    const { model, _innerRef, dataModel = model, configModel = dataModel && `${dataModel}_config` } = props, remainingProps = __rest(props, ["model", "_innerRef", "dataModel", "configModel"]);
     const { data } = hooks_1.useComponentData();
-    // Extract values from component data
-    const values = react_1.useMemo(() => {
-        if (!dataModel || !valueOptions)
-            return {};
-        // merge configuration option from props and configuration option values from model
-        const valuePropNames = lodash_1.map(valueOptions, 'name');
-        const propsForValue = lodash_1.pick(props, valuePropNames);
-        return lodash_1.assign(propsForValue, lodash_1.get(data, dataModel));
+    // Extract values from component data,
+    const propsFromModel = react_1.useMemo(() => {
+        return lodash_1.assign({}, lodash_1.get(data, configModel), lodash_1.get(data, dataModel));
     }, [dataModel, props, data]);
-    // Extract configs from component data
-    const configs = react_1.useMemo(() => {
-        if (!configModel || !configurationOptions)
-            return {};
-        // merge configuration option from props and configuration option values from model
-        const configOptionPropNames = lodash_1.map(configurationOptions, 'name');
-        const propsForConfigOptions = lodash_1.pick(props, configOptionPropNames);
-        return lodash_1.assign(propsForConfigOptions, lodash_1.get(data, configModel));
-    }, [configModel, props, data]);
-    const action = values.action || actionProp || onPress;
-    const actionHandeller = hooks_1.useAction(action);
-    return (react_1.default.createElement(BaseComponent, Object.assign({ ref: forwardedRef }, remainingProps, configs, values, { onPress: actionHandeller, action: action })));
-});
-exports.withSettings = withSettings;
+    return (react_1.default.createElement(BaseComponent, Object.assign({ ref: _innerRef }, remainingProps, propsFromModel)));
+};
+exports.withModelPropsLoader = withModelPropsLoader;
 exports.withToolbar = exports.withSettings;
 exports.default = exports.withSettings;
 //# sourceMappingURL=withSettings.native.js.map

package/dist/src/components/hoc/withSettings.native.js.map

@@ -1 +1 @@
-{"version":3,"file":"withSettings.native.js","sourceRoot":"","sources":["../../../../src/components/hoc/withSettings.native.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,mCAAgD;AAChD,+CAAsG;AACtG,uCAAkE;AAM3D,MAAM,YAAY,GAAC,CAAC,EAAE,YAAY,GAAG,EAAE,EAAE,oBAAoB,GAAG,EAAE,EAAC,EAAE,EAAE,CAAC,CAAmB,aAAqC,EAAE,EAAE,CAAC,kBAAU,CAA0C,CAAC,KAAU,EAAE,YAAY,EAAE,EAAE;IAEzN,MAAM,EAAE,KAAK,EAAE,SAAS,GAAG,KAAK,EAAG,WAAW,GAAG,SAAS,IAAI,GAAG,SAAS,SAAS,EAAE,MAAM,EAAE,UAAU,EAAE,OAAO,KAAuB,KAAK,EAAvB,cAAc,UAAI,KAAK,EAAtI,0DAA8H,CAAQ,CAAC;IAC7I,MAAM,EAAC,IAAI,EAAC,GAAG,wBAAgB,EAAE,CAAC;IAElC,qCAAqC;IACrC,MAAM,MAAM,GAAQ,eAAO,CAAC,GAAE,EAAE;QAC5B,IAAG,CAAC,SAAS,IAAI,CAAC,YAAY;YAAE,OAAO,EAAE,CAAC;QAE1C,mFAAmF;QACnF,MAAM,cAAc,GAAG,YAAG,CAAC,YAAY,EAAE,MAAM,CAAC,CAAC;QACjD,MAAM,aAAa,GAAG,aAAI,CAAC,KAAK,EAAE,cAAc,CAAC,CAAC;QAClD,OAAQ,eAAM,CAAC,aAAa,EAAE,YAAG,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC,CAAC;IACxD,CAAC,EAAE,CAAC,SAAS,EAAE,KAAK,EAAE,IAAI,CAAC,CAAC,CAAC;IAE7B,sCAAsC;IACtC,MAAM,OAAO,GAAQ,eAAO,CAAC,GAAE,EAAE;QAC7B,IAAG,CAAC,WAAW,IAAI,CAAC,oBAAoB;YAAE,OAAO,EAAE,CAAC;QACpD,mFAAmF;QACnF,MAAM,qBAAqB,GAAG,YAAG,CAAC,oBAAoB,EAAE,MAAM,CAAC,CAAC;QAChE,MAAM,qBAAqB,GAAG,aAAI,CAAC,KAAK,EAAE,qBAAqB,CAAC,CAAC;QACjE,OAAQ,eAAM,CAAC,qBAAqB,EAAE,YAAG,CAAC,IAAI,EAAE,WAAW,CAAC,CAAC,CAAC;IAClE,CAAC,EAAE,CAAC,WAAW,EAAE,KAAK,EAAE,IAAI,CAAC,CAAC,CAAC;IAE/B,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,IAAI,UAAU,IAAI,OAAO,CAAC;IAEtD,MAAM,eAAe,GAAG,iBAAS,CAAC,MAAM,CAAC,CAAC;IAE1C,OAAO,CACH,8BAAC,aAAa,kBACV,GAAG,EAAE,YAAY,IACb,cAAc,EACd,OAAO,EACP,MAAM,IACV,OAAO,EAAE,eAAe,EACxB,MAAM,EAAE,MAAM,IAChB,CACL,CAAC;AACN,CAAC,CAAC,CAAC;AAtCU,QAAA,YAAY,gBAsCtB;AAGU,QAAA,WAAW,GAAG,oBAAY,CAAC;AACxC,kBAAe,oBAAY,CAAC"}
+{"version":3,"file":"withSettings.native.js","sourceRoot":"","sources":["../../../../src/components/hoc/withSettings.native.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,mCAAgD;AAChD,+CAAsG;AACtG,uCAA+C;AAQxC,MAAM,YAAY,GAAG,CAAC,cAA8B,EAAE,EAAE,CAAC,CAAmB,aAAqC,EAAE,EAAE;IAExH,MAAM,6BAA6B,GAAG,4BAAoB,CAAC,cAAc,CAAC,CAAC,aAAa,CAAC,CAAC;IAE1F,OAAO,kBAAU,CAAyC,CAAC,KAAU,EAAE,YAAY,EAAE,EAAE;QACnF,MAAM,EAAE,KAAK,EAAE,SAAS,GAAG,KAAK,EAAG,WAAW,GAAG,SAAS,IAAI,GAAG,SAAS,SAAS,KAAuB,KAAK,EAAvB,cAAc,UAAI,KAAK,EAAzG,qCAAiG,CAAQ,CAAC;QAEhH,IAAG,SAAS,IAAI,WAAW,EAAE;YACzB,OAAO,8BAAC,6BAA6B,kBACzB,SAAS,EAAE,YAAY,EACvB,SAAS,EAAE,SAAS,EACpB,WAAW,EAAE,WAAW,IACpB,cAAc,EACpB,CAAA;SACb;aAAM;YACH,OAAO,8BAAC,aAAa,kBAAC,GAAG,EAAE,YAAY,IAAM,KAAK,EAAI,CAAA;SACzD;IACL,CAAC,CAAC,CAAC;AACP,CAAC,CAAA;AAlBY,QAAA,YAAY,gBAkBxB;AAGM,MAAM,oBAAoB,GAAC,CAAC,cAA8B,EAAE,EAAE,CAAC,CAAmB,aAAqC,EAAE,EAAE,CAAC,CAAC,KAA0C,EAAE,EAAE;IAE9K,MAAM,EAAE,KAAK,EAAE,SAAS,EAAE,SAAS,GAAG,KAAK,EAAG,WAAW,GAAG,SAAS,IAAI,GAAG,SAAS,SAAS,KAAuB,KAAK,EAAvB,cAAc,UAAI,KAAK,EAApH,kDAA4G,CAAQ,CAAC;IAC3H,MAAM,EAAC,IAAI,EAAC,GAAG,wBAAgB,EAAE,CAAC;IAElC,sCAAsC;IACtC,MAAM,cAAc,GAAQ,eAAO,CAAC,GAAE,EAAE;QACpC,OAAQ,eAAM,CAAC,EAAE,EAAE,YAAG,CAAC,IAAI,EAAE,WAAW,CAAC,EAAE,YAAG,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC,CAAC;IACrE,CAAC,EAAE,CAAC,SAAS,EAAE,KAAK,EAAE,IAAI,CAAC,CAAC,CAAC;IAE7B,OAAO,CACH,8BAAC,aAAa,kBACV,GAAG,EAAE,SAAS,IACV,cAAc,EACd,cAAc,EACpB,CACL,CAAC;AACN,CAAC,CAAC;AAjBW,QAAA,oBAAoB,wBAiB/B;AAGW,QAAA,WAAW,GAAG,oBAAY,CAAC;AACxC,kBAAe,oBAAY,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@evlop/commons",
-  "version": "1.0.206",
+  "version": "1.0.207",
   "description": "",
   "main": "dist/main.js",
   "peerDependencies": {