Merge pull request #6999 from tchak/fix-multi-select

fix(multi-select): fix labels on multi select component

app/javascript/components/ComboMultiple.tsx

@@ -5,9 +5,12 @@ import React, {
   useContext,
   createContext,
   useEffect,
-  useLayoutEffect
+  useLayoutEffect,
+  MutableRefObject,
+  ReactNode,
+  ChangeEventHandler,
+  KeyboardEventHandler
 } from 'react';
-import PropTypes from 'prop-types';
 import {
   Combobox,
   ComboboxInput,
@@ -24,22 +27,51 @@ import invariant from 'tiny-invariant';
 
 import { useDeferredSubmit, useHiddenField } from './shared/hooks';
 
-const Context = createContext();
+const Context = createContext<{
+  selectionsRef: MutableRefObject<string[]>;
+  onRemove: (value: string) => void;
+} | null>(null);
 
-const optionValueByLabel = (values, options, label) => {
+type Option = [label: string, value: string];
-  const maybeOption = values.includes(label)
+
+function isOptions(options: string[] | Option[]): options is Option[] {
+  return Array.isArray(options[0]);
+}
+
+const optionValueByLabel = (
+  values: string[],
+  options: Option[],
+  label: string
+): string => {
+  const maybeOption: Option | undefined = values.includes(label)
     ? [label, label]
     : options.find(([optionLabel]) => optionLabel == label);
-  return maybeOption ? maybeOption[1] : undefined;
+  return maybeOption ? maybeOption[1] : '';
 };
-const optionLabelByValue = (values, options, value) => {
+const optionLabelByValue = (
-  const maybeOption = values.includes(value)
+  values: string[],
+  options: Option[],
+  value: string
+): string => {
+  const maybeOption: Option | undefined = values.includes(value)
     ? [value, value]
     : options.find(([, optionValue]) => optionValue == value);
-  return maybeOption ? maybeOption[0] : undefined;
+  return maybeOption ? maybeOption[0] : '';
 };
 
-function ComboMultiple({
+export type ComboMultipleProps = {
+  options: string[] | Option[];
+  id: string;
+  labelledby: string;
+  describedby: string;
+  label: string;
+  group: string;
+  name?: string;
+  selected: string[];
+  acceptNewValues?: boolean;
+};
+
+export default function ComboMultiple({
   options,
   id,
   labelledby,
@@ -49,21 +81,21 @@ function ComboMultiple({
   name = 'value',
   selected,
   acceptNewValues = false
-}) {
+}: ComboMultipleProps) {
   invariant(id || label, 'ComboMultiple: `id` or a `label` are required');
   invariant(group, 'ComboMultiple: `group` is required');
 
-  const inputRef = useRef();
+  const inputRef = useRef<HTMLInputElement>(null);
   const [term, setTerm] = useState('');
   const [selections, setSelections] = useState(selected);
-  const [newValues, setNewValues] = useState([]);
+  const [newValues, setNewValues] = useState<string[]>([]);
   const inputId = useId(id);
   const removedLabelledby = `${inputId}-remove`;
   const selectedLabelledby = `${inputId}-selected`;
 
-  const optionsWithLabels = useMemo(
+  const optionsWithLabels = useMemo<Option[]>(
     () =>
-      Array.isArray(options[0])
+      isOptions(options)
         ? options
         : options.filter((o) => o).map((o) => [o, o]),
     [options]
@@ -94,11 +126,11 @@ function ComboMultiple({
   const [, setHiddenFieldValue, hiddenField] = useHiddenField(group, name);
   const awaitFormSubmit = useDeferredSubmit(hiddenField);
 
-  const handleChange = (event) => {
+  const handleChange: ChangeEventHandler<HTMLInputElement> = (event) => {
     setTerm(event.target.value);
   };
 
-  const saveSelection = (fn) => {
+  const saveSelection = (fn: (selections: string[]) => string[]) => {
     setSelections((selections) => {
       selections = fn(selections);
       setHiddenFieldValue(JSON.stringify(selections));
@@ -106,7 +138,7 @@ function ComboMultiple({
     });
   };
 
-  const onSelect = (value) => {
+  const onSelect = (value: string) => {
     const maybeValue = [...extraOptions, ...optionsWithLabels].find(
       ([val]) => val == value
     );
@@ -134,8 +166,8 @@ function ComboMultiple({
     hidePopover();
   };
 
-  const onRemove = (label) => {
+  const onRemove = (label: string) => {
-    const optionValue = optionValueByLabel(newValues, options, label);
+    const optionValue = optionValueByLabel(newValues, optionsWithLabels, label);
     if (optionValue) {
       saveSelection((selections) =>
         selections.filter((value) => value != optionValue)
@@ -144,10 +176,10 @@ function ComboMultiple({
         newValues.filter((value) => value != optionValue)
       );
     }
-    inputRef.current.focus();
+    inputRef.current?.focus();
   };
 
-  const onKeyDown = (event) => {
+  const onKeyDown: KeyboardEventHandler<HTMLInputElement> = (event) => {
     if (
       isHotkey('enter', event) ||
       isHotkey(' ', event) ||
@@ -210,7 +242,11 @@ function ComboMultiple({
             <ComboboxToken
               key={selection}
               describedby={removedLabelledby}
-              value={optionLabelByValue(newValues, options, selection)}
+              value={optionLabelByValue(
+                newValues,
+                optionsWithLabels,
+                selection
+              )}
             />
           ))}
         </ul>
@@ -263,31 +299,35 @@ function ComboMultiple({
   );
 }
 
-function ComboboxTokenLabel({ onRemove, ...props }) {
+function ComboboxTokenLabel({
-  const selectionsRef = useRef([]);
+  onRemove,
+  children
+}: {
+  onRemove: (value: string) => void;
+  children: ReactNode;
+}) {
+  const selectionsRef = useRef<string[]>([]);
 
   useLayoutEffect(() => {
     selectionsRef.current = [];
-    return () => (selectionsRef.current = []);
+    return () => {
-  });
+      selectionsRef.current = [];
-
+    };
-  const context = {
+  }, []);
-    onRemove,
-    selectionsRef
-  };
 
   return (
-    <Context.Provider value={context}>
+    <Context.Provider
-      <div data-reach-combobox-token-label {...props} />
+      value={{
+        onRemove,
+        selectionsRef
+      }}
+    >
+      <div data-reach-combobox-token-label>{children}</div>
     </Context.Provider>
   );
 }
 
-ComboboxTokenLabel.propTypes = {
+function ComboboxSeparator({ value }: { value: string }) {
-  onRemove: PropTypes.func
-};
-
-function ComboboxSeparator({ value }) {
   return (
     <li aria-disabled="true" role="option" data-reach-combobox-separator>
       {value.slice(2, -2)}
@@ -295,12 +335,17 @@ function ComboboxSeparator({ value }) {
   );
 }
 
-ComboboxSeparator.propTypes = {
+function ComboboxToken({
-  value: PropTypes.string
+  value,
-};
+  describedby,
-
+  ...props
-function ComboboxToken({ value, describedby, ...props }) {
+}: {
-  const { selectionsRef, onRemove } = useContext(Context);
+  value: string;
+  describedby: string;
+}) {
+  const context = useContext(Context);
+  invariant(context, 'invalid context');
+  const { selectionsRef, onRemove } = context;
   useEffect(() => {
     selectionsRef.current.push(value);
   });
@@ -325,31 +370,3 @@ function ComboboxToken({ value, describedby, ...props }) {
     </li>
   );
 }
-
-ComboboxToken.propTypes = {
-  value: PropTypes.string,
-  describedby: PropTypes.string
-};
-
-ComboMultiple.propTypes = {
-  options: PropTypes.oneOfType([
-    PropTypes.arrayOf(PropTypes.string),
-    PropTypes.arrayOf(
-      PropTypes.arrayOf(
-        PropTypes.oneOfType([PropTypes.string, PropTypes.number])
-      )
-    )
-  ]),
-  selected: PropTypes.arrayOf(PropTypes.string),
-  arraySelected: PropTypes.arrayOf(PropTypes.array),
-  acceptNewValues: PropTypes.bool,
-  mandatory: PropTypes.bool,
-  id: PropTypes.string,
-  group: PropTypes.string,
-  name: PropTypes.string,
-  labelledby: PropTypes.string,
-  describedby: PropTypes.string,
-  label: PropTypes.string
-};
-
-export default ComboMultiple;

package.json

@@ -47,6 +47,7 @@
     "@2fd/graphdoc": "^2.4.0",
     "@types/debounce": "^1.2.1",
     "@types/geojson": "^7946.0.8",
+    "@types/is-hotkey": "^0.1.7",
     "@types/mapbox__mapbox-gl-draw": "^1.2.3",
     "@types/rails__ujs": "^6.0.1",
     "@types/react": "^17.0.38",

yarn.lock

@@ -2383,6 +2383,11 @@
   dependencies:
     "@types/node" "*"
 
+"@types/is-hotkey@^0.1.7":
+  version "0.1.7"
+  resolved "https://registry.yarnpkg.com/@types/is-hotkey/-/is-hotkey-0.1.7.tgz#30ec6d4234895230b576728ef77e70a52962f3b3"
+  integrity sha512-yB5C7zcOM7idwYZZ1wKQ3pTfjA9BbvFqRWvKB46GFddxnJtHwi/b9y84ykQtxQPg5qhdpg4Q/kWU3EGoCTmLzQ==
+
 "@types/istanbul-lib-coverage@*", "@types/istanbul-lib-coverage@^2.0.0":
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.3.tgz#4ba8ddb720221f432e443bd5f9117fd22cfd4762"