@wavemaker/react-runtime 11.14.2-rc.6311 → 11.14.4-rc.647538

package/components/input/currency/index.js

@@ -51,8 +51,7 @@ var WmCurrency = function WmCurrency(props) {
     inputmode = _props$inputmode === void 0 ? "natural" : _props$inputmode,
     _props$decimalplaces = props.decimalplaces,
     decimalplaces = _props$decimalplaces === void 0 ? 0 : _props$decimalplaces,
-    _props$updateon = props.updateon,
-    updateon = _props$updateon === void 0 ? "blur" : _props$updateon,
+    updateon = props.updateon,
     _props$updatedelay = props.updatedelay,
     updatedelay = _props$updatedelay === void 0 ? "0" : _props$updatedelay,
     onChange = props.onChange,
@@ -101,7 +100,7 @@ var WmCurrency = function WmCurrency(props) {
   var debouncedUpdateValue = (0, _react.useCallback)(lodash.debounce(function (value) {
     var validation = validateValue(value);
     setShowError(!validation.isValid);
-    if (onChange || listener !== null && listener !== void 0 && listener.onChange) {
+    if (validation.isValid && (onChange || listener !== null && listener !== void 0 && listener.onChange)) {
       (0, _formatUtil.handleValidatedValueUpdate)(value, name, inputEl.current, onChange, listener, prevDatavalue, setPrevDatavalue, props);
     }
   }, parseInt(updatedelay || "10"), {
@@ -220,7 +219,7 @@ var WmCurrency = function WmCurrency(props) {
       setPrevDatavalue(datavalue);
     }
   }, [initialDataValue]);
-  var events = _objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread({}, onClick ? {
+  var events = _objectSpread(_objectSpread(_objectSpread(_objectSpread({}, onClick ? {
     onClick: handleClick
   } : {}), onMouseEnter ? {
     onMouseEnter: handleMouseEnter
@@ -228,12 +227,6 @@ var WmCurrency = function WmCurrency(props) {
     onMouseLeave: handleMouseLeave
   } : {}), onFocus ? {
     onFocus: handleFocus
-  } : {}), onBlur ? {
-    onBlur: handleBlur
-  } : {}), onChange ? {
-    onChange: handleInputChange
-  } : {}), onKeyDown ? {
-    onKeyDown: handleKeyDown
   } : {});
   return __jsx(_material.Box, {
     component: "div",
@@ -261,7 +254,10 @@ var WmCurrency = function WmCurrency(props) {
     tabIndex: tabindex,
     accessKey: shortcutkey,
     style: styles,
-    ref: inputEl
+    ref: inputEl,
+    onChange: handleInputChange,
+    onBlur: handleBlur,
+    onKeyDown: handleKeyDown
   })));
 };
 var _default = exports["default"] = (0, _withBaseWrapper.withBaseWrapper)((0, _withFormController["default"])(/*#__PURE__*/_react["default"].memo(WmCurrency)));

package/components/input/default/checkbox/index.js

@@ -55,6 +55,7 @@ var WmCheckbox = exports.WmCheckbox = /*#__PURE__*/(0, _react.memo)(function (pr
     rest = (0, _objectWithoutProperties2["default"])(props, _excluded);
   var checkboxRef = (0, _react.useRef)(null);
   var prevRefValue = (0, _react.useRef)(null);
+  var isInitialized = (0, _react.useRef)(false);
 
   // Keep track of the actual value (not just boolean state)
   var _React$useState = _react["default"].useState(function () {
@@ -74,13 +75,14 @@ var WmCheckbox = exports.WmCheckbox = /*#__PURE__*/(0, _react.memo)(function (pr
 
   // Update actual value when datavalue prop changes
   (0, _react.useEffect)(function () {
-    if (prevRefValue.current === datavalue) return;
+    if (prevRefValue.current === datavalue || isInitialized.current) return;
     if (datavalue === null || datavalue === undefined) {
       setActualValue(null);
     } else {
       var newValue = datavalue === checkedvalue ? checkedvalue : uncheckedvalue;
       setActualValue(newValue);
       prevRefValue.current = datavalue;
+      isInitialized.current = true;
       var event = {
         target: {
           checked: newValue
@@ -95,7 +97,6 @@ var WmCheckbox = exports.WmCheckbox = /*#__PURE__*/(0, _react.memo)(function (pr
 
     // Update our internal state with the actual value
     setActualValue(newValue);
-    prevRefValue.current = newValue;
     if (listener !== null && listener !== void 0 && listener.onChange) {
       listener.onChange(props.fieldName || name, {
         datavalue: newValue // Pass the actual value, not boolean

package/components/input/default/checkboxset/index.js

@@ -9,6 +9,7 @@ exports["default"] = exports.WmCheckboxset = void 0;
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
+var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _react = _interopRequireWildcard(require("react"));
 var _clsx = _interopRequireDefault(require("clsx"));
 var _Box = _interopRequireDefault(require("@mui/material/Box"));
@@ -22,7 +23,6 @@ var _constants = require("@wavemaker/react-runtime/components/constants");
 var _transformedDatasetUtils = require("@wavemaker/react-runtime/utils/transformedDataset-utils");
 var _input = require("@base-ui-components/react/input");
 var _withFormController = _interopRequireDefault(require("@wavemaker/react-runtime/components/data/form/form-controller/withFormController"));
-var _listHelpers = require("@wavemaker/react-runtime/components/data/list/utils/list-helpers");
 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;
 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; }
@@ -45,6 +45,26 @@ var normalizeDatavalue = function normalizeDatavalue(datavalue) {
   // Convert single value to array
   return [datavalue];
 };
+
+// Helper function to generate itemsPerRowClass
+var generateItemsPerRowClass = function generateItemsPerRowClass(itemsperrow) {
+  if (!itemsperrow) {
+    return "col-xs-12";
+  }
+  if (isNaN(parseInt(itemsperrow, 10))) {
+    // Handle string of classes (e.g. "xs-1 sm-1 md-1 lg-1")
+    return itemsperrow.split(" ").map(function (cls) {
+      var _cls$split = cls.split("-"),
+        _cls$split2 = (0, _slicedToArray2["default"])(_cls$split, 2),
+        tier = _cls$split2[0],
+        value = _cls$split2[1];
+      return "col-".concat(tier, "-").concat(12 / parseInt(value, 10));
+    }).join(" ");
+  }
+
+  // Handle single number value
+  return "col-xs-".concat(12 / parseInt(itemsperrow, 10));
+};
 var WmCheckboxset = exports.WmCheckboxset = /*#__PURE__*/(0, _react.memo)(function (props) {
   var _props$disabled = props.disabled,
     disabled = _props$disabled === void 0 ? false : _props$disabled,
@@ -130,7 +150,7 @@ var WmCheckboxset = exports.WmCheckboxset = /*#__PURE__*/(0, _react.memo)(functi
 
   // Generate itemsPerRowClass
   var itemsPerRowClass = (0, _react.useMemo)(function () {
-    return (0, _listHelpers.getItemsPerRowClass)(itemsperrow);
+    return generateItemsPerRowClass(itemsperrow);
   }, [itemsperrow]);
   var transformedDataset = (0, _react.useMemo)(function () {
     if (!dataset) return [];

package/components/input/default/radioset/index.js

@@ -22,7 +22,6 @@ var _transformedDatasetUtils = require("@wavemaker/react-runtime/utils/transform
 var _constants = require("@wavemaker/react-runtime/components/constants");
 var _withBaseWrapper = _interopRequireDefault(require("@wavemaker/react-runtime/higherOrder/withBaseWrapper"));
 var _withFormController = _interopRequireDefault(require("@wavemaker/react-runtime/components/data/form/form-controller/withFormController"));
-var _listHelpers = require("@wavemaker/react-runtime/components/data/list/utils/list-helpers");
 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; }
@@ -126,9 +125,7 @@ var WmRadioset = /*#__PURE__*/(0, _react.memo)(function (props) {
   var _useState6 = (0, _react.useState)(null),
     error = _useState6[0],
     setError = _useState6[1];
-  var itemsPerRowClass = (0, _react.useMemo)(function () {
-    return (0, _listHelpers.getItemsPerRowClass)(itemsperrow);
-  }, [itemsperrow]);
+  var itemsPerRowClass = "items-per-row-".concat(itemsperrow.replace(/\s+/g, "-"));
   var handleBlur = (0, _react.useCallback)(function () {
     if (onblur) onblur();
   }, [onblur]);
@@ -185,7 +182,9 @@ var WmRadioset = /*#__PURE__*/(0, _react.memo)(function (props) {
     }
   }, [groupby, localDatasetItems, collapsible, transformedDataset]);
   (0, _react.useEffect)(function () {
-    setSelectedKey(datavalue);
+    if (datavalue !== undefined) {
+      setSelectedKey(datavalue);
+    }
   }, [datavalue]);
   var handleGroupClick = (0, _react.useCallback)(function (key, event) {
     setExpandedItems(function (prevState) {

package/components/input/epoch/datetime/index.js

@@ -14,10 +14,8 @@ var _TimePicker = require("@mui/x-date-pickers/TimePicker");
 var _momentTimezone = _interopRequireDefault(require("moment-timezone"));
 var _clsx = _interopRequireDefault(require("clsx"));
 var _BaseDateTime = _interopRequireDefault(require("@wavemaker/react-runtime/higherOrder/BaseDateTime"));
-var _withFormController = _interopRequireDefault(require("@wavemaker/react-runtime/components/data/form/form-controller/withFormController"));
 var _utils = require("./utils");
 var _styled = require("./styled");
-var _store = require("@wavemaker/react-runtime/store");
 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; }
@@ -33,9 +31,7 @@ var WmDateTime = exports.WmDateTime = function WmDateTime(props) {
     shortcutkey = props.shortcutkey,
     datavalue = props.datavalue,
     _props$datepattern = props.datepattern,
-    datepattern = _props$datepattern === void 0 ? (0, _store.useAppSelector)(function (state) {
-      return "".concat(state.i18n.dateFormat, " ").concat(state.i18n.timeFormat) || "MMM d, y h:mm:ss a";
-    }) : _props$datepattern,
+    datepattern = _props$datepattern === void 0 ? "MMM d, y h:mm:ss a" : _props$datepattern,
     _props$hourstep = props.hourstep,
     hourstep = _props$hourstep === void 0 ? 1 : _props$hourstep,
     _props$minutestep = props.minutestep,
@@ -657,4 +653,4 @@ var WmDateTime = exports.WmDateTime = function WmDateTime(props) {
   }));
 };
 WmDateTime.displayName = "WmDateTime";
-var _default = exports["default"] = (0, _BaseDateTime["default"])((0, _withFormController["default"])(WmDateTime));
+var _default = exports["default"] = (0, _BaseDateTime["default"])(WmDateTime);

package/components/input/epoch/time/index.js

@@ -12,7 +12,6 @@ var _xDatePickers = require("@mui/x-date-pickers");
 var _momentTimezone = _interopRequireDefault(require("moment-timezone"));
 var _clsx = _interopRequireDefault(require("clsx"));
 var _BaseDateTime = _interopRequireDefault(require("@wavemaker/react-runtime/higherOrder/BaseDateTime"));
-var _withFormController = _interopRequireDefault(require("@wavemaker/react-runtime/components/data/form/form-controller/withFormController"));
 var _utils = require("./utils");
 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;
@@ -410,4 +409,4 @@ var WmTime = function WmTime(props) {
   }));
 };
 WmTime.displayName = "WmTime";
-var _default = exports["default"] = (0, _BaseDateTime["default"])((0, _withFormController["default"])(WmTime));
+var _default = exports["default"] = (0, _BaseDateTime["default"])(WmTime);

package/components/input/number/index.js

@@ -104,8 +104,8 @@ var WmNumber = /*#__PURE__*/(0, _react.memo)(function (props) {
         currentTarget: inputEl.current
       };
       listener === null || listener === void 0 || (_listener$onChange = listener.onChange) === null || _listener$onChange === void 0 || _listener$onChange.call(listener, props.fieldName || name, {
-        datavalue: value == null ? "" : value,
-        value: value == null ? "" : value,
+        datavalue: value == null ? "" : parseInt(value.toString()),
+        value: value == null ? "" : parseInt(value.toString()),
         displayValue: value == null ? "" : value.toString()
       }, value, prevDatavalue);
       if (onChange) {

package/components/input/text/util.js

@@ -7,7 +7,6 @@ exports.autoCapitalize = autoCapitalize;
 exports.removeDisplayFormat = exports.formatInput = void 0;
 var formatInput = exports.formatInput = function formatInput(value, format) {
   if (!format || !value) return value;
-  value = value.toString();
   var digitsOnly = value.replace(/\D/g, "");
   var formatDigits = format.replace(/[^9]/g, "");
   var maxDigits = formatDigits.length;
@@ -147,7 +146,6 @@ var formatInput = exports.formatInput = function formatInput(value, format) {
  */
 var removeDisplayFormat = exports.removeDisplayFormat = function removeDisplayFormat(value, format) {
   if (!format || !value) return value;
-  value = value.toString();
 
   // For alphanumeric formats (like AA-9999), keep both letters and numbers
   if (format.includes("A")) {

package/components/input/textarea/index.js

@@ -100,30 +100,32 @@ var WmTextarea = /*#__PURE__*/(0, _react.memo)(function (props) {
     };
   }, [required, regexp, maxchars]);
   var updateValue = (0, _react.useCallback)(function (newValue, validation) {
-    isInternalUpdate.current = true;
-    if (listener !== null && listener !== void 0 && listener.onChange) {
-      listener.onChange(props.fieldName || name, {
-        datavalue: newValue,
-        value: newValue,
-        charlength: newValue === null || newValue === void 0 ? void 0 : newValue.length
-      });
-    }
-    if (onChange) {
-      var syntheticEvent = {
-        target: {
+    if (validation.isValid) {
+      isInternalUpdate.current = true;
+      if (listener !== null && listener !== void 0 && listener.onChange) {
+        listener.onChange(props.fieldName || name, {
+          datavalue: newValue,
           value: newValue,
-          name: name
-        },
-        currentTarget: textareaRef.current
-      };
-      onChange(syntheticEvent, props, newValue, valueRef.current);
-    }
+          charlength: newValue === null || newValue === void 0 ? void 0 : newValue.length
+        });
+      }
+      if (onChange) {
+        var syntheticEvent = {
+          target: {
+            value: newValue,
+            name: name
+          },
+          currentTarget: textareaRef.current
+        };
+        onChange(syntheticEvent, props, newValue, valueRef.current);
+      }
 
-    // We need this setTimeout to ensure external updates don't override
-    // our internal update immediately
-    setTimeout(function () {
-      isInternalUpdate.current = false;
-    }, 0);
+      // We need this setTimeout to ensure external updates don't override
+      // our internal update immediately
+      setTimeout(function () {
+        isInternalUpdate.current = false;
+      }, 0);
+    }
   }, [onChange, listener === null || listener === void 0 ? void 0 : listener.onChange]);
 
   // Debounced update with stable reference

package/components/layout/leftnav/index.js

@@ -37,7 +37,7 @@ function WmLeftPanel(props) {
     id: id,
     component: "div",
     sx: styles,
-    className: (0, _clsx["default"])(DEFAULT_CLASS, className, "col-sm-".concat(columnwidth, " ").concat(navtype ? "app-nav-".concat(navtype) : "", " ").concat(navheight ? "app-nav-".concat(navheight) : ""))
+    className: (0, _clsx["default"])(DEFAULT_CLASS, className, "col-sm-".concat(columnwidth, " app-nav-").concat(navtype))
   }, children);
 }
 WmLeftPanel.displayName = "WmLeftPanel";

package/components/navbar/nav/index.js

@@ -14,8 +14,7 @@ var _navItem = require("@wavemaker/react-runtime/components/navbar/nav-item");
 var _anchor = require("@wavemaker/react-runtime/components/basic/anchor");
 var _withBaseWrapper = _interopRequireDefault(require("@wavemaker/react-runtime/higherOrder/withBaseWrapper"));
 var _menu = _interopRequireDefault(require("@wavemaker/react-runtime/components/navigation/menu"));
-var _utils = require("@wavemaker/react-runtime/core/util/utils");
-var _utils2 = require("../../../core/util/utils");
+var _constants = require("../../../core/constants");
 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; }
@@ -36,117 +35,30 @@ var WmNav = /*#__PURE__*/(0, _react.memo)(function (props) {
     name = props.name,
     styles = props.styles,
     id = props.id;
-  var path = (0, _utils2.getCurrentPath)();
-  var _useState = (0, _react.useState)(null),
-    activeNavItemIndex = _useState[0],
-    setActiveNavItemIndex = _useState[1];
-  var _useState2 = (0, _react.useState)(null),
-    hoveredNavItemIndex = _useState2[0],
-    setHoveredNavItemIndex = _useState2[1];
-  var activeNavItemIndexRef = (0, _react.useRef)(null);
-  var triggerActionClickForAnchor = function triggerActionClickForAnchor(e, item) {
-    e === null || e === void 0 || e.preventDefault();
-    (0, _utils.triggerItemAction)({
-      label: getItemLabel(item),
-      link: item[props.itemlink || "link"],
-      target: item[props.itemtarget]
-    });
-  };
-
-  // Helper function to get the label - handles both string and function
-  var getItemLabel = function getItemLabel(item) {
-    var itemlabel = props.itemlabel;
-    if (typeof itemlabel === "function") {
-      try {
-        return itemlabel(item);
-      } catch (error) {
-        console.warn("Error in itemlabel function:", error);
-      }
-    }
-
-    // If itemlabel is a string, use it as property name
-    if (typeof itemlabel === "string") {
-      return item[itemlabel];
-    }
-
-    // Fallback
-    return item["label"];
-  };
-
-  // Handler to activate nav item when menu detects active item or menu item is clicked
-  var handleNavItemActivate = (0, _react.useCallback)(function (navItemIndex) {
-    return function () {
-      activeNavItemIndexRef.current = navItemIndex;
-      setActiveNavItemIndex(navItemIndex);
-    };
-  }, []);
-
-  // Handler for nav item hover enter
-  var handleNavItemMouseEnter = (0, _react.useCallback)(function (index) {
-    return function (event) {
-      setHoveredNavItemIndex(index);
-    };
-  }, []);
-
-  // Handler for nav item hover leave
-  var handleNavItemMouseLeave = (0, _react.useCallback)(function (event) {
-    setHoveredNavItemIndex(null);
-  }, []);
-
-  // Check if nav item should be active - menu handles its own active detection
-  var isNavItemActive = (0, _react.useCallback)(function (item, index) {
-    var currentActiveIndex = activeNavItemIndexRef.current;
-    if (currentActiveIndex !== null && currentActiveIndex !== undefined) {
-      return currentActiveIndex === index;
-    }
-    var subActions = item["itemchildren"] || item["children"] || item["SubActions"];
-    var hasSubactions = Array.isArray(subActions) && subActions.length > 0;
-    if (hasSubactions) {
-      return false;
-    }
-    var itemLink = (0, _utils2.getItemLink)(item, props);
-    if (itemLink) {
-      var currentRoute = "#/".concat(path.split("/").filter(Boolean).pop() || "");
-      if (itemLink === currentRoute || path === itemLink.replace("#", "")) {
-        return true;
-      }
-    }
-    return false;
-  }, [activeNavItemIndex, path]);
   var renderNavItem = function renderNavItem() {
     if (props.dataset && props.dataset.length > 0) {
       return props.dataset.map(function (item, index) {
-        var label = getItemLabel(item);
-        var isActive = isNavItemActive(item, index);
         var subActions = item["itemchildren"] || item["children"] || item["SubActions"];
         var hasSubactions = Array.isArray(subActions) && subActions.length > 0;
         var childComponent = hasSubactions ? __jsx(_menu["default"], {
           name: "",
           itemlabel: props.itemlabel,
-          itemlink: props.itemlink,
-          itemicon: props.itemicon,
           listener: {},
           iconclass: item[props.itemicon],
-          caption: label,
+          caption: item[props.itemlabel || "label"],
           dataset: subActions,
           type: "anchor",
-          isFromNav: true,
-          onNavItemActivate: handleNavItemActivate(index),
-          onSelect: props.onSelect,
-          isNavFromMenu: true
+          onSelect: props.onSelect
         }) : __jsx(_anchor.WmAnchor, {
           name: "",
           listener: {},
-          caption: label,
+          caption: item[props.itemlabel || "label"],
           iconclass: item[props.itemicon],
           iconposition: item[props.iconposition],
           iconheight: item[props.iconheight],
           iconwidth: item[props.iconwidth],
           iconmargin: item[props.iconmargin],
-          hyperlink: "#",
-          onClick: function onClick(e) {
-            return triggerActionClickForAnchor(e, item);
-          },
+          hyperlink: (0, _constants.hyperLinkMofify)(item[props.itemlink || "link"]),
           target: item[props.itemtarget],
           action: item[props.itemaction],
           badgevalue: item[props.itembadge],
@@ -157,10 +69,8 @@ var WmNav = /*#__PURE__*/(0, _react.memo)(function (props) {
           key: index,
           name: "",
           listener: {},
-          className: (0, _clsx["default"])(hasSubactions ? "nav-".concat(type) : "", isActive ? "active" : "", hoveredNavItemIndex === index ? "active" : ""),
-          hint: item[props.itemhint],
-          onMouseEnter: handleNavItemMouseEnter(index),
-          onMouseLeave: handleNavItemMouseLeave
+          className: hasSubactions ? "nav-".concat(type) : undefined,
+          hint: item[props.itemhint]
         }, childComponent);
       });
     }

package/components/navbar/nav-item/index.js

@@ -20,8 +20,7 @@ var WmNavItem = exports.WmNavItem = /*#__PURE__*/(0, _react.memo)(function (prop
   var className = props.className,
     styles = props.styles,
     id = props.id,
-    onMouseEnter = props.onMouseEnter,
-    onMouseLeave = props.onMouseLeave;
+    name = props.name;
   return __jsx(_ListItem["default"], {
     name: name,
     id: id,
@@ -33,9 +32,7 @@ var WmNavItem = exports.WmNavItem = /*#__PURE__*/(0, _react.memo)(function (prop
       padding: "inherit"
     }),
     className: (0, _clsx["default"])(DEFAULT_CLASS, className),
-    title: props.hint,
-    onMouseEnter: onMouseEnter,
-    onMouseLeave: onMouseLeave
+    title: props.hint
   }, props.children);
 }, function (prev, current) {
   var keys = ["className", "styles", "children"];