refactor(useSlots): extract helpers, deduplicate matching logic

Author: hectahertz

packages/react/src/hooks/useSlots.ts

@@ -23,10 +23,11 @@ import type {SlotMarker} from '../utils/types'
  * calls this 101 times per render). Key optimizations:
  *
  *   1. for-loop matching instead of findIndex (no closure allocation per child)
- *   2. Pre-computed isArrayMatcher[] (avoids Array.isArray in hot loop)
- *   3. Short-circuit: once all slots filled, skip matching entirely
+ *   2. Short-circuit: once all slots filled, skip matching entirely
  *      - In production: single integer comparison, straight to rest
  *      - In dev: scans for duplicates to warn, then to rest
+ *   3. Extracted childMatchesSlot() for shared matching logic (deduplicates
+ *      the match check across main loop, short-circuit, and duplicate paths)
  *
  *   Flow per child:
  *
@@ -54,16 +55,15 @@ import type {SlotMarker} from '../utils/types'
  *   2. Component + test fn:  { block: [Description, props => props.variant === 'block'] }
  */
 
-// Slot config: Component reference, or [Component, testFn] tuple
+// --- Types ---
+
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+type Props = any
 type ComponentMatcher = React.ElementType<Props>
 type ComponentAndPropsMatcher = [ComponentMatcher, (props: Props) => boolean]
 
 export type SlotConfig = Record<string, ComponentMatcher | ComponentAndPropsMatcher>
 
-// We don't know what the props are yet, we set them later based on slot config
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-type Props = any
-
 type SlotElements<Config extends SlotConfig> = {
   [Property in keyof Config]: SlotValue<Config, Property>
 }
@@ -78,31 +78,35 @@ type SlotValue<Config, Property extends keyof Config> = Config[Property] extends
     ? React.ReactElement<React.ComponentPropsWithoutRef<ElementType>, ElementType>
     : never
 
+// --- Matching ---
+
+/** Check if a child element matches a slot config entry. */
+function childMatchesSlot(child: React.ReactElement, slotValue: ComponentMatcher | ComponentAndPropsMatcher): boolean {
+  if (Array.isArray(slotValue)) {
+    const [component, testFn] = slotValue
+    return (child.type === component || isSlot(child, component as SlotMarker)) && testFn(child.props)
+  }
+  return child.type === slotValue || isSlot(child, slotValue as SlotMarker)
+}
+
+// --- Hook ---
+
 /** Extract slot components from children. See file header for details. */
 export function useSlots<Config extends SlotConfig>(
   children: React.ReactNode,
   config: Config,
 ): [Partial<SlotElements<Config>>, React.ReactNode[]] {
-  // Array of elements that are not slots
   const rest: React.ReactNode[] = []
-
   const keys = Object.keys(config) as Array<keyof Config>
   const values = Object.values(config)
   const totalSlots = keys.length
 
-  // Object mapping slot names to their elements, initialized with undefined for each key
+  // Initialize all slot keys to undefined so callers can check `slots.x === undefined`
   const slots: Partial<SlotElements<Config>> = {} as Partial<SlotElements<Config>>
   for (let i = 0; i < totalSlots; i++) {
     slots[keys[i]] = undefined
   }
 
-  // Pre-compute which slots use the [Component, testFn] matcher pattern
-  // to avoid Array.isArray() checks in the hot inner loop
-  const isArrayMatcher: boolean[] = new Array(totalSlots)
-  for (let i = 0; i < totalSlots; i++) {
-    isArrayMatcher[i] = Array.isArray(values[i])
-  }
-
   let slotsFound = 0
 
   // eslint-disable-next-line github/array-foreach
@@ -112,65 +116,66 @@ export function useSlots<Config extends SlotConfig>(
       return
     }
 
-    // Fast path: once all slots are filled, skip matching entirely in production.
-    // In dev, check for duplicates to warn.
+    // Short-circuit: all slots filled, no more matching needed
     if (slotsFound === totalSlots) {
-      if (__DEV__) {
-        for (let i = 0; i < totalSlots; i++) {
-          if (isArrayMatcher[i]) {
-            const [component, testFn] = values[i] as ComponentAndPropsMatcher
-            if ((child.type === component || isSlot(child, component as SlotMarker)) && testFn(child.props)) {
-              warning(true, `Found duplicate "${String(keys[i])}" slot. Only the first will be rendered.`)
-              return
-            }
-          } else {
-            if (child.type === values[i] || isSlot(child, values[i] as SlotMarker)) {
-              warning(true, `Found duplicate "${String(keys[i])}" slot. Only the first will be rendered.`)
-              return
-            }
-          }
-        }
+      if (__DEV__ && warnIfDuplicate(child, keys, values, totalSlots)) {
+        return
       }
       rest.push(child)
       return
     }
 
-    let matchedIndex = -1
-    for (let i = 0; i < totalSlots; i++) {
-      if (isArrayMatcher[i]) {
-        const [component, testFn] = values[i] as ComponentAndPropsMatcher
-        if ((child.type === component || isSlot(child, component as SlotMarker)) && testFn(child.props)) {
-          matchedIndex = i
-          break
-        }
-      } else {
-        if (child.type === values[i] || isSlot(child, values[i] as SlotMarker)) {
-          matchedIndex = i
-          break
-        }
-      }
-    }
+    // Try to match child against an unfilled slot
+    const matchedIndex = findMatchingSlot(child, values, totalSlots)
 
-    // If the child is not a slot, add it to the `rest` array
     if (matchedIndex === -1) {
       rest.push(child)
       return
     }
 
     const slotKey = keys[matchedIndex]
 
-    // If slot is already filled, ignore duplicates
+    // Duplicate: slot already filled by an earlier child
     if (slots[slotKey] !== undefined) {
       if (__DEV__) {
         warning(true, `Found duplicate "${String(slotKey)}" slot. Only the first will be rendered.`)
       }
       return
     }
 
-    // If the child is a slot, add it to the `slots` object
     slots[slotKey] = child as SlotValue<Config, keyof Config>
     slotsFound++
   })
 
   return [slots, rest]
 }
+
+// --- Helpers ---
+
+/** Find the index of the first slot config entry that matches this child, or -1. */
+function findMatchingSlot(
+  child: React.ReactElement,
+  values: Array<ComponentMatcher | ComponentAndPropsMatcher>,
+  totalSlots: number,
+): number {
+  for (let i = 0; i < totalSlots; i++) {
+    if (childMatchesSlot(child, values[i])) return i
+  }
+  return -1
+}
+
+/** Warn in dev if a child matches any slot (used after all slots are filled). Returns true if duplicate found. */
+function warnIfDuplicate(
+  child: React.ReactElement,
+  keys: Array<string | number | symbol>,
+  values: Array<ComponentMatcher | ComponentAndPropsMatcher>,
+  totalSlots: number,
+): boolean {
+  for (let i = 0; i < totalSlots; i++) {
+    if (childMatchesSlot(child, values[i])) {
+      warning(true, `Found duplicate "${String(keys[i])}" slot. Only the first will be rendered.`)
+      return true
+    }
+  }
+  return false
+}