- Address PR feedback

- Update test snaps after mainline merge
magento · Feb 5, 2020 · 23e9cb5 · 23e9cb5
1 parent b033585
commit 23e9cb5
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 11 deletions.
diff --git a/packages/peregrine/lib/talons/CartPage/PriceAdjustments/ShippingMethods/useShippingForm.js b/packages/peregrine/lib/talons/CartPage/PriceAdjustments/ShippingMethods/useShippingForm.js
@@ -61,6 +61,13 @@ export const useShippingForm = props => {
         [fetchStates]
     );
 
+    /**
+     * When the zip value is changed, go ahead and manually wipe out that
+     * portion of the cache, which will cause the components subscribed to
+     * that state to re-render. Ideally we would send a mutation to clear the
+     * shipping address set on the cart, to keep those states in sync, but the
+     * GraphQL API does not currently supported clearing addresses.
+     */
     const handleZipChange = useCallback(
         zip => {
             if (zip !== selectedValues.zip) {

diff --git a/...ages/peregrine/lib/talons/CartPage/PriceAdjustments/ShippingMethods/useShippingMethods.js b/...ages/peregrine/lib/talons/CartPage/PriceAdjustments/ShippingMethods/useShippingMethods.js
@@ -14,6 +14,7 @@ export const useShippingMethods = props => {
     );
 
     const [isShowingForm, setIsShowingForm] = useState(false);
+    const showForm = () => setIsShowingForm(true);
 
     useEffect(() => {
         if (cartId) {
@@ -26,12 +27,7 @@ export const useShippingMethods = props => {
     }, [cartId, fetchShippingMethods]);
 
     useEffect(() => {
-        if (
-            data &&
-            data.cart &&
-            data.cart.shipping_addresses &&
-            data.cart.shipping_addresses.length
-        ) {
+        if (data && data.cart.shipping_addresses.length) {
             setIsShowingForm(true);
         }
     }, [data]);
@@ -76,7 +72,7 @@ export const useShippingMethods = props => {
         isShowingForm,
         selectedShippingFields,
         selectedShippingMethod,
-        setIsShowingForm,
-        shippingMethods: formattedShippingMethods
+        shippingMethods: formattedShippingMethods,
+        showForm
     };
 };
diff --git a/...rtPage/PriceAdjustments/ShippingMethods/__tests__/__snapshots__/shippingForm.spec.js.snap b/...rtPage/PriceAdjustments/ShippingMethods/__tests__/__snapshots__/shippingForm.spec.js.snap
@@ -9,6 +9,7 @@ Array [
   </h3>,
   <form
     className="root"
+    onKeyDown={[Function]}
     onReset={[Function]}
     onSubmit={[Function]}
   >
@@ -185,6 +186,7 @@ Array [
   </h3>,
   <form
     className="root"
+    onKeyDown={[Function]}
     onReset={[Function]}
     onSubmit={[Function]}
   >
@@ -375,6 +377,7 @@ Array [
   </h3>,
   <form
     className="root"
+    onKeyDown={[Function]}
     onReset={[Function]}
     onSubmit={[Function]}
   >
@@ -607,6 +610,7 @@ Array [
   </h3>,
   <form
     className="root"
+    onKeyDown={[Function]}
     onReset={[Function]}
     onSubmit={[Function]}
   >
@@ -828,6 +832,7 @@ Array [
   </h3>,
   <form
     className="root"
+    onKeyDown={[Function]}
     onReset={[Function]}
     onSubmit={[Function]}
   >

diff --git a/...age/PriceAdjustments/ShippingMethods/__tests__/__snapshots__/shippingMethods.spec.js.snap b/...age/PriceAdjustments/ShippingMethods/__tests__/__snapshots__/shippingMethods.spec.js.snap
@@ -25,6 +25,7 @@ exports[`renders address form and methods with address set 1`] = `
     Shipping Methods
   </h3>
   <form
+    onKeyDown={[Function]}
     onReset={[Function]}
     onSubmit={[Function]}
   >

diff --git a/...Page/PriceAdjustments/ShippingMethods/__tests__/__snapshots__/shippingRadios.spec.js.snap b/...Page/PriceAdjustments/ShippingMethods/__tests__/__snapshots__/shippingRadios.spec.js.snap
@@ -2,6 +2,7 @@
 
 exports[`automatically selects first option when none selected 1`] = `
 <form
+  onKeyDown={[Function]}
   onReset={[Function]}
   onSubmit={[Function]}
 >
@@ -69,6 +70,7 @@ exports[`automatically selects first option when none selected 1`] = `
 
 exports[`renders list of shipping methods 1`] = `
 <form
+  onKeyDown={[Function]}
   onReset={[Function]}
   onSubmit={[Function]}
 >

diff --git a/...ages/venia-ui/lib/components/CartPage/PriceAdjustments/ShippingMethods/shippingMethods.js b/...ages/venia-ui/lib/components/CartPage/PriceAdjustments/ShippingMethods/shippingMethods.js
@@ -16,8 +16,8 @@ const ShippingMethods = props => {
         isShowingForm,
         selectedShippingFields,
         selectedShippingMethod,
-        setIsShowingForm,
-        shippingMethods
+        shippingMethods,
+        showForm
     } = useShippingMethods({
         getShippingMethodsQuery: GET_SHIPPING_METHODS
     });
@@ -56,7 +56,7 @@ const ShippingMethods = props => {
                     classes={{ root_lowPriority: classes.estimateLink }}
                     priority="low"
                     type="button"
-                    onClick={() => setIsShowingForm(true)}
+                    onClick={showForm}
                 >
                     I want to estimate my shipping
                 </Button>