@graphcommerce/framer-next-pages 8.1.0-canary.8 → 9.0.0-canary.100

package/CHANGELOG.md

@@ -1,5 +1,197 @@
 # Change Log
 
+## 9.0.0-canary.100
+
+## 9.0.0-canary.99
+
+## 9.0.0-canary.98
+
+## 9.0.0-canary.97
+
+## 9.0.0-canary.96
+
+## 9.0.0-canary.95
+
+## 9.0.0-canary.94
+
+## 9.0.0-canary.93
+
+## 9.0.0-canary.92
+
+## 9.0.0-canary.91
+
+## 9.0.0-canary.90
+
+## 9.0.0-canary.89
+
+## 9.0.0-canary.88
+
+## 9.0.0-canary.87
+
+## 9.0.0-canary.86
+
+## 9.0.0-canary.85
+
+## 9.0.0-canary.84
+
+## 9.0.0-canary.83
+
+## 9.0.0-canary.82
+
+## 9.0.0-canary.81
+
+## 9.0.0-canary.80
+
+## 9.0.0-canary.79
+
+### Patch Changes
+
+- [#2356](https://github.com/graphcommerce-org/graphcommerce/pull/2356) [`d283901`](https://github.com/graphcommerce-org/graphcommerce/commit/d283901cb537c3e7bf6f5500e9f52f47f452cf10) - Loading an overlay page directly would animate in the overlay instead of directly showing it. ([@paales](https://github.com/paales))
+
+## 9.0.0-canary.78
+
+## 9.0.0-canary.77
+
+## 9.0.0-canary.76
+
+## 9.0.0-canary.75
+
+## 9.0.0-canary.74
+
+## 9.0.0-canary.73
+
+## 9.0.0-canary.72
+
+## 9.0.0-canary.71
+
+## 9.0.0-canary.70
+
+## 9.0.0-canary.69
+
+## 9.0.0-canary.68
+
+## 9.0.0-canary.67
+
+## 9.0.0-canary.66
+
+## 9.0.0-canary.65
+
+## 9.0.0-canary.64
+
+## 9.0.0-canary.63
+
+## 9.0.0-canary.62
+
+## 9.0.0-canary.61
+
+## 9.0.0-canary.60
+
+## 9.0.0-canary.59
+
+## 9.0.0-canary.58
+
+## 9.0.0-canary.57
+
+## 9.0.0-canary.56
+
+## 9.0.0-canary.55
+
+## 9.0.0-canary.54
+
+## 8.1.0-canary.53
+
+## 8.1.0-canary.52
+
+## 8.1.0-canary.51
+
+## 8.1.0-canary.50
+
+## 8.1.0-canary.49
+
+## 8.1.0-canary.48
+
+## 8.1.0-canary.47
+
+## 8.1.0-canary.46
+
+## 8.1.0-canary.45
+
+## 8.1.0-canary.44
+
+## 8.1.0-canary.43
+
+## 8.1.0-canary.42
+
+## 8.1.0-canary.41
+
+## 8.1.0-canary.40
+
+## 8.1.0-canary.39
+
+## 8.1.0-canary.38
+
+## 8.1.0-canary.37
+
+## 8.1.0-canary.36
+
+### Minor Changes
+
+- [#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. ([@Giovanni-Schroevers](https://github.com/Giovanni-Schroevers))
+
+## 8.1.0-canary.35
+
+## 8.1.0-canary.34
+
+## 8.1.0-canary.33
+
+## 8.1.0-canary.32
+
+## 8.1.0-canary.31
+
+## 8.1.0-canary.30
+
+## 8.1.0-canary.29
+
+## 8.1.0-canary.28
+
+## 8.1.0-canary.27
+
+## 8.1.0-canary.26
+
+## 8.1.0-canary.25
+
+## 8.1.0-canary.24
+
+## 8.1.0-canary.23
+
+## 8.1.0-canary.22
+
+## 8.1.0-canary.21
+
+## 8.1.0-canary.20
+
+## 8.1.0-canary.19
+
+## 8.1.0-canary.18
+
+## 8.1.0-canary.17
+
+## 8.1.0-canary.16
+
+## 8.1.0-canary.15
+
+## 8.1.0-canary.14
+
+## 8.1.0-canary.13
+
+## 8.1.0-canary.12
+
+## 8.1.0-canary.11
+
+## 8.1.0-canary.10
+
+## 8.1.0-canary.9
+
 ## 8.1.0-canary.8
 
 ## 8.1.0-canary.7
@@ -22,8 +214,7 @@
 
 ### Patch Changes
 
-- [#2236](https://github.com/graphcommerce-org/graphcommerce/pull/2236) [`85fb916`](https://github.com/graphcommerce-org/graphcommerce/commit/85fb916e5ec2a1456a93a59bf92a5f414fee8595) - Solve issue where the inert prop wouldnt be properly forwarded
-  ([@paales](https://github.com/paales))
+- [#2236](https://github.com/graphcommerce-org/graphcommerce/pull/2236) [`85fb916`](https://github.com/graphcommerce-org/graphcommerce/commit/85fb916e5ec2a1456a93a59bf92a5f414fee8595) - Solve issue where the inert prop wouldnt be properly forwarded ([@paales](https://github.com/paales))
 
 ## 8.0.5-canary.10
 
@@ -43,8 +234,7 @@
 
 ### Patch Changes
 
-- [#2236](https://github.com/graphcommerce-org/graphcommerce/pull/2236) [`85fb916`](https://github.com/graphcommerce-org/graphcommerce/commit/85fb916e5ec2a1456a93a59bf92a5f414fee8595) - Solve issue where the inert prop wouldnt be properly forwarded
-  ([@paales](https://github.com/paales))
+- [#2236](https://github.com/graphcommerce-org/graphcommerce/pull/2236) [`85fb916`](https://github.com/graphcommerce-org/graphcommerce/commit/85fb916e5ec2a1456a93a59bf92a5f414fee8595) - Solve issue where the inert prop wouldnt be properly forwarded ([@paales](https://github.com/paales))
 
 ## 8.0.5-canary.2
 
@@ -56,8 +246,7 @@
 
 ### Patch Changes
 
-- [#2228](https://github.com/graphcommerce-org/graphcommerce/pull/2228) [`0c0cacb`](https://github.com/graphcommerce-org/graphcommerce/commit/0c0cacb8725f0a626ea5d3acf154d83c433c3eb7) - apply correct type for the inert property
-  ([@carlocarels90](https://github.com/carlocarels90))
+- [#2228](https://github.com/graphcommerce-org/graphcommerce/pull/2228) [`0c0cacb`](https://github.com/graphcommerce-org/graphcommerce/commit/0c0cacb8725f0a626ea5d3acf154d83c433c3eb7) - apply correct type for the inert property ([@carlocarels90](https://github.com/carlocarels90))
 
 ## 8.0.4-canary.1
 
@@ -65,8 +254,7 @@
 
 ### Patch Changes
 
-- [#2228](https://github.com/graphcommerce-org/graphcommerce/pull/2228) [`0c0cacb`](https://github.com/graphcommerce-org/graphcommerce/commit/0c0cacb8725f0a626ea5d3acf154d83c433c3eb7) - apply correct type for the inert property
-  ([@carlocarels90](https://github.com/carlocarels90))
+- [#2228](https://github.com/graphcommerce-org/graphcommerce/pull/2228) [`0c0cacb`](https://github.com/graphcommerce-org/graphcommerce/commit/0c0cacb8725f0a626ea5d3acf154d83c433c3eb7) - apply correct type for the inert property ([@carlocarels90](https://github.com/carlocarels90))
 
 ## 8.0.3
 

package/README.md

@@ -87,7 +87,7 @@ Example routes:
 
 - `pages/account.tsx`
 - `pages/account/orders.tsx`
-- `pages/account/orders/[orderId].tsx`
+- `pages/account/orders/[orderNumber].tsx`
 
 ```tsx
 import { PageOptions } from '@graphcommerce/framer-next-pages'

package/components/Pages.tsx

@@ -5,7 +5,7 @@ import { PrivateRouteInfo } from 'next/dist/shared/lib/router/router'
 import { AppPropsType } from 'next/dist/shared/lib/utils'
 import { NextRouter, Router } from 'next/router'
 import { useEffect, useRef, useState } from 'react'
-import { pageContext } from '../context/pageContext'
+import { Direction, pageContext } from '../context/pageContext'
 import type { PageComponent, PageItem, UpPage } from '../types'
 import { Page } from './Page'
 import { PageRenderer } from './PageRenderer'
@@ -56,7 +56,8 @@ export function FramerNextPages(props: PagesProps) {
   const idx = routerKeys.indexOf(key)
 
   const prevHistory = useRef<number>(-1)
-  const direction = idx >= prevHistory.current ? 1 : -1
+  let direction: Direction = idx >= prevHistory.current ? 1 : -1
+  if (prevHistory.current === -1) direction = 0
 
   prevHistory.current = idx
 
@@ -102,8 +103,21 @@ export function FramerNextPages(props: PagesProps) {
 
   let renderItems = [...items.current]
 
+  /**  Removes the page if the up path equls the path of a overlay and there is no history present **/
+  const upPath = (renderItems.at(0)?.pageProps?.up as { href: string; title: string })?.href
+  const overlayPath = renderItems.at(-1)?.routerContext.pageInfo.asPath
+  if (
+    renderItems.length === 2 &&
+    upPath &&
+    overlayPath &&
+    upPath === overlayPath &&
+    renderItems.at(-1)?.overlayGroup
+  ) {
+    renderItems = renderItems.slice(1)
+  }
+
   /** We need to render back to the last item that isn't an overlay. */
-  const plainIdx = findPlainIdx(items.current)
+  const plainIdx = findPlainIdx(renderItems)
 
   const shouldLoadFb = plainIdx === -1 && typeof window !== 'undefined' && !fb
 

package/context/pageContext.ts

@@ -1,9 +1,17 @@
 import { createContext } from 'react'
 
-export type Direction = 1 | -1
+/**
+ * - `-1` -> Navigated back
+ * - `0` -> Loaded the page
+ * - `1` -> Navigated forward
+ */
+export type Direction = -1 | 0 | 1
 
 export type PageContext = {
-  /** Number of steps we need to navigate back to go to the last non-overlay page and thus close the overlay */
+  /**
+   * Number of steps we need to navigate back to go to the last non-overlay page and thus close the
+   * overlay
+   */
   closeSteps: number
 
   /** Number of steps we can go back inside the the current overlay */

package/hooks/useHistoryLink.ts

@@ -10,24 +10,17 @@ export function useHistoryLink(options: UseHistoryLink) {
   const prevRouter = usePrevPageRouter()
   const router = useRouter()
 
-  const onClick =
-    href === prevRouter?.asPath
-      ? (e: ClickEvent) => {
-          e.preventDefault()
-          router.back()
-        }
-      : undefined
+  const onClick = (e: ClickEvent) => {
+    e.preventDefault()
+
+    if (href === prevRouter?.asPath) return router.back()
+    return router.replace(href)
+  }
 
   return { onClick, href }
 }
 
 export function useHistoryGo(options: UseHistoryLink) {
-  const { onClick, href } = useHistoryLink(options)
-  const router = useRouter()
-
-  return () => {
-    if (onClick) onClick({ preventDefault: () => {} })
-    // eslint-disable-next-line @typescript-eslint/no-floating-promises
-    else router.push(href)
-  }
+  const { onClick } = useHistoryLink(options)
+  return () => onClick({ preventDefault: () => {} })
 }

package/package.json

@@ -2,7 +2,7 @@
   "name": "@graphcommerce/framer-next-pages",
   "homepage": "https://www.graphcommerce.org/",
   "repository": "github:graphcommerce-org/graphcommerce",
-  "version": "8.1.0-canary.8",
+  "version": "9.0.0-canary.100",
   "sideEffects": false,
   "prettier": "@graphcommerce/prettier-config-pwa",
   "eslintConfig": {
@@ -12,10 +12,10 @@
     }
   },
   "peerDependencies": {
-    "@graphcommerce/eslint-config-pwa": "^8.1.0-canary.8",
-    "@graphcommerce/framer-utils": "^8.1.0-canary.8",
-    "@graphcommerce/prettier-config-pwa": "^8.1.0-canary.8",
-    "@graphcommerce/typescript-config-pwa": "^8.1.0-canary.8",
+    "@graphcommerce/eslint-config-pwa": "^9.0.0-canary.100",
+    "@graphcommerce/framer-utils": "^9.0.0-canary.100",
+    "@graphcommerce/prettier-config-pwa": "^9.0.0-canary.100",
+    "@graphcommerce/typescript-config-pwa": "^9.0.0-canary.100",
     "framer-motion": "^10.0.0",
     "next": "*",
     "react": "^18.2.0",