fix: Do not hide ancestor nodes if they match 🐛 (#294)

dowjones · Sep 29, 2019 · 3b80d50 · 3b80d50
1 parent 100e623
commit 3b80d50
Show file tree

Hide file tree

Showing 3 changed files with 58 additions and 1 deletion.
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -4,12 +4,29 @@
   // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
   "version": "0.2.0",
   "configurations": [
+    {
+      "type": "node",
+      "request": "attach",
+      "name": "Attach by Process ID",
+      "processId": "${command:PickProcess}"
+    },
     {
       "type": "node",
       "request": "launch",
       "name": "webpack-dev-server",
       "program": "${workspaceRoot}/node_modules/webpack-dev-server/bin/webpack-dev-server.js",
       "cwd": "${workspaceFolder}/docs"
+    },
+    {
+      "type": "node",
+      "request": "launch",
+      "name": "Run AVA test",
+      "program": "${workspaceFolder}/node_modules/ava/cli.js",
+      "autoAttachChildProcesses": true,
+      //"args": ["${file}", "--serial"],
+      // "args": ["${file}"],
+      "args": ["${workspaceFolder}\\src\\index.test.js", "--serial"],
+      "skipFiles": ["<node_internals>/**/*.js"]
     }
   ]
 }
diff --git a/src/tree-manager/index.js b/src/tree-manager/index.js
@@ -67,7 +67,7 @@ class TreeManager {
     if (id !== undefined) {
       const node = this.getNodeById(id)
       this.addParentsToTree(node._parent, tree)
-      node.hide = true
+      node.hide = node._isMatch ? node.hide : true
       node.matchInChildren = true
       tree.set(id, node)
     }
@@ -96,6 +96,10 @@ class TreeManager {
     matches.forEach(m => {
       const node = this.getNodeById(m)
       node.hide = false
+
+      // add a marker to tell `addParentsToTree` to not hide this node; even if it's an ancestor node
+      node._isMatch = true
+
       if (keepTreeOnSearch) {
         // add parent nodes first or else the tree won't be rendered in correct hierarchy
         this.addParentsToTree(node._parent, matchTree)

diff --git a/src/tree-manager/tests/index.test.js b/src/tree-manager/tests/index.test.js
@@ -604,3 +604,39 @@ test('should return children when search with `keepChildrenOnSearch`', t => {
   const nodes = ['i1', 'c1', 'c2']
   nodes.forEach(n => t.not(matchTree.get(n), undefined))
 })
+
+test('should not hide parent nodes if they match search term with `keepTreeOnSearch`', t => {
+  const tree = [
+    {
+      id: 'i1',
+      label: 'A top level item',
+      value: 'v1',
+      children: [
+        {
+          id: 'c1',
+          label: 'SeaRch me too',
+          value: 'l1v1',
+          children: [
+            {
+              id: 'c2',
+              label: 'search me, please!',
+              value: 'l2v1',
+            },
+          ],
+        },
+      ],
+    },
+  ]
+  const manager = new TreeManager({ data: tree })
+  const keepTreeOnSearch = true
+  const { allNodesHidden, tree: matchTree } = manager.filterTree('search me', keepTreeOnSearch)
+  t.false(allNodesHidden)
+  const nodes = ['c1', 'c2']
+  nodes.forEach(n => {
+    t.not(matchTree.get(n), undefined, `${n} should not be undefined.`)
+    t.false(manager.getNodeById(n).hide, `${n} should not be hidden.`)
+  })
+
+  const hiddenNodes = ['i1']
+  hiddenNodes.forEach(n => t.true(manager.getNodeById(n).hide, `${n} should not be visible.`))
+})