Move Key to settings
This commit is contained in:
Shin'ya UEOKA
parent
8428671a0a
commit
da3ce77aa0
14 changed files with 105 additions and 106 deletions
|
|
@ -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;
|
||||
});
|
||||
});
|
||||
|
|
|
|||
|
|
@ -1,139 +0,0 @@
|
|||
import Key from '../../../src/content/domains/Key';
|
||||
import { expect } from 'chai'
|
||||
|
||||
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');
|
||||
expect(key.key).to.equal('x');
|
||||
expect(key.shift).to.be.false;
|
||||
expect(key.ctrl).to.be.false;
|
||||
expect(key.alt).to.be.false;
|
||||
expect(key.meta).to.be.false;
|
||||
});
|
||||
|
||||
it('return for Shift+X', () => {
|
||||
let key = Key.fromMapKey('X');
|
||||
expect(key.key).to.equal('X');
|
||||
expect(key.shift).to.be.true;
|
||||
expect(key.ctrl).to.be.false;
|
||||
expect(key.alt).to.be.false;
|
||||
expect(key.meta).to.be.false;
|
||||
});
|
||||
|
||||
it('return for Ctrl+X', () => {
|
||||
let key = Key.fromMapKey('<C-X>');
|
||||
expect(key.key).to.equal('x');
|
||||
expect(key.shift).to.be.false;
|
||||
expect(key.ctrl).to.be.true;
|
||||
expect(key.alt).to.be.false;
|
||||
expect(key.meta).to.be.false;
|
||||
});
|
||||
|
||||
it('returns for Ctrl+Meta+X', () => {
|
||||
let key = Key.fromMapKey('<C-M-X>');
|
||||
expect(key.key).to.equal('x');
|
||||
expect(key.shift).to.be.false;
|
||||
expect(key.ctrl).to.be.true;
|
||||
expect(key.alt).to.be.false;
|
||||
expect(key.meta).to.be.true;
|
||||
});
|
||||
|
||||
it('returns for Ctrl+Shift+x', () => {
|
||||
let key = Key.fromMapKey('<C-S-x>');
|
||||
expect(key.key).to.equal('X');
|
||||
expect(key.shift).to.be.true;
|
||||
expect(key.ctrl).to.be.true;
|
||||
expect(key.alt).to.be.false;
|
||||
expect(key.meta).to.be.false;
|
||||
});
|
||||
|
||||
it('returns for Shift+Esc', () => {
|
||||
let key = Key.fromMapKey('<S-Esc>');
|
||||
expect(key.key).to.equal('Esc');
|
||||
expect(key.shift).to.be.true;
|
||||
expect(key.ctrl).to.be.false;
|
||||
expect(key.alt).to.be.false;
|
||||
expect(key.meta).to.be.false;
|
||||
});
|
||||
|
||||
it('returns for Ctrl+Esc', () => {
|
||||
let key = Key.fromMapKey('<C-Esc>');
|
||||
expect(key.key).to.equal('Esc');
|
||||
expect(key.shift).to.be.false;
|
||||
expect(key.ctrl).to.be.true;
|
||||
expect(key.alt).to.be.false;
|
||||
expect(key.meta).to.be.false;
|
||||
});
|
||||
|
||||
it('returns for Ctrl+Esc', () => {
|
||||
let key = Key.fromMapKey('<C-Space>');
|
||||
expect(key.key).to.equal('Space');
|
||||
expect(key.shift).to.be.false;
|
||||
expect(key.ctrl).to.be.true;
|
||||
expect(key.alt).to.be.false;
|
||||
expect(key.meta).to.be.false;
|
||||
});
|
||||
});
|
||||
|
||||
describe('equals', () => {
|
||||
expect(new Key({
|
||||
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;
|
||||
|
||||
expect(new Key({
|
||||
key: 'x', shift: false, ctrl: false, alt: false, meta: false,
|
||||
}).equals(new Key({
|
||||
key: 'X', shift: true, ctrl: false, alt: false, meta: false,
|
||||
}))).to.be.false;
|
||||
});
|
||||
});
|
||||
|
|
@ -1,72 +0,0 @@
|
|||
import KeySequence from '../../../src/content/domains/KeySequence';
|
||||
import Key from '../../../src/content/domains/Key';
|
||||
import { expect } from 'chai'
|
||||
|
||||
describe("KeySequence", () => {
|
||||
describe('#push', () => {
|
||||
it('append a key to the sequence', () => {
|
||||
let seq = new KeySequence([]);
|
||||
seq.push(Key.fromMapKey('g'));
|
||||
seq.push(Key.fromMapKey('<S-U>'));
|
||||
|
||||
expect(seq.keys[0].key).to.equal('g');
|
||||
expect(seq.keys[1].key).to.equal('U');
|
||||
expect(seq.keys[1].shift).to.be.true;
|
||||
})
|
||||
});
|
||||
|
||||
describe('#startsWith', () => {
|
||||
it('returns true if the key sequence starts with param', () => {
|
||||
let seq = new KeySequence([
|
||||
Key.fromMapKey('g'),
|
||||
Key.fromMapKey('<S-U>'),
|
||||
]);
|
||||
|
||||
expect(seq.startsWith(new KeySequence([
|
||||
]))).to.be.true;
|
||||
expect(seq.startsWith(new KeySequence([
|
||||
Key.fromMapKey('g'),
|
||||
]))).to.be.true;
|
||||
expect(seq.startsWith(new KeySequence([
|
||||
Key.fromMapKey('g'), Key.fromMapKey('<S-U>'),
|
||||
]))).to.be.true;
|
||||
expect(seq.startsWith(new KeySequence([
|
||||
Key.fromMapKey('g'), Key.fromMapKey('<S-U>'), Key.fromMapKey('x'),
|
||||
]))).to.be.false;
|
||||
expect(seq.startsWith(new KeySequence([
|
||||
Key.fromMapKey('h'),
|
||||
]))).to.be.false;
|
||||
});
|
||||
|
||||
it('returns true if the empty sequence starts with an empty sequence', () => {
|
||||
let seq = new KeySequence([]);
|
||||
|
||||
expect(seq.startsWith(new KeySequence([]))).to.be.true;
|
||||
expect(seq.startsWith(new KeySequence([
|
||||
Key.fromMapKey('h'),
|
||||
]))).to.be.false;
|
||||
})
|
||||
});
|
||||
|
||||
describe('#fromMapKeys', () => {
|
||||
it('returns mapped keys for Shift+Esc', () => {
|
||||
let keys = KeySequence.fromMapKeys('<S-Esc>').keys;
|
||||
expect(keys).to.have.lengthOf(1);
|
||||
expect(keys[0].key).to.equal('Esc');
|
||||
expect(keys[0].shift).to.be.true;
|
||||
});
|
||||
|
||||
it('returns mapped keys for a<C-B><A-C>d<M-e>', () => {
|
||||
let keys = KeySequence.fromMapKeys('a<C-B><A-C>d<M-e>').keys;
|
||||
expect(keys).to.have.lengthOf(5);
|
||||
expect(keys[0].key).to.equal('a');
|
||||
expect(keys[1].ctrl).to.be.true;
|
||||
expect(keys[1].key).to.equal('b');
|
||||
expect(keys[2].alt).to.be.true;
|
||||
expect(keys[2].key).to.equal('c');
|
||||
expect(keys[3].key).to.equal('d');
|
||||
expect(keys[4].meta).to.be.true;
|
||||
expect(keys[4].key).to.equal('e');
|
||||
});
|
||||
})
|
||||
});
|
||||
|
|
@ -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;
|
||||
|
|
|
|||
Reference in a new issue