Skip to content
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

bugfix(react-tag-picker): regression from #33689 #33747

Merged
merged 1 commit into from
Jan 31, 2025
Merged

bugfix(react-tag-picker): regression from #33689 #33747

Show file tree
Hide file tree
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
7 changes: 7 additions & 0 deletions change/@fluentui-react-tag-picker-47947df9-46a1-4b10-b5b4-30965038a3c8.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
bsunderhus marked this conversation as resolved.
Show resolved Hide resolved
"type": "patch",
"comment": "bugfix: regression from #33689",
"packageName": "@fluentui/react-tag-picker",
"email": "[email protected]",
"dependentChangeType": "patch"
}
47 changes: 28 additions & 19 deletions ...eact-tag-picker/library/src/components/TagPickerOption/useTagPickerOptionStyles.styles.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { makeStyles, mergeClasses } from '@griffel/react';
import { makeResetStyles, makeStyles, mergeClasses } from '@griffel/react';
import type { SlotClassNames } from '@fluentui/react-utilities';
import type { TagPickerOptionSlots, TagPickerOptionState } from './TagPickerOption.types';
import { useOptionStyles_unstable } from '@fluentui/react-combobox';
Expand All @@ -10,25 +10,26 @@ export const tagPickerOptionClassNames: SlotClassNames<TagPickerOptionSlots> = {
secondaryContent: 'fui-TagPickerOption__secondaryContent',
};

/**
* Styles for the root slot
*/
const useStyles = makeStyles({
root: {
const useRootBaseStyle = makeResetStyles({
display: 'flex',
alignItems: 'center',
});

const useRootStyles = makeStyles({
secondaryContent: {
display: 'grid',
gridTemplateColumns: 'auto 1fr',
alignItems: 'center',
},
});

secondaryContent: {
gridColumnStart: 2,
gridRowStart: 2,
...typographyStyles.caption1,
},
const useSecondaryContentBaseStyle = makeResetStyles({
gridColumnStart: 2,
gridRowStart: 2,
...typographyStyles.caption1,
});

media: {
gridRowStart: 'span 2',
},
const useMediaBaseStyle = makeResetStyles({
gridRowStart: 'span 2',
});

/**
Expand All @@ -37,9 +38,17 @@ const useStyles = makeStyles({
export const useTagPickerOptionStyles_unstable = (state: TagPickerOptionState): TagPickerOptionState => {
'use no memo';

const styles = useStyles();
const rootBaseStyle = useRootBaseStyle();
const rootStyles = useRootStyles();
const secondaryContentBaseStyle = useSecondaryContentBaseStyle();
const mediaBaseStyle = useMediaBaseStyle();

state.root.className = mergeClasses(tagPickerOptionClassNames.root, styles.root, state.root.className);
state.root.className = mergeClasses(
tagPickerOptionClassNames.root,
rootBaseStyle,
state.secondaryContent && rootStyles.secondaryContent,
state.root.className,
);
useOptionStyles_unstable({
...state,
active: false,
Expand All @@ -49,13 +58,13 @@ export const useTagPickerOptionStyles_unstable = (state: TagPickerOptionState):
selected: false,
});
if (state.media) {
state.media.className = mergeClasses(tagPickerOptionClassNames.media, styles.media, state.media.className);
state.media.className = mergeClasses(tagPickerOptionClassNames.media, mediaBaseStyle, state.media.className);
}

if (state.secondaryContent) {
state.secondaryContent.className = mergeClasses(
tagPickerOptionClassNames.secondaryContent,
styles.secondaryContent,
secondaryContentBaseStyle,
state.secondaryContent.className,
);
}
Expand Down
1 change: 0 additions & 1 deletion ...ages/react-components/react-tag-picker/stories/src/TagPicker/TagPickerDefault.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,6 @@ export const Default = () => {
{tagPickerOptions.length > 0 ? (
tagPickerOptions.map(option => (
<TagPickerOption
secondaryContent="Microsoft FTE"
media={<Avatar shape="square" aria-hidden name={option} color="colorful" />}
value={option}
key={option}
Expand Down