Rename componentsProps to slotProps and components to slots

Author: hbjORbj

packages/mui-joy/src/utils/useSlot.ts

@@ -35,8 +35,8 @@ export default function useSlot<
   ExternalSlotProps extends { component?: React.ElementType },
   ExternalForwardedProps extends {
     component?: React.ElementType;
-    components?: { [k in T]?: React.ElementType };
-    componentsProps?: {
+    slots?: { [k in T]?: React.ElementType };
+    slotProps?: {
       [k in T]?:
         | WithCommonProps<ExternalSlotProps>
         | ((ownerState: OwnerState) => WithCommonProps<ExternalSlotProps>);
@@ -66,7 +66,7 @@ export default function useSlot<
      */
     ownerState: OwnerState;
     /**
-     * The `other` props from the consumer. It has to contain `component`, `components`, and `componentsProps`.
+     * The `other` props from the consumer. It has to contain `component`, `slots`, and `slotProps`.
      * The function will use those props to calculate the final leaf component and the returned props.
      *
      * If the slot is not `root`, the rest of the `externalForwardedProps` are neglected.
@@ -80,13 +80,13 @@ export default function useSlot<
      * For overriding the component's ownerState for the slot.
      * This is required for some components that need styling via `ownerState`.
      *
-     * It is a function because `componentsProps.{slot}` can be a function which has to be resolved first.
+     * It is a function because `slotProps.{slot}` can be a function which has to be resolved first.
      */
     getSlotOwnerState?: (
       mergedProps: SlotProps &
         ExternalSlotProps &
         ExtractComponentProps<
-          Exclude<Exclude<ExternalForwardedProps['componentsProps'], undefined>[T], undefined>
+          Exclude<Exclude<ExternalForwardedProps['slotProps'], undefined>[T], undefined>
         >,
     ) => SlotOwnerState;
     /**
@@ -107,14 +107,14 @@ export default function useSlot<
   } = parameters;
   const {
     component: rootComponent,
-    components = { [name]: undefined },
-    componentsProps = { [name]: undefined },
+    slots = { [name]: undefined },
+    slotProps = { [name]: undefined },
     ...other
   } = externalForwardedProps;
 
-  // `componentsProps[name]` can be a callback that receives the component's `ownerState`.
+  // `slotProps[name]` can be a callback that receives the component's ownerState.
   // `resolvedComponentsProps` is always a plain object.
-  const resolvedComponentsProps = resolveComponentProps(componentsProps[name], ownerState);
+  const resolvedComponentsProps = resolveComponentProps(slotProps[name], ownerState);
 
   const {
     props: { component: slotComponent, ...mergedProps },
@@ -143,8 +143,8 @@ export default function useSlot<
   const props = appendOwnerState(
     elementType,
     {
-      ...(name === 'root' && !rootComponent && !components[name] && internalForwardedProps),
-      ...(name !== 'root' && !components[name] && internalForwardedProps),
+      ...(name === 'root' && !rootComponent && !slots[name] && internalForwardedProps),
+      ...(name !== 'root' && !slots[name] && internalForwardedProps),
       ...(mergedProps as { className: string } & SlotProps &
         ExternalSlotProps &
         AdditionalProps &
@@ -157,5 +157,5 @@ export default function useSlot<
     finalOwnerState as OwnerState & SlotOwnerState,
   );
 
-  return [components[name] || elementType, props] as [ElementType, typeof props];
+  return [slots[name] || elementType, props] as [ElementType, typeof props];
 }