Skip to content

fix(react-tags-preview): tag with secondary text has no top border under windows high contrast #28963

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

Merged
YuanboXue-Amber merged 2 commits into from
Aug 25, 2023
Merged

fix(react-tags-preview): tag with secondary text has no top border under windows high contrast #28963

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
321434b
styles
YuanboXue-Amber Aug 23, 2023
9492c69
chg
YuanboXue-Amber Aug 23, 2023
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
7 changes: 7 additions & 0 deletions change/@fluentui-react-tags-preview-94eb29aa-e1eb-4bc6-a747-23edc4f50642.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "patch",
"comment": "fix: tag with secondary text has no top border under windows high contrast",
"packageName": "@fluentui/react-tags-preview",
"email": "yuanboxue@microsoft.com",
"dependentChangeType": "patch"
}
5 changes: 5 additions & 0 deletions ...ags-preview/src/components/InteractionTagPrimary/useInteractionTagPrimaryStyles.styles.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import {
useMediaStyles,
usePrimaryTextStyles,
useSecondaryTextStyles,
useTagWithSecondaryTextContrastStyles,
} from '../Tag/useTagStyles.styles';

export const interactionTagPrimaryClassNames: SlotClassNames<InteractionTagPrimarySlots> = {
Expand Down Expand Up @@ -189,6 +190,8 @@ export const useInteractionTagPrimaryStyles_unstable = (
const primaryTextStyles = usePrimaryTextStyles();
const secondaryTextStyles = useSecondaryTextStyles();

const tagWithSecondaryTextContrastStyles = useTagWithSecondaryTextContrastStyles();

const { shape, size, appearance } = state;

state.root.className = mergeClasses(
Expand All @@ -203,6 +206,8 @@ export const useInteractionTagPrimaryStyles_unstable = (
state.hasSecondaryAction && rootWithSecondaryActionStyles.base,
state.hasSecondaryAction && rootWithSecondaryActionStyles[size],

state.secondaryText && tagWithSecondaryTextContrastStyles[shape],

state.root.className,
);

Expand Down
41 changes: 41 additions & 0 deletions packages/react-components/react-tags-preview/src/components/Tag/useTagStyles.styles.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -258,6 +258,43 @@ export const usePrimaryTextStyles = makeStyles({
},
});

/**
* Styles for root slot under windows high contrast mode when Tag is with secondary text.
* Tag's primary text has negative margin that covers the border. Pseudo element is used to draw the border.
*/
export const useTagWithSecondaryTextContrastStyles = makeStyles({
rounded: {
'@media (forced-colors: active)': {
position: 'relative',
'::before': {
content: '""',
...shorthands.border(tokens.strokeWidthThin, 'solid'),
position: 'absolute',
top: '-1px',
left: '-1px',
right: '-1px',
bottom: '-1px',
...shorthands.borderRadius(tokens.borderRadiusMedium),
},
},
},
circular: {
'@media (forced-colors: active)': {
position: 'relative',
'::before': {
content: '""',
...shorthands.border(tokens.strokeWidthThin, 'solid'),
position: 'absolute',
top: '-1px',
left: '-1px',
right: '-1px',
bottom: '-1px',
...shorthands.borderRadius(tokens.borderRadiusCircular),
},
},
},
});

export const useSecondaryTextStyles = makeStyles({
base: {
...shorthands.gridArea('secondary'),
Expand All @@ -283,6 +320,8 @@ export const useTagStyles_unstable = (state: TagState): TagState => {
const primaryTextStyles = usePrimaryTextStyles();
const secondaryTextStyles = useSecondaryTextStyles();

const tagWithSecondaryTextContrastStyles = useTagWithSecondaryTextContrastStyles();

const { shape, size, appearance } = state;

state.root.className = mergeClasses(
Expand All @@ -297,6 +336,8 @@ export const useTagStyles_unstable = (state: TagState): TagState => {
!state.media && !state.icon && rootWithoutMediaStyles[size],
!state.dismissIcon && rootWithoutDismissStyles[size],

state.secondaryText && tagWithSecondaryTextContrastStyles[shape],

state.root.className,
);

Expand Down