Skip to content

Commit b5062e7

Browse files
authored
Change TextCtlSubtlePlaceholder to TextTextBoxPlaceholder (#3965)
* Remove another palette entry * Change files
1 parent 9773a57 commit b5062e7

File tree

7 files changed

+21
-7
lines changed

7 files changed

+21
-7
lines changed
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"type": "minor",
3+
"comment": "Remove another palette entry",
4+
"packageName": "@fluentui-react-native/theme-types",
5+
"email": "email not defined",
6+
"dependentChangeType": "patch"
7+
}
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"type": "minor",
3+
"comment": "Remove another palette entry",
4+
"packageName": "@fluentui-react-native/win32-theme",
5+
"email": "email not defined",
6+
"dependentChangeType": "patch"
7+
}

packages/theming/theme-types/src/palette.types.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,6 @@ export interface OfficePalette {
120120

121121
// text
122122
TextCtlSubtle: ColorValue;
123-
TextCtlSubtlePlaceholder: ColorValue;
124123
TextCtlSubtleHover: ColorValue;
125124
TextCtlSubtlePressed: ColorValue;
126125
TextCtlSubtleDisabled: ColorValue;
@@ -254,4 +253,5 @@ export interface OfficePalette {
254253
BkgCtlSubtleFocus: ColorValue;
255254
BkgCtlSubtleHoverDisabled: ColorValue;
256255
BkgCtlSubtleSelectedDisabled: ColorValue;
256+
TextTextBoxPlaceholder: ColorValue;
257257
}

packages/theming/win32-theme/src/NativeModule/fallbackOfficeModule.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,6 @@ const whiteColorsPalette: OfficePalette = {
6868
BkgCtlSubtlePressed: '#FFFFFF',
6969
BkgCtlSubtleDisabled: '#F3F3F3',
7070
TextCtlSubtle: '#262626',
71-
TextCtlSubtlePlaceholder: '#666666',
7271
TextCtlSubtleHover: '#262626',
7372
TextCtlSubtlePressed: '#262626',
7473
TextCtlSubtleDisabled: '#B1B1B1',
@@ -140,6 +139,7 @@ const whiteColorsPalette: OfficePalette = {
140139
BkgCtlSubtleSelectedDisabled: '#F3F3F3',
141140
BkgHeader: '#E6E6E6',
142141
TextHeader: '#262626',
142+
TextTextBoxPlaceholder: '#666666',
143143
};
144144

145145
export function fallbackGetPalette(pal?: string): OfficePalette {

packages/theming/win32-theme/src/__tests__/__snapshots__/win32-theme.test.ts.snap

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2835,7 +2835,6 @@ exports[`createOfficeTheme test 1`] = `
28352835
"TextCtlSubtle": "#262626",
28362836
"TextCtlSubtleDisabled": "#B1B1B1",
28372837
"TextCtlSubtleHover": "#262626",
2838-
"TextCtlSubtlePlaceholder": "#666666",
28392838
"TextCtlSubtlePressed": "#262626",
28402839
"TextCtlSubtleSelected": "#262626",
28412840
"TextDisabled": "#B1B1B1",
@@ -2863,6 +2862,7 @@ exports[`createOfficeTheme test 1`] = `
28632862
"TextSecondarySelected": "#666666",
28642863
"TextSelected": "#262626",
28652864
"TextSelectionHighlight": "#FFFFFF",
2865+
"TextTextBoxPlaceholder": "#666666",
28662866
"ThumbToggleSwitchOff": "#505050",
28672867
"ThumbToggleSwitchOffDisabled": "#D2D2D2",
28682868
"ThumbToggleSwitchOffHover": "#505050",
@@ -3318,7 +3318,6 @@ exports[`fallbackGetPalette test Random palette 1`] = `
33183318
"TextCtlSubtle": "#262626",
33193319
"TextCtlSubtleDisabled": "#B1B1B1",
33203320
"TextCtlSubtleHover": "#262626",
3321-
"TextCtlSubtlePlaceholder": "#666666",
33223321
"TextCtlSubtlePressed": "#262626",
33233322
"TextCtlSubtleSelected": "#262626",
33243323
"TextDisabled": "#B1B1B1",
@@ -3346,6 +3345,7 @@ exports[`fallbackGetPalette test Random palette 1`] = `
33463345
"TextSecondarySelected": "#666666",
33473346
"TextSelected": "#262626",
33483347
"TextSelectionHighlight": "#FFFFFF",
3348+
"TextTextBoxPlaceholder": "#666666",
33493349
"ThumbToggleSwitchOff": "#505050",
33503350
"ThumbToggleSwitchOffDisabled": "#D2D2D2",
33513351
"ThumbToggleSwitchOffHover": "#505050",
@@ -3460,7 +3460,6 @@ exports[`fallbackGetPalette test TaskPane palette 1`] = `
34603460
"TextCtlSubtle": "#262626",
34613461
"TextCtlSubtleDisabled": "#B1B1B1",
34623462
"TextCtlSubtleHover": "#262626",
3463-
"TextCtlSubtlePlaceholder": "#666666",
34643463
"TextCtlSubtlePressed": "#262626",
34653464
"TextCtlSubtleSelected": "#262626",
34663465
"TextDisabled": "#B1B1B1",
@@ -3488,6 +3487,7 @@ exports[`fallbackGetPalette test TaskPane palette 1`] = `
34883487
"TextSecondarySelected": "#666666",
34893488
"TextSelected": "#262626",
34903489
"TextSelectionHighlight": "#FFFFFF",
3490+
"TextTextBoxPlaceholder": "#666666",
34913491
"ThumbToggleSwitchOff": "#505050",
34923492
"ThumbToggleSwitchOffDisabled": "#D2D2D2",
34933493
"ThumbToggleSwitchOffHover": "#505050",

packages/theming/win32-theme/src/createAliasesFromPalette.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ export function createAliasesFromPalette(palette: OfficePalette, isHighContrast:
1616
neutralForeground2Hover: palette.TextSecondaryHover,
1717
neutralForeground2Pressed: palette.TextSecondaryPressed,
1818
neutralForeground2Selected: palette.TextSecondarySelected,
19-
neutralForeground4: palette.TextCtlSubtlePlaceholder,
19+
neutralForeground4: palette.TextTextBoxPlaceholder,
2020
neutralForegroundDisabled: palette.TextDisabled,
2121

2222
compoundBrandForeground1: palette.TextEmphasis,

packages/theming/win32-theme/src/paletteFromOfficeColors.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ export function paletteFromOfficeColors(p: OfficePalette): Palette {
2424
inputBackground: p.BkgCtlSubtle,
2525
inputFocusBorderAlt: p.StrokeCtlSubtleKeyboard,
2626
inputText: p.TextCtlSubtle,
27-
inputPlaceholderText: p.TextCtlSubtlePlaceholder,
27+
inputPlaceholderText: p.TextTextBoxPlaceholder,
2828

2929
buttonBackground: p.BkgCtl,
3030
buttonBackgroundChecked: p.BkgCtlSelected,

0 commit comments

Comments
 (0)