React 16.3.1

lib/controllers/git-tab-controller.js

@@ -421,6 +421,6 @@ export default class GitTabController extends React.Component {
 
   @autobind
   quietlySelectItem(filePath, stagingStatus) {
-    return this.refs.gitTab.quietlySelectItem(filePath, stagingStatus);
+    return this.refView.quietlySelectItem(filePath, stagingStatus);
   }
 }

lib/controllers/root-controller.js

@@ -5,6 +5,7 @@ import url from 'url';
 import React from 'react';
 import PropTypes from 'prop-types';
 import {autobind} from 'core-decorators';
+import {CompositeDisposable} from 'event-kit';
 import createDOMPurify from 'dompurify';
 
 import StatusBar from '../views/status-bar';
@@ -23,6 +24,7 @@ import StatusBarTileController from './status-bar-tile-controller';
 import RepositoryConflictController from './repository-conflict-controller';
 import GithubLoginModel from '../models/github-login-model';
 import Conflict from '../models/conflicts/conflict';
+import RefHolder from '../models/ref-holder';
 import Switchboard from '../switchboard';
 import {toNativePathSep, destroyFilePatchPaneItems, destroyEmptyFilePatchPaneItems} from '../helpers';
 import {GitError} from '../git-shell-out-strategy';
@@ -91,19 +93,27 @@ export default class RootController extends React.Component {
       credentialDialogQuery: null,
     };
 
+    this.refGitTabController = new RefHolder();
+    this.refGitTabWrapperController = new RefHolder();
+    this.refGitHubTabController = new RefHolder();
+    this.filePatchRefs = new Map();
+
     this.gitTabTracker = new TabTracker('git', {
       uri: 'atom-github://dock-item/git',
-      getController: () => this.gitTabController,
+      getController: () => this.refGitTabController.get(),
       getWorkspace: () => this.props.workspace,
     });
 
     this.githubTabTracker = new TabTracker('github', {
       uri: 'atom-github://dock-item/github',
-      getController: () => this.githubTabController,
+      getController: () => this.refGithubTabController.get(),
       getWorkspace: () => this.props.workspace,
     });
 
-    this.subscription = this.props.repository.onMergeError(() => this.gitTabTracker.ensureVisible());
+    this.subscription = new CompositeDisposable(
+      this.props.repository.onMergeError(() => this.gitTabTracker.ensureVisible()),
+      this.refGitTabWrapperController.observe(c => this.refGitTabController.setter(c.getWrappedComponentInstance())),
+    );
   }
 
   render() {
@@ -171,14 +181,13 @@ export default class RootController extends React.Component {
   renderPanels() {
     const gitTab = this.props.gitTabStubItem && (
       <DockItem
-        ref={c => { this.gitDockItem = c; }}
         workspace={this.props.workspace}
         onDidCloseItem={this.props.destroyGitTabItem}
         stubItem={this.props.gitTabStubItem}
-        getItem={({subtree}) => subtree.getWrappedComponentInstance()}
+        itemHolder={this.refGitTabController}
         activate={this.props.startOpen}>
         <GitTabController
-          ref={c => { this.gitTabController = c; }}
+          ref={this.refGitTabWrapperController.setter}
           workspace={this.props.workspace}
           commandRegistry={this.props.commandRegistry}
           notificationManager={this.props.notificationManager}
@@ -201,12 +210,12 @@ export default class RootController extends React.Component {
 
     const githubTab = this.props.githubTabStubItem && (
       <DockItem
-        ref={c => { this.githubDockItem = c; }}
         workspace={this.props.workspace}
         onDidCloseItem={this.props.destroyGithubTabItem}
-        stubItem={this.props.githubTabStubItem}>
+        stubItem={this.props.githubTabStubItem}
+        itemHolder={this.refGitHubTabController}>
         <GithubTabController
-          ref={c => { this.githubTabController = c; }}
+          ref={this.refGitHubTabController.setter}
           repository={this.props.repository}
           loginModel={this.loginModel}
         />
@@ -301,14 +310,21 @@ export default class RootController extends React.Component {
     return this.props.filePatchItems.map(item => {
       const {filePath, stagingStatus, workdir} = getPropsFromUri(item.uri);
 
+      let refHolder = this.filePatchRefs.get(item.uri);
+      if (!refHolder) {
+        refHolder = new RefHolder();
+        this.filePatchRefs.set(refHolder);
+      }
+
       return (
         <PaneItem
           key={item.key}
           workspace={this.props.workspace}
-          getItem={({subtree}) => subtree}
           onDidCloseItem={this.removeFilePatchItem}
-          stubItem={item}>
+          stubItem={item}
+          itemHolder={refHolder}>
           <FilePatchController
+            ref={refHolder.setter}
             deserializers={this.props.deserializers}
             commandRegistry={this.props.commandRegistry}
             tooltips={this.props.tooltips}
@@ -355,7 +371,18 @@ export default class RootController extends React.Component {
 
   componentDidUpdate() {
     this.subscription.dispose();
-    this.subscription = this.props.repository.onMergeError(() => this.gitTabTracker.ensureVisible());
+    this.subscription = new CompositeDisposable(
+      this.props.repository.onMergeError(() => this.gitTabTracker.ensureVisible()),
+      this.refGitTabWrapperController.observe(c => this.refGitTabController.setter(c.getWrappedComponentInstance())),
+    );
+
+    const existingURIs = new Set(this.props.filePatchItems.map(item => item.uri));
+    const retainedURIs = [...this.filePatchRefs.keys()];
+    for (const uri of retainedURIs) {
+      if (!existingURIs.has(uri)) {
+        this.filePatchRefs.delete(uri);
+      }
+    }
   }
 
   onConsumeStatusBar(statusBar) {
@@ -445,9 +472,9 @@ export default class RootController extends React.Component {
 
   @autobind
   surfaceFromFileAtPath(filePath, stagingStatus) {
-    if (this.gitTabController) {
-      this.gitTabController.getWrappedComponentInstance().focusAndSelectStagingItem(filePath, stagingStatus);
-    }
+    this.refGitTabController.map(c => {
+      return c.focusAndSelectStagingItem(filePath, stagingStatus);
+    });
   }
 
   @autobind
@@ -467,11 +494,9 @@ export default class RootController extends React.Component {
 
   @autobind
   quietlySelectItem(filePath, stagingStatus) {
-    if (this.gitTabController) {
-      return this.gitTabController.getWrappedComponentInstance().quietlySelectItem(filePath, stagingStatus);
-    } else {
-      return null;
-    }
+    return this.refGitTabController.map(c => {
+      return c.quietlySelectItem(filePath, stagingStatus);
+    });
   }
 
   async viewChangesForCurrentFile(stagingStatus) {