@jupyterlab/shortcuts-extension 5.1.0-beta.2 → 5.1.0-beta.3

package/lib/components/ShortcutInput.d.ts

@@ -1,10 +1,12 @@
 import * as React from 'react';
 import { ITranslator } from '@jupyterlab/translation';
 import { IKeybinding, IShortcutRegistry, IShortcutTarget, IShortcutUI } from '../types';
+export declare const CONFLICT_CONTAINER_CLASS = "jp-Shortcuts-ConflictContainer";
 export interface IConflicts {
     keys: string[];
     conflictsWith: IShortcutTarget[];
     overwrite: () => void;
+    cancel: () => void;
 }
 export interface IShortcutInputProps {
     addKeybinding: IShortcutUI['addKeybinding'];
@@ -25,7 +27,6 @@ export interface IShortcutInputState {
     userInput: string;
     isAvailable: boolean;
     isFunctional: boolean;
-    conflicts: IShortcutTarget[];
     keys: string[];
     currentChain: string;
     selected: boolean;
@@ -34,10 +35,10 @@ export declare class ShortcutInput extends React.Component<IShortcutInputProps,
     constructor(props: IShortcutInputProps);
     /** Whether this input replaces existing keybinding or creates a new one */
     private get _isReplacingExistingKeybinding();
-    private _updateConflictDisplay;
+    private _emitConflicts;
     handleSubmit: () => Promise<void>;
     private _updateShortcut;
-    handleOverwrite: () => Promise<void>;
+    private _handleOverwrite;
     /** Parse user input for chained shortcuts */
     parseChaining: (event: React.KeyboardEvent, value: string, userInput: string, keys: Array<string>, currentChain: string) => Array<any>;
     /**
@@ -49,6 +50,7 @@ export declare class ShortcutInput extends React.Component<IShortcutInputProps,
     checkShortcutAvailability: (userInput: string, keys: string[], currentChain: string) => IShortcutTarget[];
     /** Parse and normalize user input */
     handleInput: (event: React.KeyboardEvent) => void;
-    handleBlur: (event: React.FocusEvent<HTMLDivElement>) => void;
     render(): JSX.Element;
+    private _handleBlur;
+    private _ref;
 }

package/lib/components/ShortcutInput.js

@@ -6,33 +6,24 @@ import * as React from 'react';
 import { JSONExt } from '@lumino/coreutils';
 import { EN_US } from '@lumino/keyboard';
 import { checkIcon, errorIcon } from '@jupyterlab/ui-components';
+export const CONFLICT_CONTAINER_CLASS = 'jp-Shortcuts-ConflictContainer';
 export class ShortcutInput extends React.Component {
     constructor(props) {
         super(props);
         this.handleSubmit = async () => {
             if (!this._isReplacingExistingKeybinding) {
                 await this._updateShortcut();
-                this.setState({
-                    value: '',
-                    keys: [],
-                    currentChain: ''
-                });
                 this.props.toggleInput();
             }
             else {
                 /** don't replace if field has not been edited */
                 if (this.state.selected) {
                     this.props.toggleInput();
-                    this.setState({
-                        value: '',
-                        userInput: ''
-                    });
                 }
                 else {
                     await this._updateShortcut();
                 }
             }
-            this._updateConflictDisplay();
         };
         this._updateShortcut = async () => {
             const keys = [...this.state.keys, this.state.currentChain];
@@ -44,9 +35,8 @@ export class ShortcutInput extends React.Component {
                 await this.props.addKeybinding(this.props.shortcut, keys);
             }
         };
-        this.handleOverwrite = async () => {
-            const keys = [...this.state.keys, this.state.currentChain];
-            for (const conflict of this.state.conflicts) {
+        this._handleOverwrite = async (conflicts, keys) => {
+            for (const conflict of conflicts) {
                 const conflictingBinding = conflict.keybindings.filter(binding => JSONExt.deepEqual(binding.keys, keys) ||
                     keys.some(key => JSONExt.deepEqual(binding.keys, [key])))[0];
                 if (!conflictingBinding) {
@@ -55,9 +45,7 @@ export class ShortcutInput extends React.Component {
                 }
                 await this.props.deleteKeybinding(conflict, conflictingBinding);
             }
-            this.setState({ conflicts: [] });
             await this._updateShortcut();
-            this._updateConflictDisplay();
         };
         /** Parse user input for chained shortcuts */
         this.parseChaining = (event, value, userInput, keys, currentChain) => {
@@ -208,34 +196,32 @@ export class ShortcutInput extends React.Component {
             this.setState({
                 value: value,
                 userInput: userInput,
-                conflicts: conflicts,
                 keys: keys,
                 currentChain: currentChain
             }, () => {
                 this.checkNonFunctional();
-                this._updateConflictDisplay();
+                this._emitConflicts(conflicts);
             });
         };
-        this.handleBlur = (event) => {
-            if (event.relatedTarget === null ||
-                // TODO: get rid of IDs here
-                event.relatedTarget.id !== 'no-blur') {
-                this.props.toggleInput();
-                this.setState({
-                    value: '',
-                    userInput: '',
-                    conflicts: []
-                }, () => {
-                    this._updateConflictDisplay();
-                });
+        this._handleBlur = (event) => {
+            var _a, _b;
+            if ((_a = this._ref.current) === null || _a === void 0 ? void 0 : _a.contains(event.relatedTarget)) {
+                // Do not hide when clicking inside the input
+                return;
             }
+            if ((_b = event.relatedTarget) === null || _b === void 0 ? void 0 : _b.closest(`.${CONFLICT_CONTAINER_CLASS}`)) {
+                // Do not hide input when clicking on conflict container as this would destroy the state
+                return;
+            }
+            // Hide the input
+            this.props.toggleInput();
         };
+        this._ref = React.createRef();
         this.state = {
             value: this.props.placeholder,
             userInput: '',
             isAvailable: true,
             isFunctional: this._isReplacingExistingKeybinding,
-            conflicts: [],
             keys: [],
             currentChain: '',
             selected: true
@@ -245,11 +231,25 @@ export class ShortcutInput extends React.Component {
     get _isReplacingExistingKeybinding() {
         return !!this.props.keybinding;
     }
-    _updateConflictDisplay() {
+    _emitConflicts(conflicts) {
+        const keys = [...this.state.keys, this.state.currentChain];
         this.props.displayConflicts({
-            conflictsWith: this.state.conflicts,
+            conflictsWith: conflicts,
             keys: this.state.keys,
-            overwrite: this.handleOverwrite
+            overwrite: async () => {
+                this.setState({
+                    // Since user decided to overwrite, no need to show it as conflicted anymore
+                    isAvailable: true
+                });
+                // Try to overwrite
+                await this._handleOverwrite(conflicts, keys);
+                // Only hide the input after the overwrite took place
+                this.props.toggleInput();
+            },
+            cancel: () => {
+                // Hide the input
+                this.props.toggleInput();
+            }
         });
     }
     render() {
@@ -262,8 +262,8 @@ export class ShortcutInput extends React.Component {
                 ? !this._isReplacingExistingKeybinding
                     ? 'jp-Shortcuts-InputBox jp-Shortcuts-InputBoxNew'
                     : 'jp-Shortcuts-InputBox'
-                : 'jp-mod-hidden', onBlur: event => this.handleBlur(event) },
-            React.createElement("div", { tabIndex: 0, id: "no-blur", className: inputClassName, onKeyDown: this.handleInput, ref: input => input && input.focus(), "data-lm-suppress-shortcuts": "true" },
+                : 'jp-mod-hidden', ref: this._ref, onBlur: this._handleBlur },
+            React.createElement("div", { tabIndex: 0, className: inputClassName, onKeyDown: this.handleInput, ref: input => input && input.focus(), "data-lm-suppress-shortcuts": "true" },
                 React.createElement("p", { className: this.state.selected && this._isReplacingExistingKeybinding
                         ? 'jp-Shortcuts-InputText jp-mod-selected-InputText'
                         : this.state.value === ''
@@ -275,7 +275,7 @@ export class ShortcutInput extends React.Component {
                     ? 'jp-Shortcuts-Submit jp-mod-defunc-Submit'
                     : !this.state.isAvailable
                         ? 'jp-Shortcuts-Submit jp-mod-conflict-Submit'
-                        : 'jp-Shortcuts-Submit', id: 'no-blur', disabled: !this.state.isAvailable || !this.state.isFunctional, onClick: this.handleSubmit }, this.state.isAvailable ? React.createElement(checkIcon.react, null) : React.createElement(errorIcon.react, null))));
+                        : 'jp-Shortcuts-Submit', disabled: !this.state.isAvailable || !this.state.isFunctional, onClick: this.handleSubmit }, this.state.isAvailable ? React.createElement(checkIcon.react, null) : React.createElement(errorIcon.react, null))));
     }
 }
 //# sourceMappingURL=ShortcutInput.js.map

package/lib/components/ShortcutInput.js.map

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

package/lib/components/ShortcutItem.d.ts

@@ -45,6 +45,14 @@ export declare class ShortcutItem extends React.Component<IShortcutItemProps, IS
     getInputBoxWhenToggled(): JSX.Element;
     getShortCutsCell(nonEmptyBindings: IKeybinding[]): JSX.Element;
     getConflicts(): JSX.Element;
+    /**
+     * Mark conflict as resolved.
+     */
+    private _clearConflict;
+    /**
+     * Create a unique conflict identifier.
+     */
+    private _conflictId;
     private get _nonEmptyBindings();
     render(): JSX.Element;
     private _trans;

package/lib/components/ShortcutItem.js

@@ -4,7 +4,7 @@
  */
 import { Platform } from '@lumino/domutils';
 import * as React from 'react';
-import { ShortcutInput } from './ShortcutInput';
+import { CONFLICT_CONTAINER_CLASS, ShortcutInput } from './ShortcutInput';
 /** React component for each command shortcut item */
 export class ShortcutItem extends React.Component {
     constructor(props) {
@@ -12,7 +12,9 @@ export class ShortcutItem extends React.Component {
         /** Toggle display state of input box */
         this.toggleInputNew = () => {
             this.setState({
-                displayNewInput: !this.state.displayNewInput
+                displayNewInput: !this.state.displayNewInput,
+                // reset conflicts
+                conflicts: new Map()
             });
         };
         /** Transform special key names into unicode characters */
@@ -107,7 +109,9 @@ export class ShortcutItem extends React.Component {
             displayReplaceInput: {
                 ...this.state.displayReplaceInput,
                 [location]: !previous
-            }
+            },
+            // Clear old conflicts
+            conflicts: new Map()
         });
     }
     getDisplayReplaceInput(location) {
@@ -172,8 +176,8 @@ export class ShortcutItem extends React.Component {
         if (conflicts.length === 0) {
             return React.createElement(React.Fragment, null);
         }
-        return (React.createElement("div", { className: "jp-Shortcuts-Row" },
-            React.createElement("div", { className: "jp-Shortcuts-ConflictContainer" }, conflicts.map(conflict => {
+        return (React.createElement("div", { className: "jp-Shortcuts-Row jp-Shortcuts-RowWithConflict" },
+            React.createElement("div", { className: CONFLICT_CONTAINER_CLASS }, conflicts.map(conflict => {
                 const key = conflict.keys.join(' ') +
                     '_' +
                     conflict.conflictsWith.map(target => target.id).join('');
@@ -182,12 +186,38 @@ export class ShortcutItem extends React.Component {
                         .map(target => { var _a; return (_a = target.label) !== null && _a !== void 0 ? _a : target.command; })
                         .join(', '))),
                     React.createElement("div", { className: "jp-Shortcuts-ErrorButton" },
-                        React.createElement("button", null, this._trans.__('Cancel')),
-                        React.createElement("button", { id: "no-blur", onClick: () => {
+                        React.createElement("button", { className: "jp-Button jp-mod-reject jp-mod-styled", onClick: () => {
+                                this._clearConflict(conflict);
+                                conflict.cancel();
+                            } }, this._trans.__('Cancel')),
+                        React.createElement("button", { className: "jp-Button jp-mod-warn jp-mod-styled", onClick: () => {
+                                // Clear the conflict first to prevent user from accidentally clicking this button twice
+                                this._clearConflict(conflict);
                                 conflict.overwrite();
                             } }, this._trans.__('Overwrite')))));
             }))));
     }
+    /**
+     * Mark conflict as resolved.
+     */
+    _clearConflict(conflictToClear) {
+        const conflicts = new Map();
+        const idToSkip = this._conflictId(conflictToClear);
+        for (const [binding, conflict] of this.state.conflicts.entries()) {
+            if (this._conflictId(conflict) !== idToSkip) {
+                conflicts.set(binding, conflict);
+            }
+        }
+        this.setState({ conflicts });
+    }
+    /**
+     * Create a unique conflict identifier.
+     */
+    _conflictId(conflict) {
+        return (conflict.keys.join(' ') +
+            '_' +
+            conflict.conflictsWith.map(target => target.id).join(''));
+    }
     get _nonEmptyBindings() {
         return this.props.shortcut.keybindings.filter(binding => binding.keys.filter(k => k != '').length !== 0);
     }

package/lib/components/ShortcutItem.js.map

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

package/lib/components/ShortcutUI.js

@@ -149,9 +149,7 @@ export class ShortcutUI extends React.Component {
          * Reset keybindings for given target to defaults.
          */
         this.resetKeybindings = async (target) => {
-            for (const binding of target.keybindings) {
-                await this._setKeybinding(target, binding.isDefault ? binding.keys : [], binding);
-            }
+            await this._setKeybinding(target, []);
         };
         /**
          * Replace the given keybinding with a new keybinding as defined by given keys.
@@ -241,7 +239,7 @@ export class ShortcutUI extends React.Component {
      * If keybinding is a default keybinding and the provided keys differ from default, it will be disabled.
      */
     async _setKeybinding(target, keys, keybinding) {
-        var _a, _b, _c;
+        var _a, _b, _c, _d, _e;
         if (keys.length === 1 && keys[0] == '') {
             keys = [];
         }
@@ -272,8 +270,10 @@ export class ShortcutUI extends React.Component {
                 }
                 found = true;
             }
-            else if (keybinding &&
-                !JSONExt.deepEqual(keybinding.keys, shortcut.keys) &&
+            else if (shortcut.command === target.command &&
+                shortcut.selector === target.selector &&
+                JSONExt.deepEqual((_d = shortcut.args) !== null && _d !== void 0 ? _d : {}, (_e = target.args) !== null && _e !== void 0 ? _e : {}) &&
+                !keybinding &&
                 keys.length === 0) {
                 continue;
             }

package/lib/components/ShortcutUI.js.map

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jupyterlab/shortcuts-extension",
-  "version": "5.1.0-beta.2",
+  "version": "5.1.0-beta.3",
   "description": "JupyterLab - Shortcuts Extension",
   "homepage": "https://github.com/jupyterlab/jupyterlab",
   "bugs": {
@@ -40,21 +40,21 @@
     "watch": "tsc -b --watch"
   },
   "dependencies": {
-    "@jupyterlab/application": "^4.3.0-beta.2",
-    "@jupyterlab/settingregistry": "^4.3.0-beta.2",
-    "@jupyterlab/translation": "^4.3.0-beta.2",
-    "@jupyterlab/ui-components": "^4.3.0-beta.2",
-    "@lumino/algorithm": "^2.0.1",
-    "@lumino/commands": "^2.3.0",
-    "@lumino/coreutils": "^2.1.2",
-    "@lumino/disposable": "^2.1.2",
-    "@lumino/domutils": "^2.0.1",
-    "@lumino/keyboard": "^2.0.1",
-    "@lumino/signaling": "^2.1.2",
+    "@jupyterlab/application": "^4.3.0-beta.3",
+    "@jupyterlab/settingregistry": "^4.3.0-beta.3",
+    "@jupyterlab/translation": "^4.3.0-beta.3",
+    "@jupyterlab/ui-components": "^4.3.0-beta.3",
+    "@lumino/algorithm": "^2.0.2",
+    "@lumino/commands": "^2.3.1",
+    "@lumino/coreutils": "^2.2.0",
+    "@lumino/disposable": "^2.1.3",
+    "@lumino/domutils": "^2.0.2",
+    "@lumino/keyboard": "^2.0.2",
+    "@lumino/signaling": "^2.1.3",
     "react": "^18.2.0"
   },
   "devDependencies": {
-    "@jupyterlab/testing": "^4.3.0-beta.2",
+    "@jupyterlab/testing": "^4.3.0-beta.3",
     "@types/jest": "^29.2.0",
     "jest": "^29.2.0",
     "rimraf": "~5.0.5",

package/src/components/ShortcutInput.tsx

@@ -15,10 +15,13 @@ import {
   IShortcutUI
 } from '../types';
 
+export const CONFLICT_CONTAINER_CLASS = 'jp-Shortcuts-ConflictContainer';
+
 export interface IConflicts {
   keys: string[];
   conflictsWith: IShortcutTarget[];
   overwrite: () => void;
+  cancel: () => void;
 }
 
 export interface IShortcutInputProps {
@@ -42,7 +45,6 @@ export interface IShortcutInputState {
   userInput: string;
   isAvailable: boolean;
   isFunctional: boolean;
-  conflicts: IShortcutTarget[];
   keys: string[];
   currentChain: string;
   selected: boolean;
@@ -54,13 +56,13 @@ export class ShortcutInput extends React.Component<
 > {
   constructor(props: IShortcutInputProps) {
     super(props);
+    this._ref = React.createRef();
 
     this.state = {
       value: this.props.placeholder,
       userInput: '',
       isAvailable: true,
       isFunctional: this._isReplacingExistingKeybinding,
-      conflicts: [],
       keys: [],
       currentChain: '',
       selected: true
@@ -72,36 +74,40 @@ export class ShortcutInput extends React.Component<
     return !!this.props.keybinding;
   }
 
-  private _updateConflictDisplay() {
+  private _emitConflicts(conflicts: IShortcutTarget[]) {
+    const keys = [...this.state.keys, this.state.currentChain];
     this.props.displayConflicts({
-      conflictsWith: this.state.conflicts,
+      conflictsWith: conflicts,
       keys: this.state.keys,
-      overwrite: this.handleOverwrite
+      overwrite: async () => {
+        this.setState({
+          // Since user decided to overwrite, no need to show it as conflicted anymore
+          isAvailable: true
+        });
+        // Try to overwrite
+        await this._handleOverwrite(conflicts, keys);
+        // Only hide the input after the overwrite took place
+        this.props.toggleInput();
+      },
+      cancel: () => {
+        // Hide the input
+        this.props.toggleInput();
+      }
     });
   }
 
   handleSubmit = async () => {
     if (!this._isReplacingExistingKeybinding) {
       await this._updateShortcut();
-      this.setState({
-        value: '',
-        keys: [],
-        currentChain: ''
-      });
       this.props.toggleInput();
     } else {
       /** don't replace if field has not been edited */
       if (this.state.selected) {
         this.props.toggleInput();
-        this.setState({
-          value: '',
-          userInput: ''
-        });
       } else {
         await this._updateShortcut();
       }
     }
-    this._updateConflictDisplay();
   };
 
   private _updateShortcut = async () => {
@@ -118,9 +124,11 @@ export class ShortcutInput extends React.Component<
     }
   };
 
-  handleOverwrite = async () => {
-    const keys = [...this.state.keys, this.state.currentChain];
-    for (const conflict of this.state.conflicts) {
+  private _handleOverwrite = async (
+    conflicts: IShortcutTarget[],
+    keys: string[]
+  ) => {
+    for (const conflict of conflicts) {
       const conflictingBinding = conflict.keybindings.filter(
         binding =>
           JSONExt.deepEqual(binding.keys, keys) ||
@@ -134,9 +142,7 @@ export class ShortcutInput extends React.Component<
       }
       await this.props.deleteKeybinding(conflict, conflictingBinding);
     }
-    this.setState({ conflicts: [] });
     await this._updateShortcut();
-    this._updateConflictDisplay();
   };
 
   /** Parse user input for chained shortcuts */
@@ -320,37 +326,16 @@ export class ShortcutInput extends React.Component<
       {
         value: value,
         userInput: userInput,
-        conflicts: conflicts,
         keys: keys,
         currentChain: currentChain
       },
       () => {
         this.checkNonFunctional();
-        this._updateConflictDisplay();
+        this._emitConflicts(conflicts);
       }
     );
   };
 
-  handleBlur = (event: React.FocusEvent<HTMLDivElement>) => {
-    if (
-      event.relatedTarget === null ||
-      // TODO: get rid of IDs here
-      (event.relatedTarget as HTMLElement).id !== 'no-blur'
-    ) {
-      this.props.toggleInput();
-      this.setState(
-        {
-          value: '',
-          userInput: '',
-          conflicts: []
-        },
-        () => {
-          this._updateConflictDisplay();
-        }
-      );
-    }
-  };
-
   render() {
     const trans = this.props.translator.load('jupyterlab');
     let inputClassName = 'jp-Shortcuts-Input';
@@ -366,11 +351,11 @@ export class ShortcutInput extends React.Component<
               : 'jp-Shortcuts-InputBox'
             : 'jp-mod-hidden'
         }
-        onBlur={event => this.handleBlur(event)}
+        ref={this._ref}
+        onBlur={this._handleBlur}
       >
         <div
           tabIndex={0}
-          id="no-blur"
           className={inputClassName}
           onKeyDown={this.handleInput}
           ref={input => input && input.focus()}
@@ -398,7 +383,6 @@ export class ShortcutInput extends React.Component<
               ? 'jp-Shortcuts-Submit jp-mod-conflict-Submit'
               : 'jp-Shortcuts-Submit'
           }
-          id={'no-blur'}
           disabled={!this.state.isAvailable || !this.state.isFunctional}
           onClick={this.handleSubmit}
         >
@@ -407,4 +391,19 @@ export class ShortcutInput extends React.Component<
       </div>
     );
   }
+
+  private _handleBlur = (event: React.FocusEvent<HTMLDivElement>) => {
+    if (this._ref.current?.contains(event.relatedTarget)) {
+      // Do not hide when clicking inside the input
+      return;
+    }
+    if (event.relatedTarget?.closest(`.${CONFLICT_CONTAINER_CLASS}`)) {
+      // Do not hide input when clicking on conflict container as this would destroy the state
+      return;
+    }
+    // Hide the input
+    this.props.toggleInput();
+  };
+
+  private _ref: React.RefObject<HTMLDivElement>;
 }

package/src/components/ShortcutItem.tsx

@@ -6,7 +6,11 @@
 import { TranslationBundle } from '@jupyterlab/translation';
 import { Platform } from '@lumino/domutils';
 import * as React from 'react';
-import { IConflicts, ShortcutInput } from './ShortcutInput';
+import {
+  CONFLICT_CONTAINER_CLASS,
+  IConflicts,
+  ShortcutInput
+} from './ShortcutInput';
 import {
   IKeybinding,
   IShortcutRegistry,
@@ -86,7 +90,9 @@ export class ShortcutItem extends React.Component<
   /** Toggle display state of input box */
   private toggleInputNew = (): void => {
     this.setState({
-      displayNewInput: !this.state.displayNewInput
+      displayNewInput: !this.state.displayNewInput,
+      // reset conflicts
+      conflicts: new Map()
     });
   };
 
@@ -178,7 +184,9 @@ export class ShortcutItem extends React.Component<
       displayReplaceInput: {
         ...this.state.displayReplaceInput,
         [location]: !previous
-      }
+      },
+      // Clear old conflicts
+      conflicts: new Map()
     });
   }
 
@@ -320,8 +328,8 @@ export class ShortcutItem extends React.Component<
       return <></>;
     }
     return (
-      <div className="jp-Shortcuts-Row">
-        <div className="jp-Shortcuts-ConflictContainer">
+      <div className="jp-Shortcuts-Row jp-Shortcuts-RowWithConflict">
+        <div className={CONFLICT_CONTAINER_CLASS}>
           {conflicts.map(conflict => {
             const key =
               conflict.keys.join(' ') +
@@ -338,10 +346,20 @@ export class ShortcutItem extends React.Component<
                   )}
                 </div>
                 <div className="jp-Shortcuts-ErrorButton">
-                  <button>{this._trans.__('Cancel')}</button>
                   <button
-                    id="no-blur"
+                    className="jp-Button jp-mod-reject jp-mod-styled"
+                    onClick={() => {
+                      this._clearConflict(conflict);
+                      conflict.cancel();
+                    }}
+                  >
+                    {this._trans.__('Cancel')}
+                  </button>
+                  <button
+                    className="jp-Button jp-mod-warn jp-mod-styled"
                     onClick={() => {
+                      // Clear the conflict first to prevent user from accidentally clicking this button twice
+                      this._clearConflict(conflict);
                       conflict.overwrite();
                     }}
                   >
@@ -356,6 +374,31 @@ export class ShortcutItem extends React.Component<
     );
   }
 
+  /**
+   * Mark conflict as resolved.
+   */
+  private _clearConflict(conflictToClear: IConflicts) {
+    const conflicts = new Map();
+    const idToSkip = this._conflictId(conflictToClear);
+    for (const [binding, conflict] of this.state.conflicts.entries()) {
+      if (this._conflictId(conflict) !== idToSkip) {
+        conflicts.set(binding, conflict);
+      }
+    }
+    this.setState({ conflicts });
+  }
+
+  /**
+   * Create a unique conflict identifier.
+   */
+  private _conflictId(conflict: IConflicts): string {
+    return (
+      conflict.keys.join(' ') +
+      '_' +
+      conflict.conflictsWith.map(target => target.id).join('')
+    );
+  }
+
   private get _nonEmptyBindings() {
     return this.props.shortcut.keybindings.filter(
       binding => binding.keys.filter(k => k != '').length !== 0

package/src/components/ShortcutUI.tsx

@@ -299,13 +299,7 @@ export class ShortcutUI
    * Reset keybindings for given target to defaults.
    */
   resetKeybindings = async (target: IShortcutTarget): Promise<void> => {
-    for (const binding of target.keybindings) {
-      await this._setKeybinding(
-        target,
-        binding.isDefault ? binding.keys : [],
-        binding
-      );
-    }
+    await this._setKeybinding(target, []);
   };
 
   /**
@@ -385,8 +379,10 @@ export class ShortcutUI
         }
         found = true;
       } else if (
-        keybinding &&
-        !JSONExt.deepEqual(keybinding.keys, shortcut.keys) &&
+        shortcut.command === target.command &&
+        shortcut.selector === target.selector &&
+        JSONExt.deepEqual(shortcut.args ?? {}, target.args ?? {}) &&
+        !keybinding &&
         keys.length === 0
       ) {
         continue;

package/style/base.css

@@ -147,39 +147,21 @@
 
 .jp-Shortcuts-ErrorMessage {
   color: var(--jp-error-color1);
-  margin-top: 9px;
+  align-self: center;
 }
 
-.jp-Shortcuts-ErrorButton {
-  line-height: 34px;
-  margin-left: 10px;
-}
-
-.jp-Shortcuts-ErrorButton button:nth-of-type(1) {
-  height: 25px;
-  margin-right: 5px;
-  background-color: var(--jp-border-color0);
-  color: white;
-  outline: none;
+.jp-Shortcuts-RowWithConflict {
+  height: 45px;
+  position: relative;
 }
 
-.jp-Shortcuts-ErrorButton button:nth-of-type(1):active,
-.jp-Shortcuts-ErrorButton button:nth-of-type(1):focus {
-  outline: none;
-  border: none;
-}
-
-.jp-Shortcuts-ErrorButton button:nth-of-type(2) {
-  height: 25px;
-  background-color: var(--jp-error-color1);
-  color: white;
-  outline: none;
+.jp-Shortcuts-ErrorButton {
+  margin-left: 12px;
+  white-space: nowrap;
 }
 
-.jp-Shortcuts-ErrorButton button:nth-of-type(2):active,
-.jp-Shortcuts-ErrorButton button:nth-of-type(2):focus {
-  outline: none;
-  border: none;
+.jp-Shortcuts-ErrorButton > button {
+  margin-right: 12px;
 }
 
 .jp-Shortcuts-ShortcutContainer {
@@ -199,9 +181,13 @@
 }
 
 .jp-Shortcuts-ConflictContainer {
-  display: table;
-  margin: 6px 12px 6px 15%;
-  width: 400%;
+  display: block;
+  padding: 6px 12px;
+  position: absolute;
+  height: 100%;
+  width: 100%;
+  box-sizing: border-box;
+  overflow: hidden;
 }
 
 .jp-Shortcuts-Conflict {