Skip to content

Commit f30917d

Browse files
caiiiycukcaiiiycuk
committed
v0.73.7: fix caiiiycuk/js-dos#113 
1 parent 28274a8 commit f30917d

File tree

4 files changed

+94
-81
lines changed

4 files changed

+94
-81
lines changed

‎package.json

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "emulators-ui",
3-
"version": "0.73.6",
3+
"version": "0.73.7",
44
"description": "Emulators UI",
55
"main": "dist/emulators-ui.js",
66
"types": "dist/types/emulators-ui.d.ts",
@@ -38,18 +38,18 @@
3838
"@types/gulp-size": "^4.0.0",
3939
"@types/gulp-sourcemaps": "0.0.35",
4040
"@types/gulp-terser": "^1.2.1",
41-
"@types/node": "^18.0.3",
41+
"@types/node": "^18.0.6",
4242
"@types/vinyl-buffer": "^1.0.0",
4343
"@types/vinyl-source-stream": "0.0.30",
44-
"@typescript-eslint/eslint-plugin": "^5.30.5",
45-
"@typescript-eslint/parser": "^5.30.5",
44+
"@typescript-eslint/eslint-plugin": "^5.30.6",
45+
"@typescript-eslint/parser": "^5.30.6",
4646
"babelify": "^10.0.0",
4747
"browserify": "^17.0.0",
48-
"core-js": "^3.23.4",
48+
"core-js": "^3.23.5",
4949
"del": "^6.1.1",
5050
"element-resize-detector": "^1.2.4",
5151
"emulators": "^0.73.7",
52-
"eslint": "^8.19.0",
52+
"eslint": "^8.20.0",
5353
"eslint-config-google": "^0.14.0",
5454
"git-repo-info": "^2.1.1",
5555
"gulp": "^4.0.2",
@@ -60,8 +60,8 @@
6060
"md5.js": "^1.3.5",
6161
"nipplejs": "^0.9.0",
6262
"notyf": "^3.10.0",
63-
"simple-keyboard": "^3.4.122",
64-
"ts-node": "^10.8.2",
63+
"simple-keyboard": "^3.4.126",
64+
"ts-node": "^10.9.1",
6565
"tsify": "^5.0.4",
6666
"typescript": "^4.7.4",
6767
"vinyl-buffer": "^1.0.1",

‎src/build.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
// gulpfile.ts/wasm.ts --> generateBuildInfo
55

66
export const Build = {
7-
short: "0.73.5",
8-
version: "0.73.5 (2823574dcca80b00ce959e6882126e16)",
9-
buildSeed: 1657520884756,
7+
short: "0.73.6",
8+
version: "0.73.6 (56358274d9c94c50e01e40c6e3b92c6e)",
9+
buildSeed: 1658134329704,
1010
};

‎src/dom/layers.ts

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ const resizeDetector = elementResizeDetector({
1919
export interface LayersOptions {
2020
optionControls?: string[];
2121
keyboardDiv?: HTMLDivElement;
22+
keyboardInputDiv?: HTMLDivElement;
2223
fullscreenElement?: HTMLElement;
2324
}
2425

@@ -134,14 +135,22 @@ export class Layers {
134135
}
135136

136137
private initKeyEvents() {
137-
window.addEventListener("keydown", (e) => {
138+
const keyboardInput = this.options.keyboardInputDiv ?? this.root;
139+
keyboardInput.style.outline = "none";
140+
if (!keyboardInput.tabIndex || keyboardInput.tabIndex === -1) {
141+
keyboardInput.tabIndex = 0;
142+
}
143+
keyboardInput.addEventListener("keydown", (e) => {
138144
const keyCode = domToKeyCode(e.keyCode);
139145
this.onKeyDown(keyCode);
146+
e.stopPropagation();
147+
e.preventDefault();
140148
});
141-
142-
window.addEventListener("keyup", (e) => {
149+
keyboardInput.addEventListener("keyup", (e) => {
143150
const keyCode = domToKeyCode(e.keyCode);
144151
this.onKeyUp(keyCode);
152+
e.stopPropagation();
153+
e.preventDefault();
145154
});
146155
}
147156

@@ -385,6 +394,10 @@ export class Layers {
385394
preventMouseUpDefault: true,
386395
stopMouseDownPropagation: true,
387396
stopMouseUpPropagation: true,
397+
physicalKeyboardHighlight: false,
398+
physicalKeyboardHighlightPress: false,
399+
physicalKeyboardHighlightPressUseClick: false,
400+
physicalKeyboardHighlightPressUsePointerEvents: false,
388401
});
389402

390403
this.toggleKeyboard = () => {

‎yarn.lock

Lines changed: 67 additions & 67 deletions
Original file line numberDiff line numberDiff line change
@@ -1292,10 +1292,10 @@
12921292
resolved "https://registry.yarnpkg.com/@types/node/-/node-16.11.10.tgz#2e3ad0a680d96367103d3e670d41c2fed3da61ae"
12931293
integrity sha512-3aRnHa1KlOEEhJ6+CvyHKK5vE9BcLGjtUpwvqYLRvYNQKMfabu3BwfJaA/SLW8dxe28LsNDjtHwePTuzn3gmOA==
12941294

1295-
"@types/node@^18.0.3":
1296-
version "18.0.3"
1297-
resolved "https://registry.yarnpkg.com/@types/node/-/node-18.0.3.tgz#463fc47f13ec0688a33aec75d078a0541a447199"
1298-
integrity sha512-HzNRZtp4eepNitP+BD6k2L6DROIDG4Q0fm4x+dwfsr6LGmROENnok75VGw40628xf+iR24WeMFcHuuBDUAzzsQ==
1295+
"@types/node@^18.0.6":
1296+
version "18.0.6"
1297+
resolved "https://registry.yarnpkg.com/@types/node/-/node-18.0.6.tgz#0ba49ac517ad69abe7a1508bc9b3a5483df9d5d7"
1298+
integrity sha512-/xUq6H2aQm261exT6iZTMifUySEt4GR5KX8eYyY+C4MSNPqSh9oNIP7tz2GLKTlFaiBbgZNxffoR3CVRG+cljw==
12991299

13001300
"@types/undertaker-registry@*":
13011301
version "1.0.1"
@@ -1342,84 +1342,84 @@
13421342
"@types/expect" "^1.20.4"
13431343
"@types/node" "*"
13441344

1345-
"@typescript-eslint/eslint-plugin@^5.30.5":
1346-
version "5.30.5"
1347-
resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.30.5.tgz#e9a0afd6eb3b1d663db91cf1e7bc7584d394503d"
1348-
integrity sha512-lftkqRoBvc28VFXEoRgyZuztyVUQ04JvUnATSPtIRFAccbXTWL6DEtXGYMcbg998kXw1NLUJm7rTQ9eUt+q6Ig==
1345+
"@typescript-eslint/eslint-plugin@^5.30.6":
1346+
version "5.30.6"
1347+
resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.30.6.tgz#9c6017b6c1d04894141b4a87816388967f64c359"
1348+
integrity sha512-J4zYMIhgrx4MgnZrSDD7sEnQp7FmhKNOaqaOpaoQ/SfdMfRB/0yvK74hTnvH+VQxndZynqs5/Hn4t+2/j9bADg==
13491349
dependencies:
1350-
"@typescript-eslint/scope-manager" "5.30.5"
1351-
"@typescript-eslint/type-utils" "5.30.5"
1352-
"@typescript-eslint/utils" "5.30.5"
1350+
"@typescript-eslint/scope-manager" "5.30.6"
1351+
"@typescript-eslint/type-utils" "5.30.6"
1352+
"@typescript-eslint/utils" "5.30.6"
13531353
debug "^4.3.4"
13541354
functional-red-black-tree "^1.0.1"
13551355
ignore "^5.2.0"
13561356
regexpp "^3.2.0"
13571357
semver "^7.3.7"
13581358
tsutils "^3.21.0"
13591359

1360-
"@typescript-eslint/parser@^5.30.5":
1361-
version "5.30.5"
1362-
resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-5.30.5.tgz#f667c34e4e4c299d98281246c9b1e68c03a92522"
1363-
integrity sha512-zj251pcPXI8GO9NDKWWmygP6+UjwWmrdf9qMW/L/uQJBM/0XbU2inxe5io/234y/RCvwpKEYjZ6c1YrXERkK4Q==
1360+
"@typescript-eslint/parser@^5.30.6":
1361+
version "5.30.6"
1362+
resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-5.30.6.tgz#add440db038fa9d777e4ebdaf66da9e7fb7abe92"
1363+
integrity sha512-gfF9lZjT0p2ZSdxO70Xbw8w9sPPJGfAdjK7WikEjB3fcUI/yr9maUVEdqigBjKincUYNKOmf7QBMiTf719kbrA==
13641364
dependencies:
1365-
"@typescript-eslint/scope-manager" "5.30.5"
1366-
"@typescript-eslint/types" "5.30.5"
1367-
"@typescript-eslint/typescript-estree" "5.30.5"
1365+
"@typescript-eslint/scope-manager" "5.30.6"
1366+
"@typescript-eslint/types" "5.30.6"
1367+
"@typescript-eslint/typescript-estree" "5.30.6"
13681368
debug "^4.3.4"
13691369

1370-
"@typescript-eslint/scope-manager@5.30.5":
1371-
version "5.30.5"
1372-
resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-5.30.5.tgz#7f90b9d6800552c856a5f3644f5e55dd1469d964"
1373-
integrity sha512-NJ6F+YHHFT/30isRe2UTmIGGAiXKckCyMnIV58cE3JkHmaD6e5zyEYm5hBDv0Wbin+IC0T1FWJpD3YqHUG/Ydg==
1370+
"@typescript-eslint/scope-manager@5.30.6":
1371+
version "5.30.6"
1372+
resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-5.30.6.tgz#ce1b49ff5ce47f55518d63dbe8fc9181ddbd1a33"
1373+
integrity sha512-Hkq5PhLgtVoW1obkqYH0i4iELctEKixkhWLPTYs55doGUKCASvkjOXOd/pisVeLdO24ZX9D6yymJ/twqpJiG3g==
13741374
dependencies:
1375-
"@typescript-eslint/types" "5.30.5"
1376-
"@typescript-eslint/visitor-keys" "5.30.5"
1375+
"@typescript-eslint/types" "5.30.6"
1376+
"@typescript-eslint/visitor-keys" "5.30.6"
13771377

1378-
"@typescript-eslint/type-utils@5.30.5":
1379-
version "5.30.5"
1380-
resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-5.30.5.tgz#7a9656f360b4b1daea635c4621dab053d08bf8a9"
1381-
integrity sha512-k9+ejlv1GgwN1nN7XjVtyCgE0BTzhzT1YsQF0rv4Vfj2U9xnslBgMYYvcEYAFVdvhuEscELJsB7lDkN7WusErw==
1378+
"@typescript-eslint/type-utils@5.30.6":
1379+
version "5.30.6"
1380+
resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-5.30.6.tgz#a64aa9acbe609ab77f09f53434a6af2b9685f3af"
1381+
integrity sha512-GFVVzs2j0QPpM+NTDMXtNmJKlF842lkZKDSanIxf+ArJsGeZUIaeT4jGg+gAgHt7AcQSFwW7htzF/rbAh2jaVA==
13821382
dependencies:
1383-
"@typescript-eslint/utils" "5.30.5"
1383+
"@typescript-eslint/utils" "5.30.6"
13841384
debug "^4.3.4"
13851385
tsutils "^3.21.0"
13861386

1387-
"@typescript-eslint/types@5.30.5":
1388-
version "5.30.5"
1389-
resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.30.5.tgz#36a0c05a72af3623cdf9ee8b81ea743b7de75a98"
1390-
integrity sha512-kZ80w/M2AvsbRvOr3PjaNh6qEW1LFqs2pLdo2s5R38B2HYXG8Z0PP48/4+j1QHJFL3ssHIbJ4odPRS8PlHrFfw==
1387+
"@typescript-eslint/types@5.30.6":
1388+
version "5.30.6"
1389+
resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.30.6.tgz#86369d0a7af8c67024115ac1da3e8fb2d38907e1"
1390+
integrity sha512-HdnP8HioL1F7CwVmT4RaaMX57RrfqsOMclZc08wGMiDYJBsLGBM7JwXM4cZJmbWLzIR/pXg1kkrBBVpxTOwfUg==
13911391

1392-
"@typescript-eslint/typescript-estree@5.30.5":
1393-
version "5.30.5"
1394-
resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.30.5.tgz#c520e4eba20551c4ec76af8d344a42eb6c9767bb"
1395-
integrity sha512-qGTc7QZC801kbYjAr4AgdOfnokpwStqyhSbiQvqGBLixniAKyH+ib2qXIVo4P9NgGzwyfD9I0nlJN7D91E1VpQ==
1392+
"@typescript-eslint/typescript-estree@5.30.6":
1393+
version "5.30.6"
1394+
resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.30.6.tgz#a84a0d6a486f9b54042da1de3d671a2c9f14484e"
1395+
integrity sha512-Z7TgPoeYUm06smfEfYF0RBkpF8csMyVnqQbLYiGgmUSTaSXTP57bt8f0UFXstbGxKIreTwQCujtaH0LY9w9B+A==
13961396
dependencies:
1397-
"@typescript-eslint/types" "5.30.5"
1398-
"@typescript-eslint/visitor-keys" "5.30.5"
1397+
"@typescript-eslint/types" "5.30.6"
1398+
"@typescript-eslint/visitor-keys" "5.30.6"
13991399
debug "^4.3.4"
14001400
globby "^11.1.0"
14011401
is-glob "^4.0.3"
14021402
semver "^7.3.7"
14031403
tsutils "^3.21.0"
14041404

1405-
"@typescript-eslint/utils@5.30.5":
1406-
version "5.30.5"
1407-
resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-5.30.5.tgz#3999cbd06baad31b9e60d084f20714d1b2776765"
1408-
integrity sha512-o4SSUH9IkuA7AYIfAvatldovurqTAHrfzPApOZvdUq01hHojZojCFXx06D/aFpKCgWbMPRdJBWAC3sWp3itwTA==
1405+
"@typescript-eslint/utils@5.30.6":
1406+
version "5.30.6"
1407+
resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-5.30.6.tgz#1de2da14f678e7d187daa6f2e4cdb558ed0609dc"
1408+
integrity sha512-xFBLc/esUbLOJLk9jKv0E9gD/OH966M40aY9jJ8GiqpSkP2xOV908cokJqqhVd85WoIvHVHYXxSFE4cCSDzVvA==
14091409
dependencies:
14101410
"@types/json-schema" "^7.0.9"
1411-
"@typescript-eslint/scope-manager" "5.30.5"
1412-
"@typescript-eslint/types" "5.30.5"
1413-
"@typescript-eslint/typescript-estree" "5.30.5"
1411+
"@typescript-eslint/scope-manager" "5.30.6"
1412+
"@typescript-eslint/types" "5.30.6"
1413+
"@typescript-eslint/typescript-estree" "5.30.6"
14141414
eslint-scope "^5.1.1"
14151415
eslint-utils "^3.0.0"
14161416

1417-
"@typescript-eslint/visitor-keys@5.30.5":
1418-
version "5.30.5"
1419-
resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.30.5.tgz#d4bb969202019d5d5d849a0aaedc7370cc044b14"
1420-
integrity sha512-D+xtGo9HUMELzWIUqcQc0p2PO4NyvTrgIOK/VnSH083+8sq0tiLozNRKuLarwHYGRuA6TVBQSuuLwJUDWd3aaA==
1417+
"@typescript-eslint/visitor-keys@5.30.6":
1418+
version "5.30.6"
1419+
resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.30.6.tgz#94dd10bb481c8083378d24de1742a14b38a2678c"
1420+
integrity sha512-41OiCjdL2mCaSDi2SvYbzFLlqqlm5v1ZW9Ym55wXKL/Rx6OOB1IbuFGo71Fj6Xy90gJDFTlgOS+vbmtGHPTQQA==
14211421
dependencies:
1422-
"@typescript-eslint/types" "5.30.5"
1422+
"@typescript-eslint/types" "5.30.6"
14231423
eslint-visitor-keys "^3.3.0"
14241424

14251425
JSONStream@^1.0.3:
@@ -2339,10 +2339,10 @@ core-js-compat@^3.22.1:
23392339
browserslist "^4.20.3"
23402340
semver "7.0.0"
23412341

2342-
core-js@^3.23.4:
2343-
version "3.23.4"
2344-
resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.23.4.tgz#92d640faa7f48b90bbd5da239986602cfc402aa6"
2345-
integrity sha512-vjsKqRc1RyAJC3Ye2kYqgfdThb3zYnx9CrqoCcjMOENMtQPC7ZViBvlDxwYU/2z2NI/IPuiXw5mT4hWhddqjzQ==
2342+
core-js@^3.23.5:
2343+
version "3.23.5"
2344+
resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.23.5.tgz#1f82b0de5eece800827a2f59d597509c67650475"
2345+
integrity sha512-7Vh11tujtAZy82da4duVreQysIoO2EvVrur7y6IzZkH1IHPSekuDi8Vuw1+YKjkbfWLRD7Nc9ICQ/sIUDutcyg==
23462346

23472347
core-util-is@~1.0.0:
23482348
version "1.0.3"
@@ -2816,10 +2816,10 @@ eslint-visitor-keys@^3.3.0:
28162816
resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz#f6480fa6b1f30efe2d1968aa8ac745b862469826"
28172817
integrity sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==
28182818

2819-
eslint@^8.19.0:
2820-
version "8.19.0"
2821-
resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.19.0.tgz#7342a3cbc4fbc5c106a1eefe0fd0b50b6b1a7d28"
2822-
integrity sha512-SXOPj3x9VKvPe81TjjUJCYlV4oJjQw68Uek+AM0X4p+33dj2HY5bpTZOgnQHcG2eAm1mtCU9uNMnJi7exU/kYw==
2819+
eslint@^8.20.0:
2820+
version "8.20.0"
2821+
resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.20.0.tgz#048ac56aa18529967da8354a478be4ec0a2bc81b"
2822+
integrity sha512-d4ixhz5SKCa1D6SCPrivP7yYVi7nyD6A4vs6HIAul9ujBzcEmZVM3/0NN/yu5nKhmO1wjp5xQ46iRfmDGlOviA==
28232823
dependencies:
28242824
"@eslint/eslintrc" "^1.3.0"
28252825
"@humanwhocodes/config-array" "^0.9.2"
@@ -5210,10 +5210,10 @@ simple-concat@^1.0.0:
52105210
resolved "https://registry.yarnpkg.com/simple-concat/-/simple-concat-1.0.1.tgz#f46976082ba35c2263f1c8ab5edfe26c41c9552f"
52115211
integrity sha512-cSFtAPtRhljv69IK0hTVZQ+OfE9nePi/rtJmw5UjHeVyVroEqJXP1sFztKUy1qU+xvz3u/sfYJLa947b7nAN2Q==
52125212

5213-
simple-keyboard@^3.4.122:
5214-
version "3.4.122"
5215-
resolved "https://registry.yarnpkg.com/simple-keyboard/-/simple-keyboard-3.4.122.tgz#786b509b8d6ddd180472b3a0742ff4f8213b589b"
5216-
integrity sha512-qG1kXgkAMcJ/yBOjwRHbss/l5EaJoIgU0+4xXd/ynhdfPnD9juAAJNKfgFtFWu/GtfxFJy5N1H40DNI8HJJBEw==
5213+
simple-keyboard@^3.4.126:
5214+
version "3.4.126"
5215+
resolved "https://registry.yarnpkg.com/simple-keyboard/-/simple-keyboard-3.4.126.tgz#ad34254c11a5151a11d430e8d6755d1f03331d02"
5216+
integrity sha512-2PaZiDjyi+bfVEMOJwzpoeb6gWtEPmPFC/hGa6ZWGIXWcXYsn7e1RP/NxzlYg9Z5oB0fC1yAtN6Jvk94V4O10w==
52175217

52185218
slash@^3.0.0:
52195219
version "3.0.0"
@@ -5644,10 +5644,10 @@ to-through@^2.0.0:
56445644
dependencies:
56455645
through2 "^2.0.3"
56465646

5647-
ts-node@^10.8.2:
5648-
version "10.8.2"
5649-
resolved "https://registry.yarnpkg.com/ts-node/-/ts-node-10.8.2.tgz#3185b75228cef116bf82ffe8762594f54b2a23f2"
5650-
integrity sha512-LYdGnoGddf1D6v8REPtIH+5iq/gTDuZqv2/UJUU7tKjuEU8xVZorBM+buCGNjj+pGEud+sOoM4CX3/YzINpENA==
5647+
ts-node@^10.9.1:
5648+
version "10.9.1"
5649+
resolved "https://registry.yarnpkg.com/ts-node/-/ts-node-10.9.1.tgz#e73de9102958af9e1f0b168a6ff320e25adcff4b"
5650+
integrity sha512-NtVysVPkxxrwFGUUxGYhfux8k78pQB3JqYBXlLRZgdGUqTO5wU/UyHop5p70iEbGhB7q5KmiZiU0Y3KlJrScEw==
56515651
dependencies:
56525652
"@cspotcode/source-map-support" "^0.8.0"
56535653
"@tsconfig/node10" "^1.0.7"

0 commit comments

Comments
 (0)