Skip to content

Commit e1b5415

Browse files
github-actions[bot]github-actions[bot]
committed
Merge remote-tracking branch 'origin/develop'
2 parents eee50eb + c469188 commit e1b5415

File tree

19 files changed

+77
-47
lines changed

19 files changed

+77
-47
lines changed

‎CHANGELOG.md‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,13 @@ toc: false
55
spline: explain
66
---
77

8+
## 🌈 1.8.5 `2025-05-13`
9+
### 🚀 Features
10+
- `Navbar`: 新增 `safeAreaInsetTop`，是否开启顶部安全区适配 @anlyyao ([#1834](https://github.com/Tencent/tdesign-mobile-vue/pull/1834))
11+
- `PullDownRefresh`: 新增 `disabled` 属性 @anlyyao ([#1844](https://github.com/Tencent/tdesign-mobile-vue/pull/1844))
12+
### 🐞 Bug Fixes
13+
- `Message`: 修复项目引入 `amfe-flexible` 包后，组件样式不兼容 @anlyyao ([#1845](https://github.com/Tencent/tdesign-mobile-vue/pull/1845))
14+
815
## 🌈 1.8.4 `2025-04-25`
916
### 🚀 Features
1017
- `Icon`: 新增 `logo-miniprogram`、`logo-cnb`、`seal`、`quote` 图标 @taowensheng1997 @uyarn ([#1827](https://github.com/Tencent/tdesign-mobile-vue/pull/1827))

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "tdesign-mobile-vue",
33
"purename": "tdesign",
4-
"version": "1.8.4",
4+
"version": "1.8.5",
55
"description": "tdesign-mobile-vue",
66
"author": "TDesign Group",
77
"homepage": "https://tdesign.tencent.com/mobile-vue/",

‎src/_common‎

Submodule _common updated 38 files

‎src/navbar/__test__/__snapshots__/demo.test.jsx.snap‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ exports[`Navbar > Navbar baseVue demo works fine 1`] = `
66
>
77
88
<div
9-
class="t-navbar t-navbar--visible-animation"
9+
class="t-navbar t-safe-area-top t-navbar--visible-animation"
1010
data-v-fcc0cda1=""
1111
style="position: relative;"
1212
>
@@ -45,7 +45,7 @@ exports[`Navbar > Navbar baseVue demo works fine 1`] = `
4545
</div>
4646
</div>
4747
<div
48-
class="t-navbar t-navbar--visible-animation"
48+
class="t-navbar t-safe-area-top t-navbar--visible-animation"
4949
data-v-fcc0cda1=""
5050
style="position: relative;"
5151
>
@@ -108,7 +108,7 @@ exports[`Navbar > Navbar baseVue demo works fine 1`] = `
108108
</div>
109109
</div>
110110
<div
111-
class="t-navbar t-navbar--visible-animation"
111+
class="t-navbar t-safe-area-top t-navbar--visible-animation"
112112
data-v-fcc0cda1=""
113113
style="position: relative;"
114114
>
@@ -194,7 +194,7 @@ exports[`Navbar > Navbar baseVue demo works fine 1`] = `
194194

195195
exports[`Navbar > Navbar customColorVue demo works fine 1`] = `
196196
<div
197-
class="t-navbar t-navbar--visible-animation custom-navbar"
197+
class="t-navbar t-safe-area-top t-navbar--visible-animation custom-navbar"
198198
data-v-3ef3b10f=""
199199
style="position: relative;"
200200
>
@@ -250,7 +250,7 @@ exports[`Navbar > Navbar customColorVue demo works fine 1`] = `
250250

251251
exports[`Navbar > Navbar imgVue demo works fine 1`] = `
252252
<div
253-
class="t-navbar t-navbar--visible-animation"
253+
class="t-navbar t-safe-area-top t-navbar--visible-animation"
254254
data-v-ed0b13d1=""
255255
style="position: relative;"
256256
>
@@ -349,7 +349,7 @@ exports[`Navbar > Navbar leftTitleVue demo works fine 1`] = `
349349
>
350350
351351
<div
352-
class="t-navbar t-navbar--visible-animation"
352+
class="t-navbar t-safe-area-top t-navbar--visible-animation"
353353
data-v-593dba5f=""
354354
style="position: relative;"
355355
>
@@ -402,7 +402,7 @@ exports[`Navbar > Navbar leftTitleVue demo works fine 1`] = `
402402
</div>
403403
</div>
404404
<div
405-
class="t-navbar t-navbar--visible-animation"
405+
class="t-navbar t-safe-area-top t-navbar--visible-animation"
406406
data-v-593dba5f=""
407407
style="position: relative;"
408408
>
@@ -511,7 +511,7 @@ exports[`Navbar > Navbar mobileVue demo works fine 1`] = `
511511
512512
513513
<div
514-
class="t-navbar t-navbar--visible-animation"
514+
class="t-navbar t-safe-area-top t-navbar--visible-animation"
515515
data-v-fcc0cda1=""
516516
style="position: relative;"
517517
>
@@ -550,7 +550,7 @@ exports[`Navbar > Navbar mobileVue demo works fine 1`] = `
550550
</div>
551551
</div>
552552
<div
553-
class="t-navbar t-navbar--visible-animation"
553+
class="t-navbar t-safe-area-top t-navbar--visible-animation"
554554
data-v-fcc0cda1=""
555555
style="position: relative;"
556556
>
@@ -613,7 +613,7 @@ exports[`Navbar > Navbar mobileVue demo works fine 1`] = `
613613
</div>
614614
</div>
615615
<div
616-
class="t-navbar t-navbar--visible-animation"
616+
class="t-navbar t-safe-area-top t-navbar--visible-animation"
617617
data-v-fcc0cda1=""
618618
style="position: relative;"
619619
>
@@ -716,7 +716,7 @@ exports[`Navbar > Navbar mobileVue demo works fine 1`] = `
716716
>
717717
718718
<div
719-
class="t-navbar t-navbar--visible-animation"
719+
class="t-navbar t-safe-area-top t-navbar--visible-animation"
720720
data-v-0270c729=""
721721
data-v-614a1e54=""
722722
style="position: relative;"
@@ -820,7 +820,7 @@ exports[`Navbar > Navbar mobileVue demo works fine 1`] = `
820820
>
821821
822822
<div
823-
class="t-navbar t-navbar--visible-animation"
823+
class="t-navbar t-safe-area-top t-navbar--visible-animation"
824824
data-v-0270c729=""
825825
data-v-ed0b13d1=""
826826
style="position: relative;"
@@ -939,7 +939,7 @@ exports[`Navbar > Navbar mobileVue demo works fine 1`] = `
939939
940940
941941
<div
942-
class="t-navbar t-navbar--visible-animation"
942+
class="t-navbar t-safe-area-top t-navbar--visible-animation"
943943
data-v-593dba5f=""
944944
style="position: relative;"
945945
>
@@ -992,7 +992,7 @@ exports[`Navbar > Navbar mobileVue demo works fine 1`] = `
992992
</div>
993993
</div>
994994
<div
995-
class="t-navbar t-navbar--visible-animation"
995+
class="t-navbar t-safe-area-top t-navbar--visible-animation"
996996
data-v-593dba5f=""
997997
style="position: relative;"
998998
>
@@ -1080,7 +1080,7 @@ exports[`Navbar > Navbar mobileVue demo works fine 1`] = `
10801080
10811081
10821082
<div
1083-
class="t-navbar t-navbar--visible-animation"
1083+
class="t-navbar t-safe-area-top t-navbar--visible-animation"
10841084
data-v-f6e31b98=""
10851085
style="position: relative;"
10861086
>
@@ -1133,7 +1133,7 @@ exports[`Navbar > Navbar mobileVue demo works fine 1`] = `
11331133
</div>
11341134
</div>
11351135
<div
1136-
class="t-navbar t-navbar--visible-animation custom-navbar"
1136+
class="t-navbar t-safe-area-top t-navbar--visible-animation custom-navbar"
11371137
data-v-f6e31b98=""
11381138
style="position: relative;"
11391139
>
@@ -1219,7 +1219,7 @@ exports[`Navbar > Navbar mobileVue demo works fine 1`] = `
12191219
>
12201220
12211221
<div
1222-
class="t-navbar t-navbar--visible-animation custom-navbar"
1222+
class="t-navbar t-safe-area-top t-navbar--visible-animation custom-navbar"
12231223
data-v-0270c729=""
12241224
data-v-3ef3b10f=""
12251225
style="position: relative;"
@@ -1280,7 +1280,7 @@ exports[`Navbar > Navbar mobileVue demo works fine 1`] = `
12801280

12811281
exports[`Navbar > Navbar searchVue demo works fine 1`] = `
12821282
<div
1283-
class="t-navbar t-navbar--visible-animation"
1283+
class="t-navbar t-safe-area-top t-navbar--visible-animation"
12841284
data-v-614a1e54=""
12851285
style="position: relative;"
12861286
>
@@ -1369,7 +1369,7 @@ exports[`Navbar > Navbar sizeVue demo works fine 1`] = `
13691369
>
13701370
13711371
<div
1372-
class="t-navbar t-navbar--visible-animation"
1372+
class="t-navbar t-safe-area-top t-navbar--visible-animation"
13731373
data-v-f6e31b98=""
13741374
style="position: relative;"
13751375
>
@@ -1422,7 +1422,7 @@ exports[`Navbar > Navbar sizeVue demo works fine 1`] = `
14221422
</div>
14231423
</div>
14241424
<div
1425-
class="t-navbar t-navbar--visible-animation custom-navbar"
1425+
class="t-navbar t-safe-area-top t-navbar--visible-animation custom-navbar"
14261426
data-v-f6e31b98=""
14271427
style="position: relative;"
14281428
>

‎src/navbar/__test__/__snapshots__/index.test.jsx.snap‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
exports[`navbar > events > left-click 1`] = `
44
<div
5-
class="t-navbar t-navbar--fixed t-navbar--visible-animation"
5+
class="t-navbar t-navbar--fixed t-safe-area-top t-navbar--visible-animation"
66
style="position: fixed;"
77
>
88
<div
@@ -47,7 +47,7 @@ exports[`navbar > events > left-click 1`] = `
4747

4848
exports[`navbar > events > right-click 1`] = `
4949
<div
50-
class="t-navbar t-navbar--fixed t-navbar--visible-animation"
50+
class="t-navbar t-navbar--fixed t-safe-area-top t-navbar--visible-animation"
5151
style="position: fixed;"
5252
>
5353
<div

‎src/navbar/navbar.en-US.md‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
:: BASE_DOC ::
22

33
## API
4+
45
### Navbar Props
56

67
name | type | default | description | required
@@ -11,11 +12,12 @@ fixed | Boolean | true | \- | N
1112
left | Slot / Function | - | Typescript：`TNode`。[see more ts definition](https://github.com/Tencent/tdesign-mobile-vue/blob/develop/src/common.ts) | N
1213
leftArrow | Boolean | false | \- | N
1314
right | Slot / Function | - | Typescript：`TNode`。[see more ts definition](https://github.com/Tencent/tdesign-mobile-vue/blob/develop/src/common.ts) | N
14-
title | String / Slot / Function | - | page title。Typescript：`string | TNode`。[see more ts definition](https://github.com/Tencent/tdesign-mobile-vue/blob/develop/src/common.ts) | N
15+
safeAreaInsetTop | Boolean | true | \- | N
16+
title | String / Slot / Function | - | page title。Typescript：`string \| TNode`。[see more ts definition](https://github.com/Tencent/tdesign-mobile-vue/blob/develop/src/common.ts) | N
1517
titleMaxLength | Number | - | \- | N
1618
visible | Boolean | true | \- | N
17-
onLeftClick | Function | | Typescript：`() => void` | N
18-
onRightClick | Function | | Typescript：`() => void` | N
19+
onLeftClick | Function | | Typescript：`() => void`<br/> | N
20+
onRightClick | Function | | Typescript：`() => void`<br/> | N
1921

2022
### Navbar Events
2123

@@ -24,8 +26,8 @@ name | params | description
2426
left-click | \- | \-
2527
right-click | \- | \-
2628

27-
2829
### CSS Variables
30+
2931
The component provides the following CSS variables, which can be used to customize styles.
3032
Name | Default Value | Description
3133
-- | -- | --
@@ -40,4 +42,4 @@ Name | Default Value | Description
4042
--td-navbar-padding-top | 0 | -
4143
--td-navbar-right | 95px | -
4244
--td-navbar-title-font-size | 18px | -
43-
--td-navbar-title-font-weight | 600 | -
45+
--td-navbar-title-font-weight | 600 | -

‎src/navbar/navbar.md‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,19 @@
11
:: BASE_DOC ::
22

33
## API
4+
45
### Navbar Props
56

6-
名称 | 类型 | 默认值 | 说明 | 必传
7+
名称 | 类型 | 默认值 | 描述 | 必传
78
-- | -- | -- | -- | --
89
animation | Boolean | true | 是否添加动画效果 | N
910
capsule | Slot / Function | - | 左侧胶囊区域。TS 类型：`TNode`。[通用类型定义](https://github.com/Tencent/tdesign-mobile-vue/blob/develop/src/common.ts) | N
1011
fixed | Boolean | true | 是否固定在顶部 | N
1112
left | Slot / Function | - | 左侧区域。TS 类型：`TNode`。[通用类型定义](https://github.com/Tencent/tdesign-mobile-vue/blob/develop/src/common.ts) | N
1213
leftArrow | Boolean | false | 是否展示左侧箭头 | N
1314
right | Slot / Function | - | 右侧区域。TS 类型：`TNode`。[通用类型定义](https://github.com/Tencent/tdesign-mobile-vue/blob/develop/src/common.ts) | N
14-
title | String / Slot / Function | - | 页面标题。TS 类型：`string | TNode`。[通用类型定义](https://github.com/Tencent/tdesign-mobile-vue/blob/develop/src/common.ts) | N
15+
safeAreaInsetTop | Boolean | true | 是否开启顶部安全区适配 | N
16+
title | String / Slot / Function | - | 页面标题。TS 类型：`string \| TNode`。[通用类型定义](https://github.com/Tencent/tdesign-mobile-vue/blob/develop/src/common.ts) | N
1517
titleMaxLength | Number | - | 标题文字最大长度，超出的范围使用 `...` 表示 | N
1618
visible | Boolean | true | 是否显示 | N
1719
onLeftClick | Function | | TS 类型：`() => void`<br/>点击左侧按钮时触发 | N
@@ -24,8 +26,8 @@ onRightClick | Function | | TS 类型：`() => void`<br/>点击右侧图标时
2426
left-click | \- | 点击左侧按钮时触发
2527
right-click | \- | 点击右侧图标时触发
2628

27-
2829
### CSS Variables
30+
2931
组件提供了下列 CSS 变量，可用于自定义样式。
3032
名称 | 默认值 | 描述
3133
-- | -- | --
@@ -40,4 +42,4 @@ right-click | \- | 点击右侧图标时触发
4042
--td-navbar-padding-top | 0 | -
4143
--td-navbar-right | 95px | -
4244
--td-navbar-title-font-size | 18px | -
43-
--td-navbar-title-font-weight | 600 | -
45+
--td-navbar-title-font-weight | 600 | -

‎src/navbar/navbar.tsx‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ export default defineComponent({
2121
navbarClass.value,
2222
{
2323
[`${navbarClass.value}--fixed`]: props.fixed,
24+
[`${prefix}-safe-area-top `]: props.safeAreaInsetTop,
2425
},
2526
props.visible
2627
? `${navbarClass.value}--visible${animationSuffix.value}`

‎src/navbar/props.ts‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,14 +27,16 @@ export default {
2727
type: Function as PropType<TdNavbarProps['left']>,
2828
},
2929
/** 是否展示左侧箭头 */
30-
leftArrow: {
31-
type: Boolean,
32-
default: false,
33-
},
30+
leftArrow: Boolean,
3431
/** 右侧区域 */
3532
right: {
3633
type: Function as PropType<TdNavbarProps['right']>,
3734
},
35+
/** 是否开启顶部安全区适配 */
36+
safeAreaInsetTop: {
37+
type: Boolean,
38+
default: true,
39+
},
3840
/** 页面标题 */
3941
title: {
4042
type: [String, Function] as PropType<TdNavbarProps['title']>,
@@ -48,8 +50,8 @@ export default {
4850
type: Boolean,
4951
default: true,
5052
},
51-
/** 点击左侧区域时触发 */
53+
/** 点击左侧按钮时触发 */
5254
onLeftClick: Function as PropType<TdNavbarProps['onLeftClick']>,
53-
/** 点击右侧区域时触发 */
55+
/** 点击右侧图标时触发 */
5456
onRightClick: Function as PropType<TdNavbarProps['onRightClick']>,
5557
};

‎src/navbar/type.ts‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,11 @@ export interface TdNavbarProps {
3434
* 右侧区域
3535
*/
3636
right?: TNode;
37+
/**
38+
* 是否开启顶部安全区适配
39+
* @default true
40+
*/
41+
safeAreaInsetTop?: boolean;
3742
/**
3843
* 页面标题
3944
*/
@@ -48,11 +53,11 @@ export interface TdNavbarProps {
4853
*/
4954
visible?: boolean;
5055
/**
51-
* 点击左侧区域时触发
56+
* 点击左侧按钮时触发
5257
*/
5358
onLeftClick?: () => void;
5459
/**
55-
* 点击右侧区域时触发
60+
* 点击右侧图标时触发
5661
*/
5762
onRightClick?: () => void;
5863
}

0 commit comments

Comments
 (0)