reneco-hierarchized-picker 0.5.1 → 0.5.3

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[] = [];
@@ -18461,6 +18467,9 @@ function findNodeById(tree, nodeId) {
  */
 function fillTreeWithObject(tree, myObject, searched, options) {
   const searchResultPresentsUnMatched = options.searchResultPresentsUnMatched;
+  if (myObject && myObject.children) {
+    myObject = [myObject];
+  }
   if (myObject && myObject.length) {
     myObject.forEach(value => {
       var _a, _b, _c, _d;
@@ -18491,9 +18500,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,
@@ -19553,12 +19562,16 @@ const HierarchizedPickerComponent = class {
       this.el.querySelector('.hierarchized-picker-tree').innerHTML = 'No search results ...';
       return;
     }
+    if (!this.loadedTreeJs || forceTreeReset) {
+      const dataManagerData = this.rawDataManager.getData();
+      treeData = fillTreeWithObject([], (this.optionsManager.getOptions().displayRootNode ? dataManagerData : dataManagerData.children), null, this.optionsManager.getOptions());
+    }
     // TODO If statement is a quick fix to allow the loadedTreeJs data to be holded instead of being reinitialized after hiding the modale
     const myTree = new Tree('#tree-area-' + this.componentID, {
       parentApi: this,
       rawDataManager: this.rawDataManager,
       completeCurrentTreeWithTree: completeCurrentTreeWithTree,
-      data: (!this.loadedTreeJs || forceTreeReset ? treeData : fillTreeWithObject([], this.rawDataManager.getData().children, null, this.optionsManager.getOptions())),
+      data: treeData,
       onChange: async () => {
         let oldValue;
         try {

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

@@ -822,12 +822,16 @@ export class HierarchizedPickerComponent {
       this.el.querySelector('.hierarchized-picker-tree').innerHTML = 'No search results ...';
       return;
     }
+    if (!this.loadedTreeJs || forceTreeReset) {
+      const dataManagerData = this.rawDataManager.getData();
+      treeData = fillTreeWithObject([], (this.optionsManager.getOptions().displayRootNode ? dataManagerData : dataManagerData.children), null, this.optionsManager.getOptions());
+    }
     // TODO If statement is a quick fix to allow the loadedTreeJs data to be holded instead of being reinitialized after hiding the modale
     const myTree = new Tree('#tree-area-' + this.componentID, {
       parentApi: this,
       rawDataManager: this.rawDataManager,
       completeCurrentTreeWithTree: completeCurrentTreeWithTree,
-      data: (!this.loadedTreeJs || forceTreeReset ? treeData : fillTreeWithObject([], this.rawDataManager.getData().children, null, this.optionsManager.getOptions())),
+      data: treeData,
       onChange: async () => {
         let oldValue;
         try {

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

@@ -147,14 +147,6 @@ Tree.prototype.buildTree = function (nodes, depth) {
 };
 Tree.prototype.bindEvent = function (ele) {
   var _a;
-  // const that = this;
-  // let parentOptions:any = {};
-  // try{
-  //   parentOptions = JSON.parse(this.options.parentApi.theOptions);
-  // }
-  // catch {
-  //   parentOptions = this.options.parentApi.theOptions;
-  // }
   // @ts-ignore
   function getLi(target) {
     return target.classList.contains('treejs-node') ? target : target.closest('.treejs-node');

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/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[] = [];
@@ -49,6 +52,9 @@ export function findNodeById(tree, nodeId) {
  */
 export function fillTreeWithObject(tree, myObject, searched, options) {
   const searchResultPresentsUnMatched = options.searchResultPresentsUnMatched;
+  if (myObject && myObject.children) {
+    myObject = [myObject];
+  }
   if (myObject && myObject.length) {
     myObject.forEach(value => {
       var _a, _b, _c, _d;
@@ -79,9 +85,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[] = [];
@@ -18458,6 +18464,9 @@ function findNodeById(tree, nodeId) {
  */
 function fillTreeWithObject(tree, myObject, searched, options) {
   const searchResultPresentsUnMatched = options.searchResultPresentsUnMatched;
+  if (myObject && myObject.children) {
+    myObject = [myObject];
+  }
   if (myObject && myObject.length) {
     myObject.forEach(value => {
       var _a, _b, _c, _d;
@@ -18488,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,
@@ -19551,12 +19560,16 @@ const HierarchizedPickerComponent = class extends HTMLElement {
       this.el.querySelector('.hierarchized-picker-tree').innerHTML = 'No search results ...';
       return;
     }
+    if (!this.loadedTreeJs || forceTreeReset) {
+      const dataManagerData = this.rawDataManager.getData();
+      treeData = fillTreeWithObject([], (this.optionsManager.getOptions().displayRootNode ? dataManagerData : dataManagerData.children), null, this.optionsManager.getOptions());
+    }
     // TODO If statement is a quick fix to allow the loadedTreeJs data to be holded instead of being reinitialized after hiding the modale
     const myTree = new Tree('#tree-area-' + this.componentID, {
       parentApi: this,
       rawDataManager: this.rawDataManager,
       completeCurrentTreeWithTree: completeCurrentTreeWithTree,
-      data: (!this.loadedTreeJs || forceTreeReset ? treeData : fillTreeWithObject([], this.rawDataManager.getData().children, null, this.optionsManager.getOptions())),
+      data: treeData,
       onChange: async () => {
         let oldValue;
         try {

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[] = [];
@@ -18457,6 +18463,9 @@ function findNodeById(tree, nodeId) {
  */
 function fillTreeWithObject(tree, myObject, searched, options) {
   const searchResultPresentsUnMatched = options.searchResultPresentsUnMatched;
+  if (myObject && myObject.children) {
+    myObject = [myObject];
+  }
   if (myObject && myObject.length) {
     myObject.forEach(value => {
       var _a, _b, _c, _d;
@@ -18487,9 +18496,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,
@@ -19549,12 +19558,16 @@ const HierarchizedPickerComponent = class {
       this.el.querySelector('.hierarchized-picker-tree').innerHTML = 'No search results ...';
       return;
     }
+    if (!this.loadedTreeJs || forceTreeReset) {
+      const dataManagerData = this.rawDataManager.getData();
+      treeData = fillTreeWithObject([], (this.optionsManager.getOptions().displayRootNode ? dataManagerData : dataManagerData.children), null, this.optionsManager.getOptions());
+    }
     // TODO If statement is a quick fix to allow the loadedTreeJs data to be holded instead of being reinitialized after hiding the modale
     const myTree = new Tree('#tree-area-' + this.componentID, {
       parentApi: this,
       rawDataManager: this.rawDataManager,
       completeCurrentTreeWithTree: completeCurrentTreeWithTree,
-      data: (!this.loadedTreeJs || forceTreeReset ? treeData : fillTreeWithObject([], this.rawDataManager.getData().children, null, this.optionsManager.getOptions())),
+      data: treeData,
       onChange: async () => {
         let oldValue;
         try {