@oneuptime/common 14.0.7 → 14.0.9

package/build/dist/UI/Components/CustomFields/CustomFieldModelFormFields.js

@@ -0,0 +1,212 @@
+import Detail from "../Detail/Detail";
+import FieldType from "../Types/FieldType";
+import { buildCustomFieldFormFields, CUSTOM_FIELD_NO_VALUE_PLACEHOLDER, getCustomFieldDetailContentClassName, getCustomFieldDisplayValue, getCustomFieldDropdownOptions, } from "./CustomFieldFormFields";
+export { CUSTOM_FIELD_NO_VALUE_PLACEHOLDER } from "./CustomFieldFormFields";
+import { getCustomFieldMappingSource, hasCustomFieldMappingSource, } from "../../../Types/CustomField/CustomFieldMappingCatalog";
+import CustomFieldType from "../../../Types/CustomField/CustomFieldType";
+import { isCustomFieldValueEmpty } from "../../../Types/CustomField/CustomFieldValueMapping";
+import React from "react";
+/*
+ * Custom field inputs inside a record's OWN create form, next to its columns:
+ * the Details step of declaring an incident, and the Custom Fields step of a
+ * new incident template. (The Custom Fields card of a record that exists
+ * edits the values on their own, through CustomFieldsDetail.)
+ *
+ * A ModelForm only knows its model's columns, and the values live in one of
+ * them, `customFields`, a JSON bag keyed by each field's name. So each input
+ * here:
+ *
+ *   - is held under its own form key, "customFields:<name>", never under the
+ *     field's bare name: a field called "title" must not become the title
+ *     input's value;
+ *   - is permission-checked against the model's `customFields` column
+ *     (overrideField), so nobody is shown inputs they may not fill in;
+ *   - is packed back into `customFields` by the page's onBeforeCreate, from
+ *     the values the form submitted (packCustomFieldFormValues). Never from
+ *     the request's misc data, which keeps only truthy values - a Number of 0
+ *     and a switch left off would be dropped there.
+ */
+export const CUSTOM_FIELD_FORM_KEY_PREFIX = "customFields:";
+// Where the form holds one field's value.
+export const getCustomFieldFormKey = (fieldName) => {
+    return `${CUSTOM_FIELD_FORM_KEY_PREFIX}${fieldName}`;
+};
+/**
+ * Whether a field's value will be copied from a related resource rather than
+ * typed: it is mapped (an incident field from a monitor field) and the record
+ * is attached to something to copy from (the incident has a monitor). The
+ * server re-applies the mapping on create, so asking for such a value would
+ * only have it replaced. The same rule the Custom Fields card uses.
+ */
+export const isCustomFieldInherited = (data) => {
+    if (!data.definition.mapFromResourceType ||
+        !data.definition.mapFromCustomFieldName) {
+        return false;
+    }
+    const source = getCustomFieldMappingSource({
+        definitionTableName: data.definitionTableName,
+        resource: data.definition.mapFromResourceType,
+    });
+    if (!source) {
+        return false;
+    }
+    return hasCustomFieldMappingSource({
+        source: source,
+        record: data.values,
+    });
+};
+/*
+ * One field's value on a form's review step, drawn the way the Custom Fields
+ * card draws it: Yes or No, the option's label, the date in the viewer's
+ * time, a text field's number or yes/no as text, a Long text value's lines.
+ */
+export const CustomFieldValueSummary = (props) => {
+    const type = props.definition.customFieldType;
+    const isDropdown = type === CustomFieldType.Dropdown ||
+        type === CustomFieldType.MultiSelectDropdown;
+    return (React.createElement(Detail, { item: {
+            value: isCustomFieldValueEmpty(props.value)
+                ? null
+                : getCustomFieldDisplayValue({
+                    customFieldType: type,
+                    value: props.value,
+                }),
+        }, fields: [
+            {
+                key: "value",
+                // CustomFieldType names a FieldType by value (see CustomFieldType).
+                fieldType: type || FieldType.Text,
+                contentClassName: getCustomFieldDetailContentClassName(type),
+                placeholder: CUSTOM_FIELD_NO_VALUE_PLACEHOLDER,
+                dropdownOptions: isDropdown
+                    ? getCustomFieldDropdownOptions(props.definition.dropdownOptions)
+                    : undefined,
+            },
+        ] }));
+};
+/**
+ * One ModelForm input per definition, in the order given, built by the same
+ * builder as every other custom field form (buildCustomFieldFormFields).
+ */
+export const buildCustomFieldModelFormFields = (data) => {
+    const fields = buildCustomFieldFormFields({
+        definitions: data.definitions,
+        enforceRequiredOnCreate: data.enforceRequiredOnCreate,
+        stepId: data.stepId,
+        getFormKey: getCustomFieldFormKey,
+    });
+    return fields.map((builtField, index) => {
+        const definition = data.definitions[index];
+        const formKey = getCustomFieldFormKey(definition.name);
+        /*
+         * The builder names the field after its name (`field`). Here the
+         * value is not a column, so that goes: the permission check and the
+         * dedupe read `overrideField` and the form key instead.
+         */
+        const rest = Object.assign({}, builtField);
+        delete rest.field;
+        const modelField = Object.assign(Object.assign({}, rest), { overrideField: {
+                customFields: true,
+            }, overrideFieldKey: formKey, getSummaryElement: (values) => {
+                return (React.createElement(CustomFieldValueSummary, { definition: definition, value: values[formKey] }));
+            } });
+        if (data.isShown) {
+            const isShown = data.isShown;
+            modelField.showIf = (values) => {
+                return isShown(definition, (values || {}));
+            };
+        }
+        return modelField;
+    });
+};
+/**
+ * The form's starting values for these fields, taken from a bag keyed by
+ * field name (an incident template's values), under their form keys.
+ */
+export const getCustomFieldFormInitialValues = (data) => {
+    const initialValues = {};
+    if (!isPlainObject(data.customFields)) {
+        return initialValues;
+    }
+    const bag = data.customFields;
+    for (const definition of data.definitions) {
+        if (!Object.prototype.hasOwnProperty.call(bag, definition.name)) {
+            continue;
+        }
+        const value = bag[definition.name];
+        if (isCustomFieldValueEmpty(value)) {
+            continue;
+        }
+        // A text field's number or yes/no as text: its input takes a string.
+        initialValues[getCustomFieldFormKey(definition.name)] =
+            getCustomFieldDisplayValue({
+                customFieldType: definition.customFieldType,
+                value: value,
+            });
+    }
+    return initialValues;
+};
+const isPlainObject = (value) => {
+    return (value !== null &&
+        typeof value === "object" &&
+        !Array.isArray(value) &&
+        !(value instanceof Date));
+};
+/*
+ * A dropdown can still hold the option object it was picked as ({label,
+ * value}) rather than its value; the value is what is stored.
+ */
+const normalizeFormValue = (value) => {
+    const unwrap = (entry) => {
+        if (isPlainObject(entry) &&
+            Object.prototype.hasOwnProperty.call(entry, "value") &&
+            Object.prototype.hasOwnProperty.call(entry, "label")) {
+            return entry["value"];
+        }
+        return entry;
+    };
+    if (Array.isArray(value)) {
+        return value.map(unwrap);
+    }
+    return unwrap(value);
+};
+/**
+ * The record's `customFields` bag: the starting values, with each field the
+ * form asked for set to what it holds. 0 and false are answers and are kept;
+ * a field emptied on the form is removed, so clearing a value a template
+ * filled in sticks. Undefined when there is nothing to store.
+ */
+export const packCustomFieldFormValues = (data) => {
+    const formValues = data.formValues || {};
+    const result = isPlainObject(data.startingCustomFields)
+        ? Object.assign({}, data.startingCustomFields) : {};
+    for (const definition of data.definitions) {
+        if (data.isShown && !data.isShown(definition, formValues)) {
+            continue;
+        }
+        const formKey = getCustomFieldFormKey(definition.name);
+        // The form never held a value for it, so it has nothing to say.
+        if (!Object.prototype.hasOwnProperty.call(formValues, formKey)) {
+            continue;
+        }
+        const value = normalizeFormValue(formValues[formKey]);
+        if (isCustomFieldValueEmpty(value)) {
+            delete result[definition.name];
+            continue;
+        }
+        result[definition.name] = value;
+    }
+    return Object.keys(result).length > 0 ? result : undefined;
+};
+/**
+ * Takes the inputs' values out of a request's misc data, where ModelForm puts
+ * every form-only value: they travel in `customFields`, and nowhere else.
+ */
+export const removeCustomFieldFormKeys = (miscDataProps) => {
+    for (const key of Object.keys(miscDataProps)) {
+        if (key.startsWith(CUSTOM_FIELD_FORM_KEY_PREFIX)) {
+            delete miscDataProps[key];
+        }
+    }
+};
+//# sourceMappingURL=CustomFieldModelFormFields.js.map

package/build/dist/UI/Components/CustomFields/CustomFieldModelFormFields.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"CustomFieldModelFormFields.js","sourceRoot":"","sources":["../../../../../UI/Components/CustomFields/CustomFieldModelFormFields.tsx"],"names":[],"mappings":"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"}

package/build/dist/UI/Components/CustomFields/CustomFieldsDetail.js

@@ -7,26 +7,14 @@ import ComponentLoader from "../ComponentLoader/ComponentLoader";
 import Detail from "../Detail/Detail";
 import ErrorMessage from "../ErrorMessage/ErrorMessage";
 import BasicFormModal from "../FormModal/BasicFormModal";
+import { buildCustomFieldFormFields, getCustomFieldDetailContentClassName, getCustomFieldDisplayValue, getCustomFieldDropdownOptions, sortCustomFieldDefinitions, toCustomFieldFormDefinition, } from "./CustomFieldFormFields";
+import SortOrder from "../../../Types/BaseDatabase/SortOrder";
 import CustomFieldType from "../../../Types/CustomField/CustomFieldType";
-import { parseCustomFieldDropdownOptions, } from "../../../Types/CustomField/CustomFieldDropdownOption";
 import { getCustomFieldMappingRelationSelect, getCustomFieldMappingSources, hasCustomFieldMappingSource, } from "../../../Types/CustomField/CustomFieldMappingCatalog";
-import Color from "../../../Types/Color";
 import { LIMIT_PER_PROJECT } from "../../../Types/Database/LimitMax";
 import IconProp from "../../../Types/Icon/IconProp";
 import React, { useState } from "react";
 import useAsyncEffect from "use-async-effect";
-const parseDropdownOptions = (value) => {
-    return parseCustomFieldDropdownOptions(value).map((option) => {
-        const dropdownOption = {
-            label: option.value,
-            value: option.value,
-        };
-        if (option.color) {
-            dropdownOption.color = Color.fromString(option.color);
-        }
-        return dropdownOption;
-    });
-};
 const CustomFieldsDetail = (props) => {
     const [schemaList, setSchemaList] = useState([]);
     /*
@@ -49,6 +37,13 @@ const CustomFieldsDetail = (props) => {
      * it did before mapping existed.
      */
     const mappingSources = getCustomFieldMappingSources(new props.customFieldType().tableName);
+    /*
+     * Only incident fields have an order today. The column is asked for only
+     * where the definition model has it: this card issues one select for
+     * whichever definition model it is handed, and a column missing from the
+     * model would fail that read for every other resource.
+     */
+    const hasSortOrder = new props.customFieldType().hasColumn("sortOrder");
     const isMappedAndInherited = (schemaItem) => {
         const resource = schemaItem
             .mapFromResourceType;
@@ -91,15 +86,8 @@ const CustomFieldsDetail = (props) => {
                 },
                 limit: LIMIT_PER_PROJECT,
                 skip: 0,
-                select: {
-                    name: true,
-                    customFieldType: true,
-                    description: true,
-                    dropdownOptions: true,
-                    mapFromResourceType: true,
-                    mapFromCustomFieldName: true,
-                },
-                sort: {},
+                select: Object.assign({ name: true, customFieldType: true, description: true, dropdownOptions: true, mapFromResourceType: true, mapFromCustomFieldName: true }, (hasSortOrder ? { sortOrder: true } : {})),
+                sort: (hasSortOrder ? { sortOrder: SortOrder.Ascending } : {}),
             });
             /*
              * The relation a mapped field would inherit through is read alongside
@@ -121,7 +109,13 @@ const CustomFieldsDetail = (props) => {
                 id: props.modelId,
                 select: itemSelect,
             });
-            setSchemaList(schemaList.data);
+            /*
+             * Sorted here as well as by the query: the order has to hold for fields
+             * with no order too (last, in the order the server listed them).
+             */
+            setSchemaList(hasSortOrder
+                ? sortCustomFieldDefinitions(schemaList.data)
+                : schemaList.data);
             setModel(item);
             if (props.onValuesLoaded) {
                 props.onValuesLoaded((item === null || item === void 0 ? void 0 : item["customFields"]) || {});
@@ -220,6 +214,30 @@ const CustomFieldsDetail = (props) => {
             : []),
         ...(props.additionalButtons || []),
     ];
+    /*
+     * The stored values as the card draws them and the edit form starts from
+     * them: a text field's number or yes/no as text
+     * (getCustomFieldDisplayValue). The Markdown viewer draws nothing for a
+     * value that is not a string, and the Rich text editor fails on one, so a
+     * field switched from Number to Rich text could be neither seen nor
+     * edited. Every other value, and every key no field has, is as stored.
+     */
+    const getDisplayValues = () => {
+        const stored = ((model === null || model === void 0 ? void 0 : model["customFields"]) ||
+            {});
+        const displayed = Object.assign({}, stored);
+        for (const schemaItem of schemaList) {
+            const name = schemaItem.name;
+            if (typeof name === "string" &&
+                Object.prototype.hasOwnProperty.call(stored, name)) {
+                displayed[name] = getCustomFieldDisplayValue({
+                    customFieldType: schemaItem.customFieldType,
+                    value: stored[name],
+                });
+            }
+        }
+        return displayed;
+    };
     return (React.createElement(Card, { title: props.title, description: props.description, buttons: cardButtons, headerLayout: props.headerLayout },
         React.createElement("div", { className: "border-t border-gray-200 px-4 py-5 sm:px-6 -m-6 -mt-2" },
             isLoading && !loadError && React.createElement(ComponentLoader, null),
@@ -227,7 +245,7 @@ const CustomFieldsDetail = (props) => {
             loadError && React.createElement(ErrorMessage, { message: loadError }),
             saveError && React.createElement(ErrorMessage, { message: saveError }),
             !isLoading && !loadError && schemaList.length > 0 && !model && (React.createElement(ErrorMessage, { message: "Item not found" })),
-            !isLoading && !loadError && schemaList.length > 0 && model && (React.createElement(Detail, { id: props.name, item: model["customFields"] || {}, fields: schemaList.map((schemaItem) => {
+            !isLoading && !loadError && schemaList.length > 0 && model && (React.createElement(Detail, { id: props.name, item: getDisplayValues(), fields: schemaList.map((schemaItem) => {
                     const isDropdown = schemaItem.customFieldType ===
                         CustomFieldType.Dropdown ||
                         schemaItem.customFieldType ===
@@ -237,9 +255,10 @@ const CustomFieldsDetail = (props) => {
                         title: schemaItem.name,
                         description: getMappedDescription(schemaItem),
                         fieldType: schemaItem.customFieldType,
+                        contentClassName: getCustomFieldDetailContentClassName(schemaItem.customFieldType),
                         placeholder: "No data entered",
                         dropdownOptions: isDropdown
-                            ? parseDropdownOptions(schemaItem.dropdownOptions)
+                            ? getCustomFieldDropdownOptions(schemaItem.dropdownOptions)
                             : undefined,
                     };
                 }), showDetailsInNumberOfColumns: 1 })),
@@ -248,7 +267,7 @@ const CustomFieldsDetail = (props) => {
                 }, onSubmit: async (data) => {
                     await onSave(data).catch();
                 }, formProps: {
-                    initialValues: (model === null || model === void 0 ? void 0 : model["customFields"]) || {},
+                    initialValues: getDisplayValues(),
                     /*
                      * Mapped fields are left OUT of the form rather than rendered
                      * disabled: `Field.disabled` is honoured by only three of the
@@ -259,28 +278,24 @@ const CustomFieldsDetail = (props) => {
                      * from the record's existing bag — and the server re-applies the
                      * mapping on update either way.
                      */
-                    fields: schemaList
-                        .filter((schemaItem) => {
-                        return !isMappedAndInherited(schemaItem);
-                    })
-                        .map((schemaItem) => {
-                        const isDropdown = schemaItem.customFieldType ===
-                            CustomFieldType.Dropdown ||
-                            schemaItem.customFieldType ===
-                                CustomFieldType.MultiSelectDropdown;
-                        return {
-                            field: {
-                                [schemaItem.name]: true,
-                            },
-                            title: schemaItem.name,
-                            description: schemaItem.description,
-                            fieldType: schemaItem.customFieldType,
-                            required: false,
-                            placeholder: "",
-                            dropdownOptions: isDropdown
-                                ? parseDropdownOptions(schemaItem.dropdownOptions)
-                                : undefined,
-                        };
+                    /*
+                     * Every field optional, "Required on create" included: that
+                     * applies when an incident is declared, and fixing one field on
+                     * an incident a monitor opened mid-outage must not demand all
+                     * the others first.
+                     */
+                    fields: buildCustomFieldFormFields({
+                        definitions: schemaList
+                            .filter((schemaItem) => {
+                            return !isMappedAndInherited(schemaItem);
+                        })
+                            .map((schemaItem) => {
+                            return toCustomFieldFormDefinition(schemaItem);
+                        })
+                            .filter((definition) => {
+                            return definition !== null;
+                        }),
+                        enforceRequiredOnCreate: false,
                     }),
                 } })))));
 };

package/build/dist/UI/Components/CustomFields/CustomFieldsDetail.js.map

@@ -1 +1 @@
-{"version":3,"file":"CustomFieldsDetail.js","sourceRoot":"","sources":["../../../../../UI/Components/CustomFields/CustomFieldsDetail.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"CustomFieldsDetail.js","sourceRoot":"","sources":["../../../../../UI/Components/CustomFields/CustomFieldsDetail.tsx"],"names":[],"mappings":"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"}

package/build/dist/UI/Components/EntityDropdown/EntityDropdown.js

@@ -301,6 +301,7 @@ const EntityDropdown = (props) => {
     const containerRef = useRef(null);
     const controlRef = useRef(null);
     const inputRef = useRef(null);
+    const valueButtonRef = useRef(null);
     const debounceRef = useRef(null);
     const searchSeqRef = useRef(0);
     const [menuPosition, setMenuPosition] = useState(null);
@@ -370,6 +371,55 @@ const EntityDropdown = (props) => {
             document.removeEventListener("mousedown", handle);
         };
     }, []);
+    /*
+     * The keyboard's side of the click-outside above. Tabbing out of the
+     * dropdown - from the input, or on past the last option in the menu - onto
+     * the next field used to leave the menu open, and when that field opened a
+     * popup of its own (the next dropdown, the Affected Resources picker) the
+     * two stacked on top of each other. The menu is a DOM child of the
+     * container (laid out fixed, never portalled), so moving between the input,
+     * the chips, the menu's tabs and its options stays inside and keeps it open.
+     *
+     * Only a move onto another element closes it. With no element to go to
+     * (relatedTarget null, or the document itself) focus went nowhere in
+     * particular - the window lost focus, a press landed on something that
+     * takes no focus, the focused option unmounted - and presses are for the
+     * listener above to judge.
+     */
+    const closeWhenFocusLeaves = (event) => {
+        const nextFocused = event.relatedTarget;
+        if (!(nextFocused instanceof Element) ||
+            event.currentTarget.contains(nextFocused)) {
+            return;
+        }
+        setIsOpen(false);
+        setHighlightedIndex(-1);
+    };
+    /*
+     * A single-select showing its value swaps elements as the menu opens and
+     * closes: the value button while closed, the search input while open. Focus
+     * meant for the field across that swap has to wait for the element taking
+     * over, which is not mounted yet when the swap is asked for. Set by the
+     * value button, which hands focus to the search input as the menu opens,
+     * and by Escape, which hands it back to the value button as the menu
+     * closes (see closeMenuOnEscape). Without it focus went down with the
+     * element being replaced, to the page: typing did not search, focus could
+     * never leave the dropdown to close the menu (see closeWhenFocusLeaves),
+     * and a keyboard user was left outside the field they were working in.
+     */
+    const focusFieldAfterSwapRef = useRef(false);
+    useLayoutEffect(() => {
+        var _a, _b;
+        if (!focusFieldAfterSwapRef.current) {
+            return;
+        }
+        focusFieldAfterSwapRef.current = false;
+        if (isOpen) {
+            (_a = inputRef.current) === null || _a === void 0 ? void 0 : _a.focus();
+            return;
+        }
+        (_b = valueButtonRef.current) === null || _b === void 0 ? void 0 : _b.focus();
+    }, [isOpen]);
     useEffect(() => {
         return () => {
             if (debounceRef.current !== null) {
@@ -916,7 +966,39 @@ const EntityDropdown = (props) => {
      */
     const placeholderText = props.placeholder || "Select...";
     const showSingleSelectedText = !isMulti && !isOpen && selectedOptions.length > 0;
-    return (React.createElement("div", { ref: containerRef, id: props.id, className: props.className || "relative mt-2 mb-1 w-full" },
+    /*
+     * Escape while the menu is open closes just the menu, wherever focus is in
+     * the dropdown: the search input, or - reached with Tab - an option, one of
+     * the menu's tabs or footer buttons, a chip or the Clear button. It is
+     * claimed, so Modal's document listener never hears it: that listener
+     * closes the whole form and throws away its unsaved edits, which is what
+     * Escape on a Tab-reached option used to do while Escape in the input only
+     * closed the menu. With the menu already closed Escape is left alone, so
+     * the next press still closes the modal.
+     *
+     * Focus goes back to the field rather than down with the menu's buttons.
+     */
+    const closeMenuOnEscape = (event) => {
+        var _a;
+        if (event.key !== "Escape" || !isOpen) {
+            return;
+        }
+        event.preventDefault();
+        if (!isMulti && selectedOptions.length > 0) {
+            /*
+             * Closing swaps the search input for the value button, so focus waits
+             * for the button to mount (see focusFieldAfterSwapRef).
+             */
+            focusFieldAfterSwapRef.current = true;
+        }
+        else {
+            // Focusing the input asks to open the menu; closing it after wins.
+            (_a = inputRef.current) === null || _a === void 0 ? void 0 : _a.focus();
+        }
+        setIsOpen(false);
+        setHighlightedIndex(-1);
+    };
+    return (React.createElement("div", { ref: containerRef, id: props.id, className: props.className || "relative mt-2 mb-1 w-full", onBlur: closeWhenFocusLeaves, onKeyDown: closeMenuOnEscape },
         isMulti && selectedOptions.length > 0 && (React.createElement("div", { className: "mb-2 flex flex-wrap gap-1.5" }, selectedOptions.map((opt) => {
             const key = valueKey(opt.value);
             const colorStr = optionColorString(opt);
@@ -930,13 +1012,12 @@ const EntityDropdown = (props) => {
                         React.createElement("path", { fillRule: "evenodd", d: "M4.293 4.293a1 1 0 011.414 0L10 8.586l4.293-4.293a1 1 0 111.414 1.414L11.414 10l4.293 4.293a1 1 0 01-1.414 1.414L10 11.414l-4.293 4.293a1 1 0 01-1.414-1.414L8.586 10 4.293 5.707a1 1 0 010-1.414z", clipRule: "evenodd" }))))));
         }))),
         React.createElement("div", { ref: controlRef, className: "relative" },
-            showSingleSelectedText && (React.createElement("button", { type: "button", disabled: props.disabled, "aria-labelledby": props.ariaLabelledby, onClick: () => {
-                    var _a;
+            showSingleSelectedText && (React.createElement("button", { ref: valueButtonRef, type: "button", disabled: props.disabled, "aria-labelledby": props.ariaLabelledby, onClick: () => {
                     if (props.disabled) {
                         return;
                     }
+                    focusFieldAfterSwapRef.current = true;
                     setIsOpen(true);
-                    (_a = inputRef.current) === null || _a === void 0 ? void 0 : _a.focus();
                 }, onFocus: () => {
                     var _a;
                     (_a = props.onFocus) === null || _a === void 0 ? void 0 : _a.call(props);
@@ -1030,16 +1111,10 @@ const EntityDropdown = (props) => {
                             }
                             return;
                         }
-                        if (event.key === "Escape") {
-                            /*
-                             * The modal also listens for Escape. Consume it here so the
-                             * first press closes the menu without dismissing the form.
-                             */
-                            event.preventDefault();
-                            setIsOpen(false);
-                            setHighlightedIndex(-1);
-                            return;
-                        }
+                        /*
+                         * Escape bubbles to the container, which closes the menu for
+                         * every control in the dropdown alike (closeMenuOnEscape).
+                         */
                         if (event.key === "Backspace" &&
                             searchQuery === "" &&
                             isMulti &&