@jbrowse/app-core 5.0.0-beta.1 → 5.0.0-beta.10

package/esm/Assemblies/AssembliesMixin.d.ts

@@ -14,86 +14,87 @@ export declare function AssembliesMixin(_pluginManager: PluginManager, assemblyC
      */
     sessionAssemblies: import("@jbrowse/mobx-state-tree").IOptionalIType<import("@jbrowse/mobx-state-tree").IArrayType<import("@jbrowse/core/configuration/configurationSchema").ConfigurationSchemaType<{
         readonly aliases: {
-            readonly type: "stringArray";
-            readonly defaultValue: readonly [];
-            readonly description: "Other possible names for the assembly";
+            type: "stringArray";
+        } & {
+            defaultValue: unknown;
         };
         readonly sequence: import("@jbrowse/core/configuration").AnyConfigurationSchemaType;
         readonly refNameColors: {
-            readonly type: "stringArray";
-            readonly defaultValue: readonly [];
-            readonly description: "Define custom colors for each reference sequence. Will cycle through this list if there are not enough colors for every sequence.";
+            type: "stringArray";
+        } & {
+            defaultValue: unknown;
         };
         readonly geneticCodes: {
-            readonly type: "frozen";
-            readonly defaultValue: {};
-            readonly description: "Map of reference sequence name to NCBI genetic-code (translation table) id for sequences not using the standard code, e.g. { \"chrM\": 2 }";
+            type: "frozen";
+        } & {
+            defaultValue: unknown;
         };
         readonly geneticCodesLocation: {
-            readonly type: "fileLocation";
-            readonly defaultValue: {
-                readonly uri: "";
-                readonly locationType: "UriLocation";
-            };
-            readonly description: "Optional TSV file of refName<TAB>geneticCodeId, an alternative to inlining the geneticCodes map";
+            type: "maybeFileLocation";
         };
         readonly refNameAliases: import("@jbrowse/core/configuration/configurationSchema").ConfigurationSchemaType<{
-            readonly adapter: import("@jbrowse/mobx-state-tree").IAnyType;
-        }, import("@jbrowse/core/configuration/configurationSchema").ConfigurationSchemaOptions<undefined, undefined>>;
+            readonly adapter: import("@jbrowse/core/PluginManager").PluggableConfigSchemaType;
+        }, import("@jbrowse/core/configuration/configurationSchema").ConfigurationSchemaOptions<undefined, undefined, undefined, import("@jbrowse/core/configuration").ConfigurationSchemaRequirement<Partial<Record<string, string[]>>, string>, any>>;
         readonly cytobands: import("@jbrowse/core/configuration/configurationSchema").ConfigurationSchemaType<{
-            readonly adapter: import("@jbrowse/mobx-state-tree").IAnyType;
-        }, import("@jbrowse/core/configuration/configurationSchema").ConfigurationSchemaOptions<undefined, undefined>>;
+            readonly adapter: import("@jbrowse/core/PluginManager").PluggableConfigSchemaType;
+        }, import("@jbrowse/core/configuration/configurationSchema").ConfigurationSchemaOptions<undefined, undefined, undefined, import("@jbrowse/core/configuration").ConfigurationSchemaRequirement<Partial<Record<string, string[]>>, string>, any>>;
         readonly displayName: {
-            readonly type: "string";
-            readonly defaultValue: "";
-            readonly description: "A human readable display name for the assembly e.g. \"Homo sapiens (hg38)\" while the assembly name may just be \"hg38\"";
+            type: "string";
+        } & {
+            defaultValue: string;
         };
-    }, import("@jbrowse/core/configuration/configurationSchema").ConfigurationSchemaOptions<undefined, "name">>>, [undefined]>;
+        name: {
+            type: "string";
+        } & {
+            defaultValue: string;
+        };
+    }, import("@jbrowse/core/configuration/configurationSchema").ConfigurationSchemaOptions<undefined, "name", undefined, import("@jbrowse/core/configuration").ConfigurationSchemaRequirement<Partial<Record<string, string[]>>, string>, any>>>, [undefined]>;
     /**
      * #property
      */
     temporaryAssemblies: import("@jbrowse/mobx-state-tree").IOptionalIType<import("@jbrowse/mobx-state-tree").IArrayType<import("@jbrowse/core/configuration/configurationSchema").ConfigurationSchemaType<{
         readonly aliases: {
-            readonly type: "stringArray";
-            readonly defaultValue: readonly [];
-            readonly description: "Other possible names for the assembly";
+            type: "stringArray";
+        } & {
+            defaultValue: unknown;
         };
         readonly sequence: import("@jbrowse/core/configuration").AnyConfigurationSchemaType;
         readonly refNameColors: {
-            readonly type: "stringArray";
-            readonly defaultValue: readonly [];
-            readonly description: "Define custom colors for each reference sequence. Will cycle through this list if there are not enough colors for every sequence.";
+            type: "stringArray";
+        } & {
+            defaultValue: unknown;
         };
         readonly geneticCodes: {
-            readonly type: "frozen";
-            readonly defaultValue: {};
-            readonly description: "Map of reference sequence name to NCBI genetic-code (translation table) id for sequences not using the standard code, e.g. { \"chrM\": 2 }";
+            type: "frozen";
+        } & {
+            defaultValue: unknown;
         };
         readonly geneticCodesLocation: {
-            readonly type: "fileLocation";
-            readonly defaultValue: {
-                readonly uri: "";
-                readonly locationType: "UriLocation";
-            };
-            readonly description: "Optional TSV file of refName<TAB>geneticCodeId, an alternative to inlining the geneticCodes map";
+            type: "maybeFileLocation";
         };
         readonly refNameAliases: import("@jbrowse/core/configuration/configurationSchema").ConfigurationSchemaType<{
-            readonly adapter: import("@jbrowse/mobx-state-tree").IAnyType;
-        }, import("@jbrowse/core/configuration/configurationSchema").ConfigurationSchemaOptions<undefined, undefined>>;
+            readonly adapter: import("@jbrowse/core/PluginManager").PluggableConfigSchemaType;
+        }, import("@jbrowse/core/configuration/configurationSchema").ConfigurationSchemaOptions<undefined, undefined, undefined, import("@jbrowse/core/configuration").ConfigurationSchemaRequirement<Partial<Record<string, string[]>>, string>, any>>;
         readonly cytobands: import("@jbrowse/core/configuration/configurationSchema").ConfigurationSchemaType<{
-            readonly adapter: import("@jbrowse/mobx-state-tree").IAnyType;
-        }, import("@jbrowse/core/configuration/configurationSchema").ConfigurationSchemaOptions<undefined, undefined>>;
+            readonly adapter: import("@jbrowse/core/PluginManager").PluggableConfigSchemaType;
+        }, import("@jbrowse/core/configuration/configurationSchema").ConfigurationSchemaOptions<undefined, undefined, undefined, import("@jbrowse/core/configuration").ConfigurationSchemaRequirement<Partial<Record<string, string[]>>, string>, any>>;
         readonly displayName: {
-            readonly type: "string";
-            readonly defaultValue: "";
-            readonly description: "A human readable display name for the assembly e.g. \"Homo sapiens (hg38)\" while the assembly name may just be \"hg38\"";
+            type: "string";
+        } & {
+            defaultValue: string;
+        };
+        name: {
+            type: "string";
+        } & {
+            defaultValue: string;
         };
-    }, import("@jbrowse/core/configuration/configurationSchema").ConfigurationSchemaOptions<undefined, "name">>>, [undefined]>;
+    }, import("@jbrowse/core/configuration/configurationSchema").ConfigurationSchemaOptions<undefined, "name", undefined, import("@jbrowse/core/configuration").ConfigurationSchemaRequirement<Partial<Record<string, string[]>>, string>, any>>>, [undefined]>;
 }, {
     /**
      * #method
-     * The assembly config already carrying `name`, from any of the three
-     * arrays the assemblyManager draws on, or undefined.
+     * The assembly config answering to `name`, as its name or one of its
+     * aliases, from any of the three arrays the assemblyManager draws on,
+     * or undefined.
      *
      * One namespace, because `name` is the assembly config's MST
      * identifier: a second config carrying a name one of the others
@@ -102,52 +103,87 @@ export declare function AssembliesMixin(_pluginManager: PluginManager, assemblyC
      * MST then throws on every read of one — inside the manager's own
      * autorun and inside `assemblyNameMap`, which takes the session down.
      * So each add path checks all three, not just the array it pushes to.
+     * Aliases count too: a new assembly named `GRCh38` beside an `hg38`
+     * aliased `GRCh38` would leave `get('GRCh38')` to array order.
      */
-    findAssemblyConf(name: unknown): BaseAssemblyConfigModel | undefined;
+    findAssemblyConf(name: string): BaseAssemblyConfigModel | undefined;
 } & {
     /**
      * #action
      */
-    addSessionAssembly(conf: AnyConfiguration): (import("@jbrowse/mobx-state-tree").ModelInstanceTypeProps<Record<string, any>> & {
-        setSubschema(slotName: string, data: Record<string, unknown>): any;
-        setSlot(slotName: string, value: unknown): void;
-    } & import("@jbrowse/mobx-state-tree").IStateTreeNode<import("@jbrowse/core/configuration/configurationSchema").ConfigurationSchemaType<{
+    addSessionAssembly(conf: AnyConfiguration): (import("@jbrowse/core/configuration").ConfigNodeProps<{
+        readonly aliases: {
+            type: "stringArray";
+        } & {
+            defaultValue: unknown;
+        };
+        readonly sequence: import("@jbrowse/core/configuration").AnyConfigurationSchemaType;
+        readonly refNameColors: {
+            type: "stringArray";
+        } & {
+            defaultValue: unknown;
+        };
+        readonly geneticCodes: {
+            type: "frozen";
+        } & {
+            defaultValue: unknown;
+        };
+        readonly geneticCodesLocation: {
+            type: "maybeFileLocation";
+        };
+        readonly refNameAliases: import("@jbrowse/core/configuration/configurationSchema").ConfigurationSchemaType<{
+            readonly adapter: import("@jbrowse/core/PluginManager").PluggableConfigSchemaType;
+        }, import("@jbrowse/core/configuration/configurationSchema").ConfigurationSchemaOptions<undefined, undefined, undefined, import("@jbrowse/core/configuration").ConfigurationSchemaRequirement<Partial<Record<string, string[]>>, string>, any>>;
+        readonly cytobands: import("@jbrowse/core/configuration/configurationSchema").ConfigurationSchemaType<{
+            readonly adapter: import("@jbrowse/core/PluginManager").PluggableConfigSchemaType;
+        }, import("@jbrowse/core/configuration/configurationSchema").ConfigurationSchemaOptions<undefined, undefined, undefined, import("@jbrowse/core/configuration").ConfigurationSchemaRequirement<Partial<Record<string, string[]>>, string>, any>>;
+        readonly displayName: {
+            type: "string";
+        } & {
+            defaultValue: string;
+        };
+        name: {
+            type: "string";
+        } & {
+            defaultValue: string;
+        };
+    }> & import("@jbrowse/core/configuration").ConfigNodeActions & import("@jbrowse/core/configuration").ConfigNodeBrand<import("@jbrowse/core/configuration/configurationSchema").ConfigurationSchemaType<{
         readonly aliases: {
-            readonly type: "stringArray";
-            readonly defaultValue: readonly [];
-            readonly description: "Other possible names for the assembly";
+            type: "stringArray";
+        } & {
+            defaultValue: unknown;
         };
         readonly sequence: import("@jbrowse/core/configuration").AnyConfigurationSchemaType;
         readonly refNameColors: {
-            readonly type: "stringArray";
-            readonly defaultValue: readonly [];
-            readonly description: "Define custom colors for each reference sequence. Will cycle through this list if there are not enough colors for every sequence.";
+            type: "stringArray";
+        } & {
+            defaultValue: unknown;
         };
         readonly geneticCodes: {
-            readonly type: "frozen";
-            readonly defaultValue: {};
-            readonly description: "Map of reference sequence name to NCBI genetic-code (translation table) id for sequences not using the standard code, e.g. { \"chrM\": 2 }";
+            type: "frozen";
+        } & {
+            defaultValue: unknown;
         };
         readonly geneticCodesLocation: {
-            readonly type: "fileLocation";
-            readonly defaultValue: {
-                readonly uri: "";
-                readonly locationType: "UriLocation";
-            };
-            readonly description: "Optional TSV file of refName<TAB>geneticCodeId, an alternative to inlining the geneticCodes map";
+            type: "maybeFileLocation";
         };
         readonly refNameAliases: import("@jbrowse/core/configuration/configurationSchema").ConfigurationSchemaType<{
-            readonly adapter: import("@jbrowse/mobx-state-tree").IAnyType;
-        }, import("@jbrowse/core/configuration/configurationSchema").ConfigurationSchemaOptions<undefined, undefined>>;
+            readonly adapter: import("@jbrowse/core/PluginManager").PluggableConfigSchemaType;
+        }, import("@jbrowse/core/configuration/configurationSchema").ConfigurationSchemaOptions<undefined, undefined, undefined, import("@jbrowse/core/configuration").ConfigurationSchemaRequirement<Partial<Record<string, string[]>>, string>, any>>;
         readonly cytobands: import("@jbrowse/core/configuration/configurationSchema").ConfigurationSchemaType<{
-            readonly adapter: import("@jbrowse/mobx-state-tree").IAnyType;
-        }, import("@jbrowse/core/configuration/configurationSchema").ConfigurationSchemaOptions<undefined, undefined>>;
+            readonly adapter: import("@jbrowse/core/PluginManager").PluggableConfigSchemaType;
+        }, import("@jbrowse/core/configuration/configurationSchema").ConfigurationSchemaOptions<undefined, undefined, undefined, import("@jbrowse/core/configuration").ConfigurationSchemaRequirement<Partial<Record<string, string[]>>, string>, any>>;
         readonly displayName: {
-            readonly type: "string";
-            readonly defaultValue: "";
-            readonly description: "A human readable display name for the assembly e.g. \"Homo sapiens (hg38)\" while the assembly name may just be \"hg38\"";
+            type: "string";
+        } & {
+            defaultValue: string;
         };
-    }, import("@jbrowse/core/configuration/configurationSchema").ConfigurationSchemaOptions<undefined, "name">>>) | undefined;
+        name: {
+            type: "string";
+        } & {
+            defaultValue: string;
+        };
+    }, import("@jbrowse/core/configuration/configurationSchema").ConfigurationSchemaOptions<undefined, "name", undefined, import("@jbrowse/core/configuration").ConfigurationSchemaRequirement<Partial<Record<string, string[]>>, string>, any>>>) | undefined;
     /**
      * #action
      */
@@ -164,46 +200,79 @@ export declare function AssembliesMixin(_pluginManager: PluginManager, assemblyC
      * #action
      * used for read vs ref type assemblies.
      */
-    addTemporaryAssembly(conf: AnyConfiguration): (import("@jbrowse/mobx-state-tree").ModelInstanceTypeProps<Record<string, any>> & {
-        setSubschema(slotName: string, data: Record<string, unknown>): any;
-        setSlot(slotName: string, value: unknown): void;
-    } & import("@jbrowse/mobx-state-tree").IStateTreeNode<import("@jbrowse/core/configuration/configurationSchema").ConfigurationSchemaType<{
+    addTemporaryAssembly(conf: AnyConfiguration): (import("@jbrowse/core/configuration").ConfigNodeProps<{
+        readonly aliases: {
+            type: "stringArray";
+        } & {
+            defaultValue: unknown;
+        };
+        readonly sequence: import("@jbrowse/core/configuration").AnyConfigurationSchemaType;
+        readonly refNameColors: {
+            type: "stringArray";
+        } & {
+            defaultValue: unknown;
+        };
+        readonly geneticCodes: {
+            type: "frozen";
+        } & {
+            defaultValue: unknown;
+        };
+        readonly geneticCodesLocation: {
+            type: "maybeFileLocation";
+        };
+        readonly refNameAliases: import("@jbrowse/core/configuration/configurationSchema").ConfigurationSchemaType<{
+            readonly adapter: import("@jbrowse/core/PluginManager").PluggableConfigSchemaType;
+        }, import("@jbrowse/core/configuration/configurationSchema").ConfigurationSchemaOptions<undefined, undefined, undefined, import("@jbrowse/core/configuration").ConfigurationSchemaRequirement<Partial<Record<string, string[]>>, string>, any>>;
+        readonly cytobands: import("@jbrowse/core/configuration/configurationSchema").ConfigurationSchemaType<{
+            readonly adapter: import("@jbrowse/core/PluginManager").PluggableConfigSchemaType;
+        }, import("@jbrowse/core/configuration/configurationSchema").ConfigurationSchemaOptions<undefined, undefined, undefined, import("@jbrowse/core/configuration").ConfigurationSchemaRequirement<Partial<Record<string, string[]>>, string>, any>>;
+        readonly displayName: {
+            type: "string";
+        } & {
+            defaultValue: string;
+        };
+        name: {
+            type: "string";
+        } & {
+            defaultValue: string;
+        };
+    }> & import("@jbrowse/core/configuration").ConfigNodeActions & import("@jbrowse/core/configuration").ConfigNodeBrand<import("@jbrowse/core/configuration/configurationSchema").ConfigurationSchemaType<{
         readonly aliases: {
-            readonly type: "stringArray";
-            readonly defaultValue: readonly [];
-            readonly description: "Other possible names for the assembly";
+            type: "stringArray";
+        } & {
+            defaultValue: unknown;
         };
         readonly sequence: import("@jbrowse/core/configuration").AnyConfigurationSchemaType;
         readonly refNameColors: {
-            readonly type: "stringArray";
-            readonly defaultValue: readonly [];
-            readonly description: "Define custom colors for each reference sequence. Will cycle through this list if there are not enough colors for every sequence.";
+            type: "stringArray";
+        } & {
+            defaultValue: unknown;
         };
         readonly geneticCodes: {
-            readonly type: "frozen";
-            readonly defaultValue: {};
-            readonly description: "Map of reference sequence name to NCBI genetic-code (translation table) id for sequences not using the standard code, e.g. { \"chrM\": 2 }";
+            type: "frozen";
+        } & {
+            defaultValue: unknown;
         };
         readonly geneticCodesLocation: {
-            readonly type: "fileLocation";
-            readonly defaultValue: {
-                readonly uri: "";
-                readonly locationType: "UriLocation";
-            };
-            readonly description: "Optional TSV file of refName<TAB>geneticCodeId, an alternative to inlining the geneticCodes map";
+            type: "maybeFileLocation";
         };
         readonly refNameAliases: import("@jbrowse/core/configuration/configurationSchema").ConfigurationSchemaType<{
-            readonly adapter: import("@jbrowse/mobx-state-tree").IAnyType;
-        }, import("@jbrowse/core/configuration/configurationSchema").ConfigurationSchemaOptions<undefined, undefined>>;
+            readonly adapter: import("@jbrowse/core/PluginManager").PluggableConfigSchemaType;
+        }, import("@jbrowse/core/configuration/configurationSchema").ConfigurationSchemaOptions<undefined, undefined, undefined, import("@jbrowse/core/configuration").ConfigurationSchemaRequirement<Partial<Record<string, string[]>>, string>, any>>;
         readonly cytobands: import("@jbrowse/core/configuration/configurationSchema").ConfigurationSchemaType<{
-            readonly adapter: import("@jbrowse/mobx-state-tree").IAnyType;
-        }, import("@jbrowse/core/configuration/configurationSchema").ConfigurationSchemaOptions<undefined, undefined>>;
+            readonly adapter: import("@jbrowse/core/PluginManager").PluggableConfigSchemaType;
+        }, import("@jbrowse/core/configuration/configurationSchema").ConfigurationSchemaOptions<undefined, undefined, undefined, import("@jbrowse/core/configuration").ConfigurationSchemaRequirement<Partial<Record<string, string[]>>, string>, any>>;
         readonly displayName: {
-            readonly type: "string";
-            readonly defaultValue: "";
-            readonly description: "A human readable display name for the assembly e.g. \"Homo sapiens (hg38)\" while the assembly name may just be \"hg38\"";
+            type: "string";
+        } & {
+            defaultValue: string;
+        };
+        name: {
+            type: "string";
+        } & {
+            defaultValue: string;
         };
-    }, import("@jbrowse/core/configuration/configurationSchema").ConfigurationSchemaOptions<undefined, "name">>>) | undefined;
+    }, import("@jbrowse/core/configuration/configurationSchema").ConfigurationSchemaOptions<undefined, "name", undefined, import("@jbrowse/core/configuration").ConfigurationSchemaRequirement<Partial<Record<string, string[]>>, string>, any>>>) | undefined;
     /**
      * #action
      */

package/esm/Assemblies/AssembliesMixin.js

@@ -25,8 +25,9 @@ export function AssembliesMixin(_pluginManager, assemblyConfigSchemasType) {
         return {
             /**
              * #method
-             * The assembly config already carrying `name`, from any of the three
-             * arrays the assemblyManager draws on, or undefined.
+             * The assembly config answering to `name`, as its name or one of its
+             * aliases, from any of the three arrays the assemblyManager draws on,
+             * or undefined.
              *
              * One namespace, because `name` is the assembly config's MST
              * identifier: a second config carrying a name one of the others
@@ -35,13 +36,17 @@ export function AssembliesMixin(_pluginManager, assemblyConfigSchemasType) {
              * MST then throws on every read of one — inside the manager's own
              * autorun and inside `assemblyNameMap`, which takes the session down.
              * So each add path checks all three, not just the array it pushes to.
+             * Aliases count too: a new assembly named `GRCh38` beside an `hg38`
+             * aliased `GRCh38` would leave `get('GRCh38')` to array order.
              */
             findAssemblyConf(name) {
-                return [
+                const confs = [
                     ...self.jbrowse.assemblies,
                     ...self.sessionAssemblies,
                     ...self.temporaryAssemblies,
-                ].find(f => f.name === name);
+                ];
+                return (confs.find(f => f.name === name) ??
+                    confs.find(f => f.aliases.includes(name)));
             },
         };
     })
@@ -83,12 +88,12 @@ export function AssembliesMixin(_pluginManager, assemblyConfigSchemasType) {
              * #action
              */
             removeAssembly(name) {
-                if (self.adminMode) {
-                    self.jbrowse.removeAssemblyConf(name);
-                }
-                else {
+                if (self.sessionAssemblies.some(a => a.name === name)) {
                     this.removeSessionAssembly(name);
                 }
+                else if (self.adminMode) {
+                    self.jbrowse.removeAssemblyConf(name);
+                }
             },
             /**
              * #action

package/esm/HistoryManagement/index.d.ts

@@ -1,14 +1,5 @@
-/**
- * Whether the user is typing into something with an undo stack of its own.
- *
- * Session undo must not steal the text editor's. The keydown listener below is
- * on `document`, so it sees ctrl+z no matter what has focus — including the
- * multiline TextFields the config editor, the jexl/JSON monospace field, and
- * the paste-config workflows are built from. Those render a `<textarea>`, not
- * an `<input>`, so an INPUT-only check let a keystroke meant to undo typing
- * roll back the whole session instead.
- */
-export declare function isTextEntryFocused(): boolean;
+type ShortcutKeys = Pick<KeyboardEvent, 'key' | 'code' | 'ctrlKey' | 'metaKey' | 'shiftKey'>;
+export declare function historyShortcut(e: ShortcutKeys): "redo" | "undo" | undefined;
 /**
  * #stateModel HistoryManagementMixin
  * #category root
@@ -40,3 +31,4 @@ export declare function HistoryManagementMixin(): import("@jbrowse/mobx-state-tr
     afterCreate(): void;
     beforeDestroy(): void;
 }, import("@jbrowse/mobx-state-tree")._NotCustomized, import("@jbrowse/mobx-state-tree")._NotCustomized>;
+export {};

package/esm/HistoryManagement/index.js

@@ -1,26 +1,29 @@
 import TimeTraveller from '@jbrowse/core/util/TimeTraveller';
+import { isTextEntryFocused } from '@jbrowse/core/util/isTextEntryFocused';
 import { addDisposer, types } from '@jbrowse/mobx-state-tree';
 import { asRoot } from '@jbrowse/product-core';
 import { autorun } from 'mobx';
-/**
- * Whether the user is typing into something with an undo stack of its own.
- *
- * Session undo must not steal the text editor's. The keydown listener below is
- * on `document`, so it sees ctrl+z no matter what has focus — including the
- * multiline TextFields the config editor, the jexl/JSON monospace field, and
- * the paste-config workflows are built from. Those render a `<textarea>`, not
- * an `<input>`, so an INPUT-only check let a keystroke meant to undo typing
- * roll back the whole session instead.
- */
-export function isTextEntryFocused() {
-    const el = document.activeElement;
-    if (!(el instanceof HTMLElement)) {
-        return false;
+// `key` follows the layout, so undo is wherever the user's Z is (QWERTZ reports
+// it as `code: 'KeyY'`, AZERTY as `KeyW`); a non-Latin layout has no letter
+// there, and the physical key stands in
+function shortcutLetter(e) {
+    const key = e.key.toLowerCase();
+    return /^[a-z]$/.test(key) ? key : e.code.replace(/^Key/, '').toLowerCase();
+}
+// modifiers first: a synthetic keydown (autofill, an extension) is a bare Event
+// with no `key` to read
+export function historyShortcut(e) {
+    if (!e.ctrlKey && !e.metaKey) {
+        return undefined;
+    }
+    const letter = shortcutLetter(e);
+    if (letter === 'z') {
+        return e.shiftKey ? 'redo' : 'undo';
+    }
+    if (e.ctrlKey && !e.shiftKey && letter === 'y') {
+        return 'redo';
     }
-    const tag = el.tagName.toUpperCase();
-    // coerced: isContentEditable is declared boolean but is undefined in jsdom,
-    // so the raw expression returns undefined for an ordinary focused element
-    return tag === 'INPUT' || tag === 'TEXTAREA' || !!el.isContentEditable;
+    return undefined;
 }
 /**
  * #stateModel HistoryManagementMixin
@@ -40,18 +43,11 @@ export function HistoryManagementMixin() {
             if (isTextEntryFocused()) {
                 return;
             }
-            if (self.history.canRedo &&
-                // ctrl+shift+z or cmd+shift+z
-                (((e.ctrlKey || e.metaKey) && e.shiftKey && e.code === 'KeyZ') ||
-                    // ctrl+y
-                    (e.ctrlKey && !e.shiftKey && e.code === 'KeyY'))) {
+            const shortcut = historyShortcut(e);
+            if (shortcut === 'redo' && self.history.canRedo) {
                 self.history.redo();
             }
-            if (self.history.canUndo &&
-                // ctrl+z or cmd+z
-                (e.ctrlKey || e.metaKey) &&
-                !e.shiftKey &&
-                e.code === 'KeyZ') {
+            else if (shortcut === 'undo' && self.history.canUndo) {
                 self.history.undo();
             }
         };