From af280948b9d759a05fa127c7628d3a4fe2399130 Mon Sep 17 00:00:00 2001 From: Ruriko Araki Date: Thu, 25 Sep 2025 15:06:55 -0700 Subject: [PATCH 1/2] Remove another palette entry --- packages/theming/theme-types/src/palette.types.ts | 2 +- .../win32-theme/src/NativeModule/fallbackOfficeModule.ts | 2 +- .../src/__tests__/__snapshots__/win32-theme.test.ts.snap | 6 +++--- .../theming/win32-theme/src/createAliasesFromPalette.ts | 2 +- packages/theming/win32-theme/src/paletteFromOfficeColors.ts | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/packages/theming/theme-types/src/palette.types.ts b/packages/theming/theme-types/src/palette.types.ts index 35a8590c2b..0cf2cf451e 100644 --- a/packages/theming/theme-types/src/palette.types.ts +++ b/packages/theming/theme-types/src/palette.types.ts @@ -120,7 +120,6 @@ export interface OfficePalette { // text TextCtlSubtle: ColorValue; - TextCtlSubtlePlaceholder: ColorValue; TextCtlSubtleHover: ColorValue; TextCtlSubtlePressed: ColorValue; TextCtlSubtleDisabled: ColorValue; @@ -254,4 +253,5 @@ export interface OfficePalette { BkgCtlSubtleFocus: ColorValue; BkgCtlSubtleHoverDisabled: ColorValue; BkgCtlSubtleSelectedDisabled: ColorValue; + TextTextBoxPlaceholder: ColorValue; } diff --git a/packages/theming/win32-theme/src/NativeModule/fallbackOfficeModule.ts b/packages/theming/win32-theme/src/NativeModule/fallbackOfficeModule.ts index 84a3902b8d..8f1a310e6d 100644 --- a/packages/theming/win32-theme/src/NativeModule/fallbackOfficeModule.ts +++ b/packages/theming/win32-theme/src/NativeModule/fallbackOfficeModule.ts @@ -68,7 +68,6 @@ const whiteColorsPalette: OfficePalette = { BkgCtlSubtlePressed: '#FFFFFF', BkgCtlSubtleDisabled: '#F3F3F3', TextCtlSubtle: '#262626', - TextCtlSubtlePlaceholder: '#666666', TextCtlSubtleHover: '#262626', TextCtlSubtlePressed: '#262626', TextCtlSubtleDisabled: '#B1B1B1', @@ -140,6 +139,7 @@ const whiteColorsPalette: OfficePalette = { BkgCtlSubtleSelectedDisabled: '#F3F3F3', BkgHeader: '#E6E6E6', TextHeader: '#262626', + TextTextBoxPlaceholder: '#666666', }; export function fallbackGetPalette(pal?: string): OfficePalette { diff --git a/packages/theming/win32-theme/src/__tests__/__snapshots__/win32-theme.test.ts.snap b/packages/theming/win32-theme/src/__tests__/__snapshots__/win32-theme.test.ts.snap index 9e1655c6ec..a0c4995644 100644 --- a/packages/theming/win32-theme/src/__tests__/__snapshots__/win32-theme.test.ts.snap +++ b/packages/theming/win32-theme/src/__tests__/__snapshots__/win32-theme.test.ts.snap @@ -2835,7 +2835,6 @@ exports[`createOfficeTheme test 1`] = ` "TextCtlSubtle": "#262626", "TextCtlSubtleDisabled": "#B1B1B1", "TextCtlSubtleHover": "#262626", - "TextCtlSubtlePlaceholder": "#666666", "TextCtlSubtlePressed": "#262626", "TextCtlSubtleSelected": "#262626", "TextDisabled": "#B1B1B1", @@ -2863,6 +2862,7 @@ exports[`createOfficeTheme test 1`] = ` "TextSecondarySelected": "#666666", "TextSelected": "#262626", "TextSelectionHighlight": "#FFFFFF", + "TextTextBoxPlaceholder": "#666666", "ThumbToggleSwitchOff": "#505050", "ThumbToggleSwitchOffDisabled": "#D2D2D2", "ThumbToggleSwitchOffHover": "#505050", @@ -3318,7 +3318,6 @@ exports[`fallbackGetPalette test Random palette 1`] = ` "TextCtlSubtle": "#262626", "TextCtlSubtleDisabled": "#B1B1B1", "TextCtlSubtleHover": "#262626", - "TextCtlSubtlePlaceholder": "#666666", "TextCtlSubtlePressed": "#262626", "TextCtlSubtleSelected": "#262626", "TextDisabled": "#B1B1B1", @@ -3346,6 +3345,7 @@ exports[`fallbackGetPalette test Random palette 1`] = ` "TextSecondarySelected": "#666666", "TextSelected": "#262626", "TextSelectionHighlight": "#FFFFFF", + "TextTextBoxPlaceholder": "#666666", "ThumbToggleSwitchOff": "#505050", "ThumbToggleSwitchOffDisabled": "#D2D2D2", "ThumbToggleSwitchOffHover": "#505050", @@ -3460,7 +3460,6 @@ exports[`fallbackGetPalette test TaskPane palette 1`] = ` "TextCtlSubtle": "#262626", "TextCtlSubtleDisabled": "#B1B1B1", "TextCtlSubtleHover": "#262626", - "TextCtlSubtlePlaceholder": "#666666", "TextCtlSubtlePressed": "#262626", "TextCtlSubtleSelected": "#262626", "TextDisabled": "#B1B1B1", @@ -3488,6 +3487,7 @@ exports[`fallbackGetPalette test TaskPane palette 1`] = ` "TextSecondarySelected": "#666666", "TextSelected": "#262626", "TextSelectionHighlight": "#FFFFFF", + "TextTextBoxPlaceholder": "#666666", "ThumbToggleSwitchOff": "#505050", "ThumbToggleSwitchOffDisabled": "#D2D2D2", "ThumbToggleSwitchOffHover": "#505050", diff --git a/packages/theming/win32-theme/src/createAliasesFromPalette.ts b/packages/theming/win32-theme/src/createAliasesFromPalette.ts index 08ead496b2..a7a83b150c 100644 --- a/packages/theming/win32-theme/src/createAliasesFromPalette.ts +++ b/packages/theming/win32-theme/src/createAliasesFromPalette.ts @@ -16,7 +16,7 @@ export function createAliasesFromPalette(palette: OfficePalette, isHighContrast: neutralForeground2Hover: palette.TextSecondaryHover, neutralForeground2Pressed: palette.TextSecondaryPressed, neutralForeground2Selected: palette.TextSecondarySelected, - neutralForeground4: palette.TextCtlSubtlePlaceholder, + neutralForeground4: palette.TextTextBoxPlaceholder, neutralForegroundDisabled: palette.TextDisabled, compoundBrandForeground1: palette.TextEmphasis, diff --git a/packages/theming/win32-theme/src/paletteFromOfficeColors.ts b/packages/theming/win32-theme/src/paletteFromOfficeColors.ts index a4ce568a69..6d8803714e 100644 --- a/packages/theming/win32-theme/src/paletteFromOfficeColors.ts +++ b/packages/theming/win32-theme/src/paletteFromOfficeColors.ts @@ -24,7 +24,7 @@ export function paletteFromOfficeColors(p: OfficePalette): Palette { inputBackground: p.BkgCtlSubtle, inputFocusBorderAlt: p.StrokeCtlSubtleKeyboard, inputText: p.TextCtlSubtle, - inputPlaceholderText: p.TextCtlSubtlePlaceholder, + inputPlaceholderText: p.TextTextBoxPlaceholder, buttonBackground: p.BkgCtl, buttonBackgroundChecked: p.BkgCtlSelected, From cca74147f37bf6ab8e7ffeb27210bf99b6b27450 Mon Sep 17 00:00:00 2001 From: Ruriko Araki Date: Thu, 25 Sep 2025 15:07:17 -0700 Subject: [PATCH 2/2] Change files --- ...e-theme-types-ea9e6263-6722-45bc-8a43-613225a1bcb4.json | 7 +++++++ ...e-win32-theme-d87e956f-e913-41cf-9c96-d0db336ed6d5.json | 7 +++++++ 2 files changed, 14 insertions(+) create mode 100644 change/@fluentui-react-native-theme-types-ea9e6263-6722-45bc-8a43-613225a1bcb4.json create mode 100644 change/@fluentui-react-native-win32-theme-d87e956f-e913-41cf-9c96-d0db336ed6d5.json diff --git a/change/@fluentui-react-native-theme-types-ea9e6263-6722-45bc-8a43-613225a1bcb4.json b/change/@fluentui-react-native-theme-types-ea9e6263-6722-45bc-8a43-613225a1bcb4.json new file mode 100644 index 0000000000..84d2fceaee --- /dev/null +++ b/change/@fluentui-react-native-theme-types-ea9e6263-6722-45bc-8a43-613225a1bcb4.json @@ -0,0 +1,7 @@ +{ + "type": "minor", + "comment": "Remove another palette entry", + "packageName": "@fluentui-react-native/theme-types", + "email": "email not defined", + "dependentChangeType": "patch" +} diff --git a/change/@fluentui-react-native-win32-theme-d87e956f-e913-41cf-9c96-d0db336ed6d5.json b/change/@fluentui-react-native-win32-theme-d87e956f-e913-41cf-9c96-d0db336ed6d5.json new file mode 100644 index 0000000000..69d6c32fc7 --- /dev/null +++ b/change/@fluentui-react-native-win32-theme-d87e956f-e913-41cf-9c96-d0db336ed6d5.json @@ -0,0 +1,7 @@ +{ + "type": "minor", + "comment": "Remove another palette entry", + "packageName": "@fluentui-react-native/win32-theme", + "email": "email not defined", + "dependentChangeType": "patch" +}