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(avatar): svg color #2777

Merged
merged 3 commits into from
Nov 21, 2024
Merged

fix(avatar): svg color #2777

merged 3 commits into from
Nov 21, 2024

Conversation

xiaoyatong
Copy link
Collaborator

@xiaoyatong xiaoyatong commented Nov 20, 2024

Summary by CodeRabbit

  • 新功能

    • 更新了 Avatar 组件,增强了样式能力,支持 color 属性。
    • 当未提供 srciconchildren 时,默认显示用户图标。
  • 样式改进

    • 修改了 Avatar 组件的背景颜色,以确保一致的样式。
  • 文档

    • 更新了 AvatarProps 接口,新增 color 属性。

Copy link

coderabbitai bot commented Nov 20, 2024

Walkthrough

该拉取请求对src/packages/avatar/avatar.taro.tsx中的Avatar组件进行了多项修改。color属性现在被传递给iconchildren元素,以增强其样式能力。clickAvatarerrorEvent函数的调用逻辑进行了条件检查,确保只有在定义时才会执行。此外,头像的渲染逻辑进行了调整,以包含对srciconchildren的额外条件检查,未提供时显示默认的User图标。maxStyles对象用于处理超出最大计数的样式。

Changes

文件路径 更改摘要
src/packages/avatar/avatar.taro.tsx - AvatarProps接口新增color: string属性。
- Avatar组件更新,color属性传递给iconchildren
- clickAvatarerrorEvent函数添加条件检查。
- 渲染逻辑调整,增加对srciconchildren的条件检查,未提供时显示默认图标。
- childrenstyle属性更新,包含color属性。
src/packages/avatar/demos/taro/demo6.tsx - Avatar组件的background属性从'#eee'更改为'#ffd6e1',应用于两个实例,保持一致的样式。

Possibly related PRs

Suggested reviewers

  • oasis-cloud

Poem

在草地上跳跃的小兔,
头像变化真是美妙,
颜色闪烁如星星,
点击时欢笑声响亮。
让我们一起庆祝吧,
新的样式,新的风格! 🐇✨


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.

@github-actions github-actions bot added the 3.x label Nov 20, 2024
Copy link

codecov bot commented Nov 20, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 83.98%. Comparing base (5bcca3b) to head (299a157).
Report is 3 commits behind head on V3.0.

Additional details and impacted files
@@           Coverage Diff           @@
##             V3.0    #2777   +/-   ##
=======================================
  Coverage   83.98%   83.98%           
=======================================
  Files         220      220           
  Lines       17876    17876           
  Branches     2676     2676           
=======================================
  Hits        15013    15013           
  Misses       2858     2858           
  Partials        5        5           

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.


🚨 Try these New Features:

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

🧹 Outside diff range and nitpick comments (1)
src/packages/avatar/demos/taro/demo6.tsx (1)

15-15: 配色方案修改符合设计规范

背景色的修改保持了跨平台的一致性,同时通过条件判断确保了在不同平台下的正确显示。

建议考虑将颜色值抽取为常量,以便于后续维护和统一管理。

+ // 在文件顶部定义颜色常量
+ const HARMONY_COLORS = {
+   background: '#ffd6e1',
+   text: '#ff0f23',
+ }
+ const DEFAULT_COLORS = {
+   background: 'var(--nutui-brand-2)',
+   text: 'var(--nutui-color-primary)',
+ }

  // 在使用时
- background={`${harmonyAndRn() ? '#ffd6e1' : 'var(--nutui-brand-2)'}`}
+ background={harmonyAndRn() ? HARMONY_COLORS.background : DEFAULT_COLORS.background}
📜 Review details

Configuration used: CodeRabbit UI
Review profile: CHILL

📥 Commits

Reviewing files that changed from the base of the PR and between 5bcca3b and 299a157.

📒 Files selected for processing (2)
  • src/packages/avatar/avatar.taro.tsx (2 hunks)
  • src/packages/avatar/demos/taro/demo6.tsx (1 hunks)
🔇 Additional comments (3)
src/packages/avatar/avatar.taro.tsx (3)

157-159: 图标颜色属性传递正确实现

颜色属性通过 React.cloneElement 正确传递给图标组件,保持了与现有类名逻辑的一致性。


164-164: 文本颜色样式设置合理

为子元素文本添加颜色样式的实现简洁有效。


173-175: 默认用户图标样式统一

默认 User 图标的颜色样式设置保持了与自定义图标的一致性,实现合理。

@oasis-cloud oasis-cloud merged commit 29bee49 into jdf2e:V3.0 Nov 21, 2024
6 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants