@graphcommerce/framer-next-pages 8.1.0-canary.35 → 8.1.0-canary.36
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +7 -0
- package/components/Pages.tsx +14 -1
- package/package.json +5 -5
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,12 @@
|
|
|
1
1
|
# Change Log
|
|
2
2
|
|
|
3
|
+
## 8.1.0-canary.36
|
|
4
|
+
|
|
5
|
+
### Minor Changes
|
|
6
|
+
|
|
7
|
+
- [#2284](https://github.com/graphcommerce-org/graphcommerce/pull/2284) [`5ee712c`](https://github.com/graphcommerce-org/graphcommerce/commit/5ee712c962c6b0dda903172660d70cf433321b7e) - Prevent checkout on looping back and forth with the cart overlay when navigating directly to the checkout.
|
|
8
|
+
([@Giovanni-Schroevers](https://github.com/Giovanni-Schroevers))
|
|
9
|
+
|
|
3
10
|
## 8.1.0-canary.35
|
|
4
11
|
|
|
5
12
|
## 8.1.0-canary.34
|
package/components/Pages.tsx
CHANGED
|
@@ -102,8 +102,21 @@ export function FramerNextPages(props: PagesProps) {
|
|
|
102
102
|
|
|
103
103
|
let renderItems = [...items.current]
|
|
104
104
|
|
|
105
|
+
/** Removes the page if the up path equls the path of a overlay and there is no history present **/
|
|
106
|
+
const upPath = (renderItems.at(0)?.pageProps?.up as { href: string; title: string })?.href
|
|
107
|
+
const overlayPath = renderItems.at(-1)?.routerContext.pageInfo.asPath
|
|
108
|
+
if (
|
|
109
|
+
renderItems.length === 2 &&
|
|
110
|
+
upPath &&
|
|
111
|
+
overlayPath &&
|
|
112
|
+
upPath === overlayPath &&
|
|
113
|
+
renderItems.at(-1)?.overlayGroup
|
|
114
|
+
) {
|
|
115
|
+
renderItems = renderItems.slice(1)
|
|
116
|
+
}
|
|
117
|
+
|
|
105
118
|
/** We need to render back to the last item that isn't an overlay. */
|
|
106
|
-
const plainIdx = findPlainIdx(
|
|
119
|
+
const plainIdx = findPlainIdx(renderItems)
|
|
107
120
|
|
|
108
121
|
const shouldLoadFb = plainIdx === -1 && typeof window !== 'undefined' && !fb
|
|
109
122
|
|
package/package.json
CHANGED
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
"name": "@graphcommerce/framer-next-pages",
|
|
3
3
|
"homepage": "https://www.graphcommerce.org/",
|
|
4
4
|
"repository": "github:graphcommerce-org/graphcommerce",
|
|
5
|
-
"version": "8.1.0-canary.
|
|
5
|
+
"version": "8.1.0-canary.36",
|
|
6
6
|
"sideEffects": false,
|
|
7
7
|
"prettier": "@graphcommerce/prettier-config-pwa",
|
|
8
8
|
"eslintConfig": {
|
|
@@ -12,10 +12,10 @@
|
|
|
12
12
|
}
|
|
13
13
|
},
|
|
14
14
|
"peerDependencies": {
|
|
15
|
-
"@graphcommerce/eslint-config-pwa": "^8.1.0-canary.
|
|
16
|
-
"@graphcommerce/framer-utils": "^8.1.0-canary.
|
|
17
|
-
"@graphcommerce/prettier-config-pwa": "^8.1.0-canary.
|
|
18
|
-
"@graphcommerce/typescript-config-pwa": "^8.1.0-canary.
|
|
15
|
+
"@graphcommerce/eslint-config-pwa": "^8.1.0-canary.36",
|
|
16
|
+
"@graphcommerce/framer-utils": "^8.1.0-canary.36",
|
|
17
|
+
"@graphcommerce/prettier-config-pwa": "^8.1.0-canary.36",
|
|
18
|
+
"@graphcommerce/typescript-config-pwa": "^8.1.0-canary.36",
|
|
19
19
|
"framer-motion": "^10.0.0",
|
|
20
20
|
"next": "*",
|
|
21
21
|
"react": "^18.2.0",
|