更新快照

qkiroc · Jan 29, 2024 · b8657c1 · b8657c1
1 parent 0d28ec4
commit b8657c1
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 34 deletions.
diff --git a/packages/amis-ui/src/components/icons.tsx b/packages/amis-ui/src/components/icons.tsx
@@ -262,20 +262,20 @@ export function Icon({
   iconContent,
   vendor,
   cx: iconCx,
-  onClick = () => {},
-  onMouseEnter = () => {},
-  onMouseLeave = () => {},
-  onMouseOver = () => {},
-  onMouseOut = () => {},
-  onMouseDown = () => {},
-  onMouseUp = () => {},
-  onMouseMove = () => {},
-  onBlur = () => {},
-  onFocus = () => {},
-  onTouchStart = () => {},
-  onTouchMove = () => {},
-  onTouchEnd = () => {},
-  onTouchCancel = () => {},
+  onClick,
+  onMouseEnter,
+  onMouseLeave,
+  onMouseOver,
+  onMouseOut,
+  onMouseDown,
+  onMouseUp,
+  onMouseMove,
+  onBlur,
+  onFocus,
+  onTouchStart,
+  onTouchMove,
+  onTouchEnd,
+  onTouchCancel,
   style
 }: {
   icon: string;
@@ -312,13 +312,13 @@ export function Icon({
   // 直接的icon dom
   if (React.isValidElement(icon)) {
     return React.cloneElement(icon, {
+      ...events,
       ...((icon.props as any) || {}),
       className: cxClass(
         cx(className, classNameProp),
         (icon.props as any).className
       ),
-      style,
-      ...events
+      style
     });
   }
 

diff --git a/packages/amis/__tests__/renderers/__snapshots__/Action.test.tsx.snap b/packages/amis/__tests__/renderers/__snapshots__/Action.test.tsx.snap
@@ -76,9 +76,6 @@ exports[`Renderers:Action MenuItem display icon 2`] = `
 >
   <i
     className="fa fa-cloud cxd-Button-icon fa fa-cloud"
-    onClick={[Function]}
-    onMouseEnter={[Function]}
-    onMouseLeave={[Function]}
   />
   <span>
     123

diff --git a/packages/amis/__tests__/renderers/__snapshots__/Breadcrumb.test.tsx.snap b/packages/amis/__tests__/renderers/__snapshots__/Breadcrumb.test.tsx.snap
@@ -356,9 +356,6 @@ exports[`Renderer:breadcrumb tooltip labelMaxLength 1`] = `
               >
                 <i
                   className="fa fa-home cxd-Icon cxd-Breadcrumb-icon fa fa-home"
-                  onClick={[Function]}
-                  onMouseEnter={[Function]}
-                  onMouseLeave={[Function]}
                 />
                 <span
                   className="cxd-TplField"
@@ -447,9 +444,6 @@ exports[`Renderer:breadcrumb tooltip labelMaxLength 2`] = `
               >
                 <i
                   className="fa fa-home cxd-Icon cxd-Breadcrumb-icon fa fa-home"
-                  onClick={[Function]}
-                  onMouseEnter={[Function]}
-                  onMouseLeave={[Function]}
                 />
                 <span
                   className="cxd-TplField"
@@ -538,9 +532,6 @@ exports[`Renderer:breadcrumb tooltip labelMaxLength 3`] = `
               >
                 <i
                   className="fa fa-home cxd-Icon cxd-Breadcrumb-icon fa fa-home"
-                  onClick={[Function]}
-                  onMouseEnter={[Function]}
-                  onMouseLeave={[Function]}
                 />
                 <span
                   className="cxd-TplField"
@@ -629,9 +620,6 @@ exports[`Renderer:breadcrumb tooltip labelMaxLength 4`] = `
               >
                 <i
                   className="fa fa-home cxd-Icon cxd-Breadcrumb-icon fa fa-home"
-                  onClick={[Function]}
-                  onMouseEnter={[Function]}
-                  onMouseLeave={[Function]}
                 />
                 <span
                   className="cxd-TplField"

diff --git a/packages/amis/__tests__/renderers/__snapshots__/Page.test.tsx.snap b/packages/amis/__tests__/renderers/__snapshots__/Page.test.tsx.snap
@@ -48,9 +48,6 @@ exports[`Renderer:Page 1`] = `
                   <icon-mock
                     className="icon-question-mark"
                     icon="question-mark"
-                    onClick={[Function]}
-                    onMouseEnter={[Function]}
-                    onMouseLeave={[Function]}
                   />
                 </span>
               </div>