@evlop/commons 1.0.367 → 1.0.369

package/dist/cjs/src/components/hoc/withSettings.app.d.ts

@@ -1,18 +1,19 @@
-import React, { PropsWithChildren, PropsWithoutRef, RefAttributes } from 'react';
+import React, { PropsWithChildren } from 'react';
 type ModalProps = {
     model?: string;
     dataModel?: string;
     configModel?: string;
+    ref?: any;
 };
-export type ComponentWithSettings<P extends Object> = React.ForwardRefExoticComponent<PropsWithoutRef<PropsWithChildren<P & ModalProps>> & RefAttributes<any>>;
+type PropsWithSetting<P> = PropsWithChildren<P & ModalProps>;
+export type ComponentWithSettings<P> = React.ComponentType<PropsWithSetting<P>>;
 export type SettingOptions = {
+    name: string;
     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;
-}) => React.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 declare const withSettings: (settingOptions: SettingOptions) => <P extends Object>(BaseComponent: React.ComponentType<P>) => React.ComponentType<PropsWithSetting<P>>;
+export declare const withModelPropsLoader: (settingOptions: SettingOptions) => <P = Object>(BaseComponent: React.ComponentType<P>) => React.ComponentType<PropsWithSetting<P>>;
+export declare const withToolbar: (settingOptions: SettingOptions) => <P extends Object>(BaseComponent: React.ComponentType<P>) => React.ComponentType<PropsWithSetting<P>>;
 export default withSettings;
 //# sourceMappingURL=withSettings.app.d.ts.map

package/dist/cjs/src/components/hoc/withSettings.app.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"withSettings.app.d.ts","sourceRoot":"","sources":["../../../../../src/components/hoc/withSettings.app.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,EAAc,iBAAiB,EAAE,eAAe,EAAE,aAAa,EAAW,MAAM,OAAO,CAAC;AAGtG,KAAK,UAAU,GAAG;IAAC,KAAK,CAAC,EAAE,MAAM,CAAC;IAAC,SAAS,CAAC,EAAE,MAAM,CAAC;IAAC,WAAW,CAAC,EAAE,MAAM,CAAA;CAAE,CAAA;AAE7E,MAAM,MAAM,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,MAAM,MAAM,cAAc,GAAG;IAAC,YAAY,EAAE,GAAG,EAAE,CAAC;IAAC,oBAAoB,EAAE,GAAG,EAAE,CAAA;CAAC,CAAC;AAEhF,eAAO,MAAM,YAAY,GAAI,gBAAgB,cAAc,MAAM,CAAC,SAAS,MAAM,EAAE,eAAe,KAAK,CAAC,aAAa,CAAC,CAAC,CAAC,+HAkBvH,CAAA;AAGD,eAAO,MAAM,oBAAoB,GAAE,gBAAgB,cAAc,MAAM,CAAC,SAAS,MAAM,EAAE,eAAe,KAAK,CAAC,aAAa,CAAC,CAAC,CAAC,MAAM,OAAO,CAAC,GAAG,UAAU,GAAG;IAAE,SAAS,EAAE,GAAG,CAAA;CAAE,sBAiB7K,CAAC;AAGF,eAAO,MAAM,WAAW,mBAzCqB,cAAc,MAAM,CAAC,SAAS,MAAM,EAAE,eAAe,KAAK,CAAC,aAAa,CAAC,CAAC,CAAC,+HAyCjF,CAAC;AACxC,eAAe,YAAY,CAAC"}
+{"version":3,"file":"withSettings.app.d.ts","sourceRoot":"","sources":["../../../../../src/components/hoc/withSettings.app.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,EAAc,iBAAiB,EAA2C,MAAM,OAAO,CAAC;AAGtG,KAAK,UAAU,GAAG;IAAE,KAAK,CAAC,EAAE,MAAM,CAAC;IAAC,SAAS,CAAC,EAAE,MAAM,CAAC;IAAC,WAAW,CAAC,EAAE,MAAM,CAAC;IAAC,GAAG,CAAC,EAAE,GAAG,CAAA;CAAE,CAAA;AAEzF,KAAK,gBAAgB,CAAC,CAAC,IAAI,iBAAiB,CAAC,CAAC,GAAG,UAAU,CAAC,CAAC;AAE7D,MAAM,MAAM,qBAAqB,CAAC,CAAC,IAAI,KAAK,CAAC,aAAa,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC,CAAA;AAE/E,MAAM,MAAM,cAAc,GAAG;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,YAAY,EAAE,GAAG,EAAE,CAAC;IAAC,oBAAoB,EAAE,GAAG,EAAE,CAAA;CAAE,CAAC;AAEhG,eAAO,MAAM,YAAY,GAAI,gBAAgB,cAAc,MAAM,CAAC,SAAS,MAAM,EAAE,eAAe,KAAK,CAAC,aAAa,CAAC,CAAC,CAAC,KAAG,KAAK,CAAC,aAAa,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAmBjK,CAAA;AAGD,eAAO,MAAM,oBAAoB,GAAI,gBAAgB,cAAc,MAAM,CAAC,GAAG,MAAM,EAAE,eAAe,KAAK,CAAC,aAAa,CAAC,CAAC,CAAC,KAAG,KAAK,CAAC,aAAa,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAiBnK,CAAC;AAGF,eAAO,MAAM,WAAW,mBA1CqB,cAAc,MAAM,CAAC,SAAS,MAAM,EAAE,eAAe,KAAK,CAAC,aAAa,CAAC,CAAC,CAAC,KAAG,KAAK,CAAC,aAAa,CAAC,gBAAgB,CAAC,CAAC,CAAC,CA0C3H,CAAC;AACxC,eAAe,YAAY,CAAC"}

package/dist/cjs/src/components/hoc/withSettings.app.js

@@ -39,25 +39,25 @@ const react_1 = __importStar(require("react"));
 const hooks_1 = require("../../hooks");
 const withSettings = (settingOptions) => (BaseComponent) => {
     const ComponentWithModalPropsLoader = (0, exports.withModelPropsLoader)(settingOptions)(BaseComponent);
-    return (0, react_1.forwardRef)((props, forwardedRef) => {
-        const { model, dataModel = model, configModel = dataModel && `${dataModel}_config`, ...remainingProps } = props;
+    return (props) => {
+        const { model, dataModel = model, configModel = dataModel && `${dataModel}_config`, ref, ...remainingProps } = props;
         if (dataModel || configModel) {
-            return react_1.default.createElement(ComponentWithModalPropsLoader, { _innerRef: forwardedRef, dataModel: dataModel, configModel: configModel, ...remainingProps });
+            return react_1.default.createElement(ComponentWithModalPropsLoader, { ref: ref, model: model, dataModel: dataModel, configModel: configModel, ...remainingProps });
         }
         else {
-            return react_1.default.createElement(BaseComponent, { ref: forwardedRef, ...props });
+            return react_1.default.createElement(BaseComponent, { ref: ref, ...props });
         }
-    });
+    };
 };
 exports.withSettings = withSettings;
 const withModelPropsLoader = (settingOptions) => (BaseComponent) => (props) => {
-    const { model, _innerRef, dataModel = model, configModel = dataModel && `${dataModel}_config`, ...remainingProps } = props;
+    const { model, ref, dataModel = model, configModel = dataModel && `${dataModel}_config`, ...remainingProps } = props;
     const { data } = (0, hooks_1.useComponentData)();
     // Extract values from component data,
     const propsFromModel = (0, react_1.useMemo)(() => {
         return (0, lodash_1.assign)({}, (0, lodash_1.get)(data, configModel), (0, lodash_1.get)(data, dataModel));
     }, [dataModel, props, data]);
-    return (react_1.default.createElement(BaseComponent, { ref: _innerRef, ...remainingProps, ...propsFromModel }));
+    return (react_1.default.createElement(BaseComponent, { ref: ref, ...remainingProps, ...propsFromModel }));
 };
 exports.withModelPropsLoader = withModelPropsLoader;
 exports.withToolbar = exports.withSettings;

package/dist/cjs/src/components/hoc/withSettings.app.js.map

@@ -1 +1 @@
-{"version":3,"file":"withSettings.app.js","sourceRoot":"","sources":["../../../../../src/components/hoc/withSettings.app.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,mCAAqC;AACrC,+CAAsG;AACtG,uCAA+C;AAQxC,MAAM,YAAY,GAAG,CAAC,cAA8B,EAAE,EAAE,CAAC,CAAmB,aAAqC,EAAE,EAAE;IAExH,MAAM,6BAA6B,GAAG,IAAA,4BAAoB,EAAC,cAAc,CAAC,CAAC,aAAa,CAAC,CAAC;IAE1F,OAAO,IAAA,kBAAU,EAAyC,CAAC,KAAU,EAAE,YAAY,EAAE,EAAE;QACnF,MAAM,EAAE,KAAK,EAAE,SAAS,GAAG,KAAK,EAAG,WAAW,GAAG,SAAS,IAAI,GAAG,SAAS,SAAS,EAAE,GAAG,cAAc,EAAC,GAAG,KAAK,CAAC;QAEhH,IAAG,SAAS,IAAI,WAAW,EAAE,CAAC;YAC1B,OAAO,8BAAC,6BAA6B,IACzB,SAAS,EAAE,YAAY,EACvB,SAAS,EAAE,SAAS,EACpB,WAAW,EAAE,WAAW,KACpB,cAAc,GACpB,CAAA;QACd,CAAC;aAAM,CAAC;YACJ,OAAO,8BAAC,aAAa,IAAC,GAAG,EAAE,YAAY,KAAM,KAAK,GAAI,CAAA;QAC1D,CAAC;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,EAAE,GAAG,cAAc,EAAC,GAAG,KAAK,CAAC;IAC3H,MAAM,EAAC,IAAI,EAAC,GAAG,IAAA,wBAAgB,GAAE,CAAC;IAElC,sCAAsC;IACtC,MAAM,cAAc,GAAQ,IAAA,eAAO,EAAC,GAAE,EAAE;QACpC,OAAQ,IAAA,eAAM,EAAC,EAAE,EAAE,IAAA,YAAG,EAAC,IAAI,EAAE,WAAW,CAAC,EAAE,IAAA,YAAG,EAAC,IAAI,EAAE,SAAS,CAAC,CAAC,CAAC;IACrE,CAAC,EAAE,CAAC,SAAS,EAAE,KAAK,EAAE,IAAI,CAAC,CAAC,CAAC;IAE7B,OAAO,CACH,8BAAC,aAAa,IACV,GAAG,EAAE,SAAS,KACV,cAAc,KACd,cAAc,GACpB,CACL,CAAC;AACN,CAAC,CAAC;AAjBW,QAAA,oBAAoB,wBAiB/B;AAGW,QAAA,WAAW,GAAG,oBAAY,CAAC;AACxC,kBAAe,oBAAY,CAAC"}
+{"version":3,"file":"withSettings.app.js","sourceRoot":"","sources":["../../../../../src/components/hoc/withSettings.app.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,mCAAqC;AACrC,+CAAsG;AACtG,uCAA+C;AAUxC,MAAM,YAAY,GAAG,CAAC,cAA8B,EAAE,EAAE,CAAC,CAAmB,aAAqC,EAA4C,EAAE;IAElK,MAAM,6BAA6B,GAAG,IAAA,4BAAoB,EAAC,cAAc,CAAC,CAAC,aAAa,CAAC,CAAC;IAE1F,OAAO,CAAC,KAAK,EAAE,EAAE;QACb,MAAM,EAAE,KAAK,EAAE,SAAS,GAAG,KAAK,EAAE,WAAW,GAAG,SAAS,IAAI,GAAG,SAAS,SAAS,EAAE,GAAG,EAAE,GAAG,cAAc,EAAE,GAAG,KAAY,CAAC;QAE5H,IAAI,SAAS,IAAI,WAAW,EAAE,CAAC;YAC3B,OAAO,8BAAC,6BAA6B,IACjC,GAAG,EAAE,GAAG,EACR,KAAK,EAAE,KAAK,EACZ,SAAS,EAAE,SAAS,EACpB,WAAW,EAAE,WAAW,KACpB,cAAc,GACpB,CAAA;QACN,CAAC;aAAM,CAAC;YACJ,OAAO,8BAAC,aAAa,IAAC,GAAG,EAAE,GAAG,KAAM,KAAK,GAAI,CAAA;QACjD,CAAC;IACL,CAAC,CAAC;AACN,CAAC,CAAA;AAnBY,QAAA,YAAY,gBAmBxB;AAGM,MAAM,oBAAoB,GAAG,CAAC,cAA8B,EAAE,EAAE,CAAC,CAAa,aAAqC,EAA4C,EAAE,CAAC,CAAC,KAA0B,EAAE,EAAE;IAEpM,MAAM,EAAE,KAAK,EAAE,GAAG,EAAE,SAAS,GAAG,KAAK,EAAE,WAAW,GAAG,SAAS,IAAI,GAAG,SAAS,SAAS,EAAE,GAAG,cAAc,EAAE,GAAG,KAAK,CAAC;IACrH,MAAM,EAAE,IAAI,EAAE,GAAG,IAAA,wBAAgB,GAAE,CAAC;IAEpC,sCAAsC;IACtC,MAAM,cAAc,GAAQ,IAAA,eAAO,EAAC,GAAG,EAAE;QACrC,OAAO,IAAA,eAAM,EAAC,EAAE,EAAE,IAAA,YAAG,EAAC,IAAI,EAAE,WAAW,CAAC,EAAE,IAAA,YAAG,EAAC,IAAI,EAAE,SAAS,CAAC,CAAC,CAAC;IACpE,CAAC,EAAE,CAAC,SAAS,EAAE,KAAK,EAAE,IAAI,CAAC,CAAC,CAAC;IAE7B,OAAO,CACH,8BAAC,aAAa,IACV,GAAG,EAAE,GAAG,KACJ,cAAc,KACd,cAAc,GACpB,CACL,CAAC;AACN,CAAC,CAAC;AAjBW,QAAA,oBAAoB,wBAiB/B;AAGW,QAAA,WAAW,GAAG,oBAAY,CAAC;AACxC,kBAAe,oBAAY,CAAC"}

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

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

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

@@ -1 +1 @@
-{"version":3,"file":"withSettings.d.ts","sourceRoot":"","sources":["../../../../../src/components/hoc/withSettings.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,EAAE,iBAAiB,EAAE,eAAe,EAAE,aAAa,EAAuB,MAAM,OAAO,CAAC;AACtG,OAAO,EAAE,MAAM,EAA+B,MAAM,aAAa,CAAC;AAElE,KAAK,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,MAAM,MAAM,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,GAAE;;;;CAAiE,MAAM,CAAC,SAAS,MAAM,EAAE,eAAe,KAAK,CAAC,aAAa,CAAC,CAAC,CAAC,gIAsCvJ,CAAC;AAGH,eAAO,MAAM,WAAW;;;;OAzC0E,CAAC,SAAS,MAAM,EAAE,eAAe,KAAK,CAAC,aAAa,CAAC,CAAC,CAAC,gIAyClH,CAAC;AACxC,eAAe,YAAY,CAAC"}
+{"version":3,"file":"withSettings.d.ts","sourceRoot":"","sources":["../../../../../src/components/hoc/withSettings.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,EAAE,iBAAiB,EAAW,MAAM,OAAO,CAAC;AAC1D,OAAO,EAAE,MAAM,EAA+B,MAAM,aAAa,CAAC;AAElE,KAAK,WAAW,GAAG;IAAE,KAAK,CAAC,EAAE,MAAM,CAAC;IAAC,SAAS,CAAC,EAAE,MAAM,CAAC;IAAC,WAAW,CAAC,EAAE,MAAM,CAAC;IAAC,MAAM,CAAC,EAAE,MAAM,CAAC;IAAC,GAAG,CAAC,EAAE,GAAG,CAAA;CAAE,CAAA;AAC3G,KAAK,gBAAgB,CAAC,CAAC,SAAS,MAAM,IAAI,iBAAiB,CAAC,CAAC,GAAG,WAAW,CAAC,CAAA;AAC5E,MAAM,MAAM,qBAAqB,CAAC,CAAC,SAAS,MAAM,IAAI,KAAK,CAAC,aAAa,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC,CAAA;AAE9F,eAAO,MAAM,YAAY,GAAI;;;;CAAmE,MAAM,CAAC,SAAS,MAAM,EAAE,eAAe,KAAK,CAAC,aAAa,CAAC,CAAC,CAAC,MAAM,OAAO,gBAAgB,CAAC,CAAC,CAAC,sBAoC5L,CAAC;AAEF,eAAO,MAAM,WAAW;;;;OAtC8E,CAAC,SAAS,MAAM,EAAE,eAAe,KAAK,CAAC,aAAa,CAAC,CAAC,CAAC,MAAM,OAAO,gBAAgB,CAAC,CAAC,CAAC,sBAsCtJ,CAAC;AACxC,eAAe,YAAY,CAAC"}

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

@@ -37,8 +37,8 @@ exports.withToolbar = exports.withSettings = void 0;
 const lodash_1 = require("lodash");
 const react_1 = __importStar(require("react"));
 const hooks_1 = require("../../hooks");
-const withSettings = ({ name: elementName, valueOptions = [], configurationOptions = [] }) => (BaseComponent) => (0, react_1.forwardRef)((props, forwardedRef) => {
-    const { model, dataModel = model, configModel = dataModel && `${dataModel}_config`, restrictEdit, action: actionProp, onPress, onClick: onClickProp = onPress } = props;
+const withSettings = ({ name: elementName, valueOptions = [], configurationOptions = [] }) => (BaseComponent) => (props) => {
+    const { model, dataModel = model, configModel = dataModel && `${dataModel}_config`, action: actionProp, ref, ...remainingProps } = props;
     const { data } = (0, hooks_1.useComponentData)();
     // Extract values from component data,
     const propsFromModel = (0, react_1.useMemo)(() => {
@@ -59,9 +59,8 @@ const withSettings = ({ name: elementName, valueOptions = [], configurationOptio
         return { handleAction: action };
     }, [dataModel, action]);
     const actionClickEvent = (0, hooks_1.useAction)(handleAction);
-    const elementOnClick = action ? actionClickEvent : onClickProp;
-    return (react_1.default.createElement(BaseComponent, { animate: true, ...props, ...propsFromModel, action: forwardActions, onClick: elementOnClick, onPress: elementOnClick, ref: forwardedRef }));
-});
+    return (react_1.default.createElement(BaseComponent, { animate: true, ...propsFromModel, onClick: actionClickEvent, action: forwardActions, ref: ref, ...remainingProps }));
+};
 exports.withSettings = withSettings;
 exports.withToolbar = exports.withSettings;
 exports.default = exports.withSettings;

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

@@ -1 +1 @@
-{"version":3,"file":"withSettings.js","sourceRoot":"","sources":["../../../../../src/components/hoc/withSettings.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,mCAAqC;AACrC,+CAAsG;AACtG,uCAAkE;AAM3D,MAAM,YAAY,GAAC,CAAC,EAAC,IAAI,EAAE,WAAW,EAAE,YAAY,GAAG,EAAE,EAAE,oBAAoB,GAAG,EAAE,EAAC,EAAE,EAAE,CAAC,CAAmB,aAAqC,EAAE,EAAE,CAAC,IAAA,kBAAU,EAA0C,CAAC,KAAU,EAAE,YAAY,EAAE,EAAE;IAC3O,MAAM,EAAE,KAAK,EAAE,SAAS,GAAG,KAAK,EAAG,WAAW,GAAG,SAAS,IAAI,GAAG,SAAS,SAAS,EAAE,YAAY,EAAE,MAAM,EAAE,UAAU,EAAE,OAAO,EAAE,OAAO,EAAE,WAAW,GAAG,OAAO,EAAC,GAAG,KAAK,CAAC;IACxK,MAAM,EAAC,IAAI,EAAC,GAAG,IAAA,wBAAgB,GAAE,CAAC;IAElC,sCAAsC;IACtC,MAAM,cAAc,GAAQ,IAAA,eAAO,EAAC,GAAE,EAAE;QACpC,OAAQ,IAAA,eAAM,EAAC,EAAE,EAAE,IAAA,YAAG,EAAC,IAAI,EAAE,WAAW,CAAC,EAAE,IAAA,YAAG,EAAC,IAAI,EAAE,SAAS,CAAC,CAAC,CAAC;IACrE,CAAC,EAAE,CAAC,SAAS,EAAE,KAAK,EAAE,IAAI,CAAC,CAAC,CAAC;IAE7B,MAAM,MAAM,GAAG,cAAc,CAAC,MAAM,IAAI,UAAU,CAAC;IAEnD,MAAM,EAAC,YAAY,EAAE,cAAc,EAAC,GAAG,IAAA,eAAO,EAAC,GAAE,EAAE;QAC/C,IAAG,CAAC,MAAM;YAAE,OAAO,EAAE,CAAC;QACtB,0FAA0F;QAC1F,IAAG,WAAW,KAAK,MAAM,EAAE,CAAC;YACxB,MAAM,EAAC,IAAI,EAAE,KAAK,EAAE,QAAQ,EAAE,GAAG,gBAAgB,EAAC,GAAG,MAAM,CAAC;YAC5D,OAAO;gBACH,cAAc,EAAE,EAAC,IAAI,EAAE,KAAK,EAAE,QAAQ,EAAC;gBACvC,aAAa,EAAE,gBAAgB;aAClC,CAAA;QACL,CAAC;QACD,OAAO,EAAC,YAAY,EAAE,MAAM,EAAC,CAAC;IAClC,CAAC,EAAE,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC,CAAC;IAExB,MAAM,gBAAgB,GAAG,IAAA,iBAAS,EAAC,YAAY,CAAC,CAAC;IACjD,MAAM,cAAc,GAAG,MAAM,CAAC,CAAC,CAAC,gBAAgB,CAAC,CAAC,CAAC,WAAW,CAAC;IAE/D,OAAO,CACH,8BAAC,aAAa,IACV,OAAO,WACH,KAAK,KACL,cAAc,EAClB,MAAM,EAAE,cAAc,EACtB,OAAO,EAAE,cAAc,EACvB,OAAO,EAAE,cAAc,EACvB,GAAG,EAAE,YAAY,GACnB,CACL,CAAC;AACN,CAAC,CAAC,CAAC;AAtCU,QAAA,YAAY,gBAsCtB;AAGU,QAAA,WAAW,GAAG,oBAAY,CAAC;AACxC,kBAAe,oBAAY,CAAC"}
+{"version":3,"file":"withSettings.js","sourceRoot":"","sources":["../../../../../src/components/hoc/withSettings.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,mCAAqC;AACrC,+CAA0D;AAC1D,uCAAkE;AAM3D,MAAM,YAAY,GAAG,CAAC,EAAE,IAAI,EAAE,WAAW,EAAE,YAAY,GAAG,EAAE,EAAE,oBAAoB,GAAG,EAAE,EAAE,EAAE,EAAE,CAAC,CAAmB,aAAqC,EAAE,EAAE,CAAC,CAAC,KAA0B,EAAE,EAAE;IAC7L,MAAM,EAAE,KAAK,EAAE,SAAS,GAAG,KAAK,EAAE,WAAW,GAAG,SAAS,IAAI,GAAG,SAAS,SAAS,EAAE,MAAM,EAAE,UAAU,EAAE,GAAG,EAAE,GAAG,cAAc,EAAE,GAAG,KAAK,CAAC;IACzI,MAAM,EAAE,IAAI,EAAE,GAAG,IAAA,wBAAgB,GAAE,CAAC;IAEpC,sCAAsC;IACtC,MAAM,cAAc,GAAQ,IAAA,eAAO,EAAC,GAAG,EAAE;QACrC,OAAO,IAAA,eAAM,EAAC,EAAE,EAAE,IAAA,YAAG,EAAC,IAAI,EAAE,WAAW,CAAC,EAAE,IAAA,YAAG,EAAC,IAAI,EAAE,SAAS,CAAC,CAAC,CAAC;IACpE,CAAC,EAAE,CAAC,SAAS,EAAE,KAAK,EAAE,IAAI,CAAC,CAAC,CAAC;IAE7B,MAAM,MAAM,GAAG,cAAc,CAAC,MAAM,IAAI,UAAU,CAAC;IAEnD,MAAM,EAAE,YAAY,EAAE,cAAc,EAAE,GAAG,IAAA,eAAO,EAAC,GAAG,EAAE;QAClD,IAAI,CAAC,MAAM;YAAE,OAAO,EAAE,CAAC;QACvB,0FAA0F;QAC1F,IAAI,WAAW,KAAK,MAAM,EAAE,CAAC;YACzB,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,QAAQ,EAAE,GAAG,gBAAgB,EAAE,GAAG,MAAM,CAAC;YAC9D,OAAO;gBACH,cAAc,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,QAAQ,EAAE;gBACzC,aAAa,EAAE,gBAAgB;aAClC,CAAA;QACL,CAAC;QACD,OAAO,EAAE,YAAY,EAAE,MAAM,EAAE,CAAC;IACpC,CAAC,EAAE,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC,CAAC;IAExB,MAAM,gBAAgB,GAAG,IAAA,iBAAS,EAAC,YAAY,CAAC,CAAC;IAEjD,OAAO,CACH,8BAAC,aAAa,IACV,OAAO,WACH,cAAc,EAClB,OAAO,EAAE,gBAAgB,EACzB,MAAM,EAAE,cAAc,EACtB,GAAG,EAAE,GAAG,KACJ,cAAc,GACpB,CACL,CAAC;AACN,CAAC,CAAC;AApCW,QAAA,YAAY,gBAoCvB;AAEW,QAAA,WAAW,GAAG,oBAAY,CAAC;AACxC,kBAAe,oBAAY,CAAC"}

package/dist/cjs/src/reducers/modals.d.ts

@@ -11,6 +11,7 @@ export interface AppModal {
      * @description: Only used for mobile apps.
      */
     presentationStyle?: 'pageSheet' | 'formSheet' | 'fullScreen' | 'overFullScreen' | 'bottomSheet';
+    visible?: boolean;
 }
 export declare const showModal: (options: Partial<AppModal>) => {
     type: string;
@@ -25,6 +26,11 @@ export declare const closeModal: (id: any) => {
     type: string;
     id: any;
 };
+export declare const hideModal: (id: any) => {
+    type: string;
+    id: number;
+    modalUpdates: Partial<AppModal>;
+};
 declare const _default: (state: any, action: any) => any;
 export default _default;
 //# sourceMappingURL=modals.d.ts.map

package/dist/cjs/src/reducers/modals.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"modals.d.ts","sourceRoot":"","sources":["../../../../src/reducers/modals.tsx"],"names":[],"mappings":"AAEA,eAAO,MAAM,UAAU,eAAe,CAAC;AACvC,eAAO,MAAM,YAAY,iBAAiB,CAAC;AAC3C,eAAO,MAAM,WAAW,gBAAgB,CAAC;AAEzC,MAAM,WAAW,QAAQ;IACrB,EAAE,EAAE,MAAM,CAAC;IACX,SAAS,EAAE,GAAG,CAAC;IACf,KAAK,EAAE,GAAG,CAAC;IACX,SAAS,EAAE,OAAO,CAAC;IACnB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB;;OAEG;IACH,iBAAiB,CAAC,EAAE,WAAW,GAAG,WAAW,GAAG,YAAY,GAAG,gBAAgB,GAAG,aAAa,CAAC;CACnG;AAGD,eAAO,MAAM,SAAS,GAAI,SAAS,OAAO,CAAC,QAAQ,CAAC;;;CAmBnD,CAAC;AAEF,eAAO,MAAM,WAAW,GAAI,IAAI,QAAQ,CAAC,IAAI,CAAC,EAAE,SAAS,OAAO,CAAC,QAAQ,CAAC;;;;CAMzE,CAAA;AAED,eAAO,MAAM,UAAU,GAAI,OAAE;;;CAG3B,CAAC;yBAIa,UAAoB,EAAE,WAAM;AAA5C,wBAoBC"}
+{"version":3,"file":"modals.d.ts","sourceRoot":"","sources":["../../../../src/reducers/modals.tsx"],"names":[],"mappings":"AAEA,eAAO,MAAM,UAAU,eAAe,CAAC;AACvC,eAAO,MAAM,YAAY,iBAAiB,CAAC;AAC3C,eAAO,MAAM,WAAW,gBAAgB,CAAC;AAEzC,MAAM,WAAW,QAAQ;IACrB,EAAE,EAAE,MAAM,CAAC;IACX,SAAS,EAAE,GAAG,CAAC;IACf,KAAK,EAAE,GAAG,CAAC;IACX,SAAS,EAAE,OAAO,CAAC;IACnB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB;;OAEG;IACH,iBAAiB,CAAC,EAAE,WAAW,GAAG,WAAW,GAAG,YAAY,GAAG,gBAAgB,GAAG,aAAa,CAAC;IAChG,OAAO,CAAC,EAAE,OAAO,CAAC;CACrB;AAGD,eAAO,MAAM,SAAS,GAAI,SAAS,OAAO,CAAC,QAAQ,CAAC;;;CAoBnD,CAAC;AAEF,eAAO,MAAM,WAAW,GAAI,IAAI,QAAQ,CAAC,IAAI,CAAC,EAAE,SAAS,OAAO,CAAC,QAAQ,CAAC;;;;CAMzE,CAAA;AAED,eAAO,MAAM,UAAU,GAAI,OAAE;;;CAG3B,CAAC;AAEH,eAAO,MAAM,SAAS,GAAI,OAAE;;;;CAAwC,CAAC;yBAIrD,UAAoB,EAAE,WAAM;AAA5C,wBAoBC"}

package/dist/cjs/src/reducers/modals.js

@@ -1,13 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.closeModal = exports.updateModal = exports.showModal = exports.CLOSE_MODAL = exports.UPDATE_MODAL = exports.SHOW_MODAL = void 0;
+exports.hideModal = exports.closeModal = exports.updateModal = exports.showModal = exports.CLOSE_MODAL = exports.UPDATE_MODAL = exports.SHOW_MODAL = void 0;
 const lodash_1 = require("lodash");
 exports.SHOW_MODAL = 'modal/show';
 exports.UPDATE_MODAL = 'modal/update';
 exports.CLOSE_MODAL = 'modal/close';
 // export const showModal = (component, props = {})=>({
 const showModal = (options) => {
-    const { id = (0, lodash_1.random)(Number.MAX_SAFE_INTEGER), component, props = {}, closeable = true, zIndex = 0, presentationStyle = 'bottomSheet' } = options;
+    const { id = (0, lodash_1.random)(Number.MAX_SAFE_INTEGER), component, props = {}, closeable = true, zIndex = 0, presentationStyle = 'bottomSheet', visible = true } = options;
     if (!component) {
         throw new Error('Modal component is required');
     }
@@ -18,6 +18,7 @@ const showModal = (options) => {
         closeable,
         zIndex,
         presentationStyle,
+        visible,
     };
     return {
         type: exports.SHOW_MODAL,
@@ -38,6 +39,8 @@ const closeModal = (id) => ({
     id,
 });
 exports.closeModal = closeModal;
+const hideModal = (id) => (0, exports.updateModal)(id, { visible: false });
+exports.hideModal = hideModal;
 let initialState = [];
 exports.default = (state = initialState, action) => {
     switch (action.type) {

package/dist/cjs/src/reducers/modals.js.map

@@ -1 +1 @@
-{"version":3,"file":"modals.js","sourceRoot":"","sources":["../../../../src/reducers/modals.tsx"],"names":[],"mappings":";;;AAAA,mCAAgD;AAEnC,QAAA,UAAU,GAAG,YAAY,CAAC;AAC1B,QAAA,YAAY,GAAG,cAAc,CAAC;AAC9B,QAAA,WAAW,GAAG,aAAa,CAAC;AAczC,uDAAuD;AAChD,MAAM,SAAS,GAAG,CAAC,OAA0B,EAAC,EAAE;IACnD,MAAM,EAAC,EAAE,GAAG,IAAA,eAAM,EAAC,MAAM,CAAC,gBAAgB,CAAC,EAAE,SAAS,EAAE,KAAK,GAAG,EAAE,EAAE,SAAS,GAAG,IAAI,EAAE,MAAM,GAAG,CAAC,EAAE,iBAAiB,GAAG,aAAa,EAAC,GAAG,OAAO,CAAC;IAE/I,IAAI,CAAC,SAAS,EAAE,CAAC;QACb,MAAM,IAAI,KAAK,CAAC,6BAA6B,CAAC,CAAC;IACnD,CAAC;IAED,MAAM,KAAK,GAAa;QACpB,EAAE;QACF,SAAS;QACT,KAAK;QACL,SAAS;QACT,MAAM;QACN,iBAAiB;KACpB,CAAC;IACF,OAAO;QACH,IAAI,EAAE,kBAAU;QAChB,KAAK;KACR,CAAA;AACL,CAAC,CAAC;AAnBW,QAAA,SAAS,aAmBpB;AAEK,MAAM,WAAW,GAAG,CAAC,EAAkB,EAAE,OAA0B,EAAC,EAAE;IACzE,OAAO;QACH,IAAI,EAAE,oBAAY;QAClB,EAAE;QACF,YAAY,EAAE,OAAO;KACxB,CAAA;AACL,CAAC,CAAA;AANY,QAAA,WAAW,eAMvB;AAEM,MAAM,UAAU,GAAG,CAAC,EAAE,EAAC,EAAE,CAAA,CAAC;IAC7B,IAAI,EAAE,mBAAW;IACjB,EAAE;CACL,CAAC,CAAC;AAHU,QAAA,UAAU,cAGpB;AAEH,IAAI,YAAY,GAAO,EAAE,CAAC;AAE1B,kBAAe,CAAC,KAAK,GAAG,YAAY,EAAE,MAAM,EAAC,EAAE;IAC3C,QAAQ,MAAM,CAAC,IAAI,EAAE,CAAC;QAClB,KAAK,kBAAU,CAAC,CAAA,CAAC;YACb,MAAM,QAAQ,GAAG;gBACb,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC,CAAA,EAAE,CAAA,CAAC,CAAC,EAAE,KAAG,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,EAAE,mEAAmE;gBAC/G,MAAM,CAAC,KAAK;aACf,CAAC;YACF,wBAAwB;YACxB,OAAO,IAAA,eAAM,EAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;QACtC,CAAC;QACD,KAAK,oBAAY,CAAC,CAAA,CAAC;YACf,MAAM,QAAQ,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC,CAAA,EAAE,CAAA,CAAC,CAAC,EAAE,KAAG,MAAM,CAAC,EAAE,CAAA,CAAC,CAAA,EAAC,GAAG,CAAC,EAAE,GAAG,MAAM,CAAC,YAAY,EAAC,CAAA,CAAC,CAAA,CAAC,CAAC,CAAC;YACjF,wBAAwB;YACxB,OAAO,IAAA,eAAM,EAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;QACtC,CAAC;QACD,KAAK,mBAAW;YACZ,OAAO,KAAK,CAAC,MAAM,CAAC,CAAC,CAAA,EAAE,CAAA,CAAC,CAAC,EAAE,KAAG,MAAM,CAAC,EAAE,CAAC,CAAC;QAC7C;YACI,OAAO,KAAK,CAAC;IACrB,CAAC;AACL,CAAC,CAAA"}
+{"version":3,"file":"modals.js","sourceRoot":"","sources":["../../../../src/reducers/modals.tsx"],"names":[],"mappings":";;;AAAA,mCAAgD;AAEnC,QAAA,UAAU,GAAG,YAAY,CAAC;AAC1B,QAAA,YAAY,GAAG,cAAc,CAAC;AAC9B,QAAA,WAAW,GAAG,aAAa,CAAC;AAezC,uDAAuD;AAChD,MAAM,SAAS,GAAG,CAAC,OAA0B,EAAE,EAAE;IACpD,MAAM,EAAE,EAAE,GAAG,IAAA,eAAM,EAAC,MAAM,CAAC,gBAAgB,CAAC,EAAE,SAAS,EAAE,KAAK,GAAG,EAAE,EAAE,SAAS,GAAG,IAAI,EAAE,MAAM,GAAG,CAAC,EAAE,iBAAiB,GAAG,aAAa,EAAE,OAAO,GAAG,IAAI,EAAE,GAAG,OAAO,CAAC;IAEjK,IAAI,CAAC,SAAS,EAAE,CAAC;QACb,MAAM,IAAI,KAAK,CAAC,6BAA6B,CAAC,CAAC;IACnD,CAAC;IAED,MAAM,KAAK,GAAa;QACpB,EAAE;QACF,SAAS;QACT,KAAK;QACL,SAAS;QACT,MAAM;QACN,iBAAiB;QACjB,OAAO;KACV,CAAC;IACF,OAAO;QACH,IAAI,EAAE,kBAAU;QAChB,KAAK;KACR,CAAA;AACL,CAAC,CAAC;AApBW,QAAA,SAAS,aAoBpB;AAEK,MAAM,WAAW,GAAG,CAAC,EAAkB,EAAE,OAA0B,EAAE,EAAE;IAC1E,OAAO;QACH,IAAI,EAAE,oBAAY;QAClB,EAAE;QACF,YAAY,EAAE,OAAO;KACxB,CAAA;AACL,CAAC,CAAA;AANY,QAAA,WAAW,eAMvB;AAEM,MAAM,UAAU,GAAG,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;IAC/B,IAAI,EAAE,mBAAW;IACjB,EAAE;CACL,CAAC,CAAC;AAHU,QAAA,UAAU,cAGpB;AAEI,MAAM,SAAS,GAAG,CAAC,EAAE,EAAE,EAAE,CAAC,IAAA,mBAAW,EAAC,EAAE,EAAE,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC,CAAC;AAAxD,QAAA,SAAS,aAA+C;AAErE,IAAI,YAAY,GAAQ,EAAE,CAAC;AAE3B,kBAAe,CAAC,KAAK,GAAG,YAAY,EAAE,MAAM,EAAE,EAAE;IAC5C,QAAQ,MAAM,CAAC,IAAI,EAAE,CAAC;QAClB,KAAK,kBAAU,CAAC,CAAC,CAAC;YACd,MAAM,QAAQ,GAAG;gBACb,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,EAAE,mEAAmE;gBACnH,MAAM,CAAC,KAAK;aACf,CAAC;YACF,wBAAwB;YACxB,OAAO,IAAA,eAAM,EAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;QACtC,CAAC;QACD,KAAK,oBAAY,CAAC,CAAC,CAAC;YAChB,MAAM,QAAQ,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,GAAG,CAAC,EAAE,GAAG,MAAM,CAAC,YAAY,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;YAC3F,wBAAwB;YACxB,OAAO,IAAA,eAAM,EAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;QACtC,CAAC;QACD,KAAK,mBAAW;YACZ,OAAO,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,MAAM,CAAC,EAAE,CAAC,CAAC;QACjD;YACI,OAAO,KAAK,CAAC;IACrB,CAAC;AACL,CAAC,CAAA"}

package/dist/esm/src/components/hoc/withSettings.app.d.ts

@@ -1,18 +1,19 @@
-import React, { PropsWithChildren, PropsWithoutRef, RefAttributes } from 'react';
+import React, { PropsWithChildren } from 'react';
 type ModalProps = {
     model?: string;
     dataModel?: string;
     configModel?: string;
+    ref?: any;
 };
-export type ComponentWithSettings<P extends Object> = React.ForwardRefExoticComponent<PropsWithoutRef<PropsWithChildren<P & ModalProps>> & RefAttributes<any>>;
+type PropsWithSetting<P> = PropsWithChildren<P & ModalProps>;
+export type ComponentWithSettings<P> = React.ComponentType<PropsWithSetting<P>>;
 export type SettingOptions = {
+    name: string;
     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;
-}) => React.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 declare const withSettings: (settingOptions: SettingOptions) => <P extends Object>(BaseComponent: React.ComponentType<P>) => React.ComponentType<PropsWithSetting<P>>;
+export declare const withModelPropsLoader: (settingOptions: SettingOptions) => <P = Object>(BaseComponent: React.ComponentType<P>) => React.ComponentType<PropsWithSetting<P>>;
+export declare const withToolbar: (settingOptions: SettingOptions) => <P extends Object>(BaseComponent: React.ComponentType<P>) => React.ComponentType<PropsWithSetting<P>>;
 export default withSettings;
 //# sourceMappingURL=withSettings.app.d.ts.map

package/dist/esm/src/components/hoc/withSettings.app.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"withSettings.app.d.ts","sourceRoot":"","sources":["../../../../../src/components/hoc/withSettings.app.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,EAAc,iBAAiB,EAAE,eAAe,EAAE,aAAa,EAAW,MAAM,OAAO,CAAC;AAGtG,KAAK,UAAU,GAAG;IAAC,KAAK,CAAC,EAAE,MAAM,CAAC;IAAC,SAAS,CAAC,EAAE,MAAM,CAAC;IAAC,WAAW,CAAC,EAAE,MAAM,CAAA;CAAE,CAAA;AAE7E,MAAM,MAAM,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,MAAM,MAAM,cAAc,GAAG;IAAC,YAAY,EAAE,GAAG,EAAE,CAAC;IAAC,oBAAoB,EAAE,GAAG,EAAE,CAAA;CAAC,CAAC;AAEhF,eAAO,MAAM,YAAY,GAAI,gBAAgB,cAAc,MAAM,CAAC,SAAS,MAAM,EAAE,eAAe,KAAK,CAAC,aAAa,CAAC,CAAC,CAAC,+HAkBvH,CAAA;AAGD,eAAO,MAAM,oBAAoB,GAAE,gBAAgB,cAAc,MAAM,CAAC,SAAS,MAAM,EAAE,eAAe,KAAK,CAAC,aAAa,CAAC,CAAC,CAAC,MAAM,OAAO,CAAC,GAAG,UAAU,GAAG;IAAE,SAAS,EAAE,GAAG,CAAA;CAAE,sBAiB7K,CAAC;AAGF,eAAO,MAAM,WAAW,mBAzCqB,cAAc,MAAM,CAAC,SAAS,MAAM,EAAE,eAAe,KAAK,CAAC,aAAa,CAAC,CAAC,CAAC,+HAyCjF,CAAC;AACxC,eAAe,YAAY,CAAC"}
+{"version":3,"file":"withSettings.app.d.ts","sourceRoot":"","sources":["../../../../../src/components/hoc/withSettings.app.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,EAAc,iBAAiB,EAA2C,MAAM,OAAO,CAAC;AAGtG,KAAK,UAAU,GAAG;IAAE,KAAK,CAAC,EAAE,MAAM,CAAC;IAAC,SAAS,CAAC,EAAE,MAAM,CAAC;IAAC,WAAW,CAAC,EAAE,MAAM,CAAC;IAAC,GAAG,CAAC,EAAE,GAAG,CAAA;CAAE,CAAA;AAEzF,KAAK,gBAAgB,CAAC,CAAC,IAAI,iBAAiB,CAAC,CAAC,GAAG,UAAU,CAAC,CAAC;AAE7D,MAAM,MAAM,qBAAqB,CAAC,CAAC,IAAI,KAAK,CAAC,aAAa,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC,CAAA;AAE/E,MAAM,MAAM,cAAc,GAAG;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,YAAY,EAAE,GAAG,EAAE,CAAC;IAAC,oBAAoB,EAAE,GAAG,EAAE,CAAA;CAAE,CAAC;AAEhG,eAAO,MAAM,YAAY,GAAI,gBAAgB,cAAc,MAAM,CAAC,SAAS,MAAM,EAAE,eAAe,KAAK,CAAC,aAAa,CAAC,CAAC,CAAC,KAAG,KAAK,CAAC,aAAa,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAmBjK,CAAA;AAGD,eAAO,MAAM,oBAAoB,GAAI,gBAAgB,cAAc,MAAM,CAAC,GAAG,MAAM,EAAE,eAAe,KAAK,CAAC,aAAa,CAAC,CAAC,CAAC,KAAG,KAAK,CAAC,aAAa,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAiBnK,CAAC;AAGF,eAAO,MAAM,WAAW,mBA1CqB,cAAc,MAAM,CAAC,SAAS,MAAM,EAAE,eAAe,KAAK,CAAC,aAAa,CAAC,CAAC,CAAC,KAAG,KAAK,CAAC,aAAa,CAAC,gBAAgB,CAAC,CAAC,CAAC,CA0C3H,CAAC;AACxC,eAAe,YAAY,CAAC"}

package/dist/esm/src/components/hoc/withSettings.app.js

@@ -1,26 +1,26 @@
 import { assign, get } from 'lodash';
-import React, { forwardRef, useMemo } from 'react';
+import React, { useMemo } from 'react';
 import { useComponentData } from '../../hooks';
 export const withSettings = (settingOptions) => (BaseComponent) => {
     const ComponentWithModalPropsLoader = withModelPropsLoader(settingOptions)(BaseComponent);
-    return forwardRef((props, forwardedRef) => {
-        const { model, dataModel = model, configModel = dataModel && `${dataModel}_config`, ...remainingProps } = props;
+    return (props) => {
+        const { model, dataModel = model, configModel = dataModel && `${dataModel}_config`, ref, ...remainingProps } = props;
         if (dataModel || configModel) {
-            return React.createElement(ComponentWithModalPropsLoader, { _innerRef: forwardedRef, dataModel: dataModel, configModel: configModel, ...remainingProps });
+            return React.createElement(ComponentWithModalPropsLoader, { ref: ref, model: model, dataModel: dataModel, configModel: configModel, ...remainingProps });
         }
         else {
-            return React.createElement(BaseComponent, { ref: forwardedRef, ...props });
+            return React.createElement(BaseComponent, { ref: ref, ...props });
         }
-    });
+    };
 };
 export const withModelPropsLoader = (settingOptions) => (BaseComponent) => (props) => {
-    const { model, _innerRef, dataModel = model, configModel = dataModel && `${dataModel}_config`, ...remainingProps } = props;
+    const { model, ref, dataModel = model, configModel = dataModel && `${dataModel}_config`, ...remainingProps } = props;
     const { data } = useComponentData();
     // Extract values from component data,
     const propsFromModel = useMemo(() => {
         return assign({}, get(data, configModel), get(data, dataModel));
     }, [dataModel, props, data]);
-    return (React.createElement(BaseComponent, { ref: _innerRef, ...remainingProps, ...propsFromModel }));
+    return (React.createElement(BaseComponent, { ref: ref, ...remainingProps, ...propsFromModel }));
 };
 export const withToolbar = withSettings;
 export default withSettings;

package/dist/esm/src/components/hoc/withSettings.app.js.map

@@ -1 +1 @@
-{"version":3,"file":"withSettings.app.js","sourceRoot":"","sources":["../../../../../src/components/hoc/withSettings.app.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,QAAQ,CAAC;AACrC,OAAO,KAAK,EAAE,EAAE,UAAU,EAAqD,OAAO,EAAE,MAAM,OAAO,CAAC;AACtG,OAAO,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAQ/C,MAAM,CAAC,MAAM,YAAY,GAAG,CAAC,cAA8B,EAAE,EAAE,CAAC,CAAmB,aAAqC,EAAE,EAAE;IAExH,MAAM,6BAA6B,GAAG,oBAAoB,CAAC,cAAc,CAAC,CAAC,aAAa,CAAC,CAAC;IAE1F,OAAO,UAAU,CAAyC,CAAC,KAAU,EAAE,YAAY,EAAE,EAAE;QACnF,MAAM,EAAE,KAAK,EAAE,SAAS,GAAG,KAAK,EAAG,WAAW,GAAG,SAAS,IAAI,GAAG,SAAS,SAAS,EAAE,GAAG,cAAc,EAAC,GAAG,KAAK,CAAC;QAEhH,IAAG,SAAS,IAAI,WAAW,EAAE,CAAC;YAC1B,OAAO,oBAAC,6BAA6B,IACzB,SAAS,EAAE,YAAY,EACvB,SAAS,EAAE,SAAS,EACpB,WAAW,EAAE,WAAW,KACpB,cAAc,GACpB,CAAA;QACd,CAAC;aAAM,CAAC;YACJ,OAAO,oBAAC,aAAa,IAAC,GAAG,EAAE,YAAY,KAAM,KAAK,GAAI,CAAA;QAC1D,CAAC;IACL,CAAC,CAAC,CAAC;AACP,CAAC,CAAA;AAGD,MAAM,CAAC,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,EAAE,GAAG,cAAc,EAAC,GAAG,KAAK,CAAC;IAC3H,MAAM,EAAC,IAAI,EAAC,GAAG,gBAAgB,EAAE,CAAC;IAElC,sCAAsC;IACtC,MAAM,cAAc,GAAQ,OAAO,CAAC,GAAE,EAAE;QACpC,OAAQ,MAAM,CAAC,EAAE,EAAE,GAAG,CAAC,IAAI,EAAE,WAAW,CAAC,EAAE,GAAG,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC,CAAC;IACrE,CAAC,EAAE,CAAC,SAAS,EAAE,KAAK,EAAE,IAAI,CAAC,CAAC,CAAC;IAE7B,OAAO,CACH,oBAAC,aAAa,IACV,GAAG,EAAE,SAAS,KACV,cAAc,KACd,cAAc,GACpB,CACL,CAAC;AACN,CAAC,CAAC;AAGF,MAAM,CAAC,MAAM,WAAW,GAAG,YAAY,CAAC;AACxC,eAAe,YAAY,CAAC"}
+{"version":3,"file":"withSettings.app.js","sourceRoot":"","sources":["../../../../../src/components/hoc/withSettings.app.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,QAAQ,CAAC;AACrC,OAAO,KAAK,EAAE,EAAiE,OAAO,EAAE,MAAM,OAAO,CAAC;AACtG,OAAO,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAU/C,MAAM,CAAC,MAAM,YAAY,GAAG,CAAC,cAA8B,EAAE,EAAE,CAAC,CAAmB,aAAqC,EAA4C,EAAE;IAElK,MAAM,6BAA6B,GAAG,oBAAoB,CAAC,cAAc,CAAC,CAAC,aAAa,CAAC,CAAC;IAE1F,OAAO,CAAC,KAAK,EAAE,EAAE;QACb,MAAM,EAAE,KAAK,EAAE,SAAS,GAAG,KAAK,EAAE,WAAW,GAAG,SAAS,IAAI,GAAG,SAAS,SAAS,EAAE,GAAG,EAAE,GAAG,cAAc,EAAE,GAAG,KAAY,CAAC;QAE5H,IAAI,SAAS,IAAI,WAAW,EAAE,CAAC;YAC3B,OAAO,oBAAC,6BAA6B,IACjC,GAAG,EAAE,GAAG,EACR,KAAK,EAAE,KAAK,EACZ,SAAS,EAAE,SAAS,EACpB,WAAW,EAAE,WAAW,KACpB,cAAc,GACpB,CAAA;QACN,CAAC;aAAM,CAAC;YACJ,OAAO,oBAAC,aAAa,IAAC,GAAG,EAAE,GAAG,KAAM,KAAK,GAAI,CAAA;QACjD,CAAC;IACL,CAAC,CAAC;AACN,CAAC,CAAA;AAGD,MAAM,CAAC,MAAM,oBAAoB,GAAG,CAAC,cAA8B,EAAE,EAAE,CAAC,CAAa,aAAqC,EAA4C,EAAE,CAAC,CAAC,KAA0B,EAAE,EAAE;IAEpM,MAAM,EAAE,KAAK,EAAE,GAAG,EAAE,SAAS,GAAG,KAAK,EAAE,WAAW,GAAG,SAAS,IAAI,GAAG,SAAS,SAAS,EAAE,GAAG,cAAc,EAAE,GAAG,KAAK,CAAC;IACrH,MAAM,EAAE,IAAI,EAAE,GAAG,gBAAgB,EAAE,CAAC;IAEpC,sCAAsC;IACtC,MAAM,cAAc,GAAQ,OAAO,CAAC,GAAG,EAAE;QACrC,OAAO,MAAM,CAAC,EAAE,EAAE,GAAG,CAAC,IAAI,EAAE,WAAW,CAAC,EAAE,GAAG,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC,CAAC;IACpE,CAAC,EAAE,CAAC,SAAS,EAAE,KAAK,EAAE,IAAI,CAAC,CAAC,CAAC;IAE7B,OAAO,CACH,oBAAC,aAAa,IACV,GAAG,EAAE,GAAG,KACJ,cAAc,KACd,cAAc,GACpB,CACL,CAAC;AACN,CAAC,CAAC;AAGF,MAAM,CAAC,MAAM,WAAW,GAAG,YAAY,CAAC;AACxC,eAAe,YAAY,CAAC"}

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

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

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

@@ -1 +1 @@
-{"version":3,"file":"withSettings.d.ts","sourceRoot":"","sources":["../../../../../src/components/hoc/withSettings.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,EAAE,iBAAiB,EAAE,eAAe,EAAE,aAAa,EAAuB,MAAM,OAAO,CAAC;AACtG,OAAO,EAAE,MAAM,EAA+B,MAAM,aAAa,CAAC;AAElE,KAAK,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,MAAM,MAAM,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,GAAE;;;;CAAiE,MAAM,CAAC,SAAS,MAAM,EAAE,eAAe,KAAK,CAAC,aAAa,CAAC,CAAC,CAAC,gIAsCvJ,CAAC;AAGH,eAAO,MAAM,WAAW;;;;OAzC0E,CAAC,SAAS,MAAM,EAAE,eAAe,KAAK,CAAC,aAAa,CAAC,CAAC,CAAC,gIAyClH,CAAC;AACxC,eAAe,YAAY,CAAC"}
+{"version":3,"file":"withSettings.d.ts","sourceRoot":"","sources":["../../../../../src/components/hoc/withSettings.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,EAAE,iBAAiB,EAAW,MAAM,OAAO,CAAC;AAC1D,OAAO,EAAE,MAAM,EAA+B,MAAM,aAAa,CAAC;AAElE,KAAK,WAAW,GAAG;IAAE,KAAK,CAAC,EAAE,MAAM,CAAC;IAAC,SAAS,CAAC,EAAE,MAAM,CAAC;IAAC,WAAW,CAAC,EAAE,MAAM,CAAC;IAAC,MAAM,CAAC,EAAE,MAAM,CAAC;IAAC,GAAG,CAAC,EAAE,GAAG,CAAA;CAAE,CAAA;AAC3G,KAAK,gBAAgB,CAAC,CAAC,SAAS,MAAM,IAAI,iBAAiB,CAAC,CAAC,GAAG,WAAW,CAAC,CAAA;AAC5E,MAAM,MAAM,qBAAqB,CAAC,CAAC,SAAS,MAAM,IAAI,KAAK,CAAC,aAAa,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC,CAAA;AAE9F,eAAO,MAAM,YAAY,GAAI;;;;CAAmE,MAAM,CAAC,SAAS,MAAM,EAAE,eAAe,KAAK,CAAC,aAAa,CAAC,CAAC,CAAC,MAAM,OAAO,gBAAgB,CAAC,CAAC,CAAC,sBAoC5L,CAAC;AAEF,eAAO,MAAM,WAAW;;;;OAtC8E,CAAC,SAAS,MAAM,EAAE,eAAe,KAAK,CAAC,aAAa,CAAC,CAAC,CAAC,MAAM,OAAO,gBAAgB,CAAC,CAAC,CAAC,sBAsCtJ,CAAC;AACxC,eAAe,YAAY,CAAC"}

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

@@ -1,8 +1,8 @@
 import { assign, get } from 'lodash';
-import React, { forwardRef, useMemo } from 'react';
+import React, { useMemo } from 'react';
 import { useAction, useComponentData } from '../../hooks';
-export const withSettings = ({ name: elementName, valueOptions = [], configurationOptions = [] }) => (BaseComponent) => forwardRef((props, forwardedRef) => {
-    const { model, dataModel = model, configModel = dataModel && `${dataModel}_config`, restrictEdit, action: actionProp, onPress, onClick: onClickProp = onPress } = props;
+export const withSettings = ({ name: elementName, valueOptions = [], configurationOptions = [] }) => (BaseComponent) => (props) => {
+    const { model, dataModel = model, configModel = dataModel && `${dataModel}_config`, action: actionProp, ref, ...remainingProps } = props;
     const { data } = useComponentData();
     // Extract values from component data,
     const propsFromModel = useMemo(() => {
@@ -23,9 +23,8 @@ export const withSettings = ({ name: elementName, valueOptions = [], configurati
         return { handleAction: action };
     }, [dataModel, action]);
     const actionClickEvent = useAction(handleAction);
-    const elementOnClick = action ? actionClickEvent : onClickProp;
-    return (React.createElement(BaseComponent, { animate: true, ...props, ...propsFromModel, action: forwardActions, onClick: elementOnClick, onPress: elementOnClick, ref: forwardedRef }));
-});
+    return (React.createElement(BaseComponent, { animate: true, ...propsFromModel, onClick: actionClickEvent, action: forwardActions, ref: ref, ...remainingProps }));
+};
 export const withToolbar = withSettings;
 export default withSettings;
 //# sourceMappingURL=withSettings.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"withSettings.js","sourceRoot":"","sources":["../../../../../src/components/hoc/withSettings.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,QAAQ,CAAC;AACrC,OAAO,KAAK,EAAE,EAAqD,UAAU,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;AACtG,OAAO,EAAU,SAAS,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAMlE,MAAM,CAAC,MAAM,YAAY,GAAC,CAAC,EAAC,IAAI,EAAE,WAAW,EAAE,YAAY,GAAG,EAAE,EAAE,oBAAoB,GAAG,EAAE,EAAC,EAAE,EAAE,CAAC,CAAmB,aAAqC,EAAE,EAAE,CAAC,UAAU,CAA0C,CAAC,KAAU,EAAE,YAAY,EAAE,EAAE;IAC3O,MAAM,EAAE,KAAK,EAAE,SAAS,GAAG,KAAK,EAAG,WAAW,GAAG,SAAS,IAAI,GAAG,SAAS,SAAS,EAAE,YAAY,EAAE,MAAM,EAAE,UAAU,EAAE,OAAO,EAAE,OAAO,EAAE,WAAW,GAAG,OAAO,EAAC,GAAG,KAAK,CAAC;IACxK,MAAM,EAAC,IAAI,EAAC,GAAG,gBAAgB,EAAE,CAAC;IAElC,sCAAsC;IACtC,MAAM,cAAc,GAAQ,OAAO,CAAC,GAAE,EAAE;QACpC,OAAQ,MAAM,CAAC,EAAE,EAAE,GAAG,CAAC,IAAI,EAAE,WAAW,CAAC,EAAE,GAAG,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC,CAAC;IACrE,CAAC,EAAE,CAAC,SAAS,EAAE,KAAK,EAAE,IAAI,CAAC,CAAC,CAAC;IAE7B,MAAM,MAAM,GAAG,cAAc,CAAC,MAAM,IAAI,UAAU,CAAC;IAEnD,MAAM,EAAC,YAAY,EAAE,cAAc,EAAC,GAAG,OAAO,CAAC,GAAE,EAAE;QAC/C,IAAG,CAAC,MAAM;YAAE,OAAO,EAAE,CAAC;QACtB,0FAA0F;QAC1F,IAAG,WAAW,KAAK,MAAM,EAAE,CAAC;YACxB,MAAM,EAAC,IAAI,EAAE,KAAK,EAAE,QAAQ,EAAE,GAAG,gBAAgB,EAAC,GAAG,MAAM,CAAC;YAC5D,OAAO;gBACH,cAAc,EAAE,EAAC,IAAI,EAAE,KAAK,EAAE,QAAQ,EAAC;gBACvC,aAAa,EAAE,gBAAgB;aAClC,CAAA;QACL,CAAC;QACD,OAAO,EAAC,YAAY,EAAE,MAAM,EAAC,CAAC;IAClC,CAAC,EAAE,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC,CAAC;IAExB,MAAM,gBAAgB,GAAG,SAAS,CAAC,YAAY,CAAC,CAAC;IACjD,MAAM,cAAc,GAAG,MAAM,CAAC,CAAC,CAAC,gBAAgB,CAAC,CAAC,CAAC,WAAW,CAAC;IAE/D,OAAO,CACH,oBAAC,aAAa,IACV,OAAO,WACH,KAAK,KACL,cAAc,EAClB,MAAM,EAAE,cAAc,EACtB,OAAO,EAAE,cAAc,EACvB,OAAO,EAAE,cAAc,EACvB,GAAG,EAAE,YAAY,GACnB,CACL,CAAC;AACN,CAAC,CAAC,CAAC;AAGH,MAAM,CAAC,MAAM,WAAW,GAAG,YAAY,CAAC;AACxC,eAAe,YAAY,CAAC"}
+{"version":3,"file":"withSettings.js","sourceRoot":"","sources":["../../../../../src/components/hoc/withSettings.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,QAAQ,CAAC;AACrC,OAAO,KAAK,EAAE,EAAqB,OAAO,EAAE,MAAM,OAAO,CAAC;AAC1D,OAAO,EAAU,SAAS,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAMlE,MAAM,CAAC,MAAM,YAAY,GAAG,CAAC,EAAE,IAAI,EAAE,WAAW,EAAE,YAAY,GAAG,EAAE,EAAE,oBAAoB,GAAG,EAAE,EAAE,EAAE,EAAE,CAAC,CAAmB,aAAqC,EAAE,EAAE,CAAC,CAAC,KAA0B,EAAE,EAAE;IAC7L,MAAM,EAAE,KAAK,EAAE,SAAS,GAAG,KAAK,EAAE,WAAW,GAAG,SAAS,IAAI,GAAG,SAAS,SAAS,EAAE,MAAM,EAAE,UAAU,EAAE,GAAG,EAAE,GAAG,cAAc,EAAE,GAAG,KAAK,CAAC;IACzI,MAAM,EAAE,IAAI,EAAE,GAAG,gBAAgB,EAAE,CAAC;IAEpC,sCAAsC;IACtC,MAAM,cAAc,GAAQ,OAAO,CAAC,GAAG,EAAE;QACrC,OAAO,MAAM,CAAC,EAAE,EAAE,GAAG,CAAC,IAAI,EAAE,WAAW,CAAC,EAAE,GAAG,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC,CAAC;IACpE,CAAC,EAAE,CAAC,SAAS,EAAE,KAAK,EAAE,IAAI,CAAC,CAAC,CAAC;IAE7B,MAAM,MAAM,GAAG,cAAc,CAAC,MAAM,IAAI,UAAU,CAAC;IAEnD,MAAM,EAAE,YAAY,EAAE,cAAc,EAAE,GAAG,OAAO,CAAC,GAAG,EAAE;QAClD,IAAI,CAAC,MAAM;YAAE,OAAO,EAAE,CAAC;QACvB,0FAA0F;QAC1F,IAAI,WAAW,KAAK,MAAM,EAAE,CAAC;YACzB,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,QAAQ,EAAE,GAAG,gBAAgB,EAAE,GAAG,MAAM,CAAC;YAC9D,OAAO;gBACH,cAAc,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,QAAQ,EAAE;gBACzC,aAAa,EAAE,gBAAgB;aAClC,CAAA;QACL,CAAC;QACD,OAAO,EAAE,YAAY,EAAE,MAAM,EAAE,CAAC;IACpC,CAAC,EAAE,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC,CAAC;IAExB,MAAM,gBAAgB,GAAG,SAAS,CAAC,YAAY,CAAC,CAAC;IAEjD,OAAO,CACH,oBAAC,aAAa,IACV,OAAO,WACH,cAAc,EAClB,OAAO,EAAE,gBAAgB,EACzB,MAAM,EAAE,cAAc,EACtB,GAAG,EAAE,GAAG,KACJ,cAAc,GACpB,CACL,CAAC;AACN,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,WAAW,GAAG,YAAY,CAAC;AACxC,eAAe,YAAY,CAAC"}

package/dist/esm/src/reducers/modals.d.ts

@@ -11,6 +11,7 @@ export interface AppModal {
      * @description: Only used for mobile apps.
      */
     presentationStyle?: 'pageSheet' | 'formSheet' | 'fullScreen' | 'overFullScreen' | 'bottomSheet';
+    visible?: boolean;
 }
 export declare const showModal: (options: Partial<AppModal>) => {
     type: string;
@@ -25,6 +26,11 @@ export declare const closeModal: (id: any) => {
     type: string;
     id: any;
 };
+export declare const hideModal: (id: any) => {
+    type: string;
+    id: number;
+    modalUpdates: Partial<AppModal>;
+};
 declare const _default: (state: any, action: any) => any;
 export default _default;
 //# sourceMappingURL=modals.d.ts.map

package/dist/esm/src/reducers/modals.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"modals.d.ts","sourceRoot":"","sources":["../../../../src/reducers/modals.tsx"],"names":[],"mappings":"AAEA,eAAO,MAAM,UAAU,eAAe,CAAC;AACvC,eAAO,MAAM,YAAY,iBAAiB,CAAC;AAC3C,eAAO,MAAM,WAAW,gBAAgB,CAAC;AAEzC,MAAM,WAAW,QAAQ;IACrB,EAAE,EAAE,MAAM,CAAC;IACX,SAAS,EAAE,GAAG,CAAC;IACf,KAAK,EAAE,GAAG,CAAC;IACX,SAAS,EAAE,OAAO,CAAC;IACnB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB;;OAEG;IACH,iBAAiB,CAAC,EAAE,WAAW,GAAG,WAAW,GAAG,YAAY,GAAG,gBAAgB,GAAG,aAAa,CAAC;CACnG;AAGD,eAAO,MAAM,SAAS,GAAI,SAAS,OAAO,CAAC,QAAQ,CAAC;;;CAmBnD,CAAC;AAEF,eAAO,MAAM,WAAW,GAAI,IAAI,QAAQ,CAAC,IAAI,CAAC,EAAE,SAAS,OAAO,CAAC,QAAQ,CAAC;;;;CAMzE,CAAA;AAED,eAAO,MAAM,UAAU,GAAI,OAAE;;;CAG3B,CAAC;yBAIa,UAAoB,EAAE,WAAM;AAA5C,wBAoBC"}
+{"version":3,"file":"modals.d.ts","sourceRoot":"","sources":["../../../../src/reducers/modals.tsx"],"names":[],"mappings":"AAEA,eAAO,MAAM,UAAU,eAAe,CAAC;AACvC,eAAO,MAAM,YAAY,iBAAiB,CAAC;AAC3C,eAAO,MAAM,WAAW,gBAAgB,CAAC;AAEzC,MAAM,WAAW,QAAQ;IACrB,EAAE,EAAE,MAAM,CAAC;IACX,SAAS,EAAE,GAAG,CAAC;IACf,KAAK,EAAE,GAAG,CAAC;IACX,SAAS,EAAE,OAAO,CAAC;IACnB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB;;OAEG;IACH,iBAAiB,CAAC,EAAE,WAAW,GAAG,WAAW,GAAG,YAAY,GAAG,gBAAgB,GAAG,aAAa,CAAC;IAChG,OAAO,CAAC,EAAE,OAAO,CAAC;CACrB;AAGD,eAAO,MAAM,SAAS,GAAI,SAAS,OAAO,CAAC,QAAQ,CAAC;;;CAoBnD,CAAC;AAEF,eAAO,MAAM,WAAW,GAAI,IAAI,QAAQ,CAAC,IAAI,CAAC,EAAE,SAAS,OAAO,CAAC,QAAQ,CAAC;;;;CAMzE,CAAA;AAED,eAAO,MAAM,UAAU,GAAI,OAAE;;;CAG3B,CAAC;AAEH,eAAO,MAAM,SAAS,GAAI,OAAE;;;;CAAwC,CAAC;yBAIrD,UAAoB,EAAE,WAAM;AAA5C,wBAoBC"}

package/dist/esm/src/reducers/modals.js

@@ -4,7 +4,7 @@ export const UPDATE_MODAL = 'modal/update';
 export const CLOSE_MODAL = 'modal/close';
 // export const showModal = (component, props = {})=>({
 export const showModal = (options) => {
-    const { id = random(Number.MAX_SAFE_INTEGER), component, props = {}, closeable = true, zIndex = 0, presentationStyle = 'bottomSheet' } = options;
+    const { id = random(Number.MAX_SAFE_INTEGER), component, props = {}, closeable = true, zIndex = 0, presentationStyle = 'bottomSheet', visible = true } = options;
     if (!component) {
         throw new Error('Modal component is required');
     }
@@ -15,6 +15,7 @@ export const showModal = (options) => {
         closeable,
         zIndex,
         presentationStyle,
+        visible,
     };
     return {
         type: SHOW_MODAL,
@@ -32,6 +33,7 @@ export const closeModal = (id) => ({
     type: CLOSE_MODAL,
     id,
 });
+export const hideModal = (id) => updateModal(id, { visible: false });
 let initialState = [];
 export default (state = initialState, action) => {
     switch (action.type) {

package/dist/esm/src/reducers/modals.js.map

@@ -1 +1 @@
-{"version":3,"file":"modals.js","sourceRoot":"","sources":["../../../../src/reducers/modals.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,EAAU,MAAM,QAAQ,CAAC;AAEhD,MAAM,CAAC,MAAM,UAAU,GAAG,YAAY,CAAC;AACvC,MAAM,CAAC,MAAM,YAAY,GAAG,cAAc,CAAC;AAC3C,MAAM,CAAC,MAAM,WAAW,GAAG,aAAa,CAAC;AAczC,uDAAuD;AACvD,MAAM,CAAC,MAAM,SAAS,GAAG,CAAC,OAA0B,EAAC,EAAE;IACnD,MAAM,EAAC,EAAE,GAAG,MAAM,CAAC,MAAM,CAAC,gBAAgB,CAAC,EAAE,SAAS,EAAE,KAAK,GAAG,EAAE,EAAE,SAAS,GAAG,IAAI,EAAE,MAAM,GAAG,CAAC,EAAE,iBAAiB,GAAG,aAAa,EAAC,GAAG,OAAO,CAAC;IAE/I,IAAI,CAAC,SAAS,EAAE,CAAC;QACb,MAAM,IAAI,KAAK,CAAC,6BAA6B,CAAC,CAAC;IACnD,CAAC;IAED,MAAM,KAAK,GAAa;QACpB,EAAE;QACF,SAAS;QACT,KAAK;QACL,SAAS;QACT,MAAM;QACN,iBAAiB;KACpB,CAAC;IACF,OAAO;QACH,IAAI,EAAE,UAAU;QAChB,KAAK;KACR,CAAA;AACL,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,WAAW,GAAG,CAAC,EAAkB,EAAE,OAA0B,EAAC,EAAE;IACzE,OAAO;QACH,IAAI,EAAE,YAAY;QAClB,EAAE;QACF,YAAY,EAAE,OAAO;KACxB,CAAA;AACL,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,UAAU,GAAG,CAAC,EAAE,EAAC,EAAE,CAAA,CAAC;IAC7B,IAAI,EAAE,WAAW;IACjB,EAAE;CACL,CAAC,CAAC;AAEH,IAAI,YAAY,GAAO,EAAE,CAAC;AAE1B,eAAe,CAAC,KAAK,GAAG,YAAY,EAAE,MAAM,EAAC,EAAE;IAC3C,QAAQ,MAAM,CAAC,IAAI,EAAE,CAAC;QAClB,KAAK,UAAU,CAAC,CAAA,CAAC;YACb,MAAM,QAAQ,GAAG;gBACb,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC,CAAA,EAAE,CAAA,CAAC,CAAC,EAAE,KAAG,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,EAAE,mEAAmE;gBAC/G,MAAM,CAAC,KAAK;aACf,CAAC;YACF,wBAAwB;YACxB,OAAO,MAAM,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;QACtC,CAAC;QACD,KAAK,YAAY,CAAC,CAAA,CAAC;YACf,MAAM,QAAQ,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC,CAAA,EAAE,CAAA,CAAC,CAAC,EAAE,KAAG,MAAM,CAAC,EAAE,CAAA,CAAC,CAAA,EAAC,GAAG,CAAC,EAAE,GAAG,MAAM,CAAC,YAAY,EAAC,CAAA,CAAC,CAAA,CAAC,CAAC,CAAC;YACjF,wBAAwB;YACxB,OAAO,MAAM,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;QACtC,CAAC;QACD,KAAK,WAAW;YACZ,OAAO,KAAK,CAAC,MAAM,CAAC,CAAC,CAAA,EAAE,CAAA,CAAC,CAAC,EAAE,KAAG,MAAM,CAAC,EAAE,CAAC,CAAC;QAC7C;YACI,OAAO,KAAK,CAAC;IACrB,CAAC;AACL,CAAC,CAAA"}
+{"version":3,"file":"modals.js","sourceRoot":"","sources":["../../../../src/reducers/modals.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,EAAU,MAAM,QAAQ,CAAC;AAEhD,MAAM,CAAC,MAAM,UAAU,GAAG,YAAY,CAAC;AACvC,MAAM,CAAC,MAAM,YAAY,GAAG,cAAc,CAAC;AAC3C,MAAM,CAAC,MAAM,WAAW,GAAG,aAAa,CAAC;AAezC,uDAAuD;AACvD,MAAM,CAAC,MAAM,SAAS,GAAG,CAAC,OAA0B,EAAE,EAAE;IACpD,MAAM,EAAE,EAAE,GAAG,MAAM,CAAC,MAAM,CAAC,gBAAgB,CAAC,EAAE,SAAS,EAAE,KAAK,GAAG,EAAE,EAAE,SAAS,GAAG,IAAI,EAAE,MAAM,GAAG,CAAC,EAAE,iBAAiB,GAAG,aAAa,EAAE,OAAO,GAAG,IAAI,EAAE,GAAG,OAAO,CAAC;IAEjK,IAAI,CAAC,SAAS,EAAE,CAAC;QACb,MAAM,IAAI,KAAK,CAAC,6BAA6B,CAAC,CAAC;IACnD,CAAC;IAED,MAAM,KAAK,GAAa;QACpB,EAAE;QACF,SAAS;QACT,KAAK;QACL,SAAS;QACT,MAAM;QACN,iBAAiB;QACjB,OAAO;KACV,CAAC;IACF,OAAO;QACH,IAAI,EAAE,UAAU;QAChB,KAAK;KACR,CAAA;AACL,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,WAAW,GAAG,CAAC,EAAkB,EAAE,OAA0B,EAAE,EAAE;IAC1E,OAAO;QACH,IAAI,EAAE,YAAY;QAClB,EAAE;QACF,YAAY,EAAE,OAAO;KACxB,CAAA;AACL,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,UAAU,GAAG,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;IAC/B,IAAI,EAAE,WAAW;IACjB,EAAE;CACL,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,SAAS,GAAG,CAAC,EAAE,EAAE,EAAE,CAAC,WAAW,CAAC,EAAE,EAAE,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC,CAAC;AAErE,IAAI,YAAY,GAAQ,EAAE,CAAC;AAE3B,eAAe,CAAC,KAAK,GAAG,YAAY,EAAE,MAAM,EAAE,EAAE;IAC5C,QAAQ,MAAM,CAAC,IAAI,EAAE,CAAC;QAClB,KAAK,UAAU,CAAC,CAAC,CAAC;YACd,MAAM,QAAQ,GAAG;gBACb,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,EAAE,mEAAmE;gBACnH,MAAM,CAAC,KAAK;aACf,CAAC;YACF,wBAAwB;YACxB,OAAO,MAAM,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;QACtC,CAAC;QACD,KAAK,YAAY,CAAC,CAAC,CAAC;YAChB,MAAM,QAAQ,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,GAAG,CAAC,EAAE,GAAG,MAAM,CAAC,YAAY,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;YAC3F,wBAAwB;YACxB,OAAO,MAAM,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;QACtC,CAAC;QACD,KAAK,WAAW;YACZ,OAAO,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,MAAM,CAAC,EAAE,CAAC,CAAC;QACjD;YACI,OAAO,KAAK,CAAC;IACrB,CAAC;AACL,CAAC,CAAA"}

package/dist/types/src/components/hoc/withSettings.app.d.ts

@@ -1,18 +1,19 @@
-import React, { PropsWithChildren, PropsWithoutRef, RefAttributes } from 'react';
+import React, { PropsWithChildren } from 'react';
 type ModalProps = {
     model?: string;
     dataModel?: string;
     configModel?: string;
+    ref?: any;
 };
-export type ComponentWithSettings<P extends Object> = React.ForwardRefExoticComponent<PropsWithoutRef<PropsWithChildren<P & ModalProps>> & RefAttributes<any>>;
+type PropsWithSetting<P> = PropsWithChildren<P & ModalProps>;
+export type ComponentWithSettings<P> = React.ComponentType<PropsWithSetting<P>>;
 export type SettingOptions = {
+    name: string;
     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;
-}) => React.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 declare const withSettings: (settingOptions: SettingOptions) => <P extends Object>(BaseComponent: React.ComponentType<P>) => React.ComponentType<PropsWithSetting<P>>;
+export declare const withModelPropsLoader: (settingOptions: SettingOptions) => <P = Object>(BaseComponent: React.ComponentType<P>) => React.ComponentType<PropsWithSetting<P>>;
+export declare const withToolbar: (settingOptions: SettingOptions) => <P extends Object>(BaseComponent: React.ComponentType<P>) => React.ComponentType<PropsWithSetting<P>>;
 export default withSettings;
 //# sourceMappingURL=withSettings.app.d.ts.map

package/dist/types/src/components/hoc/withSettings.app.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"withSettings.app.d.ts","sourceRoot":"","sources":["../../../../../src/components/hoc/withSettings.app.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,EAAc,iBAAiB,EAAE,eAAe,EAAE,aAAa,EAAW,MAAM,OAAO,CAAC;AAGtG,KAAK,UAAU,GAAG;IAAC,KAAK,CAAC,EAAE,MAAM,CAAC;IAAC,SAAS,CAAC,EAAE,MAAM,CAAC;IAAC,WAAW,CAAC,EAAE,MAAM,CAAA;CAAE,CAAA;AAE7E,MAAM,MAAM,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,MAAM,MAAM,cAAc,GAAG;IAAC,YAAY,EAAE,GAAG,EAAE,CAAC;IAAC,oBAAoB,EAAE,GAAG,EAAE,CAAA;CAAC,CAAC;AAEhF,eAAO,MAAM,YAAY,GAAI,gBAAgB,cAAc,MAAM,CAAC,SAAS,MAAM,EAAE,eAAe,KAAK,CAAC,aAAa,CAAC,CAAC,CAAC,+HAkBvH,CAAA;AAGD,eAAO,MAAM,oBAAoB,GAAE,gBAAgB,cAAc,MAAM,CAAC,SAAS,MAAM,EAAE,eAAe,KAAK,CAAC,aAAa,CAAC,CAAC,CAAC,MAAM,OAAO,CAAC,GAAG,UAAU,GAAG;IAAE,SAAS,EAAE,GAAG,CAAA;CAAE,sBAiB7K,CAAC;AAGF,eAAO,MAAM,WAAW,mBAzCqB,cAAc,MAAM,CAAC,SAAS,MAAM,EAAE,eAAe,KAAK,CAAC,aAAa,CAAC,CAAC,CAAC,+HAyCjF,CAAC;AACxC,eAAe,YAAY,CAAC"}
+{"version":3,"file":"withSettings.app.d.ts","sourceRoot":"","sources":["../../../../../src/components/hoc/withSettings.app.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,EAAc,iBAAiB,EAA2C,MAAM,OAAO,CAAC;AAGtG,KAAK,UAAU,GAAG;IAAE,KAAK,CAAC,EAAE,MAAM,CAAC;IAAC,SAAS,CAAC,EAAE,MAAM,CAAC;IAAC,WAAW,CAAC,EAAE,MAAM,CAAC;IAAC,GAAG,CAAC,EAAE,GAAG,CAAA;CAAE,CAAA;AAEzF,KAAK,gBAAgB,CAAC,CAAC,IAAI,iBAAiB,CAAC,CAAC,GAAG,UAAU,CAAC,CAAC;AAE7D,MAAM,MAAM,qBAAqB,CAAC,CAAC,IAAI,KAAK,CAAC,aAAa,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC,CAAA;AAE/E,MAAM,MAAM,cAAc,GAAG;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,YAAY,EAAE,GAAG,EAAE,CAAC;IAAC,oBAAoB,EAAE,GAAG,EAAE,CAAA;CAAE,CAAC;AAEhG,eAAO,MAAM,YAAY,GAAI,gBAAgB,cAAc,MAAM,CAAC,SAAS,MAAM,EAAE,eAAe,KAAK,CAAC,aAAa,CAAC,CAAC,CAAC,KAAG,KAAK,CAAC,aAAa,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAmBjK,CAAA;AAGD,eAAO,MAAM,oBAAoB,GAAI,gBAAgB,cAAc,MAAM,CAAC,GAAG,MAAM,EAAE,eAAe,KAAK,CAAC,aAAa,CAAC,CAAC,CAAC,KAAG,KAAK,CAAC,aAAa,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAiBnK,CAAC;AAGF,eAAO,MAAM,WAAW,mBA1CqB,cAAc,MAAM,CAAC,SAAS,MAAM,EAAE,eAAe,KAAK,CAAC,aAAa,CAAC,CAAC,CAAC,KAAG,KAAK,CAAC,aAAa,CAAC,gBAAgB,CAAC,CAAC,CAAC,CA0C3H,CAAC;AACxC,eAAe,YAAY,CAAC"}

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

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

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

@@ -1 +1 @@
-{"version":3,"file":"withSettings.d.ts","sourceRoot":"","sources":["../../../../../src/components/hoc/withSettings.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,EAAE,iBAAiB,EAAE,eAAe,EAAE,aAAa,EAAuB,MAAM,OAAO,CAAC;AACtG,OAAO,EAAE,MAAM,EAA+B,MAAM,aAAa,CAAC;AAElE,KAAK,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,MAAM,MAAM,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,GAAE;;;;CAAiE,MAAM,CAAC,SAAS,MAAM,EAAE,eAAe,KAAK,CAAC,aAAa,CAAC,CAAC,CAAC,gIAsCvJ,CAAC;AAGH,eAAO,MAAM,WAAW;;;;OAzC0E,CAAC,SAAS,MAAM,EAAE,eAAe,KAAK,CAAC,aAAa,CAAC,CAAC,CAAC,gIAyClH,CAAC;AACxC,eAAe,YAAY,CAAC"}
+{"version":3,"file":"withSettings.d.ts","sourceRoot":"","sources":["../../../../../src/components/hoc/withSettings.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,EAAE,iBAAiB,EAAW,MAAM,OAAO,CAAC;AAC1D,OAAO,EAAE,MAAM,EAA+B,MAAM,aAAa,CAAC;AAElE,KAAK,WAAW,GAAG;IAAE,KAAK,CAAC,EAAE,MAAM,CAAC;IAAC,SAAS,CAAC,EAAE,MAAM,CAAC;IAAC,WAAW,CAAC,EAAE,MAAM,CAAC;IAAC,MAAM,CAAC,EAAE,MAAM,CAAC;IAAC,GAAG,CAAC,EAAE,GAAG,CAAA;CAAE,CAAA;AAC3G,KAAK,gBAAgB,CAAC,CAAC,SAAS,MAAM,IAAI,iBAAiB,CAAC,CAAC,GAAG,WAAW,CAAC,CAAA;AAC5E,MAAM,MAAM,qBAAqB,CAAC,CAAC,SAAS,MAAM,IAAI,KAAK,CAAC,aAAa,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC,CAAA;AAE9F,eAAO,MAAM,YAAY,GAAI;;;;CAAmE,MAAM,CAAC,SAAS,MAAM,EAAE,eAAe,KAAK,CAAC,aAAa,CAAC,CAAC,CAAC,MAAM,OAAO,gBAAgB,CAAC,CAAC,CAAC,sBAoC5L,CAAC;AAEF,eAAO,MAAM,WAAW;;;;OAtC8E,CAAC,SAAS,MAAM,EAAE,eAAe,KAAK,CAAC,aAAa,CAAC,CAAC,CAAC,MAAM,OAAO,gBAAgB,CAAC,CAAC,CAAC,sBAsCtJ,CAAC;AACxC,eAAe,YAAY,CAAC"}

package/dist/types/src/reducers/modals.d.ts

@@ -11,6 +11,7 @@ export interface AppModal {
      * @description: Only used for mobile apps.
      */
     presentationStyle?: 'pageSheet' | 'formSheet' | 'fullScreen' | 'overFullScreen' | 'bottomSheet';
+    visible?: boolean;
 }
 export declare const showModal: (options: Partial<AppModal>) => {
     type: string;
@@ -25,6 +26,11 @@ export declare const closeModal: (id: any) => {
     type: string;
     id: any;
 };
+export declare const hideModal: (id: any) => {
+    type: string;
+    id: number;
+    modalUpdates: Partial<AppModal>;
+};
 declare const _default: (state: any, action: any) => any;
 export default _default;
 //# sourceMappingURL=modals.d.ts.map

package/dist/types/src/reducers/modals.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"modals.d.ts","sourceRoot":"","sources":["../../../../src/reducers/modals.tsx"],"names":[],"mappings":"AAEA,eAAO,MAAM,UAAU,eAAe,CAAC;AACvC,eAAO,MAAM,YAAY,iBAAiB,CAAC;AAC3C,eAAO,MAAM,WAAW,gBAAgB,CAAC;AAEzC,MAAM,WAAW,QAAQ;IACrB,EAAE,EAAE,MAAM,CAAC;IACX,SAAS,EAAE,GAAG,CAAC;IACf,KAAK,EAAE,GAAG,CAAC;IACX,SAAS,EAAE,OAAO,CAAC;IACnB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB;;OAEG;IACH,iBAAiB,CAAC,EAAE,WAAW,GAAG,WAAW,GAAG,YAAY,GAAG,gBAAgB,GAAG,aAAa,CAAC;CACnG;AAGD,eAAO,MAAM,SAAS,GAAI,SAAS,OAAO,CAAC,QAAQ,CAAC;;;CAmBnD,CAAC;AAEF,eAAO,MAAM,WAAW,GAAI,IAAI,QAAQ,CAAC,IAAI,CAAC,EAAE,SAAS,OAAO,CAAC,QAAQ,CAAC;;;;CAMzE,CAAA;AAED,eAAO,MAAM,UAAU,GAAI,OAAE;;;CAG3B,CAAC;yBAIa,UAAoB,EAAE,WAAM;AAA5C,wBAoBC"}
+{"version":3,"file":"modals.d.ts","sourceRoot":"","sources":["../../../../src/reducers/modals.tsx"],"names":[],"mappings":"AAEA,eAAO,MAAM,UAAU,eAAe,CAAC;AACvC,eAAO,MAAM,YAAY,iBAAiB,CAAC;AAC3C,eAAO,MAAM,WAAW,gBAAgB,CAAC;AAEzC,MAAM,WAAW,QAAQ;IACrB,EAAE,EAAE,MAAM,CAAC;IACX,SAAS,EAAE,GAAG,CAAC;IACf,KAAK,EAAE,GAAG,CAAC;IACX,SAAS,EAAE,OAAO,CAAC;IACnB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB;;OAEG;IACH,iBAAiB,CAAC,EAAE,WAAW,GAAG,WAAW,GAAG,YAAY,GAAG,gBAAgB,GAAG,aAAa,CAAC;IAChG,OAAO,CAAC,EAAE,OAAO,CAAC;CACrB;AAGD,eAAO,MAAM,SAAS,GAAI,SAAS,OAAO,CAAC,QAAQ,CAAC;;;CAoBnD,CAAC;AAEF,eAAO,MAAM,WAAW,GAAI,IAAI,QAAQ,CAAC,IAAI,CAAC,EAAE,SAAS,OAAO,CAAC,QAAQ,CAAC;;;;CAMzE,CAAA;AAED,eAAO,MAAM,UAAU,GAAI,OAAE;;;CAG3B,CAAC;AAEH,eAAO,MAAM,SAAS,GAAI,OAAE;;;;CAAwC,CAAC;yBAIrD,UAAoB,EAAE,WAAM;AAA5C,wBAoBC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@evlop/commons",
-  "version": "1.0.367",
+  "version": "1.0.369",
   "description": "",
   "main": "dist/cjs/main.js",
   "module": "dist/esm/main.js",