@antv/l7-component 2.20.0 → 2.20.2

package/es/control/layerSwitch.js

@@ -13,7 +13,9 @@ import { createL7Icon } from "../utils/icon";
 import SelectControl from "./baseControl/selectControl";
 export { LayerSwitch };
 function isLayerSwitchItem(obj) {
-  return obj && obj.layer;
+  return Object.keys(obj !== null && obj !== void 0 ? obj : {}).every(function (key) {
+    return ['layer', 'name', 'img'].includes(key);
+  });
 }
 var LayerSwitch = /*#__PURE__*/function (_SelectControl) {
   _inherits(LayerSwitch, _SelectControl);

package/es/popup/layerPopup.js

@@ -102,24 +102,26 @@ var LayerPopup = /*#__PURE__*/function (_Popup) {
   }, {
     key: "setOptions",
     value: function setOptions(option) {
-      var _newOption$items;
       this.unbindLayerEvent();
       var newOption = _objectSpread({}, option);
-      var trigger = option.trigger || this.popupOption.trigger;
-      if (((_newOption$items = newOption.items) === null || _newOption$items === void 0 ? void 0 : _newOption$items.length) === 0 && trigger === 'hover') {
-        newOption.followCursor = false;
-      }
+      var trigger = newOption.trigger || this.popupOption.trigger;
+      var items = newOption.items || this.popupOption.items;
+      var isEmptyItems = (items === null || items === void 0 ? void 0 : items.length) === 0;
+      newOption.followCursor = trigger === 'hover' && !isEmptyItems;
       _get(_getPrototypeOf(LayerPopup.prototype), "setOptions", this).call(this, newOption);
       this.bindLayerEvent();
+      if (isEmptyItems) {
+        this.hide();
+      }
       return this;
     }
   }, {
     key: "getDefault",
     value: function getDefault(option) {
-      var isClickTrigger = option.trigger === 'click';
+      var isHoverTrigger = option.trigger === 'hover';
       return _objectSpread(_objectSpread({}, _get(_getPrototypeOf(LayerPopup.prototype), "getDefault", this).call(this, option)), {}, {
         trigger: 'hover',
-        followCursor: !isClickTrigger,
+        followCursor: isHoverTrigger,
         lngLat: {
           lng: 0,
           lat: 0

package/lib/control/layerSwitch.js

@@ -19,7 +19,9 @@ var _selectControl = _interopRequireDefault(require("./baseControl/selectControl
 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; } }
 function isLayerSwitchItem(obj) {
-  return obj && obj.layer;
+  return Object.keys(obj !== null && obj !== void 0 ? obj : {}).every(function (key) {
+    return ['layer', 'name', 'img'].includes(key);
+  });
 }
 var LayerSwitch = exports.default = exports.LayerSwitch = /*#__PURE__*/function (_SelectControl) {
   (0, _inherits2.default)(LayerSwitch, _SelectControl);

package/lib/popup/layerPopup.js

@@ -108,24 +108,26 @@ var LayerPopup = exports.default = exports.LayerPopup = /*#__PURE__*/function (_
   }, {
     key: "setOptions",
     value: function setOptions(option) {
-      var _newOption$items;
       this.unbindLayerEvent();
       var newOption = (0, _objectSpread2.default)({}, option);
-      var trigger = option.trigger || this.popupOption.trigger;
-      if (((_newOption$items = newOption.items) === null || _newOption$items === void 0 ? void 0 : _newOption$items.length) === 0 && trigger === 'hover') {
-        newOption.followCursor = false;
-      }
+      var trigger = newOption.trigger || this.popupOption.trigger;
+      var items = newOption.items || this.popupOption.items;
+      var isEmptyItems = (items === null || items === void 0 ? void 0 : items.length) === 0;
+      newOption.followCursor = trigger === 'hover' && !isEmptyItems;
       (0, _get2.default)((0, _getPrototypeOf2.default)(LayerPopup.prototype), "setOptions", this).call(this, newOption);
       this.bindLayerEvent();
+      if (isEmptyItems) {
+        this.hide();
+      }
       return this;
     }
   }, {
     key: "getDefault",
     value: function getDefault(option) {
-      var isClickTrigger = option.trigger === 'click';
+      var isHoverTrigger = option.trigger === 'hover';
       return (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (0, _get2.default)((0, _getPrototypeOf2.default)(LayerPopup.prototype), "getDefault", this).call(this, option)), {}, {
         trigger: 'hover',
-        followCursor: !isClickTrigger,
+        followCursor: isHoverTrigger,
         lngLat: {
           lng: 0,
           lat: 0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@antv/l7-component",
-  "version": "2.20.0",
+  "version": "2.20.2",
   "description": "",
   "main": "lib/index.js",
   "module": "es/index.js",
@@ -26,8 +26,8 @@
   "author": "lzxue",
   "license": "ISC",
   "dependencies": {
-    "@antv/l7-core": "2.20.0",
-    "@antv/l7-utils": "2.20.0",
+    "@antv/l7-core": "2.20.2",
+    "@antv/l7-utils": "2.20.2",
     "@babel/runtime": "^7.7.7",
     "eventemitter3": "^4.0.0",
     "inversify": "^5.0.1",
@@ -35,12 +35,12 @@
     "supercluster": "^7.0.0"
   },
   "devDependencies": {
-    "@antv/l7-layers": "2.20.0",
-    "@antv/l7-test-utils": "2.20.0",
+    "@antv/l7-layers": "2.20.2",
+    "@antv/l7-test-utils": "2.20.2",
     "gcoord": "^0.3.2",
     "less": "^4.1.3"
   },
-  "gitHead": "6b1a6b52bae44b05336459d4d80f7cace21da6f1",
+  "gitHead": "c0e21cc20d1530aa586623484a9511636800839f",
   "publishConfig": {
     "access": "public"
   }