fix review comments

Author: snowystinger

packages/@react-spectrum/s2/src/Tooltip.tsx

@@ -27,21 +27,15 @@ import {DOMProps, DOMRef, GlobalDOMAttributes} from '@react-types/shared';
 import {style} from '../style' with {type: 'macro'};
 import {useDOMRef} from '@react-spectrum/utils';
 
-export interface TooltipTriggerProps extends Omit<AriaTooltipTriggerComponentProps, 'children' | 'closeDelay' | keyof GlobalDOMAttributes>, Pick<AriaTooltipProps, 'shouldFlip' | 'containerPadding' | 'offset' | 'crossOffset'> {
+export interface TooltipTriggerProps extends Omit<AriaTooltipTriggerComponentProps, 'children' | 'closeDelay' | keyof GlobalDOMAttributes>, Pick<AriaTooltipProps, 'shouldFlip' | 'containerPadding' | 'crossOffset'> {
   /** The content of the tooltip. */
   children: ReactNode,
   /**
    * The placement of the element with respect to its anchor element.
    *
    * @default 'top'
    */
-  placement?: 'start' | 'end' | 'right' | 'left' | 'top' | 'bottom',
-  /**
-   * The offset of the tooltip from the trigger.
-   *
-   * @default 4
-   */
-  offset?: number
+  placement?: 'start' | 'end' | 'right' | 'left' | 'top' | 'bottom'
 }
 
 export interface TooltipProps extends Omit<AriaTooltipProps, 'children' | 'className' | 'style' | 'triggerRef' | 'UNSTABLE_portalContainer' | 'isEntering' | 'isExiting' | 'placement' | 'containerPadding' |  'offset' | 'crossOffset' |  'shouldFlip' | 'arrowBoundaryOffset' | 'isOpen' | 'defaultOpen' | 'onOpenChange' | keyof GlobalDOMAttributes>, DOMProps, UnsafeStyles {
@@ -145,7 +139,6 @@ export const Tooltip = forwardRef(function Tooltip(props: TooltipProps, ref: DOM
   let {
     containerPadding,
     crossOffset,
-    offset = 4,
     placement = 'top',
     shouldFlip
   } = useContext(InternalTooltipTriggerContext);
@@ -172,7 +165,7 @@ export const Tooltip = forwardRef(function Tooltip(props: TooltipProps, ref: DOM
       arrowBoundaryOffset={borderRadius}
       containerPadding={containerPadding}
       crossOffset={crossOffset}
-      offset={offset}
+      offset={4}
       placement={placement}
       shouldFlip={shouldFlip}
       ref={tooltipRef}
@@ -201,7 +194,6 @@ export function TooltipTrigger(props: TooltipTriggerProps): ReactNode {
   let {
     containerPadding,
     crossOffset,
-    offset,
     placement,
     shouldFlip,
     ...triggerProps
@@ -213,7 +205,6 @@ export function TooltipTrigger(props: TooltipTriggerProps): ReactNode {
         value={{
           containerPadding: containerPadding,
           crossOffset: crossOffset,
-          offset: offset,
           placement: placement,
           shouldFlip: shouldFlip
         }}>

packages/dev/s2-docs/pages/s2/Tooltip.mdx

@@ -11,7 +11,7 @@ export const description = 'Displays a description of an element on hover or foc
 
 <PageDescription>{docs.exports.Tooltip.description}</PageDescription>
 
-```tsx render docs={docs.exports.TooltipTrigger} links={docs.links} props={['placement', 'offset', 'crossOffset', 'shouldFlip']} type="s2"
+```tsx render docs={docs.exports.TooltipTrigger} links={docs.links} props={['placement', 'crossOffset', 'shouldFlip']} type="s2"
 "use client";
 import {Tooltip, TooltipTrigger, ActionButton} from '@react-spectrum/s2';
 import Edit from '@react-spectrum/s2/icons/Edit';

starters/docs/src/SearchField.tsx

@@ -15,18 +15,17 @@ export interface SearchFieldProps extends AriaSearchFieldProps {
   description?: string;
   errorMessage?: string | ((validation: ValidationResult) => string);
   placeholder?: string;
-  autoFocus?: boolean;
 }
 
 export function SearchField(
-  { label, description, errorMessage, placeholder, autoFocus, ...props }: SearchFieldProps
+  { label, description, errorMessage, placeholder, ...props }: SearchFieldProps
 ) {
   return (
     (
       <AriaSearchField {...props}>
         {label && <Label>{label}</Label>}
         <Search size={18} />
-        <Input placeholder={placeholder} className="react-aria-Input inset" autoFocus={autoFocus} />
+        <Input placeholder={placeholder} className="react-aria-Input inset" />
         <Button className="clear-button"><X size={14} /></Button>
         {description && <Description>{description}</Description>}
         <FieldError>{errorMessage}</FieldError>

starters/tailwind/src/SearchField.tsx

@@ -15,18 +15,17 @@ export interface SearchFieldProps extends AriaSearchFieldProps {
   description?: string;
   errorMessage?: string | ((validation: ValidationResult) => string);
   placeholder?: string;
-  autoFocus?: boolean;
 }
 
 export function SearchField(
-  { label, description, errorMessage, placeholder, autoFocus, ...props }: SearchFieldProps
+  { label, description, errorMessage, placeholder, ...props }: SearchFieldProps
 ) {
   return (
     <AriaSearchField {...props} className={composeTailwindRenderProps(props.className, 'group flex flex-col gap-1 min-w-[40px] font-sans')}>
       {label && <Label>{label}</Label>}
       <FieldGroup>
         <SearchIcon aria-hidden className="w-4 h-4 ml-2 text-neutral-500 dark:text-neutral-400 forced-colors:text-[ButtonText] group-disabled:text-neutral-200 dark:group-disabled:text-neutral-600 forced-colors:group-disabled:text-[GrayText]" />
-        <Input placeholder={placeholder} className="pl-2 [&::-webkit-search-cancel-button]:hidden" autoFocus={autoFocus} />
+        <Input placeholder={placeholder} className="pl-2 [&::-webkit-search-cancel-button]:hidden" />
         <FieldButton className="mr-1 w-6 group-empty:invisible">
           <XIcon aria-hidden className="w-4 h-4" />
         </FieldButton>