@wavemaker/react-runtime 11.14.2-rc.6311 → 11.15.0-1.246

package/utils/form-state.util.js

@@ -7,6 +7,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.unregisterFormField = exports.shouldRegisterFormField = exports.registerFormFieldSafe = exports.registerFormField = void 0;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _get = _interopRequireDefault(require("lodash-es/get"));
+var _events = require("../core/constants/events");
 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; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2["default"])(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; } /**
  * Form State Utility
@@ -43,6 +44,9 @@ var shouldRegisterFormField = exports.shouldRegisterFormField = function shouldR
   var isNotFormWidget = isFormField(widget.name);
   return isField && hasFormName && isNotFormWidget;
 };
+var hasParentForm = function hasParentForm(formName) {
+  return Boolean();
+};
 
 /**
  * Registers a form field widget with its parent form in the context
@@ -52,7 +56,8 @@ var shouldRegisterFormField = exports.shouldRegisterFormField = function shouldR
  * @param widget - The widget/proxy to register
  * @param widgetProps - The widget properties containing form metadata
  */
-var registerFormField = exports.registerFormField = function registerFormField(widgetsContext, widget, widgetProps) {
+var registerFormField = exports.registerFormField = function registerFormField(widgetsContext, widget, widgetProps, newContext) {
+  var _widgetsContext$formN;
   var formName = widgetProps === null || widgetProps === void 0 ? void 0 : widgetProps.formName;
   if (!formName || !shouldRegisterFormField(widgetProps)) {
     return;
@@ -79,6 +84,25 @@ var registerFormField = exports.registerFormField = function registerFormField(w
   // Register formWidget variants (for form field wrapper components)
   widgetsContext[formName].formfields["".concat(fieldName, "_formWidget")] = widget;
   widgetsContext[formName].formWidgets["".concat(fieldName, "_formWidget")] = widget;
+  var parentFormName = (_widgetsContext$formN = widgetsContext[formName]) === null || _widgetsContext$formN === void 0 ? void 0 : _widgetsContext$formN.parentForm;
+  // If this is a prefab form with a parent form, emit event to register field in parent form's proxy
+  if (newContext !== null && newContext !== void 0 && newContext.prefab && newContext !== null && newContext !== void 0 && newContext.parentForm) {
+    _events.EVENTEMITTER_METHODS.CHILD_FORM_FIELD_REGISTER_EMIT(newContext === null || newContext === void 0 ? void 0 : newContext.parentForm, {
+      childFormName: formName,
+      widget: widget,
+      widgetProps: widgetProps,
+      formKey: formKey,
+      fieldName: fieldName
+    });
+  }
+  if (parentFormName && widgetsContext[parentFormName]) {
+    widgetsContext[parentFormName].formfields = widgetsContext[parentFormName].formfields || {};
+    widgetsContext[parentFormName].formWidgets = widgetsContext[parentFormName].formWidgets || {};
+    widgetsContext[parentFormName].formfields[formKey] = widget;
+    widgetsContext[parentFormName].formWidgets[fieldName] = widget;
+    widgetsContext[parentFormName].formfields["".concat(formKey, "_formWidget")] = widget;
+    widgetsContext[parentFormName].formWidgets["".concat(fieldName, "_formWidget")] = widget;
+  }
 };
 
 /**
@@ -89,7 +113,7 @@ var registerFormField = exports.registerFormField = function registerFormField(w
  * @param fieldProps - The field properties to register
  */
 var registerFormFieldSafe = exports.registerFormFieldSafe = function registerFormFieldSafe(widgetsContext, fieldProps) {
-  var _widgetsContext$formN, _widgetsContext$formN2, _widgetsContext$formN3, _widgetsContext$formN4, _widgetsContext$formN5;
+  var _widgetsContext$formN7;
   var formName = fieldProps === null || fieldProps === void 0 ? void 0 : fieldProps.formName;
   if (!formName || !shouldRegisterFormField(fieldProps)) {
     return;
@@ -99,17 +123,24 @@ var registerFormFieldSafe = exports.registerFormFieldSafe = function registerFor
   if (!formKey || !fieldName) {
     return;
   }
+  function register(formName, formKey, fieldName, fieldProps) {
+    var _widgetsContext$formN2, _widgetsContext$formN3, _widgetsContext$formN4, _widgetsContext$formN5, _widgetsContext$formN6;
+    // ✅ Ensure all nested structures exist using nullish coalescing
+    (_widgetsContext$formN2 = widgetsContext[formName]) !== null && _widgetsContext$formN2 !== void 0 ? _widgetsContext$formN2 : widgetsContext[formName] = {};
+    (_widgetsContext$formN4 = (_widgetsContext$formN3 = widgetsContext[formName]).formfields) !== null && _widgetsContext$formN4 !== void 0 ? _widgetsContext$formN4 : _widgetsContext$formN3.formfields = {};
+    (_widgetsContext$formN6 = (_widgetsContext$formN5 = widgetsContext[formName]).formWidgets) !== null && _widgetsContext$formN6 !== void 0 ? _widgetsContext$formN6 : _widgetsContext$formN5.formWidgets = {};
 
-  // ✅ Ensure all nested structures exist using nullish coalescing
-  (_widgetsContext$formN = widgetsContext[formName]) !== null && _widgetsContext$formN !== void 0 ? _widgetsContext$formN : widgetsContext[formName] = {};
-  (_widgetsContext$formN3 = (_widgetsContext$formN2 = widgetsContext[formName]).formfields) !== null && _widgetsContext$formN3 !== void 0 ? _widgetsContext$formN3 : _widgetsContext$formN2.formfields = {};
-  (_widgetsContext$formN5 = (_widgetsContext$formN4 = widgetsContext[formName]).formWidgets) !== null && _widgetsContext$formN5 !== void 0 ? _widgetsContext$formN5 : _widgetsContext$formN4.formWidgets = {};
-
-  // ✅ Only add if not already present
-  widgetsContext[formName].formfields[formKey] = _objectSpread({}, fieldProps);
-  widgetsContext[formName].formWidgets[fieldName] = _objectSpread({}, fieldProps);
-  widgetsContext[formName].formfields["".concat(fieldName, "_formWidget")] = _objectSpread({}, fieldProps);
-  widgetsContext[formName].formWidgets["".concat(fieldName, "_formWidget")] = _objectSpread({}, fieldProps);
+    // ✅ Only add if not already present
+    widgetsContext[formName].formfields[formKey] = _objectSpread({}, fieldProps);
+    widgetsContext[formName].formWidgets[fieldName] = _objectSpread({}, fieldProps);
+    widgetsContext[formName].formfields["".concat(fieldName, "_formWidget")] = _objectSpread({}, fieldProps);
+    widgetsContext[formName].formWidgets["".concat(fieldName, "_formWidget")] = _objectSpread({}, fieldProps);
+  }
+  register(formName, formKey, fieldName, fieldProps);
+  var parentForm = (_widgetsContext$formN7 = widgetsContext[formName]) === null || _widgetsContext$formN7 === void 0 ? void 0 : _widgetsContext$formN7.parentForm;
+  if (parentForm) {
+    register(parentForm, formKey, fieldName, fieldProps);
+  }
 };
 
 /**

package/utils/form-utils.js

@@ -4,10 +4,11 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.loginErrorMessage = exports.invokeFormEvent = exports.getFormWidget = exports.getFormProps = exports.getFormData = exports.formValidate = void 0;
+exports.shouldSkipFieldKey = exports.loginErrorMessage = exports.invokeFormEvent = exports.getFormWidget = exports.getFormProps = exports.getFormData = exports.getErrorTypes = exports.formValidate = void 0;
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
+var _keys = _interopRequireDefault(require("lodash-es/keys"));
 /**
  * Form utility functions for centralizing form operations across widgets
  */
@@ -184,4 +185,48 @@ var invokeFormEvent = exports.invokeFormEvent = /*#__PURE__*/function () {
   return function invokeFormEvent(_x2, _x3, _x4, _x5, _x6) {
     return _ref2.apply(this, arguments);
   };
-}();
+}();
+
+/**
+ * Extracts error types from react-hook-form error object.
+ * react-hook-form error structure: { type: 'required', message: '...' }
+ * or { types: { required: '...', minLength: '...' } }
+ * @param fieldErrors - The error object from react-hook-form
+ * @returns Array of error type strings
+ */
+var getErrorTypes = exports.getErrorTypes = function getErrorTypes(fieldErrors) {
+  if (!fieldErrors) return [];
+
+  // Handle multiple errors (when using criteriaMode: 'all')
+  if (fieldErrors.types) {
+    return (0, _keys["default"])(fieldErrors.types);
+  }
+
+  // Handle single error
+  if (fieldErrors.type) {
+    return [fieldErrors.type];
+  }
+  return (0, _keys["default"])(fieldErrors);
+};
+
+/**
+ * Checks if a field key should be skipped during validation messages iteration.
+ * - Skips formWidget entries (duplicates)
+ * - Skips underscore variants if dot notation exists (e.g., Department_deptCode when Department.deptCode exists)
+ * @param fieldKey - The field key to check
+ * @param allFieldKeys - All field keys in the form
+ * @returns true if the field should be skipped
+ */
+var shouldSkipFieldKey = exports.shouldSkipFieldKey = function shouldSkipFieldKey(fieldKey, allFieldKeys) {
+  // Skip formWidget entries (they are duplicates)
+  if (fieldKey.includes("formWidget")) return true;
+
+  // Skip underscore variants if dot notation exists (avoid duplicates)
+  if (fieldKey.includes("_")) {
+    var dotNotationKey = fieldKey.replace(/_/g, ".");
+    if (allFieldKeys.includes(dotNotationKey)) {
+      return true;
+    }
+  }
+  return false;
+};

package/utils/format-util.js

@@ -92,7 +92,7 @@ var handleStepValue = exports.handleStepValue = function handleStepValue(current
     newValue = getValueInRange(minvalue || 0, minvalue || 0, maxvalue || 0);
   } else {
     var stepAmount = direction === "UP" ? step : -step;
-    newValue = getValueInRange(currentValue + stepAmount, minvalue || 0, maxvalue || 0);
+    newValue = getValueInRange(currentValue + stepAmount, minvalue, maxvalue);
   }
 
   // Round to appropriate decimal places
@@ -101,20 +101,20 @@ var handleStepValue = exports.handleStepValue = function handleStepValue(current
 
 // Common validation function for both currency and number widgets
 var validateNumericValue = exports.validateNumericValue = function validateNumericValue(value, required, minvalue, maxvalue, regexp) {
-  if (!value && required) {
+  if ((value === undefined || value === null) && required) {
     return {
       isValid: false,
       message: "This field is required"
     };
   }
   var numValue = typeof value === "string" ? parseNumber(value) : value;
-  if (!numValue && required) {
+  if ((numValue === undefined || numValue === null) && required) {
     return {
       isValid: false,
       message: "This field is required"
     };
   }
-  if (!numValue) {
+  if (numValue === undefined || numValue === null) {
     return {
       isValid: !required,
       message: required ? "This field is required" : ""
@@ -150,7 +150,7 @@ var validateNumericValue = exports.validateNumericValue = function validateNumer
 var handleNumericInputChange = exports.handleNumericInputChange = function handleNumericInputChange(inputValue, inputmode, decimalplaces, setRawInputValue) {
   var processedInputValue = inputValue;
   var newVal;
-  if (inputmode === "financial") {
+  if (inputmode === "financial" && decimalplaces > 0) {
     var digitsOnly = inputValue.replace(/[^\d]/g, "");
     if (digitsOnly === "") {
       processedInputValue = "";
@@ -190,7 +190,7 @@ var handleNumericInputChange = exports.handleNumericInputChange = function handl
       if (decPart && decPart.length > decimalplaces) {
         return {
           inputValue: inputValue,
-          newVal: null
+          newVal: Number(_cleanValue)
         };
       }
       processedInputValue = _cleanValue;
@@ -231,6 +231,18 @@ var formatOnBlur = exports.formatOnBlur = function formatOnBlur(datavalue, rawIn
       // Use the raw input value to preserve trailing zeros
       return formatNumberWithCommas(rawInputValue, trailingzero, decimalplaces);
     } else {
+      if (rawInputValue.includes(".")) {
+        var _rawInputValue$split = rawInputValue.split("."),
+          _rawInputValue$split2 = (0, _slicedToArray2["default"])(_rawInputValue$split, 2),
+          intPart = _rawInputValue$split2[0],
+          decPart = _rawInputValue$split2[1];
+        var intWithCommas = new Intl.NumberFormat("en-US").format(Number(intPart));
+        var trimmedDecPart = decPart.replace(/0+$/, "");
+        if (trimmedDecPart === "") {
+          return intWithCommas;
+        }
+        return "".concat(intWithCommas, ".").concat(trimmedDecPart);
+      }
       return formatNumberWithCommas(datavalue);
     }
   }
@@ -241,6 +253,15 @@ var formatOnBlur = exports.formatOnBlur = function formatOnBlur(datavalue, rawIn
 var handleValidatedValueUpdate = exports.handleValidatedValueUpdate = function handleValidatedValueUpdate(value, name, inputElCurrent, onChangeProp, listenerProp, prevDatavalueState, setPrevDatavalueState, widgetProps) {
   var stringifiedValue = value === null ? "" : value.toString();
   var widgetInfo = name && listenerProp !== null && listenerProp !== void 0 && listenerProp.Widgets ? listenerProp.Widgets[name] : undefined;
+  if (listenerProp !== null && listenerProp !== void 0 && listenerProp.onChange) {
+    listenerProp.onChange(name, _objectSpread(_objectSpread({}, widgetInfo || widgetProps), {}, {
+      datavalue: stringifiedValue
+    }));
+  }
+  setPrevDatavalueState(value);
+  var updatedProps = _objectSpread(_objectSpread({}, widgetProps), {}, {
+    datavalue: stringifiedValue
+  });
   if (onChangeProp) {
     var syntheticEvent = {
       target: {
@@ -249,12 +270,6 @@ var handleValidatedValueUpdate = exports.handleValidatedValueUpdate = function h
       },
       currentTarget: inputElCurrent
     };
-    onChangeProp(syntheticEvent, widgetInfo || widgetProps, value, prevDatavalueState);
-  }
-  if (listenerProp !== null && listenerProp !== void 0 && listenerProp.onChange) {
-    listenerProp.onChange(name, _objectSpread(_objectSpread({}, widgetInfo || {}), {}, {
-      datavalue: stringifiedValue
-    }));
+    onChangeProp(syntheticEvent, updatedProps, value, prevDatavalueState);
   }
-  setPrevDatavalueState(value);
 };

package/utils/page-params-util.js

@@ -4,7 +4,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.computeMergedPageParams = void 0;
+exports.extractPartialParamValues = exports.computePartialParamKey = exports.computeMergedPageParams = void 0;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 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; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2["default"])(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
@@ -21,4 +21,36 @@ var computeMergedPageParams = exports.computeMergedPageParams = function compute
     return _objectSpread(_objectSpread({}, urlParams), partialParams);
   }
   return urlParams;
+};
+
+/**
+ * Extracts param values from props (excluding functions) for partial components
+ * @param params - Array of param keys to extract (e.g., ['toPageName', 'userId'])
+ * @param props - Props object containing the param values
+ * @returns Object with param keys and their non-function values
+ */
+var extractPartialParamValues = exports.extractPartialParamValues = function extractPartialParamValues(params, props) {
+  return (params || []).reduce(function (acc, key) {
+    var val = props[key];
+    // Exclude functions - they get new references on every render
+    if (typeof val !== "function") {
+      acc[key] = val;
+    }
+    return acc;
+  }, {});
+};
+
+/**
+ * Computes a stable serialized key from partial param values
+ * Used as a dependency for effects that need to react to param changes
+ * @param componentType - Type of component ('PARTIAL', 'PAGE', etc.)
+ * @param params - Array of param keys to watch
+ * @param props - Props object containing the param values
+ * @returns JSON string of param values or null for non-partial components
+ */
+var computePartialParamKey = exports.computePartialParamKey = function computePartialParamKey(componentType, params, props) {
+  if (componentType !== "PARTIAL") {
+    return null;
+  }
+  return JSON.stringify(extractPartialParamValues(params || [], props));
 };

package/utils/state-persistance.js

@@ -4,16 +4,65 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.setWidgetState = exports.getWidgetState = exports.clearWidgetState = void 0;
+exports.setWidgetState = exports.markPageNavigationPending = exports.isPageNavigationPending = exports.getWidgetState = exports.clearWidgetState = exports.clearPageNavigationPending = void 0;
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
 var _lodashEs = require("lodash-es");
+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; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2["default"])(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 // Storage keys
 var WM_STATE_KEY = "wm_state";
 var WM_STATE_URL_PARAM = "wm_state";
 // Default workspace name
 var DEFAULT_WORKSPACE = "ws";
 
+// Page navigation tracking - prevents router.replace() from overwriting router.push()
+// when both are called during the same event (e.g., click on container inside list)
+var pageNavigationPending = false;
+var navigationClearTimeout = null;
+
+/**
+ * Marks that a page navigation (router.push) is about to occur.
+ * This prevents URL state persistence (router.replace) from overwriting the navigation.
+ * Must be called SYNCHRONOUSLY before router.push() is invoked.
+ * Auto-clears after 2 seconds to prevent getting stuck.
+ */
+var markPageNavigationPending = exports.markPageNavigationPending = function markPageNavigationPending() {
+  pageNavigationPending = true;
+
+  // Clear any existing timeout
+  if (navigationClearTimeout) {
+    clearTimeout(navigationClearTimeout);
+  }
+
+  // Auto-clear after 2 seconds to prevent getting stuck
+  // (navigation should complete well before this)
+  navigationClearTimeout = setTimeout(function () {
+    pageNavigationPending = false;
+    navigationClearTimeout = null;
+  }, 2000);
+};
+
+/**
+ * Clears the page navigation pending flag.
+ * Called after navigation completes or is cancelled.
+ */
+var clearPageNavigationPending = exports.clearPageNavigationPending = function clearPageNavigationPending() {
+  pageNavigationPending = false;
+  if (navigationClearTimeout) {
+    clearTimeout(navigationClearTimeout);
+    navigationClearTimeout = null;
+  }
+};
+
+/**
+ * Checks if page navigation is currently pending.
+ */
+var isPageNavigationPending = exports.isPageNavigationPending = function isPageNavigationPending() {
+  return pageNavigationPending;
+};
+
 // Generate storage key for localStorage/sessionStorage (page-specific)
 var getStorageKey = function getStorageKey() {
   if (typeof window === "undefined") return WM_STATE_KEY;
@@ -30,14 +79,14 @@ var getCurrentPageName = function getCurrentPageName() {
 // Convert JSON to URL-friendly encoded format (no quotes needed)
 var jsonToUri = function jsonToUri(jsonObj) {
   // Custom stringify that doesn't use quotes
-  var customStringify = function customStringify(obj) {
+  var _customStringify = function customStringify(obj) {
     if (obj === null) return "null";
     if (obj === undefined) return "undefined";
     if (typeof obj === "string") return obj;
     if (typeof obj === "number" || typeof obj === "boolean") return String(obj);
     if (Array.isArray(obj)) {
       if (obj.length === 0) return "!*";
-      return "!" + obj.map(customStringify).join("_") + "*";
+      return "!" + obj.map(_customStringify).join("_") + "*";
     }
     if ((0, _typeof2["default"])(obj) === "object") {
       var pairs = [];
@@ -45,14 +94,14 @@ var jsonToUri = function jsonToUri(jsonObj) {
         var _Object$entries$_i = (0, _slicedToArray2["default"])(_Object$entries[_i], 2),
           key = _Object$entries$_i[0],
           value = _Object$entries$_i[1];
-        pairs.push(key + "~" + customStringify(value));
+        pairs.push(key + "~" + _customStringify(value));
       }
       if (pairs.length === 0) return "()";
       return "(" + pairs.join("_") + ")";
     }
     return String(obj);
   };
-  return customStringify(jsonObj);
+  return _customStringify(jsonObj);
 };
 
 // Decode URL-encoded format back to object
@@ -62,7 +111,7 @@ var uriToJson = function uriToJson(encodedObj) {
     var decoded = decodeURIComponent(encodedObj);
 
     // Custom parser for our format
-    var parse = function parse(str) {
+    var _parse3 = function parse(str) {
       var startIndex = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 0;
       if (str[startIndex] === "(") {
         // Parse object
@@ -81,7 +130,7 @@ var uriToJson = function uriToJson(encodedObj) {
           i++; // skip '~'
 
           // Parse value
-          var _parse = parse(str, i),
+          var _parse = _parse3(str, i),
             _value = _parse.value,
             endIndex = _parse.endIndex;
           obj[key] = _value;
@@ -99,7 +148,7 @@ var uriToJson = function uriToJson(encodedObj) {
         var arr = [];
         var _i2 = startIndex + 1;
         while (_i2 < str.length && str[_i2] !== "*") {
-          var _parse2 = parse(str, _i2),
+          var _parse2 = _parse3(str, _i2),
             _value2 = _parse2.value,
             _endIndex = _parse2.endIndex;
           arr.push(_value2);
@@ -153,8 +202,8 @@ var uriToJson = function uriToJson(encodedObj) {
         };
       }
     };
-    var _parse3 = parse(decoded),
-      value = _parse3.value;
+    var _parse4 = _parse3(decoded),
+      value = _parse4.value;
     return value;
   } catch (e) {
     console.warn("Failed to parse state from URL:", e);
@@ -202,6 +251,7 @@ var setAllStates = function setAllStates(storage, states) {
       sessionStorage.setItem(getStorageKey(), JSON.stringify(states));
       break;
     case "URL":
+      var currentUrl = window.location.href;
       var url = new URL(window.location.href);
       var urlParams = new URLSearchParams(url.search);
       if ((0, _lodashEs.keys)(states).length > 0) {
@@ -222,9 +272,18 @@ var setAllStates = function setAllStates(storage, states) {
         urlParams["delete"](WM_STATE_URL_PARAM);
         url.search = urlParams.toString();
       }
-      window.history.replaceState({
-        path: url.toString()
-      }, "", url.toString());
+      if (currentUrl !== url.toString()) {
+        // Skip URL state update if page navigation is pending to prevent
+        // URL update from overwriting the pending router.push()
+        if (pageNavigationPending) {
+          return;
+        }
+
+        // Use window.history.replaceState() to update URL without triggering re-render
+        // This is more efficient than router.replace() which causes component re-renders
+        var newPath = url.pathname + url.search;
+        window.history.replaceState(_objectSpread({}, window.history.state), "", newPath);
+      }
       break;
   }
 };

package/utils/transformedDataset-utils.js

@@ -5,7 +5,7 @@ var _typeof3 = require("@babel/runtime/helpers/typeof");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.transformFormData = exports.transformDataset = exports.transformDataWithKeys = exports.toggleAllHeaders = exports.setItemByCompare = exports.handleHeaderClick = exports.groupData = exports.getOrderedDataset = exports.extractDataAsArray = exports.datasetItems = exports.convertDataToObject = exports.configureDnD = exports.DataSetItem = void 0;
+exports.transformFormData = exports.transformDataset = exports.transformDataWithKeys = exports.toggleAllHeaders = exports.setItemByCompare = exports.handleHeaderClick = exports.groupData = exports.getUniqObjsByDataField = exports.getOrderedDataset = exports.extractDataAsArray = exports.datasetItems = exports.convertDataToObject = exports.configureDnD = exports.DataSetItem = void 0;
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
@@ -89,8 +89,8 @@ var DataSetItem = exports.DataSetItem = /*#__PURE__*/(0, _createClass2["default"
   (0, _defineProperty2["default"])(this, "match", void 0);
   (0, _defineProperty2["default"])(this, "dateformat", void 0);
 });
-var _internalTransformDataset = function _internalTransformDataset(dataset, datafield, displayfield, displaylabel, displayexpression, orderby, groupby, dataPath, itemchildren) {
-  return datasetItems(dataset, datafield, displayfield, displaylabel, displayexpression, orderby, groupby, dataPath, itemchildren);
+var _internalTransformDataset = function _internalTransformDataset(dataset, datafield, displayfield, displaylabel, displayexpression, orderby, groupby, dataPath, itemchildren, match) {
+  return _datasetItems(dataset, datafield, displayfield, displaylabel, displayexpression, orderby, groupby, dataPath, itemchildren, match);
 };
 
 // Custom resolver for memoize to handle multiple arguments correctly
@@ -218,7 +218,7 @@ function resolveDataPath(dataSet, dataPath) {
     return segment.length > 0;
   });
   if (pathSegments.length === 0) return dataSet;
-  var flatten = function flatten(data, path) {
+  var _flatten = function flatten(data, path) {
     if (path.length === 0) return data;
     var nextKey = path[0];
     var remainingPath = path.slice(1);
@@ -231,10 +231,10 @@ function resolveDataPath(dataSet, dataPath) {
         if (!item || (0, _typeof2["default"])(item) !== "object") continue;
         var value = item[nextKey];
         if (Array.isArray(value)) {
-          var next = flatten(value, remainingPath);
+          var next = _flatten(value, remainingPath);
           result = result.concat(next);
         } else if (((0, _typeof2["default"])(value) === "object" || typeof value === "string") && value !== null) {
-          var _next = flatten([value], remainingPath);
+          var _next = _flatten([value], remainingPath);
           result = result.concat(_next);
         }
         // else: primitive types or undefined → skip
@@ -246,7 +246,7 @@ function resolveDataPath(dataSet, dataPath) {
     }
     return result;
   };
-  return flatten(dataSet, pathSegments);
+  return _flatten(dataSet, pathSegments);
 }
 var transformFormData = exports.transformFormData = function transformFormData(context, dataSet, myDataField, displayOptions, startIndex, scope, dataPath) {
   if (dataPath) {
@@ -307,9 +307,13 @@ var transformFormData = exports.transformFormData = function transformFormData(c
           expression: displayOptions.displayExpr,
           bindExpression: displayOptions.bindDisplayExpr
         }, option);
+        // If label is empty and there's no displayexpression/displayfield, use datafield value (key) as label
+        var hasDisplayExpr = displayOptions === null || displayOptions === void 0 ? void 0 : displayOptions.displayExpr;
+        var hasDisplayField = displayOptions === null || displayOptions === void 0 ? void 0 : displayOptions.displayField; // Check if displayfield was originally provided
+        var finalLabel = isDefined(label) && label !== null ? label.toString() : !hasDisplayExpr && !hasDisplayField && key !== undefined && key !== null ? String(key) : "";
         var dataSetItem = {
           key: key,
-          label: isDefined(label) && label !== null ? label.toString() : "",
+          label: finalLabel,
           value: myDataField === ALLFIELDS ? option : key,
           dataObject: option,
           // represents the object when datafield is ALLFIELDS. This is used as innerItem while grouping the datasetItems.
@@ -328,18 +332,20 @@ var transformFormData = exports.transformFormData = function transformFormData(c
   }
   return data;
 };
-var getUniqObjsByDataField = function getUniqObjsByDataField(data, dataField, displayField, allowEmptyFields) {
-  if (!allowEmptyFields) {
-    data = (0, _lodashEs.filter)(data, function (item) {
-      return isDefined(item.key) && item.key !== "";
-    });
+var getUniqObjsByDataField = exports.getUniqObjsByDataField = function getUniqObjsByDataField(data, dataField, displayField, allowEmptyFields) {
+  var uniqData;
+  var isAllFields = dataField === ALLFIELDS;
+  uniqData = isAllFields ? (0, _lodashEs.uniqWith)(data, _lodashEs.isEqual) : (0, _lodashEs.uniqBy)(data, "key");
+  if (!displayField || allowEmptyFields) {
+    return uniqData;
   }
-  return (0, _lodashEs.uniqWith)(data, function (obj1, obj2) {
-    var val1 = (0, _lodashEs.get)(obj1.dataObject, dataField);
-    var val2 = (0, _lodashEs.get)(obj2.dataObject, dataField);
-    var dVal1 = (0, _lodashEs.get)(obj1.dataObject, displayField);
-    var dVal2 = (0, _lodashEs.get)(obj2.dataObject, displayField);
-    return (0, _lodashEs.isEqual)(val1, val2) && (0, _lodashEs.isEqual)(dVal1, dVal2);
+
+  // return objects having non empty datafield and display field values.
+  return (0, _lodashEs.filter)(uniqData, function (obj) {
+    if (isAllFields) {
+      return (0, _lodashEs.trim)(obj.label);
+    }
+    return (0, _lodashEs.trim)(obj.key) && (0, _lodashEs.trim)(obj.label);
   });
 };
 var setItemByCompare = exports.setItemByCompare = function setItemByCompare(datasetItems, compareWithDataObj, compareByField) {
@@ -359,12 +365,13 @@ var getSortedGroupedData = function getSortedGroupedData(groupedLiData, groupBy,
   });
   return (0, _lodashEs.sortBy)(data, "data[0].dataObject.".concat(groupBy));
 };
-var datasetItems = exports.datasetItems = function datasetItems(dataset, datafield, displayfield, displaylabel, displayexpression, orderby, groupby, dataPath, itemchildren) {
+var _datasetItems = exports.datasetItems = function datasetItems(dataset, datafield, displayfield, displaylabel, displayexpression, orderby, groupby, dataPath, itemchildren, match) {
   if (!dataset) return [];
   var items = transformFormData(null, dataset, datafield, {
     displayField: displayfield || displaylabel,
     displayExpr: displayexpression
   }, 0, null, dataPath);
+  items = getUniqObjsByDataField(items, datafield, displayfield || displaylabel, false);
   if (orderby) {
     var orderFields = orderby.split(",");
     items.sort(function (a, b) {
@@ -379,7 +386,11 @@ var datasetItems = exports.datasetItems = function datasetItems(dataset, datafie
             order = _orderField$split2[1];
           var aVal = String(a.dataObject[field] || a.label || "");
           var bVal = String(b.dataObject[field] || b.label || "");
-          var comparison = order === "desc" ? bVal.localeCompare(aVal) : aVal.localeCompare(bVal);
+          var comparison = order === "desc" ? bVal.localeCompare(aVal, "en", {
+            numeric: true
+          }) : aVal.localeCompare(bVal, "en", {
+            numeric: true
+          });
           if (comparison !== 0) return comparison;
         }
       } catch (err) {
@@ -400,7 +411,7 @@ var datasetItems = exports.datasetItems = function datasetItems(dataset, datafie
         var _itemchildren;
         children = (_itemchildren = itemchildren(item === null || item === void 0 ? void 0 : item.dataObject)) !== null && _itemchildren !== void 0 ? _itemchildren : itemchildren(item);
         if (Array.isArray(children)) {
-          var sortedChildren = datasetItems(children, datafield, displayfield, displaylabel, displayexpression, orderby, groupby);
+          var sortedChildren = _datasetItems(children, datafield, displayfield, displaylabel, displayexpression, orderby, groupby, dataPath, itemchildren, match);
           if (itemchildren(item === null || item === void 0 ? void 0 : item.dataObject)) {
             item.dataObject.children = sortedChildren;
           } else if (itemchildren(item)) {
@@ -412,7 +423,7 @@ var datasetItems = exports.datasetItems = function datasetItems(dataset, datafie
         children = (_item$dataObject$item = item === null || item === void 0 || (_item$dataObject = item.dataObject) === null || _item$dataObject === void 0 ? void 0 : _item$dataObject[itemchildren]) !== null && _item$dataObject$item !== void 0 ? _item$dataObject$item : item === null || item === void 0 ? void 0 : item[itemchildren];
         if (Array.isArray(children)) {
           var _item$dataObject2;
-          var _sortedChildren = datasetItems(children, datafield, displayfield, displaylabel, displayexpression, orderby, groupby);
+          var _sortedChildren = _datasetItems(children, datafield, displayfield, displaylabel, displayexpression, orderby, groupby, dataPath, itemchildren, match);
           if (item !== null && item !== void 0 && (_item$dataObject2 = item.dataObject) !== null && _item$dataObject2 !== void 0 && _item$dataObject2[itemchildren]) {
             item.dataObject.children = _sortedChildren;
           } else if (item !== null && item !== void 0 && item[itemchildren]) {
@@ -427,7 +438,7 @@ var datasetItems = exports.datasetItems = function datasetItems(dataset, datafie
     _iterator4.f();
   }
   if (groupby) {
-    items = groupData(null, items, groupby, "word", "", "");
+    items = groupData(null, items, groupby, match || "word", "", "");
   }
   return items;
 };