@evlop/commons 1.0.381 → 1.0.383

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,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"}
+{"version":3,"file":"withSettings.d.ts","sourceRoot":"","sources":["../../../../../src/components/hoc/withSettings.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,EAAE,iBAAiB,EAAwB,MAAM,OAAO,CAAC;AACvE,OAAO,EAAE,MAAM,EAA+B,MAAM,aAAa,CAAC;AAGlE,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;AAO9F,eAAO,MAAM,YAAY,GAAI;;;;CAAmE,MAAM,CAAC,SAAS,MAAM,EAAE,eAAe,KAAK,CAAC,aAAa,CAAC,CAAC,CAAC,MAAM,OAAO,gBAAgB,CAAC,CAAC,CAAC,sBAgC5L,CAAC;AAEF,eAAO,MAAM,WAAW;;;;OAlC8E,CAAC,SAAS,MAAM,EAAE,eAAe,KAAK,CAAC,aAAa,CAAC,CAAC,CAAC,MAAM,OAAO,gBAAgB,CAAC,CAAC,CAAC,sBAkCtJ,CAAC;AACxC,eAAe,YAAY,CAAC"}

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

@@ -37,6 +37,11 @@ exports.withToolbar = exports.withSettings = void 0;
 const lodash_1 = require("lodash");
 const react_1 = __importStar(require("react"));
 const hooks_1 = require("../../hooks");
+const commons_1 = require("@evlop/commons");
+const selfActionHandellerElements = new Set([
+    'Button', 'button',
+    'Link', 'link',
+]);
 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)();
@@ -45,21 +50,13 @@ const withSettings = ({ name: elementName, valueOptions = [], configurationOptio
         return (0, lodash_1.assign)({}, (0, lodash_1.get)(data, configModel), (0, lodash_1.get)(data, dataModel));
     }, [dataModel, props, data]);
     const action = propsFromModel.action || actionProp;
-    const { handleAction, forwardActions } = (0, react_1.useMemo)(() => {
-        if (!action)
-            return {};
-        // if this is a link component forward link, route, navigate so it can be used as href tag
-        if (elementName === 'link') {
-            const { link, route, navigate, ...remainingActions } = action;
-            return {
-                forwardActions: { link, route, navigate },
-                handleActions: remainingActions,
-            };
-        }
-        return { handleAction: action };
-    }, [dataModel, action]);
-    const actionClickEvent = (0, hooks_1.useAction)(handleAction);
-    return (react_1.default.createElement(BaseComponent, { animate: true, ...propsFromModel, onClick: actionClickEvent, action: forwardActions, ref: ref, ...remainingProps }));
+    const handleAction = (0, react_1.useCallback)(() => {
+        commons_1.remoteAction.do(action);
+    }, [action]);
+    if (!action || selfActionHandellerElements.has(elementName)) {
+        return react_1.default.createElement(BaseComponent, { ...propsFromModel, action: action, ref: ref, ...remainingProps });
+    }
+    return (react_1.default.createElement(BaseComponent, { ...propsFromModel, onClick: handleAction, ref: ref, ...remainingProps }));
 };
 exports.withSettings = withSettings;
 exports.withToolbar = 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,+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"}
+{"version":3,"file":"withSettings.js","sourceRoot":"","sources":["../../../../../src/components/hoc/withSettings.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,mCAAqC;AACrC,+CAAuE;AACvE,uCAAkE;AAClE,4CAA8C;AAM9C,MAAM,2BAA2B,GAAG,IAAI,GAAG,CAAC;IACxC,QAAQ,EAAE,QAAQ;IAClB,MAAM,EAAE,MAAM;CACjB,CAAC,CAAA;AAEK,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,YAAY,GAAE,IAAA,mBAAW,EAAC,GAAG,EAAE;QACjC,sBAAY,CAAC,EAAE,CAAC,MAAM,CAAC,CAAA;IAC3B,CAAC,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC;IAEb,IAAG,CAAC,MAAM,IAAI,2BAA2B,CAAC,GAAG,CAAC,WAAW,CAAC,EAAC,CAAC;QACxD,OAAO,8BAAC,aAAa,OACb,cAAc,EAClB,MAAM,EAAE,MAAM,EACd,GAAG,EAAE,GAAG,KACJ,cAAc,GACpB,CAAA;IACN,CAAC;IAED,OAAO,CACH,8BAAC,aAAa,OACN,cAAc,EAClB,OAAO,EAAE,YAAY,EACrB,GAAG,EAAE,GAAG,KACJ,cAAc,GACpB,CACL,CAAC;AACN,CAAC,CAAC;AAhCW,QAAA,YAAY,gBAgCvB;AAEW,QAAA,WAAW,GAAG,oBAAY,CAAC;AACxC,kBAAe,oBAAY,CAAC"}

package/dist/cjs/src/hooks/useAction.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useAction.d.ts","sourceRoot":"","sources":["../../../../src/hooks/useAction.tsx"],"names":[],"mappings":"AACA,OAAwB,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAG5D;;;;GAIG;AAEH,eAAO,MAAM,SAAS,GAAI,SAAS,MAAM,wBAIxC,CAAC;AAEF,eAAO,MAAM,cAAc,GAAI,SAAS,MAAM,yBAMK,GAAG,qBAgBrD,CAAC;AAEF,eAAe,SAAS,CAAC"}
+{"version":3,"file":"useAction.d.ts","sourceRoot":"","sources":["../../../../src/hooks/useAction.tsx"],"names":[],"mappings":"AACA,OAAwB,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAG5D;;;;GAIG;AAEH,eAAO,MAAM,SAAS,GAAI,SAAS,MAAM,wBAIxC,CAAC;AAEF,eAAO,MAAM,cAAc,GAAI,SAAS,MAAM,yBAMK,GAAG,qBAkBrD,CAAC;AAEF,eAAe,SAAS,CAAC"}

package/dist/cjs/src/hooks/useAction.js

@@ -23,18 +23,20 @@ const useAsyncAction = (action) => {
     const actionHandeller = (0, react_1.useMemo)(() => action ? createActionHandeller(action) : null, [action, createActionHandeller]);
     const handleAction = (0, react_1.useCallback)(async (event) => {
         const actionRes = actionHandeller?.(event);
-        if (!(actionRes instanceof Promise)) {
-            return actionRes;
-        }
-        try {
-            setIsProcessing(true);
-            return await actionRes;
+        if (actionRes instanceof Promise) {
+            try {
+                setIsProcessing(true);
+                return await actionRes;
+            }
+            catch (error) {
+                console.error(error);
+            }
+            finally {
+                setIsProcessing(false);
+            }
         }
-        catch (error) {
-            console.error(error);
-        }
-        finally {
-            setIsProcessing(false);
+        else {
+            return actionRes;
         }
     }, [actionHandeller]);
     return [isProcessing, handleAction];

package/dist/cjs/src/hooks/useAction.js.map

@@ -1 +1 @@
-{"version":3,"file":"useAction.js","sourceRoot":"","sources":["../../../../src/hooks/useAction.tsx"],"names":[],"mappings":";;;;;;AAAA,iCAAuD;AACvD,wEAA4D;AAE5D,qCAAqC;AACrC;;;;GAIG;AAEI,MAAM,SAAS,GAAG,CAAC,MAAe,EAAC,EAAE;IACxC,MAAM,qBAAqB,GAAG,IAAA,yBAAe,GAAE,CAAC;IAEhD,OAAO,IAAA,eAAO,EAAC,GAAE,EAAE,CAAC,qBAAqB,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,qBAAqB,CAAC,CAAC,CAAC;AACxF,CAAC,CAAC;AAJW,QAAA,SAAS,aAIpB;AAEK,MAAM,cAAc,GAAG,CAAC,MAAe,EAAC,EAAE;IAC7C,MAAM,qBAAqB,GAAG,IAAA,yBAAe,GAAE,CAAC;IAChD,MAAM,CAAC,YAAY,EAAE,eAAe,CAAC,GAAG,IAAA,gBAAQ,EAAC,KAAK,CAAC,CAAC;IAExD,MAAM,eAAe,GAAG,IAAA,eAAO,EAAC,GAAE,EAAE,CAAA,MAAM,CAAC,CAAC,CAAC,qBAAqB,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,MAAM,EAAE,qBAAqB,CAAC,CAAC,CAAC;IAEpH,MAAM,YAAY,GAAG,IAAA,mBAAW,EAAC,KAAK,EAAE,KAAU,EAAC,EAAE;QACjD,MAAM,SAAS,GAAG,eAAe,EAAE,CAAC,KAAK,CAAC,CAAC;QAC3C,IAAG,CAAC,CAAC,SAAS,YAAY,OAAO,CAAC,EAAC,CAAC;YAChC,OAAO,SAAS,CAAC;QACrB,CAAC;QACD,IAAG,CAAC;YACA,eAAe,CAAC,IAAI,CAAC,CAAC;YACtB,OAAO,MAAM,SAAS,CAAC;QAC3B,CAAC;QAAA,OAAM,KAAK,EAAC,CAAC;YACV,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;QACzB,CAAC;gBAAO,CAAC;YACL,eAAe,CAAC,KAAK,CAAC,CAAC;QAC3B,CAAC;IACL,CAAC,EAAE,CAAC,eAAe,CAAC,CAAC,CAAC;IAEtB,OAAO,CAAC,YAAY,EAAE,YAAY,CAAC,CAAC;AACxC,CAAC,CAAC;AAtBW,QAAA,cAAc,kBAsBzB;AAEF,kBAAe,iBAAS,CAAC"}
+{"version":3,"file":"useAction.js","sourceRoot":"","sources":["../../../../src/hooks/useAction.tsx"],"names":[],"mappings":";;;;;;AAAA,iCAAuD;AACvD,wEAA4D;AAE5D,qCAAqC;AACrC;;;;GAIG;AAEI,MAAM,SAAS,GAAG,CAAC,MAAe,EAAC,EAAE;IACxC,MAAM,qBAAqB,GAAG,IAAA,yBAAe,GAAE,CAAC;IAEhD,OAAO,IAAA,eAAO,EAAC,GAAE,EAAE,CAAC,qBAAqB,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,qBAAqB,CAAC,CAAC,CAAC;AACxF,CAAC,CAAC;AAJW,QAAA,SAAS,aAIpB;AAEK,MAAM,cAAc,GAAG,CAAC,MAAe,EAAC,EAAE;IAC7C,MAAM,qBAAqB,GAAG,IAAA,yBAAe,GAAE,CAAC;IAChD,MAAM,CAAC,YAAY,EAAE,eAAe,CAAC,GAAG,IAAA,gBAAQ,EAAC,KAAK,CAAC,CAAC;IAExD,MAAM,eAAe,GAAG,IAAA,eAAO,EAAC,GAAE,EAAE,CAAA,MAAM,CAAC,CAAC,CAAC,qBAAqB,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,MAAM,EAAE,qBAAqB,CAAC,CAAC,CAAC;IAEpH,MAAM,YAAY,GAAG,IAAA,mBAAW,EAAC,KAAK,EAAE,KAAU,EAAC,EAAE;QACjD,MAAM,SAAS,GAAG,eAAe,EAAE,CAAC,KAAK,CAAC,CAAC;QAC3C,IAAG,SAAS,YAAY,OAAO,EAAC,CAAC;YAC7B,IAAG,CAAC;gBACA,eAAe,CAAC,IAAI,CAAC,CAAC;gBACtB,OAAO,MAAM,SAAS,CAAC;YAC3B,CAAC;YAAA,OAAM,KAAK,EAAC,CAAC;gBACV,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;YACzB,CAAC;oBAAO,CAAC;gBACL,eAAe,CAAC,KAAK,CAAC,CAAC;YAC3B,CAAC;QACL,CAAC;aAAM,CAAC;YACJ,OAAO,SAAS,CAAC;QACrB,CAAC;IAEL,CAAC,EAAE,CAAC,eAAe,CAAC,CAAC,CAAC;IAEtB,OAAO,CAAC,YAAY,EAAE,YAAY,CAAC,CAAC;AACxC,CAAC,CAAC;AAxBW,QAAA,cAAc,kBAwBzB;AAEF,kBAAe,iBAAS,CAAC"}

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,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"}
+{"version":3,"file":"withSettings.d.ts","sourceRoot":"","sources":["../../../../../src/components/hoc/withSettings.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,EAAE,iBAAiB,EAAwB,MAAM,OAAO,CAAC;AACvE,OAAO,EAAE,MAAM,EAA+B,MAAM,aAAa,CAAC;AAGlE,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;AAO9F,eAAO,MAAM,YAAY,GAAI;;;;CAAmE,MAAM,CAAC,SAAS,MAAM,EAAE,eAAe,KAAK,CAAC,aAAa,CAAC,CAAC,CAAC,MAAM,OAAO,gBAAgB,CAAC,CAAC,CAAC,sBAgC5L,CAAC;AAEF,eAAO,MAAM,WAAW;;;;OAlC8E,CAAC,SAAS,MAAM,EAAE,eAAe,KAAK,CAAC,aAAa,CAAC,CAAC,CAAC,MAAM,OAAO,gBAAgB,CAAC,CAAC,CAAC,sBAkCtJ,CAAC;AACxC,eAAe,YAAY,CAAC"}

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

@@ -1,6 +1,11 @@
 import { assign, get } from 'lodash';
-import React, { useMemo } from 'react';
-import { useAction, useComponentData } from '../../hooks';
+import React, { useCallback, useMemo } from 'react';
+import { useComponentData } from '../../hooks';
+import { remoteAction } from '@evlop/commons';
+const selfActionHandellerElements = new Set([
+    'Button', 'button',
+    'Link', 'link',
+]);
 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();
@@ -9,21 +14,13 @@ export const withSettings = ({ name: elementName, valueOptions = [], configurati
         return assign({}, get(data, configModel), get(data, dataModel));
     }, [dataModel, props, data]);
     const action = propsFromModel.action || actionProp;
-    const { handleAction, forwardActions } = useMemo(() => {
-        if (!action)
-            return {};
-        // if this is a link component forward link, route, navigate so it can be used as href tag
-        if (elementName === 'link') {
-            const { link, route, navigate, ...remainingActions } = action;
-            return {
-                forwardActions: { link, route, navigate },
-                handleActions: remainingActions,
-            };
-        }
-        return { handleAction: action };
-    }, [dataModel, action]);
-    const actionClickEvent = useAction(handleAction);
-    return (React.createElement(BaseComponent, { animate: true, ...propsFromModel, onClick: actionClickEvent, action: forwardActions, ref: ref, ...remainingProps }));
+    const handleAction = useCallback(() => {
+        remoteAction.do(action);
+    }, [action]);
+    if (!action || selfActionHandellerElements.has(elementName)) {
+        return React.createElement(BaseComponent, { ...propsFromModel, action: action, ref: ref, ...remainingProps });
+    }
+    return (React.createElement(BaseComponent, { ...propsFromModel, onClick: handleAction, ref: ref, ...remainingProps }));
 };
 export const withToolbar = withSettings;
 export default withSettings;

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,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"}
+{"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,WAAW,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;AACvE,OAAO,EAAqB,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAClE,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAM9C,MAAM,2BAA2B,GAAG,IAAI,GAAG,CAAC;IACxC,QAAQ,EAAE,QAAQ;IAClB,MAAM,EAAE,MAAM;CACjB,CAAC,CAAA;AAEF,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,YAAY,GAAE,WAAW,CAAC,GAAG,EAAE;QACjC,YAAY,CAAC,EAAE,CAAC,MAAM,CAAC,CAAA;IAC3B,CAAC,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC;IAEb,IAAG,CAAC,MAAM,IAAI,2BAA2B,CAAC,GAAG,CAAC,WAAW,CAAC,EAAC,CAAC;QACxD,OAAO,oBAAC,aAAa,OACb,cAAc,EAClB,MAAM,EAAE,MAAM,EACd,GAAG,EAAE,GAAG,KACJ,cAAc,GACpB,CAAA;IACN,CAAC;IAED,OAAO,CACH,oBAAC,aAAa,OACN,cAAc,EAClB,OAAO,EAAE,YAAY,EACrB,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/hooks/useAction.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useAction.d.ts","sourceRoot":"","sources":["../../../../src/hooks/useAction.tsx"],"names":[],"mappings":"AACA,OAAwB,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAG5D;;;;GAIG;AAEH,eAAO,MAAM,SAAS,GAAI,SAAS,MAAM,wBAIxC,CAAC;AAEF,eAAO,MAAM,cAAc,GAAI,SAAS,MAAM,yBAMK,GAAG,qBAgBrD,CAAC;AAEF,eAAe,SAAS,CAAC"}
+{"version":3,"file":"useAction.d.ts","sourceRoot":"","sources":["../../../../src/hooks/useAction.tsx"],"names":[],"mappings":"AACA,OAAwB,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAG5D;;;;GAIG;AAEH,eAAO,MAAM,SAAS,GAAI,SAAS,MAAM,wBAIxC,CAAC;AAEF,eAAO,MAAM,cAAc,GAAI,SAAS,MAAM,yBAMK,GAAG,qBAkBrD,CAAC;AAEF,eAAe,SAAS,CAAC"}

package/dist/esm/src/hooks/useAction.js

@@ -16,18 +16,20 @@ export const useAsyncAction = (action) => {
     const actionHandeller = useMemo(() => action ? createActionHandeller(action) : null, [action, createActionHandeller]);
     const handleAction = useCallback(async (event) => {
         const actionRes = actionHandeller?.(event);
-        if (!(actionRes instanceof Promise)) {
-            return actionRes;
-        }
-        try {
-            setIsProcessing(true);
-            return await actionRes;
+        if (actionRes instanceof Promise) {
+            try {
+                setIsProcessing(true);
+                return await actionRes;
+            }
+            catch (error) {
+                console.error(error);
+            }
+            finally {
+                setIsProcessing(false);
+            }
         }
-        catch (error) {
-            console.error(error);
-        }
-        finally {
-            setIsProcessing(false);
+        else {
+            return actionRes;
         }
     }, [actionHandeller]);
     return [isProcessing, handleAction];

package/dist/esm/src/hooks/useAction.js.map

@@ -1 +1 @@
-{"version":3,"file":"useAction.js","sourceRoot":"","sources":["../../../../src/hooks/useAction.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AACvD,OAAO,eAA2B,MAAM,mBAAmB,CAAC;AAE5D,qCAAqC;AACrC;;;;GAIG;AAEH,MAAM,CAAC,MAAM,SAAS,GAAG,CAAC,MAAe,EAAC,EAAE;IACxC,MAAM,qBAAqB,GAAG,eAAe,EAAE,CAAC;IAEhD,OAAO,OAAO,CAAC,GAAE,EAAE,CAAC,qBAAqB,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,qBAAqB,CAAC,CAAC,CAAC;AACxF,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,cAAc,GAAG,CAAC,MAAe,EAAC,EAAE;IAC7C,MAAM,qBAAqB,GAAG,eAAe,EAAE,CAAC;IAChD,MAAM,CAAC,YAAY,EAAE,eAAe,CAAC,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC;IAExD,MAAM,eAAe,GAAG,OAAO,CAAC,GAAE,EAAE,CAAA,MAAM,CAAC,CAAC,CAAC,qBAAqB,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,MAAM,EAAE,qBAAqB,CAAC,CAAC,CAAC;IAEpH,MAAM,YAAY,GAAG,WAAW,CAAC,KAAK,EAAE,KAAU,EAAC,EAAE;QACjD,MAAM,SAAS,GAAG,eAAe,EAAE,CAAC,KAAK,CAAC,CAAC;QAC3C,IAAG,CAAC,CAAC,SAAS,YAAY,OAAO,CAAC,EAAC,CAAC;YAChC,OAAO,SAAS,CAAC;QACrB,CAAC;QACD,IAAG,CAAC;YACA,eAAe,CAAC,IAAI,CAAC,CAAC;YACtB,OAAO,MAAM,SAAS,CAAC;QAC3B,CAAC;QAAA,OAAM,KAAK,EAAC,CAAC;YACV,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;QACzB,CAAC;gBAAO,CAAC;YACL,eAAe,CAAC,KAAK,CAAC,CAAC;QAC3B,CAAC;IACL,CAAC,EAAE,CAAC,eAAe,CAAC,CAAC,CAAC;IAEtB,OAAO,CAAC,YAAY,EAAE,YAAY,CAAC,CAAC;AACxC,CAAC,CAAC;AAEF,eAAe,SAAS,CAAC"}
+{"version":3,"file":"useAction.js","sourceRoot":"","sources":["../../../../src/hooks/useAction.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AACvD,OAAO,eAA2B,MAAM,mBAAmB,CAAC;AAE5D,qCAAqC;AACrC;;;;GAIG;AAEH,MAAM,CAAC,MAAM,SAAS,GAAG,CAAC,MAAe,EAAC,EAAE;IACxC,MAAM,qBAAqB,GAAG,eAAe,EAAE,CAAC;IAEhD,OAAO,OAAO,CAAC,GAAE,EAAE,CAAC,qBAAqB,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,qBAAqB,CAAC,CAAC,CAAC;AACxF,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,cAAc,GAAG,CAAC,MAAe,EAAC,EAAE;IAC7C,MAAM,qBAAqB,GAAG,eAAe,EAAE,CAAC;IAChD,MAAM,CAAC,YAAY,EAAE,eAAe,CAAC,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC;IAExD,MAAM,eAAe,GAAG,OAAO,CAAC,GAAE,EAAE,CAAA,MAAM,CAAC,CAAC,CAAC,qBAAqB,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,MAAM,EAAE,qBAAqB,CAAC,CAAC,CAAC;IAEpH,MAAM,YAAY,GAAG,WAAW,CAAC,KAAK,EAAE,KAAU,EAAC,EAAE;QACjD,MAAM,SAAS,GAAG,eAAe,EAAE,CAAC,KAAK,CAAC,CAAC;QAC3C,IAAG,SAAS,YAAY,OAAO,EAAC,CAAC;YAC7B,IAAG,CAAC;gBACA,eAAe,CAAC,IAAI,CAAC,CAAC;gBACtB,OAAO,MAAM,SAAS,CAAC;YAC3B,CAAC;YAAA,OAAM,KAAK,EAAC,CAAC;gBACV,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;YACzB,CAAC;oBAAO,CAAC;gBACL,eAAe,CAAC,KAAK,CAAC,CAAC;YAC3B,CAAC;QACL,CAAC;aAAM,CAAC;YACJ,OAAO,SAAS,CAAC;QACrB,CAAC;IAEL,CAAC,EAAE,CAAC,eAAe,CAAC,CAAC,CAAC;IAEtB,OAAO,CAAC,YAAY,EAAE,YAAY,CAAC,CAAC;AACxC,CAAC,CAAC;AAEF,eAAe,SAAS,CAAC"}

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,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"}
+{"version":3,"file":"withSettings.d.ts","sourceRoot":"","sources":["../../../../../src/components/hoc/withSettings.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,EAAE,iBAAiB,EAAwB,MAAM,OAAO,CAAC;AACvE,OAAO,EAAE,MAAM,EAA+B,MAAM,aAAa,CAAC;AAGlE,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;AAO9F,eAAO,MAAM,YAAY,GAAI;;;;CAAmE,MAAM,CAAC,SAAS,MAAM,EAAE,eAAe,KAAK,CAAC,aAAa,CAAC,CAAC,CAAC,MAAM,OAAO,gBAAgB,CAAC,CAAC,CAAC,sBAgC5L,CAAC;AAEF,eAAO,MAAM,WAAW;;;;OAlC8E,CAAC,SAAS,MAAM,EAAE,eAAe,KAAK,CAAC,aAAa,CAAC,CAAC,CAAC,MAAM,OAAO,gBAAgB,CAAC,CAAC,CAAC,sBAkCtJ,CAAC;AACxC,eAAe,YAAY,CAAC"}

package/dist/types/src/hooks/useAction.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useAction.d.ts","sourceRoot":"","sources":["../../../../src/hooks/useAction.tsx"],"names":[],"mappings":"AACA,OAAwB,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAG5D;;;;GAIG;AAEH,eAAO,MAAM,SAAS,GAAI,SAAS,MAAM,wBAIxC,CAAC;AAEF,eAAO,MAAM,cAAc,GAAI,SAAS,MAAM,yBAMK,GAAG,qBAgBrD,CAAC;AAEF,eAAe,SAAS,CAAC"}
+{"version":3,"file":"useAction.d.ts","sourceRoot":"","sources":["../../../../src/hooks/useAction.tsx"],"names":[],"mappings":"AACA,OAAwB,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAG5D;;;;GAIG;AAEH,eAAO,MAAM,SAAS,GAAI,SAAS,MAAM,wBAIxC,CAAC;AAEF,eAAO,MAAM,cAAc,GAAI,SAAS,MAAM,yBAMK,GAAG,qBAkBrD,CAAC;AAEF,eAAe,SAAS,CAAC"}

package/package.json

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