@antv/l7-component 2.10.15 → 2.11.1

package/es/control/baseControl/selectControl.d.ts

@@ -1,16 +1,16 @@
 import { IPopperControlOption, PopperControl } from './popperControl';
-declare type BaseOptionItem = {
+type BaseOptionItem = {
     value: string;
     text: string;
     [key: string]: string;
 };
-declare type NormalOptionItem = BaseOptionItem & {
+type NormalOptionItem = BaseOptionItem & {
     icon?: HTMLElement;
 };
-declare type ImageOptionItem = BaseOptionItem & {
+type ImageOptionItem = BaseOptionItem & {
     img: string;
 };
-export declare type ControlOptionItem = ImageOptionItem | NormalOptionItem;
+export type ControlOptionItem = ImageOptionItem | NormalOptionItem;
 export interface ISelectControlOption extends IPopperControlOption {
     options: ControlOptionItem[];
     defaultValue?: string | string[];

package/es/interface.d.ts

@@ -1,4 +1,4 @@
-export declare type ControlEvent = 'show' | 'hide' | 'add' | 'remove' | string;
+export type ControlEvent = 'show' | 'hide' | 'add' | 'remove' | string;
 export interface IMarkerStyleOption {
     element?: (...args: any[]) => any;
     style: {

package/es/marker.js

@@ -39,7 +39,7 @@ var Marker = /*#__PURE__*/function (_EventEmitter) {
     });
 
     _this.markerOption = _objectSpread(_objectSpread({}, _this.getDefault()), option);
-    bindAll(['update', 'onMove', 'onUp', 'addDragHandler', 'onMapClick'], _assertThisInitialized(_this));
+    bindAll(['update', 'onMove', 'onMapClick'], _assertThisInitialized(_this));
 
     _this.init();
 
@@ -87,11 +87,10 @@ var Marker = /*#__PURE__*/function (_EventEmitter) {
       if (this.mapsService) {
         this.mapsService.off('click', this.onMapClick);
         this.mapsService.off('move', this.update);
-        this.mapsService.off('moveend', this.update);
-        this.mapsService.off('mousedown', this.addDragHandler);
-        this.mapsService.off('touchstart', this.addDragHandler);
-        this.mapsService.off('mouseup', this.onUp);
-        this.mapsService.off('touchend', this.onUp);
+        this.mapsService.off('moveend', this.update); // this.mapsService.off('mousedown', this.addDragHandler);
+        // this.mapsService.off('touchstart', this.addDragHandler);
+        // this.mapsService.off('mouseup', this.onUp);
+        // this.mapsService.off('touchend', this.onUp);
       }
 
       this.unRegisterMarkerEvent();
@@ -418,7 +417,7 @@ var Marker = /*#__PURE__*/function (_EventEmitter) {
     key: "addDragHandler",
     value: // eslint-disable-next-line @typescript-eslint/no-unused-vars
     function addDragHandler(e) {
-      throw new Error('Method not implemented.');
+      return null;
     } // eslint-disable-next-line @typescript-eslint/no-unused-vars
 
   }, {

package/es/popup/layerPopup.d.ts

@@ -1,13 +1,13 @@
 import { ILayer, IPopupOption } from '@antv/l7-core';
 import { Container } from 'inversify';
 import Popup from './popup';
-export declare type LayerField = {
+export type LayerField = {
     field: string;
     formatField?: ((field: string) => string) | string;
     formatValue?: ((value: any) => any) | string;
     getValue?: (feature: any) => any;
 };
-export declare type LayerPopupConfigItem = {
+export type LayerPopupConfigItem = {
     layer: ILayer | string;
     fields: Array<LayerField | string>;
 };
@@ -16,7 +16,7 @@ export interface ILayerPopupOption extends IPopupOption {
     items?: LayerPopupConfigItem[];
     trigger: 'hover' | 'click';
 }
-declare type LayerMapInfo = {
+type LayerMapInfo = {
     onMouseMove?: (layer: ILayer, e: any) => void;
     onMouseOut?: (layer: ILayer, e: any) => void;
     onClick?: (layer: ILayer, e: any) => void;

package/es/popup/layerPopup.js

@@ -89,7 +89,6 @@ var LayerPopup = /*#__PURE__*/function (_Popup) {
         },
         offsets: [0, 10],
         closeButton: false,
-        closeOnClick: false,
         autoClose: false,
         closeOnEsc: false
       });

package/es/popup/popup.js

@@ -73,7 +73,7 @@ var Popup = /*#__PURE__*/function (_EventEmitter) {
         e.stopPropagation();
       }
 
-      _this.remove();
+      _this.hide();
     });
 
     _defineProperty(_assertThisInitialized(_this), "update", function () {
@@ -208,7 +208,8 @@ var Popup = /*#__PURE__*/function (_EventEmitter) {
       this.mapsService.on('camerachange', this.update);
       this.mapsService.on('viewchange', this.update);
       this.scene = scene;
-      this.update();
+      this.update(); // 临时关闭
+
       this.updateCloseOnClick();
       this.updateCloseOnEsc();
       this.updateFollowCursor();
@@ -305,6 +306,7 @@ var Popup = /*#__PURE__*/function (_EventEmitter) {
 
       if (this.checkUpdateOption(option, ['lngLat']) && option.lngLat) {
         this.setLnglat(option.lngLat);
+        this.show();
       }
 
       return this;
@@ -465,7 +467,7 @@ var Popup = /*#__PURE__*/function (_EventEmitter) {
       // tslint:disable-next-line:no-object-literal-type-assertion
       return {
         closeButton: true,
-        closeOnClick: true,
+        closeOnClick: false,
         maxWidth: '240px',
         offsets: [0, 0],
         anchor: anchorType.BOTTOM,
@@ -502,11 +504,11 @@ var Popup = /*#__PURE__*/function (_EventEmitter) {
       var mapsService = this.mapsService;
 
       if (mapsService) {
-        this.mapsService.off('click', this.onCloseButtonClick);
+        mapsService === null || mapsService === void 0 ? void 0 : mapsService.off('click', this.onCloseButtonClick);
 
         if (this.popupOption.closeOnClick && !onlyClear) {
           requestAnimationFrame(function () {
-            _this3.mapsService.on('click', _this3.onCloseButtonClick);
+            mapsService === null || mapsService === void 0 ? void 0 : mapsService.on('click', _this3.onCloseButtonClick);
           });
         }
       }
@@ -514,31 +516,24 @@ var Popup = /*#__PURE__*/function (_EventEmitter) {
   }, {
     key: "updateCloseOnEsc",
     value: function updateCloseOnEsc(onlyClear) {
-      var _this4 = this;
-
       window.removeEventListener('keydown', this.onKeyDown);
 
       if (this.popupOption.closeOnEsc && !onlyClear) {
-        requestAnimationFrame(function () {
-          window.addEventListener('keydown', _this4.onKeyDown);
-        });
+        window.addEventListener('keydown', this.onKeyDown);
       }
     }
   }, {
     key: "updateFollowCursor",
     value: function updateFollowCursor(onlyClear) {
-      var _this$mapsService,
-          _this5 = this;
+      var _this$mapsService;
 
       var container = (_this$mapsService = this.mapsService) === null || _this$mapsService === void 0 ? void 0 : _this$mapsService.getContainer();
 
       if (container) {
-        container.removeEventListener('mousemove', this.onMouseMove);
+        container === null || container === void 0 ? void 0 : container.removeEventListener('mousemove', this.onMouseMove);
 
         if (this.popupOption.followCursor && !onlyClear) {
-          requestAnimationFrame(function () {
-            container.addEventListener('mousemove', _this5.onMouseMove);
-          });
+          container === null || container === void 0 ? void 0 : container.addEventListener('mousemove', this.onMouseMove);
         }
       }
     }
@@ -550,6 +545,8 @@ var Popup = /*#__PURE__*/function (_EventEmitter) {
      * @protected
      */
     function createContent() {
+      var _this4 = this;
+
       if (this.content) {
         DOM.remove(this.content);
       }
@@ -578,7 +575,9 @@ var Popup = /*#__PURE__*/function (_EventEmitter) {
 
 
         closeButton.setAttribute('aria-label', 'Close popup');
-        closeButton.addEventListener('click', this.onCloseButtonClick);
+        closeButton.addEventListener('click', function () {
+          _this4.hide();
+        });
         this.closeButton = closeButton;
       } else {
         this.closeButton = undefined;

package/es/utils/popper.d.ts

@@ -2,15 +2,15 @@ import { EventEmitter } from 'eventemitter3';
 /**
  * 气泡位置枚举
  */
-export declare type PopperPlacement = 'top-start' | 'top' | 'top-end' | 'left-start' | 'left' | 'left-end' | 'bottom-start' | 'bottom' | 'bottom-end' | 'right-start' | 'right' | 'right-end';
+export type PopperPlacement = 'top-start' | 'top' | 'top-end' | 'left-start' | 'left' | 'left-end' | 'bottom-start' | 'bottom' | 'bottom-end' | 'right-start' | 'right' | 'right-end';
 /**
  * 气泡触发类型，当前支持 click 和 hover 两种类型
  */
-export declare type PopperTrigger = 'click' | 'hover';
+export type PopperTrigger = 'click' | 'hover';
 /**
  * 气泡内容类型
  */
-export declare type PopperContent = string | HTMLElement | null;
+export type PopperContent = string | HTMLElement | null;
 export interface IPopperOption {
     placement: PopperPlacement;
     trigger: PopperTrigger;

package/lib/marker.js

@@ -53,7 +53,7 @@ var Marker = /*#__PURE__*/function (_EventEmitter) {
       });
     });
     _this.markerOption = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, _this.getDefault()), option);
-    (0, _l7Utils.bindAll)(['update', 'onMove', 'onUp', 'addDragHandler', 'onMapClick'], (0, _assertThisInitialized2.default)(_this));
+    (0, _l7Utils.bindAll)(['update', 'onMove', 'onMapClick'], (0, _assertThisInitialized2.default)(_this));
 
     _this.init();
 
@@ -101,11 +101,10 @@ var Marker = /*#__PURE__*/function (_EventEmitter) {
       if (this.mapsService) {
         this.mapsService.off('click', this.onMapClick);
         this.mapsService.off('move', this.update);
-        this.mapsService.off('moveend', this.update);
-        this.mapsService.off('mousedown', this.addDragHandler);
-        this.mapsService.off('touchstart', this.addDragHandler);
-        this.mapsService.off('mouseup', this.onUp);
-        this.mapsService.off('touchend', this.onUp);
+        this.mapsService.off('moveend', this.update); // this.mapsService.off('mousedown', this.addDragHandler);
+        // this.mapsService.off('touchstart', this.addDragHandler);
+        // this.mapsService.off('mouseup', this.onUp);
+        // this.mapsService.off('touchend', this.onUp);
       }
 
       this.unRegisterMarkerEvent();
@@ -434,7 +433,7 @@ var Marker = /*#__PURE__*/function (_EventEmitter) {
     key: "addDragHandler",
     value: // eslint-disable-next-line @typescript-eslint/no-unused-vars
     function addDragHandler(e) {
-      throw new Error('Method not implemented.');
+      return null;
     } // eslint-disable-next-line @typescript-eslint/no-unused-vars
 
   }, {

package/lib/popup/layerPopup.js

@@ -100,7 +100,6 @@ var LayerPopup = /*#__PURE__*/function (_Popup) {
         },
         offsets: [0, 10],
         closeButton: false,
-        closeOnClick: false,
         autoClose: false,
         closeOnEsc: false
       });

package/lib/popup/popup.js

@@ -86,7 +86,7 @@ var Popup = /*#__PURE__*/function (_EventEmitter) {
         e.stopPropagation();
       }
 
-      _this.remove();
+      _this.hide();
     });
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "update", function () {
       var hasPosition = !!_this.lngLat;
@@ -220,7 +220,8 @@ var Popup = /*#__PURE__*/function (_EventEmitter) {
       this.mapsService.on('camerachange', this.update);
       this.mapsService.on('viewchange', this.update);
       this.scene = scene;
-      this.update();
+      this.update(); // 临时关闭
+
       this.updateCloseOnClick();
       this.updateCloseOnEsc();
       this.updateFollowCursor();
@@ -319,6 +320,7 @@ var Popup = /*#__PURE__*/function (_EventEmitter) {
 
       if (this.checkUpdateOption(option, ['lngLat']) && option.lngLat) {
         this.setLnglat(option.lngLat);
+        this.show();
       }
 
       return this;
@@ -479,7 +481,7 @@ var Popup = /*#__PURE__*/function (_EventEmitter) {
       // tslint:disable-next-line:no-object-literal-type-assertion
       return {
         closeButton: true,
-        closeOnClick: true,
+        closeOnClick: false,
         maxWidth: '240px',
         offsets: [0, 0],
         anchor: _l7Utils.anchorType.BOTTOM,
@@ -516,11 +518,11 @@ var Popup = /*#__PURE__*/function (_EventEmitter) {
       var mapsService = this.mapsService;
 
       if (mapsService) {
-        this.mapsService.off('click', this.onCloseButtonClick);
+        mapsService === null || mapsService === void 0 ? void 0 : mapsService.off('click', this.onCloseButtonClick);
 
         if (this.popupOption.closeOnClick && !onlyClear) {
           requestAnimationFrame(function () {
-            _this3.mapsService.on('click', _this3.onCloseButtonClick);
+            mapsService === null || mapsService === void 0 ? void 0 : mapsService.on('click', _this3.onCloseButtonClick);
           });
         }
       }
@@ -528,31 +530,24 @@ var Popup = /*#__PURE__*/function (_EventEmitter) {
   }, {
     key: "updateCloseOnEsc",
     value: function updateCloseOnEsc(onlyClear) {
-      var _this4 = this;
-
       window.removeEventListener('keydown', this.onKeyDown);
 
       if (this.popupOption.closeOnEsc && !onlyClear) {
-        requestAnimationFrame(function () {
-          window.addEventListener('keydown', _this4.onKeyDown);
-        });
+        window.addEventListener('keydown', this.onKeyDown);
       }
     }
   }, {
     key: "updateFollowCursor",
     value: function updateFollowCursor(onlyClear) {
-      var _this$mapsService,
-          _this5 = this;
+      var _this$mapsService;
 
       var container = (_this$mapsService = this.mapsService) === null || _this$mapsService === void 0 ? void 0 : _this$mapsService.getContainer();
 
       if (container) {
-        container.removeEventListener('mousemove', this.onMouseMove);
+        container === null || container === void 0 ? void 0 : container.removeEventListener('mousemove', this.onMouseMove);
 
         if (this.popupOption.followCursor && !onlyClear) {
-          requestAnimationFrame(function () {
-            container.addEventListener('mousemove', _this5.onMouseMove);
-          });
+          container === null || container === void 0 ? void 0 : container.addEventListener('mousemove', this.onMouseMove);
         }
       }
     }
@@ -564,6 +559,8 @@ var Popup = /*#__PURE__*/function (_EventEmitter) {
      * @protected
      */
     function createContent() {
+      var _this4 = this;
+
       if (this.content) {
         _l7Utils.DOM.remove(this.content);
       }
@@ -594,7 +591,9 @@ var Popup = /*#__PURE__*/function (_EventEmitter) {
 
 
         closeButton.setAttribute('aria-label', 'Close popup');
-        closeButton.addEventListener('click', this.onCloseButtonClick);
+        closeButton.addEventListener('click', function () {
+          _this4.hide();
+        });
         this.closeButton = closeButton;
       } else {
         this.closeButton = undefined;

package/package.json

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