Merge pull request #124 from aramperes/patch-118

#118 Fix tree desync by taking :target into consideration
berzniz · Sep 19, 2020 · 80f5f69 · 80f5f69
2 parents d4b2a0e + aefa386
commit 80f5f69
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/src/js/components/tree/index.jsx b/src/js/components/tree/index.jsx
@@ -1,6 +1,6 @@
 import React from 'react'
 import Actions from '../actions'
-import { createFileTree, isElementVisible, StorageSync, getBrowserApi } from '../../lib'
+import { createFileTree, isElementVisible, StorageSync, getBrowserApi, isElementTargetAndVisible } from '../../lib'
 import { createTree } from '../../createTree'
 import BodyColor from '../bodyColor'
 
@@ -118,7 +118,7 @@ class Tree extends React.Component {
     const { visibleElement } = this.state
     const { root } = this.props
     const { diffElements = [] } = root
-    const nextVisibleElement = diffElements.find(isElementVisible)
+    const nextVisibleElement = diffElements.find(isElementTargetAndVisible) || diffElements.find(isElementVisible)
     if (nextVisibleElement !== visibleElement) {
       this.setState({
         visibleElement: nextVisibleElement

diff --git a/src/js/lib.js b/src/js/lib.js
@@ -180,6 +180,16 @@ export const isElementVisible = (el) => {
   return (vertInView && horInView)
 }
 
+export const isElementTarget = (el) => {
+  if (!el) {
+    return false
+  }
+
+  return el.matches(':target')
+}
+
+export const isElementTargetAndVisible = (el) => isElementTarget(el) && isElementVisible(el)
+
 const EMPTY_FILTER = ''
 
 export const getBrowserApi = () => {