@graphcommerce/next-ui 6.0.0-canary.26 → 6.0.0-canary.28

package/Blog/BlogList/BlogList.tsx

@@ -1,13 +1,10 @@
-import { SxProps, Theme } from '@mui/material'
+import { ContainerProps } from '@mui/material'
 import { Row } from '../../Row/Row'
 
-type BlogItemGridProps = {
-  children: React.ReactNode
-  sx?: SxProps<Theme>
-}
+type BlogItemGridProps = ContainerProps
 
 export function BlogItemGrid(props: BlogItemGridProps) {
-  const { children, sx = [] } = props
+  const { sx = [], ...containerProps } = props
 
   return (
     <Row
@@ -19,8 +16,7 @@ export function BlogItemGrid(props: BlogItemGridProps) {
         }),
         ...(Array.isArray(sx) ? sx : [sx]),
       ]}
-    >
-      {children}
-    </Row>
+      {...containerProps}
+    />
   )
 }

package/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Change Log
 
+## 6.0.0-canary.28
+
+## 6.0.0-canary.27
+
 ## 6.0.0-canary.26
 
 ## 6.0.0-canary.25

package/LayoutParts/MenuFabSecondaryItem.tsx

@@ -23,7 +23,6 @@ export function MenuFabSecondaryItem(props: FabMenuSecondaryItemProps) {
       href={href}
       className={classes.root}
       sx={[{}, ...(Array.isArray(sx) ? sx : [sx])]}
-      component='a'
       dense
       selected={router.asPath.startsWith(href)}
     >

package/PageMeta/PageMeta.tsx

@@ -2,10 +2,12 @@ import { usePageContext } from '@graphcommerce/framer-next-pages'
 import { addBasePath } from 'next/dist/client/add-base-path'
 import { addLocale } from 'next/dist/client/add-locale'
 import { getDomainLocale } from 'next/dist/client/get-domain-locale'
-import { NextRouter, resolveHref } from 'next/dist/shared/lib/router/router'
+import { NextRouter } from 'next/dist/shared/lib/router/router'
+import { resolveHref } from 'next/dist/shared/lib/router/utils/resolve-href'
 import Head from 'next/head'
 import { useRouter } from 'next/router'
 import type {} from '@graphcommerce/next-config'
+import { i18nConfig } from '../hooks'
 
 // https://developers.google.com/search/docs/advanced/robots/robots_meta_tag#directives
 export type MetaRobots =
@@ -60,7 +62,8 @@ export function canonicalize(router: PartialNextRouter, incoming?: Canonical) {
 
     href = localeDomain || addBasePath(addLocale(as, curLocale, router.defaultLocale))
 
-    let siteUrl = import.meta.graphCommerce.canonicalBaseUrl
+    let siteUrl =
+      i18nConfig(router.locale)?.canonicalBaseUrl || import.meta.graphCommerce.canonicalBaseUrl
     if (siteUrl.endsWith('/')) siteUrl = siteUrl.slice(0, -1)
 
     canonical = `${siteUrl}${href}`

package/ToggleButtonGroup/ToggleButtonGroup.tsx

@@ -1,3 +1,4 @@
+/* eslint-disable @typescript-eslint/ban-ts-comment */
 import { Box, ToggleButtonGroupProps as ToggleButtonGroupPropsBase } from '@mui/material'
 import React from 'react'
 import { isFragment } from 'react-is'
@@ -103,15 +104,15 @@ const ToggleButtonGroup = React.forwardRef<HTMLDivElement, ToggleButtonGroupProp
         }
 
         return React.cloneElement(child, {
-          // @ts-expect-error TODO: fix TS error
+          // @ts-ignore
           className: `${classes.button} ${child.props.className ?? ''}`,
           onChange: exclusive ? handleExclusiveChange : handleChange,
           selected:
-            // @ts-expect-error TODO: fix TS error
+            // @ts-ignore
             child.props.selected === undefined
-              ? // @ts-expect-error TODO: fix TS error
+              ? // @ts-ignore
                 isValueSelected(child.props.value as string, value as string | string[])
-              : // @ts-expect-error TODO: fix TS error
+              : // @ts-ignore
                 child.props.selected,
         })
       })}

package/package.json

@@ -2,7 +2,7 @@
   "name": "@graphcommerce/next-ui",
   "homepage": "https://www.graphcommerce.org/",
   "repository": "github:graphcommerce-org/graphcommerce",
-  "version": "6.0.0-canary.26",
+  "version": "6.0.0-canary.28",
   "author": "",
   "license": "MIT",
   "sideEffects": false,
@@ -15,32 +15,32 @@
   },
   "dependencies": {
     "@emotion/cache": "^11.10.5",
-    "@emotion/react": "^11.10.5",
+    "@emotion/react": "^11.10.6",
     "@emotion/server": "^11.4.0",
-    "@emotion/styled": "^11.10.5",
-    "@graphcommerce/framer-next-pages": "6.0.0-canary.26",
-    "@graphcommerce/framer-scroller": "6.0.0-canary.26",
-    "@graphcommerce/framer-utils": "6.0.0-canary.26",
-    "@graphcommerce/image": "6.0.0-canary.26",
+    "@emotion/styled": "^11.10.6",
+    "@graphcommerce/framer-next-pages": "6.0.0-canary.28",
+    "@graphcommerce/framer-scroller": "6.0.0-canary.28",
+    "@graphcommerce/framer-utils": "6.0.0-canary.28",
+    "@graphcommerce/image": "6.0.0-canary.28",
     "cookie": "^0.5.0",
     "react-is": "^18.2.0",
     "schema-dts": "^1.1.0"
   },
   "devDependencies": {
-    "@graphcommerce/eslint-config-pwa": "6.0.0-canary.26",
-    "@graphcommerce/prettier-config-pwa": "6.0.0-canary.26",
-    "@graphcommerce/typescript-config-pwa": "6.0.0-canary.26",
+    "@graphcommerce/eslint-config-pwa": "6.0.0-canary.28",
+    "@graphcommerce/prettier-config-pwa": "6.0.0-canary.28",
+    "@graphcommerce/typescript-config-pwa": "6.0.0-canary.28",
     "@types/cookie": "^0.5.1",
     "@types/react-is": "^17.0.3",
-    "typescript": "4.9.4"
+    "typescript": "4.9.5"
   },
   "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.10.16",
     "framer-motion": "^7.0.0",
-    "next": "^13.1.1",
+    "next": "^13.2.0",
     "react": "^18.2.0",
     "react-dom": "^18.2.0"
   }