@graphcommerce/next-ui 4.8.4 → 4.9.0

package/ActionCard/ActionCard.tsx

@@ -14,6 +14,7 @@ export type ActionCardProps = {
   hidden?: boolean | (() => boolean)
   value: string | number
   reset?: React.ReactNode
+  disabled?: boolean
 }
 
 const actionButtonStyles: SxProps = {
@@ -41,6 +42,7 @@ export function ActionCard(props: ActionCardProps) {
     selected,
     hidden,
     reset,
+    disabled,
   } = props
 
   const handleClick = (event: FormEvent<HTMLElement>) => onClick?.(event, value)
@@ -50,6 +52,7 @@ export function ActionCard(props: ActionCardProps) {
       component='div'
       className='ActionCard-root'
       onClick={handleClick}
+      disabled={disabled}
       sx={[
         (theme) => ({
           display: 'grid',
@@ -93,11 +96,20 @@ export function ActionCard(props: ActionCardProps) {
             borderBottomRightRadius: theme.shape.borderRadius,
             padding: `${theme.spacings.xxs} ${theme.spacings.xs}`,
           })),
+        !!disabled &&
+          ((theme) => ({
+            background: theme.palette.background.default,
+          })),
+
         ...(Array.isArray(sx) ? sx : [sx]),
       ]}
     >
       {image && <Box sx={{ gridArea: 'image', justifySelf: 'center', padding: 1 }}>{image}</Box>}
-      {title && <Box sx={{ gridArea: 'title', fontWeight: 'bold' }}>{title}</Box>}
+      {title && (
+        <Box sx={{ gridArea: 'title', fontWeight: 'bold', marginLeft: !image ? -2 : undefined }}>
+          {title}
+        </Box>
+      )}
       {action && (
         <Box
           sx={{
@@ -109,7 +121,13 @@ export function ActionCard(props: ActionCardProps) {
           {!selected ? action : reset}
         </Box>
       )}
-      {details && <Box sx={{ gridArea: 'details', color: 'text.secondary' }}>{details}</Box>}
+      {details && (
+        <Box
+          sx={{ gridArea: 'details', color: 'text.secondary', marginLeft: !image ? -2 : undefined }}
+        >
+          {details}
+        </Box>
+      )}
       {secondaryAction && (
         <Box sx={{ gridArea: 'secondaryAction', ...actionButtonStyles }}>{secondaryAction}</Box>
       )}

package/CHANGELOG.md

@@ -1,5 +1,21 @@
 # Change Log
 
+## 4.9.0
+
+### Minor Changes
+
+- [#1503](https://github.com/graphcommerce-org/graphcommerce/pull/1503) [`a9213f1f5`](https://github.com/graphcommerce-org/graphcommerce/commit/a9213f1f5a410d217768386ccb6d9b5ce7bd5782) Thanks [@mikekeehnen](https://github.com/mikekeehnen)! - Bug fixes for shipping methods in /checkout
+
+### Patch Changes
+
+- [#1490](https://github.com/graphcommerce-org/graphcommerce/pull/1490) [`d311ef48b`](https://github.com/graphcommerce-org/graphcommerce/commit/d311ef48bb3e97806d992af5516d6b7f183ec9cb) Thanks [@paales](https://github.com/paales)! - upgraded packages
+
+- Updated dependencies [[`ddb6d6329`](https://github.com/graphcommerce-org/graphcommerce/commit/ddb6d6329bfad361b2fbe96402ca2bfc0ab3d98c), [`d311ef48b`](https://github.com/graphcommerce-org/graphcommerce/commit/d311ef48bb3e97806d992af5516d6b7f183ec9cb)]:
+  - @graphcommerce/framer-scroller@2.1.16
+  - @graphcommerce/framer-next-pages@3.2.3
+  - @graphcommerce/framer-utils@3.1.4
+  - @graphcommerce/image@3.1.7
+
 ## 4.8.4
 
 ### Patch Changes

package/FramerScroller/SidebarGallery.tsx

@@ -7,8 +7,7 @@ import {
   ScrollerDots,
   ScrollerProvider,
 } from '@graphcommerce/framer-scroller'
-import { clientSize, useMotionValueValue } from '@graphcommerce/framer-utils'
-import { Fab, useTheme, alpha, Box, styled, SxProps, Theme } from '@mui/material'
+import { Fab, useTheme, Box, styled, SxProps, Theme } from '@mui/material'
 import { m, useDomEvent, useMotionValue } from 'framer-motion'
 import { useRouter } from 'next/router'
 import React, { useEffect, useRef } from 'react'
@@ -61,7 +60,6 @@ export function SidebarGallery(props: SidebarGalleryProps) {
 
   const router = useRouter()
   const prevRoute = usePrevPageRouter()
-  const clientHeight = useMotionValueValue(clientSize.y, (y) => y)
   // const classes = useMergedClasses(useStyles({ clientHeight, aspectRatio }).classes, props.classes)
 
   const route = `#${routeHash}`
@@ -162,7 +160,7 @@ export function SidebarGallery(props: SidebarGalleryProps) {
                 },
               },
               zoomed && {
-                paddingTop: `${clientHeight}px`,
+                paddingTop: `var(--client-size-y)`,
               },
             ]}
             onLayoutAnimationComplete={() => {
@@ -186,7 +184,7 @@ export function SidebarGallery(props: SidebarGalleryProps) {
                   cursor: 'zoom-in',
                 },
                 zoomed && {
-                  height: clientHeight,
+                  height: `var(--client-size-y)`,
                   cursor: 'inherit',
                 },
               ]}

package/LayoutOverlay/components/LayoutOverlayBase.tsx

@@ -151,6 +151,7 @@ export function LayoutOverlayBase(incommingProps: LayoutOverlayBaseProps) {
     if (isPresent) return
     position.set(OverlayPosition.CLOSED)
     clearScrollLock()
+
     // eslint-disable-next-line @typescript-eslint/no-floating-promises
     scrollTo({
       x: positions.closed.x.get(),

package/LayoutParts/DesktopHeaderBadge.tsx

@@ -3,6 +3,7 @@ import { Badge, BadgeProps } from '@mui/material'
 /** Note: This should _only_ be used on the Desktop, use a standard Badge for other usecases. */
 export function DesktopHeaderBadge(props: BadgeProps) {
   const { sx = false } = props
+
   return (
     <Badge
       {...props}

package/LayoutParts/DesktopNavActions.tsx

@@ -1,6 +1,6 @@
-import { Box, styled } from '@mui/material'
+import { styled } from '@mui/material'
 
-export const DesktopNavActions = styled(Box, { name: 'DesktopNavActions' })(({ theme }) => ({
+export const DesktopNavActions = styled('div', { name: 'DesktopNavActions' })(({ theme }) => ({
   display: 'none',
   [theme.breakpoints.up('md')]: {
     display: 'grid',

package/LayoutParts/DesktopNavBar.tsx

@@ -14,8 +14,7 @@ export type MenuTabsProps = {
 const { classes, selectors } = extendableComponent('DesktopNavBar', [
   'root',
   'scroller',
-  'leftWrapper',
-  'rightWrapper',
+  'button',
   'left',
   'right',
 ] as const)
@@ -34,6 +33,7 @@ export function DesktopNavBar(props: MenuTabsProps) {
             alignItems: 'center',
             position: 'relative',
             pointerEvents: 'all',
+            gridTemplateColumns: `auto 1fr auto`,
           },
           ...(Array.isArray(sx) ? sx : [sx]),
         ]}
@@ -51,61 +51,53 @@ export function DesktopNavBar(props: MenuTabsProps) {
           {children}
         </Scroller>
 
-        <Box
-          sx={{
+        <ScrollerButton
+          sxContainer={{
             gridArea: `1 / 1 / 1 / 2`,
             pointerEvents: 'none',
             '& > *': { pointerEvents: 'all' },
           }}
-          className={classes.leftWrapper}
+          sx={{
+            pointerEvents: 'all',
+            boxShadow: 'none',
+            height: 48,
+            borderTopLeftRadius: 0,
+            borderBottomLeftRadius: 0,
+            backgroundColor: 'transparent',
+            backgroundImage: (theme) =>
+              `linear-gradient(to left, rgba(255,255,255,0) 0%, ${theme.palette.background.default} 35%)`,
+          }}
+          direction='left'
+          size='small'
+          className={`${classes.left} ${classes.button}`}
         >
-          <ScrollerButton
-            sx={{
-              pointerEvents: 'all',
-              boxShadow: 'none',
-              height: 48,
-              borderTopLeftRadius: 0,
-              borderBottomLeftRadius: 0,
-              backgroundColor: 'transparent',
-              backgroundImage: (theme) =>
-                `linear-gradient(to left, rgba(255,255,255,0) 0%, ${theme.palette.background.default} 35%)`,
-            }}
-            direction='left'
-            size='small'
-            className={classes.left}
-          >
-            <IconSvg src={iconLeft ?? iconChevronLeft} />
-          </ScrollerButton>
-        </Box>
+          <IconSvg src={iconLeft ?? iconChevronLeft} />
+        </ScrollerButton>
 
-        <Box
-          sx={{
+        <ScrollerButton
+          sxContainer={{
             gridArea: `1 / 3 / 1 / 4`,
             pointerEvents: 'none',
             '& > *': {
               pointerEvents: 'all',
             },
           }}
-          className={classes.rightWrapper}
+          sx={{
+            pointerEvents: 'all',
+            boxShadow: 'none',
+            height: 48,
+            borderTopRightRadius: 0,
+            borderBottomRightRadius: 0,
+            backgroundColor: 'transparent',
+            backgroundImage: (theme) =>
+              `linear-gradient(to right, rgba(255,255,255,0) 0%, ${theme.palette.background.default} 35%)`,
+          }}
+          direction='right'
+          size='small'
+          className={`${classes.right} ${classes.button}`}
         >
-          <ScrollerButton
-            sx={{
-              pointerEvents: 'all',
-              boxShadow: 'none',
-              height: 48,
-              borderTopRightRadius: 0,
-              borderBottomRightRadius: 0,
-              backgroundColor: 'transparent',
-              backgroundImage: (theme) =>
-                `linear-gradient(to right, rgba(255,255,255,0) 0%, ${theme.palette.background.default} 35%)`,
-            }}
-            direction='right'
-            size='small'
-            className={classes.right}
-          >
-            <IconSvg src={iconRight ?? iconChevronRight} />
-          </ScrollerButton>
-        </Box>
+          <IconSvg src={iconRight ?? iconChevronRight} />
+        </ScrollerButton>
       </Box>
     </ScrollerProvider>
   )

package/LayoutParts/MenuFab.tsx

@@ -1,4 +1,4 @@
-import { useMotionValueValue } from '@graphcommerce/framer-utils'
+import { useIsomorphicLayoutEffect, useMotionValueValue } from '@graphcommerce/framer-utils'
 import {
   Divider,
   Fab,
@@ -13,7 +13,7 @@ import {
 } from '@mui/material'
 import { m } from 'framer-motion'
 import { useRouter } from 'next/router'
-import React, { useEffect } from 'react'
+import React, { useEffect, useCallback, useRef } from 'react'
 import { IconSvg } from '../IconSvg'
 import { useScrollY } from '../Layout/hooks/useScrollY'
 import { extendableComponent } from '../Styles/extendableComponent'
@@ -64,7 +64,8 @@ export function MenuFab(props: MenuFabProps) {
     const clear = () => setOpenEl(null)
     router.events.on('routeChangeStart', clear)
     return () => router.events.off('routeChangeStart', clear)
-  }, [router])
+  }, [router.events])
+
   const fabIconSize = useFabSize('responsive')
 
   const classes = withState({ scrolled })

package/Page/CssAndFramerMotionProvider.tsx

@@ -1,5 +1,4 @@
 import { LazyMotion } from 'framer-motion'
-import { EmotionProvider } from '../Styles'
 
 export type GraphCommerceProviderProps = {
   children: React.ReactNode
@@ -15,7 +14,7 @@ export type GraphCommerceProviderProps = {
 export function CssAndFramerMotionProvider({ children }: GraphCommerceProviderProps) {
   return (
     <LazyMotion features={async () => (await import('./framerFeatures')).default} strict>
-      <EmotionProvider>{children}</EmotionProvider>
+      {children}
     </LazyMotion>
   )
 }

package/PageMeta/PageMeta.tsx

@@ -1,9 +1,9 @@
 import { usePageContext } from '@graphcommerce/framer-next-pages'
 import {
   resolveHref,
-  getDomainLocale,
   addBasePath,
   addLocale,
+  getDomainLocale,
 } from 'next/dist/shared/lib/router/router'
 import Head from 'next/head'
 import { useRouter } from 'next/router'

package/package.json

@@ -2,7 +2,7 @@
   "name": "@graphcommerce/next-ui",
   "homepage": "https://www.graphcommerce.org/",
   "repository": "github:graphcommerce-org/graphcommerce",
-  "version": "4.8.4",
+  "version": "4.9.0",
   "author": "",
   "license": "MIT",
   "sideEffects": false,
@@ -19,31 +19,31 @@
     "@emotion/react": "^11.9.0",
     "@emotion/server": "^11.4.0",
     "@emotion/styled": "^11.6.0",
-    "@graphcommerce/framer-next-pages": "3.2.2",
-    "@graphcommerce/framer-scroller": "2.1.15",
-    "@graphcommerce/framer-utils": "3.1.3",
-    "@graphcommerce/image": "3.1.6",
-    "react-is": "^17.0.0",
+    "@graphcommerce/framer-next-pages": "3.2.3",
+    "@graphcommerce/framer-scroller": "2.1.16",
+    "@graphcommerce/framer-utils": "3.1.4",
+    "@graphcommerce/image": "3.1.7",
+    "react-is": "^18.1.0",
     "react-schemaorg": "^2.0.0",
     "schema-dts": "^1.1.0"
   },
   "peerDependencies": {
-    "@lingui/react": "^3.13.2",
     "@lingui/core": "^3.13.2",
+    "@lingui/react": "^3.13.2",
     "@mui/lab": "^5.0.0-alpha.68",
     "@mui/material": "5.5.3",
     "framer-motion": "^6.2.4",
-    "next": "12.1.2",
-    "react": "^17.0.2",
-    "react-dom": "^17.0.2"
+    "next": "^12.1.2",
+    "react": "^18.0.0",
+    "react-dom": "^18.0.0"
   },
   "devDependencies": {
-    "@graphcommerce/eslint-config-pwa": "^4.1.7",
+    "@graphcommerce/eslint-config-pwa": "^4.1.8",
     "@graphcommerce/prettier-config-pwa": "^4.0.6",
     "@graphcommerce/typescript-config-pwa": "^4.0.3",
     "@playwright/test": "^1.21.1",
     "@types/react-is": "^17.0.3",
     "type-fest": "^2.12.2",
-    "typescript": "4.6.3"
+    "typescript": "4.7.3"
   }
 }