diff --git a/package.json b/package.json index 6a1ac6a95f..e0da7f28e9 100644 --- a/package.json +++ b/package.json @@ -32,6 +32,7 @@ "@codemirror/search": "^6.2.3", "@codemirror/state": "^6.2.0", "@codemirror/view": "^6.9.1", + "@egjs/hammerjs": "^2.0.17", "@formatjs/intl-datetimeformat": "^6.5.1", "@formatjs/intl-getcanonicallocales": "^2.1.0", "@formatjs/intl-locale": "^3.1.1", @@ -106,7 +107,6 @@ "deep-freeze": "^0.0.1", "fuse.js": "^6.6.2", "google-timezones-json": "^1.0.2", - "hammerjs": "^2.0.8", "hls.js": "^1.3.3", "home-assistant-js-websocket": "^8.0.1", "idb-keyval": "^6.2.0", @@ -170,7 +170,6 @@ "@types/chromecast-caf-receiver": "5.0.12", "@types/chromecast-caf-sender": "^1.0.5", "@types/glob": "^8", - "@types/hammerjs": "^2.0.41", "@types/js-yaml": "^4", "@types/leaflet": "^1", "@types/leaflet-draw": "^1", diff --git a/src/components/ha-control-slider.ts b/src/components/ha-control-slider.ts index 44fea413ab..34cdf0bb6b 100644 --- a/src/components/ha-control-slider.ts +++ b/src/components/ha-control-slider.ts @@ -1,4 +1,4 @@ -import "hammerjs"; +import { DIRECTION_ALL, Manager, Pan, Tap } from "@egjs/hammerjs"; import { css, CSSResultGroup, @@ -131,18 +131,18 @@ export class HaControlSlider extends LitElement { setupListeners() { if (this.slider && !this._mc) { - this._mc = new Hammer.Manager(this.slider, { + this._mc = new Manager(this.slider, { touchAction: this.vertical ? "pan-x" : "pan-y", }); this._mc.add( - new Hammer.Pan({ + new Pan({ threshold: 10, - direction: Hammer.DIRECTION_ALL, + direction: DIRECTION_ALL, enable: true, }) ); - this._mc.add(new Hammer.Tap({ event: "singletap" })); + this._mc.add(new Tap({ event: "singletap" })); let savedValue; this._mc.on("panstart", () => { diff --git a/yarn.lock b/yarn.lock index cbf9568529..ccaab7c5ae 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1457,6 +1457,15 @@ __metadata: languageName: node linkType: hard +"@egjs/hammerjs@npm:^2.0.17": + version: 2.0.17 + resolution: "@egjs/hammerjs@npm:2.0.17" + dependencies: + "@types/hammerjs": ^2.0.36 + checksum: 8945137cec5837edd70af3f2e0ea621543eb0aa3b667e6269ec6485350f4d120c2434b37c7c30b1cf42a65275dd61c1f24626749c616696d3956ac0c008c4766 + languageName: node + linkType: hard + "@eslint/eslintrc@npm:^0.4.3": version: 0.4.3 resolution: "@eslint/eslintrc@npm:0.4.3" @@ -4141,7 +4150,7 @@ __metadata: languageName: node linkType: hard -"@types/hammerjs@npm:^2.0.41": +"@types/hammerjs@npm:^2.0.36": version: 2.0.41 resolution: "@types/hammerjs@npm:2.0.41" checksum: d16fbd688fc9b18cc270abe8dea8d4c50ef7bd8375e593d92c233d299387933a6b003c8db69819344833052458bc5f9ef1b472001277a49f095928d184356006 @@ -9361,13 +9370,6 @@ fsevents@^1.2.7: languageName: node linkType: hard -"hammerjs@npm:^2.0.8": - version: 2.0.8 - resolution: "hammerjs@npm:2.0.8" - checksum: b092da7d1565a165d7edb53ef0ce212837a8b11f897aa3cf81a7818b66686b0ab3f4747fbce8fc8a41d1376594639ce3a054b0fd4889ca8b5b136a29ca500e27 - languageName: node - linkType: hard - "handle-thing@npm:^2.0.0": version: 2.0.0 resolution: "handle-thing@npm:2.0.0" @@ -9523,6 +9525,7 @@ fsevents@^1.2.7: "@codemirror/search": ^6.2.3 "@codemirror/state": ^6.2.0 "@codemirror/view": ^6.9.1 + "@egjs/hammerjs": ^2.0.17 "@formatjs/intl-datetimeformat": ^6.5.1 "@formatjs/intl-getcanonicallocales": ^2.1.0 "@formatjs/intl-locale": ^3.1.1 @@ -9590,7 +9593,6 @@ fsevents@^1.2.7: "@types/chromecast-caf-receiver": 5.0.12 "@types/chromecast-caf-sender": ^1.0.5 "@types/glob": ^8 - "@types/hammerjs": ^2.0.41 "@types/js-yaml": ^4 "@types/leaflet": ^1 "@types/leaflet-draw": ^1 @@ -9646,7 +9648,6 @@ fsevents@^1.2.7: gulp-merge-json: ^2.1.2 gulp-rename: ^2.0.0 gulp-zopfli-green: ^6.0.1 - hammerjs: ^2.0.8 hls.js: ^1.3.3 home-assistant-js-websocket: ^8.0.1 html-minifier: ^4.0.0