From 5f4b58c31a47230f30c8a6e43a3cff25f680bc50 Mon Sep 17 00:00:00 2001 From: hanyuxinting Date: Wed, 20 Nov 2024 18:53:01 +0800 Subject: [PATCH 1/2] fix(toast): svg color --- src/packages/toast/demos/taro/demo2.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/packages/toast/demos/taro/demo2.tsx b/src/packages/toast/demos/taro/demo2.tsx index 580a801087..1d5bd515d4 100644 --- a/src/packages/toast/demos/taro/demo2.tsx +++ b/src/packages/toast/demos/taro/demo2.tsx @@ -14,7 +14,7 @@ const Demo5 = () => { type: 'fail', duration: 2, position: 'center', - icon: , + icon: , lockScroll: true, onClose: () => { console.log('close') From 970358c12400022c7f2ef47a1425eaa0a3f2e61c Mon Sep 17 00:00:00 2001 From: hanyuxinting Date: Wed, 20 Nov 2024 19:24:07 +0800 Subject: [PATCH 2/2] fix(avatar): svg color --- src/packages/avatar/avatar.taro.tsx | 3 +++ src/packages/avatar/demos/taro/demo6.tsx | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/packages/avatar/avatar.taro.tsx b/src/packages/avatar/avatar.taro.tsx index 6948858eb7..872c6c2dc0 100644 --- a/src/packages/avatar/avatar.taro.tsx +++ b/src/packages/avatar/avatar.taro.tsx @@ -154,12 +154,14 @@ export const Avatar: FunctionComponent< {React.cloneElement(icon, { ...icon.props, + color, className: `${icon.props.className || ''} nut-avatar-icon nut-avatar-${groupSize || size || 'normal'}-icon`, })} ) : null} {children && ( {children} @@ -168,6 +170,7 @@ export const Avatar: FunctionComponent< {!src && !icon && !children && ( diff --git a/src/packages/avatar/demos/taro/demo6.tsx b/src/packages/avatar/demos/taro/demo6.tsx index 9f269e45bf..40c64b0b01 100644 --- a/src/packages/avatar/demos/taro/demo6.tsx +++ b/src/packages/avatar/demos/taro/demo6.tsx @@ -12,7 +12,7 @@ const Demo6 = () => { } /> U