aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/content/InputDriver.ts36
-rw-r--r--src/content/client/FollowMasterClient.ts2
-rw-r--r--src/content/controllers/FollowKeyController.ts2
-rw-r--r--src/content/controllers/KeymapController.ts2
-rw-r--r--src/content/controllers/MarkKeyController.ts2
-rw-r--r--src/content/repositories/KeymapRepository.ts4
-rw-r--r--src/content/usecases/FollowSlaveUseCase.ts2
-rw-r--r--src/content/usecases/KeymapUseCase.ts11
-rw-r--r--src/shared/settings/Key.ts (renamed from src/content/domains/Key.ts)40
-rw-r--r--src/shared/settings/KeySequence.ts (renamed from src/content/domains/KeySequence.ts)2
-rw-r--r--test/content/InputDriver.test.ts51
-rw-r--r--test/content/repositories/KeymapRepository.test.ts2
-rw-r--r--test/shared/settings/Key.test.ts (renamed from test/content/domains/Key.test.ts)51
-rw-r--r--test/shared/settings/KeySequence.test.ts (renamed from test/content/domains/KeySequence.test.ts)4
14 files changed, 105 insertions, 106 deletions
diff --git a/src/content/InputDriver.ts b/src/content/InputDriver.ts
index e77d857..bc184d2 100644
--- a/src/content/InputDriver.ts
+++ b/src/content/InputDriver.ts
@@ -1,5 +1,5 @@
import * as dom from '../shared/utils/dom';
-import Key from './domains/Key';
+import Key from '../shared/settings/Key';
const cancelKey = (e: KeyboardEvent): boolean => {
if (e.key === 'Escape') {
@@ -11,6 +11,38 @@ const cancelKey = (e: KeyboardEvent): boolean => {
return false;
};
+const modifiedKeyName = (name: string): string => {
+ if (name === ' ') {
+ return 'Space';
+ }
+ if (name.length === 1) {
+ return name;
+ } else if (name === 'Escape') {
+ return 'Esc';
+ }
+ return name;
+};
+
+// visible for testing
+export const keyFromKeyboardEvent = (e: KeyboardEvent): Key => {
+ let key = modifiedKeyName(e.key);
+ let shift = e.shiftKey;
+ if (key.length === 1 && key.toUpperCase() === key.toLowerCase()) {
+ // make shift false for symbols to enable key bindings by symbold keys.
+ // But this limits key bindings by symbol keys with Shift
+ // (such as Shift+$>.
+ shift = false;
+ }
+
+ return new Key({
+ key: modifiedKeyName(e.key),
+ shift: shift,
+ ctrl: e.ctrlKey,
+ alt: e.altKey,
+ meta: e.metaKey,
+ });
+};
+
export default class InputDriver {
private pressed: {[key: string]: string} = {};
@@ -66,7 +98,7 @@ export default class InputDriver {
return;
}
- let key = Key.fromKeyboardEvent(e);
+ let key = keyFromKeyboardEvent(e);
for (let listener of this.onKeyListeners) {
let stop = listener(key);
if (stop) {
diff --git a/src/content/client/FollowMasterClient.ts b/src/content/client/FollowMasterClient.ts
index f79c8b0..6681e8a 100644
--- a/src/content/client/FollowMasterClient.ts
+++ b/src/content/client/FollowMasterClient.ts
@@ -1,5 +1,5 @@
import * as messages from '../../shared/messages';
-import Key from '../domains/Key';
+import Key from '../../shared/settings/Key';
export default interface FollowMasterClient {
startFollow(newTab: boolean, background: boolean): void;
diff --git a/src/content/controllers/FollowKeyController.ts b/src/content/controllers/FollowKeyController.ts
index 59d2271..0fd94ff 100644
--- a/src/content/controllers/FollowKeyController.ts
+++ b/src/content/controllers/FollowKeyController.ts
@@ -1,6 +1,6 @@
import { injectable } from 'tsyringe';
import FollowSlaveUseCase from '../usecases/FollowSlaveUseCase';
-import Key from '../domains/Key';
+import Key from '../../shared/settings/Key';
@injectable()
export default class FollowKeyController {
diff --git a/src/content/controllers/KeymapController.ts b/src/content/controllers/KeymapController.ts
index fcfaff1..6157a71 100644
--- a/src/content/controllers/KeymapController.ts
+++ b/src/content/controllers/KeymapController.ts
@@ -9,7 +9,7 @@ import ClipboardUseCase from '../usecases/ClipboardUseCase';
import OperationClient from '../client/OperationClient';
import MarkKeyyUseCase from '../usecases/MarkKeyUseCase';
import FollowMasterClient from '../client/FollowMasterClient';
-import Key from '../domains/Key';
+import Key from '../../shared/settings/Key';
@injectable()
export default class KeymapController {
diff --git a/src/content/controllers/MarkKeyController.ts b/src/content/controllers/MarkKeyController.ts
index 886e5ff..e7653ee 100644
--- a/src/content/controllers/MarkKeyController.ts
+++ b/src/content/controllers/MarkKeyController.ts
@@ -1,7 +1,7 @@
import { injectable } from 'tsyringe';
import MarkUseCase from '../usecases/MarkUseCase';
import MarkKeyyUseCase from '../usecases/MarkKeyUseCase';
-import Key from '../domains/Key';
+import Key from '../../shared/settings/Key';
@injectable()
export default class MarkKeyController {
diff --git a/src/content/repositories/KeymapRepository.ts b/src/content/repositories/KeymapRepository.ts
index 4463678..3391229 100644
--- a/src/content/repositories/KeymapRepository.ts
+++ b/src/content/repositories/KeymapRepository.ts
@@ -1,5 +1,5 @@
-import Key from '../domains/Key';
-import KeySequence from '../domains/KeySequence';
+import Key from '../../shared/settings/Key';
+import KeySequence from '../../shared/settings/KeySequence';
export default interface KeymapRepository {
enqueueKey(key: Key): KeySequence;
diff --git a/src/content/usecases/FollowSlaveUseCase.ts b/src/content/usecases/FollowSlaveUseCase.ts
index 2bd16ee..d471adb 100644
--- a/src/content/usecases/FollowSlaveUseCase.ts
+++ b/src/content/usecases/FollowSlaveUseCase.ts
@@ -4,7 +4,7 @@ import FollowPresenter from '../presenters/FollowPresenter';
import TabsClient from '../client/TabsClient';
import FollowMasterClient from '../client/FollowMasterClient';
import { LinkHint, InputHint } from '../presenters/Hint';
-import Key from '../domains/Key';
+import Key from '../../shared/settings/Key';
interface Size {
width: number;
diff --git a/src/content/usecases/KeymapUseCase.ts b/src/content/usecases/KeymapUseCase.ts
index 62cd04c..495f6d0 100644
--- a/src/content/usecases/KeymapUseCase.ts
+++ b/src/content/usecases/KeymapUseCase.ts
@@ -3,9 +3,9 @@ import KeymapRepository from '../repositories/KeymapRepository';
import SettingRepository from '../repositories/SettingRepository';
import AddonEnabledRepository from '../repositories/AddonEnabledRepository';
import * as operations from '../../shared/operations';
-import Key from '../domains/Key';
-import KeySequence from '../domains/KeySequence';
import Keymaps from '../../shared/settings/Keymaps';
+import Key from '../../shared/settings/Key';
+import KeySequence from '../../shared/settings/KeySequence';
type KeymapEntityMap = Map<KeySequence, operations.Operation>;
@@ -66,10 +66,9 @@ export default class KeymapUseCase {
private keymapEntityMap(): KeymapEntityMap {
let keymaps = this.settingRepository.get().keymaps.combine(reservedKeymaps);
- let entries = keymaps.entries().map(entry => [
- KeySequence.fromMapKeys(entry[0]),
- entry[1],
- ]) as [KeySequence, operations.Operation][];
+ let entries = keymaps.entries().map(
+ ([keys, op]) => [KeySequence.fromMapKeys(keys), op]
+ ) as [KeySequence, operations.Operation][];
return new Map<KeySequence, operations.Operation>(entries);
}
}
diff --git a/src/content/domains/Key.ts b/src/shared/settings/Key.ts
index 669edfc..b11eeb2 100644
--- a/src/content/domains/Key.ts
+++ b/src/shared/settings/Key.ts
@@ -1,15 +1,3 @@
-const modifiedKeyName = (name: string): string => {
- if (name === ' ') {
- return 'Space';
- }
- if (name.length === 1) {
- return name;
- } else if (name === 'Escape') {
- return 'Esc';
- }
- return name;
-};
-
export default class Key {
public readonly key: string;
@@ -63,31 +51,11 @@ export default class Key {
});
}
- static fromKeyboardEvent(e: KeyboardEvent): Key {
- let key = modifiedKeyName(e.key);
- let shift = e.shiftKey;
- if (key.length === 1 && key.toUpperCase() === key.toLowerCase()) {
- // make shift false for symbols to enable key bindings by symbold keys.
- // But this limits key bindings by symbol keys with Shift
- // (such as Shift+$>.
- shift = false;
- }
-
- return new Key({
- key: modifiedKeyName(e.key),
- shift: shift,
- ctrl: e.ctrlKey,
- alt: e.altKey,
- meta: e.metaKey,
- });
- }
-
equals(key: Key) {
return this.key === key.key &&
- this.ctrl === key.ctrl &&
- this.meta === key.meta &&
- this.alt === key.alt &&
- this.shift === key.shift;
+ this.ctrl === key.ctrl &&
+ this.meta === key.meta &&
+ this.alt === key.alt &&
+ this.shift === key.shift;
}
}
-
diff --git a/src/content/domains/KeySequence.ts b/src/shared/settings/KeySequence.ts
index abae61a..4955583 100644
--- a/src/content/domains/KeySequence.ts
+++ b/src/shared/settings/KeySequence.ts
@@ -1,4 +1,4 @@
-import Key from './Key';
+import Key from '../../shared/settings/Key';
export default class KeySequence {
constructor(
diff --git a/test/content/InputDriver.test.ts b/test/content/InputDriver.test.ts
index b39312c..441d107 100644
--- a/test/content/InputDriver.test.ts
+++ b/test/content/InputDriver.test.ts
@@ -1,6 +1,6 @@
-import InputDriver from '../../src/content/InputDriver';
+import InputDriver, {keyFromKeyboardEvent} from '../../src/content/InputDriver';
import { expect } from 'chai';
-import Key from '../../src/content/domains/Key';
+import Key from '../../src/shared/settings/Key';
describe('InputDriver', () => {
let target: HTMLElement;
@@ -127,3 +127,50 @@ describe('InputDriver', () => {
div.dispatchEvent(new KeyboardEvent('keydown', { key: 'x' }));
});
});
+
+describe("#keyFromKeyboardEvent", () => {
+ it('returns from keyboard input Ctrl+X', () => {
+ let k = keyFromKeyboardEvent(new KeyboardEvent('keydown', {
+ key: 'x', shiftKey: false, ctrlKey: true, altKey: false, metaKey: true,
+ }));
+ expect(k.key).to.equal('x');
+ expect(k.shift).to.be.false;
+ expect(k.ctrl).to.be.true;
+ expect(k.alt).to.be.false;
+ expect(k.meta).to.be.true;
+ });
+
+ it('returns from keyboard input Shift+Esc', () => {
+ let k = keyFromKeyboardEvent(new KeyboardEvent('keydown', {
+ key: 'Escape', shiftKey: true, ctrlKey: false, altKey: false, metaKey: true
+ }));
+ expect(k.key).to.equal('Esc');
+ expect(k.shift).to.be.true;
+ expect(k.ctrl).to.be.false;
+ expect(k.alt).to.be.false;
+ expect(k.meta).to.be.true;
+ });
+
+ it('returns from keyboard input Ctrl+$', () => {
+ // $ required shift pressing on most keyboards
+ let k = keyFromKeyboardEvent(new KeyboardEvent('keydown', {
+ key: '$', shiftKey: true, ctrlKey: true, altKey: false, metaKey: false
+ }));
+ expect(k.key).to.equal('$');
+ expect(k.shift).to.be.false;
+ expect(k.ctrl).to.be.true;
+ expect(k.alt).to.be.false;
+ expect(k.meta).to.be.false;
+ });
+
+ it('returns from keyboard input Crtl+Space', () => {
+ let k = keyFromKeyboardEvent(new KeyboardEvent('keydown', {
+ key: ' ', shiftKey: false, ctrlKey: true, altKey: false, metaKey: false
+ }));
+ expect(k.key).to.equal('Space');
+ expect(k.shift).to.be.false;
+ expect(k.ctrl).to.be.true;
+ expect(k.alt).to.be.false;
+ expect(k.meta).to.be.false;
+ });
+});
diff --git a/test/content/repositories/KeymapRepository.test.ts b/test/content/repositories/KeymapRepository.test.ts
index da5624e..df013df 100644
--- a/test/content/repositories/KeymapRepository.test.ts
+++ b/test/content/repositories/KeymapRepository.test.ts
@@ -1,7 +1,7 @@
import KeymapRepository, { KeymapRepositoryImpl }
from '../../../src/content/repositories/KeymapRepository';
-import Key from '../../../src/content/domains/Key'
import { expect } from 'chai';
+import Key from "../../../src/shared/settings/Key";
describe('KeymapRepositoryImpl', () => {
let sut: KeymapRepository;
diff --git a/test/content/domains/Key.test.ts b/test/shared/settings/Key.test.ts
index 8e62f80..8222d5a 100644
--- a/test/content/domains/Key.test.ts
+++ b/test/shared/settings/Key.test.ts
@@ -1,54 +1,7 @@
-import Key from '../../../src/content/domains/Key';
import { expect } from 'chai'
+import Key from '../../../src/shared/settings/Key';
describe("Key", () => {
- describe('fromKeyboardEvent', () => {
- it('returns from keyboard input Ctrl+X', () => {
- let k = Key.fromKeyboardEvent(new KeyboardEvent('keydown', {
- key: 'x', shiftKey: false, ctrlKey: true, altKey: false, metaKey: true,
- }));
- expect(k.key).to.equal('x');
- expect(k.shift).to.be.false;
- expect(k.ctrl).to.be.true;
- expect(k.alt).to.be.false;
- expect(k.meta).to.be.true;
- });
-
- it('returns from keyboard input Shift+Esc', () => {
- let k = Key.fromKeyboardEvent(new KeyboardEvent('keydown', {
- key: 'Escape', shiftKey: true, ctrlKey: false, altKey: false, metaKey: true
- }));
- expect(k.key).to.equal('Esc');
- expect(k.shift).to.be.true;
- expect(k.ctrl).to.be.false;
- expect(k.alt).to.be.false;
- expect(k.meta).to.be.true;
- });
-
- it('returns from keyboard input Ctrl+$', () => {
- // $ required shift pressing on most keyboards
- let k = Key.fromKeyboardEvent(new KeyboardEvent('keydown', {
- key: '$', shiftKey: true, ctrlKey: true, altKey: false, metaKey: false
- }));
- expect(k.key).to.equal('$');
- expect(k.shift).to.be.false;
- expect(k.ctrl).to.be.true;
- expect(k.alt).to.be.false;
- expect(k.meta).to.be.false;
- });
-
- it('returns from keyboard input Crtl+Space', () => {
- let k = Key.fromKeyboardEvent(new KeyboardEvent('keydown', {
- key: ' ', shiftKey: false, ctrlKey: true, altKey: false, metaKey: false
- }));
- expect(k.key).to.equal('Space');
- expect(k.shift).to.be.false;
- expect(k.ctrl).to.be.true;
- expect(k.alt).to.be.false;
- expect(k.meta).to.be.false;
- });
- });
-
describe('fromMapKey', () => {
it('return for X', () => {
let key = Key.fromMapKey('x');
@@ -125,7 +78,7 @@ describe("Key", () => {
describe('equals', () => {
expect(new Key({
- key: 'x', shift: false, ctrl: true, alt: false, meta: false,
+ key: 'x', shift: false, ctrl: true, alt: false, meta: false,
}).equals(new Key({
key: 'x', shift: false, ctrl: true, alt: false, meta: false,
}))).to.be.true;
diff --git a/test/content/domains/KeySequence.test.ts b/test/shared/settings/KeySequence.test.ts
index 62af165..361cbd1 100644
--- a/test/content/domains/KeySequence.test.ts
+++ b/test/shared/settings/KeySequence.test.ts
@@ -1,6 +1,6 @@
-import KeySequence from '../../../src/content/domains/KeySequence';
-import Key from '../../../src/content/domains/Key';
+import KeySequence from '../../../src/shared/settings/KeySequence';
import { expect } from 'chai'
+import Key from "../../../src/shared/settings/Key";
describe("KeySequence", () => {
describe('#push', () => {
generated by cgit v1.2.3 (git 2.39.1) at 2025-04-01 06:18:22 +0000