@wavemaker/react-runtime 11.14.3-rc.6401 → 11.15.0-1.246

package/components/basic/search/providers.js

@@ -12,12 +12,14 @@ var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
 var _lodash = require("lodash");
+var _types = require("@wavemaker/react-runtime/components/data/types");
+// import { DataSource } from "../../data/types";
 // Enhanced LocalDataProvider with React Native logic
 var LocalDataProvider = exports.LocalDataProvider = /*#__PURE__*/function () {
   function LocalDataProvider() {
     (0, _classCallCheck2["default"])(this, LocalDataProvider);
   }
-  (0, _createClass2["default"])(LocalDataProvider, [{
+  return (0, _createClass2["default"])(LocalDataProvider, [{
     key: "createEmptyResult",
     value: function createEmptyResult() {
       return {
@@ -40,7 +42,12 @@ var LocalDataProvider = exports.LocalDataProvider = /*#__PURE__*/function () {
       var queryText = typeof config.query === "string" ? config.query : "";
       var searchKey = config.searchKey,
         _config$casesensitive = config.casesensitive,
-        casesensitive = _config$casesensitive === void 0 ? false : _config$casesensitive;
+        casesensitive = _config$casesensitive === void 0 ? false : _config$casesensitive,
+        matchMode = config.matchMode,
+        groupby = config.groupby,
+        limit = config.limit,
+        orderby = config.orderby;
+      var isCaseSensitive = matchMode && !(0, _lodash.includes)(matchMode, "ignorecase") ? true : casesensitive;
       var filteredData = [];
       return new Promise(function (resolve) {
         // If searchkey is defined, then check for match string against each item in the dataset
@@ -70,11 +77,11 @@ var LocalDataProvider = exports.LocalDataProvider = /*#__PURE__*/function () {
             return keys.some(function (key) {
               var a = (0, _lodash.get)(item.dataObject || item, key);
               var b = queryText;
-              if (!casesensitive) {
+              if (!isCaseSensitive) {
                 a = (0, _lodash.toLower)(String(a));
                 b = (0, _lodash.toLower)(String(b));
               }
-              return _this.applyFilter(a, b);
+              return matchMode ? _this.applyMatchMode(String(a), String(b), matchMode) : _this.applyFilter(a, b);
             });
           });
         } else {
@@ -87,45 +94,71 @@ var LocalDataProvider = exports.LocalDataProvider = /*#__PURE__*/function () {
               filteredData = (0, _lodash.filter)(entries, function (entry) {
                 var dataObj = entry.dataObject || entry;
                 var a = (0, _lodash.isString)(dataObj) ? dataObj : (0, _lodash.values)(dataObj).join(" ");
-                if (!casesensitive) {
+                if (!isCaseSensitive) {
                   a = (0, _lodash.toLower)(String(a));
                   queryText = (0, _lodash.toLower)(String(queryText));
                 }
-                return _this.applyFilter(a, queryText);
+                return matchMode ? _this.applyMatchMode(String(a), String(queryText), matchMode, groupby) : _this.applyFilter(a, queryText);
               });
             } else if ((0, _lodash.isObject)(entries[0])) {
               // Handle regular object array
               filteredData = (0, _lodash.filter)(entries, function (entry) {
                 var dataObj = entry.dataObject || entry;
                 var a = (0, _lodash.isString)(dataObj) ? dataObj : (0, _lodash.values)(dataObj).join(" ");
-                if (!casesensitive) {
+                if (!isCaseSensitive) {
                   a = (0, _lodash.toLower)(String(a));
                   queryText = (0, _lodash.toLower)(String(queryText));
                 }
-                return _this.applyFilter(a, queryText);
+                return matchMode ? _this.applyMatchMode(String(a), String(queryText), matchMode) : _this.applyFilter(a, queryText);
               });
             } else {
               // Handle primitive values
               filteredData = (0, _lodash.filter)(entries, function (entry) {
                 var entryValue = entry;
-                if (!casesensitive) {
+                if (!isCaseSensitive) {
                   entryValue = (0, _lodash.toLower)(String(entryValue));
                   queryText = (0, _lodash.toLower)(String(queryText));
                 }
-                return _this.applyFilter(entryValue, queryText);
+                return matchMode ? _this.applyMatchMode(String(entryValue), String(queryText), matchMode) : _this.applyFilter(entryValue, queryText);
               });
             }
           } else {
             filteredData = (0, _lodash.filter)(entries, function (entry) {
               var entryValue = entry;
-              if (!casesensitive) {
+              if (!isCaseSensitive) {
                 entryValue = (0, _lodash.toLower)(String(entryValue));
                 queryText = (0, _lodash.toLower)(String(queryText));
               }
-              return _this.applyFilter(entryValue, queryText);
+              return matchMode ? _this.applyMatchMode(String(entryValue), String(queryText), matchMode) : _this.applyFilter(entryValue, queryText);
             });
           }
         }
+
+        // Apply orderby if provided
+        if (orderby && filteredData.length > 0) {
+          var _orderParts$, _orderParts$2;
+          var orderParts = (0, _lodash.split)(orderby, ":");
+          var orderField = (_orderParts$ = orderParts[0]) === null || _orderParts$ === void 0 ? void 0 : _orderParts$.trim();
+          var orderDirection = ((_orderParts$2 = orderParts[1]) === null || _orderParts$2 === void 0 ? void 0 : _orderParts$2.trim().toLowerCase()) || "asc";
+          if (orderField) {
+            filteredData = (0, _lodash.orderBy)(filteredData, function (item) {
+              // Handle normalized format with dataObject
+              var dataObj = item.dataObject || item;
+              var value = (0, _lodash.get)(dataObj, orderField);
+              // Handle numeric values for proper sorting
+              if ((0, _lodash.isNumber)(value)) {
+                return value;
+              }
+              // Convert to string for consistent sorting
+              return String(value || "").toLowerCase();
+            }, [orderDirection]);
+          }
+        }
+
+        // Apply limit if provided
+        if (limit && (0, _lodash.isNumber)(limit) && limit > 0) {
+          filteredData = filteredData.slice(0, limit);
+        }
         resolve({
           data: filteredData,
           hasMoreData: false,
@@ -192,9 +225,9 @@ var LocalDataProvider = exports.LocalDataProvider = /*#__PURE__*/function () {
     }
   }, {
     key: "applyMatchMode",
-    value: function applyMatchMode(entry, queryText, matchMode) {
+    value: function applyMatchMode(entry, queryText, matchMode, groupby) {
       if (!queryText) return true;
-      if (matchMode !== null && matchMode !== void 0 && matchMode.includes("start")) {
+      if (matchMode !== null && matchMode !== void 0 && matchMode.includes("start") && !(groupby && (0, _lodash.includes)(matchMode, "ignorecase"))) {
         return entry.startsWith(queryText);
       }
       if (matchMode !== null && matchMode !== void 0 && matchMode.includes("end")) {
@@ -203,23 +236,27 @@ var LocalDataProvider = exports.LocalDataProvider = /*#__PURE__*/function () {
       if (matchMode !== null && matchMode !== void 0 && matchMode.includes("exact")) {
         return entry === queryText;
       }
+      if (matchMode === "contains") {
+        return entry.toLowerCase().includes(queryText.toLowerCase());
+      }
       return entry.includes(queryText);
     }
   }]);
-  return LocalDataProvider;
 }(); // Enhanced DataProvider with React Native logic
 var DataProvider = exports.DataProvider = /*#__PURE__*/function () {
   function DataProvider() {
     (0, _classCallCheck2["default"])(this, DataProvider);
     (0, _defineProperty2["default"])(this, "localDataProvider", new LocalDataProvider());
   }
-  (0, _createClass2["default"])(DataProvider, [{
+  return (0, _createClass2["default"])(DataProvider, [{
     key: "init",
     value:
     // Check if the variable is of type service variable and whether update is required
     function init(component) {
-      if (component !== null && component !== void 0 && component.isUpdateRequired) {
-        return component === null || component === void 0 ? void 0 : component.isUpdateRequired();
+      var datasource = component === null || component === void 0 ? void 0 : component.datasource;
+      if (datasource) {
+        var _datasource$serviceIn, _datasource$serviceIn2;
+        return datasource.execute(_types.DataSource.Operation.IS_PAGEABLE) || ((_datasource$serviceIn = datasource === null || datasource === void 0 || (_datasource$serviceIn2 = datasource.serviceInfo) === null || _datasource$serviceIn2 === void 0 || (_datasource$serviceIn2 = _datasource$serviceIn2.parameters) === null || _datasource$serviceIn2 === void 0 ? void 0 : _datasource$serviceIn2.length) !== null && _datasource$serviceIn !== void 0 ? _datasource$serviceIn : 0) > 0;
       }
       return false;
     }
@@ -228,10 +265,10 @@ var DataProvider = exports.DataProvider = /*#__PURE__*/function () {
   }, {
     key: "invokeVariable",
     value: function () {
-      var _invokeVariable = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee(component, query) {
-        var paramsObj;
-        return _regenerator["default"].wrap(function _callee$(_context) {
-          while (1) switch (_context.prev = _context.next) {
+      var _invokeVariable = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee2(component, query) {
+        var paramsObj, datasource, dataSource;
+        return _regenerator["default"].wrap(function _callee2$(_context2) {
+          while (1) switch (_context2.prev = _context2.next) {
             case 0:
               paramsObj = null;
               if (component !== null && component !== void 0 && component.searchkey) {
@@ -242,26 +279,55 @@ var DataProvider = exports.DataProvider = /*#__PURE__*/function () {
                   paramsObj[k] = query;
                 });
               }
-
-              // Use the onQuerySearch callback if available
-              if (!(component !== null && component !== void 0 && component.onQuerySearch)) {
-                _context.next = 4;
+              datasource = component === null || component === void 0 ? void 0 : component.datasource;
+              if (!datasource) {
+                _context2.next = 8;
                 break;
               }
-              return _context.abrupt("return", new Promise(function (resolve, reject) {
-                component === null || component === void 0 || component.onQuerySearch(paramsObj, function (response) {
-                  return resolve(response);
-                }, function (error) {
-                  return reject(error);
-                });
-              }));
-            case 4:
-              return _context.abrupt("return", Promise.resolve());
-            case 5:
+              if (datasource.category === "wm.LiveVariable") {
+                // datasource.setFilter(paramsObj);
+              } else {
+                datasource.setInput(paramsObj);
+              }
+              dataSource = datasource;
+              if (component !== null && component !== void 0 && component.onBeforeservicecall) {
+                component.onBeforeservicecall(component, paramsObj);
+              }
+              return _context2.abrupt("return", new Promise(/*#__PURE__*/function () {
+                var _ref = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee(resolve, reject) {
+                  var result;
+                  return _regenerator["default"].wrap(function _callee$(_context) {
+                    while (1) switch (_context.prev = _context.next) {
+                      case 0:
+                        _context.prev = 0;
+                        _context.next = 3;
+                        return dataSource.execute(_types.DataSource.Operation.SEARCH_RECORDS, component);
+                      case 3:
+                        result = _context.sent;
+                        resolve((result === null || result === void 0 ? void 0 : result.data) || []);
+                        _context.next = 10;
+                        break;
+                      case 7:
+                        _context.prev = 7;
+                        _context.t0 = _context["catch"](0);
+                        resolve([]);
+                      case 10:
+                      case "end":
+                        return _context.stop();
+                    }
+                  }, _callee, null, [[0, 7]]);
+                }));
+                return function (_x3, _x4) {
+                  return _ref.apply(this, arguments);
+                };
+              }()));
+            case 8:
+              return _context2.abrupt("return", Promise.resolve());
+            case 9:
             case "end":
-              return _context.stop();
+              return _context2.stop();
           }
-        }, _callee);
+        }, _callee2);
       }));
       function invokeVariable(_x, _x2) {
         return _invokeVariable.apply(this, arguments);
@@ -271,42 +337,42 @@ var DataProvider = exports.DataProvider = /*#__PURE__*/function () {
   }, {
     key: "filter",
     value: function () {
-      var _filter2 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee2(config) {
+      var _filter2 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee3(config) {
         var searchKey, keys, updateRequired, response, dataSet;
-        return _regenerator["default"].wrap(function _callee2$(_context2) {
-          while (1) switch (_context2.prev = _context2.next) {
+        return _regenerator["default"].wrap(function _callee3$(_context3) {
+          while (1) switch (_context3.prev = _context3.next) {
             case 0:
               searchKey = config.searchKey; // If searchkey is provided, check if we need to make an API call
               if (!searchKey) {
-                _context2.next = 22;
+                _context3.next = 22;
                 break;
               }
               keys = (0, _lodash.split)(searchKey, ",");
               if (!(keys.length && config.component)) {
-                _context2.next = 22;
+                _context3.next = 22;
                 break;
               }
               // Check if update is required for service variables
               updateRequired = this.init(config.component);
               if (!updateRequired) {
-                _context2.next = 22;
+                _context3.next = 22;
                 break;
               }
-              _context2.prev = 6;
-              _context2.next = 9;
+              _context3.prev = 6;
+              _context3.next = 9;
               return this.invokeVariable(config.component, config.query || "");
             case 9:
-              response = _context2.sent;
+              response = _context3.sent;
               if (!response) {
-                _context2.next = 16;
+                _context3.next = 16;
                 break;
               }
               dataSet = response.dataSet || response;
               if (!(0, _lodash.isEmpty)(dataSet)) {
-                _context2.next = 14;
+                _context3.next = 14;
                 break;
               }
-              return _context2.abrupt("return", {
+              return _context3.abrupt("return", {
                 data: [],
                 hasMoreData: false,
                 isLastPage: true
@@ -315,36 +381,35 @@ var DataProvider = exports.DataProvider = /*#__PURE__*/function () {
               if ((0, _lodash.isObject)(dataSet) && !(0, _lodash.isArray)(dataSet)) {
                 dataSet = [dataSet];
               }
-              return _context2.abrupt("return", {
+              return _context3.abrupt("return", {
                 data: dataSet,
                 hasMoreData: false,
                 isLastPage: true
               });
             case 16:
-              _context2.next = 22;
+              _context3.next = 22;
               break;
             case 18:
-              _context2.prev = 18;
-              _context2.t0 = _context2["catch"](6);
-              console.error("API call failed:", _context2.t0);
-              return _context2.abrupt("return", {
+              _context3.prev = 18;
+              _context3.t0 = _context3["catch"](6);
+              console.error("API call failed:", _context3.t0);
+              return _context3.abrupt("return", {
                 data: [],
                 hasMoreData: false,
                 isLastPage: true
               });
             case 22:
-              return _context2.abrupt("return", this.localDataProvider.filter(config));
+              return _context3.abrupt("return", this.localDataProvider.filter(config));
             case 23:
             case "end":
-              return _context2.stop();
+              return _context3.stop();
           }
-        }, _callee2, this, [[6, 18]]);
+        }, _callee3, this, [[6, 18]]);
       }));
-      function filter(_x3) {
+      function filter(_x5) {
         return _filter2.apply(this, arguments);
       }
       return filter;
     }()
   }]);
-  return DataProvider;
 }();

package/components/basic/spinner/index.js

@@ -178,7 +178,8 @@ var WmSpinner = exports.WmSpinner = /*#__PURE__*/(0, _react.memo)(function (prop
     "aria-label": arialabel,
     role: "alert",
     "aria-live": "polite",
-    "aria-busy": "true"
+    "aria-busy": "true",
+    hidden: props.hidden
   }, __jsx(_Box["default"], {
     className: "spinner-message"
   }, renderSpinnerContent(), shouldShowStaticCaption && __jsx(_Typography["default"], {

package/components/basic/tree/index.js

@@ -114,8 +114,9 @@ var WmTree = function WmTree(props) {
       }
     };
     if ((0, _isArray["default"])(newVal)) {
-      return newVal.map(function (item, index) {
-        return (0, _utils.processNode)(item, 0, undefined, newVal, index, name, processNodeOptions);
+      var ordered = orderby ? (0, _transformedDatasetUtils.getOrderedDataset)(newVal, orderby) : newVal;
+      return ordered.map(function (item, index) {
+        return (0, _utils.processNode)(item, 0, undefined, ordered, index, name, processNodeOptions);
       });
     } else if ((0, _isObject["default"])(newVal) && newVal !== null) {
       return [(0, _utils.processNode)(newVal, 0, undefined, [newVal], 0, name, processNodeOptions)];
@@ -123,7 +124,7 @@ var WmTree = function WmTree(props) {
       return getNodesFromString(newVal.trim());
     }
     return [];
-  }, [getNodesFromString, levels, nodelabel, nodeicon, nodechildren, nodeid, name]);
+  }, [getNodesFromString, levels, nodelabel, nodeicon, nodechildren, nodeid, name, orderby]);
 
   // Get path to node (for event callbacks)
   var getPath = (0, _react.useCallback)(function (node) {
@@ -147,20 +148,20 @@ var WmTree = function WmTree(props) {
     });
 
     // Update the node in the tree
-    var updateNodeInTree = function updateNodeInTree(nodes, targetNode) {
+    var _updateNodeInTree = function updateNodeInTree(nodes, targetNode) {
       return nodes.map(function (n) {
         var _n$children;
         if (n.nodeId === targetNode.nodeId) {
           return updatedNode;
         } else if ((_n$children = n.children) !== null && _n$children !== void 0 && _n$children.length) {
           return _objectSpread(_objectSpread({}, n), {}, {
-            children: updateNodeInTree(n.children, targetNode)
+            children: _updateNodeInTree(n.children, targetNode)
           });
         }
         return n;
       });
     };
-    var updatedNodes = updateNodeInTree(treeNodes, node);
+    var updatedNodes = _updateNodeInTree(treeNodes, node);
     setTreeNodes(updatedNodes);
     var path = getPath(node);
     if (updatedNode.open) {
@@ -200,7 +201,7 @@ var WmTree = function WmTree(props) {
     var newCheckedState = !node.checked;
 
     // Update the tree with cascading effect
-    var updateCheckedState = function updateCheckedState(nodes, nodeId, checked) {
+    var _updateCheckedState = function updateCheckedState(nodes, nodeId, checked) {
       return nodes.map(function (node) {
         var _node$children3;
         if (node.nodeId === nodeId) {
@@ -212,7 +213,7 @@ var WmTree = function WmTree(props) {
 
           // Update all children recursively if any
           if ((_node$children2 = node.children) !== null && _node$children2 !== void 0 && _node$children2.length) {
-            updatedNode.children = updateAllChildrenChecked(node.children, checked);
+            updatedNode.children = _updateAllChildrenChecked(node.children, checked);
           }
 
           // Also update the data object to maintain consistency
@@ -224,7 +225,7 @@ var WmTree = function WmTree(props) {
           return updatedNode;
         } else if ((_node$children3 = node.children) !== null && _node$children3 !== void 0 && _node$children3.length) {
           // Check if the target node is in the children
-          var updatedChildren = updateCheckedState(node.children, nodeId, checked);
+          var updatedChildren = _updateCheckedState(node.children, nodeId, checked);
 
           // Check if all children are checked or unchecked to update parent accordingly
           var allChildrenChecked = updatedChildren.every(function (child) {
@@ -252,12 +253,12 @@ var WmTree = function WmTree(props) {
     };
 
     // Helper function to set all children to the same checked state
-    var updateAllChildrenChecked = function updateAllChildrenChecked(nodes, checked) {
+    var _updateAllChildrenChecked = function updateAllChildrenChecked(nodes, checked) {
       return nodes.map(function (node) {
         var _node$children4;
         var updatedNode = _objectSpread(_objectSpread({}, node), {}, {
           checked: checked,
-          children: (_node$children4 = node.children) !== null && _node$children4 !== void 0 && _node$children4.length ? updateAllChildrenChecked(node.children, checked) : node.children
+          children: (_node$children4 = node.children) !== null && _node$children4 !== void 0 && _node$children4.length ? _updateAllChildrenChecked(node.children, checked) : node.children
         });
 
         // Update the data object to maintain consistency
@@ -269,7 +270,7 @@ var WmTree = function WmTree(props) {
         return updatedNode;
       });
     };
-    var updatedNodes = updateCheckedState(treeNodes, node.nodeId, newCheckedState);
+    var updatedNodes = _updateCheckedState(treeNodes, node.nodeId, newCheckedState);
     setTreeNodes(updatedNodes);
     if (onCheck) {
       onCheck(event, undefined, node.data, newCheckedState);
@@ -289,7 +290,7 @@ var WmTree = function WmTree(props) {
     setRadioSelectedNodeId(node.nodeId);
 
     // Update all nodes in the tree to set the correct radio state
-    var updateRadioState = function updateRadioState(nodes, selectedNodeId) {
+    var _updateRadioState = function updateRadioState(nodes, selectedNodeId) {
       return nodes.map(function (node) {
         var _node$children5;
         var isChecked = node.nodeId === selectedNodeId;
@@ -308,12 +309,12 @@ var WmTree = function WmTree(props) {
 
         // Update children recursively if any
         if ((_node$children5 = node.children) !== null && _node$children5 !== void 0 && _node$children5.length) {
-          updatedNode.children = updateRadioState(node.children, selectedNodeId);
+          updatedNode.children = _updateRadioState(node.children, selectedNodeId);
         }
         return updatedNode;
       });
     };
-    var updatedNodes = updateRadioState(treeNodes, node.nodeId);
+    var updatedNodes = _updateRadioState(treeNodes, node.nodeId);
     setTreeNodes(updatedNodes);
     if (onCheck) {
       onCheck(event, undefined, node.data, true);
@@ -331,7 +332,7 @@ var WmTree = function WmTree(props) {
       selectNode(undefined, node);
       if (isRadioTree) {
         setRadioSelectedNodeId(node.nodeId);
-        var updateRadioState = function updateRadioState(nodes, selectedNodeId) {
+        var _updateRadioState2 = function updateRadioState(nodes, selectedNodeId) {
           return nodes.map(function (node) {
             var _node$children6;
             var isChecked = node.nodeId === selectedNodeId;
@@ -344,12 +345,12 @@ var WmTree = function WmTree(props) {
               });
             }
             if ((_node$children6 = node.children) !== null && _node$children6 !== void 0 && _node$children6.length) {
-              updatedNode.children = updateRadioState(node.children, selectedNodeId);
+              updatedNode.children = _updateRadioState2(node.children, selectedNodeId);
             }
             return updatedNode;
           });
         };
-        var updatedNodes = updateRadioState(treeNodes, node.nodeId);
+        var updatedNodes = _updateRadioState2(treeNodes, node.nodeId);
         setTreeNodes(updatedNodes);
       }
       var currentNode = node.parent;
@@ -359,7 +360,7 @@ var WmTree = function WmTree(props) {
         currentNode = currentNode.parent;
       }
       if (nodesToExpand.length) {
-        var updateNodeOpenState = function updateNodeOpenState(nodes, nodesToExpand) {
+        var _updateNodeOpenState = function updateNodeOpenState(nodes, nodesToExpand) {
           return nodes.map(function (node) {
             var _node$children7;
             if (nodesToExpand.some(function (n) {
@@ -367,17 +368,17 @@ var WmTree = function WmTree(props) {
             })) {
               return _objectSpread(_objectSpread({}, node), {}, {
                 open: true,
-                children: node.children ? updateNodeOpenState(node.children, nodesToExpand) : undefined
+                children: node.children ? _updateNodeOpenState(node.children, nodesToExpand) : undefined
               });
             } else if ((_node$children7 = node.children) !== null && _node$children7 !== void 0 && _node$children7.length) {
               return _objectSpread(_objectSpread({}, node), {}, {
-                children: updateNodeOpenState(node.children, nodesToExpand)
+                children: _updateNodeOpenState(node.children, nodesToExpand)
               });
             }
             return node;
           });
         };
-        var _updatedNodes = updateNodeOpenState(treeNodes, nodesToExpand);
+        var _updatedNodes = _updateNodeOpenState(treeNodes, nodesToExpand);
         setTreeNodes(_updatedNodes);
       }
     }
@@ -386,12 +387,12 @@ var WmTree = function WmTree(props) {
     setSelectedItem(null);
     if (isRadioTree) {
       setRadioSelectedNodeId(null);
-      var clearCheckedState = function clearCheckedState(nodes) {
+      var _clearCheckedState = function clearCheckedState(nodes) {
         return nodes.map(function (node) {
           var _node$children8;
           var updatedNode = _objectSpread(_objectSpread({}, node), {}, {
             checked: false,
-            children: (_node$children8 = node.children) !== null && _node$children8 !== void 0 && _node$children8.length ? clearCheckedState(node.children) : node.children
+            children: (_node$children8 = node.children) !== null && _node$children8 !== void 0 && _node$children8.length ? _clearCheckedState(node.children) : node.children
           });
           if (updatedNode.data) {
             updatedNode.data = _objectSpread(_objectSpread({}, updatedNode.data), {}, {
@@ -401,14 +402,12 @@ var WmTree = function WmTree(props) {
           return updatedNode;
         });
       };
-      setTreeNodes(clearCheckedState(treeNodes));
+      setTreeNodes(_clearCheckedState(treeNodes));
     }
   }, [isRadioTree]);
-
-  // Memoized sorted nodes to avoid re-sorting on every render
   var sortedTreeNodes = (0, _react.useMemo)(function () {
-    return orderby ? (0, _transformedDatasetUtils.getOrderedDataset)(treeNodes, orderby) : treeNodes;
-  }, [orderby, treeNodes]);
+    return treeNodes;
+  }, [treeNodes]);
 
   // Process dataset when it changes
   (0, _react.useEffect)(function () {
@@ -436,23 +435,23 @@ var WmTree = function WmTree(props) {
       var _targetNode$children;
       selectNode(undefined, targetNode);
       if ((_targetNode$children = targetNode.children) !== null && _targetNode$children !== void 0 && _targetNode$children.length) {
-        var updateNodeOpenState = function updateNodeOpenState(nodes, targetNodeId) {
+        var _updateNodeOpenState2 = function updateNodeOpenState(nodes, targetNodeId) {
           return nodes.map(function (node) {
             var _node$children9;
             if (node.nodeId === targetNodeId) {
               return _objectSpread(_objectSpread({}, node), {}, {
                 open: true,
-                children: node.children ? updateNodeOpenState(node.children, targetNodeId) : undefined
+                children: node.children ? _updateNodeOpenState2(node.children, targetNodeId) : undefined
               });
             } else if ((_node$children9 = node.children) !== null && _node$children9 !== void 0 && _node$children9.length) {
               return _objectSpread(_objectSpread({}, node), {}, {
-                children: updateNodeOpenState(node.children, targetNodeId)
+                children: _updateNodeOpenState2(node.children, targetNodeId)
               });
             }
             return node;
           });
         };
-        var updatedNodes = updateNodeOpenState(treeNodes, targetNode.nodeId);
+        var updatedNodes = _updateNodeOpenState2(treeNodes, targetNode.nodeId);
         setTreeNodes(updatedNodes);
       }
     }
@@ -477,7 +476,8 @@ var WmTree = function WmTree(props) {
       width: width,
       height: height,
       textAlign: horizontalalign
-    })
+    }),
+    hidden: props.hidden
   }, sortedTreeNodes.length > 0 ? sortedTreeNodes.map(function (node) {
     return __jsx(_TreeNodeComponent["default"], {
       key: node.nodeId,

package/components/basic/tree/utils.js

@@ -35,7 +35,7 @@ var generateUniqueNodeId = exports.generateUniqueNodeId = function generateUniqu
 };
 
 // Process a single node and its children with depth tracking
-var processNode = exports.processNode = function processNode(item, depth, parent, rootDataset, nodeIndex, treeName, options) {
+var _processNode = exports.processNode = function processNode(item, depth, parent, rootDataset, nodeIndex, treeName, options) {
   var levels = options.levels,
     nodelabel = options.nodelabel,
     nodeicon = options.nodeicon,
@@ -54,6 +54,9 @@ var processNode = exports.processNode = function processNode(item, depth, parent
       }
       // If not found on current item, fall back to default values (don't do global search)
     }
+    if (nodelabel) {
+      return nodelabel;
+    }
     return (_ref = (_ref2 = (_item$nodelabel = item[nodelabel]) !== null && _item$nodelabel !== void 0 ? _item$nodelabel : item.label) !== null && _ref2 !== void 0 ? _ref2 : item.name) !== null && _ref !== void 0 ? _ref : String(item);
   };
   var getIconValue = function getIconValue() {
@@ -66,6 +69,9 @@ var processNode = exports.processNode = function processNode(item, depth, parent
       }
       // If not found on current item, fall back to default values (don't do global search)
     }
+    if (nodeicon) {
+      return nodeicon;
+    }
     return (_item$nodeicon = item[nodeicon]) !== null && _item$nodeicon !== void 0 ? _item$nodeicon : item.icon;
   };
   var getNodeIdValue = function getNodeIdValue() {
@@ -127,12 +133,12 @@ var processNode = exports.processNode = function processNode(item, depth, parent
   };
   if ((0, _isArray["default"])(childrenData) && childrenData.length > 0) {
     node.children = childrenData.map(function (child, index) {
-      return processNode(child, depth + 1, node, rootDataset, index, treeName, options);
+      return _processNode(child, depth + 1, node, rootDataset, index, treeName, options);
     });
   }
   return node;
 };
-var findNodeById = exports.findNodeById = function findNodeById(nodes, id) {
+var _findNodeById = exports.findNodeById = function findNodeById(nodes, id) {
   var _iterator = _createForOfIteratorHelper(nodes),
     _step;
   try {
@@ -141,7 +147,7 @@ var findNodeById = exports.findNodeById = function findNodeById(nodes, id) {
       var node = _step.value;
       if (String(node.nodeId) === String(id)) return node;
       if ((_node$children = node.children) !== null && _node$children !== void 0 && _node$children.length) {
-        var found = findNodeById(node.children, id);
+        var found = _findNodeById(node.children, id);
         if (found) return found;
       }
     }