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.

Sign up for GitHub

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

Jump to bottom

fix(avatar): 恢复icon，适配鸿蒙 #2719

Merged
merged 7 commits into from
Nov 11, 2024
Merged

fix(avatar): 恢复icon，适配鸿蒙 #2719

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
376e355
feat: tag icon
xiaoyatong Oct 31, 2024
f9571dc
fix: 恢复icon
xiaoyatong Nov 8, 2024
513da87
fix: 简化样式,适配鸿蒙
xiaoyatong Nov 8, 2024
bd8c1ba
fix: merge next
xiaoyatong Nov 8, 2024
fee68d1
fix: merge V3.0
xiaoyatong Nov 8, 2024
a89bdd9
fix: 修改group时的样式
xiaoyatong Nov 9, 2024
a5bc46d
fix: 修复样式影响
xiaoyatong Nov 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 5 additions & 43 deletions src/packages/avatar/avatar.harmony.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,11 @@
.nut-avatar {
position: relative;
flex: 0 0 auto;
display: flex;
justify-content: center;
align-items: center;
width: 40px;
height: 40px;
Comment on lines +79 to +80
Copy link

Choose a reason for hiding this comment

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

🛠️ Refactor suggestion

建议使用 CSS 变量优化尺寸管理

当前的尺寸管理方式可以通过 CSS 变量得到优化，使维护更容易：

 .nut-avatar {
   position: relative;
   flex: 0 0 auto;
   display: flex;
   justify-content: center;
   align-items: center;
-  width: 40px;
-  height: 40px;
+  --avatar-size: 40px;
+  width: var(--avatar-size);
+  height: var(--avatar-size);
 }

 .nut-avatar-large {
-  width: 60px;
-  height: 60px;
+  --avatar-size: 60px;
 }

 .nut-avatar-small {
-  width: 32px;
-  height: 32px;
+  --avatar-size: 32px;
 }

这样的改进可以：

  • 集中管理尺寸变量
  • 减少代码重复
  • 便于后续维护和调整

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

}
.nut-avatar-round {
border-radius: 999px;
Expand All @@ -96,75 +101,32 @@
.nut-avatar-icon {
background-size: 100% 100%;
}
.nut-avatar .nut-icon-img {
width: 100%;
height: 100%;
}
.nut-avatar-text {
display: flex;
justify-content: center;
align-items: center;
width: 100%;
height: 100%;
}
.nut-avatar-large {
display: flex;
justify-content: center;
align-items: center;
width: 60px;
height: 60px;
}
.nut-avatar-large-img {
width: 60px;
height: 60px;
}
.nut-avatar-large-img-image {
width: 60px;
height: 60px;
}
.nut-avatar-large-icon {
width: 60px;
height: 60px;
}
.nut-avatar-large .nut-icon-img {
width: 100%;
height: 100%;
}
.nut-avatar-large-text {
width: 60px;
height: 60px;
}
.nut-avatar-small {
display: flex;
justify-content: center;
align-items: center;
width: 32px;
height: 32px;
}
.nut-avatar-small-img-image {
width: 32px;
height: 32px;
}
.nut-avatar-small-text {
width: 32px;
height: 32px;
}
.nut-avatar-normal {
display: flex;
justify-content: center;
align-items: center;
width: 40px;
height: 40px;
}
.nut-avatar-normal-img-image {
width: 40px;
height: 40px;
}
.nut-avatar-normal .nut-icon-img {
width: 100%;
height: 100%;
}
.nut-avatar-normal-text {
width: 40px;
height: 40px;
}
67 changes: 7 additions & 60 deletions src/packages/avatar/avatar.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,13 @@
.nut-avatar {
position: relative;
flex: 0 0 auto; // 防止被压缩

display: flex;
justify-content: center;
align-items: center;
width: $avatar-normal-width;
height: $avatar-normal-height;

&-round {
border-radius: 999px;
overflow: hidden;
Expand Down Expand Up @@ -31,97 +38,37 @@
background-size: 100% 100%;
}

.nut-icon-img {
width: 100%;
height: 100%;
}

&-text {
display: flex;
justify-content: center;
align-items: center;
width: 100%;
height: 100%;
}

&-large {
display: flex;
justify-content: center;
align-items: center;
width: $avatar-large-width;
height: $avatar-large-height;

&-img {
width: $avatar-large-width;
height: $avatar-large-height;
&-image {
width: $avatar-large-width;
height: $avatar-large-height;
}
}

&-icon {
width: $avatar-large-width;
height: $avatar-large-height;
}

.nut-icon-img {
width: 100%;
height: 100%;
}

&-text {
width: $avatar-large-width;
height: $avatar-large-height;
}
}

&-small {
display: flex;
justify-content: center;
align-items: center;
width: $avatar-small-width;
height: $avatar-small-height;

&-img-image {
width: $avatar-small-width;
height: $avatar-small-height;
}
&-icon {
// width: $avatar-small-width;
// height: $avatar-small-height;
}
&-text {
width: $avatar-small-width;
height: $avatar-small-height;
}
}

&-normal {
display: flex;
justify-content: center;
align-items: center;
width: $avatar-normal-width;
height: $avatar-normal-height;

&-img-image {
width: $avatar-normal-width;
height: $avatar-normal-height;
}

&-icon {
}

.nut-icon-img {
width: 100%;
height: 100%;
}

&-text {
width: $avatar-normal-width;
height: $avatar-normal-height;
}
}
}

// [dir='rtl'] .nut-avatar,
Expand Down
26 changes: 14 additions & 12 deletions src/packages/avatar/avatar.taro.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@
) {
setShowMax(true)
}
}, [avatarIndex, groupCount])

Check warning on line 122 in src/packages/avatar/avatar.taro.tsx

View workflow job for this annotation

GitHub Actions / lint 

React Hook useEffect has a missing dependency: 'groupMax'. Either include it or remove the dependency array

const errorEvent = () => {
onError && onError()
Expand All @@ -136,7 +136,6 @@
{(showMax || !groupMax || avatarIndex <= groupMax) && (
<View
className={cls}
// {...rest}
style={!showMax ? styles : maxStyles}
onClick={clickAvatar}
ref={avatarRef}
Expand All @@ -147,35 +146,38 @@
<Image
className={`nut-avatar-img nut-avatar-${groupSize || size || 'normal'}-img`}
src={src}
style={{ objectFit: fit, ...styles }}
style={{ objectFit: fit }}
onError={errorEvent}
/>
)}
{React.isValidElement(icon)
? React.cloneElement<any>(icon, {
{React.isValidElement(icon) ? (
<View className="nut-avatar-text">
{React.cloneElement<any>(icon, {
...icon.props,
className: `${icon.props.className || ''} nut-avatar-icon nut-avatar-${groupSize || size || 'normal'}-icon`,
style: { position: 'absolute' },
})
: null}
})}
</View>
) : null}
{children && (
<View
className={`nut-avatar-text nut-avatar-${groupSize || size || 'normal'}-text`}
>
{children}
</View>
)}
{!src && !icon && !children && !harmonyAndRn() && (
<User
className={`nut-avatar-icon nut-avatar-${groupSize || size || 'normal'}-icon`}
style={{ position: 'absolute' }}
/>
{!src && !icon && !children && (
<View className="nut-avatar-text">
<User
className={`nut-avatar-icon nut-avatar-${groupSize || size || 'normal'}-icon`}
/>
</View>
)}
</>
)}
{showMax && (
<View
className={`nut-avatar-text nut-avatar-${groupSize || 'normal'}-text`}
style={{ ...maxStyles }}
>
{propAvatarGroup?.maxContent
? propAvatarGroup?.maxContent
Expand Down
13 changes: 4 additions & 9 deletions src/packages/avatar/demo.taro.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ import Demo6 from './demos/taro/demo6'
import Demo7 from './demos/taro/demo7'
import Demo8 from './demos/taro/demo8'
import Demo9 from './demos/taro/demo9'
import { harmonyAndRn } from '@/utils/platform-taro'

const AvatarDemo = () => {
const [translated] = useTranslate({
Expand Down Expand Up @@ -65,14 +64,10 @@ const AvatarDemo = () => {
<Demo2 />
<View className="h2">{translated['049b6a97']}</View>
<Demo3 />
{harmonyAndRn() ? null : (
<>
<View className="h2">{translated.a304dabf}</View>
<Demo4 />
<View className="h2">{translated['89bca4e7']}</View>
<Demo5 />
</>
)}
<View className="h2">{translated.a304dabf}</View>
<Demo4 />
<View className="h2">{translated['89bca4e7']}</View>
<Demo5 />
<View className="h2">{translated.e981579e}</View>
<Demo6 />
<View className="h2">{translated.f645fc65}</View>
Expand Down
14 changes: 2 additions & 12 deletions src/packages/avatar/demos/taro/demo2.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,22 +1,12 @@
import React from 'react'
import { Avatar, Cell } from '@nutui/nutui-react-taro'
import { User } from '@nutui/icons-react-taro'
import { harmonyAndRn } from '@/utils/platform-taro'

const Demo2 = () => {
return (
<Cell className="cell-avatar">
{harmonyAndRn() ? (
<>
<Avatar shape="square">N</Avatar>
<Avatar shape="round">N</Avatar>
</>
) : (
<>
<Avatar icon={<User />} shape="square" />
<Avatar icon={<User />} shape="round" />
</>
)}
<Avatar icon={<User />} shape="square" />
<Avatar icon={<User />} shape="round" />
</Cell>
)
}
Expand Down
17 changes: 3 additions & 14 deletions src/packages/avatar/demos/taro/demo3.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,24 +1,13 @@
import React from 'react'
import { Avatar, Cell } from '@nutui/nutui-react-taro'
import { User } from '@nutui/icons-react-taro'
import { harmonyAndRn } from '@/utils/platform-taro'

const Demo3 = () => {
return (
<Cell className="cell-avatar">
{harmonyAndRn() ? (
<>
<Avatar src="https://img12.360buyimg.com/imagetools/jfs/t1/143702/31/16654/116794/5fc6f541Edebf8a57/4138097748889987.png" />
<Avatar>N</Avatar>
<Avatar>N</Avatar>
</>
) : (
<>
<Avatar src="https://img12.360buyimg.com/imagetools/jfs/t1/143702/31/16654/116794/5fc6f541Edebf8a57/4138097748889987.png" />
<Avatar icon={<User />} />
<Avatar>N</Avatar>
</>
)}
<Avatar src="https://img12.360buyimg.com/imagetools/jfs/t1/143702/31/16654/116794/5fc6f541Edebf8a57/4138097748889987.png" />
<Avatar icon={<User />} />
<Avatar>N</Avatar>
</Cell>
)
}
Expand Down
12 changes: 7 additions & 5 deletions src/packages/avatar/demos/taro/demo4.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,19 @@
import React from 'react'
import { Avatar, Cell } from '@nutui/nutui-react-taro'
import { User } from '@nutui/icons-react-taro'
import { harmonyAndRn } from '@/utils/platform-taro'

const Demo4 = () => {
return (
<Cell className="cell-avatar">
<Avatar
color="#fff"
background="var(--nutui-color-primary)"
// icon={<User />}
color="#ffffff"
background={`${harmonyAndRn() ? '#ff0f23' : 'var(--nutui-color-primary)'}`}
icon={<User />}
/>
<Avatar
color="var(--nutui-color-primary)"
background="var(--nutui-color-primary-light-pressed)"
color={`${harmonyAndRn() ? '#ff0f23' : 'var(--nutui-color-primary)'}`}
background={`${harmonyAndRn() ? '#ffebf1' : 'var(--nutui-color-primary-light-pressed)'}`}
>
U
</Avatar>
Expand Down
Loading
Loading