prevent keymaps in the page
This commit is contained in:
parent
30641f1b75
commit
ea455059bd
2 changed files with 37 additions and 25 deletions
|
@ -12,30 +12,6 @@ export default class ContentInputComponent {
|
||||||
}
|
}
|
||||||
|
|
||||||
update() {
|
update() {
|
||||||
let settings = this.store.getState().setting.settings;
|
|
||||||
if (!settings || !settings.json) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
let input = this.store.getState().input;
|
|
||||||
let keymaps = JSON.parse(settings.json).keymaps;
|
|
||||||
|
|
||||||
let matched = Object.keys(keymaps).filter((keyStr) => {
|
|
||||||
return keyStr.startsWith(input.keys);
|
|
||||||
});
|
|
||||||
if (matched.length === 0) {
|
|
||||||
this.store.dispatch(inputActions.clearKeys());
|
|
||||||
return Promise.resolve();
|
|
||||||
} else if (matched.length > 1 ||
|
|
||||||
matched.length === 1 && input.keys !== matched[0]) {
|
|
||||||
return Promise.resolve();
|
|
||||||
}
|
|
||||||
let operation = keymaps[matched];
|
|
||||||
try {
|
|
||||||
this.store.dispatch(operationActions.exec(operation));
|
|
||||||
} catch (e) {
|
|
||||||
console.error(e);
|
|
||||||
}
|
|
||||||
this.store.dispatch(inputActions.clearKeys());
|
|
||||||
}
|
}
|
||||||
|
|
||||||
onKeyPress(e) {
|
onKeyPress(e) {
|
||||||
|
@ -68,7 +44,34 @@ export default class ContentInputComponent {
|
||||||
if (e.key === 'OS') {
|
if (e.key === 'OS') {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
let keymaps = this.keymaps();
|
||||||
|
if (!keymaps) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
this.store.dispatch(inputActions.keyPress(e.key, e.ctrlKey));
|
this.store.dispatch(inputActions.keyPress(e.key, e.ctrlKey));
|
||||||
|
|
||||||
|
if (this.mapKeys(keymaps)) {
|
||||||
|
e.preventDefault();
|
||||||
|
e.stopPropagation();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
mapKeys(keymaps) {
|
||||||
|
let input = this.store.getState().input;
|
||||||
|
let matched = Object.keys(keymaps).filter((keyStr) => {
|
||||||
|
return keyStr.startsWith(input.keys);
|
||||||
|
});
|
||||||
|
if (matched.length === 0) {
|
||||||
|
this.store.dispatch(inputActions.clearKeys());
|
||||||
|
return false;
|
||||||
|
} else if (matched.length > 1 ||
|
||||||
|
matched.length === 1 && input.keys !== matched[0]) {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
let operation = keymaps[matched];
|
||||||
|
this.store.dispatch(operationActions.exec(operation));
|
||||||
|
this.store.dispatch(inputActions.clearKeys());
|
||||||
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
fromInput(e) {
|
fromInput(e) {
|
||||||
|
@ -76,4 +79,12 @@ export default class ContentInputComponent {
|
||||||
e.target instanceof HTMLTextAreaElement ||
|
e.target instanceof HTMLTextAreaElement ||
|
||||||
e.target instanceof HTMLSelectElement;
|
e.target instanceof HTMLSelectElement;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
keymaps() {
|
||||||
|
let settings = this.store.getState().setting.settings;
|
||||||
|
if (!settings || !settings.json) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
return JSON.parse(settings.json).keymaps;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -9,7 +9,8 @@ import messages from './messages';
|
||||||
|
|
||||||
const store = createStore(reducers);
|
const store = createStore(reducers);
|
||||||
const followComponent = new FollowComponent(window.document.body, store);
|
const followComponent = new FollowComponent(window.document.body, store);
|
||||||
const contentInputComponent = new ContentInputComponent(window, store);
|
const contentInputComponent =
|
||||||
|
new ContentInputComponent(window.document.body, store);
|
||||||
store.subscribe(() => {
|
store.subscribe(() => {
|
||||||
try {
|
try {
|
||||||
followComponent.update();
|
followComponent.update();
|
||||||
|
|
Reference in a new issue