[internal] Remove unused options (#4036)

Author: atomiks

packages/react/src/floating-ui-react/components/FloatingDelayGroup.tsx

@@ -89,11 +89,6 @@ export function FloatingDelayGroup(props: FloatingDelayGroupProps): React.JSX.El
 }
 
 interface UseDelayGroupOptions {
-  /**
-   * Whether delay grouping should be enabled.
-   * @default true
-   */
-  enabled?: boolean | undefined;
   /**
    * Whether the trigger this hook is used in has opened the tooltip.
    */
@@ -127,7 +122,7 @@ export function useDelayGroup(
 ): UseDelayGroupReturn {
   const store = 'rootStore' in context ? context.rootStore : context;
   const floatingId = store.useState('floatingId');
-  const { enabled = true, open } = options;
+  const { open } = options;
 
   const groupContext = React.useContext(FloatingDelayGroupContext);
   const {
@@ -151,9 +146,6 @@ export function useDelayGroup(
       delayRef.current = initialDelayRef.current;
     }
 
-    if (!enabled) {
-      return undefined;
-    }
     if (!currentIdRef.current) {
       return undefined;
     }
@@ -182,7 +174,6 @@ export function useDelayGroup(
     }
     return undefined;
   }, [
-    enabled,
     open,
     floatingId,
     currentIdRef,
@@ -195,9 +186,6 @@ export function useDelayGroup(
   ]);
 
   useIsoLayoutEffect(() => {
-    if (!enabled) {
-      return;
-    }
     if (!open) {
       return;
     }
@@ -224,7 +212,6 @@ export function useDelayGroup(
       prevContext?.setIsInstantPhase(false);
     }
   }, [
-    enabled,
     open,
     floatingId,
     store,

packages/react/src/floating-ui-react/components/FloatingFocusManager.test.tsx

@@ -761,19 +761,6 @@ describe.skipIf(!isJSDOM)('FloatingFocusManager', () => {
       expect(screen.getByTestId('last')).toHaveFocus();
     });
 
-    test('false — shift tabbing does not trap focus when reference is in order', async () => {
-      render(<App modal={false} order={['reference', 'content']} />);
-
-      fireEvent.click(screen.getByTestId('reference'));
-      await flushMicrotasks();
-
-      await userEvent.tab();
-      await userEvent.tab({ shift: true });
-      await userEvent.tab({ shift: true });
-
-      expect(screen.getByRole('dialog')).toBeInTheDocument();
-    });
-
     test('false - comboboxes do not hide all other nodes', async () => {
       function App() {
         const [open, setOpen] = React.useState(false);
@@ -1751,48 +1738,6 @@ describe.skipIf(!isJSDOM)('FloatingFocusManager', () => {
     expect(screen.getByText('outside')).toHaveAttribute('aria-hidden', 'true');
   });
 
-  describe('getInsideElements', () => {
-    test('returns a list of elements that should be considered part of the floating element', async () => {
-      function App() {
-        const [isOpen, setIsOpen] = React.useState(false);
-
-        const { refs, context } = useFloating({
-          open: isOpen,
-          onOpenChange: setIsOpen,
-        });
-
-        const click = useClick(context);
-
-        const { getReferenceProps, getFloatingProps } = useInteractions([click]);
-
-        return (
-          <>
-            <button ref={refs.setReference} {...getReferenceProps()} data-testid="reference" />
-            <div data-testid="inside" />
-            {isOpen && (
-              <FloatingFocusManager
-                context={context}
-                getInsideElements={() => {
-                  const inside = document.querySelector<HTMLElement>('[data-testid="inside"]');
-                  return inside ? [inside] : [];
-                }}
-              >
-                <div ref={refs.setFloating} data-testid="floating" {...getFloatingProps()} />
-              </FloatingFocusManager>
-            )}
-          </>
-        );
-      }
-
-      render(<App />);
-
-      await userEvent.click(screen.getByTestId('reference'));
-      await flushMicrotasks();
-
-      expect(screen.getByTestId('inside')).not.toHaveAttribute('data-base-ui-inert');
-    });
-  });
-
   test('floating element with no focusable elements and no listbox role gets tabIndex=0 when initialFocus is -1', async () => {
     function App() {
       const [isOpen, setIsOpen] = React.useState(false);

packages/react/src/floating-ui-react/components/FloatingFocusManager.tsx

@@ -167,11 +167,6 @@ export interface FloatingFocusManagerProps {
    * @default false
    */
   disabled?: boolean | undefined;
-  /**
-   * The order in which focus cycles.
-   * @default ['content']
-   */
-  order?: Array<'reference' | 'floating' | 'content'> | undefined;
   /**
    * Determines the element to focus when the floating element is opened.
    *
@@ -234,11 +229,6 @@ export interface FloatingFocusManagerProps {
    * @default true
    */
   closeOnFocusOut?: boolean | undefined;
-  /**
-   * Returns a list of elements that should be considered part of the
-   * floating element.
-   */
-  getInsideElements?: (() => Element[]) | undefined;
   /**
    * Overrides the element to focus when tabbing forward out of the floating element.
    */
@@ -268,14 +258,12 @@ export function FloatingFocusManager(props: FloatingFocusManagerProps): React.JS
     context,
     children,
     disabled = false,
-    order = ['content'],
     initialFocus = true,
     returnFocus = true,
     restoreFocus = false,
     modal = true,
     closeOnFocusOut = true,
     openInteractionType = '',
-    getInsideElements: getInsideElementsProp = () => [],
     nextFocusableElement,
     previousFocusableElement,
     beforeContentFocusGuardRef,
@@ -290,7 +278,6 @@ export function FloatingFocusManager(props: FloatingFocusManagerProps): React.JS
   const { events, dataRef } = store.context;
 
   const getNodeId = useStableCallback(() => dataRef.current.floatingContext?.nodeId);
-  const getInsideElements = useStableCallback(getInsideElementsProp);
 
   const ignoreInitialFocus = initialFocus === false;
   // If the reference is a combobox and is typeable (e.g. input/textarea),
@@ -300,7 +287,7 @@ export function FloatingFocusManager(props: FloatingFocusManagerProps): React.JS
   // start.
   const isUntrappedTypeableCombobox = isTypeableCombobox(domReference) && ignoreInitialFocus;
 
-  const orderRef = useValueAsRef(order);
+  const orderRef = React.useRef<Array<'reference' | 'floating' | 'content'>>(['content']);
   const initialFocusRef = useValueAsRef(initialFocus);
   const returnFocusRef = useValueAsRef(returnFocus);
   const openInteractionTypeRef = useValueAsRef(openInteractionType);
@@ -658,7 +645,6 @@ export function FloatingFocusManager(props: FloatingFocusManagerProps): React.JS
       floating,
       rootAncestorComboboxDomReference,
       ...portalNodes,
-      ...getInsideElements(),
       startDismissButtonRef.current,
       endDismissButtonRef.current,
       beforeGuardRef.current,
@@ -682,7 +668,6 @@ export function FloatingFocusManager(props: FloatingFocusManagerProps): React.JS
     isUntrappedTypeableCombobox,
     tree,
     getNodeId,
-    getInsideElements,
     nextFocusableElement,
     previousFocusableElement,
   ]);

packages/react/src/floating-ui-react/components/FloatingPortal.tsx

@@ -51,7 +51,6 @@ export interface UseFloatingPortalNodeProps {
     | undefined;
   componentProps?: useRenderElement.ComponentProps<any> | undefined;
   elementProps?: React.HTMLAttributes<HTMLDivElement> | undefined;
-  elementState?: Record<string, unknown> | undefined;
 }
 
 export interface UseFloatingPortalNodeResult {
@@ -62,13 +61,7 @@ export interface UseFloatingPortalNodeResult {
 export function useFloatingPortalNode(
   props: UseFloatingPortalNodeProps = {},
 ): UseFloatingPortalNodeResult {
-  const {
-    ref,
-    container: containerProp,
-    componentProps = EMPTY_OBJECT,
-    elementProps,
-    elementState,
-  } = props;
+  const { ref, container: containerProp, componentProps = EMPTY_OBJECT, elementProps } = props;
 
   const uniqueId = useId();
   const portalContext = usePortalContext();
@@ -128,7 +121,6 @@ export function useFloatingPortalNode(
 
   const portalElement = useRenderElement('div', componentProps, {
     ref: [ref, setPortalNodeRef],
-    state: elementState,
     props: [
       {
         id: uniqueId,

packages/react/src/floating-ui-react/hooks/useClientPoint.test.tsx

@@ -14,12 +14,10 @@ function expectLocation({ x, y }: Coords) {
 
 function App({
   enabled = true,
-  point,
   axis,
   useTriggerProps = false,
 }: {
   enabled?: boolean;
-  point?: Coords;
   axis?: 'both' | 'x' | 'y';
   useTriggerProps?: boolean;
 }) {
@@ -30,7 +28,6 @@ function App({
   });
   const clientPoint = useClientPoint(context, {
     enabled,
-    ...point,
     axis,
   });
   const { getReferenceProps, getTriggerProps, getFloatingProps } = useInteractions([clientPoint]);
@@ -62,22 +59,6 @@ function App({
   );
 }
 
-test('renders at explicit client point and can be updated', async () => {
-  const { rerender } = render(<App point={{ x: 0, y: 0 }} />);
-
-  fireEvent.click(screen.getByRole('button'));
-
-  await flushMicrotasks();
-
-  expectLocation({ x: 0, y: 0 });
-
-  rerender(<App point={{ x: 1000, y: 1000 }} />);
-
-  await flushMicrotasks();
-
-  expectLocation({ x: 1000, y: 1000 });
-});
-
 test('updates position from trigger props', async () => {
   render(<App useTriggerProps />);
 
@@ -198,22 +179,6 @@ test('renders at mouse event coords', async () => {
   expectLocation({ x: 0, y: 0 });
 });
 
-test('ignores mouse events when explicit coords are specified', async () => {
-  render(<App point={{ x: 0, y: 0 }} />);
-
-  fireEvent(
-    screen.getByTestId('reference'),
-    new MouseEvent('mousemove', {
-      bubbles: true,
-      clientX: 500,
-      clientY: 500,
-    }),
-  );
-  await flushMicrotasks();
-
-  expectLocation({ x: 0, y: 0 });
-});
-
 test('cleans up window listener when closing or disabling', async () => {
   const { rerender } = render(<App />);
 

packages/react/src/floating-ui-react/hooks/useClientPoint.ts

@@ -2,7 +2,6 @@
 import * as React from 'react';
 import { getWindow } from '@floating-ui/utils/dom';
 import { useStableCallback } from '@base-ui/utils/useStableCallback';
-import { useIsoLayoutEffect } from '@base-ui/utils/useIsoLayoutEffect';
 import { contains, getTarget, isMouseLikePointerType } from '../utils';
 
 import type { ContextData, ElementProps, FloatingContext, FloatingRootContext } from '../types';
@@ -99,16 +98,6 @@ export interface UseClientPointProps {
    * @default 'both'
    */
   axis?: ('x' | 'y' | 'both') | undefined;
-  /**
-   * An explicitly defined `x` client coordinate.
-   * @default null
-   */
-  x?: (number | null) | undefined;
-  /**
-   * An explicitly defined `y` client coordinate.
-   * @default null
-   */
-  y?: (number | null) | undefined;
 }
 
 /**
@@ -127,7 +116,7 @@ export function useClientPoint(
   const domReference = store.useState('domReferenceElement');
   const dataRef = store.context.dataRef;
 
-  const { enabled = true, axis = 'both', x = null, y = null } = props;
+  const { enabled = true, axis = 'both' } = props;
 
   const initialRef = React.useRef(false);
   const cleanupListenerRef = React.useRef<null | (() => void)>(null);
@@ -162,10 +151,6 @@ export function useClientPoint(
   );
 
   const handleReferenceEnterOrMove = useStableCallback((event: React.MouseEvent<Element>) => {
-    if (x != null || y != null) {
-      return;
-    }
-
     if (!open) {
       setReference(event.clientX, event.clientY, event.currentTarget as Element);
     } else if (!cleanupListenerRef.current) {
@@ -183,8 +168,7 @@ export function useClientPoint(
   const openCheck = isMouseLikePointerType(pointerType) ? floating : open;
 
   const addListener = React.useCallback(() => {
-    // Explicitly specified `x`/`y` coordinates shouldn't add a listener.
-    if (!openCheck || !enabled || x != null || y != null) {
+    if (!openCheck || !enabled) {
       return undefined;
     }
 
@@ -213,7 +197,7 @@ export function useClientPoint(
 
     store.set('positionReference', domReference);
     return undefined;
-  }, [openCheck, enabled, x, y, floating, dataRef, domReference, store, setReference]);
+  }, [openCheck, enabled, floating, dataRef, domReference, store, setReference]);
 
   React.useEffect(() => {
     return addListener();
@@ -231,13 +215,6 @@ export function useClientPoint(
     }
   }, [enabled, open]);
 
-  useIsoLayoutEffect(() => {
-    if (enabled && (x != null || y != null)) {
-      initialRef.current = false;
-      setReference(x, y);
-    }
-  }, [enabled, x, y, setReference]);
-
   const reference: ElementProps['reference'] = React.useMemo(() => {
     function setPointerTypeRef(event: React.PointerEvent) {
       setPointerType(event.pointerType);

packages/react/src/floating-ui-react/hooks/useDismiss.test.tsx

@@ -526,7 +526,7 @@ describe.skipIf(!isJSDOM)('useDismiss', () => {
 
           const popoverInteractions = useInteractions([useDismiss(popover.context)]);
           const tooltipInteractions = useInteractions([
-            useFocus(tooltip.context, { visibleOnly: false }),
+            useFocus(tooltip.context),
             useDismiss(tooltip.context),
           ]);