@graphcommerce/next-ui 3.14.7 → 3.15.2

package/AppShell/AppShellHeader/index.tsx

@@ -1,10 +1,4 @@
-import {
-  useHistoryLink,
-  usePageContext,
-  usePageRouter,
-  usePrevUp,
-  useUp,
-} from '@graphcommerce/framer-next-pages'
+import { usePageContext, usePageRouter, usePrevUp, useUp } from '@graphcommerce/framer-next-pages'
 import { Fab, makeStyles, Theme } from '@material-ui/core'
 import clsx from 'clsx'
 import { m, MotionValue, useMotionValue, useTransform } from 'framer-motion'
@@ -250,10 +244,6 @@ export default function AppShellHeader(props: AppShellHeaderProps) {
   const titleOffset = useMotionValue<number>(100)
   const titleHeight = useMotionValue<number>(100)
 
-  const { href: historyHref, onClick: historyOnClick } = useHistoryLink({
-    href: up?.href ?? '',
-  })
-
   const setOffset = useCallback(
     (offsetTop: number, offsetParent: Element | null, clientHeight: number) => {
       titleHeight.set(clientHeight)
@@ -339,19 +329,18 @@ export default function AppShellHeader(props: AppShellHeaderProps) {
 
   const canClickBack = backSteps > 0 && router.asPath !== prevUp?.href
   let back = canClickBack && (
-    <PageLink href={historyHref} passHref>
-      <Button
-        onClick={historyOnClick}
-        variant='pill-link'
-        size='small'
-        className={classes.backButton}
-        startIcon={backIcon}
-        aria-label='Back'
-      >
-        {historyOnClick ? up?.title : 'Back'}
-      </Button>
-    </PageLink>
+    <Button
+      onClick={() => router.back()}
+      variant='pill-link'
+      size='small'
+      className={classes.backButton}
+      startIcon={backIcon}
+      aria-label='Back'
+    >
+      {up?.href === router.asPath ? up?.title : 'Back'}
+    </Button>
   )
+
   if (!canClickBack && up?.href) {
     back = (
       <PageLink href={up?.href} passHref>

package/AppShell/MenuFab.tsx

@@ -53,9 +53,8 @@ const useStyles = makeStyles(
       minWidth: responsiveVal(200, 280),
     },
     menuItemText: {
-      ...theme.typography.h3,
-      fontWeight: 550,
-      lineHeight: 1,
+      ...theme.typography.h4,
+      lineHeight: 1.1,
     },
     menuItem: {},
   }),

package/AppShell/SheetShellBase/index.tsx

@@ -12,7 +12,7 @@ import {
 import { makeStyles, StyleRules, Theme } from '@material-ui/core'
 import { useDomEvent } from 'framer-motion'
 import { useRouter } from 'next/router'
-import React, { useRef } from 'react'
+import React, { useEffect, useRef, useState } from 'react'
 import responsiveVal from '../../Styles/responsiveVal'
 import AppShellProvider from '../AppShellProvider'
 import ShellBase, { PageLayoutBaseProps } from '../ShellBase'
@@ -63,11 +63,15 @@ function SheetShellBase(props: SheetShellBaseProps) {
   const { depth, closeSteps, active, direction } = usePageContext()
   const open = depth < 0 || router.asPath === pageRouter.asPath
   const initialLocale = useRef(router.locale)
+  const [isNavigating, setIsNavigating] = useState<boolean>(false)
 
   function handleClose() {
-    return initialLocale.current !== router.locale
-      ? pageRouter.push('/')
-      : pageRouter.go(closeSteps * -1)
+    if (!isNavigating) {
+      setIsNavigating(true)
+      return initialLocale.current !== router.locale
+        ? pageRouter.push('/')
+        : pageRouter.go(closeSteps * -1)
+    }
   }
 
   function handleSnap(snapPoint: SnapPoint) {

package/CHANGELOG.md

@@ -3,6 +3,51 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [3.15.2](https://github.com/ho-nl/m2-pwa/compare/@graphcommerce/next-ui@3.15.1...@graphcommerce/next-ui@3.15.2) (2021-11-12)
+
+
+### Bug Fixes
+
+* **sheet-shell-base:** prevent sheet backdrop from navigating back multiple times ([5ca2f7e](https://github.com/ho-nl/m2-pwa/commit/5ca2f7e0d3404501a6b5763daf1d442c8080f8cb))
+
+
+
+
+
+## [3.15.1](https://github.com/ho-nl/m2-pwa/compare/@graphcommerce/next-ui@3.15.0...@graphcommerce/next-ui@3.15.1) (2021-11-11)
+
+
+### Bug Fixes
+
+* better handling to go back from product page ([ff8e72b](https://github.com/ho-nl/m2-pwa/commit/ff8e72beef81b9fb0d20cbfbd50c282f0144aed7))
+
+
+
+
+
+# [3.15.0](https://github.com/ho-nl/m2-pwa/compare/@graphcommerce/next-ui@3.14.8...@graphcommerce/next-ui@3.15.0) (2021-11-11)
+
+
+### Features
+
+* lingui configuration and integration greatly simplified and fixed ssr ([d8ec22a](https://github.com/ho-nl/m2-pwa/commit/d8ec22a80295af854a4cf6f357c4fb137c5b550d))
+
+
+
+
+
+## [3.14.8](https://github.com/ho-nl/m2-pwa/compare/@graphcommerce/next-ui@3.14.7...@graphcommerce/next-ui@3.14.8) (2021-11-09)
+
+
+### Bug Fixes
+
+* **menu-fab:** revert h3 styling for mobile menu ([7a45b4f](https://github.com/ho-nl/m2-pwa/commit/7a45b4fb8b0165f7a072bc0658833c819c9f8082))
+* restyle menu to h4 ([642e166](https://github.com/ho-nl/m2-pwa/commit/642e16635dc06f38bed91ffd1a374922ac70439b))
+
+
+
+
+
 ## [3.14.7](https://github.com/ho-nl/m2-pwa/compare/@graphcommerce/next-ui@3.14.6...@graphcommerce/next-ui@3.14.7) (2021-11-09)
 
 

package/Page/Document.tsx

@@ -1,10 +1,10 @@
 import { ServerStyleSheets } from '@material-ui/core/styles'
 // eslint-disable-next-line @next/next/no-document-import-in-page
-import NextDocument, { DocumentContext } from 'next/document'
+import NextDocument, { DocumentContext, DocumentInitialProps } from 'next/document'
 import React from 'react'
 
 export default class Document extends NextDocument {
-  static getInitialProps = async (ctx: DocumentContext) => {
+  static getInitialProps = async (ctx: DocumentContext): Promise<DocumentInitialProps> => {
     const sheets = new ServerStyleSheets()
     const originalRenderPage = ctx.renderPage
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@graphcommerce/next-ui",
-  "version": "3.14.7",
+  "version": "3.15.2",
   "author": "",
   "license": "MIT",
   "scripts": {
@@ -53,5 +53,5 @@
       "project": "./tsconfig.json"
     }
   },
-  "gitHead": "c9d9c589d7e118318f3b44d8322e9bc71feca484"
+  "gitHead": "47e8be849eaecea00f8673696ae1ec3283ec5fd6"
 }