@antv/l7-component 2.10.3 → 2.10.4

package/es/control/baseControl/control.d.ts

@@ -6,7 +6,7 @@ export { PositionType } from '@antv/l7-core';
 export { Control };
 export interface IControlOption {
     name: string;
-    position: PositionName;
+    position: PositionName | Element;
     className?: string;
     style?: string;
     [key: string]: any;
@@ -87,7 +87,7 @@ export default class Control<O extends IControlOption = IControlOption> extends
      * 设置当前控件位置
      * @param position
      */
-    setPosition(position?: PositionType | PositionName): this;
+    setPosition(position?: PositionType | IControlOption['position']): this;
     /**
      * 设置容器 container 的样式相关位置，包含 className
      * @param className

package/es/control/baseControl/control.js

@@ -279,14 +279,19 @@ var Control = /*#__PURE__*/function (_ref) {
   }, {
     key: "insertContainer",
     value: function insertContainer() {
-      var container = this.container;
       var position = this.controlOption.position;
-      var corner = this.controlService.controlCorners[position];
+      var container = this.container;
 
-      if (position.indexOf('bottom') !== -1) {
-        corner.insertBefore(container, corner.firstChild);
+      if (position instanceof Element) {
+        position.appendChild(container);
       } else {
-        corner.appendChild(container);
+        var corner = this.controlService.controlCorners[position];
+
+        if (position.indexOf('bottom') !== -1) {
+          corner.insertBefore(container, corner.firstChild);
+        } else {
+          corner.appendChild(container);
+        }
       }
     }
     /**

package/es/control/baseControl/popperControl.js

@@ -66,12 +66,11 @@ var PopperControl = /*#__PURE__*/function (_ButtonControl) {
     value: function getDefault(option) {
       var _option$position;
 
-      var defaultOption = _get(_getPrototypeOf(PopperControl.prototype), "getDefault", this).call(this, option); // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-
+      var defaultOption = _get(_getPrototypeOf(PopperControl.prototype), "getDefault", this).call(this, option);
 
       var position = (_option$position = option === null || option === void 0 ? void 0 : option.position) !== null && _option$position !== void 0 ? _option$position : defaultOption.position;
       return _objectSpread(_objectSpread({}, _get(_getPrototypeOf(PopperControl.prototype), "getDefault", this).call(this, option)), {}, {
-        popperPlacement: PopperPlacementMap[position],
+        popperPlacement: position instanceof Element ? 'bottom' : PopperPlacementMap[position],
         popperTrigger: 'click'
       });
     }
@@ -96,10 +95,8 @@ var PopperControl = /*#__PURE__*/function (_ButtonControl) {
       var _this$controlOption = this.controlOption,
           popperClassName = _this$controlOption.popperClassName,
           popperPlacement = _this$controlOption.popperPlacement,
-          popperTrigger = _this$controlOption.popperTrigger; // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-
-      var popperContainer = this.mapsService.getMapContainer(); // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-
+          popperTrigger = _this$controlOption.popperTrigger;
+      var popperContainer = this.mapsService.getMapContainer();
       this.popper = new Popper(this.button, {
         className: popperClassName,
         placement: popperPlacement,

package/es/control/baseControl/selectControl.js

@@ -119,7 +119,6 @@ var SelectControl = /*#__PURE__*/function (_PopperControl) {
       var emitEvent = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : true;
       var finalValue = this.transSelectValue(value);
       this.optionDOMList.forEach(function (optionDOM) {
-        // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
         var optionValue = optionDOM.getAttribute(SelectControlConstant.OptionValueAttrKey);
         var checkboxDOM = _this2.getIsMultiple() ? optionDOM.querySelector('input[type=checkbox]') : undefined;
 

package/es/control/fullscreen.js

@@ -121,8 +121,7 @@ var Fullscreen = /*#__PURE__*/function (_ButtonControl) {
     value: function onAdd() {
       var button = _get(_getPrototypeOf(Fullscreen.prototype), "onAdd", this).call(this);
 
-      button.addEventListener('click', this.onClick); // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-
+      button.addEventListener('click', this.onClick);
       this.mapContainer = DOM.getContainer(this.scene.getSceneConfig().id);
       this.mapContainer.addEventListener('fullscreenchange', this.onFullscreenChange);
       return button;

package/es/popup/layerPopup.d.ts

@@ -1,5 +1,4 @@
 import { ILayer, IPopupOption } from '@antv/l7-core';
-import { BaseLayer } from '@antv/l7-layers';
 import { Container } from 'inversify';
 import Popup from './popup';
 export declare type LayerField = {
@@ -9,7 +8,7 @@ export declare type LayerField = {
     getValue?: (feature: any) => any;
 };
 export declare type LayerPopupConfigItem = {
-    layer: BaseLayer | string;
+    layer: ILayer | string;
     fields: Array<LayerField | string>;
 };
 export interface ILayerPopupOption extends IPopupOption {
@@ -17,10 +16,10 @@ export interface ILayerPopupOption extends IPopupOption {
     trigger: 'hover' | 'click';
 }
 declare type LayerMapInfo = {
-    onMouseMove?: (layer: BaseLayer, e: any) => void;
-    onMouseOut?: (layer: BaseLayer, e: any) => void;
-    onClick?: (layer: BaseLayer, e: any) => void;
-    onSourceUpdate?: (layer: BaseLayer) => void;
+    onMouseMove?: (layer: ILayer, e: any) => void;
+    onMouseOut?: (layer: ILayer, e: any) => void;
+    onClick?: (layer: ILayer, e: any) => void;
+    onSourceUpdate?: (layer: ILayer) => void;
 } & Partial<LayerPopupConfigItem>;
 export { LayerPopup };
 export default class LayerPopup extends Popup<ILayerPopupOption> {

package/es/popup/layerPopup.js

@@ -12,8 +12,6 @@ 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-implicit-dependencies
 import { DOM } from '@antv/l7-utils';
 import { get } from 'lodash'; // import { Container } from 'inversify';
 
@@ -193,8 +191,7 @@ var LayerPopup = /*#__PURE__*/function (_Popup) {
       if (!this.isShow) {
         this.show();
       }
-    } // eslint-disable-next-line @typescript-eslint/no-unused-vars
-
+    }
   }, {
     key: "onLayerMouseOut",
     value: function onLayerMouseOut(layer, e) {

package/es/popup/popup.js

@@ -460,8 +460,7 @@ var Popup = /*#__PURE__*/function (_EventEmitter) {
     }
   }, {
     key: "getDefault",
-    value: // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    function getDefault(option) {
+    value: function getDefault(option) {
       // tslint:disable-next-line:no-object-literal-type-assertion
       return {
         closeButton: true,
@@ -515,7 +514,6 @@ var Popup = /*#__PURE__*/function (_EventEmitter) {
   }, {
     key: "updateFollowCursor",
     value: function updateFollowCursor(onlyClear) {
-      // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
       var container = this.mapsService.getContainer();
       container.removeEventListener('mousemove', this.onMouseMove);
 

package/lib/control/baseControl/control.js

@@ -308,14 +308,19 @@ var Control = /*#__PURE__*/function (_ref) {
   }, {
     key: "insertContainer",
     value: function insertContainer() {
-      var container = this.container;
       var position = this.controlOption.position;
-      var corner = this.controlService.controlCorners[position];
+      var container = this.container;
 
-      if (position.indexOf('bottom') !== -1) {
-        corner.insertBefore(container, corner.firstChild);
+      if (position instanceof Element) {
+        position.appendChild(container);
       } else {
-        corner.appendChild(container);
+        var corner = this.controlService.controlCorners[position];
+
+        if (position.indexOf('bottom') !== -1) {
+          corner.insertBefore(container, corner.firstChild);
+        } else {
+          corner.appendChild(container);
+        }
       }
     }
     /**

package/lib/control/baseControl/popperControl.js

@@ -80,11 +80,10 @@ var PopperControl = /*#__PURE__*/function (_ButtonControl) {
     value: function getDefault(option) {
       var _option$position;
 
-      var defaultOption = (0, _get2.default)((0, _getPrototypeOf2.default)(PopperControl.prototype), "getDefault", this).call(this, option); // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-
+      var defaultOption = (0, _get2.default)((0, _getPrototypeOf2.default)(PopperControl.prototype), "getDefault", this).call(this, option);
       var position = (_option$position = option === null || option === void 0 ? void 0 : option.position) !== null && _option$position !== void 0 ? _option$position : defaultOption.position;
       return (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (0, _get2.default)((0, _getPrototypeOf2.default)(PopperControl.prototype), "getDefault", this).call(this, option)), {}, {
-        popperPlacement: PopperPlacementMap[position],
+        popperPlacement: position instanceof Element ? 'bottom' : PopperPlacementMap[position],
         popperTrigger: 'click'
       });
     }
@@ -108,10 +107,8 @@ var PopperControl = /*#__PURE__*/function (_ButtonControl) {
       var _this$controlOption = this.controlOption,
           popperClassName = _this$controlOption.popperClassName,
           popperPlacement = _this$controlOption.popperPlacement,
-          popperTrigger = _this$controlOption.popperTrigger; // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-
-      var popperContainer = this.mapsService.getMapContainer(); // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-
+          popperTrigger = _this$controlOption.popperTrigger;
+      var popperContainer = this.mapsService.getMapContainer();
       this.popper = new _popper.Popper(this.button, {
         className: popperClassName,
         placement: popperPlacement,

package/lib/control/baseControl/selectControl.js

@@ -132,7 +132,6 @@ var SelectControl = /*#__PURE__*/function (_PopperControl) {
       var emitEvent = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : true;
       var finalValue = this.transSelectValue(value);
       this.optionDOMList.forEach(function (optionDOM) {
-        // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
         var optionValue = optionDOM.getAttribute(SelectControlConstant.OptionValueAttrKey);
         var checkboxDOM = _this2.getIsMultiple() ? optionDOM.querySelector('input[type=checkbox]') : undefined;
 

package/lib/control/fullscreen.js

@@ -136,8 +136,7 @@ var Fullscreen = /*#__PURE__*/function (_ButtonControl) {
     key: "onAdd",
     value: function onAdd() {
       var button = (0, _get2.default)((0, _getPrototypeOf2.default)(Fullscreen.prototype), "onAdd", this).call(this);
-      button.addEventListener('click', this.onClick); // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-
+      button.addEventListener('click', this.onClick);
       this.mapContainer = _l7Utils.DOM.getContainer(this.scene.getSceneConfig().id);
       this.mapContainer.addEventListener('fullscreenchange', this.onFullscreenChange);
       return button;

package/lib/popup/layerPopup.js

@@ -202,8 +202,7 @@ var LayerPopup = /*#__PURE__*/function (_Popup) {
       if (!this.isShow) {
         this.show();
       }
-    } // eslint-disable-next-line @typescript-eslint/no-unused-vars
-
+    }
   }, {
     key: "onLayerMouseOut",
     value: function onLayerMouseOut(layer, e) {

package/lib/popup/popup.js

@@ -474,8 +474,7 @@ var Popup = /*#__PURE__*/function (_EventEmitter) {
     }
   }, {
     key: "getDefault",
-    value: // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    function getDefault(option) {
+    value: function getDefault(option) {
       // tslint:disable-next-line:no-object-literal-type-assertion
       return {
         closeButton: true,
@@ -529,7 +528,6 @@ var Popup = /*#__PURE__*/function (_EventEmitter) {
   }, {
     key: "updateFollowCursor",
     value: function updateFollowCursor(onlyClear) {
-      // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
       var container = this.mapsService.getContainer();
       container.removeEventListener('mousemove', this.onMouseMove);
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@antv/l7-component",
-  "version": "2.10.3",
+  "version": "2.10.4",
   "description": "",
   "main": "lib/index.js",
   "module": "es/index.js",
@@ -26,8 +26,8 @@
   "author": "lzxue",
   "license": "ISC",
   "dependencies": {
-    "@antv/l7-core": "2.10.3",
-    "@antv/l7-utils": "2.10.3",
+    "@antv/l7-core": "2.10.4",
+    "@antv/l7-utils": "2.10.4",
     "@babel/runtime": "^7.7.7",
     "eventemitter3": "^4.0.0",
     "inversify": "^5.0.1",
@@ -36,11 +36,11 @@
     "supercluster": "^7.0.0"
   },
   "devDependencies": {
-    "@antv/l7-test-utils": "2.10.3",
+    "@antv/l7-test-utils": "2.10.4",
     "gcoord": "^0.3.2",
     "less": "^4.1.3"
   },
-  "gitHead": "306900eeb5c60dbbee4331a44e42e101b711ba0d",
+  "gitHead": "4b25604adb5e066ef9779b3c52ae759a76c563c1",
   "publishConfig": {
     "access": "public"
   }