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

chore: switch back to @ctrl/tinycolor #4077

Merged
merged 2 commits into from
Aug 7, 2024
Merged

chore: switch back to @ctrl/tinycolor #4077

merged 2 commits into from
Aug 7, 2024

Conversation

likui628
Copy link
Collaborator

@likui628 likui628 commented Aug 7, 2024

Description

@antdesign/fast-color 和 @ctrl/tinycolor toHsl算法不同导致主题色会变化

#4E69FD a,g,l,s 1 231                                0.6490196078431373     0.691699604743083
#4E69FD a,g,l,s 1 230.74285714285713    0.6490196078431373     0.9776536312849162

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

    • Enhanced color conversion capabilities utilizing the new TinyColor library, including a new function to convert HLS values to RGB strings.
  • Improvements

    • Updated color handling in the PreferenceBuiltinTheme component for better color manipulation.
  • Bug Fixes

    • Removed deprecated UI elements for theme color selection in the preferences sheet, simplifying the user interface.

Copy link

changeset-bot bot commented Aug 7, 2024

⚠️ No Changeset found

Latest commit: e88be09

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

Copy link
Contributor

coderabbitai bot commented Aug 7, 2024

Walkthrough

The recent changes enhance color manipulation capabilities across the project by replacing the @ant-design/fast-color library with @ctrl/tinycolor. This update introduces improved color conversion functions and logic updates in various components while ensuring compatibility with existing interfaces. The modifications aim to streamline color processing, enhancing both functionality and user experience.

Changes

File Path Change Summary
packages/@core/base/shared/package.json Updated color manipulation library from @ant-design/fast-color to @ctrl/tinycolor.
packages/@core/base/shared/src/color/convert.ts Replaced FastColor with TinyColor for color conversion; added convertToRgb function and updated exports.
packages/@core/base/shared/src/color/generator.ts Updated to use TinyColor for color processing in generatorColorVariables; enhanced hex string generation.
packages/effects/layouts/src/widgets/preferences/blocks/theme/builtin.vue Updated to use TinyColor for color manipulation; maintained existing output format.
packages/effects/layouts/src/widgets/preferences/preferences-sheet.vue Removed unused code related to ThemeColor, simplifying the UI handling in handleReset.

Sequence Diagram(s)

sequenceDiagram
    participant User
    participant Preferences
    participant TinyColor

    User->>Preferences: Request color conversion
    Preferences->>TinyColor: Convert color using TinyColor
    TinyColor-->>Preferences: Return converted color
    Preferences-->>User: Display converted color
Loading

🐰 "In colors bright, we leap with glee,
A tiny change, oh so colorful, see!
From fast to tiny, we now can play,
With hues and shades that dance and sway.
So hop along, let colors unfold,
A vibrant tale of joy retold!" 🌈


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>.
    • 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 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.
    • @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 as 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.

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

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

Review details

Configuration used: CodeRabbit UI
Review profile: CHILL

Commits

Files that changed from the base of the PR and between a9a14fd and dd1fc82.

Files ignored due to path filters (1)
  • pnpm-lock.yaml is excluded by !**/pnpm-lock.yaml
Files selected for processing (4)
  • packages/@core/base/shared/package.json (1 hunks)
  • packages/@core/base/shared/src/color/convert.ts (3 hunks)
  • packages/effects/layouts/src/widgets/preferences/blocks/theme/builtin.vue (2 hunks)
  • packages/effects/layouts/src/widgets/preferences/preferences-sheet.vue (1 hunks)
Files skipped from review due to trivial changes (1)
  • packages/effects/layouts/src/widgets/preferences/preferences-sheet.vue
Additional comments not posted (5)
packages/@core/base/shared/src/color/convert.ts (3)

Line range hint 1-13:
LGTM!

The function convertToHsl correctly uses TinyColor for converting colors to HSL format.


Line range hint 20-31:
LGTM!

The function convertToHslCssVar correctly uses TinyColor for converting colors to HSL CSS variable format.


32-43: LGTM!

The function convertToRgb correctly handles the preprocessing step and uses TinyColor for converting HLS color values to RGB strings.

packages/@core/base/shared/package.json (1)

58-58: LGTM!

The dependency change from @ant-design/fast-color to @ctrl/tinycolor is straightforward and aligns with the PR objectives.

packages/effects/layouts/src/widgets/preferences/blocks/theme/builtin.vue (1)

Line range hint 12-25:
LGTM!

The import statement and the inputValue computed property correctly use TinyColor for color handling.

@likui628 likui628 added the chore label Aug 7, 2024
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

Review details

Configuration used: CodeRabbit UI
Review profile: CHILL

Commits

Files that changed from the base of the PR and between dd1fc82 and e88be09.

Files selected for processing (2)
  • packages/@core/base/shared/src/color/convert.test.ts (1 hunks)
  • packages/@core/base/shared/src/color/generator.ts (2 hunks)
Files skipped from review due to trivial changes (1)
  • packages/@core/base/shared/src/color/convert.test.ts
Additional comments not posted (2)
packages/@core/base/shared/src/color/generator.ts (2)

16-16: Verify the function usage and output.

Ensure that the new TinyColor(color).toHexString() produces the expected results and is consistent with the previous implementation.


3-3: Verify the new import usage.

Ensure that the TinyColor import from ./convert is correctly implemented and consistent throughout the codebase.

@anncwb anncwb merged commit 8ffc853 into main Aug 7, 2024
16 checks passed
@anncwb anncwb deleted the tinycolor branch August 7, 2024 21:46
@github-actions github-actions bot locked and limited conversation to collaborators Sep 8, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants