fix select and getNode

Author: holiber

README.md

@@ -127,7 +127,7 @@ interface ICursorPosition<TDataType> {
 | getNode(path: number[]): ISlTreeNode                                                                     | Find the node by using it's path                                                                   |
 | traverse(cb: (node: ISlTreeNode, nodeModel: ISlTreeNodeModel, siblings: ISlTreeNodeModel[])  => boolean) | Helpful method to traverse all nodes. The traversing will be stopped if callback returns `false`.  |
 | updateNode(path: number[], patch: Partial<ISlTreeNodeModel>)                                             | Update the node by using it's path                                                                 |
-| select(path: number[])                                                                                   | Select the node by using it's path                                                                 |
+| select(path: number[], addToSelection = false)                                                           | Select the node by using it's path                                                                 |
 | getFirstNode(): ISlTreeNode                                                                              | Get the first node in the tree                                                                     |
 | getLastNode(): ISlTreeNode                                                                               | Get the last node in the tree                                                                      |
 | getNodeEl(): HTMLElement                                                                                 | Get the node HTMLElement by using it's path                                                        |

dist/sl-vue-tree.d.ts

@@ -41,5 +41,5 @@ export default class SlVueTree<TDataType> extends Vue {
     getSelected(): ISlTreeNode<TDataType>[];
     traverse(cb: (node: ISlTreeNode<TDataType>, nodeModel: ISlTreeNodeModel<TDataType>, siblings: ISlTreeNodeModel<TDataType>[]) => boolean | void, nodeModels?: ISlTreeNodeModel<TDataType>[], parentPath?: number[]): ISlTreeNode<TDataType>[] | boolean;
     getNodeEl(path: number[]): HTMLElement;
-    select(path: number[]): void;
+    select(path: number[], addToSelection?: boolean): ISlTreeNode<TDataType>;
 }

dist/sl-vue-tree.js

@@ -41,5 +41,5 @@ export default class SlVueTree<TDataType> extends Vue {
     getSelected(): ISlTreeNode<TDataType>[];
     traverse(cb: (node: ISlTreeNode<TDataType>, nodeModel: ISlTreeNodeModel<TDataType>, siblings: ISlTreeNodeModel<TDataType>[]) => boolean | void, nodeModels?: ISlTreeNodeModel<TDataType>[], parentPath?: number[]): ISlTreeNode<TDataType>[] | boolean;
     getNodeEl(path: number[]): HTMLElement;
-    select(path: number[]): void;
+    select(path: number[], addToSelection?: boolean): ISlTreeNode<TDataType>;
 }

dist/sl-vue-tree.js.map

@@ -116,7 +116,9 @@ export default {
     ) {
       const ind = path.slice(-1)[0];
       siblings = siblings || this.getNodeSiblings(this.value, path);
-      nodeModel = nodeModel || siblings[ind];
+      nodeModel = nodeModel || (siblings && siblings[ind]) || null;
+
+      if (!nodeModel) return null;
 
       const node = {
 
@@ -167,23 +169,24 @@ export default {
       this.getRoot().$emit('nodecontextmenu', node, event);
     },
 
-    select(path, event = null, addToSelection = false) {
+    select(path, addToSelection = false, event = null) {
       addToSelection = ((event && event.ctrlKey) || addToSelection) && this.allowMultiselect;
-      const clickedNode = this.getNode(path);
+      const selectedNode = this.getNode(path);
+      if (!selectedNode) return null;
       const newNodes = this.copy(this.value);
-      const shiftSelectionMode = this.allowMultiselect && event.shiftKey && this.lastSelectedNode;
+      const shiftSelectionMode = this.allowMultiselect && event && event.shiftKey && this.lastSelectedNode;
       const selectedNodes = [];
       let shiftSelectionStarted = false;
 
       this.traverse((node, nodeModel) => {
 
         if (shiftSelectionMode) {
-          if (node.pathStr === clickedNode.pathStr || node.pathStr === this.lastSelectedNode.pathStr) {
+          if (node.pathStr === selectedNode.pathStr || node.pathStr === this.lastSelectedNode.pathStr) {
             nodeModel.isSelected = true;
             shiftSelectionStarted = !shiftSelectionStarted;
           }
           if (shiftSelectionStarted) nodeModel.isSelected = true;
-        } else if (node.pathStr === clickedNode.pathStr) {
+        } else if (node.pathStr === selectedNode.pathStr) {
           nodeModel.isSelected = true;
         } else if (!addToSelection) {
           if (nodeModel.isSelected) nodeModel.isSelected = false;
@@ -194,9 +197,10 @@ export default {
       }, newNodes);
 
 
-      this.lastSelectedNode = clickedNode;
+      this.lastSelectedNode = selectedNode;
       this.emitInput(newNodes);
       this.emitSelect(selectedNodes, event);
+      return selectedNode;
     },
 
     onNodeMousemoveHandler(event) {
@@ -243,7 +247,7 @@ export default {
       const destNode = this.getNode(JSON.parse($nodeItem.getAttribute('path')));
 
       if (isDragStarted && !destNode.isSelected) {
-        this.select(destNode.path, event);
+        this.select(destNode.path, false, event);
       }
 
 
@@ -357,7 +361,7 @@ export default {
       this.mouseIsDown = false;
 
       if (!this.isDragging && targetNode) {
-        this.select(targetNode.path, event);
+        this.select(targetNode.path, false, event);
         return;
       }