Handle commit of mixed values unchanged

tropy · Apr 1, 2017 · 1a27ac9 · 1a27ac9
1 parent 347f8d1
commit 1a27ac9
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 5 deletions.
diff --git a/src/components/editable.js b/src/components/editable.js
@@ -34,13 +34,13 @@ class Editable extends PureComponent {
     }
   }
 
-  stop = () => {
+  stop = (isCommit) => {
     const { onCancel, onChange } = this.props
 
     if (this.changed) {
       onChange(this.state.value)
     } else {
-      onCancel()
+      onCancel(isCommit)
     }
   }
 
@@ -57,7 +57,7 @@ class Editable extends PureComponent {
         this.cancel()
         break
       case 'Enter':
-        this.stop()
+        this.stop(true)
         break
     }
 

diff --git a/src/components/metadata/field.js b/src/components/metadata/field.js
@@ -53,9 +53,17 @@ class MetadataField extends PureComponent {
     })
   }
 
+  handleCancel = (isCommitUnchanged) => {
+    if (isCommitUnchanged) {
+      return this.handleChange(this.props.text)
+    }
+
+    this.props.onEditCancel()
+  }
+
   render() {
     const { classes,  details, label } = this
-    const { text, isEditing, isDisabled, onEditCancel } = this.props
+    const { text, isEditing, isDisabled } = this.props
 
     return (
       <li className={cx(classes)}>
@@ -65,7 +73,7 @@ class MetadataField extends PureComponent {
             value={text}
             isDisabled={isDisabled}
             isEditing={isEditing}
-            onCancel={onEditCancel}
+            onCancel={this.handleCancel}
             onChange={this.handleChange}/>
         </div>
       </li>