@antv/l7-component 2.9.32-alpha.1 → 2.9.32-alpha.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@antv/l7-component",
-  "version": "2.9.32-alpha.1",
+  "version": "2.9.32-alpha.3",
   "description": "",
   "main": "lib/index.js",
   "module": "es/index.js",
@@ -13,6 +13,7 @@
   ],
   "scripts": {
     "tsc": "tsc --project tsconfig.build.json",
+    "less": "lessc src/css/index.less src/css/index.css",
     "clean": "rimraf dist; rimraf es; rimraf lib;",
     "build": "father build",
     "build:cjs": "BABEL_ENV=cjs babel src --root-mode upward --out-dir lib --source-maps --extensions .ts,.tsx --delete-dir-on-start --no-comments",
@@ -25,8 +26,8 @@
   "author": "lzxue",
   "license": "ISC",
   "dependencies": {
-    "@antv/l7-core": "2.9.32-alpha.1",
-    "@antv/l7-utils": "2.9.32-alpha.1",
+    "@antv/l7-core": "2.9.32-alpha.3",
+    "@antv/l7-utils": "2.9.32-alpha.3",
     "@babel/runtime": "^7.7.7",
     "eventemitter3": "^4.0.0",
     "inversify": "^5.0.1",
@@ -35,9 +36,11 @@
     "supercluster": "^7.0.0"
   },
   "devDependencies": {
-    "@antv/l7-test-utils": "2.9.32-alpha.1"
+    "@antv/l7-test-utils": "2.9.32-alpha.3",
+    "gcoord": "^0.3.2",
+    "less": "^4.1.3"
   },
-  "gitHead": "3605ad7724ff58f38c6e22e195d103edfbcb5bc0",
+  "gitHead": "933f97b7f72989a523c164677235546838b476bf",
   "publishConfig": {
     "access": "public"
   }

package/es/control/BaseControl.d.ts

@@ -1,27 +0,0 @@
-import { IControlOption, IControlService, ILayerService, IMapService, IRendererService, PositionType } from '@antv/l7-core';
-import { EventEmitter } from 'eventemitter3';
-import { Container } from 'inversify';
-export { PositionType } from '@antv/l7-core';
-export default class Control extends EventEmitter {
-    controlOption: IControlOption;
-    protected container: HTMLElement;
-    protected sceneContainer: Container;
-    protected mapsService: IMapService;
-    protected renderService: IRendererService;
-    protected layerService: ILayerService;
-    protected controlService: IControlService;
-    private isShow;
-    constructor(cfg?: Partial<IControlOption>);
-    getDefault(): {
-        position: PositionType;
-        name: string;
-    };
-    setPosition(position?: PositionType): this;
-    addTo(sceneContainer: Container): this;
-    onAdd(): HTMLElement;
-    onRemove(): void;
-    hide(): void;
-    show(): void;
-    remove(): this | undefined;
-    _refocusOnMap(e: MouseEvent): void;
-}

package/es/control/BaseControl.js

@@ -1,134 +0,0 @@
-import _objectSpread from "@babel/runtime/helpers/objectSpread2";
-import _classCallCheck from "@babel/runtime/helpers/classCallCheck";
-import _createClass from "@babel/runtime/helpers/createClass";
-import _inherits from "@babel/runtime/helpers/inherits";
-import _possibleConstructorReturn from "@babel/runtime/helpers/possibleConstructorReturn";
-import _getPrototypeOf from "@babel/runtime/helpers/getPrototypeOf";
-
-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 { PositionType, TYPES } from '@antv/l7-core';
-import { DOM } from '@antv/l7-utils';
-import { EventEmitter } from 'eventemitter3';
-export { PositionType } from '@antv/l7-core';
-var controlId = 0;
-
-var Control = /*#__PURE__*/function (_EventEmitter) {
-  _inherits(Control, _EventEmitter);
-
-  var _super = _createSuper(Control);
-
-  function Control(cfg) {
-    var _this;
-
-    _classCallCheck(this, Control);
-
-    _this = _super.call(this);
-    _this.controlOption = _objectSpread(_objectSpread({}, _this.getDefault()), cfg || {});
-    return _this;
-  }
-
-  _createClass(Control, [{
-    key: "getDefault",
-    value: function getDefault() {
-      return {
-        position: PositionType.TOPRIGHT,
-        name: "".concat(controlId++)
-      };
-    }
-  }, {
-    key: "setPosition",
-    value: function setPosition() {
-      var position = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : PositionType.BOTTOMRIGHT;
-      // 考虑组件的自动布局，需要销毁重建
-      var controlService = this.controlService;
-
-      if (controlService) {
-        controlService.removeControl(this);
-      }
-
-      this.controlOption.position = position;
-
-      if (controlService) {
-        controlService.addControl(this, this.sceneContainer);
-      }
-
-      return this;
-    }
-  }, {
-    key: "addTo",
-    value: function addTo(sceneContainer) {
-      this.mapsService = sceneContainer.get(TYPES.IMapService);
-      this.renderService = sceneContainer.get(TYPES.IRendererService);
-      this.layerService = sceneContainer.get(TYPES.ILayerService);
-      this.controlService = sceneContainer.get(TYPES.IControlService);
-      this.sceneContainer = sceneContainer;
-      this.isShow = true;
-      this.container = this.onAdd();
-      var container = this.container;
-      var pos = this.controlOption.position;
-      var corner = this.controlService.controlCorners[pos];
-      DOM.addClass(container, 'l7-control');
-
-      if (pos.indexOf('bottom') !== -1) {
-        corner.insertBefore(container, corner.firstChild);
-      } else {
-        corner.appendChild(container);
-      }
-
-      return this;
-    }
-  }, {
-    key: "onAdd",
-    value: function onAdd() {
-      throw new Error('Method not implemented.');
-    }
-  }, {
-    key: "onRemove",
-    value: function onRemove() {
-      throw new Error('Method not implemented.');
-    }
-  }, {
-    key: "hide",
-    value: function hide() {
-      var container = this.container;
-      DOM.addClass(container, 'l7-control-hide');
-      this.isShow = false;
-    }
-  }, {
-    key: "show",
-    value: function show() {
-      var container = this.container;
-      DOM.removeClass(container, 'l7-control-hide');
-      this.isShow = true;
-    }
-  }, {
-    key: "remove",
-    value: function remove() {
-      if (!this.mapsService) {
-        return this;
-      }
-
-      DOM.remove(this.container);
-      this.onRemove();
-    }
-  }, {
-    key: "_refocusOnMap",
-    value: function _refocusOnMap(e) {
-      // if map exists and event is not a keyboard event
-      if (this.mapsService && e && e.screenX > 0 && e.screenY > 0) {
-        var container = this.mapsService.getContainer();
-
-        if (container !== null) {
-          container.focus();
-        }
-      }
-    }
-  }]);
-
-  return Control;
-}(EventEmitter);
-
-export { Control as default };

package/es/control/layer.d.ts

@@ -1,38 +0,0 @@
-import { PositionType } from '@antv/l7-core';
-import { ILayerControlOption } from '../interface';
-import Control from './BaseControl';
-export default class Layers extends Control {
-    private layerControlInputs;
-    private layers;
-    private lastZIndex;
-    private handlingClick;
-    private layersLink;
-    private baseLayersList;
-    private separator;
-    private overlaysList;
-    private form;
-    constructor(cfg: Partial<ILayerControlOption>);
-    getDefault(): {
-        collapsed: boolean;
-        position: PositionType;
-        autoZIndex: boolean;
-        hideSingleBase: boolean;
-        sortLayers: boolean;
-        name: string;
-    };
-    onAdd(): HTMLElement;
-    addVisualLayer(layer: any, name: string | number): this;
-    expand(): this;
-    collapse(): this;
-    onRemove(): void;
-    private initLayout;
-    private initLayers;
-    private update;
-    private checkDisabledLayers;
-    private addLayer;
-    private expandIfNotCollapsed;
-    private onLayerChange;
-    private createRadioElement;
-    private addItem;
-    private onInputClick;
-}

package/es/control/layer.js

@@ -1,340 +0,0 @@
-import _classCallCheck from "@babel/runtime/helpers/classCallCheck";
-import _createClass from "@babel/runtime/helpers/createClass";
-import _assertThisInitialized from "@babel/runtime/helpers/assertThisInitialized";
-import _inherits from "@babel/runtime/helpers/inherits";
-import _possibleConstructorReturn from "@babel/runtime/helpers/possibleConstructorReturn";
-import _getPrototypeOf from "@babel/runtime/helpers/getPrototypeOf";
-
-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 { PositionType } from '@antv/l7-core';
-import { bindAll, DOM } from '@antv/l7-utils';
-import Control from "./BaseControl";
-
-var Layers = /*#__PURE__*/function (_Control) {
-  _inherits(Layers, _Control);
-
-  var _super = _createSuper(Layers);
-
-  function Layers(cfg) {
-    var _this;
-
-    _classCallCheck(this, Layers);
-
-    _this = _super.call(this, cfg);
-    _this.layerControlInputs = [];
-    _this.layers = [];
-    _this.lastZIndex = 0;
-    _this.handlingClick = false;
-
-    _this.initLayers();
-
-    bindAll(['checkDisabledLayers', 'onLayerChange', 'collapse', 'extend', 'expand', 'onInputClick'], _assertThisInitialized(_this));
-    return _this;
-  }
-
-  _createClass(Layers, [{
-    key: "getDefault",
-    value: function getDefault() {
-      return {
-        collapsed: true,
-        position: PositionType.TOPRIGHT,
-        autoZIndex: true,
-        hideSingleBase: false,
-        sortLayers: false,
-        name: 'layers'
-      };
-    }
-  }, {
-    key: "onAdd",
-    value: function onAdd() {
-      var _this2 = this;
-
-      this.initLayout();
-      this.update();
-      this.mapsService.on('zoomend', this.checkDisabledLayers);
-      this.layers.forEach(function (layerItem) {
-        layerItem.layer.on('remove', _this2.onLayerChange);
-        layerItem.layer.on('add', _this2.onLayerChange);
-      });
-      return this.container;
-    }
-  }, {
-    key: "addVisualLayer",
-    value: function addVisualLayer(layer, name) {
-      this.addLayer(layer, name, true);
-      return this.mapsService ? this.update() : this;
-    }
-  }, {
-    key: "expand",
-    value: function expand() {
-      var _this$renderService$g = this.renderService.getViewportSize(),
-          height = _this$renderService$g.height;
-
-      DOM.addClass(this.container, 'l7-control-layers-expanded');
-      this.form.style.height = 'null';
-      var acceptableHeight = height - (this.container.offsetTop + 50);
-
-      if (acceptableHeight < this.form.clientHeight) {
-        DOM.addClass(this.form, 'l7-control-layers-scrollbar');
-        this.form.style.height = acceptableHeight + 'px';
-      } else {
-        DOM.removeClass(this.form, 'l7-control-layers-scrollbar');
-      }
-
-      this.checkDisabledLayers();
-      return this;
-    }
-  }, {
-    key: "collapse",
-    value: function collapse() {
-      DOM.removeClass(this.container, 'l7-control-layers-expanded');
-      return this;
-    }
-  }, {
-    key: "onRemove",
-    value: function onRemove() {
-      var _this3 = this;
-
-      if (!this.mapsService) {
-        return;
-      }
-
-      this.mapsService.off('click', this.collapse);
-      this.layers.forEach(function (layerItem) {
-        layerItem.layer.off('remove', _this3.onLayerChange);
-        layerItem.layer.off('add', _this3.onLayerChange);
-      });
-    }
-  }, {
-    key: "initLayout",
-    value: function initLayout() {
-      var className = 'l7-control-layers';
-      var container = this.container = DOM.create('div', className);
-      var collapsed = this.controlOption.collapsed; // makes this work on IE touch devices by stopping it from firing a mouseout event when the touch is released
-
-      container.setAttribute('aria-haspopup', 'true');
-      var form = this.form = DOM.create('form', className + '-list');
-
-      if (collapsed) {
-        this.mapsService.on('click', this.collapse);
-        container.addEventListener('mouseenter', this.expand);
-        container.addEventListener('mouseleave', this.collapse);
-      }
-
-      this.layersLink = DOM.create('a', className + '-toggle', container);
-      var link = this.layersLink; // link.href = '#';
-
-      link.title = 'Layers';
-
-      if (!collapsed) {
-        this.expand();
-      }
-
-      this.baseLayersList = DOM.create('div', className + '-base', form);
-      this.separator = DOM.create('div', className + '-separator', form);
-      this.overlaysList = DOM.create('div', className + '-overlays', form);
-      container.appendChild(form);
-    }
-  }, {
-    key: "initLayers",
-    value: function initLayers() {
-      var _this4 = this;
-
-      var _this$controlOption = this.controlOption,
-          _this$controlOption$b = _this$controlOption.baseLayers,
-          baseLayers = _this$controlOption$b === void 0 ? {} : _this$controlOption$b,
-          _this$controlOption$o = _this$controlOption.overlayers,
-          overlayers = _this$controlOption$o === void 0 ? {} : _this$controlOption$o;
-      Object.keys(baseLayers).forEach(function (name) {
-        // baseLayers[name].once('inited', this.update);
-        _this4.addLayer(baseLayers[name], name, false);
-      });
-      Object.keys(overlayers).forEach(function (name) {
-        // overlayers[name].once('inited', this.update);
-        _this4.addLayer(overlayers[name], name, true);
-      });
-    }
-  }, {
-    key: "update",
-    value: function update() {
-      if (!this.container) {
-        return this;
-      }
-
-      DOM.empty(this.baseLayersList);
-      DOM.empty(this.overlaysList);
-      this.layerControlInputs = [];
-      var baseLayersPresent;
-      var overlaysPresent;
-      var i;
-      var obj;
-      var baseLayersCount = 0;
-
-      for (i = 0; i < this.layers.length; i++) {
-        obj = this.layers[i];
-        this.addItem(obj);
-        overlaysPresent = overlaysPresent || obj.overlay;
-        baseLayersPresent = baseLayersPresent || !obj.overlay;
-        baseLayersCount += !obj.overlay ? 1 : 0;
-      } // Hide base layers section if there's only one layer.
-
-
-      if (this.controlOption.hideSingleBase) {
-        baseLayersPresent = baseLayersPresent && baseLayersCount > 1;
-        this.baseLayersList.style.display = baseLayersPresent ? '' : 'none';
-      }
-
-      this.separator.style.display = overlaysPresent && baseLayersPresent ? '' : 'none';
-      return this;
-    }
-  }, {
-    key: "checkDisabledLayers",
-    value: function checkDisabledLayers() {
-      var inputs = this.layerControlInputs;
-      var input;
-      var layer;
-      var zoom = this.mapsService.getZoom();
-
-      for (var i = inputs.length - 1; i >= 0; i--) {
-        input = inputs[i];
-        layer = this.layerService.getLayer(input.layerId);
-
-        if (layer && layer.inited) {
-          var minZoom = layer.getMinZoom();
-          var maxZoom = layer.getMaxZoom();
-          input.disabled = zoom < minZoom || zoom > maxZoom;
-        }
-      }
-    }
-  }, {
-    key: "addLayer",
-    value: function addLayer(layer, name, overlay) {
-      if (this.mapsService) {
-        layer.on('add', this.onLayerChange);
-        layer.on('remove', this.onLayerChange);
-      }
-
-      this.layers.push({
-        layer: layer,
-        name: name,
-        overlay: overlay
-      });
-      var _this$controlOption2 = this.controlOption,
-          sortLayers = _this$controlOption2.sortLayers,
-          sortFunction = _this$controlOption2.sortFunction,
-          autoZIndex = _this$controlOption2.autoZIndex;
-
-      if (sortLayers) {
-        this.layers.sort(function (a, b) {
-          return sortFunction(a.layer, b.layer, a.name, b.name);
-        });
-      }
-
-      if (autoZIndex && layer.setZIndex) {
-        this.lastZIndex++;
-        layer.setZIndex(this.lastZIndex);
-      }
-
-      this.expandIfNotCollapsed();
-    }
-  }, {
-    key: "expandIfNotCollapsed",
-    value: function expandIfNotCollapsed() {
-      if (this.mapsService && !this.controlOption.collapsed) {
-        this.expand();
-      }
-
-      return this;
-    }
-  }, {
-    key: "onLayerChange",
-    value: function onLayerChange(e) {
-      if (!this.handlingClick) {
-        this.update();
-      }
-
-      var obj = this.layerService.getLayer(e.target.layerId); // @ts-ignore
-
-      var type = obj !== null && obj !== void 0 && obj.overlay ? e.type === 'add' ? 'overlayadd' : 'overlayremove' : e.type === 'add' ? 'baselayerchange' : null;
-
-      if (type) {
-        this.emit(type, obj);
-      }
-    }
-  }, {
-    key: "createRadioElement",
-    value: function createRadioElement(name, checked) {
-      var radioHtml = '<input type="radio" class="l7-control-layers-selector" name="' + name + '"' + (checked ? ' checked="checked"' : '') + '/>';
-      var radioFragment = document.createElement('div');
-      radioFragment.innerHTML = radioHtml;
-      return radioFragment.firstChild;
-    }
-  }, {
-    key: "addItem",
-    value: function addItem(obj) {
-      var label = document.createElement('label');
-      var layer = this.layerService.getLayer(obj.layer.id);
-      var checked = layer && layer.inited && obj.layer.isVisible();
-      var input;
-
-      if (obj.overlay) {
-        input = document.createElement('input');
-        input.type = 'checkbox';
-        input.className = 'l7-control-layers-selector';
-        input.defaultChecked = checked;
-      } else {
-        input = this.createRadioElement('l7-base-layers', checked);
-      }
-
-      this.layerControlInputs.push(input);
-      input.layerId = obj.layer.id;
-      input.addEventListener('click', this.onInputClick);
-      var name = document.createElement('span');
-      name.innerHTML = ' ' + obj.name;
-      var holder = document.createElement('div');
-      label.appendChild(holder);
-      holder.appendChild(input);
-      holder.appendChild(name);
-      var container = obj.overlay ? this.overlaysList : this.baseLayersList;
-      container.appendChild(label);
-      this.checkDisabledLayers();
-      return label;
-    }
-  }, {
-    key: "onInputClick",
-    value: function onInputClick() {
-      var inputs = this.layerControlInputs;
-      var input;
-      var layer;
-      var addedLayers = [];
-      var removedLayers = [];
-      this.handlingClick = true;
-
-      for (var i = inputs.length - 1; i >= 0; i--) {
-        input = inputs[i];
-        layer = this.layerService.getLayer(input.layerId);
-
-        if (input.checked) {
-          addedLayers.push(layer);
-        } else if (!input.checked) {
-          removedLayers.push(layer);
-        }
-      }
-
-      removedLayers.forEach(function (l) {
-        l.hide();
-      });
-      addedLayers.forEach(function (l) {
-        l.show();
-      });
-      this.handlingClick = false;
-    }
-  }]);
-
-  return Layers;
-}(Control);
-
-export { Layers as default };

package/es/control/logo.d.ts

@@ -1,9 +0,0 @@
-import Control, { PositionType } from './BaseControl';
-export default class Logo extends Control {
-    getDefault(): {
-        position: PositionType;
-        name: string;
-    };
-    onAdd(): any;
-    onRemove(): null;
-}

package/es/control/logo.js

@@ -1,57 +0,0 @@
-import _classCallCheck from "@babel/runtime/helpers/classCallCheck";
-import _createClass from "@babel/runtime/helpers/createClass";
-import _inherits from "@babel/runtime/helpers/inherits";
-import _possibleConstructorReturn from "@babel/runtime/helpers/possibleConstructorReturn";
-import _getPrototypeOf from "@babel/runtime/helpers/getPrototypeOf";
-
-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 Control, { PositionType } from "./BaseControl";
-
-var Logo = /*#__PURE__*/function (_Control) {
-  _inherits(Logo, _Control);
-
-  var _super = _createSuper(Logo);
-
-  function Logo() {
-    _classCallCheck(this, Logo);
-
-    return _super.apply(this, arguments);
-  }
-
-  _createClass(Logo, [{
-    key: "getDefault",
-    value: function getDefault() {
-      return {
-        position: PositionType.BOTTOMLEFT,
-        name: 'logo'
-      };
-    }
-  }, {
-    key: "onAdd",
-    value: function onAdd() {
-      var className = 'l7-control-logo';
-      var container = DOM.create('div', className);
-      var anchor = DOM.create('a', 'l7-ctrl-logo');
-      anchor.target = '_blank';
-      anchor.rel = 'noopener nofollow';
-      anchor.href = 'https://antv.alipay.com/l7';
-      anchor.setAttribute('aria-label', 'AntV logo');
-      anchor.setAttribute('rel', 'noopener nofollow');
-      container.appendChild(anchor);
-      return container;
-    }
-  }, {
-    key: "onRemove",
-    value: function onRemove() {
-      return null;
-    }
-  }]);
-
-  return Logo;
-}(Control);
-
-export { Logo as default };

package/es/control/scale.d.ts

@@ -1,24 +0,0 @@
-import { IScaleControlOption } from '../interface';
-import Control, { PositionType } from './BaseControl';
-export default class Scale extends Control {
-    private mScale;
-    private iScale;
-    constructor(cfg?: Partial<IScaleControlOption>);
-    getDefault(): {
-        position: PositionType;
-        maxWidth: number;
-        metric: boolean;
-        updateWhenIdle: boolean;
-        imperial: boolean;
-        name: string;
-    };
-    onAdd(): any;
-    onRemove(): void;
-    update(): void;
-    updateScales(maxMeters: number): void;
-    private updateMetric;
-    private updateImperial;
-    private updateScale;
-    private getRoundNum;
-    private addScales;
-}