@fluentui/react-field 9.0.0-alpha.2 → 9.0.0-alpha.21

package/dist/index.d.ts

@@ -1,83 +1,46 @@
 /// <reference types="react" />
 
-import { Checkbox } from '@fluentui/react-checkbox';
-import type { CheckboxProps } from '@fluentui/react-checkbox';
-import { Combobox } from '@fluentui/react-combobox';
 import type { ComponentProps } from '@fluentui/react-utilities';
 import type { ComponentState } from '@fluentui/react-utilities';
 import { ForwardRefComponent } from '@fluentui/react-utilities';
-import { Input } from '@fluentui/react-input';
 import { Label } from '@fluentui/react-label';
-import { RadioGroup } from '@fluentui/react-radio';
 import * as React_2 from 'react';
-import { Select } from '@fluentui/react-select';
-import { Slider } from '@fluentui/react-slider';
 import type { Slot } from '@fluentui/react-utilities';
-import { SlotClassNames } from '@fluentui/react-utilities';
-import type { SlotRenderFunction } from '@fluentui/react-utilities';
-import type { SlotShorthandValue } from '@fluentui/react-utilities';
-import { SpinButton } from '@fluentui/react-spinbutton';
-import { Switch } from '@fluentui/react-switch';
-import { Textarea } from '@fluentui/react-textarea';
+import type { SlotClassNames } from '@fluentui/react-utilities';
 
-export declare const CheckboxField: ForwardRefComponent<CheckboxFieldProps>;
-
-export declare const checkboxFieldClassNames: SlotClassNames<FieldSlots<FieldComponent>>;
-
-export declare type CheckboxFieldProps = Omit<FieldProps<typeof Checkbox>, 'label'> & {
-    /**
-     * The Checkbox's label.
-     */
-    label?: CheckboxProps['label'];
-    /**
-     * The label for the CheckboxField, which appears above or before the Checkbox, depending on the `orientation` prop.
-     * It is recommended to only set the `label` prop, and not `fieldLabel`.
-     */
-    fieldLabel?: FieldProps<typeof Checkbox>['label'];
-};
-
-export declare const ComboboxField: ForwardRefComponent<ComboboxFieldProps>;
-
-export declare const comboboxFieldClassNames: SlotClassNames<FieldSlots<FieldComponent>>;
+/**
+ * @deprecated Only for use to make deprecated [Control]Field shim components.
+ * @internal
+ */
+export declare type DeprecatedFieldProps<ControlProps> = ControlProps & {
+    root?: FieldProps;
+    control?: ControlProps;
+} & Pick<FieldProps, 'className' | 'hint' | 'label' | 'orientation' | 'style' | 'validationMessage' | 'validationMessageIcon' | 'validationState'>;
 
-export declare type ComboboxFieldProps = FieldProps<typeof Combobox>;
+export declare const Field: ForwardRefComponent<FieldProps>;
 
 /**
- * The minimum requirement for a component used by Field.
- *
- * Note: the use of VoidFunctionComponent means that component is not *required* to have a children prop,
- * but it is still allowed to have a children prop.
+ * The props added to the Field's child element.
  */
-declare type FieldComponent = React_2.VoidFunctionComponent<Pick<React_2.HTMLAttributes<HTMLElement>, 'id' | 'className' | 'style' | 'aria-labelledby' | 'aria-describedby' | 'aria-invalid' | 'aria-errormessage'>>;
+declare type FieldChildProps = Pick<React_2.HTMLAttributes<HTMLElement>, 'id' | 'aria-labelledby' | 'aria-describedby' | 'aria-invalid' | 'aria-required'>;
+
+export declare const fieldClassNames: SlotClassNames<FieldSlots>;
 
 /**
- * Configuration parameters for a Field class, passed to useField_unstable
+ * Field Props
  */
-export declare type FieldConfig<T extends FieldComponent> = {
-    /**
-     * The underlying input component that this field is wrapping.
-     */
-    component: T;
+export declare type FieldProps = Omit<ComponentProps<FieldSlots>, 'children'> & {
     /**
-     * Class names for this component, created by `getFieldClassNames`.
-     */
-    classNames: SlotClassNames<FieldSlots<T>>;
-    /**
-     * How the label be connected to the control.
-     * * htmlFor - Set the Label's htmlFor prop to the component's ID (and generate an ID if not provided).
-     *   This is the preferred method for components that use the underlying <input> tag.
-     * * aria-labelledby - Set the component's aria-labelledby prop to the Label's ID. Use this for components
-     *   that are not directly <input> elements (such as RadioGroup).
+     * The Field's child can be a single form control, or a render function that takes the props that should be spread on
+     * a form control.
      *
-     * @default htmlFor
+     * All form controls in this library can be used directly as children (such as `<Input>` or `<RadioGroup>`), as well
+     * as intrinsic form controls like `<input>` or `<textarea>`. Custom controls can also be used as long as they
+     * accept FieldChildProps and spread them on the appropriate element.
+     *
+     * For more complex scenarios, a render function can be used to pass the FieldChildProps to the appropriate control.
      */
-    labelConnection?: 'htmlFor' | 'aria-labelledby';
-};
-
-/**
- * Field Props
- */
-export declare type FieldProps<T extends FieldComponent> = ComponentProps<Partial<FieldSlots<T>>, 'control'> & {
+    children?: React_2.ReactElement<FieldChildProps> | null | ((props: FieldChildProps) => React_2.ReactNode);
     /**
      * The orientation of the label relative to the field component.
      * This only affects the label, and not the validationMessage or hint (which always appear below the field component).
@@ -86,125 +49,92 @@ export declare type FieldProps<T extends FieldComponent> = ComponentProps<Partia
      */
     orientation?: 'vertical' | 'horizontal';
     /**
-     * The `validationState` affects the color of the `validationMessage`, the `validationMessageIcon`, and for some
-     * field components, an `validationState="error"` causes the border to become red.
+     * The `validationState` affects the display of the `validationMessage` and `validationMessageIcon`.
      *
-     * @default undefined
+     * * error: (default) The validation message has a red error icon and red text, with `role="alert"` so it is
+     *     announced by screen readers. Additionally, the control inside the field has `aria-invalid` set, which adds a
+     *     red border to some field components (such as `Input`).
+     * * success: The validation message has a green checkmark icon and gray text.
+     * * warning: The validation message has a yellow exclamation icon and gray text.
+     * * none: The validation message has no icon and gray text.
+     *
+     * @default error when validationMessage is set; none otherwise.
      */
-    validationState?: 'error' | 'warning' | 'success';
-};
-
-/**
- * FieldProps plus extra optional props that are supported by useField_unstable, but not required to be part of the
- * API of every Field component.
- *
- * This allows Field to forward the required and size props to the label if the underlying component supports them,
- * but doesn't add them to the public API of fields that don't support them.
- */
-declare type FieldPropsWithOptionalComponentProps<T extends FieldComponent> = FieldProps<T> & {
+    validationState?: 'error' | 'warning' | 'success' | 'none';
     /**
-     * Whether the field label should be marked as required.
+     * Marks the Field as required. If `true`, an asterisk will be appended to the label, and `aria-required` will be set
+     * on the Field's child.
      */
     required?: boolean;
     /**
-     * Size of the field label.
+     * The size of the Field's label.
      *
-     * Number sizes will be ignored, but are allowed because the HTML `<input>` element has a prop `size?: number`.
+     * @default medium
      */
-    size?: 'small' | 'medium' | 'large' | number;
+    size?: 'small' | 'medium' | 'large';
 };
 
 /**
- * Slots added by Field
+ * Slots of the Field component
  */
-export declare type FieldSlots<T extends FieldComponent> = {
+export declare type FieldSlots = {
     root: NonNullable<Slot<'div'>>;
-    /**
-     * The underlying component wrapped by this field.
-     */
-    control: SlotComponent<T>;
     /**
      * The label associated with the field.
      */
     label?: Slot<typeof Label>;
     /**
-     * A message about the validation state. The appearance of the `validationMessage` depends on `validationState`.
+     * A message about the validation state. By default, this is an error message, but it can be a success, warning,
+     * or custom message by setting `validationState`.
      */
-    validationMessage?: Slot<'span'>;
+    validationMessage?: Slot<'div'>;
     /**
-     * The icon associated with the `validationMessage`. If the `validationState` prop is set, this will default to an
-     * icon corresponding to that state.
+     * The icon associated with the `validationMessage`. This will only be displayed if `validationMessage` is set.
      *
-     * This will only be displayed if `validationMessage` is set.
+     * The default depends on `validationState`:
+     * * error: `<ErrorCircle12Filled />`
+     * * warning: `<Warning12Filled />`
+     * * success: `<CheckmarkCircle12Filled />`
+     * * none: `null`
      */
     validationMessageIcon?: Slot<'span'>;
     /**
      * Additional hint text below the field.
      */
-    hint?: Slot<'span'>;
+    hint?: Slot<'div'>;
 };
 
 /**
  * State used in rendering Field
  */
-export declare type FieldState<T extends FieldComponent> = ComponentState<Required<FieldSlots<T>>> & Pick<FieldProps<T>, 'orientation' | 'validationState'> & {
-    classNames: SlotClassNames<FieldSlots<T>>;
-};
-
-export declare const getFieldClassNames: (name: string) => SlotClassNames<FieldSlots<FieldComponent>>;
-
-export declare const InputField: ForwardRefComponent<InputFieldProps>;
+export declare type FieldState = ComponentState<Required<FieldSlots>> & Required<Pick<FieldProps, 'orientation' | 'validationState'>>;
 
-export declare const inputFieldClassNames: SlotClassNames<FieldSlots<FieldComponent>>;
-
-export declare type InputFieldProps = FieldProps<typeof Input>;
-
-export declare const RadioGroupField: ForwardRefComponent<RadioGroupFieldProps>;
-
-export declare const radioGroupFieldClassNames: SlotClassNames<FieldSlots<FieldComponent>>;
+/**
+ * @deprecated Only for use to make deprecated [Control]Field shim components.
+ * @internal
+ */
+export declare const getDeprecatedFieldClassNames: (controlRootClassName: string) => {
+    control: string;
+    root: string;
+    label: string;
+    validationMessage: string;
+    validationMessageIcon: string;
+    hint: string;
+};
 
-export declare type RadioGroupFieldProps = FieldProps<typeof RadioGroup>;
+/**
+ * @deprecated Only for use to make deprecated [Control]Field shim components.
+ * @internal
+ */
+export declare function makeDeprecatedField<ControlProps>(Control: React_2.ComponentType<ControlProps>, options?: {
+    mapProps?: (props: DeprecatedFieldProps<ControlProps>) => DeprecatedFieldProps<ControlProps>;
+    displayName?: string;
+}): ForwardRefComponent<DeprecatedFieldProps<ControlProps>>;
 
 /**
  * Render the final JSX of Field
  */
-export declare const renderField_unstable: <T extends FieldComponent>(state: FieldState<T>) => JSX.Element;
-
-export declare const SelectField: ForwardRefComponent<SelectFieldProps>;
-
-export declare const selectFieldClassNames: SlotClassNames<FieldSlots<FieldComponent>>;
-
-export declare type SelectFieldProps = FieldProps<typeof Select>;
-
-export declare const SliderField: ForwardRefComponent<SliderFieldProps>;
-
-export declare const sliderFieldClassNames: SlotClassNames<FieldSlots<FieldComponent>>;
-
-export declare type SliderFieldProps = FieldProps<typeof Slider>;
-
-declare type SlotComponent<Type extends React_2.ComponentType | React_2.VoidFunctionComponent> = WithSlotShorthandValue<Type extends React_2.ComponentType<infer Props> ? WithSlotRenderFunction<Props extends {
-    children?: unknown;
-} ? Props : Props & {
-    children?: never;
-}> : never>;
-
-export declare const SpinButtonField: ForwardRefComponent<SpinButtonFieldProps>;
-
-export declare const spinButtonFieldClassNames: SlotClassNames<FieldSlots<FieldComponent>>;
-
-export declare type SpinButtonFieldProps = FieldProps<typeof SpinButton>;
-
-export declare const SwitchField: ForwardRefComponent<SwitchFieldProps>;
-
-export declare const switchFieldClassNames: SlotClassNames<FieldSlots<FieldComponent>>;
-
-export declare type SwitchFieldProps = FieldProps<typeof Switch>;
-
-export declare const TextareaField: ForwardRefComponent<TextareaFieldProps>;
-
-export declare const textareaFieldClassNames: SlotClassNames<FieldSlots<FieldComponent>>;
-
-export declare type TextareaFieldProps = FieldProps<typeof Textarea>;
+export declare const renderField_unstable: (state: FieldState) => JSX.Element;
 
 /**
  * Create the state required to render Field.
@@ -213,24 +143,13 @@ export declare type TextareaFieldProps = FieldProps<typeof Textarea>;
  * before being passed to renderField_unstable.
  *
  * @param props - Props passed to this field
- * @param ref - Ref to the control slot (primary slot)
- * @param params - Configuration parameters for this Field
+ * @param ref - Ref to the root
  */
-export declare const useField_unstable: <T extends FieldComponent>(props: FieldPropsWithOptionalComponentProps<T>, ref: React_2.Ref<HTMLElement>, params: FieldConfig<T>) => FieldState<T>;
+export declare const useField_unstable: (props: FieldProps, ref: React_2.Ref<HTMLDivElement>) => FieldState;
 
 /**
  * Apply styling to the Field slots based on the state
  */
-export declare const useFieldStyles_unstable: <T extends FieldComponent>(state: FieldState<T>) => void;
-
-declare type WithSlotRenderFunction<Props extends {
-    children?: unknown;
-}> = Props & {
-    children?: Props['children'] | SlotRenderFunction<Props>;
-};
-
-declare type WithSlotShorthandValue<Props extends {
-    children?: unknown;
-}> = Props | Extract<SlotShorthandValue, Props['children']>;
+export declare const useFieldStyles_unstable: (state: FieldState) => void;
 
 export { }

package/lib/Field.js.map

@@ -1 +1 @@
-{"version":3,"file":"Field.js","sourceRoot":"../src/","sources":["Field.ts"],"names":[],"mappings":"AAAA,cAAc,0BAA0B,CAAC","sourcesContent":["export * from './components/Field/index';\n"]}
+{"version":3,"file":"Field.js","sourceRoot":"../src/","sources":["packages/react-components/react-field/src/Field.ts"],"names":[],"mappings":"AAAA,cAAc,0BAA0B,CAAC","sourcesContent":["export * from './components/Field/index';\n"]}

package/lib/components/Field/Field.js

@@ -0,0 +1,11 @@
+import * as React from 'react';
+import { renderField_unstable } from './renderField';
+import { useField_unstable } from './useField';
+import { useFieldStyles_unstable } from './useFieldStyles';
+export const Field = /*#__PURE__*/React.forwardRef((props, ref) => {
+  const state = useField_unstable(props, ref);
+  useFieldStyles_unstable(state);
+  return renderField_unstable(state);
+});
+Field.displayName = 'Field';
+//# sourceMappingURL=Field.js.map

package/lib/components/Field/Field.js.map

@@ -0,0 +1 @@
+{"version":3,"mappings":"AAAA,OAAO,KAAKA,KAAK,MAAM,OAAO;AAG9B,SAASC,oBAAoB,QAAQ,eAAe;AACpD,SAASC,iBAAiB,QAAQ,YAAY;AAC9C,SAASC,uBAAuB,QAAQ,kBAAkB;AAE1D,OAAO,MAAMC,KAAK,gBAAoCJ,KAAK,CAACK,UAAU,CAAC,CAACC,KAAK,EAAEC,GAAG,KAAI;EACpF,MAAMC,KAAK,GAAGN,iBAAiB,CAACI,KAAK,EAAEC,GAAG,CAAC;EAC3CJ,uBAAuB,CAACK,KAAK,CAAC;EAC9B,OAAOP,oBAAoB,CAACO,KAAK,CAAC;AACpC,CAAC,CAAC;AAEFJ,KAAK,CAACK,WAAW,GAAG,OAAO","names":["React","renderField_unstable","useField_unstable","useFieldStyles_unstable","Field","forwardRef","props","ref","state","displayName"],"sourceRoot":"../src/","sources":["packages/react-components/react-field/src/components/Field/Field.tsx"],"sourcesContent":["import * as React from 'react';\nimport type { ForwardRefComponent } from '@fluentui/react-utilities';\nimport type { FieldProps } from './Field.types';\nimport { renderField_unstable } from './renderField';\nimport { useField_unstable } from './useField';\nimport { useFieldStyles_unstable } from './useFieldStyles';\n\nexport const Field: ForwardRefComponent<FieldProps> = React.forwardRef((props, ref) => {\n  const state = useField_unstable(props, ref);\n  useFieldStyles_unstable(state);\n  return renderField_unstable(state);\n});\n\nField.displayName = 'Field';\n"]}

package/lib/components/Field/Field.types.js.map

@@ -1 +1 @@
-{"version":3,"file":"Field.types.js","sourceRoot":"../src/","sources":["components/Field/Field.types.ts"],"names":[],"mappings":"","sourcesContent":["import * as React from 'react';\nimport { Label } from '@fluentui/react-label';\nimport type { ComponentProps, ComponentState, Slot, SlotClassNames } from '@fluentui/react-utilities';\nimport type { SlotComponent } from './SlotComponent.types';\n\n/**\n * The minimum requirement for a component used by Field.\n *\n * Note: the use of VoidFunctionComponent means that component is not *required* to have a children prop,\n * but it is still allowed to have a children prop.\n */\nexport type FieldComponent = React.VoidFunctionComponent<\n  Pick<\n    React.HTMLAttributes<HTMLElement>,\n    'id' | 'className' | 'style' | 'aria-labelledby' | 'aria-describedby' | 'aria-invalid' | 'aria-errormessage'\n  >\n>;\n\n/**\n * Slots added by Field\n */\nexport type FieldSlots<T extends FieldComponent> = {\n  root: NonNullable<Slot<'div'>>;\n\n  /**\n   * The underlying component wrapped by this field.\n   */\n  control: SlotComponent<T>;\n\n  /**\n   * The label associated with the field.\n   */\n  label?: Slot<typeof Label>;\n\n  /**\n   * A message about the validation state. The appearance of the `validationMessage` depends on `validationState`.\n   */\n  validationMessage?: Slot<'span'>;\n\n  /**\n   * The icon associated with the `validationMessage`. If the `validationState` prop is set, this will default to an\n   * icon corresponding to that state.\n   *\n   * This will only be displayed if `validationMessage` is set.\n   */\n  validationMessageIcon?: Slot<'span'>;\n\n  /**\n   * Additional hint text below the field.\n   */\n  hint?: Slot<'span'>;\n};\n\n/**\n * Field Props\n */\nexport type FieldProps<T extends FieldComponent> = ComponentProps<Partial<FieldSlots<T>>, 'control'> & {\n  /**\n   * The orientation of the label relative to the field component.\n   * This only affects the label, and not the validationMessage or hint (which always appear below the field component).\n   *\n   * @default vertical\n   */\n  orientation?: 'vertical' | 'horizontal';\n\n  /**\n   * The `validationState` affects the color of the `validationMessage`, the `validationMessageIcon`, and for some\n   * field components, an `validationState=\"error\"` causes the border to become red.\n   *\n   * @default undefined\n   */\n  validationState?: 'error' | 'warning' | 'success';\n};\n\n/**\n * FieldProps plus extra optional props that are supported by useField_unstable, but not required to be part of the\n * API of every Field component.\n *\n * This allows Field to forward the required and size props to the label if the underlying component supports them,\n * but doesn't add them to the public API of fields that don't support them.\n */\nexport type FieldPropsWithOptionalComponentProps<T extends FieldComponent> = FieldProps<T> & {\n  /**\n   * Whether the field label should be marked as required.\n   */\n  required?: boolean;\n\n  /**\n   * Size of the field label.\n   *\n   * Number sizes will be ignored, but are allowed because the HTML `<input>` element has a prop `size?: number`.\n   */\n  size?: 'small' | 'medium' | 'large' | number;\n};\n\n/**\n * Configuration parameters for a Field class, passed to useField_unstable\n */\nexport type FieldConfig<T extends FieldComponent> = {\n  /**\n   * The underlying input component that this field is wrapping.\n   */\n  component: T;\n\n  /**\n   * Class names for this component, created by `getFieldClassNames`.\n   */\n  classNames: SlotClassNames<FieldSlots<T>>;\n\n  /**\n   * How the label be connected to the control.\n   * * htmlFor - Set the Label's htmlFor prop to the component's ID (and generate an ID if not provided).\n   *   This is the preferred method for components that use the underlying <input> tag.\n   * * aria-labelledby - Set the component's aria-labelledby prop to the Label's ID. Use this for components\n   *   that are not directly <input> elements (such as RadioGroup).\n   *\n   * @default htmlFor\n   */\n  labelConnection?: 'htmlFor' | 'aria-labelledby';\n};\n\n/**\n * State used in rendering Field\n */\nexport type FieldState<T extends FieldComponent> = ComponentState<Required<FieldSlots<T>>> &\n  Pick<FieldProps<T>, 'orientation' | 'validationState'> & {\n    classNames: SlotClassNames<FieldSlots<T>>;\n  };\n"]}
+{"version":3,"file":"Field.types.js","sourceRoot":"../src/","sources":["packages/react-components/react-field/src/components/Field/Field.types.ts"],"names":[],"mappings":"","sourcesContent":["import * as React from 'react';\nimport { Label } from '@fluentui/react-label';\nimport type { ComponentProps, ComponentState, Slot } from '@fluentui/react-utilities';\n\n/**\n * The props added to the Field's child element.\n */\nexport type FieldChildProps = Pick<\n  React.HTMLAttributes<HTMLElement>,\n  'id' | 'aria-labelledby' | 'aria-describedby' | 'aria-invalid' | 'aria-required'\n>;\n\n/**\n * Slots of the Field component\n */\nexport type FieldSlots = {\n  root: NonNullable<Slot<'div'>>;\n\n  /**\n   * The label associated with the field.\n   */\n  label?: Slot<typeof Label>;\n\n  /**\n   * A message about the validation state. By default, this is an error message, but it can be a success, warning,\n   * or custom message by setting `validationState`.\n   */\n  validationMessage?: Slot<'div'>;\n\n  /**\n   * The icon associated with the `validationMessage`. This will only be displayed if `validationMessage` is set.\n   *\n   * The default depends on `validationState`:\n   * * error: `<ErrorCircle12Filled />`\n   * * warning: `<Warning12Filled />`\n   * * success: `<CheckmarkCircle12Filled />`\n   * * none: `null`\n   */\n  validationMessageIcon?: Slot<'span'>;\n\n  /**\n   * Additional hint text below the field.\n   */\n  hint?: Slot<'div'>;\n};\n\n/**\n * Field Props\n */\nexport type FieldProps = Omit<ComponentProps<FieldSlots>, 'children'> & {\n  /**\n   * The Field's child can be a single form control, or a render function that takes the props that should be spread on\n   * a form control.\n   *\n   * All form controls in this library can be used directly as children (such as `<Input>` or `<RadioGroup>`), as well\n   * as intrinsic form controls like `<input>` or `<textarea>`. Custom controls can also be used as long as they\n   * accept FieldChildProps and spread them on the appropriate element.\n   *\n   * For more complex scenarios, a render function can be used to pass the FieldChildProps to the appropriate control.\n   */\n  children?: React.ReactElement<FieldChildProps> | null | ((props: FieldChildProps) => React.ReactNode);\n\n  /**\n   * The orientation of the label relative to the field component.\n   * This only affects the label, and not the validationMessage or hint (which always appear below the field component).\n   *\n   * @default vertical\n   */\n  orientation?: 'vertical' | 'horizontal';\n\n  /**\n   * The `validationState` affects the display of the `validationMessage` and `validationMessageIcon`.\n   *\n   * * error: (default) The validation message has a red error icon and red text, with `role=\"alert\"` so it is\n   *     announced by screen readers. Additionally, the control inside the field has `aria-invalid` set, which adds a\n   *     red border to some field components (such as `Input`).\n   * * success: The validation message has a green checkmark icon and gray text.\n   * * warning: The validation message has a yellow exclamation icon and gray text.\n   * * none: The validation message has no icon and gray text.\n   *\n   * @default error when validationMessage is set; none otherwise.\n   */\n  validationState?: 'error' | 'warning' | 'success' | 'none';\n\n  /**\n   * Marks the Field as required. If `true`, an asterisk will be appended to the label, and `aria-required` will be set\n   * on the Field's child.\n   */\n  required?: boolean;\n\n  /**\n   * The size of the Field's label.\n   *\n   * @default medium\n   */\n  size?: 'small' | 'medium' | 'large';\n};\n\n/**\n * State used in rendering Field\n */\nexport type FieldState = ComponentState<Required<FieldSlots>> &\n  Required<Pick<FieldProps, 'orientation' | 'validationState'>>;\n"]}

package/lib/components/Field/index.js

@@ -1,4 +1,5 @@
 export * from './Field.types';
+export * from './Field';
 export * from './renderField';
 export * from './useField';
 export * from './useFieldStyles';

package/lib/components/Field/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"../src/","sources":["components/Field/index.ts"],"names":[],"mappings":"AAAA,cAAc,eAAe,CAAC;AAC9B,cAAc,eAAe,CAAC;AAC9B,cAAc,YAAY,CAAC;AAC3B,cAAc,kBAAkB,CAAC","sourcesContent":["export * from './Field.types';\nexport * from './renderField';\nexport * from './useField';\nexport * from './useFieldStyles';\n"]}
+{"version":3,"file":"index.js","sourceRoot":"../src/","sources":["packages/react-components/react-field/src/components/Field/index.ts"],"names":[],"mappings":"AAAA,cAAc,eAAe,CAAC;AAC9B,cAAc,SAAS,CAAC;AACxB,cAAc,eAAe,CAAC;AAC9B,cAAc,YAAY,CAAC;AAC3B,cAAc,kBAAkB,CAAC","sourcesContent":["export * from './Field.types';\nexport * from './Field';\nexport * from './renderField';\nexport * from './useField';\nexport * from './useFieldStyles';\n"]}

package/lib/components/Field/renderField.js

@@ -3,18 +3,21 @@ import { getSlots } from '@fluentui/react-utilities';
 /**
  * Render the final JSX of Field
  */
-
 export const renderField_unstable = state => {
   const {
     slots,
     slotProps
   } = getSlots(state);
-  return /*#__PURE__*/React.createElement(slots.root, { ...slotProps.root
-  }, slots.label && /*#__PURE__*/React.createElement(slots.label, { ...slotProps.label
-  }), slots.control && /*#__PURE__*/React.createElement(slots.control, { ...slotProps.control
-  }), slots.validationMessage && /*#__PURE__*/React.createElement(slots.validationMessage, { ...slotProps.validationMessage
-  }, slots.validationMessageIcon && /*#__PURE__*/React.createElement(slots.validationMessageIcon, { ...slotProps.validationMessageIcon
-  }), slotProps.validationMessage.children), slots.hint && /*#__PURE__*/React.createElement(slots.hint, { ...slotProps.hint
+  return /*#__PURE__*/React.createElement(slots.root, {
+    ...slotProps.root
+  }, slots.label && /*#__PURE__*/React.createElement(slots.label, {
+    ...slotProps.label
+  }), slotProps.root.children, slots.validationMessage && /*#__PURE__*/React.createElement(slots.validationMessage, {
+    ...slotProps.validationMessage
+  }, slots.validationMessageIcon && /*#__PURE__*/React.createElement(slots.validationMessageIcon, {
+    ...slotProps.validationMessageIcon
+  }), slotProps.validationMessage.children), slots.hint && /*#__PURE__*/React.createElement(slots.hint, {
+    ...slotProps.hint
   }));
 };
 //# sourceMappingURL=renderField.js.map

package/lib/components/Field/renderField.js.map

@@ -1 +1 @@
-{"version":3,"sources":["components/Field/renderField.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAZ,MAAuB,OAAvB;AACA,SAAS,QAAT,QAAyB,2BAAzB;AAGA;;AAEG;;AACH,OAAO,MAAM,oBAAoB,GAA8B,KAA3B,IAAmD;EACrF,MAAM;IAAE,KAAF;IAAS;EAAT,IAAuB,QAAQ,CAA6B,KAA7B,CAArC;EAEA,oBACE,KAAA,CAAA,aAAA,CAAC,KAAK,CAAC,IAAP,EAAW,EAAA,GAAK,SAAS,CAAC;EAAf,CAAX,EACG,KAAK,CAAC,KAAN,iBAAe,KAAA,CAAA,aAAA,CAAC,KAAK,CAAC,KAAP,EAAY,EAAA,GAAK,SAAS,CAAC;EAAf,CAAZ,CADlB,EAGG,KAAK,CAAC,OAAN,iBAAiB,KAAA,CAAA,aAAA,CAAC,KAAK,CAAC,OAAP,EAAc,EAAA,GAAM,SAAS,CAAC;EAAhB,CAAd,CAHpB,EAIG,KAAK,CAAC,iBAAN,iBACC,KAAA,CAAA,aAAA,CAAC,KAAK,CAAC,iBAAP,EAAwB,EAAA,GAAK,SAAS,CAAC;EAAf,CAAxB,EACG,KAAK,CAAC,qBAAN,iBAA+B,KAAA,CAAA,aAAA,CAAC,KAAK,CAAC,qBAAP,EAA4B,EAAA,GAAK,SAAS,CAAC;EAAf,CAA5B,CADlC,EAEG,SAAS,CAAC,iBAAV,CAA4B,QAF/B,CALJ,EAUG,KAAK,CAAC,IAAN,iBAAc,KAAA,CAAA,aAAA,CAAC,KAAK,CAAC,IAAP,EAAW,EAAA,GAAK,SAAS,CAAC;EAAf,CAAX,CAVjB,CADF;AAcD,CAjBM","sourcesContent":["import * as React from 'react';\nimport { getSlots } from '@fluentui/react-utilities';\nimport type { FieldComponent, FieldSlots, FieldState } from './Field.types';\n\n/**\n * Render the final JSX of Field\n */\nexport const renderField_unstable = <T extends FieldComponent>(state: FieldState<T>) => {\n  const { slots, slotProps } = getSlots<FieldSlots<FieldComponent>>(state as FieldState<FieldComponent>);\n\n  return (\n    <slots.root {...slotProps.root}>\n      {slots.label && <slots.label {...slotProps.label} />}\n      {/* eslint-disable-next-line @typescript-eslint/no-explicit-any */}\n      {slots.control && <slots.control {...(slotProps.control as any)} />}\n      {slots.validationMessage && (\n        <slots.validationMessage {...slotProps.validationMessage}>\n          {slots.validationMessageIcon && <slots.validationMessageIcon {...slotProps.validationMessageIcon} />}\n          {slotProps.validationMessage.children}\n        </slots.validationMessage>\n      )}\n      {slots.hint && <slots.hint {...slotProps.hint} />}\n    </slots.root>\n  );\n};\n"],"sourceRoot":"../src/"}
+{"version":3,"mappings":"AAAA,OAAO,KAAKA,KAAK,MAAM,OAAO;AAC9B,SAASC,QAAQ,QAAQ,2BAA2B;AAGpD;;;AAGA,OAAO,MAAMC,oBAAoB,GAAIC,KAAiB,IAAI;EACxD,MAAM;IAAEC,KAAK;IAAEC;EAAS,CAAE,GAAGJ,QAAQ,CAAaE,KAAK,CAAC;EAExD,oBACEH,oBAACI,KAAK,CAACE,IAAI;IAAA,GAAKD,SAAS,CAACC;EAAI,GAC3BF,KAAK,CAACG,KAAK,iBAAIP,oBAACI,KAAK,CAACG,KAAK;IAAA,GAAKF,SAAS,CAACE;EAAK,EAAI,EACnDF,SAAS,CAACC,IAAI,CAACE,QAAQ,EACvBJ,KAAK,CAACK,iBAAiB,iBACtBT,oBAACI,KAAK,CAACK,iBAAiB;IAAA,GAAKJ,SAAS,CAACI;EAAiB,GACrDL,KAAK,CAACM,qBAAqB,iBAAIV,oBAACI,KAAK,CAACM,qBAAqB;IAAA,GAAKL,SAAS,CAACK;EAAqB,EAAI,EACnGL,SAAS,CAACI,iBAAiB,CAACD,QAAQ,CAExC,EACAJ,KAAK,CAACO,IAAI,iBAAIX,oBAACI,KAAK,CAACO,IAAI;IAAA,GAAKN,SAAS,CAACM;EAAI,EAAI,CACtC;AAEjB,CAAC","names":["React","getSlots","renderField_unstable","state","slots","slotProps","root","label","children","validationMessage","validationMessageIcon","hint"],"sourceRoot":"../src/","sources":["packages/react-components/react-field/src/components/Field/renderField.tsx"],"sourcesContent":["import * as React from 'react';\nimport { getSlots } from '@fluentui/react-utilities';\nimport type { FieldSlots, FieldState } from './Field.types';\n\n/**\n * Render the final JSX of Field\n */\nexport const renderField_unstable = (state: FieldState) => {\n  const { slots, slotProps } = getSlots<FieldSlots>(state);\n\n  return (\n    <slots.root {...slotProps.root}>\n      {slots.label && <slots.label {...slotProps.label} />}\n      {slotProps.root.children}\n      {slots.validationMessage && (\n        <slots.validationMessage {...slotProps.validationMessage}>\n          {slots.validationMessageIcon && <slots.validationMessageIcon {...slotProps.validationMessageIcon} />}\n          {slotProps.validationMessage.children}\n        </slots.validationMessage>\n      )}\n      {slots.hint && <slots.hint {...slotProps.hint} />}\n    </slots.root>\n  );\n};\n"]}

package/lib/components/Field/useField.js

@@ -5,46 +5,8 @@ import { getNativeElementProps, resolveShorthand, useId } from '@fluentui/react-
 const validationMessageIcons = {
   error: /*#__PURE__*/React.createElement(ErrorCircle12Filled, null),
   warning: /*#__PURE__*/React.createElement(Warning12Filled, null),
-  success: /*#__PURE__*/React.createElement(CheckmarkCircle12Filled, null)
-};
-/**
- * Merge two possibly-undefined IDs for aria-describedby. If both IDs are defined, combines
- * them into a string separated by a space. Otherwise, returns just the defined ID (if any).
- */
-
-const mergeAriaDescribedBy = (a, b) => a && b ? `${a} ${b}` : a || b;
-/**
- * Partition the props used by the Field itself, from the props that are passed to the underlying field component.
- */
-
-
-export const getPartitionedFieldProps = props => {
-  const {
-    className,
-    control,
-    hint,
-    label,
-    orientation,
-    root,
-    style,
-    validationMessage,
-    validationMessageIcon,
-    validationState,
-    ...restOfProps
-  } = props;
-  const fieldProps = {
-    className,
-    control,
-    hint,
-    label,
-    orientation,
-    root,
-    style,
-    validationMessage,
-    validationMessageIcon,
-    validationState
-  };
-  return [fieldProps, restOfProps];
+  success: /*#__PURE__*/React.createElement(CheckmarkCircle12Filled, null),
+  none: undefined
 };
 /**
  * Create the state required to render Field.
@@ -53,87 +15,92 @@ export const getPartitionedFieldProps = props => {
  * before being passed to renderField_unstable.
  *
  * @param props - Props passed to this field
- * @param ref - Ref to the control slot (primary slot)
- * @param params - Configuration parameters for this Field
+ * @param ref - Ref to the root
  */
-
-export const useField_unstable = (props, ref, params) => {
-  const [fieldProps, controlProps] = getPartitionedFieldProps(props);
-  const baseId = useId('field-');
+export const useField_unstable = (props, ref) => {
+  var _a, _b, _c, _d;
   const {
+    children,
     orientation = 'vertical',
-    validationState
-  } = fieldProps;
-  const root = resolveShorthand(fieldProps.root, {
-    required: true,
-    defaultProps: getNativeElementProps('div', fieldProps)
-  });
-  const label = resolveShorthand(fieldProps.label, {
+    required,
+    validationState = props.validationMessage ? 'error' : 'none',
+    size
+  } = props;
+  const baseId = useId('field-');
+  const root = getNativeElementProps('div', {
+    ...props,
+    ref
+  }, /*excludedPropNames:*/['children']);
+  const label = resolveShorthand(props.label, {
     defaultProps: {
       id: baseId + '__label',
-      required: controlProps.required,
-      size: typeof controlProps.size === 'string' ? controlProps.size : undefined // htmlFor is set below
-
+      required,
+      size
+      // htmlFor is handled below
     }
   });
-  const validationMessage = resolveShorthand(fieldProps.validationMessage, {
+
+  const validationMessage = resolveShorthand(props.validationMessage, {
     defaultProps: {
-      id: baseId + '__validationMessage'
+      id: baseId + '__validationMessage',
+      role: validationState === 'error' ? 'alert' : undefined
     }
   });
-  const hint = resolveShorthand(fieldProps.hint, {
+  const hint = resolveShorthand(props.hint, {
     defaultProps: {
       id: baseId + '__hint'
     }
   });
-  const validationMessageIcon = resolveShorthand(fieldProps.validationMessageIcon, {
-    required: !!validationState,
+  const defaultIcon = validationMessageIcons[validationState];
+  const validationMessageIcon = resolveShorthand(props.validationMessageIcon, {
+    required: !!defaultIcon,
     defaultProps: {
-      children: validationState ? validationMessageIcons[validationState] : undefined
+      children: defaultIcon
     }
   });
-  const {
-    labelConnection = 'htmlFor'
-  } = params;
-  const hasError = validationState === 'error';
-  const control = resolveShorthand(fieldProps.control, {
-    required: true,
-    defaultProps: {
-      ref,
-      // Add a default ID only if required for label's htmlFor prop
-      id: label && labelConnection === 'htmlFor' ? baseId + '__control' : undefined,
-      // Add aria-labelledby only if not using the label's htmlFor
-      'aria-labelledby': labelConnection !== 'htmlFor' ? label === null || label === void 0 ? void 0 : label.id : undefined,
-      'aria-describedby': hasError ? hint === null || hint === void 0 ? void 0 : hint.id : mergeAriaDescribedBy(validationMessage === null || validationMessage === void 0 ? void 0 : validationMessage.id, hint === null || hint === void 0 ? void 0 : hint.id),
-      'aria-errormessage': hasError ? validationMessage === null || validationMessage === void 0 ? void 0 : validationMessage.id : undefined,
-      'aria-invalid': hasError ? true : undefined,
-      ...controlProps
+  const controlProps = /*#__PURE__*/React.isValidElement(children) ? {
+    ...children.props
+  } : {};
+  if (label) {
+    (_a = controlProps['aria-labelledby']) !== null && _a !== void 0 ? _a : controlProps['aria-labelledby'] = label.id;
+    if (!label.htmlFor) {
+      // Assign the child a generated ID if doesn't already have an ID
+      (_b = controlProps.id) !== null && _b !== void 0 ? _b : controlProps.id = baseId + '__control';
+      label.htmlFor = controlProps.id;
     }
-  });
-
-  if (labelConnection === 'htmlFor' && label && !label.htmlFor) {
-    label.htmlFor = control.id;
   }
-
-  const state = {
+  if (validationMessage || hint) {
+    // The control is described by the validation message, or hint, or both
+    // We also preserve and append any aria-describedby supplied by the user
+    // For reference: https://github.com/microsoft/fluentui/pull/25580#discussion_r1017259933
+    controlProps['aria-describedby'] = [validationMessage === null || validationMessage === void 0 ? void 0 : validationMessage.id, hint === null || hint === void 0 ? void 0 : hint.id, controlProps['aria-describedby']].filter(Boolean).join(' ');
+  }
+  if (validationState === 'error') {
+    (_c = controlProps['aria-invalid']) !== null && _c !== void 0 ? _c : controlProps['aria-invalid'] = true;
+  }
+  if (required) {
+    (_d = controlProps['aria-required']) !== null && _d !== void 0 ? _d : controlProps['aria-required'] = true;
+  }
+  if ( /*#__PURE__*/React.isValidElement(children)) {
+    root.children = /*#__PURE__*/React.cloneElement(children, controlProps);
+  } else if (typeof children === 'function') {
+    root.children = children(controlProps);
+  }
+  return {
     orientation,
     validationState,
-    classNames: params.classNames,
     components: {
       root: 'div',
-      control: params.component,
       label: Label,
-      validationMessage: 'span',
+      validationMessage: 'div',
       validationMessageIcon: 'span',
-      hint: 'span'
+      hint: 'div'
     },
     root,
-    control,
     label,
     validationMessageIcon,
     validationMessage,
     hint
   };
-  return state;
 };
 //# sourceMappingURL=useField.js.map