reneco-hierarchized-picker 0.5.0 → 0.5.2

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

@@ -18043,7 +18043,10 @@ function replacer(key, value) {
 }
 function searchValue(obj, strict, searched) {
   let toret = false;
-  if (obj.text.toLowerCase().indexOf(searched.toLowerCase()) > -1) {
+  function normalize(s) {
+    return s.replace(/\u00A0/g, " ");
+  }
+  if (normalize(obj.text).toLowerCase().indexOf(normalize(searched).toLowerCase()) > -1) {
     toret = true;
   }
   else if (!strict && obj.children.length > 0 && Object.keys(obj.children[0]).length != 0) {
@@ -18331,7 +18334,7 @@ class RawDataManager {
       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)[index], idKey, childrenKey);
+        return this.genericMerge(child, toAdd[childrenKey].filter(item => item.key == child.key)[0], idKey, childrenKey);
       })
       : toAdd[childrenKey];
     return source;
@@ -18435,6 +18438,9 @@ function getPropertyFromNode(node, property, logerror = true) {
 function findNodeById(tree, nodeId) {
   return tree.nodesById[nodeId] || null;
 }
+function normalizeStr(str) {
+  return str.replace(/\u00A0/g, " ");
+}
 // TODO Deprecated ?
 // export function getNodesFromSearch(data: any, searched: string): any[] {
 //     let toret: any[] = [];
@@ -18491,9 +18497,9 @@ function fillTreeWithObject(tree, myObject, searched, options) {
       const objToPush = {
         id: keyPropFromNode,
         nodeId: keyPropFromNode,
-        text: valueTranslatedPropFromNode,
-        fullpath: fullpathPropFromNode,
-        fullpathTranslated: fullpathTranslatedPropFromNode,
+        text: normalizeStr(valueTranslatedPropFromNode),
+        fullpath: normalizeStr(fullpathPropFromNode),
+        fullpathTranslated: normalizeStr(fullpathTranslatedPropFromNode),
         children: getPropertyFromNode(value, 'hasChildren', false) && childrenPropFromNode && childrenPropFromNode.length === 0 ? [{}] : [],
         deprecated,
         isDesaturated: false,
@@ -18644,7 +18650,6 @@ function setupKeyboardNavigation(component, optionsManager, navigateInTree) {
             if (optionsManager.getOptions().mode != "tree" && !optionsManager.getOptions().multiple) {
               setTimeout(() => {
                 component.showTree('hide');
-                // TODO put back? >> focusMainInput(component);
               }, 100);
             }
           }
@@ -19454,12 +19459,10 @@ 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.theOptions.origin == 'classification' ? "ID" : "key");
-        newtree.children.forEach((value, index) => {
-          completeCurrentTreeWithTree(this.loadedTreeJs, value, this.optionsManager.getOptions());
-        });
+    const displayResults = () => {
+      if (this.searchToDisplay > -1) {
+        if (!searched)
+          this.setSearchResults([]);
         this.triggerTreeDisplay(this.rawDataManager.getData(), searched);
         displayAutocompleteWithResults(this.rawDataManager.getData(), searched, this.optionsManager, this.editValue.bind(this), this.showTree.bind(this));
         // Deploys all nodes
@@ -19475,15 +19478,21 @@ const HierarchizedPickerComponent = class {
         });
       }
     };
+    const completeLocalTree = (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.theOptions.origin == 'classification' ? "ID" : "key");
+        newtree.children.forEach((value, index) => {
+          completeCurrentTreeWithTree(this.loadedTreeJs, value, this.optionsManager.getOptions());
+        });
+        displayResults();
+      }
+    };
     if (this.theOptions.source == 'webservice') {
       if (this.theOptions.origin == 'classification') {
         // WS Call
         this.rawDataManager.getFromClassification(this.getApiSearchURL(), Object.assign({}, this.getContextualApiParams(null, searched)), document.querySelector("#hierarchized-picker-" + this.componentID + " .loader"))
           .then((data) => {
-          displayResults(data);
-          if (!searched) {
-            this.setSearchResults([]);
-          }
+          completeLocalTree(data);
         })
           .catch(err => {
           this.errorToLog = err;
@@ -19499,10 +19508,7 @@ const HierarchizedPickerComponent = class {
           deprecated: false,
         }, document.querySelector("#hierarchized-picker-" + this.componentID + " .loader"))
           .then((data) => {
-          displayResults(data);
-          if (!searched) {
-            this.setSearchResults([]);
-          }
+          completeLocalTree(data);
         })
           .catch(error => {
           this.errorToLog = error;
@@ -19517,10 +19523,7 @@ const HierarchizedPickerComponent = class {
     }
     else {
       if (this.optionsManager.getOptions().source == 'data') {
-        displayResults(this.rawDataManager.getData());
-        if (!searched) {
-          this.setSearchResults([]);
-        }
+        displayResults();
       }
       else {
         console.error("Unhandled picker settings for search scenario !!");

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

@@ -722,12 +722,10 @@ 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.theOptions.origin == 'classification' ? "ID" : "key");
-        newtree.children.forEach((value, index) => {
-          completeCurrentTreeWithTree(this.loadedTreeJs, value, this.optionsManager.getOptions());
-        });
+    const displayResults = () => {
+      if (this.searchToDisplay > -1) {
+        if (!searched)
+          this.setSearchResults([]);
         this.triggerTreeDisplay(this.rawDataManager.getData(), searched);
         displayAutocompleteWithResults(this.rawDataManager.getData(), searched, this.optionsManager, this.editValue.bind(this), this.showTree.bind(this));
         // Deploys all nodes
@@ -743,15 +741,21 @@ export class HierarchizedPickerComponent {
         });
       }
     };
+    const completeLocalTree = (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.theOptions.origin == 'classification' ? "ID" : "key");
+        newtree.children.forEach((value, index) => {
+          completeCurrentTreeWithTree(this.loadedTreeJs, value, this.optionsManager.getOptions());
+        });
+        displayResults();
+      }
+    };
     if (this.theOptions.source == 'webservice') {
       if (this.theOptions.origin == 'classification') {
         // WS Call
         this.rawDataManager.getFromClassification(this.getApiSearchURL(), Object.assign({}, this.getContextualApiParams(null, searched)), document.querySelector("#hierarchized-picker-" + this.componentID + " .loader"))
           .then((data) => {
-          displayResults(data);
-          if (!searched) {
-            this.setSearchResults([]);
-          }
+          completeLocalTree(data);
         })
           .catch(err => {
           this.errorToLog = err;
@@ -767,10 +771,7 @@ export class HierarchizedPickerComponent {
           deprecated: false,
         }, document.querySelector("#hierarchized-picker-" + this.componentID + " .loader"))
           .then((data) => {
-          displayResults(data);
-          if (!searched) {
-            this.setSearchResults([]);
-          }
+          completeLocalTree(data);
         })
           .catch(error => {
           this.errorToLog = error;
@@ -785,10 +786,7 @@ export class HierarchizedPickerComponent {
     }
     else {
       if (this.optionsManager.getOptions().source == 'data') {
-        displayResults(this.rawDataManager.getData());
-        if (!searched) {
-          this.setSearchResults([]);
-        }
+        displayResults();
       }
       else {
         console.error("Unhandled picker settings for search scenario !!");

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

@@ -182,7 +182,7 @@ export class RawDataManager {
       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)[index], idKey, childrenKey);
+        return this.genericMerge(child, toAdd[childrenKey].filter(item => item.key == child.key)[0], idKey, childrenKey);
       })
       : toAdd[childrenKey];
     return source;

package/dist/collection/features/keyboard-navigation/keyboard-navigation.js

@@ -50,7 +50,6 @@ export function setupKeyboardNavigation(component, optionsManager, navigateInTre
             if (optionsManager.getOptions().mode != "tree" && !optionsManager.getOptions().multiple) {
               setTimeout(() => {
                 component.showTree('hide');
-                // TODO put back? >> focusMainInput(component);
               }, 100);
             }
           }

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

@@ -23,6 +23,9 @@ export function getPropertyFromNode(node, property, logerror = true) {
 export function findNodeById(tree, nodeId) {
   return tree.nodesById[nodeId] || null;
 }
+function normalizeStr(str) {
+  return str.replace(/\u00A0/g, " ");
+}
 // TODO Deprecated ?
 // export function getNodesFromSearch(data: any, searched: string): any[] {
 //     let toret: any[] = [];
@@ -79,9 +82,9 @@ export function fillTreeWithObject(tree, myObject, searched, options) {
       const objToPush = {
         id: keyPropFromNode,
         nodeId: keyPropFromNode,
-        text: valueTranslatedPropFromNode,
-        fullpath: fullpathPropFromNode,
-        fullpathTranslated: fullpathTranslatedPropFromNode,
+        text: normalizeStr(valueTranslatedPropFromNode),
+        fullpath: normalizeStr(fullpathPropFromNode),
+        fullpathTranslated: normalizeStr(fullpathTranslatedPropFromNode),
         children: getPropertyFromNode(value, 'hasChildren', false) && childrenPropFromNode && childrenPropFromNode.length === 0 ? [{}] : [],
         deprecated,
         isDesaturated: false,

package/dist/collection/utils/helpers.js

@@ -17,7 +17,10 @@ export function replacer(key, value) {
 }
 export function searchValue(obj, strict, searched) {
   let toret = false;
-  if (obj.text.toLowerCase().indexOf(searched.toLowerCase()) > -1) {
+  function normalize(s) {
+    return s.replace(/\u00A0/g, " ");
+  }
+  if (normalize(obj.text).toLowerCase().indexOf(normalize(searched).toLowerCase()) > -1) {
     toret = true;
   }
   else if (!strict && obj.children.length > 0 && Object.keys(obj.children[0]).length != 0) {

package/dist/custom-elements/index.js

@@ -18040,7 +18040,10 @@ function replacer(key, value) {
 }
 function searchValue(obj, strict, searched) {
   let toret = false;
-  if (obj.text.toLowerCase().indexOf(searched.toLowerCase()) > -1) {
+  function normalize(s) {
+    return s.replace(/\u00A0/g, " ");
+  }
+  if (normalize(obj.text).toLowerCase().indexOf(normalize(searched).toLowerCase()) > -1) {
     toret = true;
   }
   else if (!strict && obj.children.length > 0 && Object.keys(obj.children[0]).length != 0) {
@@ -18328,7 +18331,7 @@ class RawDataManager {
       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)[index], idKey, childrenKey);
+        return this.genericMerge(child, toAdd[childrenKey].filter(item => item.key == child.key)[0], idKey, childrenKey);
       })
       : toAdd[childrenKey];
     return source;
@@ -18432,6 +18435,9 @@ function getPropertyFromNode(node, property, logerror = true) {
 function findNodeById(tree, nodeId) {
   return tree.nodesById[nodeId] || null;
 }
+function normalizeStr(str) {
+  return str.replace(/\u00A0/g, " ");
+}
 // TODO Deprecated ?
 // export function getNodesFromSearch(data: any, searched: string): any[] {
 //     let toret: any[] = [];
@@ -18488,9 +18494,9 @@ function fillTreeWithObject(tree, myObject, searched, options) {
       const objToPush = {
         id: keyPropFromNode,
         nodeId: keyPropFromNode,
-        text: valueTranslatedPropFromNode,
-        fullpath: fullpathPropFromNode,
-        fullpathTranslated: fullpathTranslatedPropFromNode,
+        text: normalizeStr(valueTranslatedPropFromNode),
+        fullpath: normalizeStr(fullpathPropFromNode),
+        fullpathTranslated: normalizeStr(fullpathTranslatedPropFromNode),
         children: getPropertyFromNode(value, 'hasChildren', false) && childrenPropFromNode && childrenPropFromNode.length === 0 ? [{}] : [],
         deprecated,
         isDesaturated: false,
@@ -18641,7 +18647,6 @@ function setupKeyboardNavigation(component, optionsManager, navigateInTree) {
             if (optionsManager.getOptions().mode != "tree" && !optionsManager.getOptions().multiple) {
               setTimeout(() => {
                 component.showTree('hide');
-                // TODO put back? >> focusMainInput(component);
               }, 100);
             }
           }
@@ -19452,12 +19457,10 @@ 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.theOptions.origin == 'classification' ? "ID" : "key");
-        newtree.children.forEach((value, index) => {
-          completeCurrentTreeWithTree(this.loadedTreeJs, value, this.optionsManager.getOptions());
-        });
+    const displayResults = () => {
+      if (this.searchToDisplay > -1) {
+        if (!searched)
+          this.setSearchResults([]);
         this.triggerTreeDisplay(this.rawDataManager.getData(), searched);
         displayAutocompleteWithResults(this.rawDataManager.getData(), searched, this.optionsManager, this.editValue.bind(this), this.showTree.bind(this));
         // Deploys all nodes
@@ -19473,15 +19476,21 @@ const HierarchizedPickerComponent = class extends HTMLElement {
         });
       }
     };
+    const completeLocalTree = (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.theOptions.origin == 'classification' ? "ID" : "key");
+        newtree.children.forEach((value, index) => {
+          completeCurrentTreeWithTree(this.loadedTreeJs, value, this.optionsManager.getOptions());
+        });
+        displayResults();
+      }
+    };
     if (this.theOptions.source == 'webservice') {
       if (this.theOptions.origin == 'classification') {
         // WS Call
         this.rawDataManager.getFromClassification(this.getApiSearchURL(), Object.assign({}, this.getContextualApiParams(null, searched)), document.querySelector("#hierarchized-picker-" + this.componentID + " .loader"))
           .then((data) => {
-          displayResults(data);
-          if (!searched) {
-            this.setSearchResults([]);
-          }
+          completeLocalTree(data);
         })
           .catch(err => {
           this.errorToLog = err;
@@ -19497,10 +19506,7 @@ const HierarchizedPickerComponent = class extends HTMLElement {
           deprecated: false,
         }, document.querySelector("#hierarchized-picker-" + this.componentID + " .loader"))
           .then((data) => {
-          displayResults(data);
-          if (!searched) {
-            this.setSearchResults([]);
-          }
+          completeLocalTree(data);
         })
           .catch(error => {
           this.errorToLog = error;
@@ -19515,10 +19521,7 @@ const HierarchizedPickerComponent = class extends HTMLElement {
     }
     else {
       if (this.optionsManager.getOptions().source == 'data') {
-        displayResults(this.rawDataManager.getData());
-        if (!searched) {
-          this.setSearchResults([]);
-        }
+        displayResults();
       }
       else {
         console.error("Unhandled picker settings for search scenario !!");

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

@@ -18039,7 +18039,10 @@ function replacer(key, value) {
 }
 function searchValue(obj, strict, searched) {
   let toret = false;
-  if (obj.text.toLowerCase().indexOf(searched.toLowerCase()) > -1) {
+  function normalize(s) {
+    return s.replace(/\u00A0/g, " ");
+  }
+  if (normalize(obj.text).toLowerCase().indexOf(normalize(searched).toLowerCase()) > -1) {
     toret = true;
   }
   else if (!strict && obj.children.length > 0 && Object.keys(obj.children[0]).length != 0) {
@@ -18327,7 +18330,7 @@ class RawDataManager {
       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)[index], idKey, childrenKey);
+        return this.genericMerge(child, toAdd[childrenKey].filter(item => item.key == child.key)[0], idKey, childrenKey);
       })
       : toAdd[childrenKey];
     return source;
@@ -18431,6 +18434,9 @@ function getPropertyFromNode(node, property, logerror = true) {
 function findNodeById(tree, nodeId) {
   return tree.nodesById[nodeId] || null;
 }
+function normalizeStr(str) {
+  return str.replace(/\u00A0/g, " ");
+}
 // TODO Deprecated ?
 // export function getNodesFromSearch(data: any, searched: string): any[] {
 //     let toret: any[] = [];
@@ -18487,9 +18493,9 @@ function fillTreeWithObject(tree, myObject, searched, options) {
       const objToPush = {
         id: keyPropFromNode,
         nodeId: keyPropFromNode,
-        text: valueTranslatedPropFromNode,
-        fullpath: fullpathPropFromNode,
-        fullpathTranslated: fullpathTranslatedPropFromNode,
+        text: normalizeStr(valueTranslatedPropFromNode),
+        fullpath: normalizeStr(fullpathPropFromNode),
+        fullpathTranslated: normalizeStr(fullpathTranslatedPropFromNode),
         children: getPropertyFromNode(value, 'hasChildren', false) && childrenPropFromNode && childrenPropFromNode.length === 0 ? [{}] : [],
         deprecated,
         isDesaturated: false,
@@ -18640,7 +18646,6 @@ function setupKeyboardNavigation(component, optionsManager, navigateInTree) {
             if (optionsManager.getOptions().mode != "tree" && !optionsManager.getOptions().multiple) {
               setTimeout(() => {
                 component.showTree('hide');
-                // TODO put back? >> focusMainInput(component);
               }, 100);
             }
           }
@@ -19450,12 +19455,10 @@ 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.theOptions.origin == 'classification' ? "ID" : "key");
-        newtree.children.forEach((value, index) => {
-          completeCurrentTreeWithTree(this.loadedTreeJs, value, this.optionsManager.getOptions());
-        });
+    const displayResults = () => {
+      if (this.searchToDisplay > -1) {
+        if (!searched)
+          this.setSearchResults([]);
         this.triggerTreeDisplay(this.rawDataManager.getData(), searched);
         displayAutocompleteWithResults(this.rawDataManager.getData(), searched, this.optionsManager, this.editValue.bind(this), this.showTree.bind(this));
         // Deploys all nodes
@@ -19471,15 +19474,21 @@ const HierarchizedPickerComponent = class {
         });
       }
     };
+    const completeLocalTree = (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.theOptions.origin == 'classification' ? "ID" : "key");
+        newtree.children.forEach((value, index) => {
+          completeCurrentTreeWithTree(this.loadedTreeJs, value, this.optionsManager.getOptions());
+        });
+        displayResults();
+      }
+    };
     if (this.theOptions.source == 'webservice') {
       if (this.theOptions.origin == 'classification') {
         // WS Call
         this.rawDataManager.getFromClassification(this.getApiSearchURL(), Object.assign({}, this.getContextualApiParams(null, searched)), document.querySelector("#hierarchized-picker-" + this.componentID + " .loader"))
           .then((data) => {
-          displayResults(data);
-          if (!searched) {
-            this.setSearchResults([]);
-          }
+          completeLocalTree(data);
         })
           .catch(err => {
           this.errorToLog = err;
@@ -19495,10 +19504,7 @@ const HierarchizedPickerComponent = class {
           deprecated: false,
         }, document.querySelector("#hierarchized-picker-" + this.componentID + " .loader"))
           .then((data) => {
-          displayResults(data);
-          if (!searched) {
-            this.setSearchResults([]);
-          }
+          completeLocalTree(data);
         })
           .catch(error => {
           this.errorToLog = error;
@@ -19513,10 +19519,7 @@ const HierarchizedPickerComponent = class {
     }
     else {
       if (this.optionsManager.getOptions().source == 'data') {
-        displayResults(this.rawDataManager.getData());
-        if (!searched) {
-          this.setSearchResults([]);
-        }
+        displayResults();
       }
       else {
         console.error("Unhandled picker settings for search scenario !!");