From 447e78526a44247de19e79b489744f5875340e91 Mon Sep 17 00:00:00 2001
From: simpleStyle <45413090+simplyStyle@users.noreply.github.com>
Date: Thu, 10 Nov 2022 09:28:35 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20button=E7=BB=84=E4=BB=B6=E6=94=AF?=
 =?UTF-8?q?=E6=8C=81=E5=8E=9F=E7=94=9F=E5=B0=8F=E7=A8=8B=E5=BA=8F=E5=92=8C?=
 =?UTF-8?q?H5=E7=9A=84button=E7=89=B9=E6=80=A7=20(#433)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../__test__/__snapshots__/button.spec.tsx.snap  | 16 +++++++++-------
 src/packages/button/__test__/button.spec.tsx     |  5 +++--
 src/packages/button/button.taro.tsx              |  5 +++--
 src/packages/button/button.tsx                   |  5 +++--
 4 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/src/packages/button/__test__/__snapshots__/button.spec.tsx.snap b/src/packages/button/__test__/__snapshots__/button.spec.tsx.snap
index b1c5d02..f45e147 100644
--- a/src/packages/button/__test__/__snapshots__/button.spec.tsx.snap
+++ b/src/packages/button/__test__/__snapshots__/button.spec.tsx.snap
@@ -1,18 +1,20 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`should match snapshot 1`] = `
-<DocumentFragment>
-  <div
+<div>
+  <button
     class="nut-button nut-button--primary nut-button--normal nut-button--round aa"
-    iconclassprefix="nut-icon"
-    iconfontclassname="nutui-iconfont"
     style="margin: 8px;"
   >
     <div
       class="nut-button__warp"
     >
-      主要按钮
+      <div
+        class="text"
+      >
+        主要按钮
+      </div>
     </div>
-  </div>
-</DocumentFragment>
+  </button>
+</div>
 `;
diff --git a/src/packages/button/__test__/button.spec.tsx b/src/packages/button/__test__/button.spec.tsx
index 18f801b..55999db 100644
--- a/src/packages/button/__test__/button.spec.tsx
+++ b/src/packages/button/__test__/button.spec.tsx
@@ -8,12 +8,13 @@ import { useState } from 'react'
 import { Button } from '../button'
 
 test('should match snapshot', () => {
-  const { asFragment } = render(
+  const { container } = render(
     <Button className="aa" style={{ margin: 8 }} type="primary" shape="round">
       主要按钮
     </Button>
   )
-  expect(asFragment()).toMatchSnapshot()
+  expect(container.firstChild?.nodeName).toBe('BUTTON')
+  expect(container).toMatchSnapshot()
 })
 
 test('should children correctly', () => {
diff --git a/src/packages/button/button.taro.tsx b/src/packages/button/button.taro.tsx
index d38af93..db6d96c 100644
--- a/src/packages/button/button.taro.tsx
+++ b/src/packages/button/button.taro.tsx
@@ -133,7 +133,8 @@ export const Button: FunctionComponent<Partial<ButtonProps>> = (props) => {
   }
 
   return (
-    <div
+    // eslint-disable-next-line react/button-has-type
+    <button
       className={`${btnName} ${className}`}
       style={{ ...btnStyle, ...style }}
       {...rest}
@@ -158,7 +159,7 @@ export const Button: FunctionComponent<Partial<ButtonProps>> = (props) => {
         )}
         <div className="text">{children}</div>
       </div>
-    </div>
+    </button>
   )
 }
 
diff --git a/src/packages/button/button.tsx b/src/packages/button/button.tsx
index b894b30..0092b10 100644
--- a/src/packages/button/button.tsx
+++ b/src/packages/button/button.tsx
@@ -134,7 +134,8 @@ export const Button: FunctionComponent<Partial<ButtonProps>> = (props) => {
   }
 
   return (
-    <div
+    // eslint-disable-next-line react/button-has-type
+    <button
       className={`${btnName} ${className}`}
       style={{ ...btnStyle, ...style }}
       {...rest}
@@ -159,7 +160,7 @@ export const Button: FunctionComponent<Partial<ButtonProps>> = (props) => {
         )}
         <div className="text">{children}</div>
       </div>
-    </div>
+    </button>
   )
 }
 
-- 
GitLab