From 8ead3e56c787758fc4e67a16f12aa76f80bd41f7 Mon Sep 17 00:00:00 2001 From: leejimqiu Date: Fri, 21 Apr 2023 16:00:30 +0800 Subject: [PATCH] fix(button): using new style (#612) * fix(button): using new style * feat(button): finish new style * refactor: remove button group * fix: update common & test * test: update snapshot --- src/_common | 2 +- .../__test__/__snapshots__/demo.test.jsx.snap | 36 +- .../__test__/__snapshots__/demo.test.jsx.snap | 72 +- .../__test__/__snapshots__/demo.test.jsx.snap | 48 +- src/button-group/button-group.md | 1 - src/button-group/button-group.vue | 26 - src/button-group/index.ts | 7 - src/button-group/style/css.js | 1 - src/button-group/style/index.js | 1 - .../__test__/__snapshots__/demo.test.jsx.snap | 2815 ++++++++--------- .../__snapshots__/index.test.jsx.snap | 34 - src/button/__test__/demo.test.jsx | 14 +- src/button/__test__/index.test.jsx | 83 +- src/button/button.en-US.md | 27 + src/button/button.md | 11 +- src/button/button.vue | 40 +- src/button/demos/base.vue | 63 +- src/button/demos/block.vue | 11 + src/button/demos/ghost.vue | 19 + src/button/demos/group.vue | 15 + src/button/demos/icon.vue | 30 + src/button/demos/mobile.vue | 53 +- src/button/demos/shape.vue | 29 + src/button/demos/size.vue | 40 +- src/button/demos/status.vue | 66 +- src/button/demos/test.vue | 22 - src/button/demos/theme.vue | 38 + src/button/props.ts | 23 +- src/button/style/index.js | 2 +- src/button/type.ts | 18 +- .../__test__/__snapshots__/demo.test.jsx.snap | 72 +- .../__snapshots__/index.test.jsx.snap | 6 +- src/components.ts | 1 - .../__test__/__snapshots__/demo.test.jsx.snap | 192 +- .../__test__/__snapshots__/demo.test.jsx.snap | 24 +- .../__test__/__snapshots__/demo.test.jsx.snap | 12 +- .../__test__/__snapshots__/demo.test.jsx.snap | 30 +- .../__snapshots__/index.test.jsx.snap | 6 +- src/fab/__test__/index.test.jsx | 4 +- .../__test__/__snapshots__/demo.test.jsx.snap | 42 +- .../__test__/__snapshots__/demo.test.jsx.snap | 54 +- .../__test__/__snapshots__/demo.test.jsx.snap | 12 +- .../__test__/__snapshots__/demo.test.jsx.snap | 12 +- .../__test__/__snapshots__/demo.test.jsx.snap | 18 +- .../__test__/__snapshots__/demo.test.jsx.snap | 108 +- .../__test__/__snapshots__/demo.test.jsx.snap | 12 +- .../__test__/__snapshots__/demo.test.jsx.snap | 84 +- .../__test__/__snapshots__/demo.test.jsx.snap | 24 +- .../__test__/__snapshots__/demo.test.jsx.snap | 6 +- .../__test__/__snapshots__/demo.test.jsx.snap | 36 +- .../__test__/__snapshots__/demo.test.jsx.snap | 310 +- .../__test__/__snapshots__/demo.test.jsx.snap | 18 +- .../__test__/__snapshots__/demo.test.jsx.snap | 132 +- 53 files changed, 2548 insertions(+), 2314 deletions(-) delete mode 100644 src/button-group/button-group.md delete mode 100644 src/button-group/button-group.vue delete mode 100644 src/button-group/index.ts delete mode 100644 src/button-group/style/css.js delete mode 100644 src/button-group/style/index.js delete mode 100644 src/button/__test__/__snapshots__/index.test.jsx.snap create mode 100644 src/button/button.en-US.md create mode 100644 src/button/demos/block.vue create mode 100644 src/button/demos/ghost.vue create mode 100644 src/button/demos/group.vue create mode 100644 src/button/demos/icon.vue create mode 100644 src/button/demos/shape.vue delete mode 100644 src/button/demos/test.vue create mode 100644 src/button/demos/theme.vue diff --git a/src/_common b/src/_common index b3064b7c9..16fb8b742 160000 --- a/src/_common +++ b/src/_common @@ -1 +1 @@ -Subproject commit b3064b7c99169817b49bef8822b5545c68ffa7cd +Subproject commit 16fb8b742fd0c7b5ebb615392493486f06ed0116 diff --git a/src/action-sheet/__test__/__snapshots__/demo.test.jsx.snap b/src/action-sheet/__test__/__snapshots__/demo.test.jsx.snap index 0ca7dfc86..a3614174d 100644 --- a/src/action-sheet/__test__/__snapshots__/demo.test.jsx.snap +++ b/src/action-sheet/__test__/__snapshots__/demo.test.jsx.snap @@ -11,18 +11,20 @@ exports[`ActionSheet > ActionSheet gridMultipleVue demo works fine 1`] = ` > ActionSheet gridVue demo works fine 1`] = ` > ActionSheet listVue demo works fine 1`] = ` > ActionSheet mobileVue demo works fine 1`] = ` > ActionSheet mobileVue demo works fine 1`] = ` > ActionSheet mobileVue demo works fine 1`] = ` > BackTop halfRoundVue demo works fine 1`] = ` >
BackTop mobileVue demo works fine 1`] = ` >
BackTop mobileVue demo works fine 1`] = ` >
BackTop roundVue demo works fine 1`] = ` >
Badge baseVue demo works fine 1`] = `
@@ -159,17 +161,19 @@ exports[`Badge > Badge baseVue demo works fine 1`] = ` @@ -203,8 +207,9 @@ exports[`Badge > Badge baseVue demo works fine 1`] = ` @@ -339,17 +345,19 @@ exports[`Badge > Badge mobileVue demo works fine 1`] = ` @@ -430,17 +438,19 @@ exports[`Badge > Badge mobileVue demo works fine 1`] = ` @@ -474,8 +484,9 @@ exports[`Badge > Badge mobileVue demo works fine 1`] = ` @@ -622,8 +634,9 @@ exports[`Badge > Badge mobileVue demo works fine 1`] = ` @@ -1061,8 +1075,9 @@ exports[`Badge > Badge themeVue demo works fine 1`] = ` diff --git a/src/button-group/button-group.md b/src/button-group/button-group.md deleted file mode 100644 index 6b237f5a4..000000000 --- a/src/button-group/button-group.md +++ /dev/null @@ -1 +0,0 @@ -# 按钮组(展示模块) diff --git a/src/button-group/button-group.vue b/src/button-group/button-group.vue deleted file mode 100644 index d121ba91f..000000000 --- a/src/button-group/button-group.vue +++ /dev/null @@ -1,26 +0,0 @@ - - diff --git a/src/button-group/index.ts b/src/button-group/index.ts deleted file mode 100644 index 8bf805cb1..000000000 --- a/src/button-group/index.ts +++ /dev/null @@ -1,7 +0,0 @@ -import ButtonGroup from './button-group.vue'; -import { withInstall, WithInstallType } from '../shared'; - -import './style'; - -const _ButtonGroup: WithInstallType = withInstall(ButtonGroup); -export default _ButtonGroup; diff --git a/src/button-group/style/css.js b/src/button-group/style/css.js deleted file mode 100644 index 6a9a4b132..000000000 --- a/src/button-group/style/css.js +++ /dev/null @@ -1 +0,0 @@ -import './index.css'; diff --git a/src/button-group/style/index.js b/src/button-group/style/index.js deleted file mode 100644 index 27ef8d907..000000000 --- a/src/button-group/style/index.js +++ /dev/null @@ -1 +0,0 @@ -import '../../_common/style/mobile/components/button-group/_index.less'; diff --git a/src/button/__test__/__snapshots__/demo.test.jsx.snap b/src/button/__test__/__snapshots__/demo.test.jsx.snap index 853a7aa6f..f9b6f8bde 100644 --- a/src/button/__test__/__snapshots__/demo.test.jsx.snap +++ b/src/button/__test__/__snapshots__/demo.test.jsx.snap @@ -6,381 +6,361 @@ exports[`Button > Button baseVue demo works fine 1`] = ` >
- - -
-
-
-
+`; + +exports[`Button > Button blockVue demo works fine 1`] = ` +
+ -
-
+ + +
+`; + +exports[`Button > Button ghostVue demo works fine 1`] = ` +
+ - + -
-
+ + + - -
-
+ + +
+`; + +exports[`Button > Button groupVue demo works fine 1`] = ` +
+ - -
-
-
+ + + +
+`; + +exports[`Button > Button iconVue demo works fine 1`] = ` +
+ + - + + + + +
- - + + + 加载中 + + + + + `; exports[`Button > Button mobileVue demo works fine 1`] = `

Button 按钮

按钮用于开启一个闭环的操作任务,如“删除”对象、“购买”商品等。

Button mobileVue demo works fine 1`] = `

- 01 类型 + 01 组件类型

Button mobileVue demo works fine 1`] = `

+
+
+
+ + +
+
+
+
+ +

+ 图标按钮 +

+
+
+ +
-
-