Extract a child ref from BranchView

smashwilson · smashwilson · commit a92731f9354c · 2018-04-16T11:43:07.000-04:00
diff --git a/lib/controllers/status-bar-tile-controller.js b/lib/controllers/status-bar-tile-controller.js
@@ -26,7 +26,7 @@ export default class StatusBarTileController extends React.Component {
   constructor(props) {
     super(props);
 
-    this.refBranchView = new RefHolder();
+    this.refBranchViewRoot = new RefHolder();
   }
 
   getChangedFilesCount(data) {
@@ -125,14 +125,14 @@ export default class StatusBarTileController extends React.Component {
           />
         </Commands>
         <BranchView
-          ref={this.refBranchView.setter}
+          refRoot={this.refBranchViewRoot.setter}
           workspace={this.props.workspace}
           checkout={this.checkout}
           currentBranch={repoProps.currentBranch}
         />
         <Tooltip
           manager={this.props.tooltips}
-          target={this.refBranchView}
+          target={this.refBranchViewRoot}
           trigger="click"
           className="github-StatusBarTileController-tooltipMenu">
           <BranchMenuView
diff --git a/lib/views/branch-view.js b/lib/views/branch-view.js
@@ -1,11 +1,17 @@
 import React from 'react';
+import PropTypes from 'prop-types';
 import cx from 'classnames';
 
 import {BranchPropType} from '../prop-types';
 
 export default class BranchView extends React.Component {
   static propTypes = {
     currentBranch: BranchPropType.isRequired,
+    refRoot: PropTypes.func,
+  }
+
+  static defaultProps = {
+    refRoot: () => {},
   }
 
   render() {
@@ -14,7 +20,7 @@ export default class BranchView extends React.Component {
     );
 
     return (
-      <div className={classNames} ref={e => { this.element = e; }}>
+      <div className={classNames} ref={this.props.refRoot}>
         <span className="icon icon-git-branch" />
         <span className="branch-label">{this.props.currentBranch.getName()}</span>
       </div>
