From f677790d85eecb7dc0f9d354df0b930346997d98 Mon Sep 17 00:00:00 2001 From: Gregory Schier Date: Fri, 25 Nov 2016 15:21:07 -0800 Subject: [PATCH] Fixed active folder logic --- app/ui/components/sidebar/SidebarChildren.js | 20 ++++---------------- 1 file changed, 4 insertions(+), 16 deletions(-) diff --git a/app/ui/components/sidebar/SidebarChildren.js b/app/ui/components/sidebar/SidebarChildren.js index 318cd0c89c..69ca35563a 100644 --- a/app/ui/components/sidebar/SidebarChildren.js +++ b/app/ui/components/sidebar/SidebarChildren.js @@ -1,21 +1,9 @@ -import React, {Component, PropTypes} from 'react'; +import React, {PureComponent, PropTypes} from 'react'; import SidebarRequestRow from './SidebarRequestRow'; import SidebarRequestGroupRow from './SidebarRequestGroupRow'; -class SidebarChildren extends Component { - shouldComponentUpdate (nextProps) { - for (const k of Object.keys(nextProps)) { - const curr = this.props[k]; - const next = nextProps[k]; - if (curr !== next) { - console.log('DIFFERENT', k, curr, next); - return true; - } - } - - return false; - } +class SidebarChildren extends PureComponent { _filterChildren (filter, children, extra = null) { filter = filter || ''; @@ -85,8 +73,8 @@ class SidebarChildren extends Component { function hasActiveChild (children) { for (const c of children) { - if (c.children.length) { - return hasActiveChild(c.children); + if (hasActiveChild(c.children || [])) { + return true; } else if (c.doc._id === activeRequestId) { return true; }