@maplat/ui 0.10.1 → 0.10.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@maplat/ui",
-  "version": "0.10.1",
+  "version": "0.10.3",
   "description": "Maplat is the cool Historical Map/Illustrated Map Viewer.\nIt can transform each map coordinates with nonlinear but homeomorphic projection and makes possible that the maps can collaborate with GPS/accurate maps, without distorting original maps.",
   "main": "src/index.js",
   "module": "src/index.js",
@@ -44,15 +44,14 @@
   },
   "homepage": "https://github.com/code4history/Maplat/wiki",
   "dependencies": {
-    "@maplat/core": "^0.10.1",
-    "@maplat/tin": "^0.9.1",
+    "@maplat/core": "^0.10.4",
+    "@maplat/tin": "^0.9.3",
     "@turf/turf": "^6.5.0",
     "bootstrap.native": "^3.0.15",
     "caniuse-lite": "^1.0.30001239",
     "lodash.template": "^4.5.0",
     "ol": "^6.1.1",
     "ol-contextmenu": "^4.1.0",
-    "ol5": "npm:ol@^5.3.3",
     "swiper": "^6.7.1",
     "swiper4": "npm:swiper@^4.5.1",
     "weiwudi": "^0.1.4"
@@ -65,11 +64,10 @@
     "babel-loader": "^8.2.2",
     "clean-webpack-plugin": "^3.0.0",
     "concaveman": "https://github.com/grassick/concaveman#patch-1",
-    "strip-whitespace-loader": "github:kochizufan/strip-whitespace-loader#fix_dq_npm",
     "copy-webpack-plugin": "^6.4.1",
     "core-js": "^3.15.1",
     "css-loader": "^5.2.6",
-    "css-minimizer-webpack-plugin": "^1.3.0",
+    "css-minimizer-webpack-plugin": "^4.2.2",
     "eslint": "^7.29.0",
     "eslint-config-prettier": "^7.2.0",
     "eslint-loader": "^4.0.2",
@@ -87,19 +85,20 @@
     "lodash": "^4.17.21",
     "mini-css-extract-plugin": "^1.6.0",
     "prettier": "^2.3.1",
+    "strip-whitespace-loader": "github:kochizufan/strip-whitespace-loader#fix_dq_npm",
     "terser-webpack-plugin": "^4.2.3",
     "url-loader": "^4.1.1",
     "webpack": "^5.40.0",
     "webpack-cli": "^4.7.2",
-    "webpack-dev-server": "^3.11.2",
-    "workbox-build": "^6.1.5",
-    "workbox-cli": "^5.1.4",
-    "workbox-core": "^6.1.5",
-    "workbox-expiration": "^6.1.5",
-    "workbox-precaching": "^6.1.5",
-    "workbox-routing": "^6.1.5",
-    "workbox-strategies": "^6.1.5",
-    "workbox-webpack-plugin": "^6.1.5"
+    "webpack-dev-server": "^4.11.1",
+    "workbox-build": "^6.5.4",
+    "workbox-cli": "^6.5.4",
+    "workbox-core": "^6.5.4",
+    "workbox-expiration": "^6.5.4",
+    "workbox-precaching": "^6.5.4",
+    "workbox-routing": "^6.5.4",
+    "workbox-strategies": "^6.5.4",
+    "workbox-webpack-plugin": "^6.5.4"
   },
   "resolutions": {
     "concaveman": "https://github.com/grassick/concaveman#patch-1"

package/src/maplat_control.js

@@ -1,16 +1,11 @@
-import { Control, Rotate } from "ol5/control";
-import { CLASS_UNSELECTABLE, CLASS_CONTROL } from "ol5/css";
-import PointerEventHandler from "ol5/pointer/PointerEventHandler";
-import { listen } from "ol5/events";
-import EventType from "ol5/pointer/EventType";
-import { stopPropagation } from "ol5/events/Event";
-import ViewHint from "ol5/ViewHint";
-import { clamp } from "ol5/math";
-import { MapEvent } from "ol5";
+import { Control, Rotate, Zoom as BaseZoom } from "ol/control";
+import { CLASS_UNSELECTABLE, CLASS_CONTROL } from "ol/css";
+import ViewHint from "ol/ViewHint";
+import { clamp } from "ol/math";
+import { MapEvent } from "ol";
 import { addResizeListener } from "../legacy/detect-element-resize";
 import pointer from "./pointer_images";
 import { createElement } from "@maplat/core";
-import { Zoom as BaseZoom } from "ol/control";
 
 let control_settings = {};
 const delegator = {
@@ -147,20 +142,25 @@ export class SliderCommon extends Control {
      * @type {ol.pointer.PointerEventHandler}
      * @private
      */
-    this.dragger_ = new PointerEventHandler(containerElement);
-
-    listen(
-      this.dragger_,
-      EventType.POINTERDOWN,
-      this.handleDraggerStart_,
-      this
-    );
-    listen(this.dragger_, EventType.POINTERMOVE, this.handleDraggerDrag_, this);
-    listen(this.dragger_, EventType.POINTERUP, this.handleDraggerEnd_, this);
-
-    listen(thumbElement, EventType.CLICK, stopPropagation);
-
-    listen(this.element, EventType.MOUSEOUT, this.handleDraggerEnd_, this);
+    containerElement.addEventListener("pointerdown", ev => {
+      ev.stopPropagation();
+      this.handleDraggerStart_(ev);
+    });
+    containerElement.addEventListener("pointermove", ev => {
+      ev.stopPropagation();
+      this.handleDraggerDrag_(ev);
+    });
+    containerElement.addEventListener("pointerup", ev => {
+      ev.stopPropagation();
+      this.handleDraggerEnd_(ev);
+    });
+    thumbElement.addEventListener("click", ev => {
+      ev.stopPropagation();
+    });
+    containerElement.addEventListener("mouseout", ev => {
+      ev.stopPropagation();
+      this.handleDraggerEnd_(ev);
+    });
 
     if (control_settings["slider_color"]) {
       const rgb = hexRgb(control_settings["slider_color"]);
@@ -294,7 +294,7 @@ export class SliderCommon extends Control {
   handleDraggerStart_(event) {
     if (
       !this.dragging_ &&
-      event.originalEvent.target === this.element.firstElementChild &&
+      event.target === this.element.firstElementChild &&
       !this.element.classList.contains("disable")
     ) {
       this.getMap().getView().setHint(ViewHint.INTERACTING, 1);