Increasingly messy hack for FilePatchController's refs

smashwilson · smashwilson · commit b3b27129da9d · 2018-04-16T17:03:18.000-04:00
diff --git a/lib/controllers/root-controller.js b/lib/controllers/root-controller.js
@@ -96,6 +96,7 @@ export default class RootController extends React.Component {
     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',
@@ -309,13 +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}
           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}
@@ -366,6 +375,14 @@ export default class RootController extends React.Component {
       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) {
