@antv/l7-map 2.17.11 → 2.18.0

package/es/camera.js

@@ -8,14 +8,15 @@ import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(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; } }
 // @ts-ignore
+import { lodashUtil } from '@antv/l7-utils';
 import { EventEmitter } from 'eventemitter3';
-import { merge } from 'lodash';
 import LngLat from "./geo/lng_lat";
 import LngLatBounds from "./geo/lng_lat_bounds";
 import Point from "./geo/point";
 import Transform from "./geo/transform";
 import { Event } from "./handler/events/event";
 import { clamp, ease as defaultEasing, extend, interpolate, now, pick, prefersReducedMotion, wrap } from "./util";
+var merge = lodashUtil.merge;
 var Camera = /*#__PURE__*/function (_EventEmitter) {
   _inherits(Camera, _EventEmitter);
   var _super = _createSuper(Camera);

package/es/earthmap.js

@@ -7,8 +7,7 @@ import _getPrototypeOf from "@babel/runtime/helpers/esm/getPrototypeOf";
 import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(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; } }
-import { DOM } from '@antv/l7-utils';
-import { merge } from 'lodash';
+import { DOM, lodashUtil } from '@antv/l7-utils';
 import Camera from "./camera";
 function loadStyles(css, doc) {
   var isMiniAli = typeof my !== 'undefined' && !!my && typeof my.showToast === 'function' && my.isFRM !== true;
@@ -51,7 +50,7 @@ import { PerformanceUtils } from "./utils/performance";
 import TaskQueue from "./utils/task_queue";
 var defaultMinZoom = -2;
 var defaultMaxZoom = 22;
-
+var merge = lodashUtil.merge;
 // the default values, but also the valid range
 var defaultMinPitch = 0;
 var defaultMaxPitch = 60;

package/es/geo/transform.js

@@ -4,7 +4,6 @@ function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol
 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-ignore
-import { isMini } from '@antv/l7-utils';
 import { mat2, mat4, vec4 } from 'gl-matrix';
 import Point from "../geo/point";
 import { clamp, interpolate, wrap } from "../util";
@@ -799,11 +798,7 @@ var Transform = /*#__PURE__*/function () {
       var s = Math.max(sx || 0, sy || 0);
       if (s) {
         this.center = this.unproject(new Point(sx ? (maxX + minX) / 2 : point.x, sy ? (maxY + minY) / 2 : point.y));
-        if (isMini) {
-          this.zoom = Math.max(this.zoom, Math.max(-1, this.minZoom));
-        } else {
-          this.zoom += this.scaleZoom(s);
-        }
+        this.zoom += this.scaleZoom(s);
         this.unmodified = unmodified;
         this.constraining = false;
         return;

package/es/handler/events/event.js

@@ -1,7 +1,8 @@
 import _createClass from "@babel/runtime/helpers/esm/createClass";
 import _classCallCheck from "@babel/runtime/helpers/esm/classCallCheck";
 // tslint:disable-next-line:no-submodule-imports
-import merge from 'lodash/merge';
+import { lodashUtil } from '@antv/l7-utils';
+var merge = lodashUtil.merge;
 export var Event = /*#__PURE__*/_createClass(function Event(type) {
   var data = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
   _classCallCheck(this, Event);

package/es/handler/events/map_mouse_event.js

@@ -7,9 +7,10 @@ function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflec
 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; } }
 // @ts-ignore
 // tslint:disable-next-line:no-submodule-imports
-import merge from 'lodash/merge';
+import { lodashUtil } from '@antv/l7-utils';
 import DOM from "../../utils/dom";
 import { Event } from "./event";
+var merge = lodashUtil.merge;
 var MapMouseEvent = /*#__PURE__*/function (_Event) {
   _inherits(MapMouseEvent, _Event);
   var _super = _createSuper(MapMouseEvent);

package/es/handler/handler_inertia.js

@@ -7,8 +7,9 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
 import Point from "../geo/point";
 
 // tslint:disable-next-line:no-submodule-imports
-import merge from 'lodash/merge';
+import { lodashUtil } from '@antv/l7-utils';
 import { bezier, clamp, now } from "../util";
+var merge = lodashUtil.merge;
 var defaultInertiaOptions = {
   linearity: 0.3,
   easing: bezier(0, 0, 0.3, 1)

package/es/handler/handler_manager.js

@@ -7,8 +7,7 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
 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-ignore
 // tslint:disable-next-line: no-submodule-imports
-import { $window, isMini } from '@antv/l7-utils';
-import { merge } from 'lodash';
+import { lodashUtil } from '@antv/l7-utils';
 import Point from "../geo/point";
 import DOM from "../utils/dom";
 import BlockableMapEventHandler from "./blockable_map_event";
@@ -28,6 +27,7 @@ import TouchZoomRotateHandler from "./shim/touch_zoom_rotate";
 import TapDragZoomHandler from "./tap/tap_drag_zoom";
 import TapZoomHandler from "./tap/tap_zoom";
 import { TouchPanHandler, TouchPitchHandler, TouchRotateHandler, TouchZoomHandler } from "./touch";
+var merge = lodashUtil.merge;
 var _isMoving = function isMoving(p) {
   return p.zoom || p.drag || p.pitch || p.rotate;
 };
@@ -139,67 +139,52 @@ var HandlerManager = /*#__PURE__*/function () {
     this.addDefaultHandlers(options);
     var el = this.el;
     this.listeners = [];
-    if (!isMini) {
-      // l7 - mini
-      this.listeners = [
-      // Bind touchstart and touchmove with passive: false because, even though
-      // they only fire a map events and therefore could theoretically be
-      // passive, binding with passive: true causes iOS not to respect
-      // e.preventDefault() in _other_ handlers, even if they are non-passive
-      // (see https://bugs.webkit.org/show_bug.cgi?id=184251)
-      [el, 'touchstart', {
-        passive: false
-      }], [el, 'touchmove', {
-        passive: false
-      }], [el, 'touchend', undefined], [el, 'touchcancel', undefined], [el, 'mousedown', undefined], [el, 'mousemove', undefined], [el, 'mouseup', undefined],
-      // Bind window-level event listeners for move and up/end events. In the absence of
-      // the pointer capture API, which is not supported by all necessary platforms,
-      // window-level event listeners give us the best shot at capturing events that
-      // fall outside the map canvas element. Use `{capture: true}` for the move event
-      // to prevent map move events from being fired during a drag.
-      // @ts-ignore
-      [window.document, 'mousemove', {
-        capture: true
-      }],
-      // @ts-ignore
-      [window.document, 'mouseup', undefined], [el, 'mouseover', undefined], [el, 'mouseout', undefined], [el, 'dblclick', undefined], [el, 'click', undefined], [el, 'keydown', {
-        capture: false
-      }], [el, 'keyup', undefined], [el, 'wheel', {
-        passive: false
-      }], [el, 'contextmenu', undefined],
-      // @ts-ignore
-      [window, 'blur', undefined]];
-      var _iterator2 = _createForOfIteratorHelper(this.listeners),
-        _step2;
-      try {
-        for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
-          var _step2$value = _slicedToArray(_step2.value, 3),
-            target = _step2$value[0],
-            type = _step2$value[1],
-            listenerOptions = _step2$value[2];
-          // @ts-ignore
-          DOM.addEventListener(target, type,
-          // @ts-ignore
-          target === window.document ? this.handleWindowEvent : this.handleEvent, listenerOptions);
-        }
-      } catch (err) {
-        _iterator2.e(err);
-      } finally {
-        _iterator2.f();
-      }
-    } else {
-      $window.document.addEventListener('touchstart', function (e) {
-        _this.handleEvent(e);
-      }, {});
-      $window.document.addEventListener('touchmove', function (e) {
-        _this.handleEvent(e);
-      }, {});
-      $window.document.addEventListener('touchend', function (e) {
-        _this.handleEvent(e);
-      }, {});
-      $window.document.addEventListener('touchcancel', function (e) {
-        _this.handleEvent(e);
-      }, {});
+    // l7 - mini
+    this.listeners = [
+    // Bind touchstart and touchmove with passive: false because, even though
+    // they only fire a map events and therefore could theoretically be
+    // passive, binding with passive: true causes iOS not to respect
+    // e.preventDefault() in _other_ handlers, even if they are non-passive
+    // (see https://bugs.webkit.org/show_bug.cgi?id=184251)
+    [el, 'touchstart', {
+      passive: false
+    }], [el, 'touchmove', {
+      passive: false
+    }], [el, 'touchend', undefined], [el, 'touchcancel', undefined], [el, 'mousedown', undefined], [el, 'mousemove', undefined], [el, 'mouseup', undefined],
+    // Bind window-level event listeners for move and up/end events. In the absence of
+    // the pointer capture API, which is not supported by all necessary platforms,
+    // window-level event listeners give us the best shot at capturing events that
+    // fall outside the map canvas element. Use `{capture: true}` for the move event
+    // to prevent map move events from being fired during a drag.
+    // @ts-ignore
+    [window.document, 'mousemove', {
+      capture: true
+    }],
+    // @ts-ignore
+    [window.document, 'mouseup', undefined], [el, 'mouseover', undefined], [el, 'mouseout', undefined], [el, 'dblclick', undefined], [el, 'click', undefined], [el, 'keydown', {
+      capture: false
+    }], [el, 'keyup', undefined], [el, 'wheel', {
+      passive: false
+    }], [el, 'contextmenu', undefined],
+    // @ts-ignore
+    [window, 'blur', undefined]];
+    var _iterator2 = _createForOfIteratorHelper(this.listeners),
+      _step2;
+    try {
+      for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
+        var _step2$value = _slicedToArray(_step2.value, 3),
+          target = _step2$value[0],
+          type = _step2$value[1],
+          listenerOptions = _step2$value[2];
+        // @ts-ignore
+        DOM.addEventListener(target, type,
+        // @ts-ignore
+        target === window.document ? this.handleWindowEvent : this.handleEvent, listenerOptions);
+      }
+    } catch (err) {
+      _iterator2.e(err);
+    } finally {
+      _iterator2.f();
     }
   }
   _createClass(HandlerManager, [{
@@ -401,7 +386,7 @@ var HandlerManager = /*#__PURE__*/function () {
         for (_iterator6.s(); !(_step6 = _iterator6.n()).done;) {
           var t = _step6.value;
           var target = t.target;
-          if (isMini || this.el.contains(target)) {
+          if (this.el.contains(target)) {
             mapTouches.push(t);
           }
         }

package/es/handler/shim/drag_pan.js

@@ -1,6 +1,5 @@
 import _classCallCheck from "@babel/runtime/helpers/esm/classCallCheck";
 import _createClass from "@babel/runtime/helpers/esm/createClass";
-import { isMini } from '@antv/l7-utils';
 /**
  * The `DragPanHandler` allows the user to pan the map by clicking and dragging
  * the cursor.
@@ -41,9 +40,7 @@ var DragPanHandler = /*#__PURE__*/function () {
       this.inertiaOptions = options || {};
       this.mousePan.enable();
       this.touchPan.enable();
-      if (!isMini) {
-        this.el.classList.add('l7-touch-drag-pan');
-      }
+      this.el.classList.add('l7-touch-drag-pan');
     }
 
     /**
@@ -57,9 +54,7 @@ var DragPanHandler = /*#__PURE__*/function () {
     value: function disable() {
       this.mousePan.disable();
       this.touchPan.disable();
-      if (!isMini) {
-        this.el.classList.remove('l7-touch-drag-pan');
-      }
+      this.el.classList.remove('l7-touch-drag-pan');
     }
 
     /**

package/es/handler/shim/touch_zoom_rotate.js

@@ -1,6 +1,5 @@
 import _classCallCheck from "@babel/runtime/helpers/esm/classCallCheck";
 import _createClass from "@babel/runtime/helpers/esm/createClass";
-import { isMini } from '@antv/l7-utils';
 /**
  * The `TouchZoomRotateHandler` allows the user to zoom and rotate the map by
  * pinching on a touchscreen.
@@ -41,9 +40,7 @@ var TouchZoomRotateHandler = /*#__PURE__*/function () {
         this.touchRotate.enable(options);
       }
       this.tapDragZoom.enable();
-      if (!isMini) {
-        this.el.classList.add('l7-touch-zoom-rotate');
-      }
+      this.el.classList.add('l7-touch-zoom-rotate');
     }
 
     /**
@@ -58,9 +55,7 @@ var TouchZoomRotateHandler = /*#__PURE__*/function () {
       this.touchZoom.disable();
       this.touchRotate.disable();
       this.tapDragZoom.disable();
-      if (!isMini) {
-        this.el.classList.remove('l7-touch-zoom-rotate');
-      }
+      this.el.classList.remove('l7-touch-zoom-rotate');
     }
 
     /**

package/es/hash.js

@@ -3,8 +3,8 @@ import _createClass from "@babel/runtime/helpers/esm/createClass";
 import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 // @ts-ignore
 // tslint:disable-next-line:no-submodule-imports
-import { $window } from '@antv/l7-utils';
-import { throttle } from 'lodash';
+import { lodashUtil } from '@antv/l7-utils';
+var throttle = lodashUtil.throttle;
 /*
  * Adds the map's position to its page's location hash.
  * Passed as an option to the map object.
@@ -67,14 +67,14 @@ var Hash = /*#__PURE__*/function () {
     key: "addTo",
     value: function addTo(map) {
       this.map = map;
-      $window.addEventListener('hashchange', this.onHashChange, false);
+      window.addEventListener('hashchange', this.onHashChange, false);
       this.map.on('moveend', this.updateHash);
       return this;
     }
   }, {
     key: "remove",
     value: function remove() {
-      $window.removeEventListener('hashchange', this.onHashChange, false);
+      window.removeEventListener('hashchange', this.onHashChange, false);
       this.map.off('moveend', this.updateHash);
       // clearTimeout(this.updateHash());
 

package/es/map.js

@@ -8,8 +8,7 @@ import _getPrototypeOf from "@babel/runtime/helpers/esm/getPrototypeOf";
 import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(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; } }
-import { $window, DOM, isMini } from '@antv/l7-utils';
-import { merge } from 'lodash';
+import { DOM, lodashUtil } from '@antv/l7-utils';
 import Camera from "./camera";
 function loadStyles(css, doc) {
   var isMiniAli = typeof my !== 'undefined' && !!my && typeof my.showToast === 'function' && my.isFRM !== true;
@@ -53,7 +52,7 @@ import { PerformanceUtils } from "./utils/performance";
 import TaskQueue from "./utils/task_queue";
 var defaultMinZoom = -2;
 var defaultMaxZoom = 22;
-
+var merge = lodashUtil.merge;
 // the default values, but also the valid range
 var defaultMinPitch = 0;
 var defaultMaxPitch = 60;
@@ -103,11 +102,7 @@ export var Map = /*#__PURE__*/function (_Camera) {
         }).update();
       }
     });
-    if (isMini) {
-      _this.initMiniContainer();
-    } else {
-      _this.initContainer();
-    }
+    _this.initContainer();
     _this.resize();
     _this.handlers = new HandlerManager(_assertThisInitialized(_this), _this.options);
     if (typeof window !== 'undefined') {
@@ -115,11 +110,9 @@ export var Map = /*#__PURE__*/function (_Camera) {
       window.addEventListener('resize', _this.onWindowResize, false);
       window.addEventListener('orientationchange', _this.onWindowResize, false);
     }
-    if (!isMini) {
-      var hashName = typeof options.hash === 'string' && options.hash || undefined;
-      if (options.hash) {
-        _this.hash = new Hash(hashName).addTo(_assertThisInitialized(_this));
-      }
+    var hashName = typeof options.hash === 'string' && options.hash || undefined;
+    if (options.hash) {
+      _this.hash = new Hash(hashName).addTo(_assertThisInitialized(_this));
     }
 
     // don't set position from options if set through hash
@@ -148,18 +141,15 @@ export var Map = /*#__PURE__*/function (_Camera) {
         height = _this$containerDimens2[1];
       this.transform.resize(width, height);
       // 小程序环境不需要执行后续动作
-      if (isMini) {
-        return this;
-      }
       var fireMoving = !this.moving;
       if (fireMoving) {
         this.stop();
-        this.emit('movestart', new $window.Event('movestart', eventData));
-        this.emit('move', new $window.Event('move', eventData));
+        this.emit('movestart', new window.Event('movestart', eventData));
+        this.emit('move', new window.Event('move', eventData));
       }
-      this.emit('resize', new $window.Event('resize', eventData));
+      this.emit('resize', new window.Event('resize', eventData));
       if (fireMoving) {
-        this.emit('moveend', new $window.Event('moveend', eventData));
+        this.emit('moveend', new window.Event('moveend', eventData));
       }
       return this;
     }
@@ -385,15 +375,10 @@ export var Map = /*#__PURE__*/function (_Camera) {
       var width = 0;
       var height = 0;
       if (this.container) {
-        if (isMini) {
-          width = this.container.width / $window.devicePixelRatio;
-          height = this.container.height / $window.devicePixelRatio;
-        } else {
-          width = this.container.clientWidth;
-          height = this.container.clientHeight;
-          width = width === 0 ? 400 : width;
-          height = height === 0 ? 300 : height;
-        }
+        width = this.container.clientWidth;
+        height = this.container.clientHeight;
+        width = width === 0 ? 400 : width;
+        height = height === 0 ? 300 : height;
       }
       return [width, height];
     }

package/es/util.d.ts

@@ -12,9 +12,9 @@ export declare function pick(src: {
 }, properties: string[]): {
     [key: string]: any;
 };
-export declare const now: any;
-export declare const raf: any;
-export declare const cancel: any;
+export declare const now: () => number;
+export declare const raf: ((callback: FrameRequestCallback) => number) & typeof requestAnimationFrame;
+export declare const cancel: ((handle: number) => void) & typeof cancelAnimationFrame;
 export declare function renderframe(fn: (paintStartTimestamp: number) => void): ICancelable;
 export declare function extend(dest: {
     [key: string]: any;

package/es/util.js

@@ -1,7 +1,6 @@
 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; }
-import { $window, isMini } from '@antv/l7-utils';
 // @ts-ignore
 import UnitBezier from '@mapbox/unitbezier';
 var reducedMotionQuery;
@@ -24,14 +23,10 @@ export function bezier(p1x, p1y, p2x, p2y) {
 }
 export var ease = bezier(0.25, 0.1, 0.25, 1);
 export function prefersReducedMotion() {
-  // @ts-ignore
-  if (isMini || !$window.matchMedia) {
-    return false;
-  }
   // Lazily initialize media query
   if (reducedMotionQuery == null) {
     // @ts-ignore
-    reducedMotionQuery = $window.matchMedia('(prefers-reduced-motion: reduce)');
+    reducedMotionQuery = window.matchMedia('(prefers-reduced-motion: reduce)');
   }
   return reducedMotionQuery.matches;
 }
@@ -53,21 +48,21 @@ export function pick(src, properties) {
   }
   return result;
 }
-export var now = isMini ? Date.now.bind(Date) : $window.performance && $window.performance.now ? $window.performance.now.bind($window.performance) : Date.now.bind(Date);
-export var raf = $window.requestAnimationFrame ||
+export var now = window.performance && window.performance.now ? window.performance.now.bind(window.performance) : Date.now.bind(Date);
+export var raf = window.requestAnimationFrame ||
 // @ts-ignore
-$window.mozRequestAnimationFrame ||
+window.mozRequestAnimationFrame ||
 // @ts-ignore
-$window.webkitRequestAnimationFrame ||
+window.webkitRequestAnimationFrame ||
 // @ts-ignore
-$window.msRequestAnimationFrame;
-var _cancel = $window.cancelAnimationFrame ||
+window.msRequestAnimationFrame;
+var _cancel = window.cancelAnimationFrame ||
 // @ts-ignore
-$window.mozCancelAnimationFrame ||
+window.mozCancelAnimationFrame ||
 // @ts-ignore
-$window.webkitCancelAnimationFrame ||
+window.webkitCancelAnimationFrame ||
 // @ts-ignore
-$window.msCancelAnimationFrame;
+window.msCancelAnimationFrame;
 export { _cancel as cancel };
 export function renderframe(fn) {
   var frame = raf(fn);

package/es/utils/dom.js

@@ -1,13 +1,12 @@
 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; }
-import { $window, isMini } from '@antv/l7-utils';
 // @ts-ignore
 import Point from "../geo/point";
 var DOM = {};
 export default DOM;
 DOM.create = function (tagName, className, container) {
-  var el = $window.document.createElement(tagName);
+  var el = window.document.createElement(tagName);
   if (className !== undefined) {
     el.className = className;
   }
@@ -17,10 +16,10 @@ DOM.create = function (tagName, className, container) {
   return el;
 };
 DOM.createNS = function (namespaceURI, tagName) {
-  var el = $window.document.createElementNS(namespaceURI, tagName);
+  var el = window.document.createElementNS(namespaceURI, tagName);
   return el;
 };
-var docStyle = $window.document && $window.document.documentElement.style;
+var docStyle = window.document && window.document.documentElement.style;
 function testProp(props) {
   if (!docStyle) {
     return props[0];
@@ -73,9 +72,9 @@ try {
     }
   });
   // @ts-ignore
-  $window.addEventListener('test', options, options);
+  window.addEventListener('test', options, options);
   // @ts-ignore
-  $window.removeEventListener('test', options, options);
+  window.removeEventListener('test', options, options);
 } catch (err) {
   passiveSupported = false;
 }
@@ -100,81 +99,38 @@ DOM.removeEventListener = function (target, type, callback) {
 var suppressClick = function suppressClick(e) {
   e.preventDefault();
   e.stopPropagation();
-  $window.removeEventListener('click', suppressClick, true);
+  window.removeEventListener('click', suppressClick, true);
 };
 DOM.suppressClick = function () {
-  if (isMini) {
-    return;
-  }
-  $window.addEventListener('click', suppressClick, true);
+  window.addEventListener('click', suppressClick, true);
   setTimeout(function () {
-    $window.removeEventListener('click', suppressClick, true);
+    window.removeEventListener('click', suppressClick, true);
   }, 0);
 };
 DOM.mousePos = function (el, e) {
   // 暂时从 el 上获取 top/left， 后面需要动态获取
-  if (!isMini) {
-    var rect = el.getBoundingClientRect();
-    return new Point(e.clientX - rect.left - el.clientLeft, e.clientY - rect.top - el.clientTop);
-  } else {
-    return new Point(
-    // @ts-ignore
-    e.clientX - el.left - 0,
-    // @ts-ignore
-    e.clientY - el.top - 0);
-  }
+  var rect = el.getBoundingClientRect();
+  return new Point(e.clientX - rect.left - el.clientLeft, e.clientY - rect.top - el.clientTop);
 };
 DOM.touchPos = function (el, touches) {
   // 暂时从 el 上获取 top/left， 后面需要动态获取
-  if (!isMini) {
-    var rect = el.getBoundingClientRect();
-    var points = [];
-    var _iterator2 = _createForOfIteratorHelper(touches),
-      _step2;
-    try {
-      for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
-        var touche = _step2.value;
-        points.push(new Point(touche.clientX - rect.left - el.clientLeft, touche.clientY - rect.top - el.clientTop));
-      }
-    } catch (err) {
-      _iterator2.e(err);
-    } finally {
-      _iterator2.f();
-    }
-    return points;
-  } else {
-    var _points = [];
-    var _iterator3 = _createForOfIteratorHelper(touches),
-      _step3;
-    try {
-      for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
-        var _touche = _step3.value;
-        _points.push(new Point(
-        // @ts-ignore
-        _touche.clientX - el.left,
-        // @ts-ignore
-        _touche.clientY - el.top));
-      }
-    } catch (err) {
-      _iterator3.e(err);
-    } finally {
-      _iterator3.f();
+  var rect = el.getBoundingClientRect();
+  var points = [];
+  var _iterator2 = _createForOfIteratorHelper(touches),
+    _step2;
+  try {
+    for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
+      var touche = _step2.value;
+      points.push(new Point(touche.clientX - rect.left - el.clientLeft, touche.clientY - rect.top - el.clientTop));
     }
-    return _points;
+  } catch (err) {
+    _iterator2.e(err);
+  } finally {
+    _iterator2.f();
   }
+  return points;
 };
 DOM.mouseButton = function (e) {
-  if (!isMini) {
-    return e.button;
-  }
-  if (
-  // @ts-ignore
-  typeof $window.InstallTrigger !== 'undefined' && e.button === 2 && e.ctrlKey && $window.navigator.platform.toUpperCase().indexOf('MAC') >= 0) {
-    // Fix for https://github.com/mapbox/mapbox-gl-js/issues/3131:
-    // Firefox (detected by InstallTrigger) on Mac determines e.button = 2 when
-    // using Control + left click
-    return 0;
-  }
   return e.button;
 };
 DOM.remove = function (node) {

package/es/utils/performance.js

@@ -1,9 +1,8 @@
-import { $window } from '@antv/l7-utils';
 var lastFrameTime = null;
 var frameTimes = [];
 var minFramerateTarget = 30;
 var frameTimeTarget = 1000 / minFramerateTarget;
-var performance = $window.performance;
+var performance = window.performance;
 export var PerformanceMarkers = {
   create: 'create',
   load: 'load',