Skip to content

fix(sidebar): badge display regardless of label length (fixes #662) #912

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Luozf12345 wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

fix(sidebar): badge display regardless of label length (fixes #662) #912

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
54 changes: 12 additions & 42 deletions tdesign-component/lib/src/components/sidebar/t_wrap_sidebar_item.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,10 +115,7 @@ class TWrapSideBarItem extends StatelessWidget {
children: [
renderIcon(context),
Expanded(child: renderLabel(context)),
if (label.length > 4) renderBadge(context),
// SizedBox(
// width: !disabled && selected ? 0 : preLineWidth,
// )
if (badge != null) renderBadge(context),
],
);
}
Expand Down Expand Up @@ -170,45 +167,18 @@ class TWrapSideBarItem extends StatelessWidget {
}

Widget renderLabel(BuildContext context) {
return TText.rich(
TextSpan(
children: [
WidgetSpan(
child: TText(
label,
style: selected
? (selectedTextStyle ?? TextStyle(color: selectedColor))
: textStyle,
fontWeight:
selected && !disabled ? FontWeight.w600 : FontWeight.w400,
textColor: disabled
? TTheme.of(context).textDisabledColor
: selected
? selectedColor ?? TTheme.of(context).brandNormalColor
: unSelectedColor ?? TTheme.of(context).textColorPrimary,
// forceVerticalCenter: true,
)),

/// todo label.length 长度小于则不展示，为什么？？？
/// 应再判断有无icon，无icon时位置够，可以展示 badge
if (label.length <= 4 || icon == null)
WidgetSpan(
child: SizedBox(
width: 1,
height: 16,
child: Stack(
clipBehavior: Clip.none,
children: [
badge != null
? Positioned(top: -6, child: badge!)
: Container()
],
),
))
],
),
return TText(
label,
style: selected
? (selectedTextStyle ?? TextStyle(color: selectedColor))
: textStyle,
fontWeight: selected && !disabled ? FontWeight.w600 : FontWeight.w400,
textColor: disabled
? TTheme.of(context).textDisabledColor
: selected
? selectedColor ?? TTheme.of(context).brandNormalColor
: unSelectedColor ?? TTheme.of(context).textColorPrimary,
softWrap: true,
style: selectedTextStyle,
);
}

Expand Down
Loading