@graphcommerce/next-ui 7.0.0-canary.13 → 7.0.0-canary.21

package/CHANGELOG.md

@@ -1,8 +1,32 @@
 # Change Log
 
-## 7.0.0-canary.13
+## 7.0.0-canary.21
 
-## 7.0.0-canary.12
+## 6.2.0-canary.20
+
+## 6.2.0-canary.19
+
+## 6.2.0-canary.18
+
+## 6.2.0-canary.17
+
+### Patch Changes
+
+- [#1934](https://github.com/graphcommerce-org/graphcommerce/pull/1934) [`96ac0320a`](https://github.com/graphcommerce-org/graphcommerce/commit/96ac0320a30bc55a6db5d46663d28b552fda4db6) - Fixed floating overlays not closing when clicking beside the overlay ([@bramvanderholst](https://github.com/bramvanderholst))
+
+## 6.2.0-canary.16
+
+### Patch Changes
+
+- [#1930](https://github.com/graphcommerce-org/graphcommerce/pull/1930) [`c8d023e9e`](https://github.com/graphcommerce-org/graphcommerce/commit/c8d023e9e874131cd9f8fe192b1fca5fe1a26ee3) - Fix the close menu on search and add the option to secondary menu items ([@StefanAngenent](https://github.com/StefanAngenent))
+
+## 6.2.0-canary.15
+
+## 6.2.0-canary.14
+
+## 6.2.0-canary.13
+
+## 6.2.0-canary.12
 
 ## 6.2.0-canary.11
 

package/LayoutParts/MenuFabSecondaryItem.tsx

@@ -1,6 +1,6 @@
 import { ListItemButton, ListItemIcon, ListItemText, SxProps, Theme } from '@mui/material'
 import { useRouter } from 'next/router'
-import React from 'react'
+import React, { MouseEventHandler } from 'react'
 import { extendableComponent } from '../Styles'
 import { NextLink } from '../Theme'
 
@@ -9,6 +9,7 @@ export type FabMenuSecondaryItemProps = {
   children: React.ReactNode
   icon: React.ReactNode
   sx?: SxProps<Theme>
+  onClick?: MouseEventHandler<HTMLElement>
 }
 
 const compName = 'MenuFabSecondaryItem' as const
@@ -16,12 +17,18 @@ const parts = ['root', 'icon', 'text'] as const
 const { classes } = extendableComponent(compName, parts)
 
 export function MenuFabSecondaryItem(props: FabMenuSecondaryItemProps) {
-  const { href, children, icon, sx = [] } = props
+  const { href, children, onClick, icon, sx = [] } = props
   const router = useRouter()
 
+  const handleClick: MouseEventHandler<HTMLElement> = (e) => {
+    e.preventDefault()
+    onClick?.(e)
+    return router.push(href)
+  }
+
   return (
     <ListItemButton
-      href={href}
+      onClick={handleClick}
       component={NextLink}
       className={classes.root}
       sx={[{}, ...(Array.isArray(sx) ? sx : [sx])]}

package/Overlay/components/OverlayBase.tsx

@@ -331,10 +331,13 @@ export function OverlayBase(incomingProps: LayoutOverlayBaseProps) {
 
   const onClickAway = useCallback(
     (event: React.MouseEvent<HTMLDivElement>) => {
-      const isTarget = event.target === beforeRef.current || event.target === overlayPaneRef.current
+      const isTarget =
+        event.target === beforeRef.current ||
+        event.target === overlayPaneRef.current ||
+        event.target === scrollerRef.current
       if (isTarget && snap.get()) closeOverlay()
     },
-    [closeOverlay, snap],
+    [closeOverlay, snap, scrollerRef],
   )
 
   return (

package/package.json

@@ -2,7 +2,7 @@
   "name": "@graphcommerce/next-ui",
   "homepage": "https://www.graphcommerce.org/",
   "repository": "github:graphcommerce-org/graphcommerce",
-  "version": "7.0.0-canary.13",
+  "version": "7.0.0-canary.21",
   "author": "",
   "license": "MIT",
   "sideEffects": false,
@@ -18,18 +18,18 @@
     "@emotion/react": "^11.10.6",
     "@emotion/server": "^11.4.0",
     "@emotion/styled": "^11.10.6",
-    "@graphcommerce/framer-next-pages": "7.0.0-canary.13",
-    "@graphcommerce/framer-scroller": "7.0.0-canary.13",
-    "@graphcommerce/framer-utils": "7.0.0-canary.13",
-    "@graphcommerce/image": "7.0.0-canary.13",
+    "@graphcommerce/framer-next-pages": "7.0.0-canary.21",
+    "@graphcommerce/framer-scroller": "7.0.0-canary.21",
+    "@graphcommerce/framer-utils": "7.0.0-canary.21",
+    "@graphcommerce/image": "7.0.0-canary.21",
     "cookie": "^0.5.0",
     "react-is": "^18.2.0",
     "schema-dts": "^1.1.0"
   },
   "devDependencies": {
-    "@graphcommerce/eslint-config-pwa": "7.0.0-canary.13",
-    "@graphcommerce/prettier-config-pwa": "7.0.0-canary.13",
-    "@graphcommerce/typescript-config-pwa": "7.0.0-canary.13",
+    "@graphcommerce/eslint-config-pwa": "7.0.0-canary.21",
+    "@graphcommerce/prettier-config-pwa": "7.0.0-canary.21",
+    "@graphcommerce/typescript-config-pwa": "7.0.0-canary.21",
     "@types/cookie": "^0.5.1",
     "@types/react-is": "^17.0.3",
     "typescript": "4.9.5"