uhk/agent
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix: remap SwitchLayerAction

Browse Source
This commit is contained in:
Róbert Kiss
2018-06-18 19:50:34 +02:00
parent a258c097a9
commit 762fa6f8bf
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
packages/uhk-web/src/app/store/reducers/user-configuration.ts
View File

@@ -142,21 +142,21 @@ export function reducer(state = initialState, action: Action & { payload?: any }
const keyActionRemap = action.payload.keyAction; const keyActionRemap = action.payload.keyAction;
const newKeyAction = keyActionRemap.action; const newKeyAction = keyActionRemap.action;
const newKeymap: Keymap = action.payload.keymap; const newKeymap: Keymap = action.payload.keymap;
const isSwitchLayerAction = newKeyAction instanceof SwitchLayerAction;
changedUserConfiguration.keymaps = state.keymaps.map(keymap => { changedUserConfiguration.keymaps = state.keymaps.map(keymap => {
if (keyActionRemap.remapOnAllKeymap || keymap.abbreviation === newKeymap.abbreviation) { if (keyActionRemap.remapOnAllKeymap || keymap.abbreviation === newKeymap.abbreviation) {
keymap = new Keymap(keymap); keymap = new Keymap(keymap);
keymap.layers = keymap.layers.map((layer, index) => { keymap.layers = keymap.layers.map((layer, index) => {
if (keyActionRemap.remapOnAllLayer || index === layerIndex) { if (keyActionRemap.remapOnAllLayer || index === layerIndex || isSwitchLayerAction) {
layer = new Layer(layer); layer = new Layer(layer);
const clonedAction = KeyActionHelper.createKeyAction(newKeyAction); const clonedAction = KeyActionHelper.createKeyAction(newKeyAction);
const isSwitchLayerAction = newKeyAction instanceof SwitchLayerAction;
// If the key action is a SwitchLayerAction then set the same SwitchLayerAction // If the key action is a SwitchLayerAction then set the same SwitchLayerAction
// on the target layer and remove SwitchLayerAction from other layers // on the target layer and remove SwitchLayerAction from other layers
if (isSwitchLayerAction) { if (isSwitchLayerAction) {
if (index - 1 === (newKeyAction as SwitchLayerAction).layer) { if (index === 0 || index - 1 === (newKeyAction as SwitchLayerAction).layer) {
setKeyActionToLayer(layer, moduleIndex, keyIndex, clonedAction); setKeyActionToLayer(layer, moduleIndex, keyIndex, clonedAction);
} else { } else {
const actionOnLayer = layer.modules[moduleIndex].keyActions[keyIndex]; const actionOnLayer = layer.modules[moduleIndex].keyActions[keyIndex];