Change final form props spreading

Change props spreading so that the whole props object is available to the form and required props can be destructured from that.
sharetribe · Jun 1, 2018 · cdfd6e0 · cdfd6e0
1 parent 3a7dc5a
commit cdfd6e0
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 14 deletions.
diff --git a/src/forms/EmailVerificationForm/EmailVerificationForm.js b/src/forms/EmailVerificationForm/EmailVerificationForm.js
@@ -17,8 +17,8 @@ import css from './EmailVerificationForm.css';
 const EmailVerificationFormComponent = props => (
   <FinalForm
     {...props}
-    render={fieldRenderProps => {
-      const { currentUser, inProgress, handleSubmit, verificationError } = fieldRenderProps;
+    render={formRenderProps => {
+      const { currentUser, inProgress, handleSubmit, verificationError } = formRenderProps;
 
       const { email, emailVerified, pendingEmail, profile } = currentUser.attributes;
       const emailToVerify = <strong>{pendingEmail || email}</strong>;

diff --git a/src/forms/LocationSearchForm/LocationSearchForm.js b/src/forms/LocationSearchForm/LocationSearchForm.js
@@ -21,7 +21,8 @@ const LocationSearchFormComponent = props => {
   return (
     <FinalForm
       {...props}
-      render={({ rootClassName, className, intl, handleSubmit }) => {
+      render={formRenderProps => {
+        const { rootClassName, className, intl } = formRenderProps;
         const classes = classNames(rootClassName || css.root, className);
 
         // Allow form submit only when the place has changed

diff --git a/src/forms/SelectMultipleFilterForm/SelectMultipleFilterForm.js b/src/forms/SelectMultipleFilterForm/SelectMultipleFilterForm.js
@@ -13,7 +13,7 @@ const SelectMultipleFilterFormComponent = props => {
     <FinalForm
       {...props}
       mutators={{ ...arrayMutators }}
-      render={formProps => {
+      render={formRenderProps => {
         const {
           form,
           handleSubmit,
@@ -25,7 +25,7 @@ const SelectMultipleFilterFormComponent = props => {
           contentRef,
           style,
           intl,
-        } = formProps;
+        } = formRenderProps;
         const classes = classNames(css.root, { [css.isOpen]: isOpen });
 
         const handleCancel = () => {

diff --git a/src/forms/SelectMultipleFilterPlainForm/SelectMultipleFilterPlainForm.js b/src/forms/SelectMultipleFilterPlainForm/SelectMultipleFilterPlainForm.js
@@ -19,12 +19,15 @@ const SelectMultipleFilterPlainForm = props => {
       {...rest}
       onSubmit={() => null}
       mutators={{ ...arrayMutators }}
-      render={({ className, name, options, twoColumns, onChange }) => (
-        <Form className={className}>
-          <FormSpy onChange={handleChange} subscription={{ values: true, dirty: true }} />
-          <FieldCheckboxGroup name={name} id={name} options={options} twoColumns={twoColumns} />
-        </Form>
-      )}
+      render={formRenderProps => {
+        const { className, name, options, twoColumns } = formRenderProps;
+        return (
+          <Form className={className}>
+            <FormSpy onChange={handleChange} subscription={{ values: true, dirty: true }} />
+            <FieldCheckboxGroup name={name} id={name} options={options} twoColumns={twoColumns} />
+          </Form>
+        );
+      }}
     />
   );
 };

diff --git a/src/forms/SendMessageForm/SendMessageForm.js b/src/forms/SendMessageForm/SendMessageForm.js
@@ -56,7 +56,7 @@ class SendMessageFormComponent extends Component {
     return (
       <FinalForm
         {...this.props}
-        render={fieldRenderProps => {
+        render={formRenderProps => {
           const {
             rootClassName,
             className,
@@ -66,7 +66,7 @@ class SendMessageFormComponent extends Component {
             sendMessageError,
             invalid,
             form,
-          } = fieldRenderProps;
+          } = formRenderProps;
 
           const classes = classNames(rootClassName || css.root, className);
           const submitInProgress = inProgress;

diff --git a/src/forms/TopbarSearchForm/TopbarSearchForm.js b/src/forms/TopbarSearchForm/TopbarSearchForm.js
@@ -32,7 +32,9 @@ class TopbarSearchFormComponent extends Component {
     return (
       <FinalForm
         {...this.props}
-        render={({ rootClassName, className, desktopInputRoot, intl, isMobile }) => {
+        render={formRenderProps => {
+          const { rootClassName, className, desktopInputRoot, intl, isMobile } = formRenderProps;
+
           const classes = classNames(rootClassName, className);
           const desktopInputRootClass = desktopInputRoot || css.desktopInputRoot;