@antv/l7-component 2.21.9-beta.0 → 2.21.10

package/es/marker.js

@@ -433,7 +433,7 @@ export default class Marker extends EventEmitter {
     element.removeEventListener('touchend', this.eventHandle);
   }
   polyfillEvent(e) {
-    if (!this.mapsService || this.mapsService.getType() !== 'amap') {
+    if (!this.mapsService || this.mapsService.version !== 'GAODE2.x') {
       return;
     }
     if (!isPC()) {

package/es/popup/layerPopup.js

@@ -99,7 +99,7 @@ export default class LayerPopup extends Popup {
     return this;
   }
   getDefault(option) {
-    const isHoverTrigger = option.trigger === 'hover';
+    const isHoverTrigger = option.trigger !== 'click';
     return _objectSpread(_objectSpread({}, super.getDefault(option)), {}, {
       trigger: 'hover',
       followCursor: isHoverTrigger,

package/es/popup/popup.js

@@ -251,8 +251,11 @@ export default class Popup extends EventEmitter {
   }
   setOptions(option) {
     this.show();
+    const {
+      className: oldClassName
+    } = this.popupOption;
     this.popupOption = _objectSpread(_objectSpread({}, this.popupOption), option);
-    if (this.checkUpdateOption(option, ['html', 'text', 'title', 'closeButton', 'closeButtonOffsets', 'maxWidth', 'anchor', 'stopPropagation', 'className', 'style', 'lngLat', 'offsets'])) {
+    if (this.checkUpdateOption(option, ['html', 'text', 'title', 'closeButton', 'closeButtonOffsets', 'maxWidth', 'anchor', 'stopPropagation', 'lngLat', 'offsets'])) {
       if (this.container) {
         DOM.remove(this.container);
         // @ts-ignore
@@ -281,6 +284,17 @@ export default class Popup extends EventEmitter {
     } else if (this.checkUpdateOption(option, ['text']) && option.text) {
       this.setText(option.text);
     }
+    if (this.checkUpdateOption(option, ['className'])) {
+      var _option$className;
+      if (oldClassName) {
+        this.container.classList.remove(oldClassName !== null && oldClassName !== void 0 ? oldClassName : '');
+      }
+      this.container.classList.add((_option$className = option.className) !== null && _option$className !== void 0 ? _option$className : '');
+    }
+    if (this.checkUpdateOption(option, ['style'])) {
+      var _option$style;
+      DOM.addStyle(this.container, (_option$style = option.style) !== null && _option$style !== void 0 ? _option$style : '');
+    }
     if (this.checkUpdateOption(option, ['lngLat']) && option.lngLat) {
       this.setLnglat(option.lngLat);
     }

package/lib/marker.js

@@ -439,7 +439,7 @@ class Marker extends _eventemitter.EventEmitter {
     element.removeEventListener('touchend', this.eventHandle);
   }
   polyfillEvent(e) {
-    if (!this.mapsService || this.mapsService.getType() !== 'amap') {
+    if (!this.mapsService || this.mapsService.version !== 'GAODE2.x') {
       return;
     }
     if (!(0, _l7Utils.isPC)()) {

package/lib/popup/layerPopup.js

@@ -105,7 +105,7 @@ class LayerPopup extends _popup.default {
     return this;
   }
   getDefault(option) {
-    const isHoverTrigger = option.trigger === 'hover';
+    const isHoverTrigger = option.trigger !== 'click';
     return (0, _objectSpread2.default)((0, _objectSpread2.default)({}, super.getDefault(option)), {}, {
       trigger: 'hover',
       followCursor: isHoverTrigger,

package/lib/popup/popup.js

@@ -257,8 +257,11 @@ class Popup extends _eventemitter.EventEmitter {
   }
   setOptions(option) {
     this.show();
+    const {
+      className: oldClassName
+    } = this.popupOption;
     this.popupOption = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, this.popupOption), option);
-    if (this.checkUpdateOption(option, ['html', 'text', 'title', 'closeButton', 'closeButtonOffsets', 'maxWidth', 'anchor', 'stopPropagation', 'className', 'style', 'lngLat', 'offsets'])) {
+    if (this.checkUpdateOption(option, ['html', 'text', 'title', 'closeButton', 'closeButtonOffsets', 'maxWidth', 'anchor', 'stopPropagation', 'lngLat', 'offsets'])) {
       if (this.container) {
         _l7Utils.DOM.remove(this.container);
         // @ts-ignore
@@ -287,6 +290,17 @@ class Popup extends _eventemitter.EventEmitter {
     } else if (this.checkUpdateOption(option, ['text']) && option.text) {
       this.setText(option.text);
     }
+    if (this.checkUpdateOption(option, ['className'])) {
+      var _option$className;
+      if (oldClassName) {
+        this.container.classList.remove(oldClassName !== null && oldClassName !== void 0 ? oldClassName : '');
+      }
+      this.container.classList.add((_option$className = option.className) !== null && _option$className !== void 0 ? _option$className : '');
+    }
+    if (this.checkUpdateOption(option, ['style'])) {
+      var _option$style;
+      _l7Utils.DOM.addStyle(this.container, (_option$style = option.style) !== null && _option$style !== void 0 ? _option$style : '');
+    }
     if (this.checkUpdateOption(option, ['lngLat']) && option.lngLat) {
       this.setLnglat(option.lngLat);
     }

package/package.json

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