@antv/l7-component 2.9.32 → 2.9.33

package/lib/popup.js

@@ -1,216 +1,317 @@
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-
-// src/popup.ts
-var popup_exports = {};
-__export(popup_exports, {
-  default: () => Popup
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
 });
-module.exports = __toCommonJS(popup_exports);
-var import_l7_core = require("@antv/l7-core");
-var import_l7_utils = require("@antv/l7-utils");
-var import_eventemitter3 = require("eventemitter3");
-var Popup = class extends import_eventemitter3.EventEmitter {
-  constructor(cfg) {
-    super();
-    this.popupOption = {
-      ...this.getdefault(),
-      ...cfg
-    };
-    (0, import_l7_utils.bindAll)(["update", "onClickClose", "remove"], this);
-  }
-  addTo(scene) {
-    this.mapsService = scene.get(import_l7_core.TYPES.IMapService);
-    this.sceneSerive = scene.get(import_l7_core.TYPES.ISceneService);
-    this.mapsService.on("camerachange", this.update);
-    this.mapsService.on("viewchange", this.update);
-    this.scene = scene;
-    this.update();
-    if (this.popupOption.closeOnClick) {
-      this.timeoutInstance = setTimeout(() => {
-        this.mapsService.on("click", this.onClickClose);
-      }, 30);
-    }
-    this.emit("open");
-    return this;
-  }
-  close() {
-    this.remove();
-  }
-  open() {
-    this.addTo(this.scene);
-  }
-  setHTML(html) {
-    const frag = window.document.createDocumentFragment();
-    const temp = window.document.createElement("body");
-    let child;
-    temp.innerHTML = html;
-    while (true) {
-      child = temp.firstChild;
-      if (!child) {
-        break;
-      }
-      frag.appendChild(child);
-    }
-    return this.setDOMContent(frag);
+exports.default = void 0;
+
+var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
+
+var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
+
+var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
+
+var _assertThisInitialized2 = _interopRequireDefault(require("@babel/runtime/helpers/assertThisInitialized"));
+
+var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
+
+var _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime/helpers/possibleConstructorReturn"));
+
+var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/getPrototypeOf"));
+
+var _l7Core = require("@antv/l7-core");
+
+var _l7Utils = require("@antv/l7-utils");
+
+var _eventemitter = require("eventemitter3");
+
+function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = (0, _getPrototypeOf2.default)(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = (0, _getPrototypeOf2.default)(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return (0, _possibleConstructorReturn2.default)(this, result); }; }
+
+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; } }
+
+/** colse event */
+var Popup = /*#__PURE__*/function (_EventEmitter) {
+  (0, _inherits2.default)(Popup, _EventEmitter);
+
+  var _super = _createSuper(Popup);
+
+  function Popup(cfg) {
+    var _this;
+
+    (0, _classCallCheck2.default)(this, Popup);
+    _this = _super.call(this);
+    _this.popupOption = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, _this.getdefault()), cfg);
+    (0, _l7Utils.bindAll)(['update', 'onClickClose', 'remove'], (0, _assertThisInitialized2.default)(_this));
+    return _this;
   }
-  setLnglat(lngLat) {
-    this.lngLat = lngLat;
-    if (Array.isArray(lngLat)) {
-      this.lngLat = {
-        lng: lngLat[0],
-        lat: lngLat[1]
-      };
+
+  (0, _createClass2.default)(Popup, [{
+    key: "addTo",
+    value: function addTo(scene) {
+      var _this2 = this;
+
+      this.mapsService = scene.get(_l7Core.TYPES.IMapService);
+      this.sceneSerive = scene.get(_l7Core.TYPES.ISceneService);
+      this.mapsService.on('camerachange', this.update);
+      this.mapsService.on('viewchange', this.update);
+      this.scene = scene;
+      this.update();
+
+      if (this.popupOption.closeOnClick) {
+        this.timeoutInstance = setTimeout(function () {
+          _this2.mapsService.on('click', _this2.onClickClose);
+        }, 30);
+      }
+
+      this.emit('open');
+      return this;
     }
-    if (this.mapsService) {
-      this.mapsService.on("camerachange", this.update);
-      this.mapsService.on("viewchange", this.update);
+  }, {
+    key: "close",
+    value: function close() {
+      this.remove();
     }
-    this.update();
-    return this;
-  }
-  getLnglat() {
-    return this.lngLat;
-  }
-  setText(text) {
-    return this.setDOMContent(window.document.createTextNode(text));
-  }
-  setMaxWidth(maxWidth) {
-    this.popupOption.maxWidth = maxWidth;
-    this.update();
-    return this;
-  }
-  setDOMContent(htmlNode) {
-    this.createContent();
-    this.content.appendChild(htmlNode);
-    this.update();
-    return this;
-  }
-  remove() {
-    if (this.content) {
-      this.removeDom(this.content);
-    }
-    if (this.container) {
-      this.removeDom(this.container);
-      delete this.container;
-    }
-    if (this.mapsService) {
-      this.mapsService.off("camerachange", this.update);
-      this.mapsService.off("viewchange", this.update);
-      this.mapsService.off("click", this.onClickClose);
-      delete this.mapsService;
-    }
-    clearTimeout(this.timeoutInstance);
-    this.emit("close");
-    return this;
-  }
-  isOpen() {
-    return !!this.mapsService;
-  }
-  createContent() {
-    if (this.content) {
-      import_l7_utils.DOM.remove(this.content);
+  }, {
+    key: "open",
+    value: function open() {
+      this.addTo(this.scene);
     }
-    this.content = import_l7_utils.DOM.create("div", "l7-popup-content", this.container);
-    if (this.popupOption.closeButton) {
-      this.closeButton = import_l7_utils.DOM.create("button", "l7-popup-close-button", this.content);
-      if (this.popupOption.closeButtonOffsets) {
-        this.closeButton.style.right = this.popupOption.closeButtonOffsets[0] + "px";
-        this.closeButton.style.top = this.popupOption.closeButtonOffsets[1] + "px";
+  }, {
+    key: "setHTML",
+    value: function setHTML(html) {
+      var frag = window.document.createDocumentFragment();
+      var temp = window.document.createElement('body');
+      var child;
+      temp.innerHTML = html;
+
+      while (true) {
+        child = temp.firstChild;
+
+        if (!child) {
+          break;
+        }
+
+        frag.appendChild(child);
       }
-      this.closeButton.setAttribute("aria-label", "Close popup");
-      this.closeButton.innerHTML = "×";
-      this.closeButton.addEventListener("click", this.onClickClose);
+
+      return this.setDOMContent(frag);
     }
-  }
-  creatDom(tagName, className, container) {
-    const el = window.document.createElement(tagName);
-    if (className !== void 0) {
-      el.className = className;
+  }, {
+    key: "setLnglat",
+    value: function setLnglat(lngLat) {
+      this.lngLat = lngLat;
+
+      if (Array.isArray(lngLat)) {
+        this.lngLat = {
+          lng: lngLat[0],
+          lat: lngLat[1]
+        };
+      }
+
+      if (this.mapsService) {
+        this.mapsService.on('camerachange', this.update);
+        this.mapsService.on('viewchange', this.update);
+      }
+
+      this.update();
+      return this;
     }
-    if (container) {
-      container.appendChild(el);
+  }, {
+    key: "getLnglat",
+    value: function getLnglat() {
+      return this.lngLat;
     }
-    return el;
-  }
-  removeDom(node) {
-    if (node.parentNode) {
-      node.parentNode.removeChild(node);
+  }, {
+    key: "setText",
+    value: function setText(text) {
+      return this.setDOMContent(window.document.createTextNode(text));
     }
-  }
-  getdefault() {
-    return {
-      closeButton: true,
-      closeOnClick: true,
-      maxWidth: "240px",
-      offsets: [0, 0],
-      anchor: import_l7_utils.anchorType.BOTTOM,
-      className: "",
-      stopPropagation: true
-    };
-  }
-  onClickClose(e) {
-    if (e.stopPropagation) {
-      e.stopPropagation();
+  }, {
+    key: "setMaxWidth",
+    value: function setMaxWidth(maxWidth) {
+      this.popupOption.maxWidth = maxWidth;
+      this.update();
+      return this;
     }
-    this.remove();
-  }
-  update() {
-    const hasPosition = this.lngLat;
-    const { className, maxWidth, anchor } = this.popupOption;
-    if (!this.mapsService || !hasPosition || !this.content) {
-      return;
-    }
-    const popupContainer = this.mapsService.getMarkerContainer();
-    if (!this.container && popupContainer) {
-      this.container = this.creatDom("div", "l7-popup", popupContainer);
-      this.tip = this.creatDom("div", "l7-popup-tip", this.container);
-      this.container.appendChild(this.content);
-      if (className) {
-        className.split(" ").forEach((name) => this.container.classList.add(name));
-      }
-      const { stopPropagation } = this.popupOption;
-      if (stopPropagation) {
-        ["mousemove", "mousedown", "mouseup", "click", "dblclick"].forEach((type) => {
-          this.container.addEventListener(type, (e) => {
-            e.stopPropagation();
+  }, {
+    key: "setDOMContent",
+    value: function setDOMContent(htmlNode) {
+      this.createContent();
+      this.content.appendChild(htmlNode);
+      this.update();
+      return this;
+    } // 移除popup
+
+  }, {
+    key: "remove",
+    value: function remove() {
+      if (this.content) {
+        this.removeDom(this.content);
+      }
+
+      if (this.container) {
+        this.removeDom(this.container); // @ts-ignore
+
+        delete this.container;
+      }
+
+      if (this.mapsService) {
+        // TODO: mapbox AMap 事件同步
+        this.mapsService.off('camerachange', this.update);
+        this.mapsService.off('viewchange', this.update);
+        this.mapsService.off('click', this.onClickClose); // @ts-ignore
+
+        delete this.mapsService;
+      }
+
+      clearTimeout(this.timeoutInstance);
+      this.emit('close');
+      return this;
+    }
+  }, {
+    key: "isOpen",
+    value: function isOpen() {
+      return !!this.mapsService;
+    }
+  }, {
+    key: "createContent",
+    value: function createContent() {
+      if (this.content) {
+        _l7Utils.DOM.remove(this.content);
+      }
+
+      this.content = _l7Utils.DOM.create('div', 'l7-popup-content', this.container);
+
+      if (this.popupOption.closeButton) {
+        this.closeButton = _l7Utils.DOM.create('button', 'l7-popup-close-button', this.content);
+
+        if (this.popupOption.closeButtonOffsets) {
+          // 关闭按钮的偏移
+          this.closeButton.style.right = this.popupOption.closeButtonOffsets[0] + 'px';
+          this.closeButton.style.top = this.popupOption.closeButtonOffsets[1] + 'px';
+        } // this.closeButton.type = 'button';
+
+
+        this.closeButton.setAttribute('aria-label', 'Close popup');
+        this.closeButton.innerHTML = '×';
+        this.closeButton.addEventListener('click', this.onClickClose);
+      }
+    }
+  }, {
+    key: "creatDom",
+    value: function creatDom(tagName, className, container) {
+      var el = window.document.createElement(tagName);
+
+      if (className !== undefined) {
+        el.className = className;
+      }
+
+      if (container) {
+        container.appendChild(el);
+      }
+
+      return el;
+    }
+  }, {
+    key: "removeDom",
+    value: function removeDom(node) {
+      if (node.parentNode) {
+        node.parentNode.removeChild(node);
+      }
+    }
+  }, {
+    key: "getdefault",
+    value: function getdefault() {
+      return {
+        closeButton: true,
+        closeOnClick: true,
+        maxWidth: '240px',
+        offsets: [0, 0],
+        anchor: _l7Utils.anchorType.BOTTOM,
+        className: '',
+        stopPropagation: true
+      };
+    }
+  }, {
+    key: "onClickClose",
+    value: function onClickClose(e) {
+      if (e.stopPropagation) {
+        e.stopPropagation();
+      }
+
+      this.remove();
+    }
+  }, {
+    key: "update",
+    value: function update() {
+      var _this3 = this;
+
+      var hasPosition = this.lngLat;
+      var _this$popupOption = this.popupOption,
+          className = _this$popupOption.className,
+          maxWidth = _this$popupOption.maxWidth,
+          anchor = _this$popupOption.anchor;
+
+      if (!this.mapsService || !hasPosition || !this.content) {
+        return;
+      }
+
+      var popupContainer = this.mapsService.getMarkerContainer();
+
+      if (!this.container && popupContainer) {
+        this.container = this.creatDom('div', 'l7-popup', popupContainer);
+        this.tip = this.creatDom('div', 'l7-popup-tip', this.container);
+        this.container.appendChild(this.content);
+
+        if (className) {
+          className.split(' ').forEach(function (name) {
+            return _this3.container.classList.add(name);
           });
-        });
+        } // 高德地图需要阻止事件冒泡 // 测试mapbox 地图不需要添加
+
+
+        var stopPropagation = this.popupOption.stopPropagation;
+
+        if (stopPropagation) {
+          ['mousemove', 'mousedown', 'mouseup', 'click', 'dblclick'].forEach(function (type) {
+            _this3.container.addEventListener(type, function (e) {
+              e.stopPropagation();
+            });
+          });
+        }
+
+        this.container.style.whiteSpace = 'nowrap';
+      }
+
+      if (maxWidth && this.container.style.maxWidth !== maxWidth) {
+        this.container.style.maxWidth = maxWidth;
       }
-      this.container.style.whiteSpace = "nowrap";
+
+      this.updatePosition();
+
+      _l7Utils.DOM.setTransform(this.container, "".concat(_l7Utils.anchorTranslate[anchor]));
+
+      (0, _l7Utils.applyAnchorClass)(this.container, anchor, 'popup');
     }
-    if (maxWidth && this.container.style.maxWidth !== maxWidth) {
-      this.container.style.maxWidth = maxWidth;
+  }, {
+    key: "updatePosition",
+    value: function updatePosition() {
+      if (!this.mapsService) {
+        return;
+      }
+
+      var _this$lngLat = this.lngLat,
+          lng = _this$lngLat.lng,
+          lat = _this$lngLat.lat;
+      var offsets = this.popupOption.offsets;
+      var pos = this.mapsService.lngLatToContainer([lng, lat]);
+      this.container.style.left = pos.x + offsets[0] + 'px';
+      this.container.style.top = pos.y - offsets[1] + 'px';
     }
-    this.updatePosition();
-    import_l7_utils.DOM.setTransform(this.container, `${import_l7_utils.anchorTranslate[anchor]}`);
-    (0, import_l7_utils.applyAnchorClass)(this.container, anchor, "popup");
-  }
-  updatePosition() {
-    if (!this.mapsService) {
-      return;
-    }
-    const { lng, lat } = this.lngLat;
-    const { offsets } = this.popupOption;
-    const pos = this.mapsService.lngLatToContainer([lng, lat]);
-    this.container.style.left = pos.x + offsets[0] + "px";
-    this.container.style.top = pos.y - offsets[1] + "px";
-  }
-};
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {});
+  }]);
+  return Popup;
+}(_eventemitter.EventEmitter);
+
+exports.default = Popup;

package/lib/utils/anchor.js

@@ -1,63 +1,45 @@
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+"use strict";
 
-// src/utils/anchor.ts
-var anchor_exports = {};
-__export(anchor_exports, {
-  anchorTranslate: () => anchorTranslate,
-  anchorType: () => anchorType,
-  applyAnchorClass: () => applyAnchorClass
+Object.defineProperty(exports, "__esModule", {
+  value: true
 });
-module.exports = __toCommonJS(anchor_exports);
-var anchorType = /* @__PURE__ */ ((anchorType2) => {
-  anchorType2["CENTER"] = "center";
-  anchorType2["TOP"] = "top";
-  anchorType2["TOP-LEFT"] = "top-left";
-  anchorType2["TOP-RIGHT"] = "top-right";
-  anchorType2["BOTTOM"] = "bottom";
-  anchorType2["BOTTOM-LEFT"] = "bottom-left";
-  anchorType2["LEFT"] = "left";
-  anchorType2["RIGHT"] = "right";
-  return anchorType2;
-})(anchorType || {});
+exports.anchorType = exports.anchorTranslate = void 0;
+exports.applyAnchorClass = applyAnchorClass;
+var anchorType;
+exports.anchorType = anchorType;
+
+(function (anchorType) {
+  anchorType["CENTER"] = "center";
+  anchorType["TOP"] = "top";
+  anchorType["TOP-LEFT"] = "top-left";
+  anchorType["TOP-RIGHT"] = "top-right";
+  anchorType["BOTTOM"] = "bottom";
+  anchorType["BOTTOM-LEFT"] = "bottom-left";
+  anchorType["LEFT"] = "left";
+  anchorType["RIGHT"] = "right";
+})(anchorType || (exports.anchorType = anchorType = {}));
+
 var anchorTranslate = {
-  center: "translate(-50%,-50%)",
-  top: "translate(-50%,0)",
-  "top-left": "translate(0,0)",
-  "top-right": "translate(-100%,0)",
-  bottom: "translate(-50%,-100%)",
-  "bottom-left": "translate(0,-100%)",
-  "bottom-right": "translate(-100%,-100%)",
-  left: "translate(0,-50%)",
-  right: "translate(-100%,-50%)"
+  center: 'translate(-50%,-50%)',
+  top: 'translate(-50%,0)',
+  'top-left': 'translate(0,0)',
+  'top-right': 'translate(-100%,0)',
+  bottom: 'translate(-50%,-100%)',
+  'bottom-left': 'translate(0,-100%)',
+  'bottom-right': 'translate(-100%,-100%)',
+  left: 'translate(0,-50%)',
+  right: 'translate(-100%,-50%)'
 };
+exports.anchorTranslate = anchorTranslate;
+
 function applyAnchorClass(element, anchor, prefix) {
-  const classList = element.classList;
-  for (const key in anchorTranslate) {
+  var classList = element.classList;
+
+  for (var key in anchorTranslate) {
     if (anchorTranslate.hasOwnProperty(key)) {
-      classList.remove(`l7-${prefix}-anchor-${key}`);
+      classList.remove("l7-".concat(prefix, "-anchor-").concat(key));
     }
   }
-  classList.add(`l7-${prefix}-anchor-${anchor}`);
-}
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  anchorTranslate,
-  anchorType,
-  applyAnchorClass
-});
+
+  classList.add("l7-".concat(prefix, "-anchor-").concat(anchor));
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@antv/l7-component",
-  "version": "2.9.32",
+  "version": "2.9.33",
   "description": "",
   "main": "lib/index.js",
   "module": "es/index.js",
@@ -25,8 +25,8 @@
   "author": "lzxue",
   "license": "ISC",
   "dependencies": {
-    "@antv/l7-core": "2.9.32",
-    "@antv/l7-utils": "2.9.32",
+    "@antv/l7-core": "2.9.33",
+    "@antv/l7-utils": "2.9.33",
     "@babel/runtime": "^7.7.7",
     "eventemitter3": "^4.0.0",
     "inversify": "^5.0.1",
@@ -35,9 +35,9 @@
     "supercluster": "^7.0.0"
   },
   "devDependencies": {
-    "@antv/l7-test-utils": "2.9.32"
+    "@antv/l7-test-utils": "2.9.33"
   },
-  "gitHead": "d76c824205f3dc3dc719c13cce97ffb23ad4e533",
+  "gitHead": "87c41d6197d0cb14993201968be0378af6429164",
   "publishConfig": {
     "access": "public"
   }