expose base hook and types

Author: dmytrokirpa

packages/react-components/react-spinner/library/etc/react-spinner.api.md

@@ -14,11 +14,17 @@ import type { Slot } from '@fluentui/react-utilities';
 import type { SlotClassNames } from '@fluentui/react-utilities';
 
 // @public
-export const renderSpinner_unstable: (state: SpinnerState) => JSXElement;
+export const renderSpinner_unstable: (state: SpinnerBaseState) => JSXElement;
 
 // @public
 export const Spinner: ForwardRefComponent<SpinnerProps>;
 
+// @public
+export type SpinnerBaseProps = Omit<SpinnerProps, 'appearance' | 'size'>;
+
+// @public
+export type SpinnerBaseState = Omit<SpinnerState, 'appearance' | 'size'>;
+
 // @public (undocumented)
 export const spinnerClassNames: SlotClassNames<SpinnerSlots>;
 
@@ -52,6 +58,9 @@ export type SpinnerState = ComponentState<SpinnerSlots> & Required<Pick<SpinnerP
 // @public
 export const useSpinner_unstable: (props: SpinnerProps, ref: React_2.Ref<HTMLElement>) => SpinnerState;
 
+// @public
+export const useSpinnerBase_unstable: (props: SpinnerBaseProps, ref: React_2.Ref<HTMLElement>) => SpinnerBaseState;
+
 // @internal (undocumented)
 export const useSpinnerContext: () => SpinnerContextValue;
 

packages/react-components/react-spinner/library/src/components/Spinner/Spinner.types.ts

@@ -1,4 +1,4 @@
-import type { ComponentProps, ComponentState, DistributiveOmit, Slot } from '@fluentui/react-utilities';
+import type { ComponentProps, ComponentState, Slot } from '@fluentui/react-utilities';
 import { Label } from '@fluentui/react-label';
 
 export type SpinnerSlots = {
@@ -56,7 +56,7 @@ export type SpinnerProps = Omit<ComponentProps<SpinnerSlots>, 'size'> & {
 /**
  * Spinner base props, excluding design-related props like appearance and size.
  */
-export type SpinnerBaseProps = DistributiveOmit<SpinnerProps, 'appearance' | 'size'>;
+export type SpinnerBaseProps = Omit<SpinnerProps, 'appearance' | 'size'>;
 
 /**
  * State used in rendering Spinner
@@ -72,4 +72,4 @@ export type SpinnerState = ComponentState<SpinnerSlots> &
 /**
  * Spinner base state, excluding design-related state like appearance and size.
  */
-export type SpinnerBaseState = DistributiveOmit<SpinnerState, 'appearance' | 'size'>;
+export type SpinnerBaseState = Omit<SpinnerState, 'appearance' | 'size'>;

packages/react-components/react-spinner/library/src/components/Spinner/renderSpinner.tsx

@@ -3,12 +3,12 @@
 
 import { assertSlots } from '@fluentui/react-utilities';
 import type { JSXElement } from '@fluentui/react-utilities';
-import type { SpinnerState, SpinnerSlots } from './Spinner.types';
+import type { SpinnerBaseState, SpinnerSlots } from './Spinner.types';
 
 /**
  * Render the final JSX of Spinner
  */
-export const renderSpinner_unstable = (state: SpinnerState): JSXElement => {
+export const renderSpinner_unstable = (state: SpinnerBaseState): JSXElement => {
   assertSlots<SpinnerSlots>(state);
   const { labelPosition, shouldRenderSpinner } = state;
   return (

packages/react-components/react-spinner/library/src/components/Spinner/useSpinner.tsx

@@ -35,7 +35,7 @@ export const useSpinner_unstable = (props: SpinnerProps, ref: React.Ref<HTMLElem
  * @param props - User provided props to the Spinner component.
  * @param ref - User provided ref to be passed to the Spinner component.
  */
-export const useSpinnerBase_unstable = (props: SpinnerBaseProps, ref?: React.Ref<HTMLElement>): SpinnerBaseState => {
+export const useSpinnerBase_unstable = (props: SpinnerBaseProps, ref: React.Ref<HTMLElement>): SpinnerBaseState => {
   const { delay = 0, labelPosition = 'after' } = props;
   const baseId = useId('spinner');
 

packages/react-components/react-spinner/library/src/index.ts

@@ -4,11 +4,8 @@ export {
   renderSpinner_unstable,
   useSpinner_unstable,
   useSpinnerStyles_unstable,
+  useSpinnerBase_unstable,
 } from './Spinner';
-export type { SpinnerProps, SpinnerSlots, SpinnerState } from './Spinner';
+export type { SpinnerProps, SpinnerSlots, SpinnerState, SpinnerBaseProps, SpinnerBaseState } from './Spinner';
 export { SpinnerContextProvider, useSpinnerContext } from './contexts/index';
 export type { SpinnerContextValue } from './contexts/index';
-
-// Experimental APIs - will be uncommented in the experimental release branch
-// export { useSpinnerBase_unstable } from './Spinner';
-// export type { SpinnerBaseProps, SpinnerBaseState } from './Spinner';