fix(theme): reposition extendBaseTheme call for Chakra CLI

[TylerAPfledderer]

With the Chakra CLI, it looks for a default exported object of the theme to extract and define the custom theming types. However, the object extracted is the raw theme object of only the custom themes, so the CLI is not including the types for the default foundation tokens.

This PR repositions the extendBaseTheme function back to the theme file so it is called during type generation, and exposes the default foundation tokens.

A simple object merge can be done to bring in the updated language direction from NextJS.

Summary by CodeRabbit

• New Features

  • Updated the theme extension approach to enhance app customization and consistency.

• Refactor

  • Improved type specificity in button component stories for clearer codebase understanding.

• Style

  • Integrated a more robust theming configuration to improve UI consistency across the application.

[netlify]

✅ Deploy Preview for ethereumorg ready!

Name	Link
🔨 Latest commit	2567713
🔍 Latest deploy log	https://app.netlify.com/sites/ethereumorg/deploys/663395dc40621d0007416815
😎 Deploy Preview	https://deploy-preview-12893--ethereumorg.netlify.app
📱 Preview on mobile	Toggle QR Code... Use your smartphone camera to open QR code link.
Lighthouse	7 paths audited Performance: 50 (🟢 up 11 from production) Accessibility: 92 (🔴 down 1 from production) Best Practices: 95 (🔴 down 5 from production) SEO: 95 (🔴 down 5 from production) PWA: - View the detailed breakdown and full score reports

---

To edit notification comments on pull requests, go to your Netlify site configuration.

[TylerAPfledderer]

@coderabbitai review

[coderabbitai]

Walkthrough

The primary update involves refining the theme extension process in a Chakra UI project. The theme extension method was switched from using Chakra UI’s extendBaseTheme to a more flexible merge function from lodash, enhancing the merging capabilities for the theme configuration. Additionally, there's a minor update in type annotation for better clarity in the Button component stories.

Changes

File Path	Change Summary
src/@chakra-ui/theme.ts	Replaced extendBaseTheme with merge for theme extension.
src/components/.../Button.stories.tsx	Added comment to type definition for clearer type searching.
src/pages/_app.tsx	Updated theme extension method from extendBaseTheme to merge.

---

Recent Review Details

Configuration used: CodeRabbit UI
Review profile: CHILL

Commits

Files that changed from the base of the PR and between 9aeefb2 and 2567713.

Files selected for processing (3)

• src/@chakra-ui/theme.ts (2 hunks)
• src/components/Buttons/Button.stories.tsx (1 hunks)
• src/pages/_app.tsx (2 hunks)

Files skipped from review due to trivial changes (1)

• src/components/Buttons/Button.stories.tsx

Additional comments not posted (2)

src/@chakra-ui/theme.ts (1)

28-28: LGTM! Ensure that the integration of extendBaseTheme with the rest of the application is seamless and that all dependent components are compatible with this change.

Verification successful

---

The verification process has successfully identified the usage of extendBaseTheme within the src/@chakra-ui/theme.ts file. This file imports and then exports extendBaseTheme, which aligns with the changes described in the review comment. There are no other files in the TypeScript and TSX codebase that use this function, suggesting that the integration is limited to this specific file.

Given this context, it appears that the integration of extendBaseTheme is localized and does not impact other parts of the application directly. This should be sufficient unless there was an expectation of broader integration across multiple components or files.

Integration of extendBaseTheme Verified:

• The function is used correctly within src/@chakra-ui/theme.ts.
• No other TypeScript or TSX files in the codebase use this function, indicating no broader integration issues.

Scripts Executed

The following scripts were executed for the analysis:

---

Script:

#!/bin/bash
# Description: Verify integration of `extendBaseTheme` with other parts of the application.

# Test: Search for usage of `extendBaseTheme` in other files. Expect: Proper integration and no errors.
rg --type typescript $'extendBaseTheme'

Length of output: 73

---

---

Script:

#!/bin/bash
# Description: Verify integration of `extendBaseTheme` with other parts of the application.

# Test: Search for usage of `extendBaseTheme` in TypeScript files. Expect: Proper integration and no errors.
rg 'extendBaseTheme' --type ts --type tsx

Length of output: 69

---

---

Script:

#!/bin/bash
# Description: Verify integration of `extendBaseTheme` with other parts of the application.

# Test: Search for usage of `extendBaseTheme` in TypeScript and TSX files. Expect: Proper integration and no errors.
rg 'extendBaseTheme' --glob '*.ts' --glob '*.tsx'

Length of output: 204

src/pages/_app.tsx (1)

35-35: LGTM! Ensure that the merge function correctly integrates the custom theme with the direction settings and that there are no conflicts or overrides that could affect the theme's behavior.

Verification successful

---

The integration of the merge function from lodash in src/pages/_app.tsx has been verified. The function is also used in other parts of the application, such as src/pages/layer-2.tsx and src/@chakra-ui/components/components.utils.ts, without any evident conflicts or issues. Each usage appears to be correctly implemented and isolated to its respective context, ensuring that the theme settings are integrated without overriding or conflicts.

• src/pages/_app.tsx: Merges custom theme settings with direction settings.
• src/pages/layer-2.tsx: Merges specific properties for components.
• src/@chakra-ui/components/components.utils.ts: Merges default theming with additional style objects.

Scripts Executed

The following scripts were executed for the analysis:

---

Script:

#!/bin/bash
# Description: Verify integration of `merge` function with theme settings.

# Test: Search for usage of `merge` in other files. Expect: Proper integration and no conflicts.
rg --type typescript $'merge'

Length of output: 63

---

---

Script:

#!/bin/bash
# Corrected script to verify integration of `merge` function with theme settings.

# Test: Search for usage of `merge` in TypeScript files. Expect: Proper integration and no conflicts.
rg --type ts 'merge'

Length of output: 4486

---

Thank you for using CodeRabbit. We offer it for free to the OSS community and would appreciate your support in helping us grow. If you find it useful, would you consider giving us a shout-out on your favorite social media?

Share

• X
• Mastodon
• Reddit
• LinkedIn

Tips

Chat

There are 3 ways to chat with CodeRabbit:

Note: Auto-reply has been disabled for this repository by the repository owner. The CodeRabbit bot will not respond to your replies unless it is explicitly tagged.

• Files and specific lines of code (under the "Files changed" tab): Tag @coderabbitai in a new review comment at the desired location with your query. Examples:
  • @coderabbitai generate unit testing code for this file.
  • @coderabbitai modularize this function.
• PR comments: Tag @coderabbitai in a new PR comment to ask questions about the PR branch. For the best results, please provide a very specific query, as very limited context is provided in this mode. Examples:
  • @coderabbitai generate interesting stats about this repository and render them as a table.
  • @coderabbitai show all the console.log statements in this repository.
  • @coderabbitai read src/utils.ts and generate unit testing code.
  • @coderabbitai read the files in the src/scheduler package and generate a class diagram using mermaid and a README in the markdown format.

Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments.

CodeRabbit Commands (invoked as PR comments)

• @coderabbitai pause to pause the reviews on a PR.
• @coderabbitai resume to resume the paused reviews.
• @coderabbitai review to trigger a review. This is useful when automatic reviews are disabled for the repository.
• @coderabbitai resolve resolve all the CodeRabbit review comments.
• @coderabbitai help to get help.

Additionally, you can add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.

CodeRabbit Configration File (.coderabbit.yaml)

• You can programmatically configure CodeRabbit by adding a .coderabbit.yaml file to the root of your repository.
• Please see the configuration documentation for more information.
• If your editor has YAML language server enabled, you can add the path at the top of this file to enable auto-completion and validation: # yaml-language-server: $schema=https://coderabbit.ai/integrations/schema.v2.json

Documentation and Community

• Visit our Documentation for detailed information on how to use CodeRabbit.
• Join our Discord Community to get help, request features, and share feedback.
• Follow us on X/Twitter for updates and announcements.

[pettinarip]

LGTM!