@graphcommerce/magento-cart-payment-method 3.6.7 → 3.6.9

package/CHANGELOG.md

@@ -1,5 +1,28 @@
 # Change Log
 
+## 3.6.9
+
+### Patch Changes
+
+- [#1692](https://github.com/graphcommerce-org/graphcommerce/pull/1692) [`a7fbe58d4`](https://github.com/graphcommerce-org/graphcommerce/commit/a7fbe58d4bbb43c59fa2ead05935757d2013404c) Thanks [@paales](https://github.com/paales)! - Make sure the cartLock state is refreshed when the page is loaded with the bfcache
+
+- [#1692](https://github.com/graphcommerce-org/graphcommerce/pull/1692) [`edbecfbfd`](https://github.com/graphcommerce-org/graphcommerce/commit/edbecfbfd532a6c78ae75ffe850c4bcf898e855d) Thanks [@paales](https://github.com/paales)! - Locking the cart when navigating away from the checkout and unlock the cart when pressing back. Made the justLocked flag a global state.
+
+- Updated dependencies [[`a26a2d05e`](https://github.com/graphcommerce-org/graphcommerce/commit/a26a2d05eecabeeef70e4d69105343197ae092b7)]:
+  - @graphcommerce/magento-cart@4.9.5
+
+## 3.6.8
+
+### Patch Changes
+
+- [#1688](https://github.com/graphcommerce-org/graphcommerce/pull/1688) [`f544401c7`](https://github.com/graphcommerce-org/graphcommerce/commit/f544401c7b653fda39c7c260ad0dcfb3bf543b65) Thanks [@paales](https://github.com/paales)! - Return the promise when changing the URL
+
+- Updated dependencies [[`8393cb266`](https://github.com/graphcommerce-org/graphcommerce/commit/8393cb2662860be0c2aa5df432447bb73c427d8e), [`f544401c7`](https://github.com/graphcommerce-org/graphcommerce/commit/f544401c7b653fda39c7c260ad0dcfb3bf543b65), [`f105d4223`](https://github.com/graphcommerce-org/graphcommerce/commit/f105d4223aa68df30970149e51ae72897e489bf9)]:
+  - @graphcommerce/next-ui@4.29.3
+  - @graphcommerce/framer-scroller@2.1.45
+  - @graphcommerce/magento-cart@4.9.4
+  - @graphcommerce/magento-store@4.3.6
+
 ## 3.6.7
 
 ### Patch Changes

package/hooks/useCartLock.ts

@@ -1,6 +1,6 @@
 import { useCurrentCartId } from '@graphcommerce/magento-cart'
 import { useUrlQuery } from '@graphcommerce/next-ui'
-import { useState } from 'react'
+import { useEffect, useState } from 'react'
 
 export type CartLockState = {
   cart_id: string | null
@@ -8,6 +8,8 @@ export type CartLockState = {
   method: string | null
 }
 
+let justLocked = false
+
 /**
  * Locking a cart might is usefull in the following cases: We want to disable cart modifications
  * while still keeping the cart active on the website.
@@ -16,21 +18,33 @@ export type CartLockState = {
  */
 export function useCartLock<E extends CartLockState>() {
   const { currentCartId } = useCurrentCartId()
-  const [justLocked, setJustLocked] = useState(false)
   const [queryState, setRouterQuery] = useUrlQuery<E>()
+  const [, setForceRender] = useState(0)
+
+  useEffect(() => {
+    const pageshow = (e: PageTransitionEvent) => {
+      if (!e.persisted) return
+      justLocked = false
+      setForceRender((cnt) => cnt + 1)
+    }
+    window.addEventListener('pageshow', pageshow)
+    return () => {
+      window.removeEventListener('pageshow', pageshow)
+    }
+  })
 
   const lock = (params: Omit<E, 'locked' | 'cart_id'>) => {
-    if (!currentCartId) return
-    setJustLocked(true)
-    setRouterQuery({
+    if (!currentCartId) return undefined
+    justLocked = true
+    return setRouterQuery({
       locked: '1',
       cart_id: currentCartId,
       ...params,
     } as unknown as E)
   }
 
-  const unlock = (params: Omit<E, 'locked' | 'cart_id' | 'method'>) => {
-    setRouterQuery({ cart_id: null, locked: null, method: null, ...params } as E)
+  const unlock = async (params: Omit<E, 'locked' | 'cart_id' | 'method'>) => {
+    await setRouterQuery({ cart_id: null, locked: null, method: null, ...params } as E)
     return queryState
   }
 

package/package.json

@@ -2,7 +2,7 @@
   "name": "@graphcommerce/magento-cart-payment-method",
   "homepage": "https://www.graphcommerce.org/",
   "repository": "github:graphcommerce-org/graphcommerce",
-  "version": "3.6.7",
+  "version": "3.6.9",
   "sideEffects": false,
   "prettier": "@graphcommerce/prettier-config-pwa",
   "eslintConfig": {
@@ -15,17 +15,17 @@
     "@graphcommerce/eslint-config-pwa": "^4.1.10",
     "@graphcommerce/prettier-config-pwa": "^4.0.6",
     "@graphcommerce/typescript-config-pwa": "^4.0.4",
-    "@graphcommerce/magento-cart-shipping-address": "3.5.7",
+    "@graphcommerce/magento-cart-shipping-address": "3.5.9",
     "@playwright/test": "^1.21.1",
     "type-fest": "^2.12.2"
   },
   "dependencies": {
-    "@graphcommerce/framer-scroller": "2.1.44",
+    "@graphcommerce/framer-scroller": "2.1.45",
     "@graphcommerce/graphql": "3.5.0",
     "@graphcommerce/image": "3.1.10",
-    "@graphcommerce/magento-cart": "4.9.3",
-    "@graphcommerce/magento-store": "4.3.5",
-    "@graphcommerce/next-ui": "4.29.2",
+    "@graphcommerce/magento-cart": "4.9.5",
+    "@graphcommerce/magento-store": "4.3.6",
+    "@graphcommerce/next-ui": "4.29.3",
     "@graphcommerce/react-hook-form": "3.3.5"
   },
   "peerDependencies": {