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: secondaryContent not displaying properly #33689

Merged
merged 2 commits into from
Jan 21, 2025
Merged

bugfix: secondaryContent not displaying properly #33689

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
639e599
bugfix: secondaryContent not displaying properly
bsunderhus Jan 20, 2025
7126223
chore: updates snapshot
bsunderhus Jan 20, 2025
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-f788c84a-933e-4291-9111-2a6187517663.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: secondaryContent not displaying properly",
"packageName": "@fluentui/react-tag-picker",
"email": "[email protected]",
"dependentChangeType": "patch"
}
2 changes: 1 addition & 1 deletion ...picker/library/src/components/TagPickerOption/__snapshots__/TagPickerOption.test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ exports[`TagPickerOption renders a default state 1`] = `
<div>
<div
aria-selected="false"
class="fui-TagPickerOption fui-Option"
bsunderhus marked this conversation as resolved.
Show resolved Hide resolved
class="fui-Option fui-TagPickerOption"
id="fluent-option8"
role="option"
>
Expand Down
8 changes: 5 additions & 3 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
Expand Up @@ -2,6 +2,7 @@ import { 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';
import { typographyStyles } from '@fluentui/react-theme';

export const tagPickerOptionClassNames: SlotClassNames<TagPickerOptionSlots> = {
root: 'fui-TagPickerOption',
Expand All @@ -22,6 +23,7 @@ const useStyles = makeStyles({
secondaryContent: {
gridColumnStart: 2,
gridRowStart: 2,
...typographyStyles.caption1,
},

media: {
Expand All @@ -35,6 +37,9 @@ const useStyles = makeStyles({
export const useTagPickerOptionStyles_unstable = (state: TagPickerOptionState): TagPickerOptionState => {
'use no memo';

const styles = useStyles();

state.root.className = mergeClasses(tagPickerOptionClassNames.root, styles.root, state.root.className);
useOptionStyles_unstable({
...state,
active: false,
Expand All @@ -43,9 +48,6 @@ export const useTagPickerOptionStyles_unstable = (state: TagPickerOptionState):
checkIcon: undefined,
selected: false,
});
const styles = useStyles();

state.root.className = mergeClasses(tagPickerOptionClassNames.root, styles.root, state.root.className);
if (state.media) {
state.media.className = mergeClasses(tagPickerOptionClassNames.media, styles.media, state.media.className);
}
Expand Down
Loading