Skip to content

Fix empty CSS creation #28566

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
ling1726 merged 4 commits into from
Jul 20, 2023
Merged

Fix empty CSS creation #28566

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
243824c
Remove empty style declaration
benlemmon-ms Jul 18, 2023
844dfee
Change files
benlemmon-ms Jul 18, 2023
c092c24
Remove makeStyles import
behowell Jul 19, 2023
24d990d
Update change/@fluentui-react-toolbar-3898461e-a785-43d9-9b44-149bb5a…
ling1726 Jul 20, 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-toolbar-3898461e-a785-43d9-9b44-149bb5a84e79.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "patch",
"comment": "fix: Remove empty makeStyles call.",
"packageName": "@fluentui/react-toolbar",
"email": "[email protected]",
"dependentChangeType": "patch"
}
12 changes: 2 additions & 10 deletions ...eact-components/react-toolbar/src/components/ToolbarGroup/useToolbarGroupStyles.styles.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,24 +1,16 @@
import { SlotClassNames } from '@fluentui/react-utilities';
import { makeStyles, mergeClasses } from '@griffel/react';
import { mergeClasses } from '@griffel/react';
import type { ToolbarGroupSlots, ToolbarGroupState } from './ToolbarGroup.types';

export const toolbarGroupClassNames: SlotClassNames<ToolbarGroupSlots> = {
root: 'fui-ToolbarGroup',
};

/**
* Styles for the root slot
*/
const useStyles = makeStyles({
root: {},
});

/**
* Apply styling to the Toolbar slots based on the state
*/
export const useToolbarGroupStyles_unstable = (state: ToolbarGroupState): ToolbarGroupState => {
const styles = useStyles();
state.root.className = mergeClasses(toolbarGroupClassNames.root, styles.root, state.root.className);
state.root.className = mergeClasses(toolbarGroupClassNames.root, state.root.className);

return state;
};