@antv/l7-component 2.11.1 → 2.11.3

package/lib/popup/popup.js

@@ -7,8 +7,6 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = exports.Popup = void 0;
 
-var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
-
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
@@ -181,11 +179,6 @@ var Popup = /*#__PURE__*/function (_EventEmitter) {
      * @protected
      */
 
-    /**
-     * popup 内容标题
-     * @protected
-     */
-
     /**
      * 气泡箭头对应的 DOM
      * @protected
@@ -227,7 +220,8 @@ var Popup = /*#__PURE__*/function (_EventEmitter) {
       this.updateFollowCursor();
       var _this$popupOption2 = this.popupOption,
           html = _this$popupOption2.html,
-          text = _this$popupOption2.text;
+          text = _this$popupOption2.text,
+          title = _this$popupOption2.title;
 
       if (html) {
         this.setHTML(html);
@@ -235,6 +229,10 @@ var Popup = /*#__PURE__*/function (_EventEmitter) {
         this.setText(text);
       }
 
+      if (title) {
+        this.setTitle(title);
+      }
+
       this.emit('open');
       return this;
     } // 移除popup
@@ -283,9 +281,10 @@ var Popup = /*#__PURE__*/function (_EventEmitter) {
   }, {
     key: "setOptions",
     value: function setOptions(option) {
+      this.show();
       this.popupOption = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, this.popupOption), option);
 
-      if (this.checkUpdateOption(option, ['closeButton', 'closeButtonOffsets', 'maxWidth', 'anchor', 'stopPropagation', 'className', 'style', 'lngLat', 'offsets', 'title'])) {
+      if (this.checkUpdateOption(option, ['closeButton', 'closeButtonOffsets', 'maxWidth', 'anchor', 'stopPropagation', 'className', 'style', 'lngLat', 'offsets'])) {
         if (this.container) {
           _l7Utils.DOM.remove(this.container); // @ts-ignore
 
@@ -293,6 +292,10 @@ var Popup = /*#__PURE__*/function (_EventEmitter) {
           this.container = undefined;
         }
 
+        if (this.popupOption.title) {
+          this.setTitle(this.popupOption.title);
+        }
+
         if (this.popupOption.html) {
           this.setHTML(this.popupOption.html);
         } else if (this.popupOption.text) {
@@ -318,9 +321,12 @@ var Popup = /*#__PURE__*/function (_EventEmitter) {
         this.setText(option.text);
       }
 
+      if (this.checkUpdateOption(option, ['title'])) {
+        this.setTitle(option.title);
+      }
+
       if (this.checkUpdateOption(option, ['lngLat']) && option.lngLat) {
         this.setLnglat(option.lngLat);
-        this.show();
       }
 
       return this;
@@ -376,7 +382,7 @@ var Popup = /*#__PURE__*/function (_EventEmitter) {
     key: "setHTML",
     value: function setHTML(html) {
       this.popupOption.html = html;
-      return this.setDOMContent(this.getPopupHTMLFragment(html));
+      return this.setDOMContent(html);
     }
     /**
      * 设置 Popup 展示文本
@@ -389,6 +395,31 @@ var Popup = /*#__PURE__*/function (_EventEmitter) {
       this.popupOption.text = text;
       return this.setDOMContent(window.document.createTextNode(text));
     }
+  }, {
+    key: "setTitle",
+    value: function setTitle(title) {
+      this.show();
+
+      if (title) {
+        if (!this.contentTitle) {
+          this.contentTitle = _l7Utils.DOM.create('div', 'l7-popup-content__title');
+
+          if (this.content.firstChild) {
+            this.content.insertBefore(this.contentTitle, this.content.firstChild);
+          } else {
+            this.content.append(this.contentTitle);
+          }
+        }
+
+        _l7Utils.DOM.clearChildren(this.contentTitle);
+
+        _l7Utils.DOM.appendElementType(this.contentTitle, title);
+      } else if (this.contentTitle) {
+        _l7Utils.DOM.remove(this.contentTitle);
+
+        this.contentTitle = undefined;
+      }
+    }
     /**
      * 将地图自动平移到气泡位置
      */
@@ -421,6 +452,7 @@ var Popup = /*#__PURE__*/function (_EventEmitter) {
     value: function setLnglat(lngLat) {
       var _this2 = this;
 
+      this.show();
       this.lngLat = lngLat;
 
       if (Array.isArray(lngLat)) {
@@ -494,14 +526,17 @@ var Popup = /*#__PURE__*/function (_EventEmitter) {
     }
     /**
      * 设置 Popup 内容 HTML
-     * @param htmlNode
+     * @param element
      */
 
   }, {
     key: "setDOMContent",
-    value: function setDOMContent(htmlNode) {
+    value: function setDOMContent(element) {
+      this.show();
       this.createContent();
-      this.contentPanel.appendChild(htmlNode);
+
+      _l7Utils.DOM.appendElementType(this.contentPanel, element);
+
       this.update();
       return this;
     }
@@ -565,17 +600,9 @@ var Popup = /*#__PURE__*/function (_EventEmitter) {
         _l7Utils.DOM.remove(this.content);
       }
 
+      this.contentTitle = undefined;
       this.content = _l7Utils.DOM.create('div', 'l7-popup-content', this.container);
 
-      if (this.popupOption.title) {
-        var _this$contentTitle;
-
-        this.contentTitle = _l7Utils.DOM.create('div', 'l7-popup-content__title', this.content);
-        (_this$contentTitle = this.contentTitle) === null || _this$contentTitle === void 0 ? void 0 : _this$contentTitle.append(this.getPopupHTMLFragment(this.popupOption.title));
-      } else {
-        this.contentTitle = undefined;
-      }
-
       if (this.popupOption.closeButton) {
         var closeButton = (0, _icon.createL7Icon)('l7-icon-guanbi');
 
@@ -631,39 +658,6 @@ var Popup = /*#__PURE__*/function (_EventEmitter) {
         return key in option;
       });
     }
-    /**
-     * 根据参数 HTML 片段返回对应的 Fragment
-     * @param html
-     * @protected
-     */
-
-  }, {
-    key: "getPopupHTMLFragment",
-    value: function getPopupHTMLFragment(html) {
-      var frag = window.document.createDocumentFragment();
-      var temp = window.document.createElement('body');
-      var child;
-
-      if (typeof html === 'string') {
-        temp.innerHTML = html;
-      } else if (Array.isArray(html)) {
-        temp.append.apply(temp, (0, _toConsumableArray2.default)(html));
-      } else if (html instanceof HTMLElement) {
-        temp.append(html);
-      }
-
-      while (true) {
-        child = temp.firstChild;
-
-        if (!child) {
-          break;
-        }
-
-        frag.appendChild(child);
-      }
-
-      return frag;
-    }
   }]);
   return Popup;
 }(_eventemitter.EventEmitter);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@antv/l7-component",
-  "version": "2.11.1",
+  "version": "2.11.3",
   "description": "",
   "main": "lib/index.js",
   "module": "es/index.js",
@@ -26,8 +26,8 @@
   "author": "lzxue",
   "license": "ISC",
   "dependencies": {
-    "@antv/l7-core": "2.11.1",
-    "@antv/l7-utils": "2.11.1",
+    "@antv/l7-core": "2.11.3",
+    "@antv/l7-utils": "2.11.3",
     "@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.11.1",
+    "@antv/l7-test-utils": "2.11.3",
     "gcoord": "^0.3.2",
     "less": "^4.1.3"
   },
-  "gitHead": "e86da32e1999fdc36668de531d16ab14bce56279",
+  "gitHead": "73291add563699ecf90ea9c39abbc5a5a5cecc2c",
   "publishConfig": {
     "access": "public"
   }