Merge pull request 'release/0.1.2.011' (#3) from release/0.1.2.011 into master

Reviewed-on: Ray/bbtreeview#3

build.bat

@@ -0,0 +1,22 @@
+del bbtreeview.min.js
+del bbtreeview.min.tmp
+del build/bbtreeview.min.js
+
+cd src
+
+type version.txt >> ../bbtreeview.min.js
+
+@REM "C:\B\Portable Files (dev)\Google Closure Compiler\closure-compiler-v20231112.jar" --js *.js --js_output_file ../bbtreeview.min.tmp
+@REM npx google-closure-compiler --compilation_level=ADVANCED --js=*.js --js_output_file=../bbtreeview.min.tmp
+@REM npx google-closure-compiler --compilation_level=ADVANCED --warning_level=VERBOSE --js=*.js --js_output_file=bbtreeview.min.tmp
+@REM npx google-closure-compiler --warning_level=VERBOSE --js=*.js --js_output_file=bbtreeview.min.tmp
+
+move bbtreeview.min.tmp ../bbtreeview.min.tmp
+
+cd..
+
+type bbtreeview.min.tmp >> bbtreeview.min.js
+
+move bbtreeview.min.js build/bbtreeview.min.js
+
+del bbtreeview.min.tmp

build/bbtreeview.min.css

@@ -1,5 +1,5 @@
 /**
  * BBTreeview
- * @version v0.1.0.223 (2023/09/08 2027)
+ * @version v0.1.1.006 (2023/09/27 2218)
  */
- ul.bbtreeview{background-image:url(line.png);background-position:4px 8px;background-repeat:repeat-y;list-style:none;padding:0;margin:0 0 0 8px}ul.bbtreeview ul{background-image:url(line.png);background-position:4px 8px;background-repeat:repeat-y;list-style:none;margin:0 0 0 8px;padding:0}ul.bbtreeview li{background-position:0 calc((1.2em - 9px)/ 2);background-repeat:no-repeat;cursor:default;display:block;padding-left:14px;width:100%}ul.bbtreeview li.c{background-image:url(expand.png)}ul.bbtreeview li.e{background-image:url(collapse.png)}ul.bbtreeview li.hidden{display:none}ul.bbtreeview div.li{display:block;height:1.2em;padding-left:4px}ul.bbtreeview div.li.highlighted{background-color:rgb(169,201,249,.7)}ul.bbtreeview div.li>div.icon{background-position:0 center;background-repeat:no-repeat;display:inline-block;height:100%;width:calc(16px)}ul.bbtreeview div.li>div.folder{background-image:url(folder.png)}ul.bbtreeview li>div.li>div.checkbox{background-image:url(uncheckbox.png)}ul.bbtreeview li.x>div.li>div.checkbox{background-image:url(checkbox.png)}ul.bbtreeview div.li>span{-webkit-user-select:none;-ms-user-select:none;user-select:none;display:inline-block;height:1.2em;line-height:1.2em;overflow:hidden;padding-left:6px;text-overflow:ellipsis;vertical-align:top;white-space:nowrap}
+ ul.bbtreeview{background-image:url(line.png);background-position:4px 8px;background-repeat:repeat-y;list-style:none;padding:0;margin:0 0 0 8px}ul.bbtreeview ul{background-image:url(line.png);background-position:4px 8px;background-repeat:repeat-y;list-style:none;margin:0 0 0 8px;padding:0}ul.bbtreeview li{background-position:0 calc((1.2em - 9px)/ 2);background-repeat:no-repeat;cursor:default;display:block;padding-left:14px;width:100%}ul.bbtreeview li.c{background-image:url(expand.png)}ul.bbtreeview li.e{background-image:url(collapse.png)}ul.bbtreeview li.hidden{display:none}ul.bbtreeview div.li{display:block;height:1.2em;padding-left:4px}ul.bbtreeview div.li.highlighted{background-color:rgb(169,201,249,.7)}ul.bbtreeview div.li>div.icon{background-position:0 center;background-repeat:no-repeat;display:inline-block;height:100%;width:calc(16px)}ul.bbtreeview div.li>div.folder{background-image:url(folder.png)}ul.bbtreeview li>div.li>div.checkbox{background-image:url(uncheckbox.png)}ul.bbtreeview li.x>div.li>div.checkbox{background-image:url(checkbox.png)}ul.bbtreeview div.li>span{-webkit-user-select:none;-ms-user-select:none;user-select:none;display:inline-block;height:1.2em;line-height:1.2em;overflow:hidden;padding-left:6px;text-overflow:ellipsis;vertical-align:top;white-space:nowrap}ul.bbtreeview div.li>span.noicon{padding-left:0!important}

build/bbtreeview.min.js

@@ -0,0 +1,18 @@
+/**
+ * BBTreeview
+ * @version v0.1.2.044 (2024/01/09 2118)
+ */
+class BBTreeview{constructor(a){this.Options={};this.initialiseComponents(a)}initialiseComponents(a){this.Options=Object.assign({ID:null,ShowCheckbox:!1,ShowSelection:!0,EnablePullUp:!1,ShowIcon:!0},a);this.createTreeview()}get Container(){return this.getTreeview()}AddItem(a){a=Object.assign({ID:null,ParentID:null,Name:"",Hint:"",Value:"",Icon:"folder",Checked:!1,Tag:null},a);null==a.ID&&(a.ID=this.generateID());null==a.Tag&&(a.Tag="");if(null!=this.Find(a.ID))return!1;let b=null;if(null!=a.ParentID&&
+(b=this.Find(a.ParentID),null==b))return!1;b=null==b?this.Container:b.ChildNode;const c=this.generateNodeHtml(a);this.appendHtml(b,c);this.Find(a.ID).InvalidateEvents();return!0}Remove(a){a=this.Find(a);if(null==a)return!1;a.Remove();return!0}Clear(){this.initialiseComponents(this.Options)}CollapseAll(){this.GetAllNodes().forEach(function(a){a.Collapse()})}ExpandAll(){this.GetAllNodes().forEach(function(a){a.Expand()})}CheckAll(a){this.Options.ShowCheckbox&&this.GetAllNodes().forEach(function(b){b.Check(a)})}Find(a){if(null==
+this.Container)console.log("BBTreeview container not found");else return a=this.Container.querySelectorAll("li[data-bbtv-id='"+a+"']"),0>=a.length?null:new BBTreeviewNode(this,a[0])}FindByName(a){let b=[];this.GetAllNodes().forEach(function(c){c.Name==a&&b.push(c)});return b}FindByValue(a){let b=[];this.GetAllNodes().forEach(function(c){c.Value==a&&b.push(c)});return b}GetAllNodes(){const a=this,b=a.Container.querySelectorAll("li");if(0>=b.length)return[];let c=[];b.forEach(function(d){d=d.getAttribute("data-bbtv-id");
+a.isNullOrWhitespace(d)||(d=a.Find(d),null!=d&&c.push(d))});return c}GetCheckedNodes(){let a=[];this.GetAllNodes().forEach(function(b){b.IsChecked&&a.push(b)});return a}GetCheckedValues(){let a=[];this.GetCheckedNodes().map(function(b){a.push(b.Value)});return a}GetCheckedTags(){let a=[];this.GetCheckedNodes().map(function(b){a.push(b.Tag)});return a}GetSelectedNode(){let a=null;this.GetAllNodes().forEach(function(b){if(b.IsHighlighted)return a=b,!1});return a}appendHtml(a,b){let c=document.createElement("template");
+c.innerHTML=b;c=c.content.firstChild;a.appendChild(c)}createTreeview(){let a=this.getContainer();null!=a&&(a.innerHTML='<ul class="bbtreeview"></ul>')}generateID(){return"treeviewItem"+(Math.floor(1000001*Math.random())+100).toString()}generateNodeHtml(a){var b="";this.isNullOrWhitespace(a.Tag)||(b=encodeURIComponent(JSON.stringify(a.Tag)));b='<li data-bbtv-id="'+a.ID+'" data-bbtv-value="'+a.Value+'" data-bbtv-tag="'+b+'">';b+='<div class="li">';this.Options.ShowCheckbox&&(b+='<div class="icon checkbox"></div>');
+this.Options.ShowIcon?(b+='<div class="icon '+a.Icon+'"></div>',b+='<span title="'+a.Hint+'">'+a.Name+"</span>"):b+='<span class="noicon" title="'+a.Hint+'">'+a.Name+"</span>";return b+"</div><ul></ul></li>"}getContainer(){let a=document.getElementsByTagName("body");if(!(0>=a.length||(a=a[0],a=a.querySelectorAll(this.Options.ID),0>=a.length)))return a=a[0]}getNode(a){a=(this.isTag(a,"li")?a:this.parentsUntilTagName(a,"li")).getAttribute("data-bbtv-id");return this.isNullOrWhitespace(a)?null:this.Find(a)}getTreeview(){let a=
+this.getContainer();if(null!=a&&(a=a.querySelectorAll("ul.bbtreeview"),!(0>=a.length)))return a=a[0]}isNullOrWhitespace(a){return"undefined"==typeof a||null==a?!0:0>=a.toString().trim().length}isTag(a,b){return a.tagName.toLowerCase()==b}parentsUntilTagName(a,b){for(;"undefined"!=typeof a.parentNode;){a=a.parentNode;if("undefined"==typeof a)break;if(this.isTag(a,"ul")&&a.classList.contains("bbtreeview"))return null;if(this.isTag(a,b))break}return a}};class BBTreeviewNode{constructor(a,b){this.Treeview=a;this.Node=b}get Checkbox(){if(!this.Treeview.Options.ShowCheckbox)return null;const a=this.Node.querySelectorAll("div.icon.checkbox");return"undefined"==typeof a?null:a[0]}get ChildNode(){let a=this.Node.querySelectorAll("ul");return 0>=a.length?null:a[0]}get ChildNodes(){const a=this.ChildNode;if(null==a)return[];let b=a.querySelectorAll("li");if(0>=b.length)return[];let c=[];b.forEach(function(d){"undefined"!=typeof d.parentNode&&d.parentNode==
+a&&c.push(d)});return c}get IsChecked(){return this.Treeview.Options.ShowCheckbox?this.Node.classList.contains("x"):!1}get Container(){return this.Node.querySelectorAll("div.li")[0]}get Hint(){return this.Label.getAttribute("title")}get ID(){return this.Node.getAttribute("data-bbtv-id")}get IsExpanded(){return this.Node.classList.contains("e")?!0:this.Node.classList.contains("c")?!1:null}get IsHighlighted(){return this.Container.classList.contains("highlighted")}get Label(){return this.Node.querySelectorAll("span")[0]}get Name(){return this.Label.textContent}get ParentID(){const a=
+this.ParentNode;return null==a?null:a.getAttribute("data-bbtv-id")}get ParentNode(){return this.parentsUntilTagName(this.Node,"li")}get Tag(){let a=this.Node.getAttribute("data-bbtv-tag");return this.Treeview.isNullOrWhitespace(a)?null:JSON.parse(decodeURIComponent(a))}get Value(){return this.Node.getAttribute("data-bbtv-value")}Check(a){const b=this;b.setCheckbox(b.Node,a);b.Node.querySelectorAll("li").forEach(function(d){b.setCheckbox(d,a)});let c=b.ParentNode;if(null!=c)if(b.Treeview.Options.EnablePullUp)for(;;){const d=
+0<c.querySelectorAll("li.x").length;b.setCheckbox(c,d);c=b.Treeview.getNode(c);c=c.ParentNode;if(null==c)break}else{let d=0;c.querySelectorAll("li").forEach(function(e){e.classList.contains("x")||d++});b.setCheckbox(c,0>=d)}}Collapse(){this.Node.classList.contains("e")&&(this.Node.classList.remove("e"),this.Node.classList.add("c"));this.ChildNodes.forEach(function(a){a.classList.add("hidden")})}Expand(){this.Node.classList.contains("c")&&(this.Node.classList.remove("c"),this.Node.classList.add("e"));
+this.ChildNodes.forEach(function(a){a.classList.remove("hidden")})}Remove(){null!=this.ParentNode&&(this.ParentNode.classList.contains("e")&&this.ParentNode.classList.remove("e"),this.ParentNode.classList.contains("c")&&this.ParentNode.classList.remove("c"));this.Node.parentNode.removeChild(this.Node)}InvalidateEvents(){const a=this;a.Node.addEventListener("click",function(b){b.stopPropagation();b.preventDefault();!a.isTag(b.target,"li")||0>b.offsetX||16<b.offsetX||0>b.offsetY||16<b.offsetY||(b=a.Treeview.getNode(b.target),
+null!=b&&b.Toggle())});a.Container.addEventListener("dblclick",function(b){b.stopPropagation();b.preventDefault();b=a.Treeview.getNode(b.target);null!=b&&b.Toggle()});a.Treeview.Options.ShowCheckbox&&(a.Checkbox.addEventListener("mousedown",function(b){b.stopPropagation();b.preventDefault();a.Check(!a.IsChecked)}),a.Checkbox.addEventListener("click",function(b){b.stopPropagation();b.preventDefault()}),a.Checkbox.addEventListener("dblclick",function(b){b.stopPropagation();b.preventDefault()}));a.Container.addEventListener("mousedown",
+function(b){b.stopPropagation();b.preventDefault();b=a.Treeview.getNode(b.target);null!=b&&(a.Treeview.Container.querySelectorAll("div.highlighted").forEach(function(c){c.classList.remove("highlighted")}),a.Treeview.Options.ShowSelection&&b.Container.classList.add("highlighted"))});a.invalidateCollapsible()}Toggle(){switch(this.IsExpanded){case !0:this.Collapse();break;case !1:this.Expand()}}invalidateCollapsible(){null!=this.ParentNode&&(this.ParentNode.classList.contains("c")?this.Node.classList.add("hidden"):
+(this.ParentNode.classList.contains("e")||this.ParentNode.classList.add("e"),this.Node.classList.remove("hidden")))}isTag(a,b){return a.tagName.toLowerCase()==b}parentsUntilTagName(a,b){for(;"undefined"!=typeof a.parentNode;){a=a.parentNode;if("undefined"==typeof a)break;if(this.isTag(a,"ul")&&a.classList.contains("bbtreeview"))return null;if(this.isTag(a,b))break}return a}setCheckbox(a,b){b?a.classList.contains("x")||a.classList.add("x"):a.classList.contains("x")&&a.classList.remove("x")}};

demo-test.html

@@ -10,12 +10,11 @@
   <!-- <script src="http://cdn.hiimray.co.uk/8206c600-707c-469e-8d49-a76ae35782af/bootstrap/5.3.0/dist/js/bootstrap.bundle.min.js"></script> -->
   <!-- <link href="http://cdn.hiimray.co.uk/8206c600-707c-469e-8d49-a76ae35782af/bootstrap/5.3.0/dist/css/bootstrap.min.css" rel="stylesheet" /> -->
 
-  <!-- <link href="src/bbtreeview.css" rel="stylesheet" /> -->
+  <!-- <link href="bbtreeview.css" rel="stylesheet" /> -->
-  <!-- <script src="src/bbtreeview.js"></script> -->
+  <link href="build/bbtreeview.min.css" rel="stylesheet" />
-  <!-- <script src="src/bbtreeviewnode.js"></script> -->
+  <!-- <script src="bbtreeview.min.js"></script> -->
-
+  <script src="src/bbtreeview.js"></script>
-  <link href="bbtreeview.min.css" rel="stylesheet" />
+  <script src="src/bbtreeviewnode.js"></script>
-  <script src="bbtreeview.min.js"></script>
 
   <title></title>
 </head>
@@ -31,26 +30,31 @@
   <div class="column">
     <div class="panel">
 
-      <p>Create demo treeview with checkboxes and selection enabled</p>
+      <p>Create demo treeview</p>
-      <button onclick="CreateTreeview()">Create Treeview</button>
+      <p><button onclick="CreateTreeview(1)">Create Treeview (Checkbox and Selection)</button></p>
+      <p><button onclick="CreateTreeview(2)">Create Treeview (Checkbox, Hide Selection, Enable Pull-Ups)</button></p>
+      <p><button onclick="CreateTreeview(3)">Create Treeview (No Checkbox, Selection)</button></p>
+      <p><button onclick="CreateTreeview(4)">Create Treeview (No Checkbox, No Icons, Selection)</button></p>
+
+    </div>
+    <div class="panel">
+
+      <p>Load sample nodes</p>
+      <button onclick="LoadTreeview()">Load Treeview</button>
 
     </div>
     <div class="panel">
 
       <p>Clear treeview</p>
-      <button onclick="ClearTreeview()">Clear Treeview</button>
+      <p>
-
+        <button onclick="ClearTreeview()">Clear Treeview</button>
-    </div>
+        <button onclick="RemoveTreeNode()">Remove Treenode</button>
-    <div class="panel">
+      </p>
-
-      <p>Remove the "Program Files" treenode</p>
-      <button onclick="RemoveTreeNode()">Remove Treenode</button>
 
     </div>
     <div class="panel">
 
       <p>Find a treenode</p>
-      <p>
         <button onclick="FindTreeNode()">Find Treenode By ID</button>
         <button onclick="FindTreeNodesByName()">Find Treenode By Name</button>
         <button onclick="FindTreeNodesByValue()">Find Treenode By Value</button>
@@ -64,6 +68,7 @@
         <button onclick="GetAllTreeNodes()">Get All Treenodes</button>
         <button onclick="GetSelectedTreeNode()">Get Highlighted Treenode</button>
         <button onclick="GetCheckedTreeNodes()">Get Checked Treenodes</button>
+        <button onclick="GetCheckedTags()">Get Checked Treenode Tags</button>
       </p>
       <p>
         <button onclick="GetCheckedValues()">Get Checked Values</button>
@@ -90,11 +95,13 @@
   <style>
 
 body {
-  padding: 20px;
+  padding: 10px;
 }
 
 .column {
-  width: 50%; min-height:400px; float: left
+  float: left;
+  min-height: 400px;
+  width: 50%;
 }
 
 .panel {
@@ -111,16 +118,58 @@ body {
 
   <script>
 
-var treeview1 = new BBTreeview({
+CreateTreeview(1);
-  ID: "#treeview1",
+LoadTreeview();
-  ShowCheckbox: true,
-  ShowSelection: true
-});
 
 
-function CreateTreeview(){
+function CreateTreeview(value){
+  switch (value) {
+    case 1:
+      window.treeview1 = new BBTreeview({
+        ID: "#treeview1",
+        ShowCheckbox: true,
+        ShowSelection: true
+      });
 
-  treeview1.AddItem({
+      break;
+    case 2:
+      window.treeview1 = new BBTreeview({
+        ID: "#treeview1",
+        ShowCheckbox: true,
+        ShowSelection: false,
+        EnablePullUp: true
+      });
+
+      break;
+    case 3:
+      window.treeview1 = new BBTreeview({
+        ID: "#treeview1",
+        ShowCheckbox: false,
+        ShowSelection: true,
+        EnablePullUp: false
+      });
+
+      break;
+    case 4:
+      window.treeview1 = new BBTreeview({
+        ID: "#treeview1",
+        ShowCheckbox: false,
+        ShowSelection: true,
+        EnablePullUp: false,
+        ShowIcon: false
+      });
+
+      break;
+    default:
+      break;
+  }
+
+  LoadTreeview();
+}
+
+function LoadTreeview(){
+
+  window.treeview1.AddItem({
     ID: "root",
     Name: "C:\\"
   });
@@ -135,7 +184,7 @@ function CreateTreeview(){
   ];
 
   for (let i=0; i<folders1.length; i++) {
-      treeview1.AddItem({
+    window.treeview1.AddItem({
       ID: "0_" + i,
       ParentID: "root",
       Name: folders1[i],
@@ -152,7 +201,7 @@ function CreateTreeview(){
   ];
 
   for (let i=0; i<folders12.length; i++) {
-      treeview1.AddItem({
+    window.treeview1.AddItem({
       ID: "0_2_" + i,
       ParentID: "0_2",
       Name: folders12[i],
@@ -166,7 +215,7 @@ function CreateTreeview(){
   ];
 
   for (let i=0; i<folders13.length; i++) {
-      treeview1.AddItem({
+    window.treeview1.AddItem({
       ID: "0_3_" + i,
       ParentID: "0_3",
       Name: folders13[i],
@@ -181,7 +230,7 @@ function CreateTreeview(){
   ];
 
   for (let i=0; i<folders15.length; i++) {
-      treeview1.AddItem({
+    window.treeview1.AddItem({
       ID: "0_5_" + i,
       ParentID: "0_5",
       Name: folders15[i],
@@ -189,7 +238,7 @@ function CreateTreeview(){
     });
   }
 
-  treeview1.AddItem({
+  window.treeview1.AddItem({
     ID: "0_2_3_0",
     ParentID: "0_2_3",
     Name: "en-GB",
@@ -199,15 +248,15 @@ function CreateTreeview(){
 }
 
 function ClearTreeview() {
-  treeview1.Clear();
+  window.treeview1.Clear();
 }
 
 function RemoveTreeNode() {
-  treeview1.Remove("0_2");
+  window.treeview1.Remove("0_2");
 }
 
 function FindTreeNode() {
-  let treenode = treeview1.Find("0_5");
+  let treenode = window.treeview1.Find("0_5");
 
   console.log(treenode);
 
@@ -215,7 +264,7 @@ function FindTreeNode() {
 }
 
 function FindTreeNodesByName() {
-  let treenodes = treeview1.FindByName("Common Files");
+  let treenodes = window.treeview1.FindByName("Common Files");
 
   console.log(treenodes);
 
@@ -223,7 +272,7 @@ function FindTreeNodesByName() {
 }
 
 function FindTreeNodesByValue() {
-  let treenodes = treeview1.FindByValue("Internet Explorer");
+  let treenodes = window.treeview1.FindByValue("Internet Explorer");
 
   console.log(treenodes);
 
@@ -231,7 +280,7 @@ function FindTreeNodesByValue() {
 }
 
 function GetSelectedTreeNode() {
-  let treenode = treeview1.GetSelectedNode();
+  let treenode = window.treeview1.GetSelectedNode();
 
   console.log(treenode);
 
@@ -239,7 +288,15 @@ function GetSelectedTreeNode() {
 }
 
 function GetCheckedTreeNodes() {
-  let treenodes = treeview1.GetCheckedNodes();
+  let treenodes = window.treeview1.GetCheckedNodes();
+
+  console.log(treenodes);
+
+  alert(JSON.stringify(treenodes));
+}
+
+function GetCheckedTags() {
+  let treenodes = window.treeview1.GetCheckedTags();
 
   console.log(treenodes);
 
@@ -247,7 +304,7 @@ function GetCheckedTreeNodes() {
 }
 
 function GetAllTreeNodes() {
-  let treenodes = treeview1.GetAllNodes();
+  let treenodes = window.treeview1.GetAllNodes();
 
   console.log(treenodes);
 
@@ -255,7 +312,7 @@ function GetAllTreeNodes() {
 }
 
 function GetCheckedValues() {
-  let treenodes = treeview1.GetCheckedValues();
+  let treenodes = window.treeview1.GetCheckedValues();
 
   console.log(treenodes);
 
@@ -263,19 +320,19 @@ function GetCheckedValues() {
 }
 
 function CollapseAll() {
-  treeview1.CollapseAll();
+  window.treeview1.CollapseAll();
 }
 
 function ExpandAll() {
-  treeview1.ExpandAll();
+  window.treeview1.ExpandAll();
 }
 
 function CheckAll() {
-  treeview1.CheckAll(true);
+  window.treeview1.CheckAll(true);
 }
 
 function UncheckAll() {
-  treeview1.CheckAll(false);
+  window.treeview1.CheckAll(false);
 }
 
 

src/bbtreeview.css

@@ -69,4 +69,8 @@ ul.bbtreeview div.li > span {
   text-overflow: ellipsis;
   vertical-align: top;
   white-space: nowrap;
+}
+
+ul.bbtreeview div.li > span.noicon {
+  padding-left: 0px !important;
 }

src/bbtreeview.js

@@ -1,72 +1,36 @@
-/**
+class BBTreeview {
- * BBTreeview
+  constructor(options) {
- * @version v0.1.0.223 (2023/09/08 2027)
+    this.Options = {};
- */
-function BBTreeview(options)
-{
-  const a = this;
 
-  a.initialise(options);
+    this.initialiseComponents(options);
-};
-
-BBTreeview.prototype.AddItem = function(options) {
-  const a = this;
-  const _options = a.getOptions(options);
-
-  // Don't add duplicate
-  if (a.Find(_options.ID) != null) {
-    return false;
   }
 
-  // Check parent exists
+  initialiseComponents(options) {
-  let parentNode = null;
+    var a = this;
-  if (_options.ParentID != null) {
-    parentNode = a.Find(_options.ParentID);
-    if (parentNode == null) {
-      return false;
-    }
-  }
 
-  if (parentNode == null) {
+    a.Options = Object.assign({
-    parentNode = a.Container;
-  } else {
-    parentNode = parentNode.GetChildNode();
-  }
-
-  const nodeHtml = a.generateNodeHtml(_options);
-
-  // Add node
-  a.appendHtml(parentNode, nodeHtml);
-
-  const node = a.Find(_options.ID);
-
-  // Setup events
-  node.SetupEvents();
-
-  return true;
-};
-
-BBTreeview.prototype.Remove = function(id) {
-  const a = this;
-
-  const node = a.Find(id);
-  if (node == null) {
-    return false;
-  }
-
-  node.Remove();
-
-  return true;
-};
-
-BBTreeview.prototype.Default = function() {
-  return {
-    TreeviewOptions: {
       ID: null,
       ShowCheckbox: false,
-      ShowSelection: true
+      ShowSelection: true,
-    },
+      EnablePullUp: false,
-    TreeNodeOptions: {
+      ShowIcon: true
+    }, options);
+
+    // Replace treeview
+    a.createTreeview();
+
+    // a.Container = a.getTreeview();
+  }
+
+
+  get Container() {
+    return this.getTreeview();
+  }
+
+
+  AddItem(options) {
+    const a = this;
+    const _options = Object.assign({
       ID: null,
       ParentID: null,
       Name: "",
@@ -75,294 +39,374 @@ BBTreeview.prototype.Default = function() {
       Icon: "folder",
       Checked: false,
       Tag: null
-    }
+    }, options);
-  };
-};
 
-BBTreeview.prototype.Clear = function() {
+    if (_options.ID == null) _options.ID = a.generateID();
-  const a = this;
+    if (_options.Tag == null) _options.Tag = "";
-
-  a.initialise(a.Options);
-};
-
-BBTreeview.prototype.CollapseAll = function() {
-  const a = this;
-
-  a.GetAllNodes().forEach(function(e) {
-    e.Collapse();
-  });
-};
-
-BBTreeview.prototype.ExpandAll = function() {
-  const a = this;
-
-  a.GetAllNodes().forEach(function(e) {
-    e.Expand();
-  });
-};
-
-BBTreeview.prototype.CheckAll = function(value) {
-  const a = this;
-
-  if (!a.Options.ShowCheckbox) {
-    return;
-  }
-
-  a.GetAllNodes().forEach(function(e) {
-    e.Check(value);
-  });
-};
-
-BBTreeview.prototype.Find = function(id) {
-  const a = this;
-
-  const node = a.Container.querySelectorAll("li[data-bbtv-id='" + id + "']");
-  if (node.length <= 0) {
-    return null;
-  }
-
-  let treenode = new BBTreeviewNode(this);
-  treenode.Load(node[0]);
-
-  // console.log(treenode);
-
-  return treenode;
-};
-
-BBTreeview.prototype.FindByName = function(value) {
-  const a = this;
-
-  let response = [];
-  a.GetAllNodes().forEach(function(e) {
-    if (e.Name != value) {
-      return;
-    }
-
-    response.push(e);
-  });
-
-  return response;
-};
-
-BBTreeview.prototype.FindByValue = function(value) {
-  const a = this;
-
-  let response = [];
-  a.GetAllNodes().forEach(function(e) {
-    if (e.Value != value) {
-      return;
-    }
-
-    response.push(e);
-  });
-
-  return response;
-};
-
-BBTreeview.prototype.GetAllNodes = function() {
-  const a = this;
-
-  const node = a.Container.querySelectorAll("li");
-  if (node.length <= 0) {
-    return [];
-  }
-
-  let response = [];
-  node.forEach(function(e) {
-    const id = e.getAttribute("data-bbtv-id");
-    if (a.isNullOrWhitespace(id)) {
-      return;
-    }
-
-    const myNode = a.Find(id);
-    if (myNode == null) {
-      return;
-    }
-
-    response.push(myNode);
-  });
-
-  return response;
-};
-
-BBTreeview.prototype.GetCheckedNodes = function() {
-  const a = this;
-
-  let response = [];
-  a.GetAllNodes().forEach(function(e) {
-    if (!e.Checked) {
-      return;
-    }
-
-    response.push(e);
-  });
-
-  return response;
-};
-
-BBTreeview.prototype.GetCheckedValues = function() {
-  const a = this;
-
-  let response = [];
-  a.GetCheckedNodes().map(function(e) {
-    response.push(e.Value);
-  });
-
-  return response;
-};
-
-BBTreeview.prototype.GetSelectedNode = function() {
-  const a = this;
-
-  let response = null;
-  a.GetAllNodes().forEach(function(e) {
-    if (e.Highlighted) {
-      response = e;
 
+    // Don't add duplicate
+    if (a.Find(_options.ID) != null) {
       return false;
     }
-  });
 
-  return response;
+    // Check parent exists
-};
+    let parentNode = null;
-
+    if (_options.ParentID != null) {
-BBTreeview.prototype.initialise = function(options) {
+      parentNode = a.Find(_options.ParentID);
-  var a = this;
+      if (parentNode == null) {
-
+        return false;
-  a.Options = Object.assign(a.Default().TreeviewOptions, options);
-
-  a.Container = null;
-
-  let treeview = document.getElementsByTagName("body")[0].querySelectorAll(a.Options.ID);
-  if (treeview.length <= 0) {
-    return;
-  }
-
-  if (treeview[0] == null) {
-    return;
-  }
-
-  a.Container = treeview[0];
-
-  a.Container.innerHTML = "<ul class=\"bbtreeview\"></ul>";
-
-  a.Container = a.Container.querySelectorAll("ul.bbtreeview")[0];
-};
-
-BBTreeview.prototype.appendHtml = function(el, html) {
-  let node = document.createElement('template');
-  node.innerHTML = html;
-
-  node = node.content.firstChild;
-
-  el.appendChild(node);
-};
-
-BBTreeview.prototype.generateID = function() {
-  return "treeviewItem" + (Math.floor(Math.random() * 1000001) + 100).toString();
-};
-
-BBTreeview.prototype.generateNodeHtml = function(options) {
-  const a = this;
-
-  let tag = "";
-  if (!a.isNullOrWhitespace(options.Tag)) {
-    tag = encodeURIComponent(JSON.stringify(options.Tag));
-  }
-
-  let html = '<li data-bbtv-id="' + options.ID + '" data-bbtv-value="' + options.Value + '" data-bbtv-tag="' + tag + '">';
-  html += '<div class="li">'
-
-  if (a.Options.ShowCheckbox) {
-    html += '<div class="icon checkbox"></div>';
-  }
-
-  html += '<div class="icon ' + options.Icon + '"></div>';
-  html += '<span title="' + options.Hint + '">' + options.Name + '</span>';
-  html += '</div>';
-  html += '<ul></ul>';
-  html += '</li>';
-
-  return html;
-};
-
-BBTreeview.prototype.getNode = function(el) {
-  const a = this;
-
-  let node = null;
-  if (a.isTag(el, "li")) {
-    node = el;
-  } else {
-    node = a.parentsUntilTagName(el, "li");
-  }
-
-  const id = node.getAttribute("data-bbtv-id");
-
-  if (a.isNullOrWhitespace(id)) {
-    return null;
-  }
-
-  return a.Find(id);
-};
-
-BBTreeview.prototype.getOptions = function(options) {
-  const a = this;
-
-  let _options = Object.assign(a.Default().TreeNodeOptions, options);
-
-  if (_options.ID == null) {
-    _options.ID = a.generateID();
-  }
-
-  if (_options.Tag == null) {
-    _options.Tag = "";
-  }
-
-  return _options;
-};
-
-BBTreeview.prototype.isNullOrWhitespace = function(value) {
-  if (typeof (value) == "undefined") {
-    return true;
-  }
-
-  if (value == null) {
-    return true;
-  }
-
-  return (value.toString().trim().length <= 0);
-};
-
-BBTreeview.prototype.isTag = function(el, tagName) {
-  return (el.tagName.toLowerCase() == tagName);
-};
-
-BBTreeview.prototype.parentsUntilTagName = function(el, tagName) {
-  const a = this;
-
-  let node = el;
-
-  while (true) {
-    if (typeof(node.parentNode) == "undefined") {
-      break;
-    }
-
-    node = node.parentNode;
-
-    if (typeof(node) == "undefined") {
-      break;
-    }
-
-    if (a.isTag(node, "ul")) {
-      if (node.classList.contains("bbtreeview")) {
-        return null;
       }
     }
 
-    if (a.isTag(node, tagName)) {
+    if (parentNode == null) {
-      break;
+      parentNode = a.Container;
+    } else {
+      parentNode = parentNode.ChildNode;
+    }
+
+    const nodeHtml = a.generateNodeHtml(_options);
+
+    // Add node
+    a.appendHtml(parentNode, nodeHtml);
+
+    const node = a.Find(_options.ID);
+
+    // Setup events
+    node.InvalidateEvents();
+
+    return true;
+  }
+
+  Remove(id) {
+    const a = this;
+
+    const node = a.Find(id);
+    if (node == null) {
+      return false;
+    }
+
+    node.Remove();
+
+    return true;
+  }
+
+  Clear() {
+    const a = this;
+
+    a.initialiseComponents(a.Options);
+  }
+
+  CollapseAll() {
+    const a = this;
+
+    a.GetAllNodes().forEach(function(e) {
+      e.Collapse();
+    });
+  }
+
+  ExpandAll() {
+    const a = this;
+
+    a.GetAllNodes().forEach(function(e) {
+      e.Expand();
+    });
+  }
+
+  CheckAll(value) {
+    const a = this;
+
+    if (!a.Options.ShowCheckbox) {
+      return;
+    }
+
+    a.GetAllNodes().forEach(function(e) {
+      e.Check(value);
+    });
+  }
+
+  Find(id) {
+    const a = this;
+
+    if (a.Container == null){
+      console.log("BBTreeview container not found");
+      return;
+    }
+
+    const node = a.Container.querySelectorAll("li[data-bbtv-id='" + id + "']");
+    if (node.length <= 0) {
+      return null;
+    }
+
+    const treenode = new BBTreeviewNode(this, node[0]);
+
+    return treenode;
+  }
+
+  FindByName(value) {
+    const a = this;
+
+    let response = [];
+    a.GetAllNodes().forEach(function(e) {
+      if (e.Name != value) {
+        return;
+      }
+
+      response.push(e);
+    });
+
+    return response;
+  }
+
+  FindByValue(value) {
+    const a = this;
+
+    let response = [];
+    a.GetAllNodes().forEach(function(e) {
+      if (e.Value != value) {
+        return;
+      }
+
+      response.push(e);
+    });
+
+    return response;
+  }
+
+  GetAllNodes() {
+    const a = this;
+
+    const node = a.Container.querySelectorAll("li");
+    if (node.length <= 0) {
+      return [];
+    }
+
+    let response = [];
+    node.forEach(function(e) {
+      const id = e.getAttribute("data-bbtv-id");
+      if (a.isNullOrWhitespace(id)) {
+        return;
+      }
+
+      const myNode = a.Find(id);
+      if (myNode == null) {
+        return;
+      }
+
+      response.push(myNode);
+    });
+
+    return response;
+  }
+
+  GetCheckedNodes() {
+    const a = this;
+
+    let response = [];
+    a.GetAllNodes().forEach(function(e) {
+      if (!e.IsChecked) {
+        return;
+      }
+
+      response.push(e);
+    });
+
+    return response;
+  }
+
+  GetCheckedValues() {
+    const a = this;
+
+    let response = [];
+    a.GetCheckedNodes().map(function(e) {
+      response.push(e.Value);
+    });
+
+    return response;
+  }
+
+  GetCheckedTags() {
+    const a = this;
+
+    let response = [];
+    a.GetCheckedNodes().map(function(e) {
+      response.push(e.Tag);
+    });
+
+    return response;
+  }
+
+  GetSelectedNode() {
+    const a = this;
+
+    let response = null;
+    a.GetAllNodes().forEach(function(e) {
+      if (e.IsHighlighted) {
+        response = e;
+
+        return false;
+      }
+    });
+
+    return response;
+  }
+
+
+  appendHtml(el, html) {
+    let node = document.createElement('template');
+    node.innerHTML = html;
+
+    node = node.content.firstChild;
+
+    el.appendChild(node);
+  }
+
+  createTreeview() {
+    const a = this;
+
+    let container = a.getContainer();
+    if (container != null) {
+      container.innerHTML = "<ul class=\"bbtreeview\"></ul>";
     }
   }
 
-  return node;
+  generateID() {
-};
+    return "treeviewItem" + (Math.floor(Math.random() * 1000001) + 100).toString();
+  }
+
+  generateNodeHtml(options) {
+    const a = this;
+
+    let tag = "";
+    if (!a.isNullOrWhitespace(options.Tag)) {
+      tag = encodeURIComponent(JSON.stringify(options.Tag));
+    }
+
+    let html = '<li data-bbtv-id="' + options.ID + '" data-bbtv-value="' + options.Value + '" data-bbtv-tag="' + tag + '">';
+    html += '<div class="li">'
+
+    if (a.Options.ShowCheckbox) {
+      html += '<div class="icon checkbox"></div>';
+    }
+
+    if (a.Options.ShowIcon) {
+      html += '<div class="icon ' + options.Icon + '"></div>';
+      html += '<span title="' + options.Hint + '">' + options.Name + '</span>';
+    } else {
+      html += '<span class="noicon" title="' + options.Hint + '">' + options.Name + '</span>';
+    }
+
+    html += '</div>';
+    html += '<ul></ul>';
+    html += '</li>';
+
+    return html;
+  }
+
+  getContainer() {
+    const a = this;
+
+    let result = document.getElementsByTagName("body");
+    if (result.length <= 0) {
+      return;
+    }
+
+    result = result[0];
+
+    result = result.querySelectorAll(a.Options.ID);
+    if (result.length <= 0) {
+      return;
+    }
+
+    result = result[0];
+
+    return result;
+  }
+
+  getNode(el) {
+    const a = this;
+
+    let node = null;
+    if (a.isTag(el, "li")) {
+      node = el;
+    } else {
+      node = a.parentsUntilTagName(el, "li");
+    }
+
+    const id = node.getAttribute("data-bbtv-id");
+
+    if (a.isNullOrWhitespace(id)) {
+      return null;
+    }
+
+    return a.Find(id);
+  }
+
+  getTreeview() {
+    const a = this;
+
+    let container = a.getContainer();
+    if (container == null) {
+      return;
+    }
+
+    // if (container.querySelectorAll("ul.bbtreeview").length <= 0) {
+    //   container.innerHTML = "<ul class=\"bbtreeview\"></ul>";
+    // }
+
+    container = container.querySelectorAll("ul.bbtreeview");
+    if (container.length <= 0) {
+      return;
+    }
+
+    container = container[0];
+
+    return container;
+  }
+
+  isNullOrWhitespace(value) {
+    if (typeof (value) == "undefined") {
+      return true;
+    }
+
+    if (value == null) {
+      return true;
+    }
+
+    return (value.toString().trim().length <= 0);
+  }
+
+  isTag(el, tagName) {
+    return (el.tagName.toLowerCase() == tagName);
+  }
+
+  parentsUntilTagName(el, tagName) {
+    const a = this;
+
+    let node = el;
+
+    while (true) {
+      if (typeof(node.parentNode) == "undefined") {
+        break;
+      }
+
+      node = node.parentNode;
+
+      if (typeof(node) == "undefined") {
+        break;
+      }
+
+      if (a.isTag(node, "ul")) {
+        if (node.classList.contains("bbtreeview")) {
+          return null;
+        }
+      }
+
+      if (a.isTag(node, tagName)) {
+        break;
+      }
+    }
+
+    return node;
+  }
+
+}

src/bbtreeviewnode.js

@@ -1,388 +1,405 @@
-/**
+class BBTreeviewNode {
- * BBTreeview
+  constructor(treeview, node) {
- * @version v0.1.0.223 (2023/09/08 2027)
+    this.Treeview = treeview;
- */
+    this.Node = node;
-function BBTreeviewNode(treeview)
-{
-  const a = this;
 
-  a.Treeview = treeview;
+    // this.initialiseComponents();
+  }
 
-  a.initialise();
+  // initialiseComponents() {
-};
+  //   const a = this;
+
+  // }
 
 
-BBTreeviewNode.prototype.Load = function(node) {
+  get Checkbox() {
-  const a = this;
+    const a = this;
 
-  a.ID = node.getAttribute("data-bbtv-id");
+    if (!a.Treeview.Options.ShowCheckbox) {
-  a.Node = node;
+      return null;
+    }
 
-  a.Container = node.querySelectorAll("div.li")[0];
+    const checkboxes = a.Node.querySelectorAll("div.icon.checkbox");
-  a.Label = node.querySelectorAll("span")[0];
+    if (typeof(checkboxes) == "undefined") {
-  a.Value = node.getAttribute("data-bbtv-value");
+      return null;
+    }
 
-  a.Name = a.Label.textContent;
+    return checkboxes[0];
-  a.Hint = a.Label.getAttribute("title");
+  }
 
-  a.ParentID = a.GetParentID();
+  get ChildNode() {
-  a.Checked = a.IsChecked();
+    const a = this;
-  a.Highlighted = a.IsHighlighted();
-  a.Tag = a.GetTag();
-};
 
+    let result = a.Node.querySelectorAll("ul");
+    if (result.length <= 0) {
+      return null;
+    }
 
-BBTreeviewNode.prototype.Check = function(value) {
+    return result[0];
-  const a = this;
+  }
 
-  a.setCheckbox(a.Node, value);
+  get ChildNodes() {
+    const a = this;
 
-  // Update children
+    const childNode = a.ChildNode;
-  a.Node.querySelectorAll("li").forEach(function(e) {
+    if (childNode == null) {
-    a.setCheckbox(e, value);
+      return [];
-  });
+    }
 
-  // Update parent state
+    let nodes = childNode.querySelectorAll("li");
-  if (a.GetParentNode() != null) {
+    if (nodes.length <= 0) {
-    let uncheckedCount = 0;
+      return [];
-    a.GetParentNode().querySelectorAll("li").forEach(function(e) {
+    }
-      if (e.classList.contains("x")) {
+
+    let result = [];
+    nodes.forEach(function(e) {
+      if (typeof(e.parentNode) == "undefined") {
         return;
       }
 
-      uncheckedCount++;
+      if (e.parentNode != childNode) {
+        return;
+      }
+
+      result.push(e);
     });
 
-    a.setCheckbox(a.GetParentNode(), (uncheckedCount <= 0));
+    return result;
-  }
-};
-
-BBTreeviewNode.prototype.Collapse = function() {
-  const a = this;
-
-  if (a.Node.classList.contains("e")) {
-    a.Node.classList.remove("e");
-    a.Node.classList.add("c");
   }
 
-  a.GetChildNodes().forEach(function(e) {
+  get IsChecked() {
-    e.classList.add("hidden");
+    const a = this;
-  });
-};
 
-BBTreeviewNode.prototype.Expand = function() {
+    if (!a.Treeview.Options.ShowCheckbox) {
-  const a = this;
+      return false;
+    }
 
-  if (a.Node.classList.contains("c")) {
+    return a.Node.classList.contains("x");
-    a.Node.classList.remove("c");
-    a.Node.classList.add("e");
   }
 
-  a.GetChildNodes().forEach(function(e) {
+  get Container() {
-    e.classList.remove("hidden");
+    return this.Node.querySelectorAll("div.li")[0];
-  });
+  }
-};
 
-BBTreeviewNode.prototype.GetCheckbox = function() {
+  get Hint() {
-  const a = this;
+    return this.Label.getAttribute("title");
+  }
+
+  get ID() {
+    return this.Node.getAttribute("data-bbtv-id");
+  }
+
+  get IsExpanded() {
+    const a = this;
+
+    if (a.Node.classList.contains("e")) {
+      return true;
+    }
+
+    if (a.Node.classList.contains("c")) {
+      return false;
+    }
 
-  if (!a.Treeview.Options.ShowCheckbox) {
     return null;
   }
 
-  const checkboxes = a.Node.querySelectorAll("div.icon.checkbox");
+  get IsHighlighted() {
-  if (typeof(checkboxes) == "undefined") {
+    const a = this;
-    return null;
+
+    return a.Container.classList.contains("highlighted");
   }
 
-  return checkboxes[0];
+  get Label() {
-};
+    return this.Node.querySelectorAll("span")[0];
-
-BBTreeviewNode.prototype.GetChildNode = function() {
-  const a = this;
-
-  let result = a.Node.querySelectorAll("ul");
-  if (result.length <= 0) {
-    return null;
   }
 
-  return result[0];
+  get Name() {
-};
+    return this.Label.textContent;
-
-BBTreeviewNode.prototype.GetChildNodes = function() {
-  const a = this;
-
-  const childNode = a.GetChildNode();
-  if (childNode == null) {
-    return [];
   }
 
-  let nodes = childNode.querySelectorAll("li");
+  get ParentID() {
-  if (nodes.length <= 0) {
+    const a = this;
-    return [];
-  }
 
-  let result = [];
+    const parentNode = a.ParentNode;
-  nodes.forEach(function(e) {
+    if (parentNode == null) {
-    if (typeof(e.parentNode) == "undefined") {
+      return null;
-      return;
     }
 
-    if (e.parentNode != childNode) {
+    return parentNode.getAttribute("data-bbtv-id");
-      return;
-    }
-
-    result.push(e);
-  });
-
-  return result;
-};
-
-BBTreeviewNode.prototype.GetTag = function() {
-  const a = this;
-
-  let tag = a.Node.getAttribute("data-bbtv-tag");
-  if (a.Treeview.isNullOrWhitespace(tag)) {
-    return null;
   }
 
-  return JSON.parse(decodeURIComponent(tag));
+  get ParentNode() {
-};
+    const a = this;
-BBTreeviewNode.prototype.GetParentID = function() {
-  const a = this;
 
-  const parentNode = a.GetParentNode();
+    return a.parentsUntilTagName(a.Node, "li");
-  if (parentNode == null) {
-    return null;
   }
 
-  return parentNode.getAttribute("data-bbtv-id");
+  get Tag() {
-};
+    const a = this;
 
-BBTreeviewNode.prototype.GetParentNode = function() {
+    let tag = a.Node.getAttribute("data-bbtv-tag");
-  const a = this;
+    if (a.Treeview.isNullOrWhitespace(tag)) {
+      return null;
+    }
 
-  return a.parentsUntilTagName(a.Node, "li");
+    return JSON.parse(decodeURIComponent(tag));
-};
-
-BBTreeviewNode.prototype.IsChecked = function() {
-  const a = this;
-
-  if (!a.Treeview.Options.ShowCheckbox) {
-    return false;
   }
 
-  return a.Node.classList.contains("x");
+  get Value() {
-};
+    return this.Node.getAttribute("data-bbtv-value");
-
-BBTreeviewNode.prototype.IsExpanded = function() {
-  const a = this;
-
-  if (a.Node.classList.contains("e")) {
-    return true;
   }
 
-  if (a.Node.classList.contains("c")) {
-    return false;
-  }
 
-  return null;
+  Check(value) {
-};
+    const a = this;
 
-BBTreeviewNode.prototype.IsHighlighted = function() {
+    a.setCheckbox(a.Node, value);
-  const a = this;
 
-  return (a.Container.classList.contains("highlighted"));
+    // Update children
-};
+    a.Node.querySelectorAll("li").forEach(function(e) {
-
+      a.setCheckbox(e, value);
-BBTreeviewNode.prototype.Remove = function() {
-  const a = this;
-
-  if (a.GetParentNode() != null) {
-    if (a.GetParentNode().classList.contains("e")) {
-      a.GetParentNode().classList.remove("e");
-    }
-
-    if (a.GetParentNode().classList.contains("c")) {
-      a.GetParentNode().classList.remove("c");
-    }
-  }
-
-  a.Node.parentNode.removeChild(a.Node);
-};
-
-BBTreeviewNode.prototype.SetupEvents = function() {
-  const a = this;
-
-  // collapsible icon behaviour
-  a.Node.addEventListener("click", function(e){
-    e.stopPropagation();
-    e.preventDefault();
-
-    if (!a.isTag(e.target, "li")) {
-      return;
-    }
-
-    if ((e.offsetX < 0) || (e.offsetX > 16) || (e.offsetY < 0) || (e.offsetY > 16)) {
-      return;
-    }
-
-    const myNode = a.Treeview.getNode(e.target);
-    if (myNode == null) {
-      return;
-    }
-
-    myNode.Toggle();
-  });
-
-  // collapsible label behaviour
-  a.Container.addEventListener("dblclick", function(e){
-    e.stopPropagation();
-    e.preventDefault();
-
-    const myNode = a.Treeview.getNode(e.target);
-    if (myNode == null) {
-      return;
-    }
-
-    myNode.Toggle();
-  });
-
-  // checkbox behaviour
-  if (a.Treeview.Options.ShowCheckbox) {
-    a.GetCheckbox().addEventListener("mousedown", function(e){
-      e.stopPropagation();
-      e.preventDefault();
-
-      a.Check(!a.IsChecked());
     });
 
-    a.GetCheckbox().addEventListener("click", function(e){
+    // Update parent state
-      e.stopPropagation();
+    let parentNode = a.ParentNode;
-      e.preventDefault();
+    if (parentNode == null) {
+      return;
+    }
 
-      // do nothing
+    // Handle pull-ups
-    });
+    if (a.Treeview.Options.EnablePullUp) {
+      while (true) {
+        const parentChecked = (parentNode.querySelectorAll("li.x").length > 0);
 
-    a.GetCheckbox().addEventListener("dblclick", function(e){
+        a.setCheckbox(parentNode, parentChecked);
-      e.stopPropagation();
-      e.preventDefault();
 
-      // do nothing
+        parentNode = a.Treeview.getNode(parentNode);
+        parentNode = parentNode.ParentNode;
+
+        if (parentNode == null) {
+          break;
+        }
+      }
+    } else {
+      let uncheckedCount = 0;
+
+      parentNode.querySelectorAll("li").forEach(function(e) {
+        if (e.classList.contains("x")) {
+          return;
+        }
+
+        uncheckedCount++;
+      });
+
+      a.setCheckbox(parentNode, (uncheckedCount <= 0));
+    }
+  }
+
+  Collapse() {
+    const a = this;
+
+    if (a.Node.classList.contains("e")) {
+      a.Node.classList.remove("e");
+      a.Node.classList.add("c");
+    }
+
+    a.ChildNodes.forEach(function(e) {
+      e.classList.add("hidden");
     });
   }
 
-  // highlighting
+  Expand() {
-  a.Container.addEventListener("mousedown", function(e){
+    const a = this;
-    e.stopPropagation();
-    e.preventDefault();
 
-    const myNode = a.Treeview.getNode(e.target);
+    if (a.Node.classList.contains("c")) {
-    if (myNode == null) {
+      a.Node.classList.remove("c");
-      return;
+      a.Node.classList.add("e");
     }
 
-    a.Treeview.Container.querySelectorAll("div.highlighted").forEach(function(e) {
+    a.ChildNodes.forEach(function(e) {
-      e.classList.remove("highlighted");
+      e.classList.remove("hidden");
     });
-
-    // Don't show selection
-    if (!a.Treeview.Options.ShowSelection) {
-      return;
-    }
-
-    myNode.Container.classList.add("highlighted");
-  });
-
-  a.invalidateCollapsible();
-};
-
-BBTreeviewNode.prototype.Toggle = function() {
-  const a = this;
-
-  switch (a.IsExpanded()) {
-    case true:
-      a.Collapse();
-      break;
-    case false:
-      a.Expand();
-      break;
-    default: break;
-  }
-};
-
-BBTreeviewNode.prototype.initialise = function() {
-  const a = this;
-
-//   a.ID = null;
-//   a.ParentID = null;
-//   a.Name = "";
-//   a.Hint = "";
-//   a.Value = "";
-//   a.Icon = "folder";
-//   a.Checked = false;
-};
-
-BBTreeviewNode.prototype.invalidateCollapsible = function() {
-  const a = this;
-
-  // Invalidate state
-  if (a.GetParentNode() == null) {
-    return;
   }
 
-  if (a.GetParentNode().classList.contains("c")) {
+  Remove() {
-    a.Node.classList.add("hidden");
+    const a = this;
-  } else if (a.GetParentNode().classList.contains("e")) {
-    a.Node.classList.remove("hidden");
-  } else {
-    a.GetParentNode().classList.add("e");
-    a.Node.classList.remove("hidden");
-  }
-};
 
-BBTreeviewNode.prototype.isTag = function(el, tagName) {
+    if (a.ParentNode != null) {
-  return (el.tagName.toLowerCase() == tagName);
+      if (a.ParentNode.classList.contains("e")) {
-};
+        a.ParentNode.classList.remove("e");
+      }
 
-BBTreeviewNode.prototype.parentsUntilTagName = function(el, tagName) {
+      if (a.ParentNode.classList.contains("c")) {
-  const a = this;
+        a.ParentNode.classList.remove("c");
-
-  let node = el;
-
-  while (true) {
-    if (typeof(node.parentNode) == "undefined") {
-      break;
-    }
-
-    node = node.parentNode;
-
-    if (typeof(node) == "undefined") {
-      break;
-    }
-
-    if (a.isTag(node, "ul")) {
-      if (node.classList.contains("bbtreeview")) {
-        return null;
       }
     }
 
-    if (a.isTag(node, tagName)) {
+    a.Node.parentNode.removeChild(a.Node);
-      break;
+  }
+
+  InvalidateEvents() {
+    const a = this;
+
+    // collapsible icon behaviour
+    a.Node.addEventListener("click", function(e){
+      e.stopPropagation();
+      e.preventDefault();
+
+      if (!a.isTag(e.target, "li")) {
+        return;
+      }
+
+      if ((e.offsetX < 0) || (e.offsetX > 16) || (e.offsetY < 0) || (e.offsetY > 16)) {
+        return;
+      }
+
+      const myNode = a.Treeview.getNode(e.target);
+      if (myNode == null) {
+        return;
+      }
+
+      myNode.Toggle();
+    });
+
+    // collapsible label behaviour
+    a.Container.addEventListener("dblclick", function(e){
+      e.stopPropagation();
+      e.preventDefault();
+
+      const myNode = a.Treeview.getNode(e.target);
+      if (myNode == null) {
+        return;
+      }
+
+      myNode.Toggle();
+    });
+
+    // checkbox behaviour
+    if (a.Treeview.Options.ShowCheckbox) {
+      a.Checkbox.addEventListener("mousedown", function(e){
+        e.stopPropagation();
+        e.preventDefault();
+
+        a.Check(!a.IsChecked);
+      });
+
+      a.Checkbox.addEventListener("click", function(e){
+        e.stopPropagation();
+        e.preventDefault();
+
+        // do nothing
+      });
+
+      a.Checkbox.addEventListener("dblclick", function(e){
+        e.stopPropagation();
+        e.preventDefault();
+
+        // do nothing
+      });
+    }
+
+    // highlighting
+    a.Container.addEventListener("mousedown", function(e){
+      e.stopPropagation();
+      e.preventDefault();
+
+      const myNode = a.Treeview.getNode(e.target);
+      if (myNode == null) {
+        return;
+      }
+
+      a.Treeview.Container.querySelectorAll("div.highlighted").forEach(function(e) {
+        e.classList.remove("highlighted");
+      });
+
+      // Don't show selection
+      if (!a.Treeview.Options.ShowSelection) {
+        return;
+      }
+
+      myNode.Container.classList.add("highlighted");
+    });
+
+    a.invalidateCollapsible();
+  }
+
+  Toggle() {
+    const a = this;
+
+    switch (a.IsExpanded) {
+      case true:
+        a.Collapse();
+        break;
+      case false:
+        a.Expand();
+        break;
+      default: break;
     }
   }
 
-  return node;
-};
 
-BBTreeviewNode.prototype.setCheckbox = function(el, value) {
+  invalidateCollapsible() {
-  if (value) {
+    const a = this;
-    if (!el.classList.contains("x")) {
+
-      el.classList.add("x");
+    // Invalidate state
+    if (a.ParentNode == null) {
+      return;
     }
-  } else {
+
-    if (el.classList.contains("x")) {
+    if (a.ParentNode.classList.contains("c")) {
-      el.classList.remove("x");
+      a.Node.classList.add("hidden");
+    } else if (a.ParentNode.classList.contains("e")) {
+      a.Node.classList.remove("hidden");
+    } else {
+      a.ParentNode.classList.add("e");
+      a.Node.classList.remove("hidden");
     }
   }
-};
+
+  isTag(el, tagName) {
+    return (el.tagName.toLowerCase() == tagName);
+  }
+
+  parentsUntilTagName(el, tagName) {
+    const a = this;
+
+    let node = el;
+
+    while (true) {
+      if (typeof(node.parentNode) == "undefined") {
+        break;
+      }
+
+      node = node.parentNode;
+
+      if (typeof(node) == "undefined") {
+        break;
+      }
+
+      if (a.isTag(node, "ul")) {
+        if (node.classList.contains("bbtreeview")) {
+          return null;
+        }
+      }
+
+      if (a.isTag(node, tagName)) {
+        break;
+      }
+    }
+
+    return node;
+  }
+
+  setCheckbox(el, value) {
+    if (value) {
+      if (!el.classList.contains("x")) {
+        el.classList.add("x");
+      }
+    } else {
+      if (el.classList.contains("x")) {
+        el.classList.remove("x");
+      }
+    }
+  }
+
+}

src/version.txt

@@ -0,0 +1,4 @@
+/**
+ * BBTreeview
+ * @version v0.1.2.044 (2024/01/09 2118)
+ */