form saving -> submitting

pivotal-cf · Nov 28, 2017 · 15f0595 · 15f0595
1 parent cc189c4
commit 15f0595
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 20 deletions.
diff --git a/spec/pivotal-ui-react/form/form-col_spec.js b/spec/pivotal-ui-react/form/form-col_spec.js
@@ -99,7 +99,7 @@ describe('FormCol', () => {
           state: {
             key: 'value',
             current: {'some-name-set-on-the-col': 'current-value'},
-            saving: true
+            submitting: true
           },
           onChange: () => formOnChange
         };
@@ -118,7 +118,7 @@ describe('FormCol', () => {
       it('calls the children callback', () => {
         expect(childrenSpy).toHaveBeenCalledWith({
           ...formProps,
-          saving: true,
+          submitting: true,
           onChange: formOnChange
         });
       });

diff --git a/spec/pivotal-ui-react/form/form_spec.js b/spec/pivotal-ui-react/form/form_spec.js
@@ -48,13 +48,13 @@ describe('Form', () => {
       expect('.grid:eq(0) .col:eq(0) input').toHaveAttr('value', 'some-name');
     });
 
-    it('renders Buttons with saving=false', () => {
+    it('renders Buttons with submitting=false', () => {
       expect(Buttons).toHaveBeenCalledWith({
         canSubmit: subject.canSubmit,
         canReset: subject.canReset,
         reset: subject.reset,
         onSubmit: subject.onSubmit,
-        saving: false,
+        submitting: false,
         setState: subject.setState,
         state: subject.state,
         onChange: jasmine.any(Function)
@@ -151,13 +151,13 @@ describe('Form', () => {
           expect('.grid:eq(0) .col:eq(1) .cancel').toBeDisabled();
         });
 
-        it('renders Buttons with saving=true', () => {
+        it('renders Buttons with submitting=true', () => {
           expect(Buttons).toHaveBeenCalledWith({
             canSubmit: subject.canSubmit,
             canReset: subject.canReset,
             reset: subject.reset,
             onSubmit: subject.onSubmit,
-            saving: true,
+            submitting: true,
             setState: subject.setState,
             state: subject.state,
             onChange: jasmine.any(Function)
@@ -174,13 +174,13 @@ describe('Form', () => {
             expect('form > fieldset').not.toBeDisabled();
           });
 
-          it('renders Buttons with saving=false', () => {
+          it('renders Buttons with submitting=false', () => {
             expect(Buttons).toHaveBeenCalledWith({
               canSubmit: subject.canSubmit,
               canReset: subject.canReset,
               reset: subject.reset,
               onSubmit: subject.onSubmit,
-              saving: false,
+              submitting: false,
               setState: subject.setState,
               state: subject.state,
               onChange: jasmine.any(Function)
@@ -226,13 +226,13 @@ describe('Form', () => {
             expect('form > fieldset').not.toBeDisabled();
           });
 
-          it('renders Buttons with saving=false', () => {
+          it('renders Buttons with submitting=false', () => {
             expect(Buttons).toHaveBeenCalledWith({
               canSubmit: subject.canSubmit,
               canReset: subject.canReset,
               reset: subject.reset,
               onSubmit: subject.onSubmit,
-              saving: false,
+              submitting: false,
               setState: subject.setState,
               state: subject.state,
               onChange: jasmine.any(Function)

diff --git a/src/react/forms/form-col.js b/src/react/forms/form-col.js
@@ -46,7 +46,7 @@ export class FormCol extends React.Component {
       canReset,
       reset,
       onSubmit,
-      saving: state.saving,
+      submitting: state.submitting,
       setState,
       state,
       onChange: onChange ? onChange(name, validator) : () => null

diff --git a/src/react/forms/form.js b/src/react/forms/form.js
@@ -50,7 +50,7 @@ export class Form extends React.Component {
     this.state = {
       initial,
       current,
-      saving: false,
+      submitting: false,
       errors: {},
       requiredFields
     };
@@ -121,8 +121,8 @@ export class Form extends React.Component {
 
   canSubmit({checkRequiredFields} = {}) {
     const {children} = this.props;
-    const {initial, current, saving, requiredFields} = this.state;
-    return !saving
+    const {initial, current, submitting, requiredFields} = this.state;
+    return !submitting
       && find(Object.keys(initial), key => !deepEqual(initial[key], current[key]))
       && (checkRequiredFields
         ? checkRequiredFields(this.state.current)
@@ -135,16 +135,16 @@ export class Form extends React.Component {
   }
 
   canReset() {
-    const {saving, initial, current} = this.state;
-    return !saving && !deepEqual(initial, current);
+    const {submitting, initial, current} = this.state;
+    return !submitting && !deepEqual(initial, current);
   }
 
   async onSubmit(e) {
     e && e.preventDefault();
     const {onSubmit, onSubmitError, afterSubmit, onModified, resetOnSubmit} = this.props;
     const {initial, current} = this.state;
-    this.setState({saving: true});
-    const nextState = {saving: false};
+    this.setState({submitting: true});
+    const nextState = {submitting: false};
     try {
       const response = await onSubmit({initial, current});
       this.setState({
@@ -170,7 +170,7 @@ export class Form extends React.Component {
 
   render() {
     const {className, children} = this.props;
-    const {saving} = this.state;
+    const {submitting} = this.state;
     const filteredChildren = React.Children.toArray(children).filter(child => {
       const childIsFormRow = child.type === FormRow || child.type.prototype instanceof FormRow;
       if (!childIsFormRow) {
@@ -181,7 +181,7 @@ export class Form extends React.Component {
 
     return (
       <form {...{className: classnames('form', className), onSubmit: this.onSubmit}}>
-        <fieldset {...{disabled: saving}}>
+        <fieldset {...{disabled: submitting}}>
           {filteredChildren.map((formRow, key) => (
             React.cloneElement(formRow, {
               key,