@codecademy/gamut
74.0.174.0.2-alpha.b4821a.0
~
Modified (7 files)
Index: package/dist/Form/SelectDropdown/elements/containers.js
===================================================================
--- package/dist/Form/SelectDropdown/elements/containers.js
+++ package/dist/Form/SelectDropdown/elements/containers.js
@@ -1,5 +1,5 @@
-import { createContext, useEffect, useLayoutEffect } from 'react';
+import { createContext, useContext, useEffect, useLayoutEffect } from 'react';
import ReactSelect, { components as SelectDropdownElements } from 'react-select';
import CreatableSelect from 'react-select/creatable';
import { DEFAULT_SELECT_DROPDOWN_TRANSLATIONS } from '../core/translations';
import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
@@ -59,58 +59,139 @@
})]
});
};
+/*
+ * With isSearchable={false}, react-select renders a hidden <input role="combobox">.
+ * Screen readers announce it as editable ("type text", "auto complete"), which is
+ * wrong for a control that takes no typing. Instead, the ValueContainer is the
+ * combobox (ARIA APG select-only pattern) and takes focus. react-select's keydown
+ * handling still applies because keydown bubbles up to its container.
+ */
+const SELECT_ONLY_ARIA_PROPS = ['aria-describedby', 'aria-errormessage', 'aria-invalid', 'aria-label', 'aria-labelledby', 'aria-required'];
+
+/* Methods on react-select's Select instance, reached through the selectRef. */
+
+const useSelectOnlyInput = (inputId, isSearchable) => {
+ useLayoutEffect(() => {
+ if (isSearchable !== false || !inputId) return;
+
+ /* Look the trigger up from the hidden input: the public id is shared with other elements. */
+ const input = document.getElementById(inputId);
+ /* Start at the parent: closest() includes the input itself, which still has role="combobox" here. */
+ const trigger = input?.parentElement?.closest('[role="combobox"]');
+ if (!input || !trigger) return;
+
+ /*
+ * A disabled input can't take focus, so react-select's focusInput() calls
+ * become no-ops and focus stays on the trigger.
+ */
+ input.setAttribute('disabled', '');
+ input.setAttribute('aria-hidden', 'true');
+ input.removeAttribute('role');
+
+ /*
+ * react-select only sets aria-activedescendant on the hidden input off Apple devices
+ * (its isAppleDevice check), so VoiceOver on macOS gets nothing from it. Derive the
+ * active option from the rendered menu instead: Gamut sets aria-selected on the
+ * focused option. The container is SelectContainer > Control > ValueContainer.
+ */
+ const container = trigger.parentElement?.parentElement ?? trigger;
+ const syncActiveOption = () => {
+ const isExpanded = trigger.getAttribute('aria-expanded') === 'true';
+ const listbox = container.querySelector('[role="listbox"]');
+ const activeOption = container.querySelector('[role="option"][aria-selected="true"]');
+ if (listbox?.id && isExpanded) {
+ trigger.setAttribute('aria-controls', listbox.id);
+ } else {
+ trigger.removeAttribute('aria-controls');
+ }
+ if (activeOption?.id && isExpanded) {
+ trigger.setAttribute('aria-activedescendant', activeOption.id);
+ } else {
+ trigger.removeAttribute('aria-activedescendant');
+ }
+ };
+
+ /*
+ * aria-expanded is set on the trigger in a later React commit than the listbox
+ * mounts, so it has to be observed too, or the sync can run while it's still "false".
+ */
+ const observer = new MutationObserver(syncActiveOption);
+ observer.observe(container, {
+ attributeFilter: ['aria-expanded', 'aria-selected'],
+ attributes: true,
+ childList: true,
+ subtree: true
+ });
+ syncActiveOption();
+ return () => observer.disconnect();
+ }, [inputId, isSearchable]);
+};
+
/**
- * Custom ValueContainer component that applies combobox props when isSearchable is false.
- * When isSearchable is false, react-select renders a dummy input (div) that doesn't accept
- * custom props, so we apply the combobox data attributes to the ValueContainer's innerProps.
+ * Custom ValueContainer component. When isSearchable is false, it becomes the
+ * select-only combobox trigger (see `useSelectOnlyInput`). Otherwise it renders
+ * react-select's default ValueContainer.
*/
export const CustomValueContainer = ({
+ innerProps,
...rest
}) => {
const {
+ selectInputRef,
+ triggerId
+ } = useContext(SelectDropdownContext);
+ const {
+ inputId,
inputProps,
- isSearchable
+ isDisabled,
+ isSearchable,
+ menuIsOpen
} = rest.selectProps;
const comboboxProps = inputProps?.combobox || {};
- useLayoutEffect(() => {
- if (isSearchable === false && Object.keys(comboboxProps).length > 0) {
- // Find the input element by inputId since we can't use a ref on ValueContainer
- const {
- inputId
- } = rest.selectProps;
- if (inputId) {
- const inputElement = document.getElementById(inputId);
- if (inputElement?.getAttribute('role') === 'combobox') {
- Object.entries(comboboxProps).forEach(([key, value]) => {
- inputElement.setAttribute(key, value);
- });
- }
- }
- }
- // We only want to run this effect when isSearchable or comboboxProps change
- // eslint-disable-next-line react-hooks/exhaustive-deps
- }, [isSearchable, comboboxProps, rest.selectProps.inputId]);
-
- // When isSearchable is false, apply combobox props to ValueContainer's innerProps
- // since the dummy input doesn't accept custom props
- if (isSearchable === false && Object.keys(comboboxProps).length > 0) {
- const {
- innerProps,
- ...otherProps
- } = rest;
- const mergedInnerProps = {
- ...innerProps,
- ...comboboxProps
- };
+ useSelectOnlyInput(inputId, isSearchable);
+ if (isSearchable !== false || !triggerId) {
return /*#__PURE__*/_jsx(SelectDropdownElements.ValueContainer, {
- ...otherProps,
- innerProps: mergedInnerProps
+ ...rest
});
}
+ const ariaProps = Object.fromEntries(Object.entries(rest.selectProps).filter(([key, value]) => SELECT_ONLY_ARIA_PROPS.includes(key) && value !== undefined));
+
+ /* Read the ref inside handlers: it is still null during render on the first pass. */
+ const getInstance = () => selectInputRef?.current;
+ const handleMouseDown = event => {
+ if (event.button !== 0 || isDisabled) return;
+
+ // Stops react-select from focusing its hidden input on mousedown.
+ event.preventDefault();
+ event.currentTarget.focus();
+ if (menuIsOpen) getInstance()?.onMenuClose();else getInstance()?.openMenu('first');
+ };
+
+ /* Close only when focus leaves the whole select; focus moving to its own menu or hidden input is not a dismissal. */
+ const handleBlur = event => {
+ const selectContainer = event.currentTarget.parentElement?.parentElement;
+ const nextFocus = event.relatedTarget;
+ if (nextFocus && selectContainer?.contains(nextFocus)) return;
+ if (menuIsOpen) getInstance()?.onMenuClose();
+ };
return /*#__PURE__*/_jsx(SelectDropdownElements.ValueContainer, {
- ...rest
+ ...rest,
+ innerProps: {
+ ...innerProps,
+ ...ariaProps,
+ 'aria-disabled': isDisabled || undefined,
+ 'aria-expanded': Boolean(menuIsOpen),
+ 'aria-haspopup': 'listbox',
+ id: triggerId,
+ onBlur: handleBlur,
+ onMouseDown: handleMouseDown,
+ role: 'combobox',
+ tabIndex: isDisabled ? -1 : 0,
+ /* Last, so consumer data- and aria- props can override the defaults above, as before this change. */
+ ...comboboxProps
+ }
});
};
/** Index: package/dist/Form/SelectDropdown/SelectDropdown.js
===================================================================
--- package/dist/Form/SelectDropdown/SelectDropdown.js
+++ package/dist/Form/SelectDropdown/SelectDropdown.js
@@ -15,9 +15,9 @@
/** Announces the custom `validationMessage` menu text - see `useNoOptionsAnnouncement`. */
const NoOptionsLiveRegion = /*#__PURE__*/_styled("div", {
target: "e2dtq0m0",
label: "NoOptionsLiveRegion"
-})(screenReaderOnly, process.env.NODE_ENV === "production" ? "" : "/*# sourceMappingURL=data:application/json;charset=utf-8;base64,{"version":3,"sources":["../../../src/Form/SelectDropdown/SelectDropdown.tsx"],"names":[],"mappings":"AAuB4B","file":"../../../src/Form/SelectDropdown/SelectDropdown.tsx","sourcesContent":["import { screenReaderOnly } from '@codecademy/gamut-styles';\nimport { useTheme } from '@emotion/react';\nimport styled from '@emotion/styled';\nimport { useId, useMemo, useRef, useState } from 'react';\nimport * as React from 'react';\nimport { StylesConfig } from 'react-select';\n\nimport { getDefaultComponents } from './core/constants';\nimport { getMemoizedStyles } from './core/styles';\nimport { DEFAULT_SELECT_DROPDOWN_TRANSLATIONS } from './core/translations';\nimport { resolveNoOptionsMessage } from './core/utils';\nimport {\n  formatGroupLabel,\n  formatOptionLabel,\n  SelectDropdownContext,\n  TypedReactSelect,\n} from './elements';\nimport { useNoOptionsAnnouncement } from './hooks/useNoOptionsAnnouncement';\nimport { useSelectHandlers } from './hooks/useSelectHandlers';\nimport { useSelectOptions } from './hooks/useSelectOptions';\nimport { OptionStrict, SelectDropdownProps } from './types';\n\n/** Announces the custom `validationMessage` menu text - see `useNoOptionsAnnouncement`. */\nconst NoOptionsLiveRegion = styled.div(screenReaderOnly);\n\n/**\n * A flexible dropdown select component built on top of react-select.\n *\n * Supports both single and multi-select modes with customizable options including\n * icons, subtitles, right labels, and abbreviations. The component provides\n * accessibility features, keyboard navigation, and responsive styling.\n *\n * @example\n * ```tsx\n * // Basic single select\n * <SelectDropdown\n *   name=\"country\"\n *   options={[\n *     { label: 'United States', value: 'us' },\n *     { label: 'Canada', value: 'ca' }\n *   ]}\n *   onChange={(option) => console.log(option)}\n * />\n *\n * // Multi-select with icons\n * <SelectDropdown\n *   name=\"skills\"\n *   multiple\n *   options={[\n *     { label: 'React', value: 'react', icon: ReactIcon },\n *     { label: 'TypeScript', value: 'ts', icon: TypeScriptIcon }\n *   ]}\n *   onChange={(options) => console.log(options)}\n * />\n *\n * // Grouped options with extended features\n * <SelectDropdown\n *   name=\"category\"\n *   placeholder=\"Default placeholder text\"\n *   options={[\n *     {\n *       label: 'Frontend',\n *       options: [\n *         { label: 'React', value: 'react', subtitle: 'UI Library' },\n *         { label: 'Vue', value: 'vue', subtitle: 'Progressive Framework' }\n *       ]\n *     }\n *   ]}\n * />\n * ```\n */\nexport const SelectDropdown: React.FC<SelectDropdownProps> = ({\n  createOptionPosition,\n  disabled,\n  dropdownWidth,\n  error,\n  formatCreateLabel,\n  id,\n  inputProps,\n  inputWidth,\n  isCreatable = false,\n  isSearchable: isSearchableProp = false,\n  isValidNewOption,\n  menuAlignment = 'left',\n  multiple,\n  name,\n  onChange,\n  onCreateOption,\n  onInputChange,\n  onMenuClose,\n  options,\n  placeholder,\n  shownOptionsLimit = 6,\n  size,\n  translations,\n  validationMessage,\n  value,\n  zIndex,\n  ...rest\n}) => {\n  const mergedTranslations = useMemo(\n    () => ({ ...DEFAULT_SELECT_DROPDOWN_TRANSLATIONS, ...translations }),\n    [translations]\n  );\n  // isSearchable is forced true when isCreatable is true (CreatableSelect requires a text input)\n  const isSearchable = isCreatable || isSearchableProp;\n  const rawInputId = useId();\n  const inputId = name ?? `${id ?? rawInputId}-select-dropdown-${rawInputId}`;\n\n  const removeAllButtonRef = useRef<HTMLDivElement>(null);\n  const selectInputRef = useRef<HTMLDivElement>(null);\n\n  const [currentFocusedValue, setCurrentFocusedValue] = useState(undefined);\n\n  const { selectOptions, parsedValue } = useSelectOptions({\n    options,\n    id,\n    size,\n    value: value as string | string[] | undefined,\n  });\n\n  const noOptionsMessage = resolveNoOptionsMessage(\n    validationMessage,\n    mergedTranslations.validationMessage\n  );\n  const { noOptionsMessageComponent, announcement, clearAnnouncement } =\n    useNoOptionsAnnouncement();\n  const components = useMemo(\n    () => getDefaultComponents(noOptionsMessageComponent),\n    [noOptionsMessageComponent]\n  );\n  const handleMenuClose = () => {\n    clearAnnouncement();\n    onMenuClose?.();\n  };\n\n  const { activated, multiValues, changeHandler, keyPressHandler } =\n    useSelectHandlers({\n      onChange,\n      multiple,\n      onCreateOption,\n      selectOptions,\n      value,\n      currentFocusedValue,\n      removeAllButtonRef,\n    });\n\n  const theme = useTheme();\n  const memoizedStyles = useMemo((): StylesConfig<any, false> => {\n    return getMemoizedStyles(theme, zIndex);\n  }, [theme, zIndex]);\n\n  return (\n    <SelectDropdownContext.Provider\n      value={{\n        currentFocusedValue,\n        setCurrentFocusedValue,\n        removeAllButtonRef,\n        selectInputRef,\n        translations: mergedTranslations,\n      }}\n    >\n      <TypedReactSelect\n        activated={activated}\n        aria-live=\"assertive\"\n        ariaLiveMessages={{\n          onFocus: ({ focused }) =>\n            mergedTranslations.focusedOptionAnnouncement(focused),\n        }}\n        components={components}\n        createOptionPosition={createOptionPosition}\n        dropdownWidth={dropdownWidth}\n        error={Boolean(error)}\n        formatCreateLabel={\n          formatCreateLabel ?? mergedTranslations.formatCreateLabel\n        }\n        formatGroupLabel={formatGroupLabel}\n        formatOptionLabel={formatOptionLabel}\n        id={id || rest.htmlFor || rawInputId}\n        inputId={inputId}\n        inputProps={{ ...inputProps }}\n        inputWidth={inputWidth}\n        isCreatable={isCreatable}\n        isDisabled={disabled}\n        isMulti={multiple}\n        isOptionDisabled={(option: OptionStrict & { disabled?: boolean }) =>\n          option.disabled ?? false\n        }\n        isSearchable={isSearchable}\n        isValidNewOption={isValidNewOption}\n        menuAlignment={menuAlignment}\n        name={name}\n        noOptionsMessage={noOptionsMessage}\n        options={selectOptions}\n        placeholder={placeholder ?? mergedTranslations.placeholder}\n        selectRef={selectInputRef}\n        shownOptionsLimit={shownOptionsLimit}\n        size={size}\n        styles={memoizedStyles}\n        value={multiple ? multiValues : parsedValue}\n        onChange={changeHandler}\n        onInputChange={onInputChange}\n        onKeyDown={multiple ? keyPressHandler : undefined}\n        onMenuClose={handleMenuClose}\n        {...rest}\n      />\n      <NoOptionsLiveRegion aria-live=\"polite\" role=\"status\">\n        {announcement}\n      </NoOptionsLiveRegion>\n    </SelectDropdownContext.Provider>\n  );\n};\n"]} */");
+})(screenReaderOnly, process.env.NODE_ENV === "production" ? "" : "/*# sourceMappingURL=data:application/json;charset=utf-8;base64,{"version":3,"sources":["../../../src/Form/SelectDropdown/SelectDropdown.tsx"],"names":[],"mappings":"AAuB4B","file":"../../../src/Form/SelectDropdown/SelectDropdown.tsx","sourcesContent":["import { screenReaderOnly } from '@codecademy/gamut-styles';\nimport { useTheme } from '@emotion/react';\nimport styled from '@emotion/styled';\nimport { useId, useMemo, useRef, useState } from 'react';\nimport * as React from 'react';\nimport { StylesConfig } from 'react-select';\n\nimport { getDefaultComponents } from './core/constants';\nimport { getMemoizedStyles } from './core/styles';\nimport { DEFAULT_SELECT_DROPDOWN_TRANSLATIONS } from './core/translations';\nimport { resolveNoOptionsMessage } from './core/utils';\nimport {\n  formatGroupLabel,\n  formatOptionLabel,\n  SelectDropdownContext,\n  TypedReactSelect,\n} from './elements';\nimport { useNoOptionsAnnouncement } from './hooks/useNoOptionsAnnouncement';\nimport { useSelectHandlers } from './hooks/useSelectHandlers';\nimport { useSelectOptions } from './hooks/useSelectOptions';\nimport { OptionStrict, SelectDropdownProps } from './types';\n\n/** Announces the custom `validationMessage` menu text - see `useNoOptionsAnnouncement`. */\nconst NoOptionsLiveRegion = styled.div(screenReaderOnly);\n\n/**\n * A flexible dropdown select component built on top of react-select.\n *\n * Supports both single and multi-select modes with customizable options including\n * icons, subtitles, right labels, and abbreviations. The component provides\n * accessibility features, keyboard navigation, and responsive styling.\n *\n * @example\n * ```tsx\n * // Basic single select\n * <SelectDropdown\n *   name=\"country\"\n *   options={[\n *     { label: 'United States', value: 'us' },\n *     { label: 'Canada', value: 'ca' }\n *   ]}\n *   onChange={(option) => console.log(option)}\n * />\n *\n * // Multi-select with icons\n * <SelectDropdown\n *   name=\"skills\"\n *   multiple\n *   options={[\n *     { label: 'React', value: 'react', icon: ReactIcon },\n *     { label: 'TypeScript', value: 'ts', icon: TypeScriptIcon }\n *   ]}\n *   onChange={(options) => console.log(options)}\n * />\n *\n * // Grouped options with extended features\n * <SelectDropdown\n *   name=\"category\"\n *   placeholder=\"Default placeholder text\"\n *   options={[\n *     {\n *       label: 'Frontend',\n *       options: [\n *         { label: 'React', value: 'react', subtitle: 'UI Library' },\n *         { label: 'Vue', value: 'vue', subtitle: 'Progressive Framework' }\n *       ]\n *     }\n *   ]}\n * />\n * ```\n */\nexport const SelectDropdown: React.FC<SelectDropdownProps> = ({\n  createOptionPosition,\n  disabled,\n  dropdownWidth,\n  error,\n  formatCreateLabel,\n  id,\n  inputProps,\n  inputWidth,\n  isCreatable = false,\n  isSearchable: isSearchableProp = false,\n  isValidNewOption,\n  menuAlignment = 'left',\n  multiple,\n  name,\n  onChange,\n  onCreateOption,\n  onInputChange,\n  onMenuClose,\n  options,\n  placeholder,\n  shownOptionsLimit = 6,\n  size,\n  translations,\n  validationMessage,\n  value,\n  zIndex,\n  ...rest\n}) => {\n  const mergedTranslations = useMemo(\n    () => ({ ...DEFAULT_SELECT_DROPDOWN_TRANSLATIONS, ...translations }),\n    [translations]\n  );\n  // isSearchable is forced true when isCreatable is true (CreatableSelect requires a text input)\n  const isSearchable = isCreatable || isSearchableProp;\n  const rawInputId = useId();\n  const inputId = name ?? `${id ?? rawInputId}-select-dropdown-${rawInputId}`;\n\n  const removeAllButtonRef = useRef<HTMLDivElement>(null);\n  const selectInputRef = useRef<HTMLDivElement>(null);\n\n  const [currentFocusedValue, setCurrentFocusedValue] = useState(undefined);\n\n  const { selectOptions, parsedValue } = useSelectOptions({\n    options,\n    id,\n    size,\n    value: value as string | string[] | undefined,\n  });\n\n  const noOptionsMessage = resolveNoOptionsMessage(\n    validationMessage,\n    mergedTranslations.validationMessage\n  );\n  const { noOptionsMessageComponent, announcement, clearAnnouncement } =\n    useNoOptionsAnnouncement();\n  const components = useMemo(\n    () => getDefaultComponents(noOptionsMessageComponent),\n    [noOptionsMessageComponent]\n  );\n  const handleMenuClose = () => {\n    clearAnnouncement();\n    onMenuClose?.();\n  };\n\n  const { activated, multiValues, changeHandler, keyPressHandler } =\n    useSelectHandlers({\n      onChange,\n      multiple,\n      onCreateOption,\n      selectOptions,\n      value,\n      currentFocusedValue,\n      removeAllButtonRef,\n    });\n\n  const theme = useTheme();\n  const memoizedStyles = useMemo((): StylesConfig<any, false> => {\n    return getMemoizedStyles(theme, zIndex);\n  }, [theme, zIndex]);\n\n  return (\n    <SelectDropdownContext.Provider\n      value={{\n        currentFocusedValue,\n        setCurrentFocusedValue,\n        removeAllButtonRef,\n        selectInputRef,\n        translations: mergedTranslations,\n        triggerId: inputId,\n      }}\n    >\n      <TypedReactSelect\n        activated={activated}\n        aria-live=\"assertive\"\n        ariaLiveMessages={{\n          /* Non-searchable: the trigger's own role and state are read, so skip the extra focus text. */\n          onFocus: ({ focused }) =>\n            isSearchable\n              ? mergedTranslations.focusedOptionAnnouncement(focused)\n              : '',\n        }}\n        components={components}\n        createOptionPosition={createOptionPosition}\n        dropdownWidth={dropdownWidth}\n        error={Boolean(error)}\n        formatCreateLabel={\n          formatCreateLabel ?? mergedTranslations.formatCreateLabel\n        }\n        formatGroupLabel={formatGroupLabel}\n        formatOptionLabel={formatOptionLabel}\n        /* Non-searchable: the public id belongs to the combobox, so keep react-select's container off it. */\n        id={isSearchable ? id || rest.htmlFor || rawInputId : undefined}\n        inputId={isSearchable ? inputId : `${inputId}-input`}\n        inputProps={{ ...inputProps }}\n        inputWidth={inputWidth}\n        isCreatable={isCreatable}\n        isDisabled={disabled}\n        isMulti={multiple}\n        isOptionDisabled={(option: OptionStrict & { disabled?: boolean }) =>\n          option.disabled ?? false\n        }\n        isSearchable={isSearchable}\n        isValidNewOption={isValidNewOption}\n        menuAlignment={menuAlignment}\n        name={name}\n        noOptionsMessage={noOptionsMessage}\n        options={selectOptions}\n        placeholder={placeholder ?? mergedTranslations.placeholder}\n        selectRef={selectInputRef}\n        shownOptionsLimit={shownOptionsLimit}\n        size={size}\n        styles={memoizedStyles}\n        tabIndex={isSearchable ? undefined : -1}\n        value={multiple ? multiValues : parsedValue}\n        onChange={changeHandler}\n        onInputChange={onInputChange}\n        onKeyDown={multiple ? keyPressHandler : undefined}\n        onMenuClose={handleMenuClose}\n        {...rest}\n      />\n      <NoOptionsLiveRegion aria-live=\"polite\" role=\"status\">\n        {announcement}\n      </NoOptionsLiveRegion>\n    </SelectDropdownContext.Provider>\n  );\n};\n"]} */");
/**
* A flexible dropdown select component built on top of react-select.
*
@@ -147,27 +147,30 @@
currentFocusedValue,
setCurrentFocusedValue,
removeAllButtonRef,
selectInputRef,
- translations: mergedTranslations
+ translations: mergedTranslations,
+ triggerId: inputId
},
children: [/*#__PURE__*/_jsx(TypedReactSelect, {
activated: activated,
"aria-live": "assertive",
ariaLiveMessages: {
+ /* Non-searchable: the trigger's own role and state are read, so skip the extra focus text. */
onFocus: ({
focused
- }) => mergedTranslations.focusedOptionAnnouncement(focused)
+ }) => isSearchable ? mergedTranslations.focusedOptionAnnouncement(focused) : ''
},
components: components,
createOptionPosition: createOptionPosition,
dropdownWidth: dropdownWidth,
error: Boolean(error),
formatCreateLabel: formatCreateLabel ?? mergedTranslations.formatCreateLabel,
formatGroupLabel: formatGroupLabel,
- formatOptionLabel: formatOptionLabel,
- id: id || rest.htmlFor || rawInputId,
- inputId: inputId,
+ formatOptionLabel: formatOptionLabel
+ /* Non-searchable: the public id belongs to the combobox, so keep react-select's container off it. */,
+ id: isSearchable ? id || rest.htmlFor || rawInputId : undefined,
+ inputId: isSearchable ? inputId : `${inputId}-input`,
inputProps: {
...inputProps
},
inputWidth: inputWidth,
@@ -185,8 +188,9 @@
selectRef: selectInputRef,
shownOptionsLimit: shownOptionsLimit,
size: size,
styles: memoizedStyles,
+ tabIndex: isSearchable ? undefined : -1,
value: multiple ? multiValues : parsedValue,
onChange: changeHandler,
onInputChange: onInputChange,
onKeyDown: multiple ? keyPressHandler : undefined, Index: package/dist/Form/SelectDropdown/core/styles.js
===================================================================
--- package/dist/Form/SelectDropdown/core/styles.js
+++ package/dist/Form/SelectDropdown/core/styles.js
@@ -87,8 +87,14 @@
size
} = state.selectProps;
const getSize = size ?? 'medium';
const getPadding = isMulti && state.hasValue && size !== 'small' ? `mediumIsMultiSelected` : getSize;
+ const borderStateProps = {
+ isDisabled: state.isDisabled,
+ error: state.selectProps.error,
+ activated: state.selectProps.activated,
+ theme
+ };
return {
...selectDropdownStyles({
theme
}),
@@ -97,12 +103,17 @@
theme
}),
...conditionalBorderStates({
isFocused: state.isFocused,
- isDisabled: state.isDisabled,
- error: state.selectProps.error,
- activated: state.selectProps.activated,
- theme
+ ...borderStateProps
+ }),
+ /*
+ * Non-searchable: focus sits on the trigger, so react-select's isFocused stays false.
+ * Show the same focused border on the control while anything inside it has focus.
+ */
+ '&:focus-within': conditionalBorderStates({
+ isFocused: true,
+ ...borderStateProps
})
};
},
dropdownIndicator: () => ({
@@ -241,8 +252,12 @@
marginLeft: 0
}),
valueContainer: provided => ({
...provided,
- padding: 0
+ padding: 0,
+ /* The control shows focus (see `control`), so drop the browser outline on the trigger. */
+ '&:focus, &:focus-visible': {
+ outline: 'none'
+ }
})
};
};
\ No newline at end of file Index: package/package.json
===================================================================
--- package/package.json
+++ package/package.json
@@ -1,16 +1,16 @@
{
"name": "@codecademy/gamut",
"description": "Styleguide & Component library for Codecademy",
- "version": "74.0.1",
+ "version": "74.0.2-alpha.b4821a.0",
"author": "Codecademy Engineering <[email protected]>",
"bin": "./bin/gamut.mjs",
"dependencies": {
- "@codecademy/gamut-icons": "10.2.0",
- "@codecademy/gamut-illustrations": "1.1.0",
- "@codecademy/gamut-patterns": "1.1.0",
- "@codecademy/gamut-styles": "21.2.0",
- "@codecademy/variance": "1.1.0",
+ "@codecademy/gamut-icons": "10.2.1-alpha.b4821a.0",
+ "@codecademy/gamut-illustrations": "1.1.1-alpha.b4821a.0",
+ "@codecademy/gamut-patterns": "1.1.1-alpha.b4821a.0",
+ "@codecademy/gamut-styles": "21.2.1-alpha.b4821a.0",
+ "@codecademy/variance": "1.1.1-alpha.b4821a.0",
"@formatjs/intl-locale": "5.3.1",
"@react-aria/interactions": "3.25.0",
"@types/marked": "^4.0.8",
"classnames": "^2.2.5", Index: package/dist/Form/SelectDropdown/core/constants.d.ts
===================================================================
--- package/dist/Form/SelectDropdown/core/constants.d.ts
+++ package/dist/Form/SelectDropdown/core/constants.d.ts
@@ -10,9 +10,9 @@
DropdownIndicator: (props: import("..").SizedIndicatorProps) => import("react/jsx-runtime").JSX.Element;
IndicatorSeparator: () => null;
ClearIndicator: (props: import("..").SizedIndicatorProps) => import("react/jsx-runtime").JSX.Element;
SelectContainer: ({ children, ...rest }: import("..").CustomSelectComponentProps<(<Option_18, IsMulti_18 extends boolean, Group_18 extends import("react-select").GroupBase<Option_18>>(props: import("react-select").ContainerProps<Option_18, IsMulti_18, Group_18>) => import("@emotion/react").jsx.JSX.Element)>) => import("react/jsx-runtime").JSX.Element;
- ValueContainer: ({ ...rest }: import("..").CustomSelectComponentProps<(<Option_20, IsMulti_20 extends boolean, Group_20 extends import("react-select").GroupBase<Option_20>>(props: import("react-select").ValueContainerProps<Option_20, IsMulti_20, Group_20>) => import("@emotion/react").jsx.JSX.Element)>) => import("react/jsx-runtime").JSX.Element;
+ ValueContainer: ({ innerProps, ...rest }: import("..").CustomSelectComponentProps<(<Option_20, IsMulti_20 extends boolean, Group_20 extends import("react-select").GroupBase<Option_20>>(props: import("react-select").ValueContainerProps<Option_20, IsMulti_20, Group_20>) => import("@emotion/react").jsx.JSX.Element)>) => import("react/jsx-runtime").JSX.Element;
MultiValue: (props: import("react-select").MultiValueProps<import("..").ExtendedOption, true, import("react-select").GroupBase<import("..").ExtendedOption>>) => import("react/jsx-runtime").JSX.Element;
MultiValueRemove: (props: import("react-select").MultiValueRemoveProps<import("..").ExtendedOption, true, import("react-select").GroupBase<import("..").ExtendedOption>>) => import("react/jsx-runtime").JSX.Element;
Option: ({ children, ...rest }: import("..").CustomSelectComponentProps<(<Option_16, IsMulti_16 extends boolean, Group_16 extends import("react-select").GroupBase<Option_16>>(props: import("react-select").OptionProps<Option_16, IsMulti_16, Group_16>) => import("@emotion/react").jsx.JSX.Element)>) => import("react/jsx-runtime").JSX.Element;
SingleValue: (props: import("react-select").SingleValueProps<import("..").ExtendedOption, false>) => import("react/jsx-runtime").JSX.Element; Index: package/dist/Form/SelectDropdown/elements/containers.d.ts
===================================================================
--- package/dist/Form/SelectDropdown/elements/containers.d.ts
+++ package/dist/Form/SelectDropdown/elements/containers.d.ts
@@ -19,13 +19,13 @@
* Renders the selected values as a comma-separated string in the hidden input.
*/
export declare const CustomContainer: ({ children, ...rest }: CustomSelectComponentProps<typeof SelectDropdownElements.SelectContainer>) => import("react/jsx-runtime").JSX.Element;
/**
- * Custom ValueContainer component that applies combobox props when isSearchable is false.
- * When isSearchable is false, react-select renders a dummy input (div) that doesn't accept
- * custom props, so we apply the combobox data attributes to the ValueContainer's innerProps.
+ * Custom ValueContainer component. When isSearchable is false, it becomes the
+ * select-only combobox trigger (see `useSelectOnlyInput`). Otherwise it renders
+ * react-select's default ValueContainer.
*/
-export declare const CustomValueContainer: ({ ...rest }: CustomSelectComponentProps<typeof SelectDropdownElements.ValueContainer>) => import("react/jsx-runtime").JSX.Element;
+export declare const CustomValueContainer: ({ innerProps, ...rest }: CustomSelectComponentProps<typeof SelectDropdownElements.ValueContainer>) => import("react/jsx-runtime").JSX.Element;
/**
* Custom Input component that passes combobox props to the react-select input.
* This allows data-* attributes and other props to be applied to the visible input element.
* Works for both searchable and non-searchable modes by using the react-select Input component. Index: package/dist/Form/SelectDropdown/types/internal.d.ts
===================================================================
--- package/dist/Form/SelectDropdown/types/internal.d.ts
+++ package/dist/Form/SelectDropdown/types/internal.d.ts
@@ -30,8 +30,10 @@
/** Ref to the remove all button for programmatic focus */
removeAllButtonRef?: ProgrammaticFocusRef;
/** Merged translations for microcopy consumed by sub-components */
translations: SelectDropdownTranslations;
+ /** Public id for the combobox (the select-only trigger when not searchable) */
+ triggerId?: string;
}
/**
* Props for sized indicator components (dropdown arrow, search icon, etc.).
* Combines react-select's DropdownIndicatorProps with internal select props.