Merge remote-tracking branch 'origin/dev' into feat/hero-new-ds

Author: TylerAPfledderer

.all-contributorsrc

@@ -10577,6 +10577,24 @@
       "contributions": [
         "content"
       ]
+    },
+    {
+      "login": "Coderoostr",
+      "name": "Marcos González",
+      "avatar_url": "https://avatars.githubusercontent.com/u/103231131?v=4",
+      "profile": "https://coderoostr.com",
+      "contributions": [
+        "doc"
+      ]
+    },
+    {
+      "login": "natpicone",
+      "name": "Natalino Picone",
+      "avatar_url": "https://avatars.githubusercontent.com/u/4753402?v=4",
+      "profile": "http://nozominetworks.com",
+      "contributions": [
+        "content"
+      ]
     }
   ],
   "contributorsPerLine": 7,

README.md

@@ -1656,6 +1656,8 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
       <td align="center" valign="top" width="14.28%"><a href="https://mirror.xyz/umede.eth"><img src="https://avatars.githubusercontent.com/u/122288558?v=4?s=100" width="100px;" alt="umede"/><br /><sub><b>umede</b></sub></a><br /><a href="#content-umededoteth" title="Content">🖋</a></td>
       <td align="center" valign="top" width="14.28%"><a href="http://taminobaumann.com"><img src="https://avatars.githubusercontent.com/u/48290617?v=4?s=100" width="100px;" alt="Tamino"/><br /><sub><b>Tamino</b></sub></a><br /><a href="#content-taminobaumann" title="Content">🖋</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/keccers"><img src="https://avatars.githubusercontent.com/u/770277?v=4?s=100" width="100px;" alt="Katherine Champagne"/><br /><sub><b>Katherine Champagne</b></sub></a><br /><a href="#content-keccers" title="Content">🖋</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://coderoostr.com"><img src="https://avatars.githubusercontent.com/u/103231131?v=4?s=100" width="100px;" alt="Marcos González"/><br /><sub><b>Marcos González</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=Coderoostr" title="Documentation">📖</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="http://nozominetworks.com"><img src="https://avatars.githubusercontent.com/u/4753402?v=4?s=100" width="100px;" alt="Natalino Picone"/><br /><sub><b>Natalino Picone</b></sub></a><br /><a href="#content-natpicone" title="Content">🖋</a></td>
     </tr>
   </tbody>
 </table>

docs/ds-implementation.md

@@ -17,10 +17,10 @@ Follow the new component directory structure:
 ```markdown
 src/
 └── components/
-    └── ComponentA/
-          ├── index.tsx
-          ├── ComponentA.stories.tsx
-          └── // Any other files as applicable (utils, child components, useHook, etc.)
+└── ComponentA/
+├── index.tsx
+├── ComponentA.stories.tsx
+└── // Any other files as applicable (utils, child components, useHook, etc.)
 ```
 
 ## Components creation/modification from the DS

package.json

@@ -1,6 +1,6 @@
 {
   "name": "ethereum-org-website",
-  "version": "7.22.0",
+  "version": "7.22.1",
   "description": "Website of ethereum.org",
   "main": "index.js",
   "repository": "git@github.com:ethereum/ethereum-org-website.git",

src/@chakra-ui/gatsby-plugin/components/Breadcrumb.ts

@@ -0,0 +1,45 @@
+import { createMultiStyleConfigHelpers } from "@chakra-ui/react"
+import { breadcrumbAnatomy } from "@chakra-ui/anatomy"
+import { breadcrumbDefaultTheme, defineMergeStyles } from "./components.utils"
+
+const { defineMultiStyleConfig } = createMultiStyleConfigHelpers(
+  breadcrumbAnatomy.keys
+)
+
+const baseStyle = defineMergeStyles(breadcrumbDefaultTheme.baseStyle, {
+  list: {
+    m: 0,
+    lineHeight: "base",
+    flexWrap: "wrap",
+  },
+  item: {
+    color: "body.medium",
+    letterSpacing: "wider",
+    m: 0,
+  },
+  link: {
+    fontWeight: "normal",
+    _hover: {
+      color: "primary.base",
+      textDecor: "none",
+    },
+    _active: {
+      color: "primary.base",
+    },
+    /*
+     * `&[aria-current="page"]`
+     * Redundancy to ensure styling on the active
+     * link is applied.
+     */
+    _activeLink: {
+      color: "primary.base",
+    },
+  },
+  separator: {
+    mx: "2.5",
+  },
+})
+
+export const Breadcrumb = defineMultiStyleConfig({
+  baseStyle,
+})

src/@chakra-ui/gatsby-plugin/components/Input.ts

@@ -1,4 +1,5 @@
 import { inputAnatomy } from "@chakra-ui/anatomy"
+import { cssVar } from "@chakra-ui/react"
 import {
   createMultiStyleConfigHelpers,
   defineStyle,
@@ -8,6 +9,9 @@ import { defineMergeStyles, inputDefaultTheme } from "./components.utils"
 const { defineMultiStyleConfig, definePartsStyle } =
   createMultiStyleConfigHelpers(inputAnatomy.keys)
 
+// From the default theme
+const $height = cssVar("input-height")
+
 const baseStyle = definePartsStyle((props) => {
   const {
     focusBorderColor: fc = "primaryHover",
@@ -19,10 +23,10 @@ const baseStyle = definePartsStyle((props) => {
     inputDefaultTheme.variants?.outline(props),
     {
       field: {
-        borderColor: "currentColor",
         borderRadius: "base",
         outline: "3px solid transparent",
         lineHeight: 1,
+        px: "2",
         _placeholder: {
           color: "disabled",
           opacity: 1,
@@ -34,9 +38,6 @@ const baseStyle = definePartsStyle((props) => {
           boxShadow: "none",
         },
         _hover: null, // override default
-        _groupHover: {
-          borderColor: "primary.hover",
-        },
         _invalid: {
           borderColor: ec,
           boxShadow: "none",
@@ -46,10 +47,14 @@ const baseStyle = definePartsStyle((props) => {
           opacity: 1,
         },
         "&:not(:disabled)": {
+          borderColor: "body.base",
           _active: {
             bg: "background.highlight",
             borderColor: "primary.highContrast",
           },
+          "[data-group] &:hover, &:hover": {
+            borderColor: "primary.hover",
+          },
         },
       },
       element: {
@@ -84,12 +89,10 @@ const baseStyle = definePartsStyle((props) => {
 
 const size = {
   md: defineStyle({
-    h: 10.5,
-    px: 2,
+    [$height.variable]: "sizes.10.5",
   }),
   sm: defineStyle({
-    h: 8,
-    px: 1,
+    [$height.variable]: "sizes.8",
   }),
 }
 

src/@chakra-ui/gatsby-plugin/components/index.ts

@@ -2,6 +2,7 @@ import { Alert } from "./Alert"
 import { Avatar } from "./Avatar"
 import { Badge } from "./Badge"
 import { Button } from "./Button"
+import { Breadcrumb } from "./Breadcrumb"
 import { Heading } from "./Heading"
 import { Link } from "./Link"
 import { Tag } from "./Tag"
@@ -17,7 +18,6 @@ import { Switch } from "./Switch"
 import { Input } from "./Input"
 import {
   accordionDefaultTheme,
-  breadcrumbDefaultTheme,
   closeButtonDefaultTheme,
   codeDefaultTheme,
   dividerDefaultTheme,
@@ -34,7 +34,7 @@ export default {
   Alert,
   Avatar,
   Badge,
-  Breadcrumb: breadcrumbDefaultTheme,
+  Breadcrumb,
   Button,
   Checkbox,
   CloseButton: closeButtonDefaultTheme,

src/components/Breadcrumbs/Breadcrumbs.stories.tsx

@@ -1,5 +1,6 @@
 import * as React from "react"
 import { Meta, StoryObj } from "@storybook/react"
+import { Stack } from "@chakra-ui/react"
 import BreadcrumbsComponent from "."
 
 type BreadcumbsType = typeof BreadcrumbsComponent
@@ -15,10 +16,10 @@ type Story = StoryObj<typeof meta>
 
 export const Breadcrumbs: Story = {
   render: () => (
-    <>
+    <Stack spacing="8">
       <BreadcrumbsComponent slug="/en/staking/" />
       <BreadcrumbsComponent slug="/en/staking/solo/" />
       <BreadcrumbsComponent slug="/en/roadmap/merge/issuance/" />
-    </>
+    </Stack>
   ),
 }

src/components/Breadcrumbs/index.tsx

@@ -68,45 +68,15 @@ const Breadcrumbs: React.FC<IProps> = ({
     .slice(startDepth)
 
   return (
-    <Breadcrumb
-      dir="auto"
-      position="relative"
-      zIndex="1"
-      mb={8}
-      spacing="2.5"
-      listProps={{
-        m: 0,
-        lineHeight: 1.6,
-        flexWrap: "wrap",
-      }}
-      {...restProps}
-    >
+    <Breadcrumb dir="auto" {...restProps}>
       {crumbs.map((crumb, idx) => {
         const isCurrentPage = slug === crumb.fullPath
         return (
-          <BreadcrumbItem
-            key={idx}
-            isCurrentPage={isCurrentPage}
-            color="body.medium"
-            letterSpacing="wider"
-            m={0}
-          >
+          <BreadcrumbItem key={idx} isCurrentPage={isCurrentPage}>
             <BreadcrumbLink
               as={BaseLink}
               to={crumb.fullPath}
               isPartiallyActive={isCurrentPage}
-              fontWeight="normal"
-              _hover={{ color: "primary.base", textDecor: "none" }}
-              _active={{ color: "primary.base" }}
-              sx={{
-                /*
-                 * Redundancy to ensure styling on the active
-                 * link is applied.
-                 */
-                '&[aria-current="page"]': {
-                  color: "primary.base",
-                },
-              }}
             >
               {crumb.text.toUpperCase()}
             </BreadcrumbLink>

src/components/Buttons/ButtonTwoLines/index.tsx

@@ -87,13 +87,20 @@ const ButtonTwoLines = (props: ButtonTwoLinesProps) => {
       >
         <Text
           as="span"
-          fontSize="md"
+          size="md"
           fontWeight={size === "md" ? "bold" : "normal"}
         >
           {mainText}
         </Text>
-        {/* TODO: use `size='xs'` instead when the Text theme is added  */}
-        <Text as="span" fontSize="xs">
+        <Text
+          as="span"
+          size="xs"
+          color={
+            rest.variant === "outline" || rest.isSecondary
+              ? "body.medium"
+              : undefined
+          }
+        >
           {helperText}
         </Text>
       </Stack>