@codecademy/gamut
72.3.072.3.1-alpha.59371c.0
dist/Form/SelectDropdown/SelectDropdown.js~
dist/Form/SelectDropdown/SelectDropdown.jsModified+79−103
Index: package/dist/Form/SelectDropdown/SelectDropdown.js
===================================================================
--- package/dist/Form/SelectDropdown/SelectDropdown.js
+++ package/dist/Form/SelectDropdown/SelectDropdown.js
@@ -1,28 +1,23 @@
+import _styled from "@emotion/styled/base";
+import { screenReaderOnly } from '@codecademy/gamut-styles';
import { useTheme } from '@emotion/react';
-import { useCallback, useEffect, useId, useMemo, useRef, useState } from 'react';
+import { useId, useMemo, useRef, useState } from 'react';
import * as React from 'react';
-import { parseOptions } from '../utils';
-import { AbbreviatedSingleValue, CustomContainer, CustomInput, CustomValueContainer, DropdownButton, formatGroupLabel, formatOptionLabel, IconOption, MultiValueRemoveButton, MultiValueWithColorMode, onFocus, RemoveAllButton, SelectDropdownContext, TypedReactSelect } from './elements';
-import { getMemoizedStyles } from './styles';
-import { filterValueFromOptions, isMultipleSelectProps, isOptionsGrouped, isSingleSelectProps, removeValueFromSelectedOptions } from './utils';
-import { jsx as _jsx } from "react/jsx-runtime";
-const defaultProps = {
- name: undefined,
- components: {
- DropdownIndicator: DropdownButton,
- IndicatorSeparator: () => null,
- ClearIndicator: RemoveAllButton,
- SelectContainer: CustomContainer,
- ValueContainer: CustomValueContainer,
- MultiValue: MultiValueWithColorMode,
- MultiValueRemove: MultiValueRemoveButton,
- Option: IconOption,
- SingleValue: AbbreviatedSingleValue,
- Input: CustomInput
- }
-};
-const onChangeAction = 'select-option';
+import { onFocus } from './core/accessibility';
+import { getDefaultComponents } from './core/constants';
+import { getMemoizedStyles } from './core/styles';
+import { resolveNoOptionsMessage } from './core/utils';
+import { formatGroupLabel, formatOptionLabel, SelectDropdownContext, TypedReactSelect } from './elements';
+import { useNoOptionsAnnouncement } from './hooks/useNoOptionsAnnouncement';
+import { useSelectHandlers } from './hooks/useSelectHandlers';
+import { useSelectOptions } from './hooks/useSelectOptions';
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+/** 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 { onFocus } from './core/accessibility';\nimport { getDefaultComponents } from './core/constants';\nimport { getMemoizedStyles } from './core/styles';\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 { 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 = (inputValue: string) => `Add \"${inputValue}\"`,\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 = 'Select an option',\n  shownOptionsLimit = 6,\n  size,\n  validationMessage,\n  value,\n  zIndex,\n  ...rest\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(validationMessage);\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      }}\n    >\n      <TypedReactSelect\n        activated={activated}\n        aria-live=\"assertive\"\n        ariaLiveMessages={{ onFocus }}\n        components={components}\n        createOptionPosition={createOptionPosition}\n        dropdownWidth={dropdownWidth}\n        error={Boolean(error)}\n        formatCreateLabel={formatCreateLabel}\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) => option.disabled}\n        isSearchable={isSearchable}\n        isValidNewOption={isValidNewOption}\n        menuAlignment={menuAlignment}\n        name={name}\n        noOptionsMessage={noOptionsMessage}\n        options={selectOptions}\n        placeholder={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"]} */");
/**
* A flexible dropdown select component built on top of react-select.
*
@@ -69,149 +64,130 @@
* />
* ```
*/
export const SelectDropdown = ({
+ createOptionPosition,
disabled,
dropdownWidth,
error,
+ formatCreateLabel = inputValue => `Add "${inputValue}"`,
id,
inputProps,
inputWidth,
- isSearchable = false,
+ isCreatable = false,
+ isSearchable: isSearchableProp = false,
+ isValidNewOption,
menuAlignment = 'left',
multiple,
name,
onChange,
+ onCreateOption,
+ onInputChange,
+ onMenuClose,
options,
placeholder = 'Select an option',
shownOptionsLimit = 6,
size,
+ validationMessage,
value,
zIndex,
...rest
}) => {
+ // isSearchable is forced true when isCreatable is true (CreatableSelect requires a text input)
+ const isSearchable = isCreatable || isSearchableProp;
const rawInputId = useId();
- const inputId = name ?? `${id}-select-dropdown-${rawInputId}`;
- const [activated, setActivated] = useState(false);
- const [currentFocusedValue, setCurrentFocusedValue] = useState(undefined);
-
- // these are used to programatically manage the focus state of our multi-select options + 'Remove all' button
+ const inputId = name ?? `${id ?? rawInputId}-select-dropdown-${rawInputId}`;
const removeAllButtonRef = useRef(null);
const selectInputRef = useRef(null);
- const selectOptions = useMemo(() => {
- if (!options || Array.isArray(options) && !options.length || typeof options === 'object' && !Array.isArray(options) && Object.keys(options).length === 0) {
- return [];
- }
- if (isOptionsGrouped(options)) {
- return options;
- }
- return parseOptions({
- options,
- id,
- size
- });
- }, [options, id, size]);
- const parsedValue = useMemo(() => {
- if (isOptionsGrouped(selectOptions)) {
- for (const group of selectOptions) {
- if (group.options) {
- const foundOption = group.options.find(option => option.value === value);
- if (foundOption) return foundOption;
- }
- }
- return undefined;
- }
- return selectOptions.find(option => option.value === value);
- }, [selectOptions, value]);
- const [multiValues, setMultiValues] = useState(multiple &&
- // To keep this efficient for non-multiSelect
- filterValueFromOptions(selectOptions, value, isOptionsGrouped(selectOptions)));
-
- // If the caller changes the initial value, let's update our value to match.
- useEffect(() => {
- const newMultiValues = filterValueFromOptions(selectOptions, value, isOptionsGrouped(selectOptions));
- if (newMultiValues !== multiValues) setMultiValues(newMultiValues);
-
- //
- // We only update this when our passed in options or value changes, not multiValues.
- // eslint-disable-next-line react-hooks/exhaustive-deps
- }, [options, value]);
- const changeHandler = useCallback(optionEvent => {
- setActivated(true);
-
- // We have to do this because the version of typescript we have doesn't have the transitivity of these type guards yet. But, we will soon!
- // Should probably come with: https://codecademy.atlassian.net/browse/GM-354
- const onChangeProps = {
- onChange,
- multiple
- };
- if (isSingleSelectProps(onChangeProps)) {
- const singleOptionEvent = optionEvent;
- onChangeProps.onChange?.(singleOptionEvent, {
- action: onChangeAction,
- option: singleOptionEvent
- });
- }
- if (isMultipleSelectProps(onChangeProps)) {
- setMultiValues(optionEvent);
- onChangeProps.onChange?.(optionEvent, {
- action: onChangeAction,
- option: undefined // At the moment this isn't used, but when multi select is built for real, boom (https://codecademy.atlassian.net/browse/GM-354)
- });
- }
- }, [onChange, multiple]);
- const keyPressHandler = e => {
- if (multiple && e.key === 'Enter' && currentFocusedValue && multiValues) {
- const newMultiValues = removeValueFromSelectedOptions(multiValues, currentFocusedValue);
- if (newMultiValues !== multiValues) setMultiValues(newMultiValues);
- }
- if (removeAllButtonRef.current !== null && e.key === 'ArrowRight' && multiValues && currentFocusedValue === multiValues[multiValues.length - 1].value) {
- removeAllButtonRef.current.focus();
- }
+ const [currentFocusedValue, setCurrentFocusedValue] = useState(undefined);
+ const {
+ selectOptions,
+ parsedValue
+ } = useSelectOptions({
+ options,
+ id,
+ size,
+ value: value
+ });
+ const noOptionsMessage = resolveNoOptionsMessage(validationMessage);
+ const {
+ noOptionsMessageComponent,
+ announcement,
+ clearAnnouncement
+ } = useNoOptionsAnnouncement();
+ const components = useMemo(() => getDefaultComponents(noOptionsMessageComponent), [noOptionsMessageComponent]);
+ const handleMenuClose = () => {
+ clearAnnouncement();
+ onMenuClose?.();
};
+ const {
+ activated,
+ multiValues,
+ changeHandler,
+ keyPressHandler
+ } = useSelectHandlers({
+ onChange,
+ multiple,
+ onCreateOption,
+ selectOptions,
+ value,
+ currentFocusedValue,
+ removeAllButtonRef
+ });
const theme = useTheme();
const memoizedStyles = useMemo(() => {
return getMemoizedStyles(theme, zIndex);
}, [theme, zIndex]);
- return /*#__PURE__*/_jsx(SelectDropdownContext.Provider, {
+ return /*#__PURE__*/_jsxs(SelectDropdownContext.Provider, {
value: {
currentFocusedValue,
setCurrentFocusedValue,
removeAllButtonRef,
selectInputRef
},
- children: /*#__PURE__*/_jsx(TypedReactSelect, {
- ...defaultProps,
+ children: [/*#__PURE__*/_jsx(TypedReactSelect, {
activated: activated,
"aria-live": "assertive",
ariaLiveMessages: {
onFocus
},
+ components: components,
+ createOptionPosition: createOptionPosition,
dropdownWidth: dropdownWidth,
error: Boolean(error),
+ formatCreateLabel: formatCreateLabel,
formatGroupLabel: formatGroupLabel,
formatOptionLabel: formatOptionLabel,
id: id || rest.htmlFor || rawInputId,
inputId: inputId,
inputProps: {
...inputProps
},
inputWidth: inputWidth,
+ isCreatable: isCreatable,
isDisabled: disabled,
isMulti: multiple,
isOptionDisabled: option => option.disabled,
isSearchable: isSearchable,
+ isValidNewOption: isValidNewOption,
menuAlignment: menuAlignment,
name: name,
+ noOptionsMessage: noOptionsMessage,
options: selectOptions,
placeholder: placeholder,
selectRef: selectInputRef,
shownOptionsLimit: shownOptionsLimit,
size: size,
styles: memoizedStyles,
value: multiple ? multiValues : parsedValue,
onChange: changeHandler,
- onKeyDown: multiple ? e => keyPressHandler(e) : undefined,
+ onInputChange: onInputChange,
+ onKeyDown: multiple ? keyPressHandler : undefined,
+ onMenuClose: handleMenuClose,
...rest
- })
+ }), /*#__PURE__*/_jsx(NoOptionsLiveRegion, {
+ "aria-live": "polite",
+ role: "status",
+ children: announcement
+ })]
});
};
\ No newline at end of file