[internal] Fix naming to match convention

Author: oliviertassinari

packages/react/src/autocomplete/root/AutocompleteRoot.tsx

@@ -29,7 +29,7 @@ export function AutocompleteRoot<Value>(props: AutocompleteRoot.Props<Value>): R
     autoHighlight = false,
     itemToStringValue,
     items,
-    ...rest
+    ...other
   } = props;
 
   const enableInline = mode === 'inline' || mode === 'both';
@@ -71,21 +71,21 @@ export function AutocompleteRoot<Value>(props: AutocompleteRoot.Props<Value>): R
   const collator = useCoreFilter(DEFAULT_FILTER_OPTIONS);
 
   const baseFilter = React.useMemo(() => {
-    if (rest.filter) {
-      return rest.filter;
+    if (other.filter) {
+      return other.filter;
     }
 
     return (item: any, query: string, toString?: (item: any) => string) => {
       return collator.contains(stringifyItem(item, toString), query);
     };
-  }, [rest, collator]);
+  }, [other, collator]);
 
   const query = String(isControlled ? value : internalValue).trim();
 
   // In "both", wrap filtering to use only the typed value, ignoring overlay.
-  let effectiveFilter: typeof rest.filter;
+  let effectiveFilter: typeof other.filter;
   if (mode !== 'both') {
-    effectiveFilter = staticItems ? null : rest.filter;
+    effectiveFilter = staticItems ? null : other.filter;
   } else {
     effectiveFilter = (item: any, _query: string, toString?: (item: any) => string) => {
       return baseFilter(item, query, toString);
@@ -113,7 +113,7 @@ export function AutocompleteRoot<Value>(props: AutocompleteRoot.Props<Value>): R
 
   return (
     <ComboboxRootInternal
-      {...rest}
+      {...other}
       items={items as any} // Block `Group` type inference
       itemToStringLabel={itemToStringValue}
       openOnInputClick={openOnInputClick}

packages/react/src/combobox/root/ComboboxRoot.tsx

@@ -14,11 +14,11 @@ export function ComboboxRoot<
   SelectedValue = ItemValue,
   Multiple extends boolean | undefined = false,
 >(props: ComboboxRoot.Props<ItemValue, SelectedValue, Multiple>): React.JSX.Element {
-  const { multiple = false as Multiple, defaultValue, value, onValueChange, ...rest } = props;
+  const { multiple = false as Multiple, defaultValue, value, onValueChange, ...other } = props;
 
   return (
     <ComboboxRootInternal
-      {...(rest as any)}
+      {...(other as any)}
       selectionMode={multiple ? 'multiple' : 'single'}
       selectedValue={value}
       defaultSelectedValue={defaultValue}

packages/react/src/utils/FocusGuard.tsx

@@ -23,13 +23,19 @@ export const FocusGuard = React.forwardRef(function FocusGuard(
   }, []);
 
   const restProps = {
-    ref,
     tabIndex: 0,
     // Role is only for VoiceOver
     role,
-    'aria-hidden': role ? undefined : true,
-    style: visuallyHidden,
   };
 
-  return <span {...props} {...restProps} data-base-ui-focus-guard="" />;
+  return (
+    <span
+      {...props}
+      ref={ref}
+      style={visuallyHidden}
+      aria-hidden={role ? undefined : true}
+      {...restProps}
+      data-base-ui-focus-guard=""
+    />
+  );
 });