修改暗色模式禁用色失效的问题

Luozf12345 · Luozf12345 · commit 186dda1a9eea · 2025-11-12T15:22:51.000+08:00
diff --git a/tdesign-component/example/lib/page/td_input_page.dart b/tdesign-component/example/lib/page/td_input_page.dart
@@ -513,7 +513,7 @@ class _TDInputViewPageState extends State<TDInputViewPage> {
                 _countdownTime > 0
                     ? TDText(
                         '${countDownText}(${_countdownTime}秒)',
-                        textColor: TDTheme.of(context).textColorDisabled,
+                        textColor: TDTheme.of(context).textDisabledColor,
                       )
                     : TDText(confirmText,
                         textColor: TDTheme.of(context).brandNormalColor),
diff --git a/tdesign-component/lib/src/components/action_sheet/td_action_sheet_list.dart b/tdesign-component/lib/src/components/action_sheet/td_action_sheet_list.dart
@@ -121,7 +121,7 @@ class TDActionSheetList extends StatelessWidget {
                       data: IconThemeData(
                         color: item.disabled
                             // 禁用状态下的图标颜色
-                            ? TDTheme.of(context).textColorDisabled
+                            ? TDTheme.of(context).textDisabledColor
                             : (item.textStyle?.color ??
                                 // 正常状态下的图标颜色
                                 TDTheme.of(context).textColorPrimary),
@@ -139,7 +139,7 @@ class TDActionSheetList extends StatelessWidget {
                     item.label,
                     font: TDTheme.of(context).fontBodyLarge,
                     textColor: item.disabled
-                        ? TDTheme.of(context).textColorDisabled // 禁用状态下的文本颜色
+                        ? TDTheme.of(context).textDisabledColor // 禁用状态下的文本颜色
                         : TDTheme.of(context).textColorPrimary, // 正常状态下的文本颜色
                     style: item.textStyle,
                   ),
diff --git a/tdesign-component/lib/src/components/button/td_button_style.dart b/tdesign-component/lib/src/components/button/td_button_style.dart
@@ -190,7 +190,7 @@ class TDButtonStyle {
       case TDButtonStatus.active:
         return TDTheme.of(context).textColorPrimary;
       case TDButtonStatus.disable:
-        return TDTheme.of(context).textColorDisabled;
+        return TDTheme.of(context).textDisabledColor;
     }
   }
 
diff --git a/tdesign-component/lib/src/components/calendar/td_calendar_style.dart b/tdesign-component/lib/src/components/calendar/td_calendar_style.dart
@@ -113,12 +113,12 @@ class TDCalendarStyle {
         break;
       case DateSelectType.disabled:
         cellStyle =
-            defStyle.copyWith(color: TDTheme.of(context).textColorDisabled);
+            defStyle.copyWith(color: TDTheme.of(context).textDisabledColor);
         todayStyle = defStyle.copyWith(color: TDTheme.of(context).brandDisabledColor);
         cellPrefixStyle =
             prefixStyle.copyWith(color: TDTheme.of(context).errorDisabledColor);
         cellSuffixStyle =
-            prefixStyle.copyWith(color: TDTheme.of(context).textColorDisabled);
+            prefixStyle.copyWith(color: TDTheme.of(context).textDisabledColor);
         cellDecoration = null;
         break;
       case DateSelectType.selected:
diff --git a/tdesign-component/lib/src/components/checkbox/td_check_box.dart b/tdesign-component/lib/src/components/checkbox/td_check_box.dart
@@ -309,7 +309,7 @@ class TDCheckboxState extends State<TDCheckbox> {
                               textColor: widget.enable
                                   ? (widget.subTitleColor ??
                                       TDTheme.of(context).textColorPlaceholder)
-                                  : TDTheme.of(context).textColorDisabled,
+                                  : TDTheme.of(context).textDisabledColor,
                               font: TDTheme.of(context).fontBodyMedium),
                         ),
                       )
@@ -367,7 +367,7 @@ class TDCheckboxState extends State<TDCheckbox> {
                               textColor: widget.enable
                                   ? (widget.subTitleColor ??
                                       TDTheme.of(context).textColorPlaceholder)
-                                  : TDTheme.of(context).textColorDisabled,
+                                  : TDTheme.of(context).textDisabledColor,
                               font: widget.subTitleFont ??
                                   TDTheme.of(context).fontBodyMedium),
                         ),
@@ -495,7 +495,7 @@ class TDCheckboxState extends State<TDCheckbox> {
             overflow: TextOverflow.ellipsis,
             textColor: widget.enable
                 ? (widget.titleColor ?? TDTheme.of(context).textColorPrimary)
-                : TDTheme.of(context).textColorDisabled,
+                : TDTheme.of(context).textDisabledColor,
             font: widget.titleFont ??
                 TDTheme.of(context)
                     .fontBodyLarge); // TODO custom fontSize https://github.com/Tencent/tdesign-flutter/issues/66
diff --git a/tdesign-component/lib/src/components/dropdown_menu/td_dropdown_item.dart b/tdesign-component/lib/src/components/dropdown_menu/td_dropdown_item.dart
@@ -317,7 +317,7 @@ class _TDDropdownItemState extends State<TDDropdownItem> {
                 ? checked
                     ? TDTheme.of(context).brandColor7
                     : TDTheme.of(context).textColorPrimary
-                : TDTheme.of(context).textColorDisabled,
+                : TDTheme.of(context).textDisabledColor,
           ),
         ),
       ),
diff --git a/tdesign-component/lib/src/components/dropdown_menu/td_dropdown_menu.dart b/tdesign-component/lib/src/components/dropdown_menu/td_dropdown_menu.dart
@@ -201,7 +201,7 @@ class _TDDropdownMenuState extends State<TDDropdownMenu>
 
   Widget _tabBarContent(int index) {
     final color = _disabled(index)
-        ? TDTheme.of(context).textColorDisabled
+        ? TDTheme.of(context).textDisabledColor
         : _isOpened[index]
             ? TDTheme.of(context).brandNormalColor
             : TDTheme.of(context).textColorPrimary;
diff --git a/tdesign-component/lib/src/components/link/td_link.dart b/tdesign-component/lib/src/components/link/td_link.dart
@@ -153,7 +153,7 @@ class TDLink extends StatelessWidget {
         TDLinkStyle.danger: theme.errorDisabledColor,
         TDLinkStyle.warning: theme.warningDisabledColor,
         TDLinkStyle.success: theme.successDisabledColor,
-        TDLinkStyle.defaultStyle: theme.textColorDisabled,
+        TDLinkStyle.defaultStyle: theme.textDisabledColor,
       },
     };
 
diff --git a/tdesign-component/lib/src/components/picker/td_item_widget.dart b/tdesign-component/lib/src/components/picker/td_item_widget.dart
@@ -109,7 +109,7 @@ class ItemDistanceCalculator {
     if (distance < 0.5) {
       return TDTheme.of(context).textColorPrimary;
     } else {
-      return TDTheme.of(context).textColorDisabled;
+      return TDTheme.of(context).textDisabledColor;
     }
   }
 
diff --git a/tdesign-component/lib/src/components/rate/td_rate.dart b/tdesign-component/lib/src/components/rate/td_rate.dart
@@ -385,7 +385,7 @@ class _TDRateState extends State<TDRate> with TickerProviderStateMixin {
               ? TDTheme.of(context).fontBodyLarge
               : TDTheme.of(context).fontTitleMedium,
           textColor: notRated
-              ? TDTheme.of(context).textColorDisabled
+              ? TDTheme.of(context).textDisabledColor
               : TDTheme.of(context).textColorPrimary,
         ),
       ),
diff --git a/tdesign-component/lib/src/components/sidebar/td_wrap_sidebar_item.dart b/tdesign-component/lib/src/components/sidebar/td_wrap_sidebar_item.dart
@@ -149,7 +149,7 @@ class TDWrapSideBarItem extends StatelessWidget {
   Widget renderIcon(BuildContext context) {
     final iconColor = () {
       if (disabled) {
-        return TDTheme.of(context).textColorDisabled;
+        return TDTheme.of(context).textDisabledColor;
       }
       if (!selected) {
         return unSelectedColor ?? TDTheme.of(context).textColorPrimary;
@@ -182,7 +182,7 @@ class TDWrapSideBarItem extends StatelessWidget {
             fontWeight:
                 selected && !disabled ? FontWeight.w600 : FontWeight.w400,
             textColor: disabled
-                ? TDTheme.of(context).textColorDisabled
+                ? TDTheme.of(context).textDisabledColor
                 : selected
                     ? selectedColor ?? TDTheme.of(context).brandNormalColor
                     : unSelectedColor ?? TDTheme.of(context).textColorPrimary,
diff --git a/tdesign-component/lib/src/components/slider/td_slider.dart b/tdesign-component/lib/src/components/slider/td_slider.dart
@@ -86,7 +86,7 @@ class TDSliderState extends State<TDSlider> {
       fontSize: 16,
       color: _enabled
           ? TDTheme.of(context).textColorPrimary
-          : TDTheme.of(context).textColorDisabled);
+          : TDTheme.of(context).textDisabledColor);
 
   Widget get leftLabel => widget.leftLabel?.isNotEmpty == true
       ? Padding(
@@ -269,7 +269,7 @@ class _TDRangeSliderState extends State<TDRangeSlider> {
       fontSize: 16,
       color: _enabled
           ? TDTheme.of(context).textColorPrimary
-          : TDTheme.of(context).textColorDisabled);
+          : TDTheme.of(context).textDisabledColor);
 
   Widget get leftLabel => widget.leftLabel?.isNotEmpty == true
       ? Padding(
diff --git a/tdesign-component/lib/src/components/stepper/td_stepper.dart b/tdesign-component/lib/src/components/stepper/td_stepper.dart
@@ -326,7 +326,7 @@ class _TDStepperState extends State<TDStepper> {
                       style: TextStyle(
                           fontSize: _getFontSize(),
                           color: widget.disabled
-                              ? TDTheme.of(context).textColorDisabled
+                              ? TDTheme.of(context).textDisabledColor
                               : TDTheme.of(context).textColorPrimary),
                       textAlign: TextAlign.center,
                       textAlignVertical: TextAlignVertical.center,
@@ -462,7 +462,7 @@ class TDStepperIconButton extends StatelessWidget {
     return Icon(iconType,
         size: _getIconSize(),
         color: disabled
-            ? TDTheme.of(context).textColorDisabled
+            ? TDTheme.of(context).textDisabledColor
             : TDTheme.of(context).textColorPrimary);
   }
 
diff --git a/tdesign-component/lib/src/components/switch/td_switch.dart b/tdesign-component/lib/src/components/switch/td_switch.dart
@@ -96,11 +96,11 @@ class TDSwitchState extends State<TDSwitch> {
     final theme = TDTheme.of(context);
     final switchEnable = widget.enable && widget.type != TDSwitchType.loading;
     final trackOnColor = widget.trackOnColor ?? theme.brandNormalColor;
-    final trackOffColor = widget.trackOffColor ?? theme.textColorDisabled;
+    final trackOffColor = widget.trackOffColor ?? theme.textDisabledColor;
     final thumbContentOnColor =
         widget.thumbContentOnColor ?? theme.brandNormalColor;
     final thumbContentOffColor =
-        widget.thumbContentOffColor ?? theme.textColorDisabled;
+        widget.thumbContentOffColor ?? theme.textDisabledColor;
     final thumbContentOnFont =
         widget.thumbContentOnFont ?? const TextStyle(fontSize: 14);
     final thumbContentOffFont =
diff --git a/tdesign-component/lib/src/components/table/td_table.dart b/tdesign-component/lib/src/components/table/td_table.dart
@@ -674,7 +674,7 @@ class TDTableState extends State<TDTable> {
         size: 16,
         color: (checked || halfSelected)
             ? TDTheme.of(context).brandNormalColor
-            : TDTheme.of(context).textColorDisabled);
+            : TDTheme.of(context).textDisabledColor);
   }
 
   @override
diff --git a/tdesign-component/lib/src/components/tag/td_tag_styles.dart b/tdesign-component/lib/src/components/tag/td_tag_styles.dart
@@ -211,7 +211,7 @@ class TDTagStyle {
     TDTagShape shape,
   ) {
     borderColor = TDTheme.of(context).componentBorderColor;
-    textColor = TDTheme.of(context).textColorDisabled;
+    textColor = TDTheme.of(context).textDisabledColor;
     backgroundColor = isOutline && !isLight
         ? Colors.transparent
         : TDTheme.of(context).bgColorComponentDisabled;
diff --git a/tdesign-component/lib/src/components/textarea/td_textarea.dart b/tdesign-component/lib/src/components/textarea/td_textarea.dart
@@ -332,7 +332,7 @@ class _TDTextareaState extends State<TDTextarea> {
           hintTextStyle: widget.hintTextStyle ??
               TextStyle(
                   color: widget.readOnly == true
-                      ? TDTheme.of(context).textColorDisabled
+                      ? TDTheme.of(context).textDisabledColor
                       : TDTheme.of(context).textColorPlaceholder),
           cursorColor: widget.cursorColor,
           textInputBackgroundColor: widget.textInputBackgroundColor,
diff --git a/tdesign-component/lib/src/components/upload/td_upload.dart b/tdesign-component/lib/src/components/upload/td_upload.dart
@@ -423,10 +423,10 @@ class _TDUploadState extends State<TDUpload> {
                       decoration: widget.type == TDUploadBoxType.circle
                           ? BoxDecoration(
                               shape: BoxShape.circle,
-                              color: TDTheme.of(context).textColorDisabled,
+                              color: TDTheme.of(context).textDisabledColor,
                             )
                           : BoxDecoration(
-                              color: TDTheme.of(context).textColorDisabled,
+                              color: TDTheme.of(context).textDisabledColor,
                               borderRadius: BorderRadius.only(
                                   bottomLeft: Radius.circular(
                                       TDTheme.of(context).radiusDefault),
diff --git a/tdesign-component/lib/src/theme/td_colors.dart b/tdesign-component/lib/src/theme/td_colors.dart
@@ -325,7 +325,7 @@ extension TDColors on TDThemeData {
 
   Color get textColorPlaceholder => colorMap['textColorPlaceholder'] ?? fontGyColor3;
 
-  Color get textColorDisabled => colorMap['textColorDisabled'] ?? fontGyColor4;
+  Color get textDisabledColor => colorMap['textDisabledColor'] ?? fontGyColor4;
 
   Color get textColorAnti => colorMap['textColorAnti'] ?? whiteColor1;
 

Original file line number	Diff line number	Diff line change
`@@ -513,7 +513,7 @@ class _TDInputViewPageState extends State<TDInputViewPage> {`
`513`	`513`	`_countdownTime > 0`
`514`	`514`	`? TDText(`
`515`	`515`	`'${countDownText}(${_countdownTime}秒)',`
`516`		`- textColor: TDTheme.of(context).textColorDisabled,`
	`516`	`+ textColor: TDTheme.of(context).textDisabledColor,`
`517`	`517`	`)`
`518`	`518`	`: TDText(confirmText,`
`519`	`519`	`textColor: TDTheme.of(context).brandNormalColor),`
Original file line number	Diff line number	Diff line change
`@@ -190,7 +190,7 @@ class TDButtonStyle {`
`190`	`190`	`case TDButtonStatus.active:`
`191`	`191`	`return TDTheme.of(context).textColorPrimary;`
`192`	`192`	`case TDButtonStatus.disable:`
`193`		`- return TDTheme.of(context).textColorDisabled;`
	`193`	`+ return TDTheme.of(context).textDisabledColor;`
`194`	`194`	`}`
`195`	`195`	`}`
`196`	`196`
Original file line number	Diff line number	Diff line change
`@@ -109,7 +109,7 @@ class ItemDistanceCalculator {`
`109`	`109`	`if (distance < 0.5) {`
`110`	`110`	`return TDTheme.of(context).textColorPrimary;`
`111`	`111`	`} else {`
`112`		`- return TDTheme.of(context).textColorDisabled;`
	`112`	`+ return TDTheme.of(context).textDisabledColor;`
`113`	`113`	`}`
`114`	`114`	`}`
`115`	`115`