From 4f8d0603c3e292a337b0be09266a360d7e91e943 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=90=B4=E9=9C=9E=E7=8E=89?= Date: Mon, 24 Jun 2024 19:27:10 +0800 Subject: [PATCH 01/13] fix: stepper controlled value --- .../arcodesign/components/stepper/hooks/useInputEvent.tsx | 6 ++++-- packages/arcodesign/components/stepper/hooks/useValue.tsx | 1 + packages/arcodesign/components/stepper/index.tsx | 3 ++- packages/arcodesign/tokens/app/arcodesign/default/index.js | 2 +- packages/arcodesign/tokens/mixin/index.less | 4 ++-- 5 files changed, 10 insertions(+), 6 deletions(-) diff --git a/packages/arcodesign/components/stepper/hooks/useInputEvent.tsx b/packages/arcodesign/components/stepper/hooks/useInputEvent.tsx index daff71b7..dc06ff8f 100644 --- a/packages/arcodesign/components/stepper/hooks/useInputEvent.tsx +++ b/packages/arcodesign/components/stepper/hooks/useInputEvent.tsx @@ -6,6 +6,7 @@ export default function useInputEvent( params: Required> & Pick & { actualInputValue: number; + innerValue: number; updateValue: (updater: number | ((oldValue: number) => number)) => void; }, ) { @@ -15,6 +16,7 @@ export default function useInputEvent( max, digits, actualInputValue, + innerValue, allowEmpty, updateValue, onBlur, @@ -53,8 +55,8 @@ export default function useInputEvent( }; useUpdateEffect(() => { - onChange && onChange(actualInputValue); - }, [actualInputValue]); + onChange && onChange(innerValue); + }, [innerValue]); return { handleInput, diff --git a/packages/arcodesign/components/stepper/hooks/useValue.tsx b/packages/arcodesign/components/stepper/hooks/useValue.tsx index 4718932e..96e4f8e9 100644 --- a/packages/arcodesign/components/stepper/hooks/useValue.tsx +++ b/packages/arcodesign/components/stepper/hooks/useValue.tsx @@ -37,5 +37,6 @@ export default function useValue( updateValue, actualInputValue, showValue, + innerValue, }; } diff --git a/packages/arcodesign/components/stepper/index.tsx b/packages/arcodesign/components/stepper/index.tsx index da163333..bd55b367 100644 --- a/packages/arcodesign/components/stepper/index.tsx +++ b/packages/arcodesign/components/stepper/index.tsx @@ -41,7 +41,7 @@ const Stepper = forwardRef((props: StepperProps, ref: Ref) => { // 值的相关逻辑 // @en The logic is that handle value - const { updateValue, actualInputValue, showValue } = useValue({ + const { updateValue, actualInputValue, showValue, innerValue } = useValue({ defaultValue, formatter, min, @@ -75,6 +75,7 @@ const Stepper = forwardRef((props: StepperProps, ref: Ref) => { digits, actualInputValue, allowEmpty, + innerValue, updateValue, onBlur, onChange, diff --git a/packages/arcodesign/tokens/app/arcodesign/default/index.js b/packages/arcodesign/tokens/app/arcodesign/default/index.js index e68daeef..1d5a1f4c 100644 --- a/packages/arcodesign/tokens/app/arcodesign/default/index.js +++ b/packages/arcodesign/tokens/app/arcodesign/default/index.js @@ -7,7 +7,7 @@ exports["default"] = void 0; exports.getRem = getRem; function getRem(px, baseFontSize) { - var num = Math.round(px / Number(baseFontSize) * 1000000) / 1000000; + var num = Math.round(px / Number(baseFontSize) * 1e6) / 1e6; return num ? "".concat(num, "rem") : num; } diff --git a/packages/arcodesign/tokens/mixin/index.less b/packages/arcodesign/tokens/mixin/index.less index 90c1ac22..600db4c3 100644 --- a/packages/arcodesign/tokens/mixin/index.less +++ b/packages/arcodesign/tokens/mixin/index.less @@ -156,7 +156,7 @@ * @param @rules {en} customized rewrite rules, default to initial * @example * ``` - * @import '@arco-design/mobile-utils/style/mixin.less'; + * @import '@arco-design/mobile-react/style/mixin.less'; * * .demo { * .set-prop-with-rtl(right, auto); @@ -183,7 +183,7 @@ * @param @value {en} css property value * @example * ``` - * @import '@arco-design/mobile-utils/style/mixin.less'; + * @import '@arco-design/mobile-react/style/mixin.less'; * * .demo { * .set-value-with-rtl(text-align, left); From 587e4ae933c35aee9e089eeb10b47b588d2a5f48 Mon Sep 17 00:00:00 2001 From: "wangtianli.y" Date: Wed, 26 Jun 2024 11:49:18 +0800 Subject: [PATCH 02/13] build: release version - @arco-design/mobile-react@2.31.4 - @arco-design/mobile-utils@2.18.4 --- packages/arcodesign/CHANGELOG.md | 11 +++++++++++ packages/arcodesign/package-lock.json | 2 +- packages/arcodesign/package.json | 4 ++-- packages/common-widgets/CHANGELOG.md | 8 ++++++++ packages/common-widgets/package-lock.json | 2 +- packages/common-widgets/package.json | 2 +- 6 files changed, 24 insertions(+), 5 deletions(-) diff --git a/packages/arcodesign/CHANGELOG.md b/packages/arcodesign/CHANGELOG.md index 92bac071..7d06e3b4 100644 --- a/packages/arcodesign/CHANGELOG.md +++ b/packages/arcodesign/CHANGELOG.md @@ -3,6 +3,17 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [2.31.4](https://github.com/arco-design/arco-design-mobile/compare/@arco-design/mobile-react@2.31.3...@arco-design/mobile-react@2.31.4) (2024-06-26) + + +### Bug Fixes + +* stepper controlled value ([4f8d060](https://github.com/arco-design/arco-design-mobile/commit/4f8d0603c3e292a337b0be09266a360d7e91e943)) + + + + + ## [2.31.3](https://github.com/arco-design/arco-design-mobile/compare/@arco-design/mobile-react@2.31.2...@arco-design/mobile-react@2.31.3) (2024-05-11) diff --git a/packages/arcodesign/package-lock.json b/packages/arcodesign/package-lock.json index dbab84e8..fe2961ea 100644 --- a/packages/arcodesign/package-lock.json +++ b/packages/arcodesign/package-lock.json @@ -1,6 +1,6 @@ { "name": "@arco-design/mobile-react", - "version": "2.31.3", + "version": "2.31.4", "lockfileVersion": 2, "requires": true, "packages": { diff --git a/packages/arcodesign/package.json b/packages/arcodesign/package.json index cb9509e1..5dc51698 100644 --- a/packages/arcodesign/package.json +++ b/packages/arcodesign/package.json @@ -1,6 +1,6 @@ { "name": "@arco-design/mobile-react", - "version": "2.31.3", + "version": "2.31.4", "description": "", "main": "cjs/index.js", "module": "esm/index.js", @@ -15,7 +15,7 @@ "author": "taoyiyue@bytedance.com", "license": "ISC", "dependencies": { - "@arco-design/mobile-utils": "2.18.3", + "@arco-design/mobile-utils": "2.18.4", "@arco-design/transformable": "^1.0.0", "@babel/runtime": "^7", "lodash.throttle": "^4.1.1", diff --git a/packages/common-widgets/CHANGELOG.md b/packages/common-widgets/CHANGELOG.md index e6d65d13..e4172cad 100644 --- a/packages/common-widgets/CHANGELOG.md +++ b/packages/common-widgets/CHANGELOG.md @@ -3,6 +3,14 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [2.18.4](https://github.com/arco-design/arco-design-mobile/compare/@arco-design/mobile-utils@2.18.3...@arco-design/mobile-utils@2.18.4) (2024-06-26) + +**Note:** Version bump only for package @arco-design/mobile-utils + + + + + ## [2.18.3](https://github.com/arco-design/arco-design-mobile/compare/@arco-design/mobile-utils@2.18.2...@arco-design/mobile-utils@2.18.3) (2024-05-11) diff --git a/packages/common-widgets/package-lock.json b/packages/common-widgets/package-lock.json index cf4ab120..e6ac11a1 100644 --- a/packages/common-widgets/package-lock.json +++ b/packages/common-widgets/package-lock.json @@ -1,6 +1,6 @@ { "name": "@arco-design/mobile-utils", - "version": "2.18.3", + "version": "2.18.4", "lockfileVersion": 2, "requires": true, "packages": { diff --git a/packages/common-widgets/package.json b/packages/common-widgets/package.json index 5c23d90b..5c212fe3 100644 --- a/packages/common-widgets/package.json +++ b/packages/common-widgets/package.json @@ -1,6 +1,6 @@ { "name": "@arco-design/mobile-utils", - "version": "2.18.3", + "version": "2.18.4", "description": "", "main": "cjs/index.js", "module": "esm/index.js", From 3b5488613dfd3833bc7f02f135ff088b0988ea15 Mon Sep 17 00:00:00 2001 From: "wangtianli.y" Date: Wed, 26 Jun 2024 11:53:38 +0800 Subject: [PATCH 03/13] build: update readme --- packages/arcodesign/README.en-US.md | 4 ++-- packages/arcodesign/README.md | 4 ++-- packages/arcodesign/package.json | 2 +- packages/arcodesign/tokens/app/arcodesign/default/index.js | 2 +- packages/common-widgets/package.json | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/packages/arcodesign/README.en-US.md b/packages/arcodesign/README.en-US.md index 2cb7e1db..2f88600a 100644 --- a/packages/arcodesign/README.en-US.md +++ b/packages/arcodesign/README.en-US.md @@ -59,8 +59,8 @@ React & ReactDOM: **Click here** ``` - - + + ``` ## Full import diff --git a/packages/arcodesign/README.md b/packages/arcodesign/README.md index 0a7096b9..927359d1 100644 --- a/packages/arcodesign/README.md +++ b/packages/arcodesign/README.md @@ -59,8 +59,8 @@ React & ReactDOM： **戳这里获取** ``` - - + + ``` ## 引入全部 diff --git a/packages/arcodesign/package.json b/packages/arcodesign/package.json index 5dc51698..aef2303e 100644 --- a/packages/arcodesign/package.json +++ b/packages/arcodesign/package.json @@ -47,5 +47,5 @@ "publishConfig": { "access": "public" }, - "gitHead": "6eab3e99e70f5fed7994acbf3d8bb01800310635" + "gitHead": "587e4ae933c35aee9e089eeb10b47b588d2a5f48" } diff --git a/packages/arcodesign/tokens/app/arcodesign/default/index.js b/packages/arcodesign/tokens/app/arcodesign/default/index.js index 1d5a1f4c..e68daeef 100644 --- a/packages/arcodesign/tokens/app/arcodesign/default/index.js +++ b/packages/arcodesign/tokens/app/arcodesign/default/index.js @@ -7,7 +7,7 @@ exports["default"] = void 0; exports.getRem = getRem; function getRem(px, baseFontSize) { - var num = Math.round(px / Number(baseFontSize) * 1e6) / 1e6; + var num = Math.round(px / Number(baseFontSize) * 1000000) / 1000000; return num ? "".concat(num, "rem") : num; } diff --git a/packages/common-widgets/package.json b/packages/common-widgets/package.json index 5c212fe3..ecf0cbea 100644 --- a/packages/common-widgets/package.json +++ b/packages/common-widgets/package.json @@ -13,7 +13,7 @@ "publishConfig": { "access": "public" }, - "gitHead": "6eab3e99e70f5fed7994acbf3d8bb01800310635", + "gitHead": "587e4ae933c35aee9e089eeb10b47b588d2a5f48", "dependencies": { "es6-promise": "^4.2.8" } From b76f2cae577402979708bba07e864b9d2dca4f93 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B7=B1=E6=B5=B7=E5=A4=A7=E5=A4=A7ovo?= Date: Mon, 1 Jul 2024 20:45:02 +0800 Subject: [PATCH 04/13] fix: add `Stepper` width (#274) * fix: stepper style * fix: stepper style * fix: stepper style * fix: stepper style * fix: stepper style * fix: stepper style --- .../arcodesign/components/stepper/style/index.less | 1 + .../tokens/app/arcodesign/default/css-variables.less | 1 + .../tokens/app/arcodesign/default/index.d.ts | 1 + .../tokens/app/arcodesign/default/index.js | 1 + .../tokens/app/arcodesign/default/index.json | 12 ++++++++++++ .../tokens/app/arcodesign/default/index.less | 1 + .../tokens/src/arcodesign/default/index.js | 6 +++++- 7 files changed, 22 insertions(+), 1 deletion(-) diff --git a/packages/arcodesign/components/stepper/style/index.less b/packages/arcodesign/components/stepper/style/index.less index 9d6f66e8..b32d44ee 100644 --- a/packages/arcodesign/components/stepper/style/index.less +++ b/packages/arcodesign/components/stepper/style/index.less @@ -3,6 +3,7 @@ .@{prefix}-stepper { display: flex; .use-var(font-size, stepper-font-size); + .use-var(width, stepper-width); &.@{prefix}-square { border-width: 1PX; diff --git a/packages/arcodesign/tokens/app/arcodesign/default/css-variables.less b/packages/arcodesign/tokens/app/arcodesign/default/css-variables.less index 9a579311..0aed3273 100644 --- a/packages/arcodesign/tokens/app/arcodesign/default/css-variables.less +++ b/packages/arcodesign/tokens/app/arcodesign/default/css-variables.less @@ -963,6 +963,7 @@ --index-bar-sidebar-toast-radius: ~`pxtorem(4)`; --index-bar-sidebar-toast-padding: 0 ~`pxtorem(8)`; --index-bar-sidebar-toast-font-size: ~`pxtorem(24)`; + --stepper-width: ~`pxtorem(98)`; --stepper-font-size: ~`pxtorem(14)`; --dark-stepper-square-border-color: var(--dark-lighter-line-color); --stepper-square-border-color: var(--lighter-line-color); diff --git a/packages/arcodesign/tokens/app/arcodesign/default/index.d.ts b/packages/arcodesign/tokens/app/arcodesign/default/index.d.ts index 1a77e6c4..a5691c3d 100644 --- a/packages/arcodesign/tokens/app/arcodesign/default/index.d.ts +++ b/packages/arcodesign/tokens/app/arcodesign/default/index.d.ts @@ -962,6 +962,7 @@ export interface ArcodesignToken extends Record { 'index-bar-sidebar-toast-radius': string; 'index-bar-sidebar-toast-padding': string; 'index-bar-sidebar-toast-font-size': string; + 'stepper-width': string; 'stepper-font-size': string; 'dark-stepper-square-border-color': string; 'stepper-square-border-color': string; diff --git a/packages/arcodesign/tokens/app/arcodesign/default/index.js b/packages/arcodesign/tokens/app/arcodesign/default/index.js index e68daeef..33aab071 100644 --- a/packages/arcodesign/tokens/app/arcodesign/default/index.js +++ b/packages/arcodesign/tokens/app/arcodesign/default/index.js @@ -974,6 +974,7 @@ var tokens = { "index-bar-sidebar-toast-radius": "0.08rem", "index-bar-sidebar-toast-padding": "0 0.16rem", "index-bar-sidebar-toast-font-size": "0.48rem", + "stepper-width": "1.96rem", "stepper-font-size": "0.28rem", "dark-stepper-square-border-color": "var(--dark-lighter-line-color)", "stepper-square-border-color": "var(--lighter-line-color)", diff --git a/packages/arcodesign/tokens/app/arcodesign/default/index.json b/packages/arcodesign/tokens/app/arcodesign/default/index.json index 66f63d14..342886a3 100644 --- a/packages/arcodesign/tokens/app/arcodesign/default/index.json +++ b/packages/arcodesign/tokens/app/arcodesign/default/index.json @@ -9411,6 +9411,18 @@ "en": "Square border radius of Stepper" } }, + "stepperWidth": { + "cssKey": "stepper-width", + "desc": "步进器整体宽度", + "override": "", + "value": "~`pxtorem(98)`", + "jsValue": "@getRem@98", + "staticValue": "1.96rem", + "localeDesc": { + "ch": "步进器整体宽度", + "en": "Width of Stepper" + } + }, "stepsDescriptionColor": { "cssKey": "steps-description-color", "desc": "steps 步骤默认描述文字颜色", diff --git a/packages/arcodesign/tokens/app/arcodesign/default/index.less b/packages/arcodesign/tokens/app/arcodesign/default/index.less index e26856d0..e3417c08 100644 --- a/packages/arcodesign/tokens/app/arcodesign/default/index.less +++ b/packages/arcodesign/tokens/app/arcodesign/default/index.less @@ -962,6 +962,7 @@ @index-bar-sidebar-toast-radius: ~`pxtorem(4)`; @index-bar-sidebar-toast-padding: 0 ~`pxtorem(8)`; @index-bar-sidebar-toast-font-size: ~`pxtorem(24)`; +@stepper-width: ~`pxtorem(98)`; @stepper-font-size: ~`pxtorem(14)`; @dark-stepper-square-border-color: @dark-lighter-line-color; @stepper-square-border-color: @lighter-line-color; diff --git a/packages/arcodesign/tokens/src/arcodesign/default/index.js b/packages/arcodesign/tokens/src/arcodesign/default/index.js index 2081afc7..868d27a0 100644 --- a/packages/arcodesign/tokens/src/arcodesign/default/index.js +++ b/packages/arcodesign/tokens/src/arcodesign/default/index.js @@ -3750,6 +3750,11 @@ function getCompTokens() { * @en IndexBar sidebar light prompt font size */ indexBarSidebarToastFontSize: getRem(24), + /** + * 步进器整体宽度 + * @en Width of Stepper + */ + stepperWidth: getRem(98), /** * 步进器字体大小 * @en Font size of Stepper @@ -4224,7 +4229,6 @@ function getCompTokens() { * @en Error status color of the text in the uploader list */ uploaderItemTextErrorColor: useGlobal('dangerColor'), - }; } From 8b2b5c2694e65be7a57a4f8d8d1af5db4601fda2 Mon Sep 17 00:00:00 2001 From: "wangtianli.y" Date: Mon, 1 Jul 2024 20:47:01 +0800 Subject: [PATCH 05/13] build: release version - @arco-design/mobile-react@2.31.5 - @arco-design/mobile-utils@2.18.5 --- packages/arcodesign/CHANGELOG.md | 11 +++++++++++ packages/arcodesign/package-lock.json | 2 +- packages/arcodesign/package.json | 4 ++-- packages/common-widgets/CHANGELOG.md | 8 ++++++++ packages/common-widgets/package-lock.json | 2 +- packages/common-widgets/package.json | 2 +- 6 files changed, 24 insertions(+), 5 deletions(-) diff --git a/packages/arcodesign/CHANGELOG.md b/packages/arcodesign/CHANGELOG.md index 7d06e3b4..a5e08586 100644 --- a/packages/arcodesign/CHANGELOG.md +++ b/packages/arcodesign/CHANGELOG.md @@ -3,6 +3,17 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [2.31.5](https://github.com/arco-design/arco-design-mobile/compare/@arco-design/mobile-react@2.31.4...@arco-design/mobile-react@2.31.5) (2024-07-01) + + +### Bug Fixes + +* add `Stepper` width ([#274](https://github.com/arco-design/arco-design-mobile/issues/274)) ([b76f2ca](https://github.com/arco-design/arco-design-mobile/commit/b76f2cae577402979708bba07e864b9d2dca4f93)) + + + + + ## [2.31.4](https://github.com/arco-design/arco-design-mobile/compare/@arco-design/mobile-react@2.31.3...@arco-design/mobile-react@2.31.4) (2024-06-26) diff --git a/packages/arcodesign/package-lock.json b/packages/arcodesign/package-lock.json index fe2961ea..974f2810 100644 --- a/packages/arcodesign/package-lock.json +++ b/packages/arcodesign/package-lock.json @@ -1,6 +1,6 @@ { "name": "@arco-design/mobile-react", - "version": "2.31.4", + "version": "2.31.5", "lockfileVersion": 2, "requires": true, "packages": { diff --git a/packages/arcodesign/package.json b/packages/arcodesign/package.json index aef2303e..47010abe 100644 --- a/packages/arcodesign/package.json +++ b/packages/arcodesign/package.json @@ -1,6 +1,6 @@ { "name": "@arco-design/mobile-react", - "version": "2.31.4", + "version": "2.31.5", "description": "", "main": "cjs/index.js", "module": "esm/index.js", @@ -15,7 +15,7 @@ "author": "taoyiyue@bytedance.com", "license": "ISC", "dependencies": { - "@arco-design/mobile-utils": "2.18.4", + "@arco-design/mobile-utils": "2.18.5", "@arco-design/transformable": "^1.0.0", "@babel/runtime": "^7", "lodash.throttle": "^4.1.1", diff --git a/packages/common-widgets/CHANGELOG.md b/packages/common-widgets/CHANGELOG.md index e4172cad..79e948da 100644 --- a/packages/common-widgets/CHANGELOG.md +++ b/packages/common-widgets/CHANGELOG.md @@ -3,6 +3,14 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [2.18.5](https://github.com/arco-design/arco-design-mobile/compare/@arco-design/mobile-utils@2.18.4...@arco-design/mobile-utils@2.18.5) (2024-07-01) + +**Note:** Version bump only for package @arco-design/mobile-utils + + + + + ## [2.18.4](https://github.com/arco-design/arco-design-mobile/compare/@arco-design/mobile-utils@2.18.3...@arco-design/mobile-utils@2.18.4) (2024-06-26) **Note:** Version bump only for package @arco-design/mobile-utils diff --git a/packages/common-widgets/package-lock.json b/packages/common-widgets/package-lock.json index e6ac11a1..98cfd32e 100644 --- a/packages/common-widgets/package-lock.json +++ b/packages/common-widgets/package-lock.json @@ -1,6 +1,6 @@ { "name": "@arco-design/mobile-utils", - "version": "2.18.4", + "version": "2.18.5", "lockfileVersion": 2, "requires": true, "packages": { diff --git a/packages/common-widgets/package.json b/packages/common-widgets/package.json index ecf0cbea..c1b71631 100644 --- a/packages/common-widgets/package.json +++ b/packages/common-widgets/package.json @@ -1,6 +1,6 @@ { "name": "@arco-design/mobile-utils", - "version": "2.18.4", + "version": "2.18.5", "description": "", "main": "cjs/index.js", "module": "esm/index.js", From c554231f241f31c804a378ce82ddbf7760a6920a Mon Sep 17 00:00:00 2001 From: "wangtianli.y" Date: Mon, 1 Jul 2024 21:15:21 +0800 Subject: [PATCH 06/13] build: update readme --- packages/arcodesign/README.en-US.md | 4 ++-- packages/arcodesign/README.md | 4 ++-- packages/arcodesign/package.json | 2 +- packages/common-widgets/package.json | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/packages/arcodesign/README.en-US.md b/packages/arcodesign/README.en-US.md index 2f88600a..06d0e2ef 100644 --- a/packages/arcodesign/README.en-US.md +++ b/packages/arcodesign/README.en-US.md @@ -59,8 +59,8 @@ React & ReactDOM: **Click here** ``` - - + + ``` ## Full import diff --git a/packages/arcodesign/README.md b/packages/arcodesign/README.md index 927359d1..54ffbe6f 100644 --- a/packages/arcodesign/README.md +++ b/packages/arcodesign/README.md @@ -59,8 +59,8 @@ React & ReactDOM： **戳这里获取** ``` - - + + ``` ## 引入全部 diff --git a/packages/arcodesign/package.json b/packages/arcodesign/package.json index 47010abe..99033bb3 100644 --- a/packages/arcodesign/package.json +++ b/packages/arcodesign/package.json @@ -47,5 +47,5 @@ "publishConfig": { "access": "public" }, - "gitHead": "587e4ae933c35aee9e089eeb10b47b588d2a5f48" + "gitHead": "8b2b5c2694e65be7a57a4f8d8d1af5db4601fda2" } diff --git a/packages/common-widgets/package.json b/packages/common-widgets/package.json index c1b71631..69d04f11 100644 --- a/packages/common-widgets/package.json +++ b/packages/common-widgets/package.json @@ -13,7 +13,7 @@ "publishConfig": { "access": "public" }, - "gitHead": "587e4ae933c35aee9e089eeb10b47b588d2a5f48", + "gitHead": "8b2b5c2694e65be7a57a4f8d8d1af5db4601fda2", "dependencies": { "es6-promise": "^4.2.8" } From e191b9319c918c249ebba24f4f6b336e6220da88 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=90=B4=E9=9C=9E=E7=8E=89?= Date: Wed, 3 Jul 2024 17:57:50 +0800 Subject: [PATCH 07/13] fix: change `Stepper` flex to inline-flex --- packages/arcodesign/components/stepper/style/index.less | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/packages/arcodesign/components/stepper/style/index.less b/packages/arcodesign/components/stepper/style/index.less index b32d44ee..0f2683a3 100644 --- a/packages/arcodesign/components/stepper/style/index.less +++ b/packages/arcodesign/components/stepper/style/index.less @@ -1,9 +1,8 @@ @import '../../../style/mixin.less'; .@{prefix}-stepper { - display: flex; + display: inline-flex; .use-var(font-size, stepper-font-size); - .use-var(width, stepper-width); &.@{prefix}-square { border-width: 1PX; From e7ea18f3c033d5284a05b3acf9f27c713f6dd943 Mon Sep 17 00:00:00 2001 From: tangshumin Date: Tue, 9 Jul 2024 15:55:19 +0800 Subject: [PATCH 08/13] build: release version - @arco-design/mobile-react@2.31.6 - @arco-design/mobile-utils@2.18.6 --- packages/arcodesign/CHANGELOG.md | 11 +++++++++++ packages/arcodesign/package-lock.json | 2 +- packages/arcodesign/package.json | 4 ++-- packages/common-widgets/CHANGELOG.md | 8 ++++++++ packages/common-widgets/package-lock.json | 2 +- packages/common-widgets/package.json | 2 +- 6 files changed, 24 insertions(+), 5 deletions(-) diff --git a/packages/arcodesign/CHANGELOG.md b/packages/arcodesign/CHANGELOG.md index a5e08586..4b988944 100644 --- a/packages/arcodesign/CHANGELOG.md +++ b/packages/arcodesign/CHANGELOG.md @@ -3,6 +3,17 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [2.31.6](https://github.com/arco-design/arco-design-mobile/compare/@arco-design/mobile-react@2.31.5...@arco-design/mobile-react@2.31.6) (2024-07-09) + + +### Bug Fixes + +* change `Stepper` flex to inline-flex ([e191b93](https://github.com/arco-design/arco-design-mobile/commit/e191b9319c918c249ebba24f4f6b336e6220da88)) + + + + + ## [2.31.5](https://github.com/arco-design/arco-design-mobile/compare/@arco-design/mobile-react@2.31.4...@arco-design/mobile-react@2.31.5) (2024-07-01) diff --git a/packages/arcodesign/package-lock.json b/packages/arcodesign/package-lock.json index 974f2810..650ee425 100644 --- a/packages/arcodesign/package-lock.json +++ b/packages/arcodesign/package-lock.json @@ -1,6 +1,6 @@ { "name": "@arco-design/mobile-react", - "version": "2.31.5", + "version": "2.31.6", "lockfileVersion": 2, "requires": true, "packages": { diff --git a/packages/arcodesign/package.json b/packages/arcodesign/package.json index 99033bb3..598db099 100644 --- a/packages/arcodesign/package.json +++ b/packages/arcodesign/package.json @@ -1,6 +1,6 @@ { "name": "@arco-design/mobile-react", - "version": "2.31.5", + "version": "2.31.6", "description": "", "main": "cjs/index.js", "module": "esm/index.js", @@ -15,7 +15,7 @@ "author": "taoyiyue@bytedance.com", "license": "ISC", "dependencies": { - "@arco-design/mobile-utils": "2.18.5", + "@arco-design/mobile-utils": "2.18.6", "@arco-design/transformable": "^1.0.0", "@babel/runtime": "^7", "lodash.throttle": "^4.1.1", diff --git a/packages/common-widgets/CHANGELOG.md b/packages/common-widgets/CHANGELOG.md index 79e948da..209d98c9 100644 --- a/packages/common-widgets/CHANGELOG.md +++ b/packages/common-widgets/CHANGELOG.md @@ -3,6 +3,14 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [2.18.6](https://github.com/arco-design/arco-design-mobile/compare/@arco-design/mobile-utils@2.18.5...@arco-design/mobile-utils@2.18.6) (2024-07-09) + +**Note:** Version bump only for package @arco-design/mobile-utils + + + + + ## [2.18.5](https://github.com/arco-design/arco-design-mobile/compare/@arco-design/mobile-utils@2.18.4...@arco-design/mobile-utils@2.18.5) (2024-07-01) **Note:** Version bump only for package @arco-design/mobile-utils diff --git a/packages/common-widgets/package-lock.json b/packages/common-widgets/package-lock.json index 98cfd32e..3ebd6f3f 100644 --- a/packages/common-widgets/package-lock.json +++ b/packages/common-widgets/package-lock.json @@ -1,6 +1,6 @@ { "name": "@arco-design/mobile-utils", - "version": "2.18.5", + "version": "2.18.6", "lockfileVersion": 2, "requires": true, "packages": { diff --git a/packages/common-widgets/package.json b/packages/common-widgets/package.json index 69d04f11..97556ff7 100644 --- a/packages/common-widgets/package.json +++ b/packages/common-widgets/package.json @@ -1,6 +1,6 @@ { "name": "@arco-design/mobile-utils", - "version": "2.18.5", + "version": "2.18.6", "description": "", "main": "cjs/index.js", "module": "esm/index.js", From f4292cfebf4afae1c8e66c8f9f2398467d94f9ea Mon Sep 17 00:00:00 2001 From: tangshumin Date: Tue, 9 Jul 2024 16:14:53 +0800 Subject: [PATCH 09/13] build: update readme --- packages/arcodesign/README.en-US.md | 4 ++-- packages/arcodesign/README.md | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/arcodesign/README.en-US.md b/packages/arcodesign/README.en-US.md index 06d0e2ef..13f0feea 100644 --- a/packages/arcodesign/README.en-US.md +++ b/packages/arcodesign/README.en-US.md @@ -59,8 +59,8 @@ React & ReactDOM: **Click here** ``` - - + + ``` ## Full import diff --git a/packages/arcodesign/README.md b/packages/arcodesign/README.md index 54ffbe6f..253493b2 100644 --- a/packages/arcodesign/README.md +++ b/packages/arcodesign/README.md @@ -59,8 +59,8 @@ React & ReactDOM： **戳这里获取** ``` - - + + ``` ## 引入全部 From 9c0213bc3a548b379491ada5fc747657a4a20a85 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=84=E5=B9=BF?= Date: Mon, 12 Aug 2024 20:21:04 +0800 Subject: [PATCH 10/13] feat: export helpers render func --- packages/arcodesign/components/_helpers/index.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/arcodesign/components/_helpers/index.ts b/packages/arcodesign/components/_helpers/index.ts index aaff8d31..23e7c118 100644 --- a/packages/arcodesign/components/_helpers/index.ts +++ b/packages/arcodesign/components/_helpers/index.ts @@ -6,6 +6,7 @@ import { CSSProperties } from 'react'; export * from './hooks'; export * from './react-dom'; +export * from './render'; export * from './type'; /** From 030875530d1068e801962c6fc57b9b3e1916772e Mon Sep 17 00:00:00 2001 From: "wangtianli.y" Date: Fri, 16 Aug 2024 16:28:55 +0800 Subject: [PATCH 11/13] feat: build output support esnext --- .gitignore | 1 + .../components/_helpers/react-dom.ts | 27 ++++++++++--------- packages/arcodesign/esnext-tsconfig.json | 23 ++++++++++++++++ packages/arcodesign/gulpfile.js | 18 +++++++++---- packages/common-widgets/package.json | 3 ++- packages/common-widgets/utils/is.ts | 4 ++- 6 files changed, 57 insertions(+), 19 deletions(-) create mode 100644 packages/arcodesign/esnext-tsconfig.json diff --git a/.gitignore b/.gitignore index 7fd37285..157d9954 100644 --- a/.gitignore +++ b/.gitignore @@ -10,6 +10,7 @@ umd/ cjs/ esm/ dist/ +esnext/ packages/arcodesign/tests/coverage packages/arcodesign/style/css yarn.lock diff --git a/packages/arcodesign/components/_helpers/react-dom.ts b/packages/arcodesign/components/_helpers/react-dom.ts index f45b8dc8..c55ea162 100644 --- a/packages/arcodesign/components/_helpers/react-dom.ts +++ b/packages/arcodesign/components/_helpers/react-dom.ts @@ -1,5 +1,5 @@ import { ReactElement } from 'react'; -import ReactDOM from 'react-dom'; +import * as ReactDOM from 'react-dom'; function isObject(obj: any): obj is { [key: string]: any } { return Object.prototype.toString.call(obj) === '[object Object]'; @@ -14,12 +14,12 @@ export interface RootTypeReact extends RootType { } export type CreateRootFnType = (container: Element | DocumentFragment) => RootTypeReact; -const __SECRET_INTERNALS__ = '__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED'; - -const CopyReactDOM = ReactDOM as typeof ReactDOM & { +const CopyReactDOM = { + ...ReactDOM, +} as typeof ReactDOM & { createRoot: CreateRootFnType; // https://github.com/facebook/react/blob/4ff5f5719b348d9d8db14aaa49a48532defb4ab7/packages/react-dom/src/client/ReactDOM.js#L181 - [__SECRET_INTERNALS__]: { + __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED?: { usingClientEntryPoint?: boolean; }; }; @@ -32,19 +32,22 @@ let copyRender: ( _unmount: () => void; }; -const isReact18 = Number(CopyReactDOM.version?.split('.')[0]) > 17; +const { version, render: reactRender, unmountComponentAtNode } = CopyReactDOM; + +const isReact18 = Number((version || '').split('.')[0]) > 17; const updateUsingClientEntryPoint = (skipWarning?: boolean) => { // https://github.com/facebook/react/blob/17806594cc28284fe195f918e8d77de3516848ec/packages/react-dom/npm/client.js#L10 // Avoid console warning - if (isObject(CopyReactDOM[__SECRET_INTERNALS__])) { - CopyReactDOM[__SECRET_INTERNALS__].usingClientEntryPoint = skipWarning; + const { __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED } = CopyReactDOM; + if (isObject(__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED)) { + __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED.usingClientEntryPoint = skipWarning; } }; let createRoot: CreateRootFnType | undefined; try { - createRoot = CopyReactDOM.createRoot; + ({ createRoot } = CopyReactDOM); } catch (_) {} if (isReact18 && createRoot) { @@ -64,14 +67,14 @@ if (isReact18 && createRoot) { }; } else { copyRender = function (app: ReactElement, container: Element | DocumentFragment) { - CopyReactDOM.render(app, container); + reactRender(app, container); return { render: (comment: ReactElement) => { - CopyReactDOM.render(comment, container); + reactRender(comment, container); }, _unmount() { - CopyReactDOM.unmountComponentAtNode(container); + unmountComponentAtNode(container); }, }; }; diff --git a/packages/arcodesign/esnext-tsconfig.json b/packages/arcodesign/esnext-tsconfig.json new file mode 100644 index 00000000..59ba2118 --- /dev/null +++ b/packages/arcodesign/esnext-tsconfig.json @@ -0,0 +1,23 @@ +{ + "compilerOptions": { + "strictNullChecks": true, + "moduleResolution": "node", + "esModuleInterop": true, + "experimentalDecorators": true, + "allowSyntheticDefaultImports": true, + "jsx": "react", + "noUnusedParameters": true, + "noUnusedLocals": true, + "module": "ESNext", + "target": "ESNext", + "declaration": true, + "lib": ["esnext", "dom"] + }, + "include": [ + "packages/arcodesign/components/**/*.ts", + "packages/arcodesign/components/**/*.tsx", + "packages/common-widgets/**/*.ts", + "sites/**/*.d.ts" + ], + "exclude": ["node_modules"] +} diff --git a/packages/arcodesign/gulpfile.js b/packages/arcodesign/gulpfile.js index 684dbc86..08f28fc1 100644 --- a/packages/arcodesign/gulpfile.js +++ b/packages/arcodesign/gulpfile.js @@ -30,6 +30,13 @@ function esmBuild() { .pipe(gulp.dest('esm')); } +function esnextBuild() { + return gulp + .src('components/**/*.{ts,tsx}') + .pipe(ts.createProject('./esnext-tsconfig.json', { emitDeclarationOnly: false })()) + .pipe(gulp.dest('esnext')); +} + function umdBuild() { return gulp .src('components/**/*.{ts,tsx}') @@ -58,7 +65,8 @@ function copyLess() { ) .pipe(gulp.dest('esm')) .pipe(gulp.dest('umd')) - .pipe(gulp.dest('cjs')); + .pipe(gulp.dest('cjs')) + .pipe(gulp.dest('esnext')); } function buildStyle(src) { @@ -98,7 +106,7 @@ function entryLessBuild() { function moveCss() { try { allCss.forEach(file => { - ['esm', 'umd', 'cjs'].forEach(type => { + ['esm', 'umd', 'cjs', 'esnext'].forEach(type => { const filePath = path.join('_temp_style_', file); const newPath = path.join(type, path.dirname(file), 'css'); fs.mkdirpSync(newPath); @@ -131,7 +139,7 @@ function buildCssEntry(type) { function moveCssEntry() { try { allCssEntry.forEach(file => { - ['esm', 'umd', 'cjs'].forEach(type => { + ['esm', 'umd', 'cjs', 'esnext'].forEach(type => { const filePath = path.join('_temp_style_entry_', type, file); const newPath = path.join(type, path.dirname(file), 'css'); fs.mkdirpSync(newPath); @@ -149,11 +157,11 @@ function moveCssEntry() { gulp.task( 'build', gulp.series( - gulp.parallel(dtsBuild, esmBuild, umdBuild, cjsBuild), // js 部分编译打包 + gulp.parallel(dtsBuild, esmBuild, umdBuild, cjsBuild, esnextBuild), // js 部分编译打包 copyLess, // 复制less文件到产物中 gulp.parallel(lessBuild, entryLessBuild), // 编译less文件为css moveCss, // css产物放到css文件夹中 - ...['esm', 'umd', 'cjs'].map(type => buildCssEntry(type)), // css中的js入口生成 + ...['esm', 'umd', 'cjs', 'esnext'].map(type => buildCssEntry(type)), // css中的js入口生成 moveCssEntry, // css入口js放到css文件夹中 ), ); diff --git a/packages/common-widgets/package.json b/packages/common-widgets/package.json index 97556ff7..d7c6622d 100644 --- a/packages/common-widgets/package.json +++ b/packages/common-widgets/package.json @@ -16,5 +16,6 @@ "gitHead": "8b2b5c2694e65be7a57a4f8d8d1af5db4601fda2", "dependencies": { "es6-promise": "^4.2.8" - } + }, + "sideEffects": false } diff --git a/packages/common-widgets/utils/is.ts b/packages/common-widgets/utils/is.ts index f4d8676a..1b61481a 100644 --- a/packages/common-widgets/utils/is.ts +++ b/packages/common-widgets/utils/is.ts @@ -191,7 +191,9 @@ export function isDeepEqual(obj: any, sub: any): boolean { return false; } for (const key in obj) { - if (!isDeepEqual(obj[key], sub[key])) return false; + if (!isDeepEqual(obj[key], sub[key])) { + return false; + } } return true; } From 72f78e976347aa9f57858d414aba6063e7de62f6 Mon Sep 17 00:00:00 2001 From: "wangtianli.y" Date: Fri, 16 Aug 2024 17:06:56 +0800 Subject: [PATCH 12/13] build: release version - @arco-design/mobile-react@2.32.0 - @arco-design/mobile-utils@2.19.0 --- packages/arcodesign/CHANGELOG.md | 12 ++++++++++++ packages/arcodesign/package-lock.json | 2 +- packages/arcodesign/package.json | 4 ++-- packages/common-widgets/CHANGELOG.md | 11 +++++++++++ packages/common-widgets/package-lock.json | 2 +- packages/common-widgets/package.json | 2 +- 6 files changed, 28 insertions(+), 5 deletions(-) diff --git a/packages/arcodesign/CHANGELOG.md b/packages/arcodesign/CHANGELOG.md index 4b988944..0226c625 100644 --- a/packages/arcodesign/CHANGELOG.md +++ b/packages/arcodesign/CHANGELOG.md @@ -3,6 +3,18 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +# [2.32.0](https://github.com/arco-design/arco-design-mobile/compare/@arco-design/mobile-react@2.31.6...@arco-design/mobile-react@2.32.0) (2024-08-16) + + +### Features + +* build output support esnext ([0308755](https://github.com/arco-design/arco-design-mobile/commit/030875530d1068e801962c6fc57b9b3e1916772e)) +* export helpers render func ([9c0213b](https://github.com/arco-design/arco-design-mobile/commit/9c0213bc3a548b379491ada5fc747657a4a20a85)) + + + + + ## [2.31.6](https://github.com/arco-design/arco-design-mobile/compare/@arco-design/mobile-react@2.31.5...@arco-design/mobile-react@2.31.6) (2024-07-09) diff --git a/packages/arcodesign/package-lock.json b/packages/arcodesign/package-lock.json index 650ee425..5025acfb 100644 --- a/packages/arcodesign/package-lock.json +++ b/packages/arcodesign/package-lock.json @@ -1,6 +1,6 @@ { "name": "@arco-design/mobile-react", - "version": "2.31.6", + "version": "2.32.0", "lockfileVersion": 2, "requires": true, "packages": { diff --git a/packages/arcodesign/package.json b/packages/arcodesign/package.json index 598db099..5f498419 100644 --- a/packages/arcodesign/package.json +++ b/packages/arcodesign/package.json @@ -1,6 +1,6 @@ { "name": "@arco-design/mobile-react", - "version": "2.31.6", + "version": "2.32.0", "description": "", "main": "cjs/index.js", "module": "esm/index.js", @@ -15,7 +15,7 @@ "author": "taoyiyue@bytedance.com", "license": "ISC", "dependencies": { - "@arco-design/mobile-utils": "2.18.6", + "@arco-design/mobile-utils": "2.19.0", "@arco-design/transformable": "^1.0.0", "@babel/runtime": "^7", "lodash.throttle": "^4.1.1", diff --git a/packages/common-widgets/CHANGELOG.md b/packages/common-widgets/CHANGELOG.md index 209d98c9..f957ef3e 100644 --- a/packages/common-widgets/CHANGELOG.md +++ b/packages/common-widgets/CHANGELOG.md @@ -3,6 +3,17 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +# [2.19.0](https://github.com/arco-design/arco-design-mobile/compare/@arco-design/mobile-utils@2.18.6...@arco-design/mobile-utils@2.19.0) (2024-08-16) + + +### Features + +* build output support esnext ([0308755](https://github.com/arco-design/arco-design-mobile/commit/030875530d1068e801962c6fc57b9b3e1916772e)) + + + + + ## [2.18.6](https://github.com/arco-design/arco-design-mobile/compare/@arco-design/mobile-utils@2.18.5...@arco-design/mobile-utils@2.18.6) (2024-07-09) **Note:** Version bump only for package @arco-design/mobile-utils diff --git a/packages/common-widgets/package-lock.json b/packages/common-widgets/package-lock.json index 3ebd6f3f..ff928d40 100644 --- a/packages/common-widgets/package-lock.json +++ b/packages/common-widgets/package-lock.json @@ -1,6 +1,6 @@ { "name": "@arco-design/mobile-utils", - "version": "2.18.6", + "version": "2.19.0", "lockfileVersion": 2, "requires": true, "packages": { diff --git a/packages/common-widgets/package.json b/packages/common-widgets/package.json index d7c6622d..6eb87e80 100644 --- a/packages/common-widgets/package.json +++ b/packages/common-widgets/package.json @@ -1,6 +1,6 @@ { "name": "@arco-design/mobile-utils", - "version": "2.18.6", + "version": "2.19.0", "description": "", "main": "cjs/index.js", "module": "esm/index.js", From d4f1119e4754483f073c8354ae7818ee77592915 Mon Sep 17 00:00:00 2001 From: "wangtianli.y" Date: Fri, 16 Aug 2024 17:10:03 +0800 Subject: [PATCH 13/13] build: update readme --- packages/arcodesign/README.en-US.md | 4 ++-- packages/arcodesign/README.md | 4 ++-- packages/arcodesign/package.json | 2 +- packages/common-widgets/package.json | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/packages/arcodesign/README.en-US.md b/packages/arcodesign/README.en-US.md index 13f0feea..057f191a 100644 --- a/packages/arcodesign/README.en-US.md +++ b/packages/arcodesign/README.en-US.md @@ -59,8 +59,8 @@ React & ReactDOM: **Click here** ``` - - + + ``` ## Full import diff --git a/packages/arcodesign/README.md b/packages/arcodesign/README.md index 253493b2..e352de90 100644 --- a/packages/arcodesign/README.md +++ b/packages/arcodesign/README.md @@ -59,8 +59,8 @@ React & ReactDOM： **戳这里获取** ``` - - + + ``` ## 引入全部 diff --git a/packages/arcodesign/package.json b/packages/arcodesign/package.json index 5f498419..fc4f6000 100644 --- a/packages/arcodesign/package.json +++ b/packages/arcodesign/package.json @@ -47,5 +47,5 @@ "publishConfig": { "access": "public" }, - "gitHead": "8b2b5c2694e65be7a57a4f8d8d1af5db4601fda2" + "gitHead": "72f78e976347aa9f57858d414aba6063e7de62f6" } diff --git a/packages/common-widgets/package.json b/packages/common-widgets/package.json index 6eb87e80..54bf757f 100644 --- a/packages/common-widgets/package.json +++ b/packages/common-widgets/package.json @@ -13,7 +13,7 @@ "publishConfig": { "access": "public" }, - "gitHead": "8b2b5c2694e65be7a57a4f8d8d1af5db4601fda2", + "gitHead": "72f78e976347aa9f57858d414aba6063e7de62f6", "dependencies": { "es6-promise": "^4.2.8" },