Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
175 commits
Select commit Hold shift + click to select a range
1138c39
Add conformance tests for static classnames
spmonahan Mar 2, 2022
4ce447b
Update component creation template
spmonahan Mar 5, 2022
aa27230
Add static classnames to Accordion
spmonahan Mar 5, 2022
484f7a2
Add static classnames to Avatar
spmonahan Mar 5, 2022
33f0c40
Add static classnames to Badge
spmonahan Mar 5, 2022
dbca212
Add static classnames to Card
spmonahan Mar 5, 2022
1a2cb62
Add static classnames to Checkbox
spmonahan Mar 5, 2022
28e93c7
Add static classnames to Dialog
spmonahan Mar 5, 2022
95e3e26
Add static classnames to Divider
spmonahan Mar 5, 2022
651c61c
Add static classnames to Image
spmonahan Mar 5, 2022
2b27000
Add static classnames to Input
spmonahan Mar 5, 2022
dc10902
Add static classnames to Label
spmonahan Mar 7, 2022
4548804
Add static classnames to Link
spmonahan Mar 7, 2022
763af67
Add static classnames to Menu
spmonahan Mar 7, 2022
45018d5
Add static classnames to Popover
spmonahan Mar 7, 2022
df7bd36
Add static classnames to Provider
spmonahan Mar 7, 2022
218991a
Deprecate static classname string for Radio.
spmonahan Mar 7, 2022
53ecb83
Add static classnames to Select
spmonahan Mar 7, 2022
466df95
Add static classnames to Tabs
spmonahan Mar 7, 2022
c1f9775
Add static classnames to Spinner
spmonahan Mar 7, 2022
a3b1c23
Add static classnames to Text
spmonahan Mar 8, 2022
a5808fe
Add static classnames to Toolbar
spmonahan Mar 8, 2022
4b7007e
Add static classnames to Tooltip
spmonahan Mar 8, 2022
8bf98cb
Add static classnames to SpinButton
spmonahan Mar 8, 2022
eab3d64
Add static classnames to Combobox
spmonahan Mar 8, 2022
0666c69
Rename conformance test for clarity
spmonahan Mar 8, 2022
9aa0a71
Update classname conformance tests to support variants
spmonahan Mar 8, 2022
8c50ea4
Update Avatar for static class name conformance
spmonahan Mar 8, 2022
c663d47
Update Card static class name conformance.
spmonahan Mar 8, 2022
048341c
Update class names conformance tests to support variants
spmonahan Mar 8, 2022
6578eb3
Change files
spmonahan Mar 8, 2022
a70226d
Simplify a conformance test
spmonahan Mar 10, 2022
8574486
Update AccordionHeader conformance test config.
spmonahan Mar 10, 2022
5b281cd
Update SpinButton API md file
spmonahan Mar 11, 2022
8936039
Update react-select API.
spmonahan Mar 11, 2022
4b1b141
Add deprecation messages to react-accordion
spmonahan Mar 14, 2022
f6eeda1
Add deprecation messages to react-avatar
spmonahan Mar 14, 2022
6e7b177
Add deprecation messages to react-badge
spmonahan Mar 14, 2022
9b0dc5f
Add deprecation messages to react-button
spmonahan Mar 14, 2022
b173709
Add deprecation messages to react-card
spmonahan Mar 14, 2022
6caeb80
Add deprecation messages to react-checkbox
spmonahan Mar 14, 2022
f6096a6
Add deprecation messages to react-combobox
spmonahan Mar 14, 2022
be0200d
Add deprecation messages to react-dialog
spmonahan Mar 14, 2022
c5ae68c
Add deprecation messages to react-divider
spmonahan Mar 14, 2022
e97199e
Add deprecation messages to react-image
spmonahan Mar 14, 2022
af3a0a5
Add deprecation messages to react-input
spmonahan Mar 14, 2022
122c0ca
Add deprecation messages to react-label
spmonahan Mar 14, 2022
1ac3d04
Add deprecation messages to react-link
spmonahan Mar 14, 2022
0439132
Add deprecation messages to react-menu
spmonahan Mar 14, 2022
0f850dd
Add deprecation messages to react-popover
spmonahan Mar 14, 2022
95d52a0
Add deprecation messages to react-provider
spmonahan Mar 14, 2022
d6fde2b
Add deprecation messages to react-radio
spmonahan Mar 14, 2022
c73d274
Add deprecation messages to react-select
spmonahan Mar 14, 2022
84620e0
Add deprecation messages to react-spinbutton
spmonahan Mar 14, 2022
b8d7585
Add deprecation messages to react-spinner
spmonahan Mar 14, 2022
be59004
Add deprecation messages to react-switch
spmonahan Mar 14, 2022
b29629a
Add deprecation messages to react-tabs
spmonahan Mar 14, 2022
f8d3cc6
Add deprecation messages to react-text
spmonahan Mar 14, 2022
b6841c4
Remove deprecated exports from Toolbar
spmonahan Mar 14, 2022
e3b3288
Add deprecation messages to react-toolip
spmonahan Mar 14, 2022
3208492
Clean up imports
spmonahan Mar 14, 2022
a39973b
Change files
spmonahan Mar 14, 2022
1d0e871
Fix import in react-dialog
spmonahan Mar 14, 2022
d21ccc1
Update Dialog API
spmonahan Mar 14, 2022
183dc75
Update type imports
spmonahan Mar 14, 2022
a6b970d
Update Badge API files
spmonahan Mar 14, 2022
c615c05
Update react-image API
spmonahan Mar 14, 2022
1672dc6
Update react-divider API
spmonahan Mar 14, 2022
bff80a7
Update react-label API
spmonahan Mar 15, 2022
290947f
Update API for react-accordion
spmonahan Mar 15, 2022
00cdd01
Update API for react-avatar
spmonahan Mar 15, 2022
c1ce605
Update API for react-card
spmonahan Mar 15, 2022
e377586
Update API for react-checkbox
spmonahan Mar 15, 2022
1246b75
Update API for react-input
spmonahan Mar 15, 2022
8b1c693
Update API for react-link
spmonahan Mar 15, 2022
9b7418a
Update API for react-menu
spmonahan Mar 15, 2022
b7d6423
Update API for react-popover
spmonahan Mar 15, 2022
87981ec
Disable 'component-has-static-classname' test on react-toolbar
spmonahan Mar 15, 2022
8503ec2
Fix conditional in classNames conformance test.
spmonahan Mar 15, 2022
6725474
Fix lint deprecation errors
spmonahan Mar 15, 2022
421a59b
Fix conformance test failures
spmonahan Mar 15, 2022
7a635c2
Fixing CompoundButton test.
khmakoto Mar 15, 2022
a440c18
Add conformance tests for static classnames
spmonahan Mar 2, 2022
91c0c7b
Update component creation template
spmonahan Mar 5, 2022
470b558
Add static classnames to Accordion
spmonahan Mar 5, 2022
1ef0aea
Add static classnames to Avatar
spmonahan Mar 5, 2022
64c4962
Add static classnames to Badge
spmonahan Mar 5, 2022
7c3b8e3
Add static classnames to Card
spmonahan Mar 5, 2022
2ec95c4
Add static classnames to Checkbox
spmonahan Mar 5, 2022
10663d0
Add static classnames to Dialog
spmonahan Mar 5, 2022
5af5ec6
Add static classnames to Divider
spmonahan Mar 5, 2022
2b11682
Add static classnames to Image
spmonahan Mar 5, 2022
7ed4e10
Add static classnames to Input
spmonahan Mar 5, 2022
5cb92a6
Add static classnames to Label
spmonahan Mar 7, 2022
857b792
Add static classnames to Link
spmonahan Mar 7, 2022
eed9350
Add static classnames to Menu
spmonahan Mar 7, 2022
e6388f5
Add static classnames to Popover
spmonahan Mar 7, 2022
85331e8
Add static classnames to Provider
spmonahan Mar 7, 2022
79d025f
Deprecate static classname string for Radio.
spmonahan Mar 7, 2022
8b85209
Add static classnames to Select
spmonahan Mar 7, 2022
4cbe818
Add static classnames to Tabs
spmonahan Mar 7, 2022
9bcdd7d
Add static classnames to Spinner
spmonahan Mar 7, 2022
bcf4c46
Add static classnames to Text
spmonahan Mar 8, 2022
8e9aa98
Add static classnames to Toolbar
spmonahan Mar 8, 2022
b7be7bc
Add static classnames to Tooltip
spmonahan Mar 8, 2022
9aa46c1
Add static classnames to SpinButton
spmonahan Mar 8, 2022
c760549
Add static classnames to Combobox
spmonahan Mar 8, 2022
dd9b983
Rename conformance test for clarity
spmonahan Mar 8, 2022
5c16597
Update classname conformance tests to support variants
spmonahan Mar 8, 2022
2af0502
Update Avatar for static class name conformance
spmonahan Mar 8, 2022
fbb22b7
Update Card static class name conformance.
spmonahan Mar 8, 2022
29dc33a
Update class names conformance tests to support variants
spmonahan Mar 8, 2022
75b563c
Change files
spmonahan Mar 8, 2022
0c97456
Simplify a conformance test
spmonahan Mar 10, 2022
b1d4d59
Update AccordionHeader conformance test config.
spmonahan Mar 10, 2022
34aa957
Update SpinButton API md file
spmonahan Mar 11, 2022
4cab422
Update react-select API.
spmonahan Mar 11, 2022
b805cfd
Add deprecation messages to react-accordion
spmonahan Mar 14, 2022
0a7e581
Add deprecation messages to react-avatar
spmonahan Mar 14, 2022
51549c1
Add deprecation messages to react-badge
spmonahan Mar 14, 2022
df15cfd
Add deprecation messages to react-button
spmonahan Mar 14, 2022
88b5c48
Add deprecation messages to react-card
spmonahan Mar 14, 2022
cb5578a
Add deprecation messages to react-checkbox
spmonahan Mar 14, 2022
b2fae95
Add deprecation messages to react-combobox
spmonahan Mar 14, 2022
80c7e72
Add deprecation messages to react-dialog
spmonahan Mar 14, 2022
f2fd443
Add deprecation messages to react-divider
spmonahan Mar 14, 2022
7adb884
Add deprecation messages to react-image
spmonahan Mar 14, 2022
12a8d32
Add deprecation messages to react-input
spmonahan Mar 14, 2022
8f826ec
Add deprecation messages to react-label
spmonahan Mar 14, 2022
ee47403
Add deprecation messages to react-link
spmonahan Mar 14, 2022
245eb0c
Add deprecation messages to react-menu
spmonahan Mar 14, 2022
a8d328b
Add deprecation messages to react-popover
spmonahan Mar 14, 2022
3766c56
Add deprecation messages to react-provider
spmonahan Mar 14, 2022
7c60ed3
Add deprecation messages to react-radio
spmonahan Mar 14, 2022
0e3ed2e
Add deprecation messages to react-select
spmonahan Mar 14, 2022
dee5bc4
Add deprecation messages to react-spinbutton
spmonahan Mar 14, 2022
a977af1
Add deprecation messages to react-spinner
spmonahan Mar 14, 2022
7048b84
Add deprecation messages to react-switch
spmonahan Mar 14, 2022
75ba18b
Add deprecation messages to react-tabs
spmonahan Mar 14, 2022
84109e1
Add deprecation messages to react-text
spmonahan Mar 14, 2022
6beb8ac
Remove deprecated exports from Toolbar
spmonahan Mar 14, 2022
cae7446
Add deprecation messages to react-toolip
spmonahan Mar 14, 2022
5efd7be
Clean up imports
spmonahan Mar 14, 2022
d7f8cf1
Change files
spmonahan Mar 14, 2022
f42cb86
Fix import in react-dialog
spmonahan Mar 14, 2022
041ebab
Update Dialog API
spmonahan Mar 14, 2022
f693390
Update type imports
spmonahan Mar 14, 2022
7b61a82
Update Badge API files
spmonahan Mar 14, 2022
54d84fb
Update react-image API
spmonahan Mar 14, 2022
0771ace
Update react-divider API
spmonahan Mar 14, 2022
aba66fc
Update react-label API
spmonahan Mar 15, 2022
1e0f059
Update API for react-accordion
spmonahan Mar 15, 2022
0bee0db
Update API for react-avatar
spmonahan Mar 15, 2022
76b326a
Update API for react-card
spmonahan Mar 15, 2022
ace11f3
Update API for react-checkbox
spmonahan Mar 15, 2022
97b93ed
Update API for react-input
spmonahan Mar 15, 2022
b8eab12
Update API for react-link
spmonahan Mar 15, 2022
920cdb5
Update API for react-menu
spmonahan Mar 15, 2022
67b5b92
Update API for react-popover
spmonahan Mar 15, 2022
e91498b
Disable 'component-has-static-classname' test on react-toolbar
spmonahan Mar 15, 2022
4ce0630
Fix conditional in classNames conformance test.
spmonahan Mar 15, 2022
ccfb618
Fix lint deprecation errors
spmonahan Mar 15, 2022
c5a7a26
Fix conformance test failures
spmonahan Mar 15, 2022
6994167
Fixing CompoundButton test.
khmakoto Mar 15, 2022
4a2d8b2
Remove debug logging
spmonahan Mar 15, 2022
8755dcb
Disable static classnames object conformance test for react-focus
spmonahan Mar 15, 2022
b33c5c9
Update classNames exports from react-components.
spmonahan Mar 15, 2022
399a4f4
Change files
spmonahan Mar 15, 2022
a06d389
Disable classNames conformance tests in @fluentui/react and react-nor…
spmonahan Mar 15, 2022
256a259
More type import fixes
khmakoto Mar 15, 2022
874fdd7
Fixing merge conflict.
khmakoto Mar 15, 2022
0c84a0e
Fixing bad merge conflict.
khmakoto Mar 15, 2022
9c8d22a
Merge branch 'master' into feat/static-classnames-helper-type
ecraig12345 Mar 16, 2022
90b3ffa
fix merge conflict + apply suggestions
ecraig12345 Mar 16, 2022
fcc4c52
remove console log
ecraig12345 Mar 16, 2022
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
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "prerelease",
"comment": "Add static classnames to Accordion",
"packageName": "@fluentui/react-accordion",
"email": "seanmonahan@microsoft.com",
"dependentChangeType": "patch"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "prerelease",
"comment": "Add static classnames to Avatar",
"packageName": "@fluentui/react-avatar",
"email": "seanmonahan@microsoft.com",
"dependentChangeType": "patch"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "prerelease",
"comment": "Add static classnames to Badge",
"packageName": "@fluentui/react-badge",
"email": "seanmonahan@microsoft.com",
"dependentChangeType": "patch"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "prerelease",
"comment": "Add deprecation messages to react-button",
"packageName": "@fluentui/react-button",
"email": "seanmonahan@microsoft.com",
"dependentChangeType": "patch"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "prerelease",
"comment": "Add static classnames to Card",
"packageName": "@fluentui/react-card",
"email": "seanmonahan@microsoft.com",
"dependentChangeType": "patch"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "prerelease",
"comment": "Add static classnames to Checkbox",
"packageName": "@fluentui/react-checkbox",
"email": "seanmonahan@microsoft.com",
"dependentChangeType": "patch"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "prerelease",
"comment": "Update classNames exports from react-components.",
"packageName": "@fluentui/react-components",
"email": "seanmonahan@microsoft.com",
"dependentChangeType": "patch"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "minor",
"comment": "Add conformance tests for static classnames",
"packageName": "@fluentui/react-conformance",
"email": "seanmonahan@microsoft.com",
"dependentChangeType": "patch"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "prerelease",
"comment": "Add static classnames to Divider",
"packageName": "@fluentui/react-divider",
"email": "seanmonahan@microsoft.com",
"dependentChangeType": "patch"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "prerelease",
"comment": "Add static classnames to Image",
"packageName": "@fluentui/react-image",
"email": "seanmonahan@microsoft.com",
"dependentChangeType": "patch"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "prerelease",
"comment": "Add static classnames to Input",
"packageName": "@fluentui/react-input",
"email": "seanmonahan@microsoft.com",
"dependentChangeType": "patch"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "prerelease",
"comment": "Add static classnames to Label",
"packageName": "@fluentui/react-label",
"email": "seanmonahan@microsoft.com",
"dependentChangeType": "patch"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "prerelease",
"comment": "Add static classnames to Link",
"packageName": "@fluentui/react-link",
"email": "seanmonahan@microsoft.com",
"dependentChangeType": "patch"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "prerelease",
"comment": "Add static classnames to Menu",
"packageName": "@fluentui/react-menu",
"email": "seanmonahan@microsoft.com",
"dependentChangeType": "patch"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "prerelease",
"comment": "Add static classnames to Popover",
"packageName": "@fluentui/react-popover",
"email": "seanmonahan@microsoft.com",
"dependentChangeType": "patch"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "prerelease",
"comment": "Add static classnames to Provider",
"packageName": "@fluentui/react-provider",
"email": "seanmonahan@microsoft.com",
"dependentChangeType": "patch"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "prerelease",
"comment": "Deprecate static classname string for Radio.",
"packageName": "@fluentui/react-radio",
"email": "seanmonahan@microsoft.com",
"dependentChangeType": "patch"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "prerelease",
"comment": "Add deprecation messages to react-switch",
"packageName": "@fluentui/react-switch",
"email": "seanmonahan@microsoft.com",
"dependentChangeType": "patch"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "prerelease",
"comment": "Add static classnames to Tabs",
"packageName": "@fluentui/react-tabs",
"email": "seanmonahan@microsoft.com",
"dependentChangeType": "patch"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "prerelease",
"comment": "Add static classnames to Text",
"packageName": "@fluentui/react-text",
"email": "seanmonahan@microsoft.com",
"dependentChangeType": "patch"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "prerelease",
"comment": "Add static classnames to Tooltip",
"packageName": "@fluentui/react-tooltip",
"email": "seanmonahan@microsoft.com",
"dependentChangeType": "patch"
}
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,7 @@ export function isConformant(
'consistent-callback-args',
// Disabled as v0 has different prefix
'component-has-static-classname',
'component-has-static-classnames-object',
],
helperComponents: [Ref, RefFindNode, FocusZone],
extraTests: extraConformanceTests,
Expand Down
21 changes: 17 additions & 4 deletions packages/react-accordion/etc/react-accordion.api.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,17 @@ import type { Context } from '@fluentui/react-context-selector';
import type { ForwardRefComponent } from '@fluentui/react-utilities';
import * as React_2 from 'react';
import type { Slot } from '@fluentui/react-utilities';
import type { SlotClassNames } from '@fluentui/react-utilities';

// @public
export const Accordion: ForwardRefComponent<AccordionProps>;

// @public (undocumented)
// @public @deprecated (undocumented)
export const accordionClassName = "fui-Accordion";

// @public (undocumented)
export const accordionClassNames: SlotClassNames<AccordionSlots>;

// @public (undocumented)
export const AccordionContext: Context<AccordionContextValue>;

Expand All @@ -37,9 +41,12 @@ export type AccordionContextValues = {
// @public
export const AccordionHeader: ForwardRefComponent<AccordionHeaderProps>;

// @public (undocumented)
// @public @deprecated (undocumented)
export const accordionHeaderClassName = "fui-AccordionHeader";

// @public (undocumented)
export const accordionHeaderClassNames: SlotClassNames<AccordionHeaderSlots>;

// @public (undocumented)
export type AccordionHeaderContextValue = {
disabled: boolean;
Expand Down Expand Up @@ -81,9 +88,12 @@ export type AccordionIndex = number | number[];
// @public
export const AccordionItem: ForwardRefComponent<AccordionItemProps>;

// @public (undocumented)
// @public @deprecated (undocumented)
export const accordionItemClassName = "fui-AccordionItem";

// @public (undocumented)
export const accordionItemClassNames: SlotClassNames<AccordionItemSlots>;

// @public (undocumented)
export const AccordionItemContext: React_2.Context<AccordionItemContextValue>;

Expand Down Expand Up @@ -117,9 +127,12 @@ export type AccordionItemValue = unknown;
// @public
export const AccordionPanel: ForwardRefComponent<AccordionPanelProps>;

// @public (undocumented)
// @public @deprecated (undocumented)
export const accordionPanelClassName = "fui-AccordionPanel";

// @public (undocumented)
export const accordionPanelClassNames: SlotClassNames<AccordionPanelSlots>;

// @public (undocumented)
export type AccordionPanelProps = ComponentProps<AccordionPanelSlots>;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,17 @@
import type { SlotClassNames } from '@fluentui/react-utilities';
import { mergeClasses } from '@griffel/react';
import type { AccordionState } from './Accordion.types';
import type { AccordionSlots, AccordionState } from './Accordion.types';

/**
* @deprecated Use `accordionClassNames.root` instead.
*/
export const accordionClassName = 'fui-Accordion';
export const accordionClassNames: SlotClassNames<AccordionSlots> = {
root: 'fui-Accordion',
};

export const useAccordionStyles_unstable = (state: AccordionState) => {
state.root.className = mergeClasses(accordionClassName, state.root.className);
state.root.className = mergeClasses(accordionClassNames.root, state.root.className);

return state;
};
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,15 @@ describe('AccordionHeader', () => {
Component: AccordionHeader,
displayName: 'AccordionHeader',
helperComponents: [AccordionHeaderContext.Provider],
testOptions: {
'has-static-classnames': [
{
props: {
icon: 'Test Icon',
},
},
],
},
});

afterEach(() => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@ exports[`AccordionHeader renders a default state 1`] = `
>
<button
aria-expanded={false}
className=""
className="fui-AccordionHeader__button"
disabled={false}
onClick={[Function]}
>
<span
aria-hidden={true}
className=""
className="fui-AccordionHeader__expandIcon"
>
<svg
aria-hidden={true}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,19 @@
import { shorthands, makeStyles, mergeClasses } from '@griffel/react';
import { createFocusOutlineStyle } from '@fluentui/react-tabster';
import { tokens } from '@fluentui/react-theme';
import type { AccordionHeaderState } from './AccordionHeader.types';
import type { AccordionHeaderSlots, AccordionHeaderState } from './AccordionHeader.types';
import type { SlotClassNames } from '@fluentui/react-utilities';

/**
* @deprecated Use `accordionHeaderClassNames.root` instead.
*/
export const accordionHeaderClassName = 'fui-AccordionHeader';
export const accordionHeaderClassNames: SlotClassNames<AccordionHeaderSlots> = {
root: 'fui-AccordionHeader',
button: 'fui-AccordionHeader__button',
expandIcon: 'fui-AccordionHeader__expandIcon',
icon: 'fui-AccordionHeader__icon',
};

const useStyles = makeStyles({
// TODO: this should be extracted to another package
Expand Down Expand Up @@ -88,14 +98,15 @@ const useStyles = makeStyles({
export const useAccordionHeaderStyles_unstable = (state: AccordionHeaderState) => {
const styles = useStyles();
state.root.className = mergeClasses(
accordionHeaderClassName,
accordionHeaderClassNames.root,
styles.root,
state.inline && styles.rootInline,
state.disabled && styles.rootDisabled,
state.root.className,
);

state.button.className = mergeClasses(
accordionHeaderClassNames.button,
styles.resetButton,
styles.button,
styles.focusIndicator,
Expand All @@ -108,6 +119,7 @@ export const useAccordionHeaderStyles_unstable = (state: AccordionHeaderState) =

if (state.expandIcon) {
state.expandIcon.className = mergeClasses(
accordionHeaderClassNames.expandIcon,
styles.expandIcon,
state.expandIconPosition === 'start' && styles.expandIconStart,
state.expandIconPosition === 'end' && styles.expandIconEnd,
Expand All @@ -116,6 +128,7 @@ export const useAccordionHeaderStyles_unstable = (state: AccordionHeaderState) =
}
if (state.icon) {
state.icon.className = mergeClasses(
accordionHeaderClassNames.icon,
styles.icon,
state.expandIconPosition === 'end' && styles.iconExpandIconEnd,
state.icon.className,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,17 @@
import type { SlotClassNames } from '@fluentui/react-utilities';
import { mergeClasses } from '@griffel/react';
import type { AccordionItemState } from './AccordionItem.types';
import type { AccordionItemSlots, AccordionItemState } from './AccordionItem.types';

/**
* @deprecated Use `accordionItemClassNames.root` instead.
*/
export const accordionItemClassName = 'fui-AccordionItem';
export const accordionItemClassNames: SlotClassNames<AccordionItemSlots> = {
root: 'fui-AccordionItem',
};

export const useAccordionItemStyles_unstable = (state: AccordionItemState) => {
state.root.className = mergeClasses(accordionItemClassName, state.root.className);
state.root.className = mergeClasses(accordionItemClassNames.root, state.root.className);

return state;
};
Original file line number Diff line number Diff line change
@@ -1,7 +1,14 @@
import type { SlotClassNames } from '@fluentui/react-utilities';
import { makeStyles, mergeClasses } from '@griffel/react';
import type { AccordionPanelState } from './AccordionPanel.types';
import type { AccordionPanelSlots, AccordionPanelState } from './AccordionPanel.types';

/**
* @deprecated Use `accordionPanelClassNames.root` instead.
*/
export const accordionPanelClassName = 'fui-AccordionPanel';
export const accordionPanelClassNames: SlotClassNames<AccordionPanelSlots> = {
root: 'fui-AccordionPanel',
};

/**
* Styles for the root slot
Expand All @@ -16,7 +23,7 @@ const useStyles = makeStyles({
/** Applies style classnames to slots */
export const useAccordionPanelStyles_unstable = (state: AccordionPanelState) => {
const styles = useStyles();
state.root.className = mergeClasses(accordionPanelClassName, styles.root, state.root.className);
state.root.className = mergeClasses(accordionPanelClassNames.root, styles.root, state.root.className);

return state;
};
Loading