Skip to content

Commit 270b5d6

Browse files
committed
Merge branch 'main' into feat-rn-popup-auto-refresh
2 parents c9f875b + 2a55e03 commit 270b5d6

File tree

13 files changed

+141
-28
lines changed

13 files changed

+141
-28
lines changed

CHANGELOG.md

Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
1+
# Changelog
2+
3+
## [1.3.10] - 2025-09-22
4+
5+
### Fixed
6+
- 对齐小程序、web,修复dialog组件按钮按钮之间没有分割线(React Native)
7+
8+
9+
## [1.3.9] - 2025-09-18
10+
11+
### Added
12+
- dialog组件添加close按钮 (React Native)
13+
14+
## [1.3.8] - 2025-09-12
15+
16+
### Fixed
17+
- 修复popup组件中包含input时input无法点击的问题 (React Native)
18+
19+
## [1.3.7] - 2025-08-27
20+
21+
### Fixed
22+
- 修复mpx-cube-ui首页在skyline引擎下无法滑动的问题
23+
- tip组件对于skyline引擎的适配
24+
- 修改箭头CSS样式类命名
25+
26+
## [1.3.6] - 2025-08-14
27+
28+
### Fixed
29+
- dialog (小程序、web) 内容区删除未使用的css透明度属性,修复skyline 时动画问题
30+
31+
## [1.3.5] - 2025-08-12
32+
33+
### Fixed
34+
- 修复 tip (小程序、web)animationend报错问题
35+
36+
## [1.3.4] - 2025-08-11
37+
38+
### Fixed
39+
- 修复 popup (小程序、web) 添加 positive: relative 兼容 iphone 13 展示问题
40+
41+
## [1.3.3] - 2025-08-02
42+
43+
### Fixed
44+
- 修复 rn switch 默认选中时动画问题
45+
46+
## [1.3.2] - 2025-07-31
47+
48+
### Fixed
49+
50+
- 修复 React Native toast mask false 不阻塞点击
51+
52+
## [1.3.1] - 2025-07-XX
53+
54+
### Fixed
55+
- 修复 React Native dialog container默认继承宽度
56+
57+
## [1.3.0] - 2025-06-XX
58+
59+
### Added
60+
- 新增input组件 (React Native )

docs/guide/changelog.md

Lines changed: 57 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,60 @@
1-
## 更新日志
1+
# Changelog
22

3-
<card>
3+
## [1.3.10] - 2025-09-22
44

5-
### 1.0.0(2024.03.13)
6-
#### mpx-cube-ui 项目开源
7-
- Initial commit([11019fb](https://github.com/didi/mpx-cube-ui/commit/11019fbfdece8ea0e76258fb11bd8fb557c1a190))
5+
### Fixed
6+
- 对齐小程序、web,修复dialog组件按钮按钮之间没有分割线(React Native)
87

9-
</card>
8+
9+
## [1.3.9] - 2025-09-18
10+
11+
### Added
12+
- dialog组件添加close按钮 (React Native)
13+
14+
## [1.3.8] - 2025-09-12
15+
16+
### Fixed
17+
- 修复popup组件中包含input时input无法点击的问题 (React Native)
18+
19+
## [1.3.7] - 2025-08-27
20+
21+
### Fixed
22+
- 修复mpx-cube-ui首页在skyline引擎下无法滑动的问题
23+
- tip组件对于skyline引擎的适配
24+
- 修改箭头CSS样式类命名
25+
26+
## [1.3.6] - 2025-08-14
27+
28+
### Fixed
29+
- dialog (小程序、web) 内容区删除未使用的css透明度属性,修复skyline 时动画问题
30+
31+
## [1.3.5] - 2025-08-12
32+
33+
### Fixed
34+
- 修复 tip (小程序、web)animationend报错问题
35+
36+
## [1.3.4] - 2025-08-11
37+
38+
### Fixed
39+
- 修复 popup (小程序、web) 添加 positive: relative 兼容 iphone 13 展示问题
40+
41+
## [1.3.3] - 2025-08-02
42+
43+
### Fixed
44+
- 修复 rn switch 默认选中时动画问题
45+
46+
## [1.3.2] - 2025-07-31
47+
48+
### Fixed
49+
50+
- 修复 React Native toast mask false 不阻塞点击
51+
52+
## [1.3.1] - 2025-07-XX
53+
54+
### Fixed
55+
- 修复 React Native dialog container默认继承宽度
56+
57+
## [1.3.0] - 2025-06-XX
58+
59+
### Added
60+
- 新增input组件 (React Native )

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "mpx-cube-ui",
3-
"version": "1.3.8",
3+
"version": "1.3.11",
44
"private": true,
55
"description": "mpx components library",
66
"author": "xiaolei <[email protected]>",

packages/extract-theme-var/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@mpxjs/extract-theme-var",
3-
"version": "1.3.8",
3+
"version": "1.3.11",
44
"description": "mpx-cube-ui theme variable extractor",
55
"publishConfig": {
66
"registry": "https://registry.npmjs.org",

packages/mpx-cube-ui/__tests__/components/dialog/__snapshots__/dialog.spec.js.snap

Lines changed: 6 additions & 6 deletions
Large diffs are not rendered by default.

packages/mpx-cube-ui/lib/components/dialog/css.rn.styl

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -136,6 +136,8 @@
136136
display flex
137137
overflow hidden
138138
font-size 0
139+
.cube-dialog-btns-cancel-border-right-1px
140+
border-right-1px($var(dialog-btns-split-color))
139141

140142
.cube-dialog-btn
141143
flex 1

packages/mpx-cube-ui/lib/components/dialog/dialog.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,8 @@ createComponent({
139139
cancelBtnClass() {
140140
return {
141141
[`${btnClsPrefix}-highlight`]: !!this._cancelBtn.active,
142-
[`${btnClsPrefix}_disabled`]: !!this._cancelBtn.disabled
142+
[`${btnClsPrefix}_disabled`]: !!this._cancelBtn.disabled,
143+
[`${btnsClsPrefix}-cancel-border-right-1px`]: this.isConfirm || this.isPrompt
143144
};
144145
},
145146
confirmBtnClass() {

packages/mpx-cube-ui/lib/components/popup/rn-mixin.js

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -78,13 +78,11 @@ if (__mpx_mode__ === 'ios' || __mpx_mode__ === 'android') {
7878
this.$watch('isVisible', (n, o) => {
7979
if (!!n === !!o)
8080
return;
81+
this.transitionendTimer && clearTimeout(this.transitionendTimer);
8182
this.rnAnimation({
8283
duration: 300,
8384
timingFunction: 'ease-out'
8485
});
85-
if (!n) {
86-
this.contentTranslateStyle = {};
87-
}
8886
}, { immediate: true });
8987
}
9088
},
@@ -118,9 +116,9 @@ if (__mpx_mode__ === 'ios' || __mpx_mode__ === 'android') {
118116
this.targetTranslateValue = start;
119117
}
120118
this.animationData = animation.export();
121-
setTimeout(() => {
119+
this.transitionendTimer = setTimeout(() => {
122120
this.transitionend();
123-
}, animationOptions.duration + 100);
121+
}, animationOptions.duration + 10);
124122
},
125123
transitionend() {
126124
if (this.isVisible && this.targetTranslate) {

packages/mpx-cube-ui/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@mpxjs/mpx-cube-ui",
3-
"version": "1.3.9-beta.0",
3+
"version": "1.3.11",
44
"description": "mpx components library",
55
"author": "xiaolei <[email protected]>",
66
"publishConfig": {

packages/mpx-cube-ui/src/components/dialog/css.rn.styl

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -136,6 +136,8 @@
136136
display flex
137137
overflow hidden
138138
font-size 0
139+
.cube-dialog-btns-cancel-border-right-1px
140+
border-right-1px($var(dialog-btns-split-color))
139141

140142
.cube-dialog-btn
141143
flex 1

0 commit comments

Comments
 (0)