@antv/l7-component 2.15.5 → 2.16.1

package/lib/utils/popper.js

@@ -1,27 +1,44 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.Popper = void 0;
+
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
+
 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 _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+
 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; } }
+
 var Popper = /*#__PURE__*/function (_EventEmitter) {
   (0, _inherits2.default)(Popper, _EventEmitter);
+
   var _super = _createSuper(Popper);
+
   function Popper(button, option) {
     var _this;
+
     (0, _classCallCheck2.default)(this, Popper);
     _this = _super.call(this);
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "isShow", false);
@@ -30,9 +47,13 @@ var Popper = /*#__PURE__*/function (_EventEmitter) {
       if (_this.isShow || !_this.contentDOM.innerHTML) {
         return (0, _assertThisInitialized2.default)(_this);
       }
+
       _this.resetPopperPosition();
+
       _l7Utils.DOM.removeClass(_this.popperDOM, 'l7-popper-hide');
+
       _this.isShow = true;
+
       if (_this.option.unique) {
         // console.log(Popper.conflictPopperList.length);
         Popper.conflictPopperList.forEach(function (popper) {
@@ -41,27 +62,36 @@ var Popper = /*#__PURE__*/function (_EventEmitter) {
           }
         });
       }
+
       _this.emit('show');
+
       return (0, _assertThisInitialized2.default)(_this);
     });
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "hide", function () {
       if (!_this.isShow) {
         return (0, _assertThisInitialized2.default)(_this);
       }
+
       _l7Utils.DOM.addClass(_this.popperDOM, 'l7-popper-hide');
+
       _this.isShow = false;
+
       _this.emit('hide');
+
       return (0, _assertThisInitialized2.default)(_this);
     });
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "setHideTimeout", function () {
       if (_this.timeout) {
         return;
       }
+
       _this.timeout = window.setTimeout(function () {
         if (!_this.isShow) {
           return;
         }
+
         _this.hide();
+
         _this.timeout = null;
       }, 300);
     });
@@ -83,19 +113,25 @@ var Popper = /*#__PURE__*/function (_EventEmitter) {
     });
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "onBtnMouseMove", function () {
       _this.clearHideTimeout();
+
       if (_this.isShow) {
         return;
       }
+
       _this.show();
     });
     _this.button = button;
     _this.option = option;
+
     _this.init();
+
     if (option.unique) {
       Popper.conflictPopperList.push((0, _assertThisInitialized2.default)(_this));
     }
+
     return _this;
   }
+
   (0, _createClass2.default)(Popper, [{
     key: "buttonRect",
     get: function get() {
@@ -123,8 +159,10 @@ var Popper = /*#__PURE__*/function (_EventEmitter) {
         this.contentDOM.innerHTML = content;
       } else if (content instanceof HTMLElement) {
         _l7Utils.DOM.clearChildren(this.contentDOM);
+
         this.contentDOM.appendChild(content);
       }
+
       this.content = content;
     }
   }, {
@@ -132,6 +170,7 @@ var Popper = /*#__PURE__*/function (_EventEmitter) {
     value: function init() {
       var trigger = this.option.trigger;
       this.popperDOM = this.createPopper();
+
       if (trigger === 'click') {
         this.button.addEventListener('click', this.onBtnClick);
       } else {
@@ -149,6 +188,7 @@ var Popper = /*#__PURE__*/function (_EventEmitter) {
       this.button.removeEventListener('mousemove', this.onBtnMouseLeave);
       this.popperDOM.removeEventListener('mousemove', this.onBtnMouseMove);
       this.popperDOM.removeEventListener('mouseleave', this.onBtnMouseLeave);
+
       _l7Utils.DOM.remove(this.popperDOM);
     }
   }, {
@@ -156,28 +196,34 @@ var Popper = /*#__PURE__*/function (_EventEmitter) {
     value: function resetPopperPosition() {
       var popperStyleObj = {};
       var _this$option = this.option,
-        container = _this$option.container,
-        _this$option$offset = _this$option.offset,
-        offset = _this$option$offset === void 0 ? [0, 0] : _this$option$offset,
-        placement = _this$option.placement;
+          container = _this$option.container,
+          _this$option$offset = _this$option.offset,
+          offset = _this$option$offset === void 0 ? [0, 0] : _this$option$offset,
+          placement = _this$option.placement;
+
       var _offset = (0, _slicedToArray2.default)(offset, 2),
-        offsetX = _offset[0],
-        offsetY = _offset[1];
+          offsetX = _offset[0],
+          offsetY = _offset[1];
+
       var buttonRect = this.button.getBoundingClientRect();
       var containerRect = container.getBoundingClientRect();
+
       var _DOM$getDiffRect = _l7Utils.DOM.getDiffRect(buttonRect, containerRect),
-        left = _DOM$getDiffRect.left,
-        right = _DOM$getDiffRect.right,
-        top = _DOM$getDiffRect.top,
-        bottom = _DOM$getDiffRect.bottom;
+          left = _DOM$getDiffRect.left,
+          right = _DOM$getDiffRect.right,
+          top = _DOM$getDiffRect.top,
+          bottom = _DOM$getDiffRect.bottom;
+
       var isTransformX = false;
       var isTransformY = false;
+
       if (/^(left|right)/.test(placement)) {
         if (placement.includes('left')) {
           popperStyleObj.right = "".concat(buttonRect.width + right, "px");
         } else if (placement.includes('right')) {
           popperStyleObj.left = "".concat(buttonRect.width + left, "px");
         }
+
         if (placement.includes('start')) {
           popperStyleObj.top = "".concat(top, "px");
         } else if (placement.includes('end')) {
@@ -193,6 +239,7 @@ var Popper = /*#__PURE__*/function (_EventEmitter) {
         } else if (placement.includes('bottom')) {
           popperStyleObj.top = "".concat(buttonRect.height + top, "px");
         }
+
         if (placement.includes('start')) {
           popperStyleObj.left = "".concat(left, "px");
         } else if (placement.includes('end')) {
@@ -203,38 +250,48 @@ var Popper = /*#__PURE__*/function (_EventEmitter) {
           popperStyleObj.transform = "translate(calc(".concat(offsetX, "px - 50%), ").concat(offsetY, "px)");
         }
       }
+
       popperStyleObj.transform = "translate(calc(".concat(offsetX, "px - ").concat(isTransformX ? '50%' : '0%', "), calc(").concat(offsetY, "px - ").concat(isTransformY ? '50%' : '0%', ")");
       var posList = placement.split('-');
+
       if (posList.length) {
         _l7Utils.DOM.addClass(this.popperDOM, posList.map(function (pos) {
           return "l7-popper-".concat(pos);
         }).join(' '));
       }
+
       _l7Utils.DOM.addStyle(this.popperDOM, _l7Utils.DOM.css2Style(popperStyleObj));
     }
   }, {
     key: "createPopper",
     value: function createPopper() {
       var _this$option2 = this.option,
-        container = _this$option2.container,
-        _this$option2$classNa = _this$option2.className,
-        className = _this$option2$classNa === void 0 ? '' : _this$option2$classNa,
-        content = _this$option2.content;
+          container = _this$option2.container,
+          _this$option2$classNa = _this$option2.className,
+          className = _this$option2$classNa === void 0 ? '' : _this$option2$classNa,
+          content = _this$option2.content;
+
       var popper = _l7Utils.DOM.create('div', "l7-popper l7-popper-hide ".concat(className));
+
       var popperContent = _l7Utils.DOM.create('div', 'l7-popper-content');
+
       var 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;
     }
   }]);
   return Popper;
 }(_eventemitter.EventEmitter);
+
 exports.Popper = Popper;
 (0, _defineProperty2.default)(Popper, "conflictPopperList", []);

package/lib/utils/screenfull.js

@@ -1,50 +1,71 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
+
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
+
 function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
+
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
-function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
-// @ts-nocheck
 
-var methodMap = [['requestFullscreen', 'exitFullscreen', 'fullscreenElement', 'fullscreenEnabled', 'fullscreenchange', 'fullscreenerror'],
-// New WebKit
-['webkitRequestFullscreen', 'webkitExitFullscreen', 'webkitFullscreenElement', 'webkitFullscreenEnabled', 'webkitfullscreenchange', 'webkitfullscreenerror'],
-// Old WebKit
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
+
+// @ts-nocheck
+var 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']];
+
 var nativeAPI = function () {
   if (typeof document === 'undefined') {
     return false;
   }
+
   var unprefixedMethods = methodMap[0];
   var returnValue = {};
-  for (var _i = 0, _methodMap = methodMap; _i < _methodMap.length; _i++) {
-    var methodList = _methodMap[_i];
-    var exitFullscreenMethod = methodList === null || methodList === void 0 ? void 0 : methodList[1];
-    if (exitFullscreenMethod in document) {
-      var _iterator = _createForOfIteratorHelper(methodList.entries()),
-        _step;
-      try {
-        for (_iterator.s(); !(_step = _iterator.n()).done;) {
-          var _step$value = (0, _slicedToArray2.default)(_step.value, 2),
-            index = _step$value[0],
-            method = _step$value[1];
-          returnValue[unprefixedMethods[index]] = method;
+
+  var _iterator = _createForOfIteratorHelper(methodMap),
+      _step;
+
+  try {
+    for (_iterator.s(); !(_step = _iterator.n()).done;) {
+      var methodList = _step.value;
+      var exitFullscreenMethod = methodList === null || methodList === void 0 ? void 0 : methodList[1];
+
+      if (exitFullscreenMethod in document) {
+        var _iterator2 = _createForOfIteratorHelper(methodList.entries()),
+            _step2;
+
+        try {
+          for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
+            var _step2$value = (0, _slicedToArray2.default)(_step2.value, 2),
+                index = _step2$value[0],
+                method = _step2$value[1];
+
+            returnValue[unprefixedMethods[index]] = method;
+          }
+        } catch (err) {
+          _iterator2.e(err);
+        } finally {
+          _iterator2.f();
         }
-      } catch (err) {
-        _iterator.e(err);
-      } finally {
-        _iterator.f();
+
+        return returnValue;
       }
-      return returnValue;
     }
+  } catch (err) {
+    _iterator.e(err);
+  } finally {
+    _iterator.f();
   }
+
   return false;
 }();
+
 var eventNameMap = {
   change: nativeAPI.fullscreenchange,
   error: nativeAPI.fullscreenerror
@@ -59,8 +80,10 @@ var screenfull = {
         screenfull.off('change', onFullScreenEntered);
         resolve();
       };
+
       screenfull.on('change', onFullScreenEntered);
       var returnPromise = element[nativeAPI.requestFullscreen](options);
+
       if (returnPromise instanceof Promise) {
         returnPromise.then(onFullScreenEntered).catch(reject);
       }
@@ -72,12 +95,15 @@ var screenfull = {
         resolve();
         return;
       }
+
       var onFullScreenExit = function onFullScreenExit() {
         screenfull.off('change', onFullScreenExit);
         resolve();
       };
+
       screenfull.on('change', onFullScreenExit);
       var returnPromise = document[nativeAPI.exitFullscreen]();
+
       if (returnPromise instanceof Promise) {
         returnPromise.then(onFullScreenExit).catch(reject);
       }
@@ -94,12 +120,14 @@ var screenfull = {
   },
   on: function on(event, callback) {
     var eventName = eventNameMap[event];
+
     if (eventName) {
       document.addEventListener(eventName, callback, false);
     }
   },
   off: function off(event, callback) {
     var eventName = eventNameMap[event];
+
     if (eventName) {
       document.removeEventListener(eventName, callback, false);
     }
@@ -116,6 +144,7 @@ Object.defineProperties(screenfull, {
     enumerable: true,
     get: function get() {
       var _document$nativeAPI$f;
+
       return (_document$nativeAPI$f = document[nativeAPI.fullscreenElement]) !== null && _document$nativeAPI$f !== void 0 ? _document$nativeAPI$f : undefined;
     }
   },
@@ -127,10 +156,12 @@ Object.defineProperties(screenfull, {
     }
   }
 });
+
 if (!nativeAPI) {
   screenfull = {
     isEnabled: false
   };
 }
+
 var _default = screenfull;
 exports.default = _default;

package/package.json

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