Merge pull request #383 from reactioncommerce/feat-update-components-context

Update components context

Author: nnnnat

package.json

@@ -96,7 +96,7 @@
     "suiteName": "jest-tests"
   },
   "dependencies": {
-    "@reactioncommerce/components-context": "1.0.0",
+    "@reactioncommerce/components-context": "^1.1.0",
     "babel-polyfill": "^6.26.0",
     "prop-types": "15.6.2",
     "react": "16.4.2",

package/src/components/AddressCapture/v1/AddressCapture.js

@@ -134,7 +134,6 @@ class AddressCapture extends Component {
   _form = null;
 
   /**
-   *
    * @method hasAddressSuggestion
    * @summary returns true if we have a suggested address from a address validation service
    * @return {Boolean} - true if address suggestion on props
@@ -145,7 +144,6 @@ class AddressCapture extends Component {
   }
 
   /**
-   *
    * @method hasValidationError
    * @summary returns true if we have any validation errors from a address validation service
    * @return {Boolean} - true if validation errors on props
@@ -156,7 +154,6 @@ class AddressCapture extends Component {
   }
 
   /**
-   *
    * @method addressEntered
    * @summary getter that returns the entered address
    * @return {Object} addressEntered -  Address object
@@ -167,7 +164,6 @@ class AddressCapture extends Component {
   }
 
   /**
-   *
    * @method addressSuggestion
    * @summary getter that returns the suggested address
    * @return {Object} addressSuggestion -  Address object
@@ -178,7 +174,6 @@ class AddressCapture extends Component {
   }
 
   /**
-   *
    * @method addressProvided
    * @summary getter that returns the provided address form value
    * @return {Object} addressProvided -  Address object
@@ -189,50 +184,46 @@ class AddressCapture extends Component {
   }
 
   /**
-   *
    * @method inEntry
    * @summary getter that returns true if in entry mode
-   * @return {Boolean}
+   * @return {Boolean} True if currently in entry status
    */
   get inEntry() {
     const { status } = this.state;
     return status === ENTRY;
   }
 
   /**
-   *
    * @method inEdit
    * @summary getter that returns true if in edit mode
-   * @return {Boolean}
+   * @return {Boolean} True if currently in edit status
    */
   get inEdit() {
     const { status } = this.state;
     return status === EDIT;
   }
 
   /**
-   *
    * @method inReview
    * @summary getter that returns true if in review mode
-   * @return {Boolean}
+   * @return {Boolean} True if currently in review status
    */
   get inReview() {
     const { status } = this.state;
     return status === REVIEW;
   }
 
   /**
-   *
    * @method toggleStatus
    * @summary setter that toggles the Component's status.
+   * @param {String} status The new status
    * @return {undefined}
    */
   set toggleStatus(status) {
     this.setState({ status });
   }
 
   /**
-   *
    * @method formRef
    * @summary binds the active form element to the `_form` property
    * @param {Object} form - React ref element
@@ -243,8 +234,7 @@ class AddressCapture extends Component {
   };
 
   /**
-   *
-   * @name submit
+   * @method submit
    * @summary Instance method that submits the form, this allows a parent component access to the Form submit event.
    * @return {undefined}
    */
@@ -253,10 +243,9 @@ class AddressCapture extends Component {
   };
 
   /**
-   *
    * @method handleSubmit
    * @summary validate or submit the entered address object.
-   * @param {Object} address - submited address object
+   * @param {Object} address - submitted address object
    * @return {undefined}
    */
   handleSubmit = async (address) => {

package/src/components/AddressReview/v1/AddressReview.test.js

@@ -27,25 +27,29 @@ const mockAddressSuggestion = {
 };
 
 test("basic snapshot with only required props", () => {
-  const component = renderer.create(<AddressReview
-    addressEntered={mockAddressEntered}
-    addressSuggestion={mockAddressSuggestion}
-    components={mockComponents}
-  />);
+  const component = renderer.create((
+    <AddressReview
+      addressEntered={mockAddressEntered}
+      addressSuggestion={mockAddressSuggestion}
+      components={mockComponents}
+    />
+  ));
 
   const tree = component.toJSON();
   expect(tree).toMatchSnapshot();
 });
 
 test("basic snapshot with all props", () => {
-  const component = renderer.create(<AddressReview
-    addressEntered={mockAddressEntered}
-    addressSuggestion={mockAddressSuggestion}
-    components={mockComponents}
-    value="entered"
-    warningTitle="Warning"
-    warningMessage="Something is wrong"
-  />);
+  const component = renderer.create((
+    <AddressReview
+      addressEntered={mockAddressEntered}
+      addressSuggestion={mockAddressSuggestion}
+      components={mockComponents}
+      value="entered"
+      warningTitle="Warning"
+      warningMessage="Something is wrong"
+    />
+  ));
 
   const tree = component.toJSON();
   expect(tree).toMatchSnapshot();

package/src/components/ErrorsBlock/v1/ErrorsBlock.js

@@ -98,8 +98,4 @@ class ErrorsBlock extends Component {
   }
 }
 
-const WrappedErrorsBlock = withComponents(ErrorsBlock);
-
-WrappedErrorsBlock.isFormErrors = true;
-
-export default WrappedErrorsBlock;
+export default withComponents(ErrorsBlock);

package/src/components/FinalReviewCheckoutAction/v1/FinalReviewCheckoutAction.js

@@ -35,6 +35,9 @@ const Items = styled.div`
 `;
 
 class FinalReviewCheckoutAction extends Component {
+  // Checkout review is the final step so it has no complete state
+  static renderComplete = () => null;
+
   static propTypes = {
     /**
      * Cart data
@@ -182,10 +185,4 @@ class FinalReviewCheckoutAction extends Component {
   }
 }
 
-const WrappedFinalReviewCheckoutAction = withComponents(FinalReviewCheckoutAction);
-
-// Checkout review is the final step so it has no complete state
-// eslint-disable-next-line
-WrappedFinalReviewCheckoutAction.renderComplete = () => null
-
-export default WrappedFinalReviewCheckoutAction;
+export default withComponents(FinalReviewCheckoutAction);

package/src/components/FulfillmentOptionsCheckoutAction/v1/FulfillmentOptionsCheckoutAction.js

@@ -30,6 +30,14 @@ const FulfillmentOptionShape = PropTypes.shape({
 });
 
 class FulfillmentOptionsCheckoutAction extends Component {
+  static renderComplete({ fulfillmentGroup: { selectedFulfillmentOption } }) {
+    return (
+      <FulfillmentOption>
+        {selectedFulfillmentOption.fulfillmentMethod.displayName} • {selectedFulfillmentOption.price.displayAmount}
+      </FulfillmentOption>
+    );
+  }
+
   static propTypes = {
     /**
      * Alert object provides alert into to InlineAlert.
@@ -183,13 +191,4 @@ class FulfillmentOptionsCheckoutAction extends Component {
   }
 }
 
-const WrappedFullfillmentOptionsCheckoutAction = withComponents(FulfillmentOptionsCheckoutAction);
-
-// eslint-disable-next-line
-WrappedFullfillmentOptionsCheckoutAction.renderComplete = ({ fulfillmentGroup: { selectedFulfillmentOption } }) => (
-  <FulfillmentOption>
-    {selectedFulfillmentOption.fulfillmentMethod.displayName} • {selectedFulfillmentOption.price.displayAmount}
-  </FulfillmentOption>
-);
-
-export default WrappedFullfillmentOptionsCheckoutAction;
+export default withComponents(FulfillmentOptionsCheckoutAction);

package/src/components/InlineAlert/v1/InlineAlert.js

@@ -175,6 +175,5 @@ class InlineAlert extends Component {
     );
   }
 }
-const WrappedInlineAlert = withComponents(InlineAlert);
 
-export default WrappedInlineAlert;
+export default withComponents(InlineAlert);

package/src/components/PhoneNumberInput/v1/PhoneNumberInput.js

@@ -479,8 +479,4 @@ class PhoneNumberInput extends Component {
   }
 }
 
-const WrappedPhoneNumberInput = withComponents(PhoneNumberInput);
-
-WrappedPhoneNumberInput.isFormInput = true;
-
-export default WrappedPhoneNumberInput;
+export default withComponents(PhoneNumberInput);

package/src/components/RegionInput/v1/RegionInput.js

@@ -80,8 +80,4 @@ class RegionInput extends Component {
   }
 }
 
-const WrappedRegionInput = withComponents(RegionInput);
-
-WrappedRegionInput.isFormInput = true;
-
-export default WrappedRegionInput;
+export default withComponents(RegionInput);

package/src/components/SelectableList/v1/SelectableList.js

@@ -359,8 +359,4 @@ class SelectableList extends Component {
   }
 }
 
-const WrappedSelectableList = withComponents(SelectableList);
-
-WrappedSelectableList.isFormInput = true;
-
-export default WrappedSelectableList;
+export default withComponents(SelectableList);