reneco-hierarchized-picker 0.2.2-beta.5 → 0.2.2-beta.6

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

@@ -214,7 +214,9 @@ Tree.prototype.bindEvent = function (ele) {
       this.onSwitcherClick(target);
     }
     //CUSTOM
-    const childspans = Array.prototype.slice.call(e.target.parentNode.querySelectorAll('ul > li > span'));
+    const childspans = Array.prototype.slice.call(e.target.parentNode.querySelectorAll('ul > li > span.treejs-label')).filter((ele) => {
+      return ele.parentNode.parentNode.parentNode === e.target.parentNode;
+    });
     let hasUndefinedchild = [];
     //This may be a problem the day a node value is "undefined"
     hasUndefinedchild = childspans.filter(ele => {
@@ -444,7 +446,10 @@ Tree.prototype.walkUp = function (node, changeState) {
         return;
       parent.status = pStatus;
       if (parent.parent) {
-        parent.parent.children.find(item => item.id === parent.id).status = pStatus;
+        let parentparentchild = parent.parent.children.find(item => item.id === parent.id);
+        if (parentparentchild) {
+          parentparentchild.status = pStatus;
+        }
       }
     }
     else {
@@ -18208,6 +18213,38 @@ const HierarchizedPickerComponent = class {
     });
     return source;
   }
+  searchAndMergeDataClassification(source, toadd) {
+    let terminate = false;
+    source.children.forEach((element, index) => {
+      if (terminate) {
+        return source;
+      }
+      if (source.ID == toadd.ID) {
+        let subterminate = false;
+        toadd.children.forEach((taelement, index) => {
+          if (subterminate) {
+            return;
+          }
+          if (element.ID == taelement.ID) {
+            element = this.mergeData(element, taelement);
+            subterminate = true;
+            return;
+          }
+        });
+      }
+      else {
+        if (element.ID == toadd.ID) {
+          element = this.mergeData(element, toadd);
+          terminate = true;
+          return source;
+        }
+        else {
+          this.searchAndMergeDataClassification(element, toadd);
+        }
+      }
+    });
+    return source;
+  }
   getNodeIdFromFullpath(fullpath) {
     return new Promise((resolve, reject) => {
       let token = this.theOptions.token;
@@ -18313,7 +18350,7 @@ const HierarchizedPickerComponent = class {
             if (xhr.status === 200) {
               that.mylog('XHR 200', JSON.parse(xhr.responseText));
               if (that.rawData) {
-                that.rawData = that.searchAndMergeData(that.rawData, JSON.parse(xhr.responseText));
+                that.rawData = that.searchAndMergeDataClassification(that.rawData, JSON.parse(xhr.responseText));
               }
               else {
                 that.rawData = JSON.parse(xhr.responseText);

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

@@ -439,6 +439,38 @@ export class HierarchizedPickerComponent {
     });
     return source;
   }
+  searchAndMergeDataClassification(source, toadd) {
+    let terminate = false;
+    source.children.forEach((element, index) => {
+      if (terminate) {
+        return source;
+      }
+      if (source.ID == toadd.ID) {
+        let subterminate = false;
+        toadd.children.forEach((taelement, index) => {
+          if (subterminate) {
+            return;
+          }
+          if (element.ID == taelement.ID) {
+            element = this.mergeData(element, taelement);
+            subterminate = true;
+            return;
+          }
+        });
+      }
+      else {
+        if (element.ID == toadd.ID) {
+          element = this.mergeData(element, toadd);
+          terminate = true;
+          return source;
+        }
+        else {
+          this.searchAndMergeDataClassification(element, toadd);
+        }
+      }
+    });
+    return source;
+  }
   getNodeIdFromFullpath(fullpath) {
     return new Promise((resolve, reject) => {
       let token = this.theOptions.token;
@@ -544,7 +576,7 @@ export class HierarchizedPickerComponent {
             if (xhr.status === 200) {
               that.mylog('XHR 200', JSON.parse(xhr.responseText));
               if (that.rawData) {
-                that.rawData = that.searchAndMergeData(that.rawData, JSON.parse(xhr.responseText));
+                that.rawData = that.searchAndMergeDataClassification(that.rawData, JSON.parse(xhr.responseText));
               }
               else {
                 that.rawData = JSON.parse(xhr.responseText);

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

@@ -182,7 +182,9 @@ Tree.prototype.bindEvent = function (ele) {
       this.onSwitcherClick(target);
     }
     //CUSTOM
-    const childspans = Array.prototype.slice.call(e.target.parentNode.querySelectorAll('ul > li > span'));
+    const childspans = Array.prototype.slice.call(e.target.parentNode.querySelectorAll('ul > li > span.treejs-label')).filter((ele) => {
+      return ele.parentNode.parentNode.parentNode === e.target.parentNode;
+    });
     let hasUndefinedchild = [];
     //This may be a problem the day a node value is "undefined"
     hasUndefinedchild = childspans.filter(ele => {
@@ -412,7 +414,10 @@ Tree.prototype.walkUp = function (node, changeState) {
         return;
       parent.status = pStatus;
       if (parent.parent) {
-        parent.parent.children.find(item => item.id === parent.id).status = pStatus;
+        let parentparentchild = parent.parent.children.find(item => item.id === parent.id);
+        if (parentparentchild) {
+          parentparentchild.status = pStatus;
+        }
       }
     }
     else {

package/dist/custom-elements/index.js

@@ -211,7 +211,9 @@ Tree.prototype.bindEvent = function (ele) {
       this.onSwitcherClick(target);
     }
     //CUSTOM
-    const childspans = Array.prototype.slice.call(e.target.parentNode.querySelectorAll('ul > li > span'));
+    const childspans = Array.prototype.slice.call(e.target.parentNode.querySelectorAll('ul > li > span.treejs-label')).filter((ele) => {
+      return ele.parentNode.parentNode.parentNode === e.target.parentNode;
+    });
     let hasUndefinedchild = [];
     //This may be a problem the day a node value is "undefined"
     hasUndefinedchild = childspans.filter(ele => {
@@ -441,7 +443,10 @@ Tree.prototype.walkUp = function (node, changeState) {
         return;
       parent.status = pStatus;
       if (parent.parent) {
-        parent.parent.children.find(item => item.id === parent.id).status = pStatus;
+        let parentparentchild = parent.parent.children.find(item => item.id === parent.id);
+        if (parentparentchild) {
+          parentparentchild.status = pStatus;
+        }
       }
     }
     else {
@@ -18206,6 +18211,38 @@ const HierarchizedPickerComponent = class extends HTMLElement {
     });
     return source;
   }
+  searchAndMergeDataClassification(source, toadd) {
+    let terminate = false;
+    source.children.forEach((element, index) => {
+      if (terminate) {
+        return source;
+      }
+      if (source.ID == toadd.ID) {
+        let subterminate = false;
+        toadd.children.forEach((taelement, index) => {
+          if (subterminate) {
+            return;
+          }
+          if (element.ID == taelement.ID) {
+            element = this.mergeData(element, taelement);
+            subterminate = true;
+            return;
+          }
+        });
+      }
+      else {
+        if (element.ID == toadd.ID) {
+          element = this.mergeData(element, toadd);
+          terminate = true;
+          return source;
+        }
+        else {
+          this.searchAndMergeDataClassification(element, toadd);
+        }
+      }
+    });
+    return source;
+  }
   getNodeIdFromFullpath(fullpath) {
     return new Promise((resolve, reject) => {
       let token = this.theOptions.token;
@@ -18311,7 +18348,7 @@ const HierarchizedPickerComponent = class extends HTMLElement {
             if (xhr.status === 200) {
               that.mylog('XHR 200', JSON.parse(xhr.responseText));
               if (that.rawData) {
-                that.rawData = that.searchAndMergeData(that.rawData, JSON.parse(xhr.responseText));
+                that.rawData = that.searchAndMergeDataClassification(that.rawData, JSON.parse(xhr.responseText));
               }
               else {
                 that.rawData = JSON.parse(xhr.responseText);

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

@@ -210,7 +210,9 @@ Tree.prototype.bindEvent = function (ele) {
       this.onSwitcherClick(target);
     }
     //CUSTOM
-    const childspans = Array.prototype.slice.call(e.target.parentNode.querySelectorAll('ul > li > span'));
+    const childspans = Array.prototype.slice.call(e.target.parentNode.querySelectorAll('ul > li > span.treejs-label')).filter((ele) => {
+      return ele.parentNode.parentNode.parentNode === e.target.parentNode;
+    });
     let hasUndefinedchild = [];
     //This may be a problem the day a node value is "undefined"
     hasUndefinedchild = childspans.filter(ele => {
@@ -440,7 +442,10 @@ Tree.prototype.walkUp = function (node, changeState) {
         return;
       parent.status = pStatus;
       if (parent.parent) {
-        parent.parent.children.find(item => item.id === parent.id).status = pStatus;
+        let parentparentchild = parent.parent.children.find(item => item.id === parent.id);
+        if (parentparentchild) {
+          parentparentchild.status = pStatus;
+        }
       }
     }
     else {
@@ -18204,6 +18209,38 @@ const HierarchizedPickerComponent = class {
     });
     return source;
   }
+  searchAndMergeDataClassification(source, toadd) {
+    let terminate = false;
+    source.children.forEach((element, index) => {
+      if (terminate) {
+        return source;
+      }
+      if (source.ID == toadd.ID) {
+        let subterminate = false;
+        toadd.children.forEach((taelement, index) => {
+          if (subterminate) {
+            return;
+          }
+          if (element.ID == taelement.ID) {
+            element = this.mergeData(element, taelement);
+            subterminate = true;
+            return;
+          }
+        });
+      }
+      else {
+        if (element.ID == toadd.ID) {
+          element = this.mergeData(element, toadd);
+          terminate = true;
+          return source;
+        }
+        else {
+          this.searchAndMergeDataClassification(element, toadd);
+        }
+      }
+    });
+    return source;
+  }
   getNodeIdFromFullpath(fullpath) {
     return new Promise((resolve, reject) => {
       let token = this.theOptions.token;
@@ -18309,7 +18346,7 @@ const HierarchizedPickerComponent = class {
             if (xhr.status === 200) {
               that.mylog('XHR 200', JSON.parse(xhr.responseText));
               if (that.rawData) {
-                that.rawData = that.searchAndMergeData(that.rawData, JSON.parse(xhr.responseText));
+                that.rawData = that.searchAndMergeDataClassification(that.rawData, JSON.parse(xhr.responseText));
               }
               else {
                 that.rawData = JSON.parse(xhr.responseText);