reneco-hierarchized-picker 0.4.2-beta.14 → 0.4.2-beta.15

package/dist/cjs/reneco-hierarchized-picker_2.cjs.entry.js

@@ -339,9 +339,11 @@ Tree.prototype.bindEvent = function (ele) {
       // If source is webservice (it shouldn't be something else)
       if (this.options.parentApi.theOptions.source == 'webservice') {
         if (this.options.parentApi.theOptions.origin == 'classification') {
+          const contextualApiParams = this.options.parentApi.getContextualApiParams(Object.assign(Object.assign({}, this.options.parentApi.theOptions.options), { startNode: target.parentNode.nodeId }));
+          const contextualApiURL = this.options.parentApi.getContextualApiURL();
           // WS Call
           this.options.rawDataManager
-            .getFromClassification(this.options.parentApi.getContextualApiURL(), this.options.parentApi.getContextualApiParams(Object.assign(Object.assign({}, this.options.parentApi.theOptions.options), { startNode: target.parentNode.nodeId })), document.querySelector("#hierarchized-picker-" + this.options.parentApi.componentID + ".loader"))
+            .getFromClassification(contextualApiURL, contextualApiParams, document.querySelector("#hierarchized-picker-" + this.options.parentApi.componentID + ".loader"))
             .then(data => {
             this.options.completeCurrentTreeWithTree(this, data, this.options.parentApi.theOptions);
           });
@@ -18192,7 +18194,7 @@ class RawDataManager {
         continue;
       const value = options[key];
       const lowerKey = key.toLowerCase();
-      if ((lowerKey === 'startnode' || lowerKey === 'startnodeid') && !pathSegment) {
+      if ((lowerKey === 'startnode') && !pathSegment) {
         pathSegment = encodeURIComponent(value);
         continue; // Skip adding this to the query string
       }
@@ -18279,8 +18281,16 @@ class RawDataManager {
    * Merge new data into the existing data.
    * @param newData New data to merge.
    */
-  mergeData(newData) {
-    this.rawData = this.genericMerge(this.rawData || {}, newData, 'key', 'children');
+  mergeData(newData, idKey) {
+    if (!this.rawData)
+      this.rawData = newData;
+    else {
+      this.rawData = this.genericMerge(this.rawData, newData, idKey, 'children');
+    }
+  }
+  reorderItems(referenceArray, toReorderArray, idKey) {
+    const idMap = new Map(toReorderArray.map(item => [item[idKey], item]));
+    return referenceArray.map(refItem => idMap.get(refItem[idKey])).filter(Boolean);
   }
   /**
    * Generic merge method.
@@ -18296,9 +18306,11 @@ class RawDataManager {
     }
     if (!toAdd || !((_a = toAdd[childrenKey]) === null || _a === void 0 ? void 0 : _a.length))
       return source;
+    if (source[childrenKey] && source[childrenKey].length > 0 && toAdd[childrenKey] && toAdd[childrenKey].length > 0)
+      toAdd[childrenKey] = this.reorderItems(source[childrenKey], toAdd[childrenKey], idKey);
     source[childrenKey] = ((_b = source[childrenKey]) === null || _b === void 0 ? void 0 : _b.length)
       ? source[childrenKey].map((child, index) => {
-        return this.genericMerge(child, toAdd[childrenKey].filter(item => item.key == child.key)[0], idKey, childrenKey);
+        return this.genericMerge(child, toAdd[childrenKey].filter(item => item.key == child.key)[index], idKey, childrenKey);
       })
       : toAdd[childrenKey];
     return source;
@@ -18368,6 +18380,12 @@ class OptionsManager {
       delete this.options.defaultValue;
     }
   }
+  // This method is pretty ugly and shouldn't have to be called, but temporarily works until a better solution is set
+  dropReach() {
+    if (this.options.options && this.options.options.Reach) {
+      delete this.options.options.Reach;
+    }
+  }
 }
 
 /**
@@ -18422,7 +18440,7 @@ function fillTreeWithObject(tree, myObject, searched, options, depth = 0) {
   const searchResultPresentsUnMatched = options.searchResultPresentsUnMatched;
   if (myObject && myObject.length) {
     myObject.forEach(value => {
-      var _a, _b, _c, _d, _e;
+      var _a, _b, _c;
       let keyPropFromNode = null;
       let valueTranslatedPropFromNode = null;
       let fullpathPropFromNode = null;
@@ -18430,15 +18448,8 @@ function fillTreeWithObject(tree, myObject, searched, options, depth = 0) {
       if (options.origin == "classification") {
         keyPropFromNode = getPropertyFromNode(value, 'ID');
         valueTranslatedPropFromNode = (_a = getPropertyFromNode(value, 'Translations')[options.language]) === null || _a === void 0 ? void 0 : _a.translated_name;
-        // TODO Not sure this is correct in the latest versions, may require review during second half of 2025
-        if (searched) {
-          fullpathPropFromNode = (_b = getPropertyFromNode(value, 'Properties')) === null || _b === void 0 ? void 0 : _b.System_FullPath;
-          fullpathTranslatedPropFromNode = (_c = getPropertyFromNode(value, 'fullpathTranslated')[options.language]) === null || _c === void 0 ? void 0 : _c.translated_fullpath;
-        }
-        else {
-          fullpathPropFromNode = (_d = getPropertyFromNode(value, 'Properties')) === null || _d === void 0 ? void 0 : _d.System_Fullpath;
-          fullpathTranslatedPropFromNode = (_e = getPropertyFromNode(value, 'Translations')[options.language]) === null || _e === void 0 ? void 0 : _e.translated_fullpath;
-        }
+        fullpathPropFromNode = (_b = getPropertyFromNode(value, 'Properties')) === null || _b === void 0 ? void 0 : _b.System_Fullpath;
+        fullpathTranslatedPropFromNode = (_c = getPropertyFromNode(value, 'Translations')[options.language]) === null || _c === void 0 ? void 0 : _c.translated_fullpath;
       }
       else {
         keyPropFromNode = getPropertyFromNode(value, 'key');
@@ -19127,15 +19138,15 @@ const HierarchizedPickerComponent = class {
       const pathSegments = parsedUrl.pathname.split('/');
       const dynamicType = pathSegments[pathSegments.length - 2];
       const newPathname = `/api/v1/classification/reach/${dynamicType}/${options.Reach}`;
+      this.optionsManager.dropReach();
       return `${parsedUrl.origin}${newPathname}`;
     }
     return url;
   }
-  getContextualApiParams(options = null) {
-    if (!options)
-      options = this.optionsManager.getOptions().options;
+  getContextualApiParams(search = null) {
+    const options = this.optionsManager.getOptions().options;
+    let optionsToReturn = Object.assign({}, options);
     if (options.Reach) {
-      let optionsToReturn = Object.assign({}, options);
       delete optionsToReturn.Reach;
       if ("startNode" in optionsToReturn) {
         optionsToReturn.startingnode = optionsToReturn.startNode;
@@ -19145,10 +19156,17 @@ const HierarchizedPickerComponent = class {
         optionsToReturn.startingnode = optionsToReturn.StartNodeID;
         delete optionsToReturn.StartNodeID;
       }
-      return optionsToReturn;
+    }
+    else if (search) {
+      optionsToReturn.searchedValue = search;
+      if ("startNode" in optionsToReturn) {
+        optionsToReturn.StartNodeID = optionsToReturn.startNode;
+        delete optionsToReturn.startNode;
+      }
     }
     else
       return options;
+    return optionsToReturn;
   }
   translateDataForTree(dataToLoad, searchID = null, searched = null) {
     if (searched && searched != "") {
@@ -19161,7 +19179,7 @@ const HierarchizedPickerComponent = class {
   loadSearchDataInCurrentTree(searchID, searched) {
     let displayResults = (newtree) => {
       if (this.searchToDisplay > -1) { // TODO > Not working anymore after refact, prevents issues in displaying results when running multiple researchs at the same time && searchID == this.searchToDisplay) {
-        this.rawDataManager.mergeData(newtree);
+        this.rawDataManager.mergeData(newtree, this.theOptions.origin == 'classification' ? "ID" : "key");
         newtree.children.forEach((value, index) => {
           completeCurrentTreeWithTree(this.loadedTreeJs, value, this.optionsManager.getOptions());
         });
@@ -19183,9 +19201,7 @@ const HierarchizedPickerComponent = class {
     if (this.theOptions.source == 'webservice') {
       if (this.theOptions.origin == 'classification') {
         // WS Call
-        this.rawDataManager.getFromClassification(this.getApiSearchURL(), {
-          searchedValue: searched
-        }, document.querySelector("#hierarchized-picker-" + this.componentID + ".loader"))
+        this.rawDataManager.getFromClassification(this.getApiSearchURL(), Object.assign({}, this.getContextualApiParams(searched)), document.querySelector("#hierarchized-picker-" + this.componentID + ".loader"))
           .then((data) => {
           displayResults(data);
           if (!searched) {
@@ -19334,19 +19350,24 @@ const HierarchizedPickerComponent = class {
     // ----- BEGIN -----
     let node = treeToUpdate.nodesById[id];
     let onChange = treeToUpdate.options.onChange;
-    if (!node.disabled) {
-      treeToUpdate.setValue(id);
-      treeToUpdate.updateLiElements();
+    if (!node) {
+      this.logError("The current selected value is not part of the loaded tree!");
     }
-    userClick && onChange && onChange.call(treeToUpdate);
-    // ------ END ------
-    if (this.setValueOnClick) {
-      this.editValue(node, userClick);
-      if (this.shownTree && userClick) {
-        // TODO > is this required ?
-        // await focusMainInput(this);
-        if (!this.optionsManager.getOptions().multiple) {
-          this.showTree('hide');
+    else {
+      if (!node.disabled) {
+        treeToUpdate.setValue(id);
+        treeToUpdate.updateLiElements();
+      }
+      userClick && onChange && onChange.call(treeToUpdate);
+      // ------ END ------
+      if (this.setValueOnClick) {
+        this.editValue(node, userClick);
+        if (this.shownTree && userClick) {
+          // TODO > is this required ?
+          // await focusMainInput(this);
+          if (!this.optionsManager.getOptions().multiple) {
+            this.showTree('hide');
+          }
         }
       }
     }
@@ -19479,6 +19500,7 @@ const HierarchizedPickerComponent = class {
   }
   // Search a value in the tree and triggers a search when necessary
   search(searched) {
+    this.loader.classList.add('loading');
     let searchinput = document.querySelector('#hierarchized-picker-' + this.componentID + ' .hierarchized-picker-search input');
     if (this.optionsManager.getOptions().mode == 'input' && searchinput) {
       searchinput.classList.remove('fieldError');
@@ -19515,6 +19537,7 @@ const HierarchizedPickerComponent = class {
       // this.checkFields(this.value, false);
       this.setSearchResults([]);
     }
+    this.loader.classList.remove('loading');
   }
   // Refresh the tree with search results
   triggerSearch(searched) {
@@ -19533,7 +19556,9 @@ const HierarchizedPickerComponent = class {
   loadDataForTree(init, loader) {
     if (this.optionsManager.getOptions().source == 'webservice') {
       if (this.optionsManager.getOptions().origin == 'classification') {
-        this.rawDataManager.getFromClassification(this.getContextualApiURL(), this.getContextualApiParams(), loader).then((data) => {
+        const contextualApiParams = this.getContextualApiParams();
+        const contextualApiURL = this.getContextualApiURL();
+        this.rawDataManager.getFromClassification(contextualApiURL, contextualApiParams, loader).then((data) => {
           this.rawData = data;
           if (init) {
             this.formatDefaultValue();

package/dist/collection/components/hierarchized-picker/hierarchized-picker.js

@@ -459,15 +459,15 @@ export class HierarchizedPickerComponent {
       const pathSegments = parsedUrl.pathname.split('/');
       const dynamicType = pathSegments[pathSegments.length - 2];
       const newPathname = `/api/v1/classification/reach/${dynamicType}/${options.Reach}`;
+      this.optionsManager.dropReach();
       return `${parsedUrl.origin}${newPathname}`;
     }
     return url;
   }
-  getContextualApiParams(options = null) {
-    if (!options)
-      options = this.optionsManager.getOptions().options;
+  getContextualApiParams(search = null) {
+    const options = this.optionsManager.getOptions().options;
+    let optionsToReturn = Object.assign({}, options);
     if (options.Reach) {
-      let optionsToReturn = Object.assign({}, options);
       delete optionsToReturn.Reach;
       if ("startNode" in optionsToReturn) {
         optionsToReturn.startingnode = optionsToReturn.startNode;
@@ -477,10 +477,17 @@ export class HierarchizedPickerComponent {
         optionsToReturn.startingnode = optionsToReturn.StartNodeID;
         delete optionsToReturn.StartNodeID;
       }
-      return optionsToReturn;
+    }
+    else if (search) {
+      optionsToReturn.searchedValue = search;
+      if ("startNode" in optionsToReturn) {
+        optionsToReturn.StartNodeID = optionsToReturn.startNode;
+        delete optionsToReturn.startNode;
+      }
     }
     else
       return options;
+    return optionsToReturn;
   }
   translateDataForTree(dataToLoad, searchID = null, searched = null) {
     if (searched && searched != "") {
@@ -493,7 +500,7 @@ export class HierarchizedPickerComponent {
   loadSearchDataInCurrentTree(searchID, searched) {
     let displayResults = (newtree) => {
       if (this.searchToDisplay > -1) { // TODO > Not working anymore after refact, prevents issues in displaying results when running multiple researchs at the same time && searchID == this.searchToDisplay) {
-        this.rawDataManager.mergeData(newtree);
+        this.rawDataManager.mergeData(newtree, this.theOptions.origin == 'classification' ? "ID" : "key");
         newtree.children.forEach((value, index) => {
           completeCurrentTreeWithTree(this.loadedTreeJs, value, this.optionsManager.getOptions());
         });
@@ -515,9 +522,7 @@ export class HierarchizedPickerComponent {
     if (this.theOptions.source == 'webservice') {
       if (this.theOptions.origin == 'classification') {
         // WS Call
-        this.rawDataManager.getFromClassification(this.getApiSearchURL(), {
-          searchedValue: searched
-        }, document.querySelector("#hierarchized-picker-" + this.componentID + ".loader"))
+        this.rawDataManager.getFromClassification(this.getApiSearchURL(), Object.assign({}, this.getContextualApiParams(searched)), document.querySelector("#hierarchized-picker-" + this.componentID + ".loader"))
           .then((data) => {
           displayResults(data);
           if (!searched) {
@@ -666,19 +671,24 @@ export class HierarchizedPickerComponent {
     // ----- BEGIN -----
     let node = treeToUpdate.nodesById[id];
     let onChange = treeToUpdate.options.onChange;
-    if (!node.disabled) {
-      treeToUpdate.setValue(id);
-      treeToUpdate.updateLiElements();
-    }
-    userClick && onChange && onChange.call(treeToUpdate);
-    // ------ END ------
-    if (this.setValueOnClick) {
-      this.editValue(node, userClick);
-      if (this.shownTree && userClick) {
-        // TODO > is this required ?
-        // await focusMainInput(this);
-        if (!this.optionsManager.getOptions().multiple) {
-          this.showTree('hide');
+    if (!node) {
+      this.logError("The current selected value is not part of the loaded tree!");
+    }
+    else {
+      if (!node.disabled) {
+        treeToUpdate.setValue(id);
+        treeToUpdate.updateLiElements();
+      }
+      userClick && onChange && onChange.call(treeToUpdate);
+      // ------ END ------
+      if (this.setValueOnClick) {
+        this.editValue(node, userClick);
+        if (this.shownTree && userClick) {
+          // TODO > is this required ?
+          // await focusMainInput(this);
+          if (!this.optionsManager.getOptions().multiple) {
+            this.showTree('hide');
+          }
         }
       }
     }
@@ -811,6 +821,7 @@ export class HierarchizedPickerComponent {
   }
   // Search a value in the tree and triggers a search when necessary
   search(searched) {
+    this.loader.classList.add('loading');
     let searchinput = document.querySelector('#hierarchized-picker-' + this.componentID + ' .hierarchized-picker-search input');
     if (this.optionsManager.getOptions().mode == 'input' && searchinput) {
       searchinput.classList.remove('fieldError');
@@ -847,6 +858,7 @@ export class HierarchizedPickerComponent {
       // this.checkFields(this.value, false);
       this.setSearchResults([]);
     }
+    this.loader.classList.remove('loading');
   }
   // Refresh the tree with search results
   triggerSearch(searched) {
@@ -865,7 +877,9 @@ export class HierarchizedPickerComponent {
   loadDataForTree(init, loader) {
     if (this.optionsManager.getOptions().source == 'webservice') {
       if (this.optionsManager.getOptions().origin == 'classification') {
-        this.rawDataManager.getFromClassification(this.getContextualApiURL(), this.getContextualApiParams(), loader).then((data) => {
+        const contextualApiParams = this.getContextualApiParams();
+        const contextualApiURL = this.getContextualApiURL();
+        this.rawDataManager.getFromClassification(contextualApiURL, contextualApiParams, loader).then((data) => {
           this.rawData = data;
           if (init) {
             this.formatDefaultValue();

package/dist/collection/components/treejs/index.js

@@ -207,9 +207,11 @@ Tree.prototype.bindEvent = function (ele) {
       // If source is webservice (it shouldn't be something else)
       if (this.options.parentApi.theOptions.source == 'webservice') {
         if (this.options.parentApi.theOptions.origin == 'classification') {
+          const contextualApiParams = this.options.parentApi.getContextualApiParams(Object.assign(Object.assign({}, this.options.parentApi.theOptions.options), { startNode: target.parentNode.nodeId }));
+          const contextualApiURL = this.options.parentApi.getContextualApiURL();
           // WS Call
           this.options.rawDataManager
-            .getFromClassification(this.options.parentApi.getContextualApiURL(), this.options.parentApi.getContextualApiParams(Object.assign(Object.assign({}, this.options.parentApi.theOptions.options), { startNode: target.parentNode.nodeId })), document.querySelector("#hierarchized-picker-" + this.options.parentApi.componentID + ".loader"))
+            .getFromClassification(contextualApiURL, contextualApiParams, document.querySelector("#hierarchized-picker-" + this.options.parentApi.componentID + ".loader"))
             .then(data => {
             this.options.completeCurrentTreeWithTree(this, data, this.options.parentApi.theOptions);
           });

package/dist/collection/core/options-manager.js

@@ -45,4 +45,10 @@ export class OptionsManager {
       delete this.options.defaultValue;
     }
   }
+  // This method is pretty ugly and shouldn't have to be called, but temporarily works until a better solution is set
+  dropReach() {
+    if (this.options.options && this.options.options.Reach) {
+      delete this.options.options.Reach;
+    }
+  }
 }

package/dist/collection/core/raw-data-manager.js

@@ -62,7 +62,7 @@ export class RawDataManager {
         continue;
       const value = options[key];
       const lowerKey = key.toLowerCase();
-      if ((lowerKey === 'startnode' || lowerKey === 'startnodeid') && !pathSegment) {
+      if ((lowerKey === 'startnode') && !pathSegment) {
         pathSegment = encodeURIComponent(value);
         continue; // Skip adding this to the query string
       }
@@ -149,8 +149,16 @@ export class RawDataManager {
    * Merge new data into the existing data.
    * @param newData New data to merge.
    */
-  mergeData(newData) {
-    this.rawData = this.genericMerge(this.rawData || {}, newData, 'key', 'children');
+  mergeData(newData, idKey) {
+    if (!this.rawData)
+      this.rawData = newData;
+    else {
+      this.rawData = this.genericMerge(this.rawData, newData, idKey, 'children');
+    }
+  }
+  reorderItems(referenceArray, toReorderArray, idKey) {
+    const idMap = new Map(toReorderArray.map(item => [item[idKey], item]));
+    return referenceArray.map(refItem => idMap.get(refItem[idKey])).filter(Boolean);
   }
   /**
    * Generic merge method.
@@ -166,9 +174,11 @@ export class RawDataManager {
     }
     if (!toAdd || !((_a = toAdd[childrenKey]) === null || _a === void 0 ? void 0 : _a.length))
       return source;
+    if (source[childrenKey] && source[childrenKey].length > 0 && toAdd[childrenKey] && toAdd[childrenKey].length > 0)
+      toAdd[childrenKey] = this.reorderItems(source[childrenKey], toAdd[childrenKey], idKey);
     source[childrenKey] = ((_b = source[childrenKey]) === null || _b === void 0 ? void 0 : _b.length)
       ? source[childrenKey].map((child, index) => {
-        return this.genericMerge(child, toAdd[childrenKey].filter(item => item.key == child.key)[0], idKey, childrenKey);
+        return this.genericMerge(child, toAdd[childrenKey].filter(item => item.key == child.key)[index], idKey, childrenKey);
       })
       : toAdd[childrenKey];
     return source;

package/dist/collection/features/tree/tree-utils.js

@@ -51,7 +51,7 @@ export function fillTreeWithObject(tree, myObject, searched, options, depth = 0)
   const searchResultPresentsUnMatched = options.searchResultPresentsUnMatched;
   if (myObject && myObject.length) {
     myObject.forEach(value => {
-      var _a, _b, _c, _d, _e;
+      var _a, _b, _c;
       let keyPropFromNode = null;
       let valueTranslatedPropFromNode = null;
       let fullpathPropFromNode = null;
@@ -59,15 +59,8 @@ export function fillTreeWithObject(tree, myObject, searched, options, depth = 0)
       if (options.origin == "classification") {
         keyPropFromNode = getPropertyFromNode(value, 'ID');
         valueTranslatedPropFromNode = (_a = getPropertyFromNode(value, 'Translations')[options.language]) === null || _a === void 0 ? void 0 : _a.translated_name;
-        // TODO Not sure this is correct in the latest versions, may require review during second half of 2025
-        if (searched) {
-          fullpathPropFromNode = (_b = getPropertyFromNode(value, 'Properties')) === null || _b === void 0 ? void 0 : _b.System_FullPath;
-          fullpathTranslatedPropFromNode = (_c = getPropertyFromNode(value, 'fullpathTranslated')[options.language]) === null || _c === void 0 ? void 0 : _c.translated_fullpath;
-        }
-        else {
-          fullpathPropFromNode = (_d = getPropertyFromNode(value, 'Properties')) === null || _d === void 0 ? void 0 : _d.System_Fullpath;
-          fullpathTranslatedPropFromNode = (_e = getPropertyFromNode(value, 'Translations')[options.language]) === null || _e === void 0 ? void 0 : _e.translated_fullpath;
-        }
+        fullpathPropFromNode = (_b = getPropertyFromNode(value, 'Properties')) === null || _b === void 0 ? void 0 : _b.System_Fullpath;
+        fullpathTranslatedPropFromNode = (_c = getPropertyFromNode(value, 'Translations')[options.language]) === null || _c === void 0 ? void 0 : _c.translated_fullpath;
       }
       else {
         keyPropFromNode = getPropertyFromNode(value, 'key');

package/dist/custom-elements/index.js

@@ -336,9 +336,11 @@ Tree.prototype.bindEvent = function (ele) {
       // If source is webservice (it shouldn't be something else)
       if (this.options.parentApi.theOptions.source == 'webservice') {
         if (this.options.parentApi.theOptions.origin == 'classification') {
+          const contextualApiParams = this.options.parentApi.getContextualApiParams(Object.assign(Object.assign({}, this.options.parentApi.theOptions.options), { startNode: target.parentNode.nodeId }));
+          const contextualApiURL = this.options.parentApi.getContextualApiURL();
           // WS Call
           this.options.rawDataManager
-            .getFromClassification(this.options.parentApi.getContextualApiURL(), this.options.parentApi.getContextualApiParams(Object.assign(Object.assign({}, this.options.parentApi.theOptions.options), { startNode: target.parentNode.nodeId })), document.querySelector("#hierarchized-picker-" + this.options.parentApi.componentID + ".loader"))
+            .getFromClassification(contextualApiURL, contextualApiParams, document.querySelector("#hierarchized-picker-" + this.options.parentApi.componentID + ".loader"))
             .then(data => {
             this.options.completeCurrentTreeWithTree(this, data, this.options.parentApi.theOptions);
           });
@@ -18189,7 +18191,7 @@ class RawDataManager {
         continue;
       const value = options[key];
       const lowerKey = key.toLowerCase();
-      if ((lowerKey === 'startnode' || lowerKey === 'startnodeid') && !pathSegment) {
+      if ((lowerKey === 'startnode') && !pathSegment) {
         pathSegment = encodeURIComponent(value);
         continue; // Skip adding this to the query string
       }
@@ -18276,8 +18278,16 @@ class RawDataManager {
    * Merge new data into the existing data.
    * @param newData New data to merge.
    */
-  mergeData(newData) {
-    this.rawData = this.genericMerge(this.rawData || {}, newData, 'key', 'children');
+  mergeData(newData, idKey) {
+    if (!this.rawData)
+      this.rawData = newData;
+    else {
+      this.rawData = this.genericMerge(this.rawData, newData, idKey, 'children');
+    }
+  }
+  reorderItems(referenceArray, toReorderArray, idKey) {
+    const idMap = new Map(toReorderArray.map(item => [item[idKey], item]));
+    return referenceArray.map(refItem => idMap.get(refItem[idKey])).filter(Boolean);
   }
   /**
    * Generic merge method.
@@ -18293,9 +18303,11 @@ class RawDataManager {
     }
     if (!toAdd || !((_a = toAdd[childrenKey]) === null || _a === void 0 ? void 0 : _a.length))
       return source;
+    if (source[childrenKey] && source[childrenKey].length > 0 && toAdd[childrenKey] && toAdd[childrenKey].length > 0)
+      toAdd[childrenKey] = this.reorderItems(source[childrenKey], toAdd[childrenKey], idKey);
     source[childrenKey] = ((_b = source[childrenKey]) === null || _b === void 0 ? void 0 : _b.length)
       ? source[childrenKey].map((child, index) => {
-        return this.genericMerge(child, toAdd[childrenKey].filter(item => item.key == child.key)[0], idKey, childrenKey);
+        return this.genericMerge(child, toAdd[childrenKey].filter(item => item.key == child.key)[index], idKey, childrenKey);
       })
       : toAdd[childrenKey];
     return source;
@@ -18365,6 +18377,12 @@ class OptionsManager {
       delete this.options.defaultValue;
     }
   }
+  // This method is pretty ugly and shouldn't have to be called, but temporarily works until a better solution is set
+  dropReach() {
+    if (this.options.options && this.options.options.Reach) {
+      delete this.options.options.Reach;
+    }
+  }
 }
 
 /**
@@ -18419,7 +18437,7 @@ function fillTreeWithObject(tree, myObject, searched, options, depth = 0) {
   const searchResultPresentsUnMatched = options.searchResultPresentsUnMatched;
   if (myObject && myObject.length) {
     myObject.forEach(value => {
-      var _a, _b, _c, _d, _e;
+      var _a, _b, _c;
       let keyPropFromNode = null;
       let valueTranslatedPropFromNode = null;
       let fullpathPropFromNode = null;
@@ -18427,15 +18445,8 @@ function fillTreeWithObject(tree, myObject, searched, options, depth = 0) {
       if (options.origin == "classification") {
         keyPropFromNode = getPropertyFromNode(value, 'ID');
         valueTranslatedPropFromNode = (_a = getPropertyFromNode(value, 'Translations')[options.language]) === null || _a === void 0 ? void 0 : _a.translated_name;
-        // TODO Not sure this is correct in the latest versions, may require review during second half of 2025
-        if (searched) {
-          fullpathPropFromNode = (_b = getPropertyFromNode(value, 'Properties')) === null || _b === void 0 ? void 0 : _b.System_FullPath;
-          fullpathTranslatedPropFromNode = (_c = getPropertyFromNode(value, 'fullpathTranslated')[options.language]) === null || _c === void 0 ? void 0 : _c.translated_fullpath;
-        }
-        else {
-          fullpathPropFromNode = (_d = getPropertyFromNode(value, 'Properties')) === null || _d === void 0 ? void 0 : _d.System_Fullpath;
-          fullpathTranslatedPropFromNode = (_e = getPropertyFromNode(value, 'Translations')[options.language]) === null || _e === void 0 ? void 0 : _e.translated_fullpath;
-        }
+        fullpathPropFromNode = (_b = getPropertyFromNode(value, 'Properties')) === null || _b === void 0 ? void 0 : _b.System_Fullpath;
+        fullpathTranslatedPropFromNode = (_c = getPropertyFromNode(value, 'Translations')[options.language]) === null || _c === void 0 ? void 0 : _c.translated_fullpath;
       }
       else {
         keyPropFromNode = getPropertyFromNode(value, 'key');
@@ -19125,15 +19136,15 @@ const HierarchizedPickerComponent = class extends HTMLElement {
       const pathSegments = parsedUrl.pathname.split('/');
       const dynamicType = pathSegments[pathSegments.length - 2];
       const newPathname = `/api/v1/classification/reach/${dynamicType}/${options.Reach}`;
+      this.optionsManager.dropReach();
       return `${parsedUrl.origin}${newPathname}`;
     }
     return url;
   }
-  getContextualApiParams(options = null) {
-    if (!options)
-      options = this.optionsManager.getOptions().options;
+  getContextualApiParams(search = null) {
+    const options = this.optionsManager.getOptions().options;
+    let optionsToReturn = Object.assign({}, options);
     if (options.Reach) {
-      let optionsToReturn = Object.assign({}, options);
       delete optionsToReturn.Reach;
       if ("startNode" in optionsToReturn) {
         optionsToReturn.startingnode = optionsToReturn.startNode;
@@ -19143,10 +19154,17 @@ const HierarchizedPickerComponent = class extends HTMLElement {
         optionsToReturn.startingnode = optionsToReturn.StartNodeID;
         delete optionsToReturn.StartNodeID;
       }
-      return optionsToReturn;
+    }
+    else if (search) {
+      optionsToReturn.searchedValue = search;
+      if ("startNode" in optionsToReturn) {
+        optionsToReturn.StartNodeID = optionsToReturn.startNode;
+        delete optionsToReturn.startNode;
+      }
     }
     else
       return options;
+    return optionsToReturn;
   }
   translateDataForTree(dataToLoad, searchID = null, searched = null) {
     if (searched && searched != "") {
@@ -19159,7 +19177,7 @@ const HierarchizedPickerComponent = class extends HTMLElement {
   loadSearchDataInCurrentTree(searchID, searched) {
     let displayResults = (newtree) => {
       if (this.searchToDisplay > -1) { // TODO > Not working anymore after refact, prevents issues in displaying results when running multiple researchs at the same time && searchID == this.searchToDisplay) {
-        this.rawDataManager.mergeData(newtree);
+        this.rawDataManager.mergeData(newtree, this.theOptions.origin == 'classification' ? "ID" : "key");
         newtree.children.forEach((value, index) => {
           completeCurrentTreeWithTree(this.loadedTreeJs, value, this.optionsManager.getOptions());
         });
@@ -19181,9 +19199,7 @@ const HierarchizedPickerComponent = class extends HTMLElement {
     if (this.theOptions.source == 'webservice') {
       if (this.theOptions.origin == 'classification') {
         // WS Call
-        this.rawDataManager.getFromClassification(this.getApiSearchURL(), {
-          searchedValue: searched
-        }, document.querySelector("#hierarchized-picker-" + this.componentID + ".loader"))
+        this.rawDataManager.getFromClassification(this.getApiSearchURL(), Object.assign({}, this.getContextualApiParams(searched)), document.querySelector("#hierarchized-picker-" + this.componentID + ".loader"))
           .then((data) => {
           displayResults(data);
           if (!searched) {
@@ -19332,19 +19348,24 @@ const HierarchizedPickerComponent = class extends HTMLElement {
     // ----- BEGIN -----
     let node = treeToUpdate.nodesById[id];
     let onChange = treeToUpdate.options.onChange;
-    if (!node.disabled) {
-      treeToUpdate.setValue(id);
-      treeToUpdate.updateLiElements();
+    if (!node) {
+      this.logError("The current selected value is not part of the loaded tree!");
     }
-    userClick && onChange && onChange.call(treeToUpdate);
-    // ------ END ------
-    if (this.setValueOnClick) {
-      this.editValue(node, userClick);
-      if (this.shownTree && userClick) {
-        // TODO > is this required ?
-        // await focusMainInput(this);
-        if (!this.optionsManager.getOptions().multiple) {
-          this.showTree('hide');
+    else {
+      if (!node.disabled) {
+        treeToUpdate.setValue(id);
+        treeToUpdate.updateLiElements();
+      }
+      userClick && onChange && onChange.call(treeToUpdate);
+      // ------ END ------
+      if (this.setValueOnClick) {
+        this.editValue(node, userClick);
+        if (this.shownTree && userClick) {
+          // TODO > is this required ?
+          // await focusMainInput(this);
+          if (!this.optionsManager.getOptions().multiple) {
+            this.showTree('hide');
+          }
         }
       }
     }
@@ -19477,6 +19498,7 @@ const HierarchizedPickerComponent = class extends HTMLElement {
   }
   // Search a value in the tree and triggers a search when necessary
   search(searched) {
+    this.loader.classList.add('loading');
     let searchinput = document.querySelector('#hierarchized-picker-' + this.componentID + ' .hierarchized-picker-search input');
     if (this.optionsManager.getOptions().mode == 'input' && searchinput) {
       searchinput.classList.remove('fieldError');
@@ -19513,6 +19535,7 @@ const HierarchizedPickerComponent = class extends HTMLElement {
       // this.checkFields(this.value, false);
       this.setSearchResults([]);
     }
+    this.loader.classList.remove('loading');
   }
   // Refresh the tree with search results
   triggerSearch(searched) {
@@ -19531,7 +19554,9 @@ const HierarchizedPickerComponent = class extends HTMLElement {
   loadDataForTree(init, loader) {
     if (this.optionsManager.getOptions().source == 'webservice') {
       if (this.optionsManager.getOptions().origin == 'classification') {
-        this.rawDataManager.getFromClassification(this.getContextualApiURL(), this.getContextualApiParams(), loader).then((data) => {
+        const contextualApiParams = this.getContextualApiParams();
+        const contextualApiURL = this.getContextualApiURL();
+        this.rawDataManager.getFromClassification(contextualApiURL, contextualApiParams, loader).then((data) => {
           this.rawData = data;
           if (init) {
             this.formatDefaultValue();