From 64d9ab9482a849ebd264d1fe127437b9dce59f36 Mon Sep 17 00:00:00 2001
From: EnixCoda <enixcoda@gmail.com>
Date: Fri, 15 Jun 2018 00:16:13 +0800
Subject: [PATCH] feat(FileExplorer): handle submodule

---
 src/components/FileExplorer.js | 35 +++++++++++++++++++++-------------
 src/components/Node.js         |  4 +++-
 src/utils/treeParser.js        | 12 +++++++++++-
 3 files changed, 36 insertions(+), 15 deletions(-)

diff --git a/src/components/FileExplorer.js b/src/components/FileExplorer.js
index 399be37..075864f 100644
--- a/src/components/FileExplorer.js
+++ b/src/components/FileExplorer.js
@@ -8,6 +8,20 @@ import treeParser from '../utils/treeParser'
 import URLHelper from '../utils/URLHelper'
 import VisibleNodesGenerator from '../utils/VisibleNodesGenerator'
 
+function getVisibleParentNode(nodes, focusedNode, depths) {
+  const focusedNodeIndex = nodes.indexOf(focusedNode)
+  const focusedNodeDepth = depths.get(focusedNode)
+  let indexOfParentNode = focusedNodeIndex - 1
+  while (
+    indexOfParentNode !== -1 &&
+    depths.get(nodes[indexOfParentNode]) >= focusedNodeDepth
+  ) {
+    --indexOfParentNode
+  }
+  const parentNode = nodes[indexOfParentNode]
+  return parentNode
+}
+
 export default class List extends React.Component {
   static defaultProps = {
     treeData: null,
@@ -93,16 +107,9 @@ export default class List extends React.Component {
             this.setExpand(focusedNode, false)
           } else {
             // go forward to the start of the list, find the closest node with lower depth
-            let indexOfParentNode = focusedNodeIndex
-            const focusedNodeDepth = depths.get(nodes[focusedNodeIndex])
-            while (
-              indexOfParentNode !== -1 &&
-              depths.get(nodes[indexOfParentNode]) >= focusedNodeDepth
-            ) {
-              --indexOfParentNode
-            }
-            if (indexOfParentNode !== -1) {
-              this.focusNode(nodes[indexOfParentNode])
+            const parentNode = getVisibleParentNode(nodes, focusedNode, depths)
+            if (parentNode) {
+              this.focusNode(parentNode)
             }
           }
           break
@@ -113,9 +120,11 @@ export default class List extends React.Component {
           // expand node or redirect to file page
           if (focusedNode.type === 'tree') {
             this.setExpand(focusedNode, true)
-          } else {
-            // simulate click to trigger pjax
-            DOMHelper.clickOnNodeElement(focusedNodeIndex)
+          } else if (focusedNode.type === 'blob') {
+            DOMHelper.loadWithPJAX(focusedNode.url)
+          } else if (focusedNode.type === 'commit') {
+            // redirect to its parent folder
+            DOMHelper.loadWithPJAX(focusedNode.parent.url)
           }
           break
 
diff --git a/src/components/Node.js b/src/components/Node.js
index c78b2ed..6678075 100644
--- a/src/components/Node.js
+++ b/src/components/Node.js
@@ -21,8 +21,10 @@ export default class Node extends React.PureComponent {
     const { node, toggleExpand } = this.props
     if (node.type === 'tree') {
       toggleExpand(node, true)
-    } else {
+    } else if (node.type === 'blob') {
       DOMHelper.loadWithPJAX(node.url)
+    } else if (node.type === 'commit') {
+      DOMHelper.loadWithPJAX(node.parent.url)
     }
   }
 
diff --git a/src/utils/treeParser.js b/src/utils/treeParser.js
index d3fcc88..7a6c6a1 100644
--- a/src/utils/treeParser.js
+++ b/src/utils/treeParser.js
@@ -23,6 +23,13 @@ function sortFoldersToFront(root) {
   return DFS(root)
 }
 
+function setParentNode(root, parent = null) {
+  root.parent = parent
+  if (root.contents) {
+    root.contents.forEach(node => setParentNode(node, root))
+  }
+}
+
 function parse(treeData, metaData) {
   const { tree } = treeData
 
@@ -52,7 +59,9 @@ function parse(treeData, metaData) {
         ...nodeTemplate,
         ...item,
         name: item.path.replace(/^.*\//, ''),
-        url: GitHubHelper.getUrlForRedirect(metaData, item.path),
+        url: item.url
+          ? GitHubHelper.getUrlForRedirect(metaData, item.path)
+          : null,
         contents: item.type === 'tree' ? [] : null,
       }
       pathToNode.get(path).contents.push(node)
@@ -61,6 +70,7 @@ function parse(treeData, metaData) {
     }
   })
 
+  setParentNode(root)
   return {
     root: sortFoldersToFront(root),
     nodes: Array.from(pathToNode.values()),