Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(site): add smb design-config support #2599

Merged
merged 1 commit into from
Dec 3, 2024

Conversation

shenjunjian
Copy link
Collaborator

@shenjunjian shenjunjian commented Dec 3, 2024

PR

PR Checklist

Please check if your PR fulfills the following requirements:

  • The commit message follows our Commit Message Guidelines
  • Tests for the changes have been added (for bug fixes / features)
  • Docs have been added / updated (for bug fixes / features)

PR Type

What kind of change does this PR introduce?

  • Bugfix
  • Feature
  • Code style update (formatting, local variables)
  • Refactoring (no functional changes, no api changes)
  • Build related changes
  • CI related changes
  • Documentation content changes
  • Other... Please describe:

What is the current behavior?

Issue Number: N/A

What is the new behavior?

Does this PR introduce a breaking change?

  • Yes
  • No

Other information

image

Summary by CodeRabbit

  • New Features

    • Added a new dependency for enhanced design capabilities with @opentiny/vue-design-smb.
    • Improved dynamic theme handling based on route parameters in the theme configuration.
  • Bug Fixes

    • Enhanced the handling of global design configurations to accommodate reactivity.
  • Documentation

    • Updated prop handling in the ConfigProvider component for better clarity and performance.

Copy link

coderabbitai bot commented Dec 3, 2024

Walkthrough

This pull request introduces several changes across multiple files, primarily focusing on the addition of the @opentiny/vue-design-smb dependency and modifications to theme handling logic. The package.json file is updated to include the new dependency, while useTheme.js is modified to enhance dynamic theme management based on routing conditions. Additionally, changes in index.ts and index.vue improve the handling of design configurations and props within the ConfigProvider component. These alterations collectively aim to enhance theme support and configuration flexibility.

Changes

File Change Summary
examples/sites/package.json Added dependency: "@opentiny/vue-design-smb": "workspace:~"
examples/sites/src/tools/useTheme.js Modified designConfig to include conditional logic for theme handling based on the current route.
packages/vue-common/src/index.ts Changed globalDesignConfig from const to let, updated logic for reactivity, and adjusted svg function for Vue 2 compatibility.
packages/vue/src/config-provider/src/index.vue Updated setup function to include design in props destructuring, streamlining design configuration provision.

Possibly related PRs

Suggested labels

enhancement

Suggested reviewers

  • zzcr

🐰 In a world of themes so bright,
A new design brings pure delight.
With props and configs, all in line,
Our components now truly shine!
So hop along, let's celebrate,
A vibrant change, it’s truly great! 🌈


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
🪧 Tips

Chat

There are 3 ways to chat with CodeRabbit:

  • Review comments: Directly reply to a review comment made by CodeRabbit. Example:
    • I pushed a fix in commit <commit_id>, please review it.
    • Generate unit testing code for this file.
    • Open a follow-up GitHub issue for this discussion.
  • 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 gather interesting stats about this repository and render them as a table. Additionally, render a pie chart showing the language distribution in the codebase.
    • @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.
    • @coderabbitai help me debug CodeRabbit configuration file.

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 using PR comments)

  • @coderabbitai pause to pause the reviews on a PR.
  • @coderabbitai resume to resume the paused reviews.
  • @coderabbitai review to trigger an incremental review. This is useful when automatic reviews are disabled for the repository.
  • @coderabbitai full review to do a full review from scratch and review all the files again.
  • @coderabbitai summary to regenerate the summary of the PR.
  • @coderabbitai resolve resolve all the CodeRabbit review comments.
  • @coderabbitai configuration to show the current CodeRabbit configuration for the repository.
  • @coderabbitai help to get help.

Other keywords and placeholders

  • Add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.
  • Add @coderabbitai summary to generate the high-level summary at a specific location in the PR description.
  • Add @coderabbitai anywhere in the PR title to generate the title automatically.

CodeRabbit Configuration 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.

@shenjunjian shenjunjian added enhancement New feature or request (功能增强) feature 新功能 labels Dec 3, 2024
@github-actions github-actions bot added bug Something isn't working and removed enhancement New feature or request (功能增强) labels Dec 3, 2024
Copy link

github-actions bot commented Dec 3, 2024

[e2e-test-warn]
The component to be tested is missing.

The title of the Pull request should look like "fix(vue-renderless): [action-menu, alert] fix xxx bug".

Please make sure you've read our contributing guide

Copy link

@coderabbitai coderabbitai bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actionable comments posted: 1

🧹 Outside diff range and nitpick comments (1)
examples/sites/src/tools/useTheme.js (1)

Line range hint 52-57: Initialize SMB theme configuration in designConfigMap

The SMB_THEME entry in designConfigMap is initialized with an empty object, but should probably use designSMBConfig.

Consider updating the initialization:

const designConfigMap = {
  [DEFAULT_THEME]: {},
  [INFINITY_THEME]: {},
  [AURORA_THEME]: {},
- [SMB_THEME]: {}
+ [SMB_THEME]: designSMBConfig
}
📜 Review details

Configuration used: CodeRabbit UI
Review profile: CHILL

📥 Commits

Reviewing files that changed from the base of the PR and between da4f7fa and 4c0056c.

📒 Files selected for processing (4)
  • examples/sites/package.json (1 hunks)
  • examples/sites/src/tools/useTheme.js (2 hunks)
  • packages/vue-common/src/index.ts (1 hunks)
  • packages/vue/src/config-provider/src/index.vue (1 hunks)
🔇 Additional comments (4)
examples/sites/package.json (1)

28-28: LGTM: SMB design dependency added correctly

The addition of @opentiny/vue-design-smb as a workspace dependency is consistent with other design packages in the project.

examples/sites/src/tools/useTheme.js (1)

4-4: LGTM: SMB design config import added

The import statement for designSMBConfig is correctly added.

packages/vue/src/config-provider/src/index.vue (1)

61-62: LGTM: Proper reactive handling of design prop

The changes correctly handle the design prop:

  1. Using toRefs ensures proper reactivity
  2. Destructuring simplifies the code while maintaining reactivity
packages/vue-common/src/index.ts (1)

177-179: 🛠️ Refactor suggestion

Consider the implications of mutable global state and add type safety

While the changes to handle reactive design configurations are necessary, there are a few considerations:

  1. Making globalDesignConfig mutable could lead to race conditions if multiple components modify it simultaneously.
  2. The type definition should be updated to reflect that the value could be reactive.

Consider these improvements:

- let globalDesignConfig: DesignConfig = customDesignConfig.designConfig || hooks.inject(design.configKey, {})
+ import type { ComputedRef } from 'vue'
+ let globalDesignConfig: DesignConfig | ComputedRef<DesignConfig> = customDesignConfig.designConfig || hooks.inject(design.configKey, {})

Also, consider adding a comment to document the reactive object handling:

- // globalDesignConfig 可能是响应式对象,比如 computed
+ // Handle both reactive (ComputedRef) and non-reactive configurations
+ // This is necessary for supporting dynamic design configurations (e.g., SMB design)

Let's verify if there are any other places in the codebase that might be affected by this change:

Comment on lines +75 to +79
if (router.currentRoute.value.params.theme === 'smb-theme') {
return designSMBConfig
}

return {}
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue

Improve theme configuration fallback logic

The current implementation has several potential issues:

  1. Direct URL parameter check ('smb-theme') doesn't align with the SMB_THEME constant
  2. Missing fallback to designConfigMap[currentThemeKey.value]
  3. Empty object fallback could cause unexpected behavior

Consider this improved implementation:

  if (import.meta.env.VITE_TINY_THEME === 'saas') {
    return designSaasConfig
  }
- if (router.currentRoute.value.params.theme === 'smb-theme') {
+ if (router.currentRoute.value.params.theme === THEME_ROUTE_MAP[SMB_THEME]) {
    return designSMBConfig
  }
- return {}
+ return designConfigMap[currentThemeKey.value] || {}

Committable suggestion skipped: line range outside the PR's diff.

@zzcr zzcr merged commit c504457 into opentiny:dev Dec 3, 2024
11 checks passed
@coderabbitai coderabbitai bot mentioned this pull request Dec 3, 2024
13 tasks
@shenjunjian shenjunjian deleted the dev-switch-smb-by-designconfig branch January 9, 2025 02:48
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Something isn't working feature 新功能
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants