@antv/l7-component 2.13.8 → 2.14.0

package/es/marker.d.ts

@@ -44,6 +44,12 @@ export default class Marker extends EventEmitter {
     private registerMarkerEvent;
     private unRegisterMarkerEvent;
     private eventHandle;
+    /**
+     * 高德 2.x 使用了 fastClick.js 避免延迟，导致 IOS 移动端的 click 事件不会正常触发，需要手动触发
+     * @param e
+     */
+    private touchStartTime;
+    private polyfillEvent;
     private addDragHandler;
     private onUp;
 }

package/es/marker.js

@@ -12,7 +12,7 @@ function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflec
 function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
 
 import { TYPES } from '@antv/l7-core';
-import { anchorTranslate, anchorType, applyAnchorClass, bindAll, DOM } from '@antv/l7-utils';
+import { anchorTranslate, anchorType, applyAnchorClass, bindAll, DOM, isiOS, isPC } from '@antv/l7-utils';
 import { EventEmitter } from 'eventemitter3';
 
 //  marker 支持 dragger 未完成
@@ -31,6 +31,8 @@ var Marker = /*#__PURE__*/function (_EventEmitter) {
     _defineProperty(_assertThisInitialized(_this), "added", false);
 
     _defineProperty(_assertThisInitialized(_this), "eventHandle", function (e) {
+      _this.polyfillEvent(e);
+
       _this.emit(e.type, {
         target: e,
         data: _this.markerOption.extData,
@@ -403,6 +405,8 @@ var Marker = /*#__PURE__*/function (_EventEmitter) {
       element.addEventListener('contextmenu', this.eventHandle);
       element.addEventListener('mouseover', this.eventHandle);
       element.addEventListener('mouseout', this.eventHandle);
+      element.addEventListener('touchstart', this.eventHandle);
+      element.addEventListener('touchend', this.eventHandle);
     }
   }, {
     key: "unRegisterMarkerEvent",
@@ -416,11 +420,34 @@ var Marker = /*#__PURE__*/function (_EventEmitter) {
       element.removeEventListener('contextmenu', this.eventHandle);
       element.removeEventListener('mouseover', this.eventHandle);
       element.removeEventListener('mouseout', this.eventHandle);
+      element.removeEventListener('touchstart', this.eventHandle);
+      element.removeEventListener('touchend', this.eventHandle);
     }
+  }, {
+    key: "polyfillEvent",
+    value: function polyfillEvent(e) {
+      if (!this.mapsService || this.mapsService.version !== 'GAODE2.x') {
+        return;
+      }
+
+      if (!isPC() && isiOS) {
+        if (e.type === 'touchstart') {
+          this.touchStartTime = Date.now();
+        }
+
+        if (e.type === 'touchend' && Date.now() - this.touchStartTime < 300) {
+          this.emit('click', {
+            target: e,
+            data: this.markerOption.extData,
+            lngLat: this.lngLat
+          });
+        }
+      }
+    } // eslint-disable-next-line @typescript-eslint/no-unused-vars
+
   }, {
     key: "addDragHandler",
-    value: // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    function addDragHandler(e) {
+    value: function addDragHandler(e) {
       return null;
     } // eslint-disable-next-line @typescript-eslint/no-unused-vars
 

package/es/popup/layerPopup.js

@@ -235,12 +235,8 @@ var LayerPopup = /*#__PURE__*/function (_Popup) {
   }, {
     key: "onSourceUpdate",
     value: function onSourceUpdate(layer) {
-      var _this$displayFeatureI;
-
-      if (((_this$displayFeatureI = this.displayFeatureInfo) === null || _this$displayFeatureI === void 0 ? void 0 : _this$displayFeatureI.layer) === layer) {
-        this.hide();
-        this.displayFeatureInfo = undefined;
-      }
+      this.hide();
+      this.displayFeatureInfo = undefined;
     }
     /**
      * 通过当前图层和对应选中的元素获取气泡展示的 HTML 内容

package/lib/marker.js

@@ -46,6 +46,8 @@ var Marker = /*#__PURE__*/function (_EventEmitter) {
     _this = _super.call(this);
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "added", false);
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "eventHandle", function (e) {
+      _this.polyfillEvent(e);
+
       _this.emit(e.type, {
         target: e,
         data: _this.markerOption.extData,
@@ -419,6 +421,8 @@ var Marker = /*#__PURE__*/function (_EventEmitter) {
       element.addEventListener('contextmenu', this.eventHandle);
       element.addEventListener('mouseover', this.eventHandle);
       element.addEventListener('mouseout', this.eventHandle);
+      element.addEventListener('touchstart', this.eventHandle);
+      element.addEventListener('touchend', this.eventHandle);
     }
   }, {
     key: "unRegisterMarkerEvent",
@@ -432,11 +436,34 @@ var Marker = /*#__PURE__*/function (_EventEmitter) {
       element.removeEventListener('contextmenu', this.eventHandle);
       element.removeEventListener('mouseover', this.eventHandle);
       element.removeEventListener('mouseout', this.eventHandle);
+      element.removeEventListener('touchstart', this.eventHandle);
+      element.removeEventListener('touchend', this.eventHandle);
     }
+  }, {
+    key: "polyfillEvent",
+    value: function polyfillEvent(e) {
+      if (!this.mapsService || this.mapsService.version !== 'GAODE2.x') {
+        return;
+      }
+
+      if (!(0, _l7Utils.isPC)() && _l7Utils.isiOS) {
+        if (e.type === 'touchstart') {
+          this.touchStartTime = Date.now();
+        }
+
+        if (e.type === 'touchend' && Date.now() - this.touchStartTime < 300) {
+          this.emit('click', {
+            target: e,
+            data: this.markerOption.extData,
+            lngLat: this.lngLat
+          });
+        }
+      }
+    } // eslint-disable-next-line @typescript-eslint/no-unused-vars
+
   }, {
     key: "addDragHandler",
-    value: // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    function addDragHandler(e) {
+    value: function addDragHandler(e) {
       return null;
     } // eslint-disable-next-line @typescript-eslint/no-unused-vars
 

package/lib/popup/layerPopup.js

@@ -246,12 +246,8 @@ var LayerPopup = /*#__PURE__*/function (_Popup) {
   }, {
     key: "onSourceUpdate",
     value: function onSourceUpdate(layer) {
-      var _this$displayFeatureI;
-
-      if (((_this$displayFeatureI = this.displayFeatureInfo) === null || _this$displayFeatureI === void 0 ? void 0 : _this$displayFeatureI.layer) === layer) {
-        this.hide();
-        this.displayFeatureInfo = undefined;
-      }
+      this.hide();
+      this.displayFeatureInfo = undefined;
     }
     /**
      * 通过当前图层和对应选中的元素获取气泡展示的 HTML 内容

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@antv/l7-component",
-  "version": "2.13.8",
+  "version": "2.14.0",
   "description": "",
   "main": "lib/index.js",
   "module": "es/index.js",
@@ -26,8 +26,8 @@
   "author": "lzxue",
   "license": "ISC",
   "dependencies": {
-    "@antv/l7-core": "2.13.8",
-    "@antv/l7-utils": "2.13.8",
+    "@antv/l7-core": "2.14.0",
+    "@antv/l7-utils": "2.14.0",
     "@babel/runtime": "^7.7.7",
     "eventemitter3": "^4.0.0",
     "inversify": "^5.0.1",
@@ -36,12 +36,12 @@
     "supercluster": "^7.0.0"
   },
   "devDependencies": {
-    "@antv/l7-layers": "2.13.8",
-    "@antv/l7-test-utils": "2.13.8",
+    "@antv/l7-layers": "2.14.0",
+    "@antv/l7-test-utils": "2.14.0",
     "gcoord": "^0.3.2",
     "less": "^4.1.3"
   },
-  "gitHead": "6ceb65535ca4bf3ad10df7b3021831e156ea9e40",
+  "gitHead": "752b36c937ee41fd2bea2ef0248f4fd86d38b834",
   "publishConfig": {
     "access": "public"
   }