Skip to content

Commit

Permalink
refactor: remove keyCode dependency
Browse files Browse the repository at this point in the history
Removes the keyCode dependency because the lib seems to be unmaintained and we need to patch it for that reason. Also, the `keyCode` property in the js event API is deprecated. We only need it for the `vue-select` component (hopefully this will change soon).
  • Loading branch information
JammingBen committed Nov 17, 2023
1 parent 4f2ac8b commit dd28d9f
Show file tree
Hide file tree
Showing 6 changed files with 15 additions and 36 deletions.
4 changes: 1 addition & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@
"@vue/compiler-dom": "3.3.4",
"@vue/compiler-sfc": "3.3.4",
"@vue/runtime-dom": "3.3.4",
"keycode": "^2.2.1",
"rollup-plugin-gzip": "^3.1.0",
"vite-plugin-static-copy": "^0.16.0",
"vite-plugin-treat-umd-as-commonjs": "0.1.3",
Expand Down Expand Up @@ -160,8 +159,7 @@
},
"patchedDependencies": {
"@adobe/[email protected]": "patches/@[email protected]",
"[email protected]": "patches/[email protected]",
"[email protected]": "patches/[email protected]"
"[email protected]": "patches/[email protected]"
}
},
"jestSerializer": {
Expand Down
2 changes: 1 addition & 1 deletion packages/design-system/src/directives/OcTooltip.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ export const hideOnEsc = {
defaultValue: true,
fn({ hide }) {
const onKeyDown = (e) => {
if (e.keyCode === 27) {
if (e.code === 'Escape') {
hide()
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
:disabled="readonly"
:options="availableTags"
taggable
:select-on-key-codes="[keycode('enter'), keycode(',')]"
:select-on-key-codes="selectOnKeyCodes"
:create-option="createOption"
:selectable="isOptionSelectable"
:map-keydown="keydownMethods"
Expand Down Expand Up @@ -79,7 +79,6 @@ import {
import { useGettext } from 'vue3-gettext'
import { useTask } from 'vue-concurrency'
import diff from 'lodash-es/difference'
import keycode from 'keycode'
import { Resource } from '@ownclouders/web-client'
type TagOption = {
Expand All @@ -90,6 +89,13 @@ type TagOption = {
const tagsMaxCount = 100
// the keycode property is deprecated in the JS event API, vue-select still works with it though
enum KeyCode {
Backspace = 8,
Enter = 13,
',' = 188
}
export default defineComponent({
name: 'TagsSelect',
props: {
Expand Down Expand Up @@ -232,7 +238,7 @@ export default defineComponent({
const objectMapping = {
...map
}
objectMapping[keycode('backspace')] = async (e) => {
objectMapping[KeyCode.Backspace] = async (e) => {
if (e.target.value || selectedTags.value.length === 0) {
return
}
Expand Down Expand Up @@ -275,7 +281,7 @@ export default defineComponent({
isOptionSelectable,
showSelectNewLabel,
save,
keycode,
selectOnKeyCodes: [KeyCode.Enter, KeyCode[',']],
keydownMethods,
readonly,
getAdditionalAttributes,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -322,9 +322,9 @@ export default defineComponent({
return
}
const { keyCode } = event
const isArrowUp = keyCode === 38
const isArrowDown = keyCode === 40
const { code } = event
const isArrowUp = code === 'ArrowUp'
const isArrowDown = code === 'ArrowDown'
// to cycle through the list of roles only up and down keyboard events are allowed
// if this is not the case we can return early and stop the script execution from here
Expand Down
14 changes: 0 additions & 14 deletions patches/[email protected]

This file was deleted.

11 changes: 0 additions & 11 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit dd28d9f

Please sign in to comment.