23448126896

Committed 23 Mar 2026 03:43PM UTC coverage: 84.786% (+0.2%) from 84.61%

Build # 23448126896

Build Type

Pull #654

github

Committed by

anguyen-yext2

Commit Message

replace Mapbox-owned public types in search-ui-react with library-owned, version-stable interfaces

Pull Request Pull Request #654: chore: upgrade mapbox-gl version for accessibility issues (v3.0.0)

Coverage Stats

1066 of 1474 branches covered (72.32%)

Branch coverage included in aggregate %.

70 of 80 new or added lines in 3 files covered. (87.5%)

6 existing lines in 2 files now uncovered.

2328 of 2529 relevant lines covered (92.05%)

126.61 hits per line

Source File
Press 'n' to go to next uncovered line, 'b' for previous

88.44

/src/components/Dropdown/Dropdown.tsx

import { useTranslation } from 'react-i18next';
import React, {
  createElement,
  isValidElement,
  KeyboardEvent,
  PropsWithChildren,
  ReactNode,
  useEffect,
  useMemo,
  useRef,
  useState
} from 'react';
import { DropdownContext, DropdownContextType } from './DropdownContext';
import { InputContext, InputContextType } from './InputContext';
import useRootClosePkg from '@restart/ui/useRootClose';
import { FocusContext, FocusContextType } from './FocusContext';
import { ScreenReader } from '../ScreenReader';
import { recursivelyMapChildren } from '../utils/recursivelyMapChildren';
import { DropdownItem, DropdownItemProps, DropdownItemWithIndex } from './DropdownItem';
import { useLayoutEffect } from '../../hooks/useLayoutEffect';
import { useId } from '../../hooks/useId';

const useRootClose = typeof useRootClosePkg === 'function' ? useRootClosePkg : useRootClosePkg['default'];

interface DropdownItemData {
  value: string,
  itemData?: Record<string, unknown>
}

export interface DropdownProps {
  screenReaderText: string,
  screenReaderInstructions?: string,
  parentQuery?: string,
  onSelect?: (value: string, index: number, focusedItemData: Record<string, unknown> | undefined) => void,
  onToggle?: (
    isActive: boolean,
    prevValue: string,
    value: string,
    index: number,
    focusedItemData: Record<string, unknown> | undefined
  ) => void,
  className?: string,
  activeClassName?: string,
  alwaysSelectOption?: boolean
}

/**
 * Dropdown is the parent component for a set of Dropdown-related components.
 *
 * @remarks
 * It provides multiple shared contexts, which are consumed by its child components,
 * and also registers some global event listeners.
 */
export function Dropdown(props: PropsWithChildren<DropdownProps>): React.JSX.Element {
  const { t } = useTranslation();
  const {
    children,
    screenReaderText,
    screenReaderInstructions,
    onSelect,
    onToggle,
    className,
    activeClassName,
    parentQuery,
    alwaysSelectOption = false
  } = props;

  const containerRef = useRef<HTMLDivElement>(null);
  const screenReaderUUID = useId('dropdown');
  const dropdownListUUID = useId('dropdown-list');
  const [screenReaderKey, setScreenReaderKey] = useState<number>(0);
  const [hasTyped, setHasTyped] = useState<boolean>(false);
  const [childrenWithDropdownItemsTransformed, items] = useMemo(() => {
    return getTransformedChildrenAndItemData(children);
  }, [children]);

  const inputContext = useInputContextInstance();
  const { value, setValue, lastTypedOrSubmittedValue, setLastTypedOrSubmittedValue } = inputContext;

  const focusContext = useFocusContextInstance(
    items,
    lastTypedOrSubmittedValue,
    setValue,
    screenReaderKey,
    setScreenReaderKey,
    alwaysSelectOption
  );
  const { focusedIndex, focusedItemData, updateFocusedItem } = focusContext;

  const dropdownContext = useDropdownContextInstance(
    lastTypedOrSubmittedValue,
    value,
    focusedIndex,
    focusedItemData,
    screenReaderUUID,
    dropdownListUUID,
    setHasTyped,
    onToggle,
    onSelect
  );
  const { toggleDropdown, isActive } = dropdownContext;

  useLayoutEffect(() => {
    if (parentQuery !== undefined && parentQuery !== lastTypedOrSubmittedValue) {
      setLastTypedOrSubmittedValue(parentQuery);
      updateFocusedItem(-1, parentQuery);
    }
  }, [
    parentQuery,
    lastTypedOrSubmittedValue,
    updateFocusedItem,
    setLastTypedOrSubmittedValue
  ]);

  useRootClose(containerRef as React.RefObject<Element>, () => {
    toggleDropdown(false);
  }, { disabled: !isActive });

  function handleKeyDown(e: KeyboardEvent<HTMLDivElement>) {
    if (!isActive) {
      return;
    }

    if (e.key === 'ArrowDown' || e.key === 'ArrowUp') {
      e.preventDefault();
    }

    if (e.key === 'ArrowDown') {
      if (alwaysSelectOption && focusedIndex === items.length - 1) {
        updateFocusedItem(0);
      } else {
        updateFocusedItem(focusedIndex + 1);
      }
    } else if (e.key === 'ArrowUp') {
      if (alwaysSelectOption && focusedIndex === 0) {
        updateFocusedItem(items.length - 1);
      } else {
        updateFocusedItem(focusedIndex - 1);
      }
    } else if (e.key === 'Tab' && !e.shiftKey) {
      updateFocusedItem(-1);
      toggleDropdown(false);
    } else if (!hasTyped) {
      setHasTyped(true);
    }
  }

  return (
    <div ref={containerRef} className={isActive ? activeClassName : className} onKeyDown={handleKeyDown}>
      <DropdownContext.Provider value={dropdownContext}>
        <InputContext.Provider value={inputContext}>
          <FocusContext.Provider value={focusContext}>
            {childrenWithDropdownItemsTransformed}
          </FocusContext.Provider>
        </InputContext.Provider>
      </DropdownContext.Provider>

      <ScreenReader
        announcementKey={screenReaderKey}
        announcementText={isActive && (hasTyped || items.length || value) ? screenReaderText : ''}
        instructionsId={screenReaderUUID}
        instructions={screenReaderInstructions ?? t('dropDownScreenReaderInstructions')}
      />
    </div>
  );
}

function useInputContextInstance(): InputContextType {
  const [value, setValue] = useState('');
  const [lastTypedOrSubmittedValue, setLastTypedOrSubmittedValue] = useState('');
  return {
    value,
    setValue,
    lastTypedOrSubmittedValue,
    setLastTypedOrSubmittedValue
  };
}

function useFocusContextInstance(
  items: DropdownItemData[],
  lastTypedOrSubmittedValue: string,
  setValue: (newValue: string) => void,
  screenReaderKey: number,
  setScreenReaderKey: (newKey: number) => void,
  alwaysSelectOption: boolean
): FocusContextType {
  const [focusedIndex, setFocusedIndex] = useState(-1);
  const [focusedValue, setFocusedValue] = useState<string | null>(null);
  const [focusedItemData, setFocusedItemData] = useState<Record<string, unknown> | undefined>(undefined);
  useEffect(() => {
    if (alwaysSelectOption) {
      if (items.length > 0) {
        const index = focusedIndex === -1 || focusedIndex >= items.length ? 0 : focusedIndex;
        setFocusedIndex(index);
        setFocusedValue(items[index].value);
        setFocusedItemData(items[index].itemData);
      } else {
        setFocusedIndex(-1);
        setFocusedValue(null);
        setFocusedItemData(undefined);
      }
    }
  }, [alwaysSelectOption, focusedIndex, items]);

  function updateFocusedItem(updatedFocusedIndex: number, value?: string) {
    const numItems = items.length;
    let updatedValue;
    if (updatedFocusedIndex === -1 || updatedFocusedIndex >= numItems || numItems === 0) {
      updatedValue = value ?? lastTypedOrSubmittedValue;
      if (alwaysSelectOption && numItems !== 0) {
        setFocusedIndex(0);
        setFocusedItemData(items[0].itemData);
        setScreenReaderKey(screenReaderKey + 1);
      } else {
        setFocusedIndex(-1);
        setFocusedItemData(undefined);
        setScreenReaderKey(screenReaderKey + 1);
      }
    } else if (updatedFocusedIndex < -1) {
      const loopedAroundIndex = (numItems + updatedFocusedIndex + 1) % numItems;
      updatedValue = value ?? items[loopedAroundIndex].value;
      setFocusedIndex(loopedAroundIndex);
      setFocusedItemData(items[loopedAroundIndex].itemData);
    } else {
      updatedValue = value ?? items[updatedFocusedIndex].value;
      setFocusedIndex(updatedFocusedIndex);
      setFocusedItemData(items[updatedFocusedIndex].itemData);
    }
    setFocusedValue(updatedValue);
    setValue(alwaysSelectOption ? (value ?? lastTypedOrSubmittedValue) : updatedValue);
  }

  return {
    focusedIndex,
    focusedValue,
    focusedItemData,
    updateFocusedItem
  };
}

function useDropdownContextInstance(
  prevValue: string,
  value: string,
  index: number,
  focusedItemData: Record<string, unknown> | undefined,
  screenReaderUUID: string | undefined,
  dropdownListUUID: string | undefined,
  setHasTyped: (hasTyped: boolean) => void,
  onToggle?: (
    isActive: boolean,
    prevValue: string,
    value: string,
    index: number,
    focusedItemData: Record<string, unknown> | undefined
  ) => void,
  onSelect?: (value: string, index: number, focusedItemData: Record<string, unknown> | undefined) => void
): DropdownContextType {
  const [isActive, _toggleDropdown] = useState(false);
  const toggleDropdown = (willBeOpen: boolean) => {
    if (!willBeOpen) {
      setHasTyped(false);
    }
    _toggleDropdown(willBeOpen);
    onToggle?.(willBeOpen, prevValue, value, index, focusedItemData);
  };
  return {
    isActive,
    toggleDropdown,
    onSelect,
    screenReaderUUID,
    dropdownListUUID
  };
}

function getTransformedChildrenAndItemData(children: ReactNode): [ReactNode, DropdownItemData[]] {
  const items: DropdownItemData [] = [];
  const childrenWithDropdownItemsTransformed = recursivelyMapChildren(children, (child => {
    if (!(isValidElement(child) && child.type === DropdownItem)) {
      return child;
    }
    const props = child.props as DropdownItemProps;
    items.push({
      value: props.value,
      itemData: props.itemData
    });
    return createElement(DropdownItemWithIndex, { ...props, index: items.length - 1 });
  }));
  return [childrenWithDropdownItemsTransformed, items];
}

1	import { useTranslation } from 'react-i18next';	8✔
2	import React, {	8✔
3	createElement,
4	isValidElement,
5	KeyboardEvent,
6	PropsWithChildren,
7	ReactNode,
8	useEffect,
9	useMemo,
10	useRef,
11	useState
12	} from 'react';
13	import { DropdownContext, DropdownContextType } from './DropdownContext';	8✔
14	import { InputContext, InputContextType } from './InputContext';	8✔
15	import useRootClosePkg from '@restart/ui/useRootClose';	8✔
16	import { FocusContext, FocusContextType } from './FocusContext';	8✔
17	import { ScreenReader } from '../ScreenReader';	8✔
18	import { recursivelyMapChildren } from '../utils/recursivelyMapChildren';	8✔
19	import { DropdownItem, DropdownItemProps, DropdownItemWithIndex } from './DropdownItem';	8✔
20	import { useLayoutEffect } from '../../hooks/useLayoutEffect';	8✔
21	import { useId } from '../../hooks/useId';	8✔
22
23	const useRootClose = typeof useRootClosePkg === 'function' ? useRootClosePkg : useRootClosePkg['default'];	20!
24
25	interface DropdownItemData {
26	value: string,
27	itemData?: Record<string, unknown>
28	}
29
30	export interface DropdownProps {
31	screenReaderText: string,
32	screenReaderInstructions?: string,
33	parentQuery?: string,
34	onSelect?: (value: string, index: number, focusedItemData: Record<string, unknown> \| undefined) => void,
35	onToggle?: (
36	isActive: boolean,
37	prevValue: string,
38	value: string,
39	index: number,
40	focusedItemData: Record<string, unknown> \| undefined
41	) => void,
42	className?: string,
43	activeClassName?: string,
44	alwaysSelectOption?: boolean
45	}
46
47	/**
48	* Dropdown is the parent component for a set of Dropdown-related components.
49	*
50	* @remarks
51	* It provides multiple shared contexts, which are consumed by its child components,
52	* and also registers some global event listeners.
53	*/
54	export function Dropdown(props: PropsWithChildren<DropdownProps>): React.JSX.Element {	8✔
55	const { t } = useTranslation();	988✔
56	const {
57	children,
58	screenReaderText,
59	screenReaderInstructions,
60	onSelect,
61	onToggle,
62	className,
63	activeClassName,
64	parentQuery,
65	alwaysSelectOption = false	527✔
66	} = props;	988✔
67
68	const containerRef = useRef<HTMLDivElement>(null);	988✔
69	const screenReaderUUID = useId('dropdown');	988✔
70	const dropdownListUUID = useId('dropdown-list');	988✔
71	const [screenReaderKey, setScreenReaderKey] = useState<number>(0);	988✔
72	const [hasTyped, setHasTyped] = useState<boolean>(false);	988✔
73	const [childrenWithDropdownItemsTransformed, items] = useMemo(() => {	988✔
74	return getTransformedChildrenAndItemData(children);	693✔
75	}, [children]);
76
77	const inputContext = useInputContextInstance();	988✔
78	const { value, setValue, lastTypedOrSubmittedValue, setLastTypedOrSubmittedValue } = inputContext;	988✔
79
80	const focusContext = useFocusContextInstance(	626✔
81	items,
82	lastTypedOrSubmittedValue,
83	setValue,
84	screenReaderKey,
85	setScreenReaderKey,
86	alwaysSelectOption
87	);
88	const { focusedIndex, focusedItemData, updateFocusedItem } = focusContext;	988✔
89
90	const dropdownContext = useDropdownContextInstance(	626✔
91	lastTypedOrSubmittedValue,
92	value,
93	focusedIndex,
94	focusedItemData,
95	screenReaderUUID,
96	dropdownListUUID,
97	setHasTyped,
98	onToggle,
99	onSelect
100	);
101	const { toggleDropdown, isActive } = dropdownContext;	988✔
102
103	useLayoutEffect(() => {	626✔
104	if (parentQuery !== undefined && parentQuery !== lastTypedOrSubmittedValue) {	564!
105	setLastTypedOrSubmittedValue(parentQuery);	22✔
106	updateFocusedItem(-1, parentQuery);	22✔
107	}
108	}, [
109	parentQuery,
110	lastTypedOrSubmittedValue,
111	updateFocusedItem,
112	setLastTypedOrSubmittedValue
113	]);
114
115	useRootClose(containerRef as React.RefObject<Element>, () => {	626✔
116	toggleDropdown(false);	4✔
117	}, { disabled: !isActive });
118
119	function handleKeyDown(e: KeyboardEvent<HTMLDivElement>) {
120	if (!isActive) {	224!
UNCOV 121	return;	×
122	}
123
124	if (e.key === 'ArrowDown' \|\| e.key === 'ArrowUp') {	224✔
125	e.preventDefault();	10✔
126	}
127
128	if (e.key === 'ArrowDown') {	224✔
129	if (alwaysSelectOption && focusedIndex === items.length - 1) {	10!
UNCOV 130	updateFocusedItem(0);	×
131	} else {
132	updateFocusedItem(focusedIndex + 1);	10✔
133	}
134	} else if (e.key === 'ArrowUp') {	214!
135	if (alwaysSelectOption && focusedIndex === 0) {	1!
UNCOV 136	updateFocusedItem(items.length - 1);	×
137	} else {
138	updateFocusedItem(focusedIndex - 1);	1✔
139	}
140	} else if (e.key === 'Tab' && !e.shiftKey) {	214!
141	updateFocusedItem(-1);	1✔
142	toggleDropdown(false);	1✔
143	} else if (!hasTyped) {	214✔
144	setHasTyped(true);	43✔
145	}
146	}
147
148	return (	626✔
149	<div ref={containerRef} className={isActive ? activeClassName : className} onKeyDown={handleKeyDown}>	988✔
150	<DropdownContext.Provider value={dropdownContext}>
151	<InputContext.Provider value={inputContext}>
152	<FocusContext.Provider value={focusContext}>
153	{childrenWithDropdownItemsTransformed}
154	</FocusContext.Provider>
155	</InputContext.Provider>
156	</DropdownContext.Provider>
157
158	<ScreenReader
159	announcementKey={screenReaderKey}
160	announcementText={isActive && (hasTyped \|\| items.length \|\| value) ? screenReaderText : ''}	2,939✔
161	instructionsId={screenReaderUUID}
162	instructions={screenReaderInstructions ?? t('dropDownScreenReaderInstructions')}	1,976✔
163	/>
164	</div>
165	);
166	}
167
168	function useInputContextInstance(): InputContextType {
169	const [value, setValue] = useState('');	988✔
170	const [lastTypedOrSubmittedValue, setLastTypedOrSubmittedValue] = useState('');	988✔
171	return {	626✔
172	value,
173	setValue,
174	lastTypedOrSubmittedValue,
175	setLastTypedOrSubmittedValue
176	};
177	}
178
179	function useFocusContextInstance(
180	items: DropdownItemData[],
181	lastTypedOrSubmittedValue: string,
182	setValue: (newValue: string) => void,
183	screenReaderKey: number,
184	setScreenReaderKey: (newKey: number) => void,
185	alwaysSelectOption: boolean
186	): FocusContextType {
187	const [focusedIndex, setFocusedIndex] = useState(-1);	988✔
188	const [focusedValue, setFocusedValue] = useState<string \| null>(null);	988✔
189	const [focusedItemData, setFocusedItemData] = useState<Record<string, unknown> \| undefined>(undefined);	988✔
190	useEffect(() => {	626✔
191	if (alwaysSelectOption) {	363✔
192	if (items.length > 0) {	187✔
193	const index = focusedIndex === -1 \|\| focusedIndex >= items.length ? 0 : focusedIndex;	66✔
194	setFocusedIndex(index);	56✔
195	setFocusedValue(items[index].value);	56✔
196	setFocusedItemData(items[index].itemData);	56✔
197	} else {
198	setFocusedIndex(-1);	131✔
199	setFocusedValue(null);	131✔
200	setFocusedItemData(undefined);	131✔
201	}
202	}
203	}, [alwaysSelectOption, focusedIndex, items]);
204
205	function updateFocusedItem(updatedFocusedIndex: number, value?: string) {
206	const numItems = items.length;	546✔
207	let updatedValue;
208	if (updatedFocusedIndex === -1 \|\| updatedFocusedIndex >= numItems \|\| numItems === 0) {	273✔
209	updatedValue = value ?? lastTypedOrSubmittedValue;	261✔
210	if (alwaysSelectOption && numItems !== 0) {	261✔
211	setFocusedIndex(0);	27✔
212	setFocusedItemData(items[0].itemData);	27✔
213	setScreenReaderKey(screenReaderKey + 1);	27✔
214	} else {
215	setFocusedIndex(-1);	260✔
216	setFocusedItemData(undefined);	260✔
217	setScreenReaderKey(screenReaderKey + 1);	260✔
218	}
219	} else if (updatedFocusedIndex < -1) {	24!
220	const loopedAroundIndex = (numItems + updatedFocusedIndex + 1) % numItems;	×
221	updatedValue = value ?? items[loopedAroundIndex].value;	×
UNCOV 222	setFocusedIndex(loopedAroundIndex);	×
UNCOV 223	setFocusedItemData(items[loopedAroundIndex].itemData);	×
224	} else {
225	updatedValue = value ?? items[updatedFocusedIndex].value;	24✔
226	setFocusedIndex(updatedFocusedIndex);	24✔
227	setFocusedItemData(items[updatedFocusedIndex].itemData);	24✔
228	}
229	setFocusedValue(updatedValue);	273✔
230	setValue(alwaysSelectOption ? (value ?? lastTypedOrSubmittedValue) : updatedValue);	273✔
231	}
232
233	return {	626✔
234	focusedIndex,
235	focusedValue,
236	focusedItemData,
237	updateFocusedItem
238	};
239	}
240
241	function useDropdownContextInstance(
242	prevValue: string,
243	value: string,
244	index: number,
245	focusedItemData: Record<string, unknown> \| undefined,
246	screenReaderUUID: string \| undefined,
247	dropdownListUUID: string \| undefined,
248	setHasTyped: (hasTyped: boolean) => void,
249	onToggle?: (
250	isActive: boolean,
251	prevValue: string,
252	value: string,
253	index: number,
254	focusedItemData: Record<string, unknown> \| undefined
255	) => void,
256	onSelect?: (value: string, index: number, focusedItemData: Record<string, unknown> \| undefined) => void
257	): DropdownContextType {
258	const [isActive, _toggleDropdown] = useState(false);	988✔
259	const toggleDropdown = (willBeOpen: boolean) => {	988✔
260	if (!willBeOpen) {	589✔
261	setHasTyped(false);	396✔
262	}
263	_toggleDropdown(willBeOpen);	589✔
264	onToggle?.(willBeOpen, prevValue, value, index, focusedItemData);	589✔
265	};
266	return {	626✔
267	isActive,
268	toggleDropdown,
269	onSelect,
270	screenReaderUUID,
271	dropdownListUUID
272	};
273	}
274
275	function getTransformedChildrenAndItemData(children: ReactNode): [ReactNode, DropdownItemData[]] {
276	const items: DropdownItemData [] = [];	604✔
277	const childrenWithDropdownItemsTransformed = recursivelyMapChildren(children, (child => {	604✔
278	if (!(isValidElement(child) && child.type === DropdownItem)) {	3,498✔
279	return child;	3,185✔
280	}
281	const props = child.props as DropdownItemProps;	481✔
282	items.push({	441✔
283	value: props.value,
284	itemData: props.itemData
285	});
286	return createElement(DropdownItemWithIndex, { ...props, index: items.length - 1 });	441✔
287	}));
288	return [childrenWithDropdownItemsTransformed, items];	331✔
289	}

yext / search-ui-react / 23448126896

Source File Press 'n' to go to next uncovered line, 'b' for previous

Source File
Press 'n' to go to next uncovered line, 'b' for previous