Merge pull request #870 from yoichi/fix-no-change-judgement

Use selected keySwitchOperation to determin that there is no change

Author: yoichiro

src/components/configure/keycap/Keycap.container.ts

@@ -64,33 +64,63 @@ const mapDispatchToProps = (_dispatch: any) => {
       draggingKey: Key,
       selectedLayer: number,
       pos: string,
+      isSelectedKey: boolean,
       orgKey: Key
     ) => {
       if (draggingKey.keymap.code === orgKey.keymap.code) {
-        return;
+        if (isSelectedKey) {
+          // clear diff display
+          _dispatch(KeydiffActions.clearKeydiff());
+        }
+        _dispatch(AppActions.remapsRemoveKey(selectedLayer, pos));
+      } else {
+        if (isSelectedKey) {
+          // show key diff
+          _dispatch(
+            KeydiffActions.updateKeydiff(orgKey.keymap, draggingKey.keymap)
+          );
+        }
+        _dispatch(
+          AppActions.remapsSetKey(selectedLayer, pos, draggingKey.keymap)
+        );
       }
-      _dispatch(
-        AppActions.remapsSetKey(selectedLayer, pos, draggingKey.keymap)
-      );
     },
     onDropKeycodeToEncoder: (
       draggingKey: Key,
       selectedLayer: number,
       encoderId: number,
       keySwitchOperation: IKeySwitchOperation,
+      isSelectedKey: boolean,
       orgKey: Key
     ) => {
       if (draggingKey.keymap.code === orgKey.keymap.code) {
-        return;
+        if (isSelectedKey) {
+          // clear diff display
+          _dispatch(KeydiffActions.clearKeydiff());
+        }
+        _dispatch(
+          AppActions.encodersRemapsRemoveKey(
+            selectedLayer,
+            encoderId,
+            keySwitchOperation
+          )
+        );
+      } else {
+        if (isSelectedKey) {
+          // show key diff
+          _dispatch(
+            KeydiffActions.updateKeydiff(orgKey.keymap, draggingKey.keymap)
+          );
+        }
+        _dispatch(
+          AppActions.encodersRemapsSetKey(
+            selectedLayer,
+            encoderId,
+            draggingKey.keymap,
+            keySwitchOperation
+          )
+        );
       }
-      _dispatch(
-        AppActions.encodersRemapsSetKey(
-          selectedLayer,
-          encoderId,
-          draggingKey.keymap,
-          keySwitchOperation
-        )
-      );
     },
   };
 };

src/components/configure/keycap/Keycap.tsx

@@ -289,6 +289,7 @@ export default class Keycap extends React.Component<
               this.props.draggingKey!,
               this.props.selectedLayer!,
               pos,
+              isFocusedKey,
               orgKey
             );
           } else {
@@ -297,6 +298,7 @@ export default class Keycap extends React.Component<
               this.props.selectedLayer!,
               this.props.model.encoderId!,
               this.state.targetKeySwitchOperation,
+              isFocusedKey,
               orgKey
             );
           }

src/components/configure/keyeventcapture/KeyEventCapture.tsx

@@ -1,6 +1,6 @@
 import React from 'react';
 import KeyModel from '../../../models/KeyModel';
-import { IKeymap } from '../../../services/hid/Hid';
+import { IEncoderKeymaps, IKeymap } from '../../../services/hid/Hid';
 import { KeycodeList } from '../../../services/hid/KeycodeList';
 import { keyInfoList } from '../../../services/hid/KeycodeInfoList';
 import { KeyLabelLangs } from '../../../services/labellang/KeyLabelLangs';
@@ -23,7 +23,7 @@ type OwnProps = {
     // eslint-disable-next-line no-unused-vars
     newKey: Key,
     // eslint-disable-next-line no-unused-vars
-    oldKeycode: number,
+    oldKeymap: IKeymap,
     // eslint-disable-next-line no-unused-vars
     selectedLayer: number,
     // eslint-disable-next-line no-unused-vars
@@ -43,6 +43,7 @@ type OwnProps = {
   ) => void;
   keyModels: KeyModel[];
   keymaps: { [pos: string]: IKeymap };
+  encodersKeymaps: IEncoderKeymaps;
   children?: React.ReactNode | React.ReactNode[];
 };
 type KeyEventCaptureProps = OwnProps &
@@ -77,9 +78,18 @@ export default class KeyEventCapture extends React.Component<
       return;
     }
 
+    let oldKeymap =
+      this.props.selectedKeySwitchOperation === 'click'
+        ? this.props.keymaps[this.props.selectedPos!]
+        : this.props.selectedKeySwitchOperation === 'cw'
+          ? this.props.encodersKeymaps[this.props.selectedEncoderId!].clockwise
+          : this.props.selectedKeySwitchOperation === 'ccw'
+            ? this.props.encodersKeymaps[this.props.selectedEncoderId!]
+                .counterclockwise
+            : undefined;
     this.props.onKeyDown!(
       newKey,
-      this.props.keymaps[this.props.selectedPos!].code,
+      oldKeymap!,
       this.props.selectedLayer!,
       this.props.selectedPos!,
       this.props.selectedEncoderId!,

src/components/configure/keymap/Keymap.container.ts

@@ -128,13 +128,27 @@ const mapDispatchToProps = (_dispatch: any) => {
     },
     onKeyDown: (
       newKey: Key,
-      oldKeycode: number,
+      oldKeymap: IKeymap,
       selectedLayer: number,
       pos: string,
       encoderId: number | null,
       keySwitchOperation: IKeySwitchOperation
     ) => {
-      if (newKey.keymap.code != oldKeycode) {
+      if (newKey.keymap.code === oldKeymap.code) {
+        _dispatch(KeydiffActions.clearKeydiff());
+        if (keySwitchOperation === 'click') {
+          _dispatch(AppActions.remapsRemoveKey(selectedLayer, pos));
+        } else {
+          _dispatch(
+            AppActions.encodersRemapsRemoveKey(
+              selectedLayer,
+              encoderId!,
+              keySwitchOperation
+            )
+          );
+        }
+      } else {
+        _dispatch(KeydiffActions.updateKeydiff(oldKeymap, newKey.keymap));
         if (keySwitchOperation === 'click') {
           _dispatch(AppActions.remapsSetKey(selectedLayer, pos, newKey.keymap));
         } else {

src/components/configure/keymap/Keymap.tsx

@@ -326,6 +326,7 @@ export default class Keymap extends React.Component<
             onKeyUp={this.props.onKeyUp!}
             keyModels={keyboardViewContent.keymaps}
             keymaps={deviceKeymaps}
+            encodersKeymaps={deviceEncodersKeymaps}
           >
             <KeyboardView
               keyboardViewContent={keyboardViewContent}