Skip to content

Commit 3d82c60

Browse files
authored
fix(SideBarItem): min-height is set to auto (#3985)
* fix(SideBarItem): min-height is set to auto * docs: update css vars
1 parent 1edc441 commit 3d82c60

File tree

4 files changed

+8
-8
lines changed

4 files changed

+8
-8
lines changed

packages/components/side-bar-item/side-bar-item.less

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
@side-bar-color: var(--td-side-bar-color, @text-color-primary);
44
@side-bar-font-size: var(--td-side-bar-font-size, 32rpx);
5-
@side-bar-item-height: var(--td-side-bar-item-height, 112rpx);
5+
@side-bar-item-height: var(--td-side-bar-item-height, auto);
66
@side-bar-item-line-height: var(--td-side-bar-item-line-height, 48rpx);
77
@side-bar-bg-color: var(--td-side-bar-bg-color, @bg-color-secondarycontainer);
88
@side-bar-disabled-color: var(--td-side-bar-disabled-color, @text-color-disabled);

packages/components/side-bar/README.en-US.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,5 +46,5 @@ Name | Default Value | Description
4646
--td-side-bar-disabled-color | @text-color-disabled | -
4747
--td-side-bar-font-size | 32rpx | -
4848
--td-side-bar-icon-size | 40rpx | -
49-
--td-side-bar-item-height | 112rpx | -
49+
--td-side-bar-item-height | auto | -
5050
--td-side-bar-item-line-height | 48rpx | -

packages/components/side-bar/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,5 +96,5 @@ value | String / Number | - | 当前选项的值 | N
9696
--td-side-bar-disabled-color | @text-color-disabled | -
9797
--td-side-bar-font-size | 32rpx | -
9898
--td-side-bar-icon-size | 40rpx | -
99-
--td-side-bar-item-height | 112rpx | -
99+
--td-side-bar-item-height | auto | -
100100
--td-side-bar-item-line-height | 48rpx | -

packages/tdesign-miniprogram/site/scripts/generate-css-vars.mjs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ import resolveCwd from './utils.mjs';
33

44
const COMPONENT_NAME = process.argv[process.argv.indexOf('--NAME') + 1]; // 在 --NAME 后面
55
const ROOT_DIR = COMPONENT_NAME.includes('chat')
6-
? resolveCwd('/packages/pro-components')
7-
: resolveCwd('/packages/components');
6+
? resolveCwd('../../../packages/components')
7+
: resolveCwd('../../../packages/components');
88

99
const combine = {
1010
avatar: ['avatar-group', 'avatar'],
@@ -57,14 +57,14 @@ const generateCssVariables = async (componentName) => {
5757

5858
const list = file.match(matchReg)?.sort();
5959

60-
list?.forEach((item, index) => {
60+
list?.forEach((item) => {
6161
cssVariableBodyContent += `${item.slice(1, item.indexOf(',')).trim()} | ${item
6262
.slice(item.indexOf(',') + 2, item.length - 1)
63-
.trim()} | -${index === list.length - 1 ? '' : ' \n'}`;
63+
.trim()} | -${' \n'}`;
6464
});
6565
});
6666

67-
return cssVariableBodyContent;
67+
return cssVariableBodyContent.trimEnd();
6868
};
6969

7070
/**

0 commit comments

Comments
 (0)