@antv/l7-component 2.9.37 → 2.10.0

package/lib/control/zoom.js

@@ -2,12 +2,12 @@
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 
-var _typeof = require("@babel/runtime/helpers/typeof");
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.default = void 0;
+exports.default = exports.Zoom = void 0;
+
+var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
 
@@ -15,19 +15,23 @@ var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/creat
 
 var _assertThisInitialized2 = _interopRequireDefault(require("@babel/runtime/helpers/assertThisInitialized"));
 
+var _get2 = _interopRequireDefault(require("@babel/runtime/helpers/get"));
+
 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 _l7Utils = require("@antv/l7-utils");
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+
+var _l7Core = require("@antv/l7-core");
 
-var _BaseControl = _interopRequireWildcard(require("./BaseControl"));
+var _l7Utils = require("@antv/l7-utils");
 
-function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
+var _icon = require("../utils/icon");
 
-function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+var _baseControl = require("./baseControl");
 
 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); }; }
 
@@ -38,39 +42,73 @@ var Zoom = /*#__PURE__*/function (_Control) {
 
   var _super = _createSuper(Zoom);
 
-  function Zoom(cfg) {
+  function Zoom() {
     var _this;
 
     (0, _classCallCheck2.default)(this, Zoom);
-    _this = _super.call(this, cfg);
-    (0, _l7Utils.bindAll)(['updateDisabled', 'zoomIn', 'zoomOut'], (0, _assertThisInitialized2.default)(_this));
+
+    for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
+      args[_key] = arguments[_key];
+    }
+
+    _this = _super.call.apply(_super, [this].concat(args));
+    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "zoomIn", function () {
+      if (!_this.disabled && _this.mapsService.getZoom() < _this.mapsService.getMaxZoom()) {
+        _this.mapsService.zoomIn();
+      }
+    });
+    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "zoomOut", function () {
+      if (!_this.disabled && _this.mapsService.getZoom() > _this.mapsService.getMinZoom()) {
+        _this.mapsService.zoomOut();
+      }
+    });
+    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "updateDisabled", function () {
+      var mapsService = _this.mapsService;
+
+      _this.zoomInButton.removeAttribute('disabled');
+
+      _this.zoomOutButton.removeAttribute('disabled');
+
+      if (_this.disabled || mapsService.getZoom() <= mapsService.getMinZoom()) {
+        _this.zoomOutButton.setAttribute('disabled', 'true');
+      }
+
+      if (_this.disabled || mapsService.getZoom() >= mapsService.getMaxZoom()) {
+        _this.zoomInButton.setAttribute('disabled', 'true');
+      }
+    });
     return _this;
   }
 
   (0, _createClass2.default)(Zoom, [{
     key: "getDefault",
-    value: function getDefault() {
-      return {
-        position: _BaseControl.PositionType.TOPLEFT,
-        zoomInText: '+',
+    value: function getDefault(option) {
+      return (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (0, _get2.default)((0, _getPrototypeOf2.default)(Zoom.prototype), "getDefault", this).call(this, option)), {}, {
+        position: _l7Core.PositionType.BOTTOMRIGHT,
+        name: 'zoom',
+        zoomInText: (0, _icon.createL7Icon)('l7-icon-enlarge'),
         zoomInTitle: 'Zoom in',
-        zoomOutText: '&#x2212;',
-        zoomOutTitle: 'Zoom out',
-        name: 'zoom'
-      };
+        zoomOutText: (0, _icon.createL7Icon)('l7-icon-narrow'),
+        zoomOutTitle: 'Zoom out'
+      });
+    }
+  }, {
+    key: "setOptions",
+    value: function setOptions(newOptions) {
+      (0, _get2.default)((0, _getPrototypeOf2.default)(Zoom.prototype), "setOptions", this).call(this, newOptions);
+
+      if (this.checkUpdateOption(newOptions, ['zoomInText', 'zoomInTitle', 'zoomOutText', 'zoomOutTitle'])) {
+        this.resetButtonGroup(this.container);
+      }
     }
   }, {
     key: "onAdd",
     value: function onAdd() {
-      var zoomName = 'l7-control-zoom';
-
-      var container = _l7Utils.DOM.create('div', zoomName + ' l7-bar');
+      var container = _l7Utils.DOM.create('div', 'l7-control-zoom');
 
-      this.zoomInButton = this.createButton(this.controlOption.zoomInText, this.controlOption.zoomInTitle, zoomName + '-in', container, this.zoomIn);
-      this.zoomOutButton = this.createButton(this.controlOption.zoomOutText, this.controlOption.zoomOutTitle, zoomName + '-out', container, this.zoomOut);
+      this.resetButtonGroup(container);
       this.mapsService.on('zoomend', this.updateDisabled);
       this.mapsService.on('zoomchange', this.updateDisabled);
-      this.updateDisabled();
       return container;
     }
   }, {
@@ -94,50 +132,31 @@ var Zoom = /*#__PURE__*/function (_Control) {
       return this;
     }
   }, {
-    key: "zoomIn",
-    value: function zoomIn() {
-      if (!this.disabled && this.mapsService.getZoom() < this.mapsService.getMaxZoom()) {
-        this.mapsService.zoomIn();
-      }
-    }
-  }, {
-    key: "zoomOut",
-    value: function zoomOut() {
-      if (!this.disabled && this.mapsService.getZoom() > this.mapsService.getMinZoom()) {
-        this.mapsService.zoomOut();
-      }
+    key: "resetButtonGroup",
+    value: function resetButtonGroup(container) {
+      _l7Utils.DOM.clearChildren(container);
+
+      this.zoomInButton = this.createButton(this.controlOption.zoomInText, this.controlOption.zoomInTitle, 'l7-button-control', container, this.zoomIn);
+      this.zoomOutButton = this.createButton(this.controlOption.zoomOutText, this.controlOption.zoomOutTitle, 'l7-button-control', container, this.zoomOut);
+      this.updateDisabled();
     }
   }, {
     key: "createButton",
     value: function createButton(html, tile, className, container, fn) {
-      var link = _l7Utils.DOM.create('a', className, container);
+      var link = _l7Utils.DOM.create('button', className, container);
+
+      if (typeof html === 'string') {
+        link.innerHTML = html;
+      } else {
+        link.append(html);
+      }
 
-      link.innerHTML = html;
       link.title = tile;
-      link.href = 'javascript:void(0)';
       link.addEventListener('click', fn);
       return link;
     }
-  }, {
-    key: "updateDisabled",
-    value: function updateDisabled() {
-      var mapsService = this.mapsService;
-      var className = 'l7-disabled';
-
-      _l7Utils.DOM.removeClass(this.zoomInButton, className);
-
-      _l7Utils.DOM.removeClass(this.zoomOutButton, className);
-
-      if (this.disabled || mapsService.getZoom() <= mapsService.getMinZoom()) {
-        _l7Utils.DOM.addClass(this.zoomOutButton, className);
-      }
-
-      if (this.disabled || mapsService.getZoom() >= mapsService.getMaxZoom()) {
-        _l7Utils.DOM.addClass(this.zoomInButton, className);
-      }
-    }
   }]);
   return Zoom;
-}(_BaseControl.default);
+}(_baseControl.Control);
 
-exports.default = Zoom;
+exports.default = exports.Zoom = Zoom;

package/lib/css/button.less

@@ -0,0 +1,70 @@
+@import 'variables.less';
+
+.l7-button-control {
+  min-width: @l7-btn-control-size;
+  height: @l7-btn-control-size;
+  background-color: @l7-control-bg-color;
+  border-width: 0;
+  border-radius: @l7-btn-control-border-radius;
+  outline: 0;
+  cursor: pointer;
+  transition: all 0.2s;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  padding: 0 ((@l7-btn-control-size - @l7-btn-icon-size) / 2);
+  box-shadow: @l7-control-shadow;
+  line-height: 16px;
+
+  .l7-iconfont {
+    fill: @l7-control-font-color;
+    color: @l7-control-font-color;
+    width: @l7-btn-icon-size;
+    height: @l7-btn-icon-size;
+  }
+
+  &.l7-button-control--row {
+    padding: 0 16px 0 13px;
+
+    * + .l7-button-control__text {
+      margin-left: 8px;
+    }
+  }
+
+  &.l7-button-control--column {
+    height: @l7-btn-column-height;
+    flex-direction: column;
+    .l7-iconfont {
+      margin-top: 3px;
+    }
+    .l7-button-control__text {
+      margin-top: 3px;
+      font-size: 10px;
+      transform: scale(0.83333);
+    }
+  }
+
+  &:not(:disabled) {
+    &:hover {
+      background-color: @l7-btn-control-bg-hover-color;
+    }
+    &:active {
+      background-color: @l7-btn-control-bg-active-color;
+    }
+  }
+  &:disabled {
+    background-color: @l7-btn-control-disabled-bg-color;
+    color: @l7-btn-control-disabled-font-color;
+    cursor: not-allowed;
+    .l7-iconfont {
+      fill: @l7-btn-control-disabled-font-color;
+      color: @l7-btn-control-disabled-font-color;
+    }
+    &:hover {
+      background-color: @l7-btn-control-disabled-bg-color;
+    }
+    &:active {
+      background-color: @l7-btn-control-disabled-bg-color;
+    }
+  }
+}

package/lib/css/control.less

@@ -0,0 +1,71 @@
+@import 'variables.less';
+
+.l7-control-container {
+  font: 12px/1.5 'Helvetica Neue', Arial, Helvetica, sans-serif;
+
+  .l7-control {
+    position: relative;
+    z-index: 800;
+    float: left;
+    clear: both;
+    color: @l7-control-font-color;
+    font-size: @l7-control-font-size;
+    pointer-events: visiblePainted; /* IE 9-10 doesn't have auto */
+    pointer-events: auto;
+
+    &.l7-control--hide {
+      display: none;
+    }
+  }
+
+  each(@position-list,{
+    .l7-@{value} {
+        @{value}: 0;
+      display: flex;
+      position: absolute;
+      z-index: 1000;
+      pointer-events: none;
+      .l7-control:not(.l7-control--hide) {
+        margin-@{value}: @l7-control-space;
+      }
+    }
+  });
+
+  .l7-center {
+    position: absolute;
+    display: flex;
+    justify-content: center;
+    &.l7-top,
+    &.l7-bottom {
+      width: 100%;
+    }
+    &.l7-left,
+    &.l7-right {
+      height: 100%;
+    }
+    .l7-control {
+      margin-right: @l7-control-space;
+      margin-bottom: @l7-control-space;
+    }
+  }
+
+  .l7-row {
+    flex-direction: row;
+    &.l7-top {
+      align-items: flex-start;
+    }
+    &.l7-bottom {
+      align-items: flex-end;
+    }
+  }
+
+  .l7-column {
+    flex-direction: column;
+    &.l7-left {
+      align-items: flex-start;
+    }
+    &.l7-right {
+      align-items: flex-end;
+    }
+  }
+}