diff --git a/change/@fluentui-react-checkbox-11fec6aa-5adf-4f0a-8643-3ba5acc1a156.json b/change/@fluentui-react-checkbox-11fec6aa-5adf-4f0a-8643-3ba5acc1a156.json new file mode 100644 index 00000000000000..8d95055af618fc --- /dev/null +++ b/change/@fluentui-react-checkbox-11fec6aa-5adf-4f0a-8643-3ba5acc1a156.json @@ -0,0 +1,7 @@ +{ + "type": "patch", + "comment": "chore: Remove deprecated CheckboxField_unstable shim component", + "packageName": "@fluentui/react-checkbox", + "email": "behowell@microsoft.com", + "dependentChangeType": "patch" +} diff --git a/change/@fluentui-react-combobox-55ac2e2c-3073-437c-8aba-bd427d7a4fe9.json b/change/@fluentui-react-combobox-55ac2e2c-3073-437c-8aba-bd427d7a4fe9.json new file mode 100644 index 00000000000000..e856af11282329 --- /dev/null +++ b/change/@fluentui-react-combobox-55ac2e2c-3073-437c-8aba-bd427d7a4fe9.json @@ -0,0 +1,7 @@ +{ + "type": "patch", + "comment": "chore: Remove deprecated ComboboxField_unstable shim component", + "packageName": "@fluentui/react-combobox", + "email": "behowell@microsoft.com", + "dependentChangeType": "patch" +} diff --git a/change/@fluentui-react-components-d91bf0b6-07ed-430e-b13a-f8bff1e266d7.json b/change/@fluentui-react-components-d91bf0b6-07ed-430e-b13a-f8bff1e266d7.json new file mode 100644 index 00000000000000..b84bd70fed2446 --- /dev/null +++ b/change/@fluentui-react-components-d91bf0b6-07ed-430e-b13a-f8bff1e266d7.json @@ -0,0 +1,7 @@ +{ + "type": "patch", + "comment": "chore(react-components/unstable): Remove deprecated InputField, etc. shim components", + "packageName": "@fluentui/react-components", + "email": "behowell@microsoft.com", + "dependentChangeType": "patch" +} diff --git a/change/@fluentui-react-field-aa25cb84-d8a4-4efe-9a15-30df2ffdfaa8.json b/change/@fluentui-react-field-aa25cb84-d8a4-4efe-9a15-30df2ffdfaa8.json new file mode 100644 index 00000000000000..2ea576f0aa3271 --- /dev/null +++ b/change/@fluentui-react-field-aa25cb84-d8a4-4efe-9a15-30df2ffdfaa8.json @@ -0,0 +1,7 @@ +{ + "type": "prerelease", + "comment": "chore: Remove utilities for deprecated shim InputField, etc. components", + "packageName": "@fluentui/react-field", + "email": "behowell@microsoft.com", + "dependentChangeType": "patch" +} diff --git a/change/@fluentui-react-input-efdc4cb9-6959-4487-8700-0b519f8f341a.json b/change/@fluentui-react-input-efdc4cb9-6959-4487-8700-0b519f8f341a.json new file mode 100644 index 00000000000000..3ee06d35edc8c8 --- /dev/null +++ b/change/@fluentui-react-input-efdc4cb9-6959-4487-8700-0b519f8f341a.json @@ -0,0 +1,7 @@ +{ + "type": "patch", + "comment": "chore: Remove deprecated InputField_unstable shim component", + "packageName": "@fluentui/react-input", + "email": "behowell@microsoft.com", + "dependentChangeType": "patch" +} diff --git a/change/@fluentui-react-progress-546292b4-db99-435c-9dcf-3696e3469dc0.json b/change/@fluentui-react-progress-546292b4-db99-435c-9dcf-3696e3469dc0.json new file mode 100644 index 00000000000000..479fb6582f82a3 --- /dev/null +++ b/change/@fluentui-react-progress-546292b4-db99-435c-9dcf-3696e3469dc0.json @@ -0,0 +1,7 @@ +{ + "type": "patch", + "comment": "chore: Remove deprecated ProgressField_unstable shim component", + "packageName": "@fluentui/react-progress", + "email": "behowell@microsoft.com", + "dependentChangeType": "patch" +} diff --git a/change/@fluentui-react-radio-3274119d-a18a-4be8-9f5f-d9a8053f964b.json b/change/@fluentui-react-radio-3274119d-a18a-4be8-9f5f-d9a8053f964b.json new file mode 100644 index 00000000000000..929fd5269c3497 --- /dev/null +++ b/change/@fluentui-react-radio-3274119d-a18a-4be8-9f5f-d9a8053f964b.json @@ -0,0 +1,7 @@ +{ + "type": "patch", + "comment": "chore: Remove deprecated RadioGroupField_unstable shim component", + "packageName": "@fluentui/react-radio", + "email": "behowell@microsoft.com", + "dependentChangeType": "patch" +} diff --git a/change/@fluentui-react-select-0b5b1eee-c188-4ba9-8893-0c7278127bb2.json b/change/@fluentui-react-select-0b5b1eee-c188-4ba9-8893-0c7278127bb2.json new file mode 100644 index 00000000000000..60b75dce5fa356 --- /dev/null +++ b/change/@fluentui-react-select-0b5b1eee-c188-4ba9-8893-0c7278127bb2.json @@ -0,0 +1,7 @@ +{ + "type": "patch", + "comment": "chore: Remove deprecated SelectField_unstable shim component", + "packageName": "@fluentui/react-select", + "email": "behowell@microsoft.com", + "dependentChangeType": "patch" +} diff --git a/change/@fluentui-react-slider-a070c2e4-448f-481a-9a82-cfa5ffcec62a.json b/change/@fluentui-react-slider-a070c2e4-448f-481a-9a82-cfa5ffcec62a.json new file mode 100644 index 00000000000000..ac6ff83d2086ce --- /dev/null +++ b/change/@fluentui-react-slider-a070c2e4-448f-481a-9a82-cfa5ffcec62a.json @@ -0,0 +1,7 @@ +{ + "type": "patch", + "comment": "chore: Remove deprecated SliderField_unstable shim component", + "packageName": "@fluentui/react-slider", + "email": "behowell@microsoft.com", + "dependentChangeType": "patch" +} diff --git a/change/@fluentui-react-spinbutton-def4061b-fb7d-4013-90a1-c1cf83acad59.json b/change/@fluentui-react-spinbutton-def4061b-fb7d-4013-90a1-c1cf83acad59.json new file mode 100644 index 00000000000000..3aae9b77ccde41 --- /dev/null +++ b/change/@fluentui-react-spinbutton-def4061b-fb7d-4013-90a1-c1cf83acad59.json @@ -0,0 +1,7 @@ +{ + "type": "patch", + "comment": "chore: Remove deprecated SpinButtonField_unstable shim component", + "packageName": "@fluentui/react-spinbutton", + "email": "behowell@microsoft.com", + "dependentChangeType": "patch" +} diff --git a/change/@fluentui-react-switch-a03a889d-1fc4-462c-9c2f-e81f1fc65987.json b/change/@fluentui-react-switch-a03a889d-1fc4-462c-9c2f-e81f1fc65987.json new file mode 100644 index 00000000000000..6ab85258544ad6 --- /dev/null +++ b/change/@fluentui-react-switch-a03a889d-1fc4-462c-9c2f-e81f1fc65987.json @@ -0,0 +1,7 @@ +{ + "type": "patch", + "comment": "chore: Remove deprecated SwitchField_unstable shim component", + "packageName": "@fluentui/react-switch", + "email": "behowell@microsoft.com", + "dependentChangeType": "patch" +} diff --git a/change/@fluentui-react-textarea-48711081-59a6-4049-a2cd-48c2b6bd7428.json b/change/@fluentui-react-textarea-48711081-59a6-4049-a2cd-48c2b6bd7428.json new file mode 100644 index 00000000000000..c54b4228123548 --- /dev/null +++ b/change/@fluentui-react-textarea-48711081-59a6-4049-a2cd-48c2b6bd7428.json @@ -0,0 +1,7 @@ +{ + "type": "patch", + "comment": "chore: Remove deprecated TextareaField_unstable shim component", + "packageName": "@fluentui/react-textarea", + "email": "behowell@microsoft.com", + "dependentChangeType": "patch" +} diff --git a/packages/react-components/react-checkbox/etc/react-checkbox.api.md b/packages/react-components/react-checkbox/etc/react-checkbox.api.md index 11259dcceffeb9..c49f11c4a11863 100644 --- a/packages/react-components/react-checkbox/etc/react-checkbox.api.md +++ b/packages/react-components/react-checkbox/etc/react-checkbox.api.md @@ -8,8 +8,6 @@ import { ComponentProps } from '@fluentui/react-utilities'; import { ComponentState } from '@fluentui/react-utilities'; -import { DeprecatedFieldProps } from '@fluentui/react-field'; -import { FieldProps } from '@fluentui/react-field'; import type { ForwardRefComponent } from '@fluentui/react-utilities'; import { Label } from '@fluentui/react-label'; import * as React_2 from 'react'; @@ -22,25 +20,6 @@ export const Checkbox: ForwardRefComponent; // @public (undocumented) export const checkboxClassNames: SlotClassNames; -// @public @deprecated (undocumented) -export const CheckboxField_unstable: ForwardRefComponent; - -// @public @deprecated (undocumented) -export const checkboxFieldClassNames: { - control: string; - root: string; - label: string; - validationMessage: string; - validationMessageIcon: string; - hint: string; -}; - -// @public @deprecated (undocumented) -export type CheckboxFieldProps_unstable = Omit, 'label'> & { - label?: CheckboxProps['label']; - fieldLabel?: FieldProps['label']; -}; - // @public export interface CheckboxOnChangeData { // (undocumented) diff --git a/packages/react-components/react-checkbox/src/CheckboxField.ts b/packages/react-components/react-checkbox/src/CheckboxField.ts deleted file mode 100644 index dc829ee3cc9d76..00000000000000 --- a/packages/react-components/react-checkbox/src/CheckboxField.ts +++ /dev/null @@ -1 +0,0 @@ -export * from './components/CheckboxField/index'; diff --git a/packages/react-components/react-checkbox/src/components/CheckboxField/CheckboxField.tsx b/packages/react-components/react-checkbox/src/components/CheckboxField/CheckboxField.tsx deleted file mode 100644 index fa6e75870f1a9e..00000000000000 --- a/packages/react-components/react-checkbox/src/components/CheckboxField/CheckboxField.tsx +++ /dev/null @@ -1,28 +0,0 @@ -/* eslint-disable deprecation/deprecation */ -import { - DeprecatedFieldProps, - FieldProps, - getDeprecatedFieldClassNames, - makeDeprecatedField, -} from '@fluentui/react-field'; -import type { ForwardRefComponent } from '@fluentui/react-utilities'; -import { Checkbox, checkboxClassNames, CheckboxProps } from '../../Checkbox'; - -/** @deprecated Use Field with a Checkbox inside: `` */ -export type CheckboxFieldProps = Omit, 'label'> & { - label?: CheckboxProps['label']; - fieldLabel?: FieldProps['label']; -}; - -/** @deprecated Use Field with a Checkbox inside: `` */ -export const checkboxFieldClassNames = getDeprecatedFieldClassNames(checkboxClassNames.root); - -/** @deprecated Use Field with a Checkbox inside: `` */ -export const CheckboxField: ForwardRefComponent = makeDeprecatedField(Checkbox, { - mapProps: (props: CheckboxFieldProps) => ({ - ...props, - label: props.fieldLabel, - required: undefined, - control: { ...props.control, required: props.required, label: props.label }, - }), -}); diff --git a/packages/react-components/react-checkbox/src/components/CheckboxField/index.ts b/packages/react-components/react-checkbox/src/components/CheckboxField/index.ts deleted file mode 100644 index 032e30e3a8b12b..00000000000000 --- a/packages/react-components/react-checkbox/src/components/CheckboxField/index.ts +++ /dev/null @@ -1 +0,0 @@ -export * from './CheckboxField'; diff --git a/packages/react-components/react-checkbox/src/index.ts b/packages/react-components/react-checkbox/src/index.ts index 9d8af4ef3f85b8..1bb3babd0ea8bb 100644 --- a/packages/react-components/react-checkbox/src/index.ts +++ b/packages/react-components/react-checkbox/src/index.ts @@ -6,8 +6,3 @@ export { useCheckbox_unstable, } from './Checkbox'; export type { CheckboxOnChangeData, CheckboxProps, CheckboxSlots, CheckboxState } from './Checkbox'; - -// eslint-disable-next-line deprecation/deprecation -export { CheckboxField as CheckboxField_unstable, checkboxFieldClassNames } from './CheckboxField'; -// eslint-disable-next-line deprecation/deprecation -export type { CheckboxFieldProps as CheckboxFieldProps_unstable } from './CheckboxField'; diff --git a/packages/react-components/react-combobox/etc/react-combobox.api.md b/packages/react-components/react-combobox/etc/react-combobox.api.md index 7d9a27dae99bbd..bb95e10b2eaedd 100644 --- a/packages/react-components/react-combobox/etc/react-combobox.api.md +++ b/packages/react-components/react-combobox/etc/react-combobox.api.md @@ -8,7 +8,6 @@ import type { ComponentProps } from '@fluentui/react-utilities'; import type { ComponentState } from '@fluentui/react-utilities'; -import { DeprecatedFieldProps } from '@fluentui/react-field'; import { FC } from 'react'; import type { ForwardRefComponent } from '@fluentui/react-utilities'; import type { PositioningShorthand } from '@fluentui/react-positioning'; @@ -30,22 +29,6 @@ export type ComboboxContextValue = Pick; - -// @public @deprecated (undocumented) -export const comboboxFieldClassNames: { - control: string; - root: string; - label: string; - validationMessage: string; - validationMessageIcon: string; - hint: string; -}; - -// @public @deprecated (undocumented) -export type ComboboxFieldProps_unstable = DeprecatedFieldProps; - // @public (undocumented) export type ComboboxOpenChangeData = ComboboxBaseOpenChangeData; diff --git a/packages/react-components/react-combobox/src/ComboboxField.ts b/packages/react-components/react-combobox/src/ComboboxField.ts deleted file mode 100644 index 932370c08f79f4..00000000000000 --- a/packages/react-components/react-combobox/src/ComboboxField.ts +++ /dev/null @@ -1 +0,0 @@ -export * from './components/ComboboxField/index'; diff --git a/packages/react-components/react-combobox/src/components/ComboboxField/ComboboxField.tsx b/packages/react-components/react-combobox/src/components/ComboboxField/ComboboxField.tsx deleted file mode 100644 index 3cab43ec2b7328..00000000000000 --- a/packages/react-components/react-combobox/src/components/ComboboxField/ComboboxField.tsx +++ /dev/null @@ -1,11 +0,0 @@ -/* eslint-disable deprecation/deprecation */ -import { DeprecatedFieldProps, getDeprecatedFieldClassNames, makeDeprecatedField } from '@fluentui/react-field'; -import type { ForwardRefComponent } from '@fluentui/react-utilities'; -import { Combobox, comboboxClassNames, ComboboxProps } from '../../Combobox'; - -/** @deprecated Use Field with Combobox: `` */ -export type ComboboxFieldProps = DeprecatedFieldProps; -/** @deprecated Use Field with Combobox: `` */ -export const comboboxFieldClassNames = getDeprecatedFieldClassNames(comboboxClassNames.root); -/** @deprecated Use Field with Combobox: `` */ -export const ComboboxField: ForwardRefComponent = makeDeprecatedField(Combobox); diff --git a/packages/react-components/react-combobox/src/components/ComboboxField/index.ts b/packages/react-components/react-combobox/src/components/ComboboxField/index.ts deleted file mode 100644 index 5dcd2a0df1f8f7..00000000000000 --- a/packages/react-components/react-combobox/src/components/ComboboxField/index.ts +++ /dev/null @@ -1 +0,0 @@ -export * from './ComboboxField'; diff --git a/packages/react-components/react-combobox/src/index.ts b/packages/react-components/react-combobox/src/index.ts index c4173df07ed5af..bb95cbfb3cb5b4 100644 --- a/packages/react-components/react-combobox/src/index.ts +++ b/packages/react-components/react-combobox/src/index.ts @@ -58,8 +58,3 @@ export { useOptionGroup_unstable, } from './OptionGroup'; export type { OptionGroupProps, OptionGroupSlots, OptionGroupState } from './OptionGroup'; - -// eslint-disable-next-line deprecation/deprecation -export { ComboboxField as ComboboxField_unstable, comboboxFieldClassNames } from './ComboboxField'; -// eslint-disable-next-line deprecation/deprecation -export type { ComboboxFieldProps as ComboboxFieldProps_unstable } from './ComboboxField'; diff --git a/packages/react-components/react-components/etc/react-components.unstable.api.md b/packages/react-components/react-components/etc/react-components.unstable.api.md index 105dadc34ad575..db8421c782cfe2 100644 --- a/packages/react-components/react-components/etc/react-components.unstable.api.md +++ b/packages/react-components/react-components/etc/react-components.unstable.api.md @@ -9,12 +9,6 @@ import { alertClassNames } from '@fluentui/react-alert'; import { AlertProps } from '@fluentui/react-alert'; import { AlertSlots } from '@fluentui/react-alert'; import { AlertState } from '@fluentui/react-alert'; -import { CheckboxField_unstable as CheckboxField } from '@fluentui/react-checkbox'; -import { checkboxFieldClassNames } from '@fluentui/react-checkbox'; -import { CheckboxFieldProps_unstable as CheckboxFieldProps } from '@fluentui/react-checkbox'; -import { ComboboxField_unstable as ComboboxField } from '@fluentui/react-combobox'; -import { comboboxFieldClassNames } from '@fluentui/react-combobox'; -import { ComboboxFieldProps_unstable as ComboboxFieldProps } from '@fluentui/react-combobox'; import { Field } from '@fluentui/react-field'; import { fieldClassNames } from '@fluentui/react-field'; import { FieldContextProvider } from '@fluentui/react-field'; @@ -40,16 +34,7 @@ import { infoLabelClassNames } from '@fluentui/react-infobutton'; import { InfoLabelProps } from '@fluentui/react-infobutton'; import { InfoLabelSlots } from '@fluentui/react-infobutton'; import { InfoLabelState } from '@fluentui/react-infobutton'; -import { InputField_unstable as InputField } from '@fluentui/react-input'; -import { inputFieldClassNames } from '@fluentui/react-input'; -import { InputFieldProps_unstable as InputFieldProps } from '@fluentui/react-input'; import { NestedTreeItem } from '@fluentui/react-tree'; -import { ProgressField_unstable as ProgressField } from '@fluentui/react-progress'; -import { progressFieldClassNames } from '@fluentui/react-progress'; -import { ProgressFieldProps_unstable as ProgressFieldProps } from '@fluentui/react-progress'; -import { RadioGroupField_unstable as RadioGroupField } from '@fluentui/react-radio'; -import { radioGroupFieldClassNames } from '@fluentui/react-radio'; -import { RadioGroupFieldProps_unstable as RadioGroupFieldProps } from '@fluentui/react-radio'; import { renderAlert_unstable } from '@fluentui/react-alert'; import { renderField_unstable } from '@fluentui/react-field'; import { renderInfoButton_unstable } from '@fluentui/react-infobutton'; @@ -62,9 +47,6 @@ import { renderTreeItemLayout_unstable } from '@fluentui/react-tree'; import { renderTreeItemPersonaLayout_unstable } from '@fluentui/react-tree'; import { renderVirtualizer_unstable } from '@fluentui/react-virtualizer'; import { renderVirtualizerScrollView_unstable } from '@fluentui/react-virtualizer'; -import { SelectField_unstable as SelectField } from '@fluentui/react-select'; -import { selectFieldClassNames } from '@fluentui/react-select'; -import { SelectFieldProps_unstable as SelectFieldProps } from '@fluentui/react-select'; import { Skeleton } from '@fluentui/react-skeleton'; import { skeletonClassNames } from '@fluentui/react-skeleton'; import { SkeletonContextProvider } from '@fluentui/react-skeleton'; @@ -77,18 +59,6 @@ import { SkeletonItemState } from '@fluentui/react-skeleton'; import { SkeletonProps } from '@fluentui/react-skeleton'; import { SkeletonSlots } from '@fluentui/react-skeleton'; import { SkeletonState } from '@fluentui/react-skeleton'; -import { SliderField_unstable as SliderField } from '@fluentui/react-slider'; -import { sliderFieldClassNames } from '@fluentui/react-slider'; -import { SliderFieldProps_unstable as SliderFieldProps } from '@fluentui/react-slider'; -import { SpinButtonField_unstable as SpinButtonField } from '@fluentui/react-spinbutton'; -import { spinButtonFieldClassNames } from '@fluentui/react-spinbutton'; -import { SpinButtonFieldProps_unstable as SpinButtonFieldProps } from '@fluentui/react-spinbutton'; -import { SwitchField_unstable as SwitchField } from '@fluentui/react-switch'; -import { switchFieldClassNames } from '@fluentui/react-switch'; -import { SwitchFieldProps_unstable as SwitchFieldProps } from '@fluentui/react-switch'; -import { TextareaField_unstable as TextareaField } from '@fluentui/react-textarea'; -import { textareaFieldClassNames } from '@fluentui/react-textarea'; -import { TextareaFieldProps_unstable as TextareaFieldProps } from '@fluentui/react-textarea'; import { Tree } from '@fluentui/react-tree'; import { treeClassNames } from '@fluentui/react-tree'; import { TreeContextValue } from '@fluentui/react-tree'; @@ -173,18 +143,6 @@ export { AlertSlots } export { AlertState } -export { CheckboxField } - -export { checkboxFieldClassNames } - -export { CheckboxFieldProps } - -export { ComboboxField } - -export { comboboxFieldClassNames } - -export { ComboboxFieldProps } - export { Field } export { fieldClassNames } @@ -235,26 +193,8 @@ export { InfoLabelSlots } export { InfoLabelState } -export { InputField } - -export { inputFieldClassNames } - -export { InputFieldProps } - export { NestedTreeItem } -export { ProgressField } - -export { progressFieldClassNames } - -export { ProgressFieldProps } - -export { RadioGroupField } - -export { radioGroupFieldClassNames } - -export { RadioGroupFieldProps } - export { renderAlert_unstable } export { renderField_unstable } @@ -279,12 +219,6 @@ export { renderVirtualizer_unstable } export { renderVirtualizerScrollView_unstable } -export { SelectField } - -export { selectFieldClassNames } - -export { SelectFieldProps } - export { Skeleton } export { skeletonClassNames } @@ -309,30 +243,6 @@ export { SkeletonSlots } export { SkeletonState } -export { SliderField } - -export { sliderFieldClassNames } - -export { SliderFieldProps } - -export { SpinButtonField } - -export { spinButtonFieldClassNames } - -export { SpinButtonFieldProps } - -export { SwitchField } - -export { switchFieldClassNames } - -export { SwitchFieldProps } - -export { TextareaField } - -export { textareaFieldClassNames } - -export { TextareaFieldProps } - export { Tree } export { treeClassNames } diff --git a/packages/react-components/react-components/src/unstable/index.ts b/packages/react-components/react-components/src/unstable/index.ts index b1b5306864ff6a..5b45a293ffd3af 100644 --- a/packages/react-components/react-components/src/unstable/index.ts +++ b/packages/react-components/react-components/src/unstable/index.ts @@ -30,56 +30,6 @@ export type { InfoLabelState, } from '@fluentui/react-infobutton'; -// eslint-disable-next-line deprecation/deprecation -export { CheckboxField_unstable as CheckboxField, checkboxFieldClassNames } from '@fluentui/react-checkbox'; -// eslint-disable-next-line deprecation/deprecation -export type { CheckboxFieldProps_unstable as CheckboxFieldProps } from '@fluentui/react-checkbox'; - -// eslint-disable-next-line deprecation/deprecation -export { ComboboxField_unstable as ComboboxField, comboboxFieldClassNames } from '@fluentui/react-combobox'; -// eslint-disable-next-line deprecation/deprecation -export type { ComboboxFieldProps_unstable as ComboboxFieldProps } from '@fluentui/react-combobox'; - -// eslint-disable-next-line deprecation/deprecation -export { InputField_unstable as InputField, inputFieldClassNames } from '@fluentui/react-input'; -// eslint-disable-next-line deprecation/deprecation -export type { InputFieldProps_unstable as InputFieldProps } from '@fluentui/react-input'; - -// eslint-disable-next-line deprecation/deprecation -export { ProgressField_unstable as ProgressField, progressFieldClassNames } from '@fluentui/react-progress'; -// eslint-disable-next-line deprecation/deprecation -export type { ProgressFieldProps_unstable as ProgressFieldProps } from '@fluentui/react-progress'; - -// eslint-disable-next-line deprecation/deprecation -export { RadioGroupField_unstable as RadioGroupField, radioGroupFieldClassNames } from '@fluentui/react-radio'; -// eslint-disable-next-line deprecation/deprecation -export type { RadioGroupFieldProps_unstable as RadioGroupFieldProps } from '@fluentui/react-radio'; - -// eslint-disable-next-line deprecation/deprecation -export { SelectField_unstable as SelectField, selectFieldClassNames } from '@fluentui/react-select'; -// eslint-disable-next-line deprecation/deprecation -export type { SelectFieldProps_unstable as SelectFieldProps } from '@fluentui/react-select'; - -// eslint-disable-next-line deprecation/deprecation -export { SliderField_unstable as SliderField, sliderFieldClassNames } from '@fluentui/react-slider'; -// eslint-disable-next-line deprecation/deprecation -export type { SliderFieldProps_unstable as SliderFieldProps } from '@fluentui/react-slider'; - -// eslint-disable-next-line deprecation/deprecation -export { SpinButtonField_unstable as SpinButtonField, spinButtonFieldClassNames } from '@fluentui/react-spinbutton'; -// eslint-disable-next-line deprecation/deprecation -export type { SpinButtonFieldProps_unstable as SpinButtonFieldProps } from '@fluentui/react-spinbutton'; - -// eslint-disable-next-line deprecation/deprecation -export { SwitchField_unstable as SwitchField, switchFieldClassNames } from '@fluentui/react-switch'; -// eslint-disable-next-line deprecation/deprecation -export type { SwitchFieldProps_unstable as SwitchFieldProps } from '@fluentui/react-switch'; - -// eslint-disable-next-line deprecation/deprecation -export { TextareaField_unstable as TextareaField, textareaFieldClassNames } from '@fluentui/react-textarea'; -// eslint-disable-next-line deprecation/deprecation -export type { TextareaFieldProps_unstable as TextareaFieldProps } from '@fluentui/react-textarea'; - export { Field, fieldClassNames, diff --git a/packages/react-components/react-field/etc/react-field.api.md b/packages/react-components/react-field/etc/react-field.api.md index a225cfa05ffd74..08d55ef618a71b 100644 --- a/packages/react-components/react-field/etc/react-field.api.md +++ b/packages/react-components/react-field/etc/react-field.api.md @@ -8,18 +8,12 @@ import type { ComponentProps } from '@fluentui/react-utilities'; import type { ComponentState } from '@fluentui/react-utilities'; -import { ForwardRefComponent } from '@fluentui/react-utilities'; +import type { ForwardRefComponent } from '@fluentui/react-utilities'; import { Label } from '@fluentui/react-label'; import * as React_2 from 'react'; import type { Slot } from '@fluentui/react-utilities'; import type { SlotClassNames } from '@fluentui/react-utilities'; -// @internal @deprecated (undocumented) -export type DeprecatedFieldProps = ControlProps & { - root?: FieldProps; - control?: ControlProps; -} & Pick; - // @public (undocumented) export const Field: ForwardRefComponent; @@ -80,22 +74,6 @@ export type FieldState = ComponentState> & Required { - control: string; - root: string; - label: string; - validationMessage: string; - validationMessageIcon: string; - hint: string; -}; - -// @internal @deprecated (undocumented) -export function makeDeprecatedField(Control: React_2.ComponentType, options?: { - mapProps?: (props: DeprecatedFieldProps) => DeprecatedFieldProps; - displayName?: string; -}): ForwardRefComponent>; - // @public export const renderField_unstable: (state: FieldState, contextValues: FieldContextValues) => JSX.Element; diff --git a/packages/react-components/react-field/src/index.ts b/packages/react-components/react-field/src/index.ts index 07469dc527f2c8..292bbb36d81bec 100644 --- a/packages/react-components/react-field/src/index.ts +++ b/packages/react-components/react-field/src/index.ts @@ -14,8 +14,3 @@ export { useFieldControlProps_unstable, } from './contexts/index'; export type { FieldControlPropsOptions } from './contexts/index'; - -// eslint-disable-next-line deprecation/deprecation -export { getDeprecatedFieldClassNames, makeDeprecatedField } from './util/makeDeprecatedField'; -// eslint-disable-next-line deprecation/deprecation -export type { DeprecatedFieldProps } from './util/makeDeprecatedField'; diff --git a/packages/react-components/react-field/src/util/makeDeprecatedField.tsx b/packages/react-components/react-field/src/util/makeDeprecatedField.tsx deleted file mode 100644 index 14c870e335de26..00000000000000 --- a/packages/react-components/react-field/src/util/makeDeprecatedField.tsx +++ /dev/null @@ -1,106 +0,0 @@ -/* eslint-disable deprecation/deprecation */ -import * as React from 'react'; -import { ForwardRefComponent } from '@fluentui/react-utilities'; -import type { FieldProps } from '../Field'; -import { Field, fieldClassNames } from '../Field'; - -/** - * @deprecated Only for use to make deprecated [Control]Field shim components. - * @internal - */ -export type DeprecatedFieldProps = ControlProps & { - root?: FieldProps; - control?: ControlProps; -} & Pick< - FieldProps, - | 'className' - | 'hint' - | 'label' - | 'orientation' - | 'style' - | 'validationMessage' - | 'validationMessageIcon' - | 'validationState' - >; - -/** - * Partition the props used by the Field itself, from the props that are passed to the underlying field component. - */ -function getPartitionedFieldProps( - props: DeprecatedFieldProps & Pick, -) { - const { - className, - control, - hint, - label, - orientation, - required, - root, - size, - style, - validationMessage, - validationMessageIcon, - validationState = 'none', - ...restOfProps - } = props; - - return [ - { - className, - hint, - label, - orientation, - required, - size, - style, - validationMessage, - validationMessageIcon, - validationState, - ...root, - }, - { - required, - size, - ...restOfProps, - ...control, - }, - ]; -} - -/** - * @deprecated Only for use to make deprecated [Control]Field shim components. - * @internal - */ -export function makeDeprecatedField( - Control: React.ComponentType, - options: { - mapProps?: (props: DeprecatedFieldProps) => DeprecatedFieldProps; - displayName?: string; - } = {}, -) { - const { mapProps = props => props, displayName = `${Control.displayName}Field` } = options; - - const DeprecatedField = React.forwardRef((props, ref) => { - const [fieldProps, controlProps] = getPartitionedFieldProps(mapProps(props)); - return ( - - {/* eslint-disable-next-line @typescript-eslint/no-explicit-any */} - - - ); - }) as ForwardRefComponent>; - - DeprecatedField.displayName = displayName; - - return DeprecatedField; -} - -/** - * @deprecated Only for use to make deprecated [Control]Field shim components. - * @internal - */ -export const getDeprecatedFieldClassNames = (controlRootClassName: string) => ({ - ...fieldClassNames, - control: controlRootClassName, -}); diff --git a/packages/react-components/react-input/etc/react-input.api.md b/packages/react-components/react-input/etc/react-input.api.md index b4ec0b26e345ef..f45330387f14ea 100644 --- a/packages/react-components/react-input/etc/react-input.api.md +++ b/packages/react-components/react-input/etc/react-input.api.md @@ -8,7 +8,6 @@ import type { ComponentProps } from '@fluentui/react-utilities'; import type { ComponentState } from '@fluentui/react-utilities'; -import { DeprecatedFieldProps } from '@fluentui/react-field'; import type { ForwardRefComponent } from '@fluentui/react-utilities'; import * as React_2 from 'react'; import type { Slot } from '@fluentui/react-utilities'; @@ -20,22 +19,6 @@ export const Input: ForwardRefComponent; // @public (undocumented) export const inputClassNames: SlotClassNames; -// @public @deprecated (undocumented) -export const InputField_unstable: ForwardRefComponent; - -// @public @deprecated (undocumented) -export const inputFieldClassNames: { - control: string; - root: string; - label: string; - validationMessage: string; - validationMessageIcon: string; - hint: string; -}; - -// @public @deprecated (undocumented) -export type InputFieldProps_unstable = DeprecatedFieldProps; - // @public export type InputOnChangeData = { value: string; diff --git a/packages/react-components/react-input/src/InputField.ts b/packages/react-components/react-input/src/InputField.ts deleted file mode 100644 index a6548ce9f2f9dd..00000000000000 --- a/packages/react-components/react-input/src/InputField.ts +++ /dev/null @@ -1 +0,0 @@ -export * from './components/InputField/index'; diff --git a/packages/react-components/react-input/src/components/InputField/InputField.tsx b/packages/react-components/react-input/src/components/InputField/InputField.tsx deleted file mode 100644 index a8e0bd264cfc1f..00000000000000 --- a/packages/react-components/react-input/src/components/InputField/InputField.tsx +++ /dev/null @@ -1,11 +0,0 @@ -/* eslint-disable deprecation/deprecation */ -import { DeprecatedFieldProps, getDeprecatedFieldClassNames, makeDeprecatedField } from '@fluentui/react-field'; -import type { ForwardRefComponent } from '@fluentui/react-utilities'; -import { Input, inputClassNames, InputProps } from '../../Input'; - -/** @deprecated Use Field with Input: `` */ -export type InputFieldProps = DeprecatedFieldProps; -/** @deprecated Use Field with Input: `` */ -export const inputFieldClassNames = getDeprecatedFieldClassNames(inputClassNames.root); -/** @deprecated Use Field with Input: `` */ -export const InputField: ForwardRefComponent = makeDeprecatedField(Input); diff --git a/packages/react-components/react-input/src/components/InputField/index.ts b/packages/react-components/react-input/src/components/InputField/index.ts deleted file mode 100644 index 9cd7022484cce5..00000000000000 --- a/packages/react-components/react-input/src/components/InputField/index.ts +++ /dev/null @@ -1 +0,0 @@ -export * from './InputField'; diff --git a/packages/react-components/react-input/src/index.ts b/packages/react-components/react-input/src/index.ts index ece2e8670d05b1..3deb992114c004 100644 --- a/packages/react-components/react-input/src/index.ts +++ b/packages/react-components/react-input/src/index.ts @@ -1,7 +1,2 @@ export { Input, inputClassNames, renderInput_unstable, useInputStyles_unstable, useInput_unstable } from './Input'; export type { InputOnChangeData, InputProps, InputSlots, InputState } from './Input'; - -// eslint-disable-next-line deprecation/deprecation -export { InputField as InputField_unstable, inputFieldClassNames } from './InputField'; -// eslint-disable-next-line deprecation/deprecation -export type { InputFieldProps as InputFieldProps_unstable } from './InputField'; diff --git a/packages/react-components/react-progress/etc/react-progress.api.md b/packages/react-components/react-progress/etc/react-progress.api.md index a34eb3f8de0718..b70b3062d078a2 100644 --- a/packages/react-components/react-progress/etc/react-progress.api.md +++ b/packages/react-components/react-progress/etc/react-progress.api.md @@ -8,7 +8,6 @@ import type { ComponentProps } from '@fluentui/react-utilities'; import type { ComponentState } from '@fluentui/react-utilities'; -import { DeprecatedFieldProps } from '@fluentui/react-field'; import type { ForwardRefComponent } from '@fluentui/react-utilities'; import * as React_2 from 'react'; import type { Slot } from '@fluentui/react-utilities'; @@ -38,22 +37,6 @@ export type ProgressBarSlots = { // @public export type ProgressBarState = ComponentState & Required> & Pick; -// @public @deprecated (undocumented) -export const ProgressField_unstable: ForwardRefComponent; - -// @public @deprecated (undocumented) -export const progressFieldClassNames: { - control: string; - root: string; - label: string; - validationMessage: string; - validationMessageIcon: string; - hint: string; -}; - -// @public @deprecated (undocumented) -export type ProgressFieldProps_unstable = DeprecatedFieldProps; - // @public export const renderProgressBar_unstable: (state: ProgressBarState) => JSX.Element; diff --git a/packages/react-components/react-progress/src/ProgressField.ts b/packages/react-components/react-progress/src/ProgressField.ts deleted file mode 100644 index bd6f2fb2cc211d..00000000000000 --- a/packages/react-components/react-progress/src/ProgressField.ts +++ /dev/null @@ -1 +0,0 @@ -export * from './components/ProgressField/index'; diff --git a/packages/react-components/react-progress/src/components/ProgressField/ProgressField.tsx b/packages/react-components/react-progress/src/components/ProgressField/ProgressField.tsx deleted file mode 100644 index 19380085df65ce..00000000000000 --- a/packages/react-components/react-progress/src/components/ProgressField/ProgressField.tsx +++ /dev/null @@ -1,17 +0,0 @@ -/* eslint-disable deprecation/deprecation */ -import { DeprecatedFieldProps, getDeprecatedFieldClassNames, makeDeprecatedField } from '@fluentui/react-field'; -import type { ForwardRefComponent } from '@fluentui/react-utilities'; -import { ProgressBar, progressBarClassNames, ProgressBarProps } from '../../ProgressBar'; - -/** @deprecated Use Field with ProgressBar: `` */ -export type ProgressFieldProps = DeprecatedFieldProps; -/** @deprecated Use Field with ProgressBar: `` */ -export const progressFieldClassNames = getDeprecatedFieldClassNames(progressBarClassNames.root); -/** @deprecated Use Field with ProgressBar: `` */ -export const ProgressField: ForwardRefComponent = makeDeprecatedField(ProgressBar, { - displayName: 'ProgressField', - mapProps: (props: ProgressFieldProps) => ({ - ...props, - control: { ...props.control, validationState: props.validationState }, - }), -}); diff --git a/packages/react-components/react-progress/src/components/ProgressField/index.ts b/packages/react-components/react-progress/src/components/ProgressField/index.ts deleted file mode 100644 index 5f620e10054749..00000000000000 --- a/packages/react-components/react-progress/src/components/ProgressField/index.ts +++ /dev/null @@ -1 +0,0 @@ -export * from './ProgressField'; diff --git a/packages/react-components/react-progress/src/index.ts b/packages/react-components/react-progress/src/index.ts index 6e23b87bec5581..1ad894790c32f0 100644 --- a/packages/react-components/react-progress/src/index.ts +++ b/packages/react-components/react-progress/src/index.ts @@ -6,8 +6,3 @@ export { useProgressBarStyles_unstable, } from './ProgressBar'; export type { ProgressBarProps, ProgressBarSlots, ProgressBarState } from './ProgressBar'; - -// eslint-disable-next-line deprecation/deprecation -export { ProgressField as ProgressField_unstable, progressFieldClassNames } from './ProgressField'; -// eslint-disable-next-line deprecation/deprecation -export type { ProgressFieldProps as ProgressFieldProps_unstable } from './ProgressField'; diff --git a/packages/react-components/react-radio/etc/react-radio.api.md b/packages/react-components/react-radio/etc/react-radio.api.md index 6719f1afd35036..8b0c354f45d0b9 100644 --- a/packages/react-components/react-radio/etc/react-radio.api.md +++ b/packages/react-components/react-radio/etc/react-radio.api.md @@ -9,7 +9,6 @@ import type { ComponentProps } from '@fluentui/react-utilities'; import type { ComponentState } from '@fluentui/react-utilities'; import { ContextSelector } from '@fluentui/react-context-selector'; -import { DeprecatedFieldProps } from '@fluentui/react-field'; import { FC } from 'react'; import type { ForwardRefComponent } from '@fluentui/react-utilities'; import { Label } from '@fluentui/react-label'; @@ -39,22 +38,6 @@ export type RadioGroupContextValues = { radioGroup: RadioGroupContextValue; }; -// @public @deprecated (undocumented) -export const RadioGroupField_unstable: ForwardRefComponent; - -// @public @deprecated (undocumented) -export const radioGroupFieldClassNames: { - control: string; - root: string; - label: string; - validationMessage: string; - validationMessageIcon: string; - hint: string; -}; - -// @public @deprecated (undocumented) -export type RadioGroupFieldProps_unstable = DeprecatedFieldProps; - // @public export type RadioGroupOnChangeData = { value: string; diff --git a/packages/react-components/react-radio/src/RadioGroupField.ts b/packages/react-components/react-radio/src/RadioGroupField.ts deleted file mode 100644 index 0be3f52f494388..00000000000000 --- a/packages/react-components/react-radio/src/RadioGroupField.ts +++ /dev/null @@ -1 +0,0 @@ -export * from './components/RadioGroupField/index'; diff --git a/packages/react-components/react-radio/src/components/RadioGroupField/RadioGroupField.tsx b/packages/react-components/react-radio/src/components/RadioGroupField/RadioGroupField.tsx deleted file mode 100644 index ee4b316d2df53a..00000000000000 --- a/packages/react-components/react-radio/src/components/RadioGroupField/RadioGroupField.tsx +++ /dev/null @@ -1,11 +0,0 @@ -/* eslint-disable deprecation/deprecation */ -import { DeprecatedFieldProps, getDeprecatedFieldClassNames, makeDeprecatedField } from '@fluentui/react-field'; -import type { ForwardRefComponent } from '@fluentui/react-utilities'; -import { RadioGroup, radioGroupClassNames, RadioGroupProps } from '../../RadioGroup'; - -/** @deprecated Use Field with RadioGroup: `` */ -export type RadioGroupFieldProps = DeprecatedFieldProps; -/** @deprecated Use Field with RadioGroup: `` */ -export const radioGroupFieldClassNames = getDeprecatedFieldClassNames(radioGroupClassNames.root); -/** @deprecated Use Field with RadioGroup: `` */ -export const RadioGroupField: ForwardRefComponent = makeDeprecatedField(RadioGroup); diff --git a/packages/react-components/react-radio/src/components/RadioGroupField/index.ts b/packages/react-components/react-radio/src/components/RadioGroupField/index.ts deleted file mode 100644 index cb66f6ac27f53e..00000000000000 --- a/packages/react-components/react-radio/src/components/RadioGroupField/index.ts +++ /dev/null @@ -1 +0,0 @@ -export * from './RadioGroupField'; diff --git a/packages/react-components/react-radio/src/index.ts b/packages/react-components/react-radio/src/index.ts index 16ed3837beab74..980ca2af6b7616 100644 --- a/packages/react-components/react-radio/src/index.ts +++ b/packages/react-components/react-radio/src/index.ts @@ -16,8 +16,3 @@ export type { export { Radio, radioClassNames, renderRadio_unstable, useRadioStyles_unstable, useRadio_unstable } from './Radio'; export type { RadioProps, RadioSlots, RadioState, RadioOnChangeData } from './Radio'; export { RadioGroupProvider, useRadioGroupContextValues, useRadioGroupContext_unstable } from './contexts/index'; - -// eslint-disable-next-line deprecation/deprecation -export { RadioGroupField as RadioGroupField_unstable, radioGroupFieldClassNames } from './RadioGroupField'; -// eslint-disable-next-line deprecation/deprecation -export type { RadioGroupFieldProps as RadioGroupFieldProps_unstable } from './RadioGroupField'; diff --git a/packages/react-components/react-select/etc/react-select.api.md b/packages/react-components/react-select/etc/react-select.api.md index 23a769ee6c989d..d6acc6e9f5e5f5 100644 --- a/packages/react-components/react-select/etc/react-select.api.md +++ b/packages/react-components/react-select/etc/react-select.api.md @@ -8,7 +8,6 @@ import type { ComponentProps } from '@fluentui/react-utilities'; import type { ComponentState } from '@fluentui/react-utilities'; -import { DeprecatedFieldProps } from '@fluentui/react-field'; import type { ForwardRefComponent } from '@fluentui/react-utilities'; import * as React_2 from 'react'; import type { Slot } from '@fluentui/react-utilities'; @@ -23,22 +22,6 @@ export const Select: ForwardRefComponent; // @public (undocumented) export const selectClassNames: SlotClassNames; -// @public @deprecated (undocumented) -export const SelectField_unstable: ForwardRefComponent; - -// @public @deprecated (undocumented) -export const selectFieldClassNames: { - control: string; - root: string; - label: string; - validationMessage: string; - validationMessageIcon: string; - hint: string; -}; - -// @public @deprecated (undocumented) -export type SelectFieldProps_unstable = DeprecatedFieldProps; - // @public export type SelectOnChangeData = { value: string; diff --git a/packages/react-components/react-select/src/SelectField.ts b/packages/react-components/react-select/src/SelectField.ts deleted file mode 100644 index 935b8affe46761..00000000000000 --- a/packages/react-components/react-select/src/SelectField.ts +++ /dev/null @@ -1 +0,0 @@ -export * from './components/SelectField/index'; diff --git a/packages/react-components/react-select/src/components/SelectField/SelectField.tsx b/packages/react-components/react-select/src/components/SelectField/SelectField.tsx deleted file mode 100644 index 86acce7ae33d07..00000000000000 --- a/packages/react-components/react-select/src/components/SelectField/SelectField.tsx +++ /dev/null @@ -1,11 +0,0 @@ -/* eslint-disable deprecation/deprecation */ -import { DeprecatedFieldProps, getDeprecatedFieldClassNames, makeDeprecatedField } from '@fluentui/react-field'; -import type { ForwardRefComponent } from '@fluentui/react-utilities'; -import { Select, selectClassNames, SelectProps } from '../../Select'; - -/** @deprecated Use Field with Select: `` */ -export const selectFieldClassNames = getDeprecatedFieldClassNames(selectClassNames.root); -/** @deprecated Use Field with Select: `