Disabled node expanding #121

amsik · Oct 16, 2019 · 3c34f49 · 3c34f49
1 parent bf104ad
commit 3c34f49
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "liquor-tree",
   "description": "A Vue.js tree component.",
-  "version": "0.2.65",
+  "version": "0.2.66",
   "author": "Kostiantyn <[email protected]>",
   "library": "LiquorTree",
   "homepage": "https://amsik.github.io/liquor-tree/",

diff --git a/src/lib/Node.js b/src/lib/Node.js
@@ -390,14 +390,20 @@ export default class Node {
   }
 
   canExpand () {
+    if (this.disabled() || !this.hasChildren()) {
+      return false
+    }
+
     return this.collapsed() &&
-      this.hasChildren() &&
       (!this.tree.autoDisableChildren || this.disabled())
   }
 
   canCollapse () {
+    if (this.disabled() || !this.hasChildren()) {
+      return false
+    }
+
     return this.expanded() &&
-      this.hasChildren() &&
       (!this.tree.autoDisableChildren || this.disabled())
   }