Skip to content

Conversation

@mynetfan
Copy link
Collaborator

@mynetfan mynetfan commented Feb 23, 2025

Description

修复loading的文字颜色(跟随主色调),完善loading和spinner的属性定义

Type of change

Please delete options that are not relevant.

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to not work as expected)
  • This change requires a documentation update
  • Please, don't make changes to pnpm-lock.yaml unless you introduce a new test example.

Checklist

ℹ️ Check all checkboxes - this will indicate that you have done everything in accordance with the rules in CONTRIBUTING.

  • If you introduce new functionality, document it. You can run documentation with pnpm run docs:dev command.
  • Run the tests with pnpm test.
  • Changes in changelog are generated from PR name. Please, make sure that it explains your changes in an understandable manner. Please, prefix changeset messages with feat:, fix:, perf:, docs:, or chore:.
  • My code follows the style guidelines of this project
  • I have performed a self-review of my own code
  • I have commented my code, particularly in hard-to-understand areas
  • I have made corresponding changes to the documentation
  • My changes generate no new warnings
  • I have added tests that prove my fix is effective or that my feature works
  • New and existing unit tests pass locally with my changes
  • Any dependent changes have been merged and published in downstream modules

Summary by CodeRabbit

  • New Features
    • Loading components now offer additional customization options, including the ability to set a minimum display time and apply extra styling.
  • Style
    • Spinner text has been updated to use the primary theme color, enhancing visual consistency and user interface appeal.

@changeset-bot
Copy link

changeset-bot bot commented Feb 23, 2025

⚠️ No Changeset found

Latest commit: 81327fa

Merging this PR will not cause a version bump for any packages. If these changes should not result in a new version, you're good to go. If these changes should result in a version bump, you need to add a changeset.

This PR includes no changesets

When changesets are added to this PR, you'll see the packages that this PR includes changesets for and the associated semver types

Click here to learn what changesets are, and how to add one.

Click here if you're a maintainer who wants to add a changeset to this PR

@coderabbitai
Copy link
Contributor

coderabbitai bot commented Feb 23, 2025

Walkthrough

This pull request updates three Vue components. The first file adjusts a CSS class in a spinner component to render text in the primary theme color. The other two files in the common UI package introduce new TypeScript interfaces—LoadingProps and SpinnerProps—to enhance property handling. They also update the templates to use a utility function for dynamic class binding and pass the new props to child components. Overall, the control flow remains consistent while the components now offer improved flexibility in property usage and styling.

Changes

Files Change Summary
packages/@core/.../spinner/loading.vue Modified a <div>’s class attribute from mt-4 text-xs to text-primary mt-4 text-xs for conditional text rendering.
packages/effects/common-ui/.../loading.vue
packages/effects/common-ui/.../spinner.vue
Added new TypeScript interfaces (LoadingProps and SpinnerProps) to define optional properties (spinning, minLoadingTime, class) and updated the defineProps usage. Also revised template class binding using the cn utility, passing props to VbenLoading and VbenSpinner respectively.

Sequence Diagram(s)

sequenceDiagram
    participant Caller
    participant LoadingComp as Loading Component
    participant CN as cn Utility
    participant VbenLoading as VbenLoading

    Caller->>LoadingComp: Pass props (spinning, text, minLoadingTime, class)
    LoadingComp->>CN: Compute dynamic class string
    CN-->>LoadingComp: Return computed class
    LoadingComp->>VbenLoading: Render with updated props
Loading
sequenceDiagram
    participant Caller
    participant SpinnerComp as Spinner Component
    participant CN as cn Utility
    participant VbenSpinner as VbenSpinner

    Caller->>SpinnerComp: Pass props (spinning, minLoadingTime, class)
    SpinnerComp->>CN: Compute dynamic class string
    CN-->>SpinnerComp: Return computed class
    SpinnerComp->>VbenSpinner: Render with updated props
Loading

Suggested reviewers

  • anncwb
  • vince292007

Poem

I'm a nimble rabbit in a codeyard bright,
Hopping through components with joyful delight.
New props and classes make my heart skip a beat,
With dynamic "cn" magic, the updates are neat.
Leaping high with interfaces, oh what a sight!
Carrot-powered coding through day and night.
Happy hops and cheers for our new insight!


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 generate docstrings to generate docstrings for this PR. (Beta)
  • @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.

Copy link
Contributor

@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: 0

🧹 Nitpick comments (1)
packages/effects/common-ui/src/components/loading/loading.vue (1)

5-21: Well-structured interface with comprehensive documentation.

The LoadingProps interface is well-defined with:

  • Optional properties marked with ?
  • Clear JSDoc comments
  • Logical property grouping

However, consider adding English translations for all JSDoc comments to maintain consistency with the minLoadingTime property:

   /**
    * @zh_CN loading状态开启
+   * @en_US Enable loading state
    */
   spinning?: boolean;
   /**
    * @zh_CN 文字
+   * @en_US Loading text
    */
   text?: string;
📜 Review details

Configuration used: CodeRabbit UI
Review profile: CHILL
Plan: Pro

📥 Commits

Reviewing files that changed from the base of the PR and between 579b1b4 and 81327fa.

📒 Files selected for processing (3)
  • packages/@core/ui-kit/shadcn-ui/src/components/spinner/loading.vue (1 hunks)
  • packages/effects/common-ui/src/components/loading/loading.vue (1 hunks)
  • packages/effects/common-ui/src/components/loading/spinner.vue (1 hunks)
✅ Files skipped from review due to trivial changes (1)
  • packages/@core/ui-kit/shadcn-ui/src/components/spinner/loading.vue
⏰ Context from checks skipped due to timeout of 90000ms (8)
  • GitHub Check: Test (windows-latest)
  • GitHub Check: Lint (windows-latest)
  • GitHub Check: post-update (windows-latest)
  • GitHub Check: Check (windows-latest)
  • GitHub Check: Analyze (javascript-typescript)
  • GitHub Check: post-update (ubuntu-latest)
  • GitHub Check: Lint (ubuntu-latest)
  • GitHub Check: Check (ubuntu-latest)
🔇 Additional comments (7)
packages/effects/common-ui/src/components/loading/spinner.vue (4)

3-3: LGTM! Good use of the shared utility.

The cn utility import from shared utils is a good practice for consistent class name handling across components.


5-16: Well-documented interface with clear type definitions.

The SpinnerProps interface is well-structured with:

  • Optional properties marked with ?
  • Clear JSDoc comments in both Chinese and English where applicable
  • Logical grouping of related properties

18-18: LGTM! Type-safe props definition.

Good use of TypeScript's type inference with defineProps<SpinnerProps>() for better type safety.


21-26: Verify the minimum height constraint.

The template changes look good, but the hardcoded min-h-20 class might be too restrictive for some use cases.

Consider making the minimum height configurable through props:

-  <div :class="cn('relative min-h-20', props.class)">
+  <div :class="cn('relative', props.minHeight ?? 'min-h-20', props.class)">

And update the interface:

 interface SpinnerProps {
   class?: string;
+  minHeight?: string;
   /**
packages/effects/common-ui/src/components/loading/loading.vue (3)

3-3: LGTM! Consistent use of shared utility.

The cn utility import matches the pattern used in spinner.vue, maintaining consistency.


23-24: LGTM! Clean component setup.

Good use of defineOptions for component naming and type-safe props definition.


27-38: Consider making the minimum height configurable.

Similar to the spinner component, the hardcoded min-h-20 class might be too restrictive.

Consider making it configurable through props:

-  <div :class="cn('relative min-h-20', props.class)">
+  <div :class="cn('relative', props.minHeight ?? 'min-h-20', props.class)">

And update the interface:

 interface LoadingProps {
   class?: string;
+  minHeight?: string;
   /**

@mynetfan mynetfan merged commit d49e3e8 into vbenjs:main Feb 23, 2025
14 checks passed
@mynetfan mynetfan deleted the improve/loading branch February 23, 2025 07:30
@github-actions github-actions bot locked and limited conversation to collaborators Mar 26, 2025
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant