github/simple-keyboard
github/simple-keyboard
3
0
Fork 0
mirror of https://github.com/hodgef/simple-keyboard.git synced 2025-02-22 01:29:39 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'staging'

Browse Source
This commit is contained in:
Francisco Hodge 2019-03-11 18:31:04 -04:00
commit 564aa188e4
4 changed files with 24 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
package-lock.json generated
View File

@ -1,6 +1,6 @@
{ {
"name": "simple-keyboard", "name": "simple-keyboard",
"version": "2.19.1", "version": "2.20.0",
"lockfileVersion": 1, "lockfileVersion": 1,
"requires": true, "requires": true,
"dependencies": { "dependencies": {
@ -2905,7 +2905,7 @@
}, },
"minimist": { "minimist": {
"version": "1.2.0", "version": "1.2.0",
"resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", "resolved": "http://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
"integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=", "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
"dev": true "dev": true
} }
@ -8452,7 +8452,7 @@
}, },
"hoek": { "hoek": {
"version": "4.2.1", "version": "4.2.1",
"resolved": "https://registry.npmjs.org/hoek/-/hoek-4.2.1.tgz", "resolved": "http://registry.npmjs.org/hoek/-/hoek-4.2.1.tgz",
"integrity": "sha512-QLg82fGkfnJ/4iy1xZ81/9SIJiq1NGFUMGs6ParyjBZr6jW2Ufj/snDqTHixNlHdPNwN2RLVD0Pi3igeK9+JfA==", "integrity": "sha512-QLg82fGkfnJ/4iy1xZ81/9SIJiq1NGFUMGs6ParyjBZr6jW2Ufj/snDqTHixNlHdPNwN2RLVD0Pi3igeK9+JfA==",
"dev": true "dev": true
}, },
@ -16404,7 +16404,7 @@
}, },
"topo": { "topo": {
"version": "2.0.2", "version": "2.0.2",
"resolved": "https://registry.npmjs.org/topo/-/topo-2.0.2.tgz", "resolved": "http://registry.npmjs.org/topo/-/topo-2.0.2.tgz",
"integrity": "sha1-zVYVdSU5BXwNwEkaYhw7xvvh0YI=", "integrity": "sha1-zVYVdSU5BXwNwEkaYhw7xvvh0YI=",
"dev": true, "dev": true,
"requires": { "requires": {

2
package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "simple-keyboard", "name": "simple-keyboard",
"version": "2.19.1", "version": "2.20.0",
"description": "On-screen Javascript Virtual Keyboard", "description": "On-screen Javascript Virtual Keyboard",
"main": "build/index.js", "main": "build/index.js",
"types": "build/index.d.ts", "types": "build/index.d.ts",

17
src/lib/components/Keyboard.js
View File

@ -226,6 +226,12 @@ class SimpleKeyboard {
*/ */
/* istanbul ignore next */ /* istanbul ignore next */
handleButtonMouseDown(button, e) { handleButtonMouseDown(button, e) {
/**
* Handle event options
*/
if (this.options.preventMouseDownDefault) e.preventDefault();
if (this.options.stopMouseDownPropagation) e.stopPropagation();
/** /**
* @type {boolean} Whether the mouse is being held onKeyPress * @type {boolean} Whether the mouse is being held onKeyPress
*/ */
@ -1039,15 +1045,13 @@ class SimpleKeyboard {
!useMouseEvents !useMouseEvents
) { ) {
/** /**
* PointerEvents support * Handle PointerEvents
*/ */
buttonDOM.onpointerdown = e => { buttonDOM.onpointerdown = e => {
if (this.options.preventMouseDownDefault) e.preventDefault();
this.handleButtonClicked(button); this.handleButtonClicked(button);
this.handleButtonMouseDown(button, e); this.handleButtonMouseDown(button, e);
}; };
buttonDOM.onpointerup = e => { buttonDOM.onpointerup = e => {
if (this.options.preventMouseDownDefault) e.preventDefault();
this.handleButtonMouseUp(); this.handleButtonMouseUp();
}; };
buttonDOM.onpointercancel = e => this.handleButtonMouseUp(); buttonDOM.onpointercancel = e => this.handleButtonMouseUp();
@ -1056,6 +1060,9 @@ class SimpleKeyboard {
* Fallback for browsers not supporting PointerEvents * Fallback for browsers not supporting PointerEvents
*/ */
if (useTouchEvents) { if (useTouchEvents) {
/**
* Handle touch events
*/
buttonDOM.ontouchstart = e => { buttonDOM.ontouchstart = e => {
this.handleButtonClicked(button); this.handleButtonClicked(button);
this.handleButtonMouseDown(button, e); this.handleButtonMouseDown(button, e);
@ -1063,12 +1070,14 @@ class SimpleKeyboard {
buttonDOM.ontouchend = e => this.handleButtonMouseUp(); buttonDOM.ontouchend = e => this.handleButtonMouseUp();
buttonDOM.ontouchcancel = e => this.handleButtonMouseUp(); buttonDOM.ontouchcancel = e => this.handleButtonMouseUp();
} else { } else {
/**
* Handle mouse events
*/
buttonDOM.onclick = () => { buttonDOM.onclick = () => {
this.isMouseHold = false; this.isMouseHold = false;
this.handleButtonClicked(button); this.handleButtonClicked(button);
}; };
buttonDOM.onmousedown = e => { buttonDOM.onmousedown = e => {
if (this.options.preventMouseDownDefault) e.preventDefault();
this.handleButtonMouseDown(button, e); this.handleButtonMouseDown(button, e);
}; };
} }

8
src/lib/components/tests/Keyboard.test.js
View File

@ -900,7 +900,9 @@ it('Keyboard handleButtonMouseDown will work', () => {
let keyboard = new Keyboard(); let keyboard = new Keyboard();
keyboard.handleButtonMouseDown("q", { keyboard.handleButtonMouseDown("q", {
target: keyboard.getButtonElement("q") target: keyboard.getButtonElement("q"),
preventDefault: () => {},
stopPropagation: () => {}
}); });
var clickEvent = document.createEvent('MouseEvents'); var clickEvent = document.createEvent('MouseEvents');
@ -918,7 +920,9 @@ it('Keyboard handleButtonMouseDown will work with preventMouseDownDefault', () =
keyboard.options.preventMouseDownDefault = true; keyboard.options.preventMouseDownDefault = true;
keyboard.handleButtonMouseDown("q", { keyboard.handleButtonMouseDown("q", {
target: keyboard.getButtonElement("q") target: keyboard.getButtonElement("q"),
preventDefault: () => {},
stopPropagation: () => {}
}); });
var clickEvent = document.createEvent('MouseEvents'); var clickEvent = document.createEvent('MouseEvents');