@antv/l7-component 2.25.7 → 2.25.10

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/icon.d.ts

@@ -0,0 +1 @@
+export declare const createL7Icon: (className: string) => SVGSVGElement;

package/lib/utils/icon.js

@@ -0,0 +1,19 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.createL7Icon = void 0;
+var _iconfont = require("../assets/iconfont/iconfont");
+const createL7Icon = className => {
+  // Ensure SVG sprite is loaded before creating the icon reference
+  (0, _iconfont.ensureSvgSprite)();
+  const svg = document.createElementNS('http://www.w3.org/2000/svg', 'svg');
+  svg.classList.add('l7-iconfont');
+  svg.setAttribute('aria-hidden', 'true');
+  const use = document.createElementNS('http://www.w3.org/2000/svg', 'use');
+  use.setAttributeNS('http://www.w3.org/1999/xlink', 'href', `#${className}`);
+  svg.appendChild(use);
+  return svg;
+};
+exports.createL7Icon = createL7Icon;

package/lib/utils/popper.d.ts

@@ -0,0 +1,76 @@
+import { EventEmitter } from 'eventemitter3';
+/**
+ * 气泡位置枚举
+ */
+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 type PopperTrigger = 'click' | 'hover';
+/**
+ * 气泡内容类型
+ */
+export type PopperContent = string | HTMLElement | null;
+export interface IPopperOption {
+    placement: PopperPlacement;
+    trigger: PopperTrigger;
+    content?: PopperContent;
+    offset?: [number, number];
+    className?: string;
+    container: HTMLElement;
+    unique?: boolean;
+}
+export declare class Popper extends EventEmitter<'show' | 'hide'> {
+    protected get buttonRect(): DOMRect;
+    protected static conflictPopperList: Popper[];
+    popperDOM: HTMLElement;
+    contentDOM: HTMLElement;
+    /**
+     * 按钮实体
+     * @protected
+     */
+    protected button: HTMLElement;
+    /**
+     * Popper 配置
+     * @protected
+     */
+    protected option: IPopperOption;
+    /**
+     * 当前是否展示
+     * @protected
+     */
+    protected isShow: boolean;
+    /**
+     * 当前气泡展示的内容
+     * @protected
+     */
+    protected content: PopperContent;
+    /**
+     * 关闭气泡的定时器
+     * @protected
+     */
+    protected timeout: number | null;
+    constructor(button: HTMLElement, option: IPopperOption);
+    getPopperDOM(): HTMLElement;
+    getIsShow(): boolean;
+    getContent(): PopperContent;
+    setContent(content: PopperContent): void;
+    show: () => this;
+    hide: () => this;
+    /**
+     * 设置隐藏气泡的定时器
+     */
+    setHideTimeout: () => void;
+    /**
+     * 销毁隐藏气泡的定时器
+     */
+    clearHideTimeout: () => void;
+    init(): void;
+    destroy(): void;
+    resetPopperPosition(): void;
+    protected createPopper(): HTMLElement;
+    protected onBtnClick: () => void;
+    protected onPopperUnClick: (e: MouseEvent) => void;
+    protected onBtnMouseLeave: () => void;
+    protected onBtnMouseMove: () => void;
+}

package/lib/utils/popper.js

@@ -0,0 +1,264 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.Popper = void 0;
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+var _l7Utils = require("@antv/l7-utils");
+var _eventemitter = require("eventemitter3");
+/**
+ * 气泡位置枚举
+ */
+
+/**
+ * 气泡触发类型，当前支持 click 和 hover 两种类型
+ */
+
+/**
+ * 气泡内容类型
+ */
+
+class Popper extends _eventemitter.EventEmitter {
+  get buttonRect() {
+    return this.button.getBoundingClientRect();
+  }
+  constructor(button, option) {
+    super();
+    // 气泡容器 DOM
+    (0, _defineProperty2.default)(this, "popperDOM", void 0);
+    // 气泡中展示的内容容器 DOM
+    (0, _defineProperty2.default)(this, "contentDOM", void 0);
+    /**
+     * 按钮实体
+     * @protected
+     */
+    (0, _defineProperty2.default)(this, "button", void 0);
+    /**
+     * Popper 配置
+     * @protected
+     */
+    (0, _defineProperty2.default)(this, "option", void 0);
+    /**
+     * 当前是否展示
+     * @protected
+     */
+    (0, _defineProperty2.default)(this, "isShow", false);
+    /**
+     * 当前气泡展示的内容
+     * @protected
+     */
+    (0, _defineProperty2.default)(this, "content", void 0);
+    /**
+     * 关闭气泡的定时器
+     * @protected
+     */
+    (0, _defineProperty2.default)(this, "timeout", null);
+    (0, _defineProperty2.default)(this, "show", () => {
+      if (this.isShow || !this.contentDOM.innerHTML) {
+        return this;
+      }
+      this.resetPopperPosition();
+      _l7Utils.DOM.removeClass(this.popperDOM, 'l7-popper-hide');
+      this.isShow = true;
+      if (this.option.unique) {
+        Popper.conflictPopperList.forEach(popper => {
+          if (popper !== this && popper.isShow) {
+            popper.hide();
+          }
+        });
+      }
+      this.emit('show');
+      window.addEventListener('pointerdown', this.onPopperUnClick);
+      return this;
+    });
+    (0, _defineProperty2.default)(this, "hide", () => {
+      if (!this.isShow) {
+        return this;
+      }
+      _l7Utils.DOM.addClass(this.popperDOM, 'l7-popper-hide');
+      this.isShow = false;
+      this.emit('hide');
+      window.removeEventListener('pointerdown', this.onPopperUnClick);
+      return this;
+    });
+    /**
+     * 设置隐藏气泡的定时器
+     */
+    (0, _defineProperty2.default)(this, "setHideTimeout", () => {
+      if (this.timeout) {
+        return;
+      }
+      this.timeout = window.setTimeout(() => {
+        if (!this.isShow) {
+          return;
+        }
+        this.hide();
+        this.timeout = null;
+      }, 300);
+    });
+    /**
+     * 销毁隐藏气泡的定时器
+     */
+    (0, _defineProperty2.default)(this, "clearHideTimeout", () => {
+      if (this.timeout) {
+        window.clearTimeout(this.timeout);
+        this.timeout = null;
+      }
+    });
+    (0, _defineProperty2.default)(this, "onBtnClick", () => {
+      if (this.isShow) {
+        this.hide();
+      } else {
+        this.show();
+      }
+    });
+    (0, _defineProperty2.default)(this, "onPopperUnClick", e => {
+      if (!_l7Utils.DOM.findParentElement(e.target, ['.l7-button-control', '.l7-popper-content'])) {
+        this.hide();
+      }
+    });
+    (0, _defineProperty2.default)(this, "onBtnMouseLeave", () => {
+      this.setHideTimeout();
+    });
+    (0, _defineProperty2.default)(this, "onBtnMouseMove", () => {
+      this.clearHideTimeout();
+      if (this.isShow) {
+        return;
+      }
+      this.show();
+    });
+    this.button = button;
+    this.option = option;
+    this.init();
+    if (option.unique) {
+      Popper.conflictPopperList.push(this);
+    }
+  }
+  getPopperDOM() {
+    return this.popperDOM;
+  }
+  getIsShow() {
+    return this.isShow;
+  }
+  getContent() {
+    return this.content;
+  }
+  setContent(content) {
+    if (typeof content === 'string') {
+      this.contentDOM.innerHTML = content;
+    } else if (content instanceof HTMLElement) {
+      _l7Utils.DOM.clearChildren(this.contentDOM);
+      this.contentDOM.appendChild(content);
+    }
+    this.content = content;
+  }
+  init() {
+    const {
+      trigger
+    } = this.option;
+    this.popperDOM = this.createPopper();
+    if (trigger === 'click') {
+      this.button.addEventListener('click', this.onBtnClick);
+    } else {
+      this.button.addEventListener('mousemove', this.onBtnMouseMove);
+      this.button.addEventListener('mouseleave', this.onBtnMouseLeave);
+      this.popperDOM.addEventListener('mousemove', this.onBtnMouseMove);
+      this.popperDOM.addEventListener('mouseleave', this.onBtnMouseLeave);
+    }
+  }
+  destroy() {
+    this.button.removeEventListener('click', this.onBtnClick);
+    this.button.removeEventListener('mousemove', this.onBtnMouseMove);
+    this.button.removeEventListener('mousemove', this.onBtnMouseLeave);
+    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 = {};
+    const {
+      container,
+      offset = [0, 0],
+      placement
+    } = this.option;
+    const [offsetX, offsetY] = offset;
+    const buttonRect = this.button.getBoundingClientRect();
+    const containerRect = container.getBoundingClientRect();
+    const {
+      left,
+      right,
+      top,
+      bottom
+    } = _l7Utils.DOM.getDiffRect(buttonRect, containerRect);
+    let isTransformX = false;
+    let isTransformY = false;
+    if (/^(left|right)/.test(placement)) {
+      if (placement.includes('left')) {
+        popperStyleObj.right = `${buttonRect.width + right}px`;
+      } else if (placement.includes('right')) {
+        popperStyleObj.left = `${buttonRect.width + left}px`;
+      }
+      if (placement.includes('start')) {
+        popperStyleObj.top = `${top}px`;
+      } else if (placement.includes('end')) {
+        popperStyleObj.bottom = `${bottom}px`;
+      } else {
+        popperStyleObj.top = `${top + buttonRect.height / 2}px`;
+        isTransformY = true;
+        popperStyleObj.transform = `translate(${offsetX}px, calc(${offsetY}px - 50%))`;
+      }
+    } else if (/^(top|bottom)/.test(placement)) {
+      if (placement.includes('top')) {
+        popperStyleObj.bottom = `${buttonRect.height + bottom}px`;
+      } else if (placement.includes('bottom')) {
+        popperStyleObj.top = `${buttonRect.height + top}px`;
+      }
+      if (placement.includes('start')) {
+        popperStyleObj.left = `${left}px`;
+      } else if (placement.includes('end')) {
+        popperStyleObj.right = `${right}px`;
+      } else {
+        popperStyleObj.left = `${left + buttonRect.width / 2}px`;
+        isTransformX = true;
+        popperStyleObj.transform = `translate(calc(${offsetX}px - 50%), ${offsetY}px)`;
+      }
+    }
+    popperStyleObj.transform = `translate(calc(${offsetX}px - ${isTransformX ? '50%' : '0%'}), calc(${offsetY}px - ${isTransformY ? '50%' : '0%'})`;
+    const posList = placement.split('-');
+    if (posList.length) {
+      _l7Utils.DOM.addClass(this.popperDOM, posList.map(pos => `l7-popper-${pos}`).join(' '));
+    }
+    _l7Utils.DOM.addStyle(this.popperDOM, _l7Utils.DOM.css2Style(popperStyleObj));
+  }
+  createPopper() {
+    const {
+      container,
+      className = '',
+      content
+    } = this.option;
+    const popper = _l7Utils.DOM.create('div', `l7-popper l7-popper-hide ${className}`);
+    const popperContent = _l7Utils.DOM.create('div', 'l7-popper-content');
+    const popperArrow = _l7Utils.DOM.create('div', 'l7-popper-arrow');
+    popper.appendChild(popperContent);
+    popper.appendChild(popperArrow);
+    container.appendChild(popper);
+    this.popperDOM = popper;
+    this.contentDOM = popperContent;
+    if (content) {
+      this.setContent(content);
+    }
+    return popper;
+  }
+}
+exports.Popper = Popper;
+(0, _defineProperty2.default)(Popper, "conflictPopperList", []);

package/lib/utils/screenfull.d.ts

@@ -0,0 +1,2 @@
+declare let screenfull: any;
+export default screenfull;

package/lib/utils/screenfull.js

@@ -0,0 +1,112 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+// @ts-nocheck
+
+const methodMap = [['requestFullscreen', 'exitFullscreen', 'fullscreenElement', 'fullscreenEnabled', 'fullscreenchange', 'fullscreenerror'],
+// New WebKit
+['webkitRequestFullscreen', 'webkitExitFullscreen', 'webkitFullscreenElement', 'webkitFullscreenEnabled', 'webkitfullscreenchange', 'webkitfullscreenerror'],
+// Old WebKit
+['webkitRequestFullScreen', 'webkitCancelFullScreen', 'webkitCurrentFullScreenElement', 'webkitCancelFullScreen', 'webkitfullscreenchange', 'webkitfullscreenerror'], ['mozRequestFullScreen', 'mozCancelFullScreen', 'mozFullScreenElement', 'mozFullScreenEnabled', 'mozfullscreenchange', 'mozfullscreenerror'], ['msRequestFullscreen', 'msExitFullscreen', 'msFullscreenElement', 'msFullscreenEnabled', 'MSFullscreenChange', 'MSFullscreenError']];
+const nativeAPI = (() => {
+  if (typeof document === 'undefined') {
+    return false;
+  }
+  const unprefixedMethods = methodMap[0];
+  const returnValue = {};
+  for (const methodList of methodMap) {
+    const exitFullscreenMethod = methodList === null || methodList === void 0 ? void 0 : methodList[1];
+    if (exitFullscreenMethod in document) {
+      for (const [index, method] of methodList.entries()) {
+        returnValue[unprefixedMethods[index]] = method;
+      }
+      return returnValue;
+    }
+  }
+  return false;
+})();
+const eventNameMap = {
+  change: nativeAPI.fullscreenchange,
+  error: nativeAPI.fullscreenerror
+};
+let screenfull = {
+  // eslint-disable-next-line default-param-last
+  request(element = document.documentElement, options) {
+    return new Promise((resolve, reject) => {
+      const onFullScreenEntered = () => {
+        screenfull.off('change', onFullScreenEntered);
+        resolve();
+      };
+      screenfull.on('change', onFullScreenEntered);
+      const returnPromise = element[nativeAPI.requestFullscreen](options);
+      if (returnPromise instanceof Promise) {
+        returnPromise.then(onFullScreenEntered).catch(reject);
+      }
+    });
+  },
+  exit() {
+    return new Promise((resolve, reject) => {
+      if (!screenfull.isFullscreen) {
+        resolve();
+        return;
+      }
+      const onFullScreenExit = () => {
+        screenfull.off('change', onFullScreenExit);
+        resolve();
+      };
+      screenfull.on('change', onFullScreenExit);
+      const returnPromise = document[nativeAPI.exitFullscreen]();
+      if (returnPromise instanceof Promise) {
+        returnPromise.then(onFullScreenExit).catch(reject);
+      }
+    });
+  },
+  toggle(element, options) {
+    return screenfull.isFullscreen ? screenfull.exit() : screenfull.request(element, options);
+  },
+  onchange(callback) {
+    screenfull.on('change', callback);
+  },
+  onerror(callback) {
+    screenfull.on('error', callback);
+  },
+  on(event, callback) {
+    const eventName = eventNameMap[event];
+    if (eventName) {
+      document.addEventListener(eventName, callback, false);
+    }
+  },
+  off(event, callback) {
+    const eventName = eventNameMap[event];
+    if (eventName) {
+      document.removeEventListener(eventName, callback, false);
+    }
+  },
+  raw: nativeAPI
+};
+Object.defineProperties(screenfull, {
+  isFullscreen: {
+    get: () => Boolean(document[nativeAPI.fullscreenElement])
+  },
+  element: {
+    enumerable: true,
+    get: () => {
+      var _document$nativeAPI$f;
+      return (_document$nativeAPI$f = document[nativeAPI.fullscreenElement]) !== null && _document$nativeAPI$f !== void 0 ? _document$nativeAPI$f : undefined;
+    }
+  },
+  isEnabled: {
+    enumerable: true,
+    // Coerce to boolean in case of old WebKit.
+    get: () => Boolean(document[nativeAPI.fullscreenEnabled])
+  }
+});
+if (!nativeAPI) {
+  screenfull = {
+    isEnabled: false
+  };
+}
+var _default = exports.default = screenfull;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@antv/l7-component",
-  "version": "2.25.7",
+  "version": "2.25.10",
   "description": "Component for L7",
   "license": "MIT",
   "author": "https://github.com/orgs/antvis/people",
@@ -21,13 +21,13 @@
     "@babel/runtime": "^7.7.7",
     "eventemitter3": "^4.0.0",
     "supercluster": "^7.0.0",
-    "@antv/l7-core": "2.25.7",
-    "@antv/l7-utils": "2.25.7",
-    "@antv/l7-layers": "2.25.7"
+    "@antv/l7-layers": "2.25.10",
+    "@antv/l7-core": "2.25.10",
+    "@antv/l7-utils": "2.25.10"
   },
   "devDependencies": {
     "less": "^4.1.3",
-    "@antv/l7-test-utils": "^2.25.7"
+    "@antv/l7-test-utils": "^2.25.10"
   },
   "publishConfig": {
     "access": "public",