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

fix: delete LayerSwitcher on the dest layer when LayerSwitcher remove/changing (#939)

Browse Source
This commit is contained in:
Róbert Kiss
2019-04-18 01:58:16 +02:00
committed by László Monda
parent 32db3817e2
commit 4abdac1ef6
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -195,6 +195,8 @@ export function reducer(
const newKeymap: Keymap = payload.keymap; const newKeymap: Keymap = payload.keymap;
const isSwitchLayerAction = newKeyAction instanceof SwitchLayerAction; const isSwitchLayerAction = newKeyAction instanceof SwitchLayerAction;
const isSwitchKeymapAction = newKeyAction instanceof SwitchKeymapAction; const isSwitchKeymapAction = newKeyAction instanceof SwitchKeymapAction;
const oldKeyAction = newKeymap.layers[layerIndex].modules[moduleIndex].keyActions[keyIndex];
const oldKeyIsSwitchLayerAction = oldKeyAction instanceof SwitchLayerAction;
const userConfiguration: UserConfiguration = Object.assign(new UserConfiguration(), state.userConfiguration); const userConfiguration: UserConfiguration = Object.assign(new UserConfiguration(), state.userConfiguration);
userConfiguration.keymaps = state.userConfiguration.keymaps.map(keymap => { userConfiguration.keymaps = state.userConfiguration.keymaps.map(keymap => {
@@ -222,6 +224,8 @@ export function reducer(
} else { } else {
setKeyActionToLayer(layer, moduleIndex, keyIndex, clonedAction); setKeyActionToLayer(layer, moduleIndex, keyIndex, clonedAction);
} }
} else if (oldKeyIsSwitchLayerAction && index - 1 === (oldKeyAction as SwitchLayerAction).layer) {
setKeyActionToLayer(layer, moduleIndex, keyIndex, null);
} }
return layer; return layer;