Merge branch 'develop' into stable

system-ui · Feb 14, 2025 · 43cbbf5 · 43cbbf5
2 parents ad62a0d + 5e09f14
commit 43cbbf5
Show file tree

Hide file tree

Showing 3 changed files with 352 additions and 124 deletions.
diff --git a/examples/next/package.json b/examples/next/package.json
@@ -17,7 +17,7 @@
     "@mdx-js/react": "^2.3.0",
     "@next/mdx": "^14.0.4",
     "@theme-ui/css": "workspace:^",
-    "next": "^14.0.4",
+    "next": "^15.1.2",
     "react": "^18.1.0",
     "react-dom": "^18",
     "theme-ui": "workspace:^"

diff --git a/packages/components/src/Flex.tsx b/packages/components/src/Flex.tsx
@@ -1,4 +1,6 @@
 import React from 'react'
+import { Theme } from '@theme-ui/core'
+
 import { Box, BoxOwnProps, BoxProps } from './Box'
 import { ForwardRef } from './types'
 
@@ -11,14 +13,15 @@ export type FlexProps = BoxProps
  */
 export const Flex: ForwardRef<HTMLElement, FlexProps> = React.forwardRef(
   function Flex(props: FlexProps, ref) {
+    const { sx } = props
     return (
       <Box
         ref={ref}
         {...props}
-        sx={{
+        sx={(theme: Theme) => ({
           display: 'flex',
-          ...props.sx,
-        }}
+          ...(typeof sx === 'function' ? sx(theme) : sx),
+        })}
       />
     )
   }