@antv/l7-component 2.23.2 → 2.23.3-beta.1

package/lib/marker-layer.d.ts

@@ -14,17 +14,7 @@ export default class MarkerLayer extends EventEmitter {
     private inited;
     private containerSize;
     constructor(option?: Partial<IMarkerLayerOption>);
-    getDefault(): {
-        cluster: boolean;
-        clusterOption: {
-            radius: number;
-            maxZoom: number;
-            minZoom: number;
-            zoom: number;
-            style: {};
-            className: string;
-        };
-    };
+    getDefault(): IMarkerLayerOption;
     addTo(scene: L7Container): this;
     private setContainerSize;
     private getContainerSize;

package/lib/marker.d.ts

@@ -63,6 +63,4 @@ export default class Marker extends EventEmitter {
      */
     private touchStartTime;
     private polyfillEvent;
-    private addDragHandler;
-    private onUp;
 }

package/lib/marker.js

@@ -498,11 +498,5 @@ class Marker extends _eventemitter.EventEmitter {
       }
     }
   }
-  addDragHandler(e) {
-    return null;
-  }
-  onUp(e) {
-    throw new Error('Method not implemented.');
-  }
 }
 exports.default = Marker;

package/lib/popup/layerPopup.d.ts

@@ -17,7 +17,7 @@ export type LayerPopupConfigItem = {
 export interface ILayerPopupOption extends IPopupOption {
     config?: LayerPopupConfigItem[];
     items?: LayerPopupConfigItem[];
-    trigger: 'hover' | 'click' | 'touchend' | 'touchstart';
+    trigger?: 'hover' | 'click' | 'touchend' | 'touchstart';
 }
 type LayerMapInfo = {
     onMouseMove?: (layer: ILayer, e: any) => void;
@@ -50,7 +50,7 @@ export default class LayerPopup extends Popup<ILayerPopupOption> {
      * 当 trigger 为 'click' 时，移动端使用 'touchend'，PC 端使用 'click'
      * @protected
      */
-    protected getActualTriggerEvent(): "hover" | "click" | "touchstart" | "touchend";
+    protected getActualTriggerEvent(): 'hover' | 'click' | 'touchend' | 'touchstart';
     addTo(scene: L7Container): this;
     remove(): this;
     setOptions(option: Partial<ILayerPopupOption>): this;

package/lib/popup/layerPopup.js

@@ -85,9 +85,8 @@ class LayerPopup extends _popup.default {
    * @protected
    */
   getActualTriggerEvent() {
-    const {
-      trigger
-    } = this.popupOption;
+    var _this$popupOption$tri;
+    const trigger = (_this$popupOption$tri = this.popupOption.trigger) !== null && _this$popupOption$tri !== void 0 ? _this$popupOption$tri : 'hover';
     if (trigger === 'click') {
       return (0, _l7Utils.isPC)() ? 'click' : 'touchend';
     }
@@ -120,9 +119,12 @@ class LayerPopup extends _popup.default {
     return this;
   }
   getDefault(option) {
-    const isHoverTrigger = option.trigger === 'hover';
+    var _option$trigger;
+    // trigger 默认值为 'hover'
+    const trigger = (_option$trigger = option.trigger) !== null && _option$trigger !== void 0 ? _option$trigger : 'hover';
+    const isHoverTrigger = trigger === 'hover';
     return (0, _objectSpread2.default)((0, _objectSpread2.default)({}, super.getDefault(option)), {}, {
-      trigger: 'hover',
+      trigger,
       followCursor: isHoverTrigger,
       lngLat: {
         lng: 0,

package/lib/popup/popup.d.ts

@@ -48,6 +48,11 @@ export default class Popup<O extends IPopupOption = IPopupOption> extends EventE
      * @protected
      */
     protected isShow: boolean;
+    /**
+     * RAF 节流 ID
+     * @protected
+     */
+    protected rafId: number | null;
     protected get lngLat(): ILngLat;
     protected set lngLat(newLngLat: ILngLat);
     constructor(cfg?: Partial<O>);

package/lib/popup/popup.js

@@ -67,6 +67,11 @@ class Popup extends _eventemitter.EventEmitter {
      * @protected
      */
     (0, _defineProperty2.default)(this, "isShow", true);
+    /**
+     * RAF 节流 ID
+     * @protected
+     */
+    (0, _defineProperty2.default)(this, "rafId", null);
     (0, _defineProperty2.default)(this, "onMouseMove", e => {
       var _container$getBoundin;
       const container = this.mapsService.getMapContainer();
@@ -176,7 +181,14 @@ class Popup extends _eventemitter.EventEmitter {
       this.updatePosition(ev, true);
     });
     (0, _defineProperty2.default)(this, "update", () => {
-      this.updatePosition(null, false);
+      // 使用 RAF 节流，避免高频事件导致的性能问题
+      if (this.rafId !== null) {
+        return;
+      }
+      this.rafId = requestAnimationFrame(() => {
+        this.rafId = null;
+        this.updatePosition(null, false);
+      });
     });
     this.popupOption = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, this.getDefault(cfg !== null && cfg !== void 0 ? cfg : {})), cfg);
     const {
@@ -225,6 +237,12 @@ class Popup extends _eventemitter.EventEmitter {
     if (!(this !== null && this !== void 0 && this.isOpen())) {
       return;
     }
+
+    // 取消未执行的 RAF
+    if (this.rafId !== null) {
+      cancelAnimationFrame(this.rafId);
+      this.rafId = null;
+    }
     if (this.content) {
       _l7Utils.DOM.remove(this.content);
     }

package/lib/utils/eventManager.d.ts

@@ -0,0 +1,42 @@
+import type { IMapService } from '@antv/l7-core';
+type EventHandler = (...args: any[]) => void;
+/**
+ * 事件管理器，用于统一管理事件绑定和解绑
+ * 解决组件销毁时事件未正确清理导致的内存泄漏问题
+ */
+export declare class EventManager {
+    private bindings;
+    /**
+     * 绑定事件
+     * @param target 事件目标对象
+     * @param event 事件名称
+     * @param handler 事件处理函数
+     */
+    on(target: IMapService, event: string, handler: EventHandler): this;
+    on(target: HTMLElement, event: string, handler: EventHandler): this;
+    on(target: Window, event: string, handler: EventHandler): this;
+    on(target: Document, event: string, handler: EventHandler): this;
+    /**
+     * 解绑指定事件
+     * @param target 事件目标对象
+     * @param event 事件名称
+     * @param handler 事件处理函数
+     */
+    off(target: IMapService, event: string, handler: EventHandler): this;
+    off(target: HTMLElement, event: string, handler: EventHandler): this;
+    off(target: Window, event: string, handler: EventHandler): this;
+    off(target: Document, event: string, handler: EventHandler): this;
+    /**
+     * 清除所有绑定的事件
+     */
+    clear(): void;
+    /**
+     * 获取当前绑定的事件数量
+     */
+    size(): number;
+    /**
+     * 判断目标是否为 MapService
+     */
+    private isMapService;
+}
+export default EventManager;

package/lib/utils/eventManager.js

@@ -0,0 +1,92 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = exports.EventManager = void 0;
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+/**
+ * 事件管理器，用于统一管理事件绑定和解绑
+ * 解决组件销毁时事件未正确清理导致的内存泄漏问题
+ */
+class EventManager {
+  constructor() {
+    (0, _defineProperty2.default)(this, "bindings", []);
+  }
+  /**
+   * 绑定事件
+   * @param target 事件目标对象
+   * @param event 事件名称
+   * @param handler 事件处理函数
+   */
+  on(target, event, handler) {
+    this.bindings.push({
+      target,
+      event,
+      handler
+    });
+
+    // 根据目标类型选择绑定方式
+    if (this.isMapService(target)) {
+      target.on(event, handler);
+    } else {
+      target.addEventListener(event, handler);
+    }
+    return this;
+  }
+
+  /**
+   * 解绑指定事件
+   * @param target 事件目标对象
+   * @param event 事件名称
+   * @param handler 事件处理函数
+   */
+
+  off(target, event, handler) {
+    const index = this.bindings.findIndex(b => b.target === target && b.event === event && b.handler === handler);
+    if (index > -1) {
+      this.bindings.splice(index, 1);
+      if (this.isMapService(target)) {
+        target.off(event, handler);
+      } else {
+        target.removeEventListener(event, handler);
+      }
+    }
+    return this;
+  }
+
+  /**
+   * 清除所有绑定的事件
+   */
+  clear() {
+    this.bindings.forEach(({
+      target,
+      event,
+      handler
+    }) => {
+      if (this.isMapService(target)) {
+        target.off(event, handler);
+      } else {
+        target.removeEventListener(event, handler);
+      }
+    });
+    this.bindings = [];
+  }
+
+  /**
+   * 获取当前绑定的事件数量
+   */
+  size() {
+    return this.bindings.length;
+  }
+
+  /**
+   * 判断目标是否为 MapService
+   */
+  isMapService(target) {
+    return target && typeof target.on === 'function' && typeof target.off === 'function';
+  }
+}
+exports.EventManager = EventManager;
+var _default = exports.default = EventManager;

package/lib/utils/popper.js

@@ -175,6 +175,14 @@ class Popper extends _eventemitter.EventEmitter {
     this.popperDOM.removeEventListener('mousemove', this.onBtnMouseMove);
     this.popperDOM.removeEventListener('mouseleave', this.onBtnMouseLeave);
     _l7Utils.DOM.remove(this.popperDOM);
+
+    // 从 conflictPopperList 中移除当前实例，防止内存泄漏
+    if (this.option.unique) {
+      const index = Popper.conflictPopperList.indexOf(this);
+      if (index > -1) {
+        Popper.conflictPopperList.splice(index, 1);
+      }
+    }
   }
   resetPopperPosition() {
     const popperStyleObj = {};

package/package.json

@@ -1,10 +1,13 @@
 {
   "name": "@antv/l7-component",
-  "version": "2.23.2",
+  "version": "2.23.3-beta.1",
   "description": "Component for L7",
   "license": "MIT",
   "author": "https://github.com/orgs/antvis/people",
-  "sideEffects": true,
+  "sideEffects": [
+    "*.css",
+    "*.less"
+  ],
   "main": "lib/index.js",
   "module": "es/index.js",
   "types": "es/index.d.ts",
@@ -16,13 +19,13 @@
     "@babel/runtime": "^7.7.7",
     "eventemitter3": "^4.0.0",
     "supercluster": "^7.0.0",
-    "@antv/l7-core": "2.23.2",
-    "@antv/l7-layers": "2.23.2",
-    "@antv/l7-utils": "2.23.2"
+    "@antv/l7-core": "2.23.3-beta.1",
+    "@antv/l7-layers": "2.23.3-beta.1",
+    "@antv/l7-utils": "2.23.3-beta.1"
   },
   "devDependencies": {
     "less": "^4.1.3",
-    "@antv/l7-test-utils": "^2.23.2"
+    "@antv/l7-test-utils": "^2.23.3-beta.1"
   },
   "publishConfig": {
     "access": "public",
@@ -34,7 +37,6 @@
     "build": "npm run clean && father build",
     "check-deps": "father doctor",
     "lint": "eslint src __tests__",
-    "clean": "rimraf dist es lib",
-    "less": "lessc src/css/index.less src/css/index.css"
+    "clean": "rimraf dist es lib"
   }
 }