Merge pull request #873 from yoichi/on-encoder-toggle

Update also selected keySwitchOperation on encoder toggle

Author: yoichiro

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

@@ -21,7 +21,10 @@ export type KeycapStateType = ReturnType<typeof mapStateToProps>;
 
 const mapDispatchToProps = (_dispatch: any) => {
   return {
-    updateKeydiff: (
+    onClickEncoderToggle: (
+      pos: string,
+      encoderId: number | null,
+      keySwitchOperation: IKeySwitchOperation,
       isSelectedKey: boolean,
       orgKey: Key,
       dstKey: Key | null
@@ -34,6 +37,13 @@ const mapDispatchToProps = (_dispatch: any) => {
           // clear diff display
           _dispatch(KeydiffActions.clearKeydiff());
         }
+        _dispatch(
+          KeymapActions.updateSelectedKeyPosition(
+            pos,
+            encoderId,
+            keySwitchOperation
+          )
+        );
       }
     },
     onClickKeycap: (

src/components/configure/keycap/Keycap.tsx

@@ -126,7 +126,14 @@ export default class Keycap extends React.Component<
       ? genKey(remap, this.props.labelLang!)
       : null;
 
-    this.props.updateKeydiff!(this.props.focus!, orgKey, dstKey);
+    this.props.onClickEncoderToggle!(
+      this.props.model.pos,
+      this.props.model.encoderId,
+      nextKeySwitchOperation,
+      this.props.focus!,
+      orgKey,
+      dstKey
+    );
   }
 
   private getTargetKeymap(