Reduce usage of legacy event.keyCode. NFC
#22881
Open
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
I noticed this could be improved while reviewing #22879. Whichever lands first will have to deal with a conflict. |
kripken
approved these changes
Nov 7, 2024
src/library_sdl.js
Outdated
| @@ -553,7 +553,7 @@ var LibrarySDL = { | |||
| receiveEvent(event) { | |||
| function unpressAllPressedKeys() { | |||
| // Un-press all pressed keys: TODO | |||
| for (var keyCode of SDL.keyboardMap) { | |||
| for (var keyCode of Object.values(SDL.keyboardMap)) { | |||
There was a problem hiding this comment.
Yup, I see this crash when running the interactive tests.
sbc100
commented
Nov 7, 2024
| @@ -313,7 +313,7 @@ if (!ENVIRONMENT_IS_NODE) { | |||
| // Only prevent default on backspace/tab because we don't want unexpected navigation. | |||
| // Do not prevent default on the rest as we need the keypress event. | |||
| function shouldPreventDefault(event) { | |||
| if (event.type === 'keydown' && event.keyCode !== 8 /* backspace */ && event.keyCode !== 9 /* tab */) { | |||
| if (event.type === 'keydown' && event.key != 'Backspace' && event.key != 'Tab') { | |||
There was a problem hiding this comment.
BTW the logic here seems to be the inverse of what the comment says. Shouldn't all the clauses above be ===?
There was a problem hiding this comment.
Looks right to me? Comment above says "prevent default on backspace/tab", the if checks "not backspace, not tab" and returns false if so. So it returns true - prevents default - on backspace/tab as described.
|
I split out the crash fix: #22884 |
This change replaced the usage of the legacy `keyCode` attribute with the preferred `key` attribute, which also has the advantage of removing some hardcoded constant numbers. In order to test this change I fixed the `test_glfw_get_key_stuck` test and added `test_sdl_key_test` to the interactive tests. In doing so I noticed and fixed a crash bug that was introduced in emscripten-core#22874.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This change replaced the usage of the legacy
keyCodeattribute with the preferredkeyattribute, which also has the advantage of removing some hardcoded constant numbers.In order to test this change I fixed the
test_glfw_get_key_stucktest and addedtest_sdl_key_testto the interactive tests.In doing so I noticed and fixed a crash bug that was introduced in #22874.