Allow edits to be rejected for EditableCell (palantir#2228)

reiv · Mar 14, 2018 · 0fe776f · 0fe776f · reiv · Mar 14, 2018
1 parent 74e7c1a
commit 0fe776f
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 8 deletions.
diff --git a/packages/table/src/cell/editableCell.tsx b/packages/table/src/cell/editableCell.tsx
@@ -96,7 +96,7 @@ export class EditableCell extends React.Component<IEditableCellProps, IEditableC
 
     public componentWillReceiveProps(nextProps: IEditableCellProps) {
         const { value } = nextProps;
-        if (value !== this.props.value) {
+        if (value != null) {
             this.setState({ savedValue: value, dirtyValue: value });
         }
     }

diff --git a/packages/table/test/editableCellTests.tsx b/packages/table/test/editableCellTests.tsx
@@ -62,7 +62,7 @@ describe("<EditableCell>", () => {
         expect(onConfirm.called).to.be.true;
     });
 
-    it("doesn't change edited value on non-value prop changes", () => {
+    it("changes value state on non-value prop changes", () => {
         const onCancel = sinon.spy();
         const onChange = sinon.spy();
         const onConfirm = sinon.spy();
@@ -83,16 +83,17 @@ describe("<EditableCell>", () => {
         expect(onConfirm.called).to.be.false;
         expect(elem.find(`.${Classes.TABLE_EDITABLE_TEXT} .pt-editable-content`).text()).to.equal("new-text");
 
-        // set non-value prop
-        elem.setProps({ onChange: null });
-
-        // value stays the same
-        expect(elem.find(`.${Classes.TABLE_EDITABLE_TEXT} .pt-editable-content`).text()).to.equal("new-text");
-
         // confirm
         input.simulate("blur");
         expect(onCancel.called).to.be.false;
         expect(onConfirm.called).to.be.true;
+        // cell shows user-entered text until re-render
+        expect(elem.find(`.${Classes.TABLE_EDITABLE_TEXT}`).text()).to.equal("new-text");
+
+        // set non-value prop, forces EditableCell update
+        elem.setProps({ onChange: null });
+        // value resets to prop
+        expect(elem.find(`.${Classes.TABLE_EDITABLE_TEXT}`).text()).to.equal("test-value-5000");
     });
 
     it("passes index prop to callbacks if index was provided", () => {