@wavemaker/react-runtime 11.14.3-rc.6401 → 11.14.4-rc.647538

package/components/container/wizard/index.js

@@ -20,7 +20,6 @@ var _wizardStep = _interopRequireDefault(require("./wizard-step"));
 var _WizardStep = require("./components/WizardStep");
 var _form = _interopRequireDefault(require("@wavemaker/react-runtime/components/data/form"));
 var _formUtils = require("@wavemaker/react-runtime/utils/form-utils");
-var _isEqual = _interopRequireDefault(require("lodash-es/isEqual"));
 function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, "default": e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t2 in e) "default" !== _t2 && {}.hasOwnProperty.call(e, _t2) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t2)) && (i.get || i.set) ? o(f, _t2, i) : f[_t2] = e[_t2]); return f; })(e, t); }
 var __jsx = _react["default"].createElement;
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
@@ -89,10 +88,6 @@ var WmWizard = /*#__PURE__*/(0, _react.memo)(function (props) {
     isInitialized = _useState3[0],
     setIsInitialized = _useState3[1];
   var formRefs = (0, _react.useRef)({});
-  var navIndexRef = (0, _react.useRef)(-1);
-  var _useState4 = (0, _react.useState)(false),
-    formReady = _useState4[0],
-    setFormReady = _useState4[1];
 
   // Create dynamic steps callback
   var createDynamicSteps = (0, _react.useCallback)(function (datasetItems) {
@@ -137,11 +132,6 @@ var WmWizard = /*#__PURE__*/(0, _react.memo)(function (props) {
       return step.name === currentStep.name;
     });
   }, [currentStep, visibleSteps]);
-
-  // Sync navigation ref whenever the visible current index changes
-  (0, _react.useEffect)(function () {
-    navIndexRef.current = currentStepIndex;
-  }, [currentStepIndex]);
   var _hasNextStep = (0, _react.useMemo)(function () {
     return currentStepIndex < visibleSteps.length - 1;
   }, [currentStepIndex, visibleSteps]);
@@ -151,41 +141,9 @@ var WmWizard = /*#__PURE__*/(0, _react.memo)(function (props) {
   var showDoneBtn = (0, _react.useMemo)(function () {
     return !_hasNextStep && (currentStep === null || currentStep === void 0 ? void 0 : currentStep.enableDone) !== false;
   }, [_hasNextStep, currentStep]);
-  var _useState5 = (0, _react.useState)(true),
-    isStepValid = _useState5[0],
-    setIsStepValid = _useState5[1];
-  var _useState6 = (0, _react.useState)(""),
-    formValiditySignature = _useState6[0],
-    setFormValiditySignature = _useState6[1];
-  (0, _react.useEffect)(function () {
-    var unbind = null;
-    var bindEmitEvent = function bindEmitEvent() {
-      var _formRefs$current;
-      var stepName = currentStep === null || currentStep === void 0 ? void 0 : currentStep.name;
-      if (!stepName) return false;
-      var formElOrList = (_formRefs$current = formRefs.current) === null || _formRefs$current === void 0 ? void 0 : _formRefs$current[stepName];
-      var forms = formElOrList ? Array.isArray(formElOrList) ? formElOrList : [formElOrList] : [];
-      if (forms.length === 0) return false;
-      var onValidity = function onValidity(e) {
-        var detail = e.detail;
-        var isValid = (detail === null || detail === void 0 ? void 0 : detail.isValid) !== false;
-        setFormValiditySignature(isValid ? "1" : "0");
-      };
-      forms.forEach(function (f) {
-        return f.addEventListener("wm:form-validity", onValidity);
-      });
-      unbind = function unbind() {
-        forms.forEach(function (f) {
-          return f.removeEventListener("wm:form-validity", onValidity);
-        });
-      };
-      return true;
-    };
-    bindEmitEvent();
-    return function () {
-      if (unbind) unbind();
-    };
-  }, [currentStep, formReady]);
+  var _useState4 = (0, _react.useState)(true),
+    isStepValid = _useState4[0],
+    setIsStepValid = _useState4[1];
   (0, _react.useEffect)(function () {
     var validateStep = /*#__PURE__*/function () {
       var _ref = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee() {
@@ -241,7 +199,7 @@ var WmWizard = /*#__PURE__*/(0, _react.memo)(function (props) {
       };
     }();
     validateStep();
-  }, [currentStep, formValiditySignature, formReady]);
+  }, [currentStep]);
   var enableNext = (0, _react.useMemo)(function () {
     return enablenext || (currentStep === null || currentStep === void 0 ? void 0 : currentStep.enableNext) !== false && (currentStep === null || currentStep === void 0 ? void 0 : currentStep.isValid) !== false && isStepValid;
   }, [enablenext, currentStep, isStepValid]);
@@ -315,143 +273,108 @@ var WmWizard = /*#__PURE__*/(0, _react.memo)(function (props) {
   // Navigation functions
   var _next = (0, _react.useCallback)(/*#__PURE__*/(0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee2() {
     var eventName,
-      fromIndex,
-      fromStep,
-      nextStep,
-      nextIndex,
-      _fromStep$onSkip,
+      _currentStep$onSkip,
       response,
-      _fromStep$onNext,
+      _currentStep$onNext,
       _response,
       _args2 = arguments;
     return _regenerator["default"].wrap(function _callee2$(_context2) {
       while (1) switch (_context2.prev = _context2.next) {
         case 0:
           eventName = _args2.length > 0 && _args2[0] !== undefined ? _args2[0] : "next";
-          fromIndex = navIndexRef.current >= 0 ? navIndexRef.current : currentStepIndex;
-          fromStep = (0, _utils.getStepByIndex)(fromIndex, visibleSteps);
-          if (fromStep) {
-            _context2.next = 5;
+          if (currentStep) {
+            _context2.next = 3;
             break;
           }
           return _context2.abrupt("return");
-        case 5:
-          nextStep = (0, _utils.getNextValidStep)(fromIndex + 1, visibleSteps);
-          if (nextStep) {
-            _context2.next = 8;
-            break;
-          }
-          return _context2.abrupt("return");
-        case 8:
-          nextIndex = visibleSteps.findIndex(function (s) {
-            return s.name === nextStep.name;
-          });
+        case 3:
           if (!(eventName === "skip")) {
-            _context2.next = 19;
+            _context2.next = 13;
             break;
           }
-          response = (_fromStep$onSkip = fromStep.onSkip) === null || _fromStep$onSkip === void 0 ? void 0 : _fromStep$onSkip.call(fromStep, fromStep, fromStep, fromIndex);
+          response = (_currentStep$onSkip = currentStep.onSkip) === null || _currentStep$onSkip === void 0 ? void 0 : _currentStep$onSkip.call(currentStep, currentStep, currentStep, currentStepIndex);
           if (!(response !== undefined)) {
-            _context2.next = 16;
+            _context2.next = 10;
             break;
           }
-          _context2.next = 14;
+          _context2.next = 8;
           return (0, _utils.handleNavigation)(response, function () {
-            return (0, _utils.extendNextFn)(fromStep, fromIndex, visibleSteps, setSteps);
+            return (0, _utils.extendNextFn)(currentStep, currentStepIndex, visibleSteps, setSteps);
           });
-        case 14:
-          _context2.next = 17;
+        case 8:
+          _context2.next = 11;
           break;
-        case 16:
-          (0, _utils.extendNextFn)(fromStep, fromIndex, visibleSteps, setSteps);
-        case 17:
-          _context2.next = 30;
+        case 10:
+          (0, _utils.extendNextFn)(currentStep, currentStepIndex, visibleSteps, setSteps);
+        case 11:
+          _context2.next = 24;
           break;
-        case 19:
-          if (!(fromStep.isValid && eventName === "next")) {
-            _context2.next = 29;
+        case 13:
+          if (!(currentStep.isValid && eventName === "next")) {
+            _context2.next = 23;
             break;
           }
-          _response = (_fromStep$onNext = fromStep.onNext) === null || _fromStep$onNext === void 0 ? void 0 : _fromStep$onNext.call(fromStep, fromStep, fromStep, fromIndex);
+          _response = (_currentStep$onNext = currentStep.onNext) === null || _currentStep$onNext === void 0 ? void 0 : _currentStep$onNext.call(currentStep, currentStep, currentStep, currentStepIndex);
           if (!(_response !== undefined)) {
-            _context2.next = 26;
+            _context2.next = 20;
             break;
           }
-          _context2.next = 24;
+          _context2.next = 18;
           return (0, _utils.handleNavigation)(_response, function () {
-            return (0, _utils.extendNextFn)(fromStep, fromIndex, visibleSteps, setSteps);
+            return (0, _utils.extendNextFn)(currentStep, currentStepIndex, visibleSteps, setSteps);
           });
-        case 24:
-          _context2.next = 27;
+        case 18:
+          _context2.next = 21;
           break;
-        case 26:
-          (0, _utils.extendNextFn)(fromStep, fromIndex, visibleSteps, setSteps);
-        case 27:
-          _context2.next = 30;
+        case 20:
+          (0, _utils.extendNextFn)(currentStep, currentStepIndex, visibleSteps, setSteps);
+        case 21:
+          _context2.next = 24;
           break;
-        case 29:
-          if (enablenext && !fromStep.isValid) {
+        case 23:
+          if (enablenext && !currentStep.isValid) {
             console.warn("Cannot proceed: current step is invalid");
           } else {
-            (0, _utils.extendNextFn)(fromStep, fromIndex, visibleSteps, setSteps);
+            (0, _utils.extendNextFn)(currentStep, currentStepIndex, visibleSteps, setSteps);
           }
-        case 30:
-          // update ref to reflect the logical next position immediately
-          navIndexRef.current = nextIndex;
-          setFormReady(false);
-        case 32:
+        case 24:
         case "end":
           return _context2.stop();
       }
     }, _callee2);
-  })), [currentStepIndex, visibleSteps, enablenext]);
+  })), [currentStep, currentStepIndex, visibleSteps, enablenext]);
   var prev = (0, _react.useCallback)(/*#__PURE__*/(0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee3() {
-    var _fromStep$onPrev;
-    var fromIndex, fromStep, targetStep, prevIndex, response;
+    var _currentStep$onPrev;
+    var response;
     return _regenerator["default"].wrap(function _callee3$(_context3) {
       while (1) switch (_context3.prev = _context3.next) {
         case 0:
-          fromIndex = navIndexRef.current >= 0 ? navIndexRef.current : currentStepIndex;
-          fromStep = (0, _utils.getStepByIndex)(fromIndex, visibleSteps);
-          if (fromStep) {
-            _context3.next = 4;
-            break;
-          }
-          return _context3.abrupt("return");
-        case 4:
-          targetStep = (0, _utils.getPrevValidStep)(fromIndex - 1, visibleSteps);
-          if (targetStep) {
-            _context3.next = 7;
+          if (currentStep) {
+            _context3.next = 2;
             break;
           }
           return _context3.abrupt("return");
-        case 7:
-          prevIndex = visibleSteps.findIndex(function (s) {
-            return s.name === targetStep.name;
-          });
-          response = (_fromStep$onPrev = fromStep.onPrev) === null || _fromStep$onPrev === void 0 ? void 0 : _fromStep$onPrev.call(fromStep, fromStep, fromStep, fromIndex);
+        case 2:
+          response = (_currentStep$onPrev = currentStep.onPrev) === null || _currentStep$onPrev === void 0 ? void 0 : _currentStep$onPrev.call(currentStep, currentStep, currentStep, currentStepIndex);
           if (!(response !== undefined)) {
-            _context3.next = 14;
+            _context3.next = 8;
             break;
           }
-          _context3.next = 12;
+          _context3.next = 6;
           return (0, _utils.handleNavigation)(response, function () {
-            return (0, _utils.extendPrevFn)(fromStep, fromIndex, visibleSteps, setSteps);
+            return (0, _utils.extendPrevFn)(currentStep, currentStepIndex, visibleSteps, setSteps);
           });
-        case 12:
-          _context3.next = 15;
+        case 6:
+          _context3.next = 9;
           break;
-        case 14:
-          (0, _utils.extendPrevFn)(fromStep, fromIndex, visibleSteps, setSteps);
-        case 15:
-          navIndexRef.current = prevIndex;
-          setFormReady(false);
-        case 17:
+        case 8:
+          (0, _utils.extendPrevFn)(currentStep, currentStepIndex, visibleSteps, setSteps);
+        case 9:
         case "end":
           return _context3.stop();
       }
     }, _callee3);
-  })), [currentStepIndex, visibleSteps]);
+  })), [currentStep, currentStepIndex, visibleSteps]);
   var registerStep = (0, _react.useCallback)(function (stepData) {
     setSteps(function (prevSteps) {
       var existingIndex = prevSteps.findIndex(function (step) {
@@ -512,11 +435,6 @@ var WmWizard = /*#__PURE__*/(0, _react.memo)(function (props) {
       return;
     }
     if ((_targetStep = targetStep) !== null && _targetStep !== void 0 && _targetStep.show) {
-      var visIndex = visibleSteps.findIndex(function (s) {
-        var _targetStep2;
-        return s.name === ((_targetStep2 = targetStep) === null || _targetStep2 === void 0 ? void 0 : _targetStep2.name);
-      });
-      if (visIndex >= 0) navIndexRef.current = visIndex;
       onStepHeaderClick({}, targetStep);
     } else {
       console.error("The gotoStep function cannot navigate to hidden steps");
@@ -560,30 +478,6 @@ var WmWizard = /*#__PURE__*/(0, _react.memo)(function (props) {
       }
     }
   }, [visibleSteps]);
-  var showSignature = steps.map(function (s) {
-    var _listener$Widgets, _listener$Widgets2;
-    return (listener === null || listener === void 0 || (_listener$Widgets = listener.Widgets) === null || _listener$Widgets === void 0 || (_listener$Widgets = _listener$Widgets[s.name]) === null || _listener$Widgets === void 0 ? void 0 : _listener$Widgets.show) === false || (listener === null || listener === void 0 || (_listener$Widgets2 = listener.Widgets) === null || _listener$Widgets2 === void 0 || (_listener$Widgets2 = _listener$Widgets2[s.name]) === null || _listener$Widgets2 === void 0 ? void 0 : _listener$Widgets2.show) === "false" ? "0" : "1";
-  }).join("|");
-  (0, _react.useEffect)(function () {
-    if (!(listener !== null && listener !== void 0 && listener.Widgets)) return;
-    steps.forEach(function (step, index) {
-      var _listener$Widgets$ste;
-      var widgetShow = (_listener$Widgets$ste = listener.Widgets[step.name]) === null || _listener$Widgets$ste === void 0 ? void 0 : _listener$Widgets$ste.show;
-      if ((widgetShow === false || widgetShow === "false") && step.show !== false) {
-        updateStep(step.name, {
-          show: false,
-          enableskip: false
-        });
-        var prevStep = steps[index - 1];
-        if (prevStep && step.active) {
-          updateStep(prevStep.name, {
-            active: true
-          });
-          navIndexRef.current = index - 1;
-        }
-      }
-    });
-  }, [showSignature]);
   var updateListener = _react["default"].useCallback(function () {
     if (listener && typeof listener.onChange === "function") {
       listener.onChange(name, {
@@ -620,7 +514,6 @@ var WmWizard = /*#__PURE__*/(0, _react.memo)(function (props) {
         disableDone: function disableDone() {
           return !enableDone;
         },
-        prev: prev,
         cancelable: cancelable,
         nextbtnlabel: nextbtnlabel,
         previousbtnlabel: previousbtnlabel,
@@ -635,12 +528,10 @@ var WmWizard = /*#__PURE__*/(0, _react.memo)(function (props) {
           return _gotoStep(step);
         },
         isFirstStep: isFirstStep,
-        isLastStep: isLastStep,
-        currentStepIndex: currentStepIndex,
-        currentStep: currentStep
+        isLastStep: isLastStep
       });
     }
-  }, [_hasNextStep, hasPrevStep, showDoneBtn, enableNext, enablePrev, enableDone, cancelable, currentStep === null || currentStep === void 0 ? void 0 : currentStep.enableskip, nextbtnlabel, previousbtnlabel, donebtnlabel, cancelbtnlabel, actionsalignment, currentStepIndex, isFirstStep, isLastStep]);
+  }, [_hasNextStep, hasPrevStep, showDoneBtn, enableNext, enablePrev, enableDone, cancelable, currentStep === null || currentStep === void 0 ? void 0 : currentStep.enableskip, nextbtnlabel, previousbtnlabel, donebtnlabel, cancelbtnlabel, actionsalignment, currentStepIndex]);
   (0, _react.useEffect)(function () {
     updateListener();
   }, [updateListener]);
@@ -749,8 +640,7 @@ var WmWizard = /*#__PURE__*/(0, _react.memo)(function (props) {
     style: _objectSpread(_objectSpread({}, styles), {}, {
       width: width,
       height: height
-    }),
-    name: name
+    })
   }, __jsx(_material.Box, {
     className: "app-wizard-heading"
   }, __jsx(_material.Stepper, {
@@ -783,9 +673,7 @@ var WmWizard = /*#__PURE__*/(0, _react.memo)(function (props) {
   }, __jsx(_material.Typography, {
     variant: "body2",
     color: wizardMessage.type === "error" ? "error" : "textSecondary"
-  }, wizardMessage.caption)), (type === "dynamic" ? steps.filter(function (s) {
-    return s.active;
-  }) : steps).map(function (step, index) {
+  }, wizardMessage.caption)), steps.map(function (step, index) {
     return __jsx("div", {
       key: step.name,
       ref: function ref(el) {
@@ -793,15 +681,6 @@ var WmWizard = /*#__PURE__*/(0, _react.memo)(function (props) {
           var formElement = el.querySelector("form");
           if (formElement) {
             formRefs.current[step.name] = formElement;
-            if (formElement.classList.contains("app-form")) {
-              setFormReady(true);
-            }
-          }
-          if (step.haveForm === undefined) {
-            var hasFormNow = !!formElement;
-            updateStep(step.name, {
-              haveForm: hasFormNow
-            });
           }
         }
       },
@@ -826,15 +705,6 @@ var WmWizard = /*#__PURE__*/(0, _react.memo)(function (props) {
       key: ((_step$props = step.props) === null || _step$props === void 0 ? void 0 : _step$props.name) || index
     });
   })));
-}, function (prev, next) {
-  var keys = ["render", "dataset", "className", "styles", "width", "height", "type", "stepstyle", "orientation", "alternativeLabel", "nonLinear", "defaultstep", "defaultstepindex", "message", "cancelable", "enablenext", "nextbtnlabel", "previousbtnlabel", "donebtnlabel", "cancelbtnlabel", "children"];
-  return keys.every(function (key) {
-    // Never deep-compare children; treat as referential
-    if (key === "children") {
-      return prev[key] === next[key];
-    }
-    return (0, _isEqual["default"])(prev[key], next[key]);
-  });
 });
 WmWizard.displayName = "WmWizard";
 var _default = exports["default"] = (0, _withBaseWrapper.withBaseWrapper)(WmWizard);

package/components/container/wizard/utils.js

@@ -36,7 +36,7 @@ var getPrevValidStep = exports.getPrevValidStep = function getPrevValidStep(from
 var getStepByName = exports.getStepByName = function getStepByName(stepName, steps) {
   return steps.find(function (step) {
     return step.name === stepName;
-  }) || steps[0];
+  }) || null;
 };
 var getStepByIndex = exports.getStepByIndex = function getStepByIndex(index, visibleSteps) {
   return visibleSteps[index] || null;

package/components/container/wizard/wizard-action/index.js

@@ -1,27 +1,22 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-var _typeof = require("@babel/runtime/helpers/typeof");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports["default"] = void 0;
-var _react = _interopRequireWildcard(require("react"));
+var _react = _interopRequireDefault(require("react"));
 var _material = require("@mui/material");
 var _clsx = _interopRequireDefault(require("clsx"));
-var _withBaseWrapper = require("@wavemaker/react-runtime/higherOrder/withBaseWrapper");
-function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, "default": e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t2 in e) "default" !== _t2 && {}.hasOwnProperty.call(e, _t2) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t2)) && (i.get || i.set) ? o(f, _t2, i) : f[_t2] = e[_t2]); return f; })(e, t); }
 var __jsx = _react["default"].createElement;
 var ACTIONS_CLASS = "app-wizard-actions panel-footer";
-var WmWizardAction = /*#__PURE__*/(0, _react.memo)(function (_ref) {
+var WmWizardAction = function WmWizardAction(_ref) {
   var children = _ref.children,
     _ref$actionsalignment = _ref.actionsalignment,
     actionsalignment = _ref$actionsalignment === void 0 ? "right" : _ref$actionsalignment;
   return __jsx(_material.Box, {
     className: (0, _clsx["default"])(ACTIONS_CLASS, actionsalignment)
   }, children);
-}, function (prev, next) {
-  return prev.actionsalignment === next.actionsalignment && prev.children === next.children && prev.listener === next.listener;
-});
+};
 WmWizardAction.displayName = "WmWizardAction";
-var _default = exports["default"] = (0, _withBaseWrapper.withBaseWrapper)(WmWizardAction);
+var _default = exports["default"] = WmWizardAction;

package/components/container/wizard/wizard-step/index.js

@@ -1,17 +1,11 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-var _typeof = require("@babel/runtime/helpers/typeof");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports["default"] = void 0;
-var _react = _interopRequireWildcard(require("react"));
+var _react = require("react");
 var _WizardContext = require("../WizardContext");
-var _withBaseWrapper = require("@wavemaker/react-runtime/higherOrder/withBaseWrapper");
-var _isEqual = _interopRequireDefault(require("lodash-es/isEqual"));
-function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, "default": e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t2 in e) "default" !== _t2 && {}.hasOwnProperty.call(e, _t2) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t2)) && (i.get || i.set) ? o(f, _t2, i) : f[_t2] = e[_t2]); return f; })(e, t); }
-var __jsx = _react["default"].createElement;
 var WmWizardstep = /*#__PURE__*/(0, _react.memo)(function (props) {
   var name = props.name,
     _props$title = props.title,
@@ -87,21 +81,14 @@ var WmWizardstep = /*#__PURE__*/(0, _react.memo)(function (props) {
     if (isRegistered && name) {
       context.updateStep(name, {
         content: content || children,
-        enableNext: !disablenext,
-        enablePrev: !disableprevious,
-        enableDone: !disabledone,
-        title: title,
-        enableskip: enableskip,
-        show: show
+        onLoad: onLoad,
+        onNext: onNext,
+        onPrev: onPrev,
+        onSkip: onSkip
       });
     }
-  }, [name, title, enableskip, show, disablenext, disableprevious, disabledone, content]);
-  return __jsx(_react["default"].Fragment, null);
-}, function (prev, next) {
-  var keys = ["name", "title", "subtitle", "iconclass", "doneiconclass", "show", "enableskip", "disablenext", "disableprevious", "disabledone", "content", "dynamicStepIndex", "isdynamic", "haveForm", "onLoad", "onNext", "onPrev", "onSkip", "render"];
-  return keys.every(function (key) {
-    return (0, _isEqual["default"])(prev[key], next[key]);
-  });
+  }, [context, name, content, children, onLoad, onNext, onPrev, onSkip, isRegistered]);
+  return null;
 });
 WmWizardstep.displayName = "WmWizardstep";
-var _default = exports["default"] = (0, _withBaseWrapper.withBaseWrapper)(WmWizardstep);
+var _default = exports["default"] = WmWizardstep;

package/components/data/form/base-form/index.js

@@ -19,6 +19,7 @@ var _set = _interopRequireDefault(require("lodash-es/set"));
 var _props = require("./props");
 var _utils = require("./utils");
 var _formContext = require("../form-context");
+var _utils2 = require("../../utils");
 var _lodashEs = require("lodash-es");
 function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, "default": e }; if (null === e || "object" != _typeof3(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t2 in e) "default" !== _t2 && {}.hasOwnProperty.call(e, _t2) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t2)) && (i.get || i.set) ? o(f, _t2, i) : f[_t2] = e[_t2]); return f; })(e, t); }
 var __jsx = _react["default"].createElement;
@@ -27,10 +28,10 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 var DEFAULT_CLASS = "panel app-panel app-form";
 var BaseForm = function BaseForm(WrappedComponent) {
   var ControlledForm = function ControlledForm(FormProps) {
-    var _props$listener4;
     // setting up default props for form
     var props = _objectSpread(_objectSpread({}, _props.defaultProps), FormProps);
     var isInsideWizard = props.isInsideWizard || false;
+    var primaryKeyRef = (0, _react.useRef)([]);
     var formRef = (0, _react.useRef)(null);
     var _useState = (0, _react.useState)({}),
       formfields = _useState[0],
@@ -69,7 +70,6 @@ var BaseForm = function BaseForm(WrappedComponent) {
       reset = _useForm.reset,
       watch = _useForm.watch,
       trigger = _useForm.trigger,
-      getValues = _useForm.getValues,
       clearErrors = _useForm.clearErrors;
 
     // update the form data when the formdata prop changes
@@ -165,13 +165,14 @@ var BaseForm = function BaseForm(WrappedComponent) {
     }, [trigger]);
     var handleFormSubmit = /*#__PURE__*/function () {
       var _ref = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee(data, e, operation) {
-        var isValid, _props$listener2, result, FormData, _props$listener3;
+        var isValid, _props$listener2, result, FormData, _props$listener3, operationType;
         return _regenerator["default"].wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
               if (!e) {
                 e = new Event("submit");
               }
+
               // check form is valid or not
               _context.next = 3;
               return validateFieldsOnSubmit();
@@ -215,22 +216,17 @@ var BaseForm = function BaseForm(WrappedComponent) {
                 }
 
                 // get the operation type
+                operationType = props.widgettype === "live-form" && !operation ? (0, _utils2.findOperationType)(FormData, primaryKeyRef.current) : operation;
                 props.formSubmit(FormData, function (data) {
-                  if (props.widgettype === "live-form" && data.operationType === "insert") {
+                  if (props.widgettype === "live-form" && operationType === "insert") {
                     reset(data);
                   }
                   onResultCb((0, _get["default"])(data, "params"), "success");
-                  var hasCustomOnSuccess = props.onSuccess !== _props.defaultProps.onSuccess;
-                  if (!hasCustomOnSuccess && props.widgettype === "live-form") {
-                    var successMsg = data.operationType === "insert" && props.insertmessage || data.operationType === "update" && props.updatemessage || data.operationType === "delete" && props.deletemessage || props.postmessage;
-                    toggleMessage(true, successMsg, "success");
-                    return;
-                  }
                   toggleMessage(true, props.postmessage, "success");
                 }, function (error) {
                   toggleMessage(true, props.errormessage || error || error.message, "error");
                   onResultCb(error, "");
-                });
+                }, operationType);
               }
               if (props !== null && props !== void 0 && props.onSubmit) {
                 props.onSubmit(e, props, FormData);
@@ -379,10 +375,7 @@ var BaseForm = function BaseForm(WrappedComponent) {
       cancel: cancel,
       "new": create,
       edit: edit,
-      setShowViewMode: setShowViewMode,
-      dataoutput: getValues(),
-      save: submit,
-      reset: reset
+      setShowViewMode: setShowViewMode
     });
     var conditionalProps = _objectSpread(_objectSpread(_objectSpread(_objectSpread({}, props.target && {
       target: props.target
@@ -426,23 +419,13 @@ var BaseForm = function BaseForm(WrappedComponent) {
     function cancel() {
       setShowViewMode(true);
     }
-    var fields = (0, _get["default"])((_props$listener4 = props.listener) === null || _props$listener4 === void 0 ? void 0 : _props$listener4.Widgets[props.name], "formfields", {});
-    var FormFields = (0, _react.useMemo)(function () {
-      var newFields = [];
-      Object.keys(fields).forEach(function (key) {
-        if (!key.includes("formWidget") && fields[key]) {
-          newFields.push(fields[key]);
-        }
-      });
-      return newFields;
-    }, [fields]);
 
     // Call onDataSourceChange when formfields change
     (0, _react.useEffect)(function () {
-      if (props.onDataSourceChange && FormFields.length > 0) {
-        props.onDataSourceChange(FormFields);
+      if (props.onDataSourceChange && Object.keys(formfields).length > 0) {
+        props.onDataSourceChange(formfields);
       }
-    }, [FormFields, props.onDataSourceChange]);
+    }, [formfields, props.onDataSourceChange]);
 
     // Determine form classes based on wizard context
     var formClassName = (0, _react.useMemo)(function () {
@@ -451,29 +434,6 @@ var BaseForm = function BaseForm(WrappedComponent) {
       }
       return (0, _clsx["default"])(DEFAULT_CLASS, props.className);
     }, [isInsideWizard, props.className]);
-
-    // Notify parent containers (wizard) about validity changes
-    (0, _react.useEffect)(function () {
-      var el = formRef.current;
-      if (!el) return;
-      var emit = function emit() {
-        el.dispatchEvent(new CustomEvent("wm:form-validity", {
-          bubbles: true,
-          detail: {
-            isValid: isValid
-          }
-        }));
-      };
-      emit();
-      var unsubscribe = watch(function () {
-        return emit();
-      });
-      return function () {
-        if (typeof unsubscribe === "function") {
-          unsubscribe();
-        }
-      };
-    }, [watch, isValid]);
     return __jsx("form", (0, _extends2["default"])({
       name: props.name,
       defaultmode: props.defaultmode,