changed file item

vanessayuenn · vanessayuenn · commit c76a00d9c125 · 2019-02-26T17:29:49.000+08:00
diff --git a/lib/items/changed-file-item.js b/lib/items/changed-file-item.js
@@ -1,13 +1,11 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import {Emitter} from 'event-kit';
+import ItemComponent from './item-component';
 
 import {WorkdirContextPoolPropType} from '../prop-types';
-import {autobind} from '../helpers';
 import ChangedFileContainer from '../containers/changed-file-container';
-import RefHolder from '../models/ref-holder';
 
-export default class ChangedFileItem extends React.Component {
+export default class ChangedFileItem extends ItemComponent {
   static propTypes = {
     workdirContextPool: WorkdirContextPoolPropType.isRequired,
 
@@ -36,15 +34,9 @@ export default class ChangedFileItem extends React.Component {
   }
 
   constructor(props) {
-    super(props);
-    autobind(this, 'destroy');
+    super(props, {});
 
-    this.emitter = new Emitter();
-    this.isDestroyed = false;
-    this.hasTerminatedPendingState = false;
-
-    this.refEditor = new RefHolder();
-    this.refEditor.observe(editor => {
+    this.refHolder.observe(editor => {
       this.emitter.emit('did-change-embedded-text-editor', editor);
     });
   }
@@ -67,18 +59,6 @@ export default class ChangedFileItem extends React.Component {
     return this.emitter.on('did-terminate-pending-state', callback);
   }
 
-  destroy() {
-    /* istanbul ignore else */
-    if (!this.isDestroyed) {
-      this.emitter.emit('did-destroy');
-      this.isDestroyed = true;
-    }
-  }
-
-  onDidDestroy(callback) {
-    return this.emitter.on('did-destroy', callback);
-  }
-
   render() {
     const repository = this.props.workdirContextPool.getContext(this.props.workingDirectory).getRepository();
 
@@ -87,14 +67,14 @@ export default class ChangedFileItem extends React.Component {
         itemType={this.constructor}
         repository={repository}
         destroy={this.destroy}
-        refEditor={this.refEditor}
+        refEditor={this.refHolder}
         {...this.props}
       />
     );
   }
 
   observeEmbeddedTextEditor(cb) {
-    this.refEditor.map(editor => cb(editor));
+    this.refHolder.map(editor => cb(editor));
     return this.emitter.on('did-change-embedded-text-editor', cb);
   }
 
diff --git a/lib/items/item-component.js b/lib/items/item-component.js
@@ -1,11 +1,13 @@
 import React from 'react';
 import RefHolder from '../models/ref-holder';
 import {Emitter} from 'event-kit';
+import {autobind} from '../helpers';
 
 export default class ItemComponent extends React.Component {
 
   constructor(props, {title, icon}) {
     super(props);
+    autobind(this, 'destroy');
 
     this.title = title;
     this.icon = icon;
@@ -24,7 +26,7 @@ export default class ItemComponent extends React.Component {
     return this.icon;
   }
 
-  destroy = () => {
+  destroy() {
     /* istanbul ignore else */
     if (!this.isDestroyed) {
       this.emitter.emit('did-destroy');
