@easyv/charts 1.2.0 → 1.2.1

package/lib/hooks/useAxes.js

@@ -1,136 +1,136 @@
-"use strict";
-
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports["default"] = void 0;
-
-var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-
-var _react = require("react");
-
-var _d3Scale = require("d3-scale");
-
-var _utils = require("../utils");
-
-var _utils2 = require("@easyv/utils/lib/common/utils");
-
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); keys.push.apply(keys, symbols); } return keys; }
-
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { (0, _defineProperty2["default"])(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
-
-var scales = {
-  linear: _d3Scale.scaleLinear,
-  log: _d3Scale.scaleLog,
-  time: _d3Scale.scaleTime,
-  utc: _d3Scale.scaleUtc,
-  ordinal: _utils.band
-};
-/**
- * x/y/z轴
- * @param {Array} axes 轴列表数组
- * @param {Object} context 其中需要包括
- * @returns {Map} 返回所有轴
- */
-
-var _default = function _default(_ref) {
-  var axes = _ref.axes,
-      _ref$context = _ref.context,
-      width = _ref$context.width,
-      height = _ref$context.height;
-
-  var _axes = (0, _react.useMemo)(function () {
-    var tmp = new Map();
-    var xAxisPositions = [];
-    axes.forEach(function (item) {
-      var _item$config$label$sh = item.config.label.showLast,
-          showLast = _item$config$label$sh === void 0 ? false : _item$config$label$sh,
-          type = item.type,
-          orientation = item.orientation,
-          ticks = item.ticks,
-          _item$tickCount = item.tickCount,
-          tickCount = _item$tickCount === void 0 ? 1 : _item$tickCount,
-          _item$step = item.step,
-          step = _item$step === void 0 ? 1 : _item$step,
-          domain = item.domain,
-          axisType = item.axisType,
-          _item$paddingOuter = item.paddingOuter,
-          paddingOuter = _item$paddingOuter === void 0 ? 0 : _item$paddingOuter,
-          auto = item.auto,
-          mode = item.mode,
-          carousel = item.carousel,
-          config = item.config;
-      var direction = orientation === 'top' || orientation === 'bottom' ? 'horizontal' : orientation === 'left' || orientation === 'right' ? 'vertical' : '';
-      var length = direction === 'horizontal' ? width : direction === 'vertical' ? height : 0;
-
-      var _paddingOuter = paddingOuter * length;
-
-      var start = _paddingOuter / 2;
-      var end = length - start;
-      var range = direction === 'horizontal' ? [start, end] : direction === 'vertical' ? [end, start] : [0, 0];
-      var scaler = scales[type]().domain(domain).range(range);
-      scaler.type = type;
-      if (type !== 'ordinal') scaler.nice().clamp(true);
-      var allTicks = ticks ? ticks : scaler.ticks ? scaler.ticks(tickCount) : scaler.domain();
-      var _ticks = allTicks;
-
-      if (type === 'ordinal') {
-        if (carousel === false) {
-          _ticks = (0, _utils.getTicksOfAxis)(_ticks, +tickCount, showLast);
-        }
-      } else {
-        if (auto === false) {
-          switch (mode) {
-            case 'count':
-              _ticks = (0, _utils2.getYTicks)(_ticks[_ticks.length - 1], _ticks[0], +tickCount);
-              break;
-
-            case 'step':
-              _ticks = (0, _utils2.getYTicksByStep)(_ticks[_ticks.length - 1], _ticks[0], +step);
-              break;
-          }
-        }
-      }
-
-      var lengthWithoutPaddingOuter = length - _paddingOuter;
-
-      if (type == 'linear' && config.on) {
-        var zeroPosition = scaler(0);
-
-        if (zeroPosition !== range[0]) {
-          if (direction === 'horizontal') {
-            xAxisPositions.push({
-              x: zeroPosition,
-              y: 0
-            });
-          } else if (direction === 'vertical') {
-            xAxisPositions.push({
-              x: 0,
-              y: zeroPosition
-            });
-          }
-        }
-      }
-
-      tmp.set(axisType, _objectSpread(_objectSpread({}, item), {}, {
-        scaler: scaler,
-        length: length,
-        direction: direction,
-        start: start,
-        end: end,
-        lengthWithoutPaddingOuter: lengthWithoutPaddingOuter,
-        step: lengthWithoutPaddingOuter / allTicks.length,
-        allTicks: allTicks,
-        ticks: _ticks
-      }));
-    });
-    tmp.get('x') && (tmp.get('x').positions = xAxisPositions);
-    return tmp;
-  }, [axes]);
-
-  return _axes;
-};
-
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports["default"] = void 0;
+
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+
+var _react = require("react");
+
+var _d3Scale = require("d3-scale");
+
+var _utils = require("../utils");
+
+var _utils2 = require("@easyv/utils/lib/common/utils");
+
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); keys.push.apply(keys, symbols); } return keys; }
+
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { (0, _defineProperty2["default"])(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+
+var scales = {
+  linear: _d3Scale.scaleLinear,
+  log: _d3Scale.scaleLog,
+  time: _d3Scale.scaleTime,
+  utc: _d3Scale.scaleUtc,
+  ordinal: _utils.band
+};
+/**
+ * x/y/z轴
+ * @param {Array} axes 轴列表数组
+ * @param {Object} context 其中需要包括
+ * @returns {Map} 返回所有轴
+ */
+
+var _default = function _default(_ref) {
+  var axes = _ref.axes,
+      _ref$context = _ref.context,
+      width = _ref$context.width,
+      height = _ref$context.height;
+
+  var _axes = (0, _react.useMemo)(function () {
+    var tmp = new Map();
+    var xAxisPositions = [];
+    axes.forEach(function (item) {
+      var _item$config$label$sh = item.config.label.showLast,
+          showLast = _item$config$label$sh === void 0 ? false : _item$config$label$sh,
+          type = item.type,
+          orientation = item.orientation,
+          ticks = item.ticks,
+          _item$tickCount = item.tickCount,
+          tickCount = _item$tickCount === void 0 ? 1 : _item$tickCount,
+          _item$step = item.step,
+          step = _item$step === void 0 ? 1 : _item$step,
+          domain = item.domain,
+          axisType = item.axisType,
+          _item$paddingOuter = item.paddingOuter,
+          paddingOuter = _item$paddingOuter === void 0 ? 0 : _item$paddingOuter,
+          auto = item.auto,
+          mode = item.mode,
+          carousel = item.carousel,
+          config = item.config;
+      var direction = orientation === 'top' || orientation === 'bottom' ? 'horizontal' : orientation === 'left' || orientation === 'right' ? 'vertical' : '';
+      var length = direction === 'horizontal' ? width : direction === 'vertical' ? height : 0;
+
+      var _paddingOuter = paddingOuter * length;
+
+      var start = _paddingOuter / 2;
+      var end = length - start;
+      var range = direction === 'horizontal' ? [start, end] : direction === 'vertical' ? [end, start] : [0, 0];
+      var scaler = scales[type]().domain(domain).range(range);
+      scaler.type = type;
+      if (type !== 'ordinal') scaler.nice().clamp(true);
+      var allTicks = ticks ? ticks : scaler.ticks ? scaler.ticks(tickCount) : scaler.domain();
+      var _ticks = allTicks;
+
+      if (type === 'ordinal') {
+        if (carousel === false) {
+          _ticks = (0, _utils.getTicksOfAxis)(_ticks, +tickCount, showLast);
+        }
+      } else {
+        if (auto === false) {
+          switch (mode) {
+            case 'count':
+              _ticks = (0, _utils2.getYTicks)(_ticks[_ticks.length - 1], _ticks[0], +tickCount);
+              break;
+
+            case 'step':
+              _ticks = (0, _utils2.getYTicksByStep)(_ticks[_ticks.length - 1], _ticks[0], +step);
+              break;
+          }
+        }
+      }
+
+      var lengthWithoutPaddingOuter = length - _paddingOuter;
+
+      if (type == 'linear' && config.on) {
+        var zeroPosition = scaler(0);
+
+        if (zeroPosition !== range[0]) {
+          if (direction === 'horizontal') {
+            xAxisPositions.push({
+              x: zeroPosition,
+              y: 0
+            });
+          } else if (direction === 'vertical') {
+            xAxisPositions.push({
+              x: 0,
+              y: zeroPosition
+            });
+          }
+        }
+      }
+
+      tmp.set(axisType, _objectSpread(_objectSpread({}, item), {}, {
+        scaler: scaler,
+        length: length,
+        direction: direction,
+        start: start,
+        end: end,
+        lengthWithoutPaddingOuter: lengthWithoutPaddingOuter,
+        step: lengthWithoutPaddingOuter / allTicks.length,
+        allTicks: allTicks,
+        ticks: _ticks
+      }));
+    });
+    tmp.get('x') && (tmp.get('x').positions = xAxisPositions);
+    return tmp;
+  }, [axes]);
+
+  return _axes;
+};
+
 exports["default"] = _default;

package/lib/hooks/useCarouselAxisX.js

@@ -1,185 +1,185 @@
-"use strict";
-
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports["default"] = void 0;
-
-var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-
-var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
-
-var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
-
-var _react = require("react");
-
-var _popmotion = require("popmotion");
-
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); keys.push.apply(keys, symbols); } return keys; }
-
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { (0, _defineProperty2["default"])(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
-
-var initialState = {
-  currentIndex: null,
-  flag: false
-};
-/**
- * x轴滚动逻辑
- * @param {Object} axis x轴配置项
- * @param {Object} config x轴轮播动画的配置项
- * @returns {Map} 返回经过改变后的x轴，主要是ticks和scaler的range发生了改变
- */
-
-var _default = function _default(axis, config) {
-  var show = config.show,
-      interval = config.interval,
-      duration = config.duration;
-  var time = duration + interval;
-  var tickCount = axis.tickCount,
-      allTicks = axis.allTicks,
-      scaler = axis.scaler,
-      start = axis.start,
-      end = axis.end,
-      step = axis.step,
-      ticks = axis.ticks,
-      lengthWithoutPaddingOuter = axis.lengthWithoutPaddingOuter;
-  var tickLength = ticks.length;
-
-  var _useState = (0, _react.useState)({
-    scaler: scaler,
-    step: step,
-    ticks: ticks
-  }),
-      _useState2 = (0, _slicedToArray2["default"])(_useState, 2),
-      state = _useState2[0],
-      setState = _useState2[1];
-
-  var _useState3 = (0, _react.useState)(initialState),
-      _useState4 = (0, _slicedToArray2["default"])(_useState3, 2),
-      status = _useState4[0],
-      setStatus = _useState4[1];
-
-  (0, _react.useEffect)(function () {
-    var handler;
-
-    if (show && time && tickLength > tickCount) {
-      setStatus({
-        currentIndex: 0,
-        flag: true
-      });
-      handler = setInterval(function () {
-        setStatus(function (_ref) {
-          var currentIndex = _ref.currentIndex;
-          var tmp = +currentIndex + 1;
-          return {
-            currentIndex: tmp >= tickLength ? 0 : tmp,
-            flag: false
-          };
-        });
-      }, time * 1000);
-    } else {
-      setStatus(initialState);
-    }
-
-    return function () {
-      handler && clearInterval(handler);
-    };
-  }, [show, time, tickCount, tickLength]);
-  (0, _react.useEffect)(function () {
-    var animation;
-    var currentIndex = status.currentIndex,
-        flag = status.flag;
-
-    if (currentIndex !== null) {
-      var _step = lengthWithoutPaddingOuter / tickCount;
-
-      if (flag) {
-        var _ticks = allTicks.slice(currentIndex, tickCount);
-
-        setState({
-          step: _step,
-          ticks: _ticks,
-          scaler: scaler.copy().domain(_ticks).range([start, end])
-        });
-      } else {
-        animation = (0, _popmotion.animate)({
-          from: 0,
-          to: -1,
-          duration: duration * 1000,
-          ease: _popmotion.linear,
-          onPlay: function onPlay() {
-            setState(function (axis) {
-              var ticks = axis.ticks,
-                  scaler = axis.scaler;
-
-              var _ticks2 = (0, _slicedToArray2["default"])(ticks, 1),
-                  tick = _ticks2[0];
-
-              var _ticks = [tick].concat((0, _toConsumableArray2["default"])(getTicks(allTicks, currentIndex, tickCount)));
-
-              return _objectSpread(_objectSpread({}, axis), {}, {
-                ticks: _ticks,
-                scaler: scaler.copy().range([start, end + _step]).domain(_ticks)
-              });
-            });
-          },
-          onUpdate: function onUpdate(v) {
-            setState(function (axis) {
-              var scaler = axis.scaler,
-                  step = axis.step;
-              return _objectSpread(_objectSpread({}, axis), {}, {
-                scaler: scaler.copy().range([start + step * v, end + step + step * v])
-              });
-            });
-          },
-          onComplete: function onComplete() {
-            setState(function (axis) {
-              var scaler = axis.scaler,
-                  ticks = axis.ticks;
-
-              var _ticks = ticks.slice(1, ticks.length);
-
-              return _objectSpread(_objectSpread({}, axis), {}, {
-                ticks: _ticks,
-                scaler: scaler.copy().range([start, end]).domain(_ticks)
-              });
-            });
-          }
-        });
-      }
-    } else {
-      var _ticks3 = scaler.type == 'linear' ? scaler.domain() : allTicks;
-
-      setState({
-        step: step,
-        scaler: scaler.copy().domain(_ticks3).range([start, end]),
-        ticks: ticks
-      });
-    }
-
-    return function () {
-      animation && animation.stop();
-    };
-  }, [tickCount, allTicks, scaler, start, end, step, ticks, lengthWithoutPaddingOuter, status, duration]);
-  return _objectSpread(_objectSpread({}, axis), state);
-};
-
-exports["default"] = _default;
-
-var getTicks = function getTicks(ticks, currentIndex, length) {
-  var _currentIndex = +currentIndex;
-
-  var ticksLength = ticks.length;
-  if (ticksLength <= length) return ticks;
-  var end = _currentIndex + length;
-
-  if (ticksLength < end) {
-    var prev = ticks.slice(_currentIndex, ticksLength);
-    var next = ticks.slice(0, end - ticksLength);
-    return [].concat((0, _toConsumableArray2["default"])(prev), (0, _toConsumableArray2["default"])(next));
-  }
-
-  return ticks.slice(_currentIndex, end);
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports["default"] = void 0;
+
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+
+var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
+
+var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
+
+var _react = require("react");
+
+var _popmotion = require("popmotion");
+
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); keys.push.apply(keys, symbols); } return keys; }
+
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { (0, _defineProperty2["default"])(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+
+var initialState = {
+  currentIndex: null,
+  flag: false
+};
+/**
+ * x轴滚动逻辑
+ * @param {Object} axis x轴配置项
+ * @param {Object} config x轴轮播动画的配置项
+ * @returns {Map} 返回经过改变后的x轴，主要是ticks和scaler的range发生了改变
+ */
+
+var _default = function _default(axis, config) {
+  var show = config.show,
+      interval = config.interval,
+      duration = config.duration;
+  var time = duration + interval;
+  var tickCount = axis.tickCount,
+      allTicks = axis.allTicks,
+      scaler = axis.scaler,
+      start = axis.start,
+      end = axis.end,
+      step = axis.step,
+      ticks = axis.ticks,
+      lengthWithoutPaddingOuter = axis.lengthWithoutPaddingOuter;
+  var tickLength = ticks.length;
+
+  var _useState = (0, _react.useState)({
+    scaler: scaler,
+    step: step,
+    ticks: ticks
+  }),
+      _useState2 = (0, _slicedToArray2["default"])(_useState, 2),
+      state = _useState2[0],
+      setState = _useState2[1];
+
+  var _useState3 = (0, _react.useState)(initialState),
+      _useState4 = (0, _slicedToArray2["default"])(_useState3, 2),
+      status = _useState4[0],
+      setStatus = _useState4[1];
+
+  (0, _react.useEffect)(function () {
+    var handler;
+
+    if (show && time && tickLength > tickCount) {
+      setStatus({
+        currentIndex: 0,
+        flag: true
+      });
+      handler = setInterval(function () {
+        setStatus(function (_ref) {
+          var currentIndex = _ref.currentIndex;
+          var tmp = +currentIndex + 1;
+          return {
+            currentIndex: tmp >= tickLength ? 0 : tmp,
+            flag: false
+          };
+        });
+      }, time * 1000);
+    } else {
+      setStatus(initialState);
+    }
+
+    return function () {
+      handler && clearInterval(handler);
+    };
+  }, [show, time, tickCount, tickLength]);
+  (0, _react.useEffect)(function () {
+    var animation;
+    var currentIndex = status.currentIndex,
+        flag = status.flag;
+
+    if (currentIndex !== null) {
+      var _step = lengthWithoutPaddingOuter / tickCount;
+
+      if (flag) {
+        var _ticks = allTicks.slice(currentIndex, tickCount);
+
+        setState({
+          step: _step,
+          ticks: _ticks,
+          scaler: scaler.copy().domain(_ticks).range([start, end])
+        });
+      } else {
+        animation = (0, _popmotion.animate)({
+          from: 0,
+          to: -1,
+          duration: duration * 1000,
+          ease: _popmotion.linear,
+          onPlay: function onPlay() {
+            setState(function (axis) {
+              var ticks = axis.ticks,
+                  scaler = axis.scaler;
+
+              var _ticks2 = (0, _slicedToArray2["default"])(ticks, 1),
+                  tick = _ticks2[0];
+
+              var _ticks = [tick].concat((0, _toConsumableArray2["default"])(getTicks(allTicks, currentIndex, tickCount)));
+
+              return _objectSpread(_objectSpread({}, axis), {}, {
+                ticks: _ticks,
+                scaler: scaler.copy().range([start, end + _step]).domain(_ticks)
+              });
+            });
+          },
+          onUpdate: function onUpdate(v) {
+            setState(function (axis) {
+              var scaler = axis.scaler,
+                  step = axis.step;
+              return _objectSpread(_objectSpread({}, axis), {}, {
+                scaler: scaler.copy().range([start + step * v, end + step + step * v])
+              });
+            });
+          },
+          onComplete: function onComplete() {
+            setState(function (axis) {
+              var scaler = axis.scaler,
+                  ticks = axis.ticks;
+
+              var _ticks = ticks.slice(1, ticks.length);
+
+              return _objectSpread(_objectSpread({}, axis), {}, {
+                ticks: _ticks,
+                scaler: scaler.copy().range([start, end]).domain(_ticks)
+              });
+            });
+          }
+        });
+      }
+    } else {
+      var _ticks3 = scaler.type == 'linear' ? scaler.domain() : allTicks;
+
+      setState({
+        step: step,
+        scaler: scaler.copy().domain(_ticks3).range([start, end]),
+        ticks: ticks
+      });
+    }
+
+    return function () {
+      animation && animation.stop();
+    };
+  }, [tickCount, allTicks, scaler, start, end, step, ticks, lengthWithoutPaddingOuter, status, duration]);
+  return _objectSpread(_objectSpread({}, axis), state);
+};
+
+exports["default"] = _default;
+
+var getTicks = function getTicks(ticks, currentIndex, length) {
+  var _currentIndex = +currentIndex;
+
+  var ticksLength = ticks.length;
+  if (ticksLength <= length) return ticks;
+  var end = _currentIndex + length;
+
+  if (ticksLength < end) {
+    var prev = ticks.slice(_currentIndex, ticksLength);
+    var next = ticks.slice(0, end - ticksLength);
+    return [].concat((0, _toConsumableArray2["default"])(prev), (0, _toConsumableArray2["default"])(next));
+  }
+
+  return ticks.slice(_currentIndex, end);
 };