Merge remote-tracking branch 'origin/develop'

huangchen1031 · May 17, 2024 · 9884568 · 9884568
2 parents 416e973 + 354aa7a
commit 9884568
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,10 @@ toc: false
 spline: explain
 ---
 
+## 🌈 1.7.2 `2024-05-17`
+### 🐞 Bug Fixes
+- `Avatar`: 修复配合Popup使用浮层不展示的异常 @uyarn
+
 ## 🌈 1.7.1 `2024-05-16`
 
 ### 🚀 Features

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "tdesign-react",
   "purename": "tdesign",
-  "version": "1.7.1",
+  "version": "1.7.2",
   "description": "TDesign Component for React",
   "title": "tdesign-react",
   "main": "lib/index.js",

diff --git a/src/avatar/Avatar.tsx b/src/avatar/Avatar.tsx
@@ -119,10 +119,10 @@ const Avatar = forwardRefWithStatics(
         ref={composeRefs(ref, avatarRef) as any}
         className={avatarClass}
         style={{ ...numSizeStyle, ...style }}
-        {...avatarProps}
         onClick={(e) => onClick?.({ e })}
         onMouseEnter={(e) => onHover?.({ e })}
         onContextMenu={(e) => onContextmenu?.({ e })}
+        {...avatarProps}
       >
         {renderChildren}
       </div>