@easyv/charts 1.6.9 → 1.6.10

package/lib/components/Chart.js

@@ -1,95 +1,77 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
 var _typeof = require("@babel/runtime/helpers/typeof");
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports["default"] = void 0;
-
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
-
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
-
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
-
 var _react = _interopRequireWildcard(require("react"));
-
 var _context = require("../context");
-
 var _ = require(".");
-
 var _d3v = require("d3v7");
-
 var _excluded = ["id", "type", "config", "config", "data", "onRelative", "emit", "emitEvent"];
-
-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); }
-
-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; }
-
+/**
+ * 总入口，通过外面传进来的type来确定渲染哪种图表，饼环图表为“pie”，否则为轴类图表
+ */
+function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
+function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { "default": e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n["default"] = e, t && t.set(e, n), n; }
 var getCallbackData = function getCallbackData(action, callbacks, data) {
   var callbackData = {};
-
   if (callbacks && Array.isArray(callbacks) && callbacks.length && data) {
     callbacks.forEach(function (_ref) {
       var origin = _ref.origin,
-          target = _ref.target,
-          _action = _ref.actions;
-
+        target = _ref.target,
+        _action = _ref.actions;
       if (action === _action) {
         callbackData[target] = data[origin];
       }
     });
   }
-
   return callbackData;
 };
-
 var Chart = /*#__PURE__*/(0, _react.memo)(function (_ref2) {
   var id = _ref2.id,
-      type = _ref2.type,
-      config = _ref2.config,
-      _ref2$config = _ref2.config,
-      axes = _ref2$config.axes,
-      _ref2$config$chart = _ref2$config.chart,
-      _ref2$config$chart$di = _ref2$config$chart.dimension.chartDimension,
-      height = _ref2$config$chart$di.height,
-      width = _ref2$config$chart$di.width,
-      _ref2$config$chart$ma = _ref2$config$chart.margin,
-      marginRight = _ref2$config$chart$ma.marginRight,
-      marginLeft = _ref2$config$chart$ma.marginLeft,
-      marginBottom = _ref2$config$chart$ma.marginBottom,
-      marginTop = _ref2$config$chart$ma.marginTop,
-      interaction = _ref2$config.interaction,
-      originData = _ref2.data,
-      onRelative = _ref2.onRelative,
-      emit = _ref2.emit,
-      emitEvent = _ref2.emitEvent,
-      props = (0, _objectWithoutProperties2["default"])(_ref2, _excluded);
+    type = _ref2.type,
+    config = _ref2.config,
+    _ref2$config = _ref2.config,
+    axes = _ref2$config.axes,
+    _ref2$config$chart = _ref2$config.chart,
+    _ref2$config$chart$di = _ref2$config$chart.dimension.chartDimension,
+    height = _ref2$config$chart$di.height,
+    width = _ref2$config$chart$di.width,
+    _ref2$config$chart$ma = _ref2$config$chart.margin,
+    marginRight = _ref2$config$chart$ma.marginRight,
+    marginLeft = _ref2$config$chart$ma.marginLeft,
+    marginBottom = _ref2$config$chart$ma.marginBottom,
+    marginTop = _ref2$config$chart$ma.marginTop,
+    interaction = _ref2$config.interaction,
+    originData = _ref2.data,
+    onRelative = _ref2.onRelative,
+    emit = _ref2.emit,
+    emitEvent = _ref2.emitEvent,
+    props = (0, _objectWithoutProperties2["default"])(_ref2, _excluded);
   var isIOS = (0, _react.useRef)(/iPad|iPhone|iPod|iOS|CriOS/i.test(navigator.userAgent));
   var svg = /*#__PURE__*/(0, _react.createRef)();
   var chartWidth = width - marginLeft - marginRight;
   var chartHeight = height - marginTop - marginBottom;
-
   var _useState = (0, _react.useState)(true),
-      _useState2 = (0, _slicedToArray2["default"])(_useState, 2),
-      active = _useState2[0],
-      setActive = _useState2[1];
-
+    _useState2 = (0, _slicedToArray2["default"])(_useState, 2),
+    active = _useState2[0],
+    setActive = _useState2[1];
   var scaleRef = (0, _react.useRef)([1, 1]);
   var triggerOnRelative = (0, _react.useCallback)(function (action, data) {
     if (!interaction) return;
     var callbacks = interaction.callbacks,
-        remoteControls = interaction.remoteControls;
+      remoteControls = interaction.remoteControls;
     var callbackData = getCallbackData(action, callbacks, data);
-
     if (JSON.stringify(callbackData) != "{}") {
       onRelative && onRelative(id, callbackData);
       remoteControls && emitEvent && remoteControls.forEach(function (o) {
         var control = JSON.parse(o.control);
-
         if (control.screen && control.type && control.type === 'callback') {
           emitEvent({
             screen: control.screen,
@@ -121,16 +103,13 @@ var Chart = /*#__PURE__*/(0, _react.memo)(function (_ref2) {
   }, [id, chartWidth, chartHeight, triggerOnRelative, svg, onEmit]);
   (0, _react.useEffect)(function () {
     var isAnimation = window.screenConfig ? window.screenConfig.isAnimation : true; //大屏的全局设置是否允许开启动画，false为不允许
-
     if (!isAnimation) setActive(false);
-
     var activeHandler = function activeHandler(e) {
       var _e$dynamicData = e.dynamicData,
-          dynamicData = _e$dynamicData === void 0 ? true : _e$dynamicData; // console.log("当前组件（id="+id+"）状态：",dynamicData?"唤醒":"休眠");
-
+        dynamicData = _e$dynamicData === void 0 ? true : _e$dynamicData;
+      // console.log("当前组件（id="+id+"）状态：",dynamicData?"唤醒":"休眠");
       isAnimation && setActive(dynamicData);
     };
-
     getScreenScale();
     document.addEventListener("switchActive_".concat(id), activeHandler);
     document.addEventListener("resize", getScreenScale);
@@ -139,7 +118,8 @@ var Chart = /*#__PURE__*/(0, _react.memo)(function (_ref2) {
       document.removeEventListener("resize", getScreenScale);
     };
   }, []);
-  var data = originData; //对轴类图表进行自动排序
+  var data = originData;
+  //对轴类图表进行自动排序
   // if(axes){
   //   const xAxis = axes.find(d=>d.axisType=="x");
   //   if(xAxis){
@@ -165,13 +145,12 @@ var Chart = /*#__PURE__*/(0, _react.memo)(function (_ref2) {
     config: config,
     data: data,
     active: active
-  }, props))); //获取大屏缩放系数
-
+  }, props)));
+  //获取大屏缩放系数
   function getScreenScale() {
     setTimeout(function () {
       //获取大屏缩放系数
       var dom = document.getElementById("bigscreen-container") || document.getElementById("m-simulator");
-
       if (dom) {
         var transform = dom.style.transform;
         var scale = transform ? transform.match(/^scale\((.+)\)$/)[1] : "1,1";
@@ -181,5 +160,4 @@ var Chart = /*#__PURE__*/(0, _react.memo)(function (_ref2) {
     }, 50);
   }
 });
-var _default = Chart;
-exports["default"] = _default;
+var _default = exports["default"] = Chart;

package/lib/components/ChartContainer.js

@@ -1,45 +1,37 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
 var _typeof = require("@babel/runtime/helpers/typeof");
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports["default"] = void 0;
-
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-
 var _react = _interopRequireWildcard(require("react"));
-
-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); }
-
-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; }
-
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); 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 = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2["default"])(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
-
+function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
+function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { "default": e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n["default"] = e, t && t.set(e, n), n; }
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2["default"])(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; } /**
+ * svg外框
+ */
 var event = function event() {};
-
-var _default = /*#__PURE__*/(0, _react.memo)( /*#__PURE__*/(0, _react.forwardRef)(function (_ref, ref) {
+var _default = exports["default"] = /*#__PURE__*/(0, _react.memo)( /*#__PURE__*/(0, _react.forwardRef)(function (_ref, ref) {
   var width = _ref.width,
-      height = _ref.height,
-      marginLeft = _ref.marginLeft,
-      marginTop = _ref.marginTop,
-      style = _ref.style,
-      children = _ref.children,
-      _ref$onMouseEnter = _ref.onMouseEnter,
-      onMouseEnter = _ref$onMouseEnter === void 0 ? event : _ref$onMouseEnter,
-      _ref$onMouseLeave = _ref.onMouseLeave,
-      onMouseLeave = _ref$onMouseLeave === void 0 ? event : _ref$onMouseLeave,
-      _ref$onClick = _ref.onClick,
-      onClick = _ref$onClick === void 0 ? event : _ref$onClick,
-      _ref$onMouseMove = _ref.onMouseMove,
-      onMouseMove = _ref$onMouseMove === void 0 ? event : _ref$onMouseMove,
-      _ref$onMouseOut = _ref.onMouseOut,
-      onMouseOut = _ref$onMouseOut === void 0 ? event : _ref$onMouseOut;
+    height = _ref.height,
+    marginLeft = _ref.marginLeft,
+    marginTop = _ref.marginTop,
+    style = _ref.style,
+    children = _ref.children,
+    _ref$onMouseEnter = _ref.onMouseEnter,
+    onMouseEnter = _ref$onMouseEnter === void 0 ? event : _ref$onMouseEnter,
+    _ref$onMouseLeave = _ref.onMouseLeave,
+    onMouseLeave = _ref$onMouseLeave === void 0 ? event : _ref$onMouseLeave,
+    _ref$onClick = _ref.onClick,
+    onClick = _ref$onClick === void 0 ? event : _ref$onClick,
+    _ref$onMouseMove = _ref.onMouseMove,
+    onMouseMove = _ref$onMouseMove === void 0 ? event : _ref$onMouseMove,
+    _ref$onMouseOut = _ref.onMouseOut,
+    onMouseOut = _ref$onMouseOut === void 0 ? event : _ref$onMouseOut;
   return /*#__PURE__*/_react["default"].createElement("svg", {
     className: "__easyv-svg",
     width: width,
@@ -59,6 +51,4 @@ var _default = /*#__PURE__*/(0, _react.memo)( /*#__PURE__*/(0, _react.forwardRef
   }, /*#__PURE__*/_react["default"].createElement("g", {
     transform: "translate(" + marginLeft + ", " + marginTop + ")"
   }, children));
-}));
-
-exports["default"] = _default;
+}));

package/lib/components/ConicalGradient.js

@@ -1,72 +1,56 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
 var _typeof = require("@babel/runtime/helpers/typeof");
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports["default"] = void 0;
-
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
-
 var _react = _interopRequireWildcard(require("react"));
-
 var _d3v = require("d3v7");
-
 var _utils = require("@easyv/utils/lib/common/utils");
-
 var _indexModule = _interopRequireDefault(require("../css/index.module.css"));
-
-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); }
-
-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; }
-
+function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
+function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { "default": e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n["default"] = e, t && t.set(e, n), n; }
 /**
  * 饼图装饰内圈
  */
-var _default = function _default(_ref) {
+var _default = exports["default"] = function _default(_ref) {
   var width = _ref.width,
-      height = _ref.height,
-      centerX = _ref.centerX,
-      centerY = _ref.centerY,
-      radius = _ref.radius,
-      _ref$config = _ref.config,
-      show = _ref$config.show,
-      innerRadius = _ref$config.innerRadius,
-      outerRadius = _ref$config.outerRadius,
-      opacity = _ref$config.opacity,
-      speed = _ref$config.speed,
-      direction = _ref$config.direction,
-      arcs = _ref.arcs;
+    height = _ref.height,
+    centerX = _ref.centerX,
+    centerY = _ref.centerY,
+    radius = _ref.radius,
+    _ref$config = _ref.config,
+    show = _ref$config.show,
+    innerRadius = _ref$config.innerRadius,
+    outerRadius = _ref$config.outerRadius,
+    opacity = _ref$config.opacity,
+    speed = _ref$config.speed,
+    direction = _ref$config.direction,
+    arcs = _ref.arcs;
   if (!show) return null;
-
   var _useState = (0, _react.useState)(null),
-      _useState2 = (0, _slicedToArray2["default"])(_useState, 2),
-      canvas = _useState2[0],
-      setCanvas = _useState2[1];
-
+    _useState2 = (0, _slicedToArray2["default"])(_useState, 2),
+    canvas = _useState2[0],
+    setCanvas = _useState2[1];
   (0, _react.useEffect)(function () {
     if (arcs && arcs.length > 0 && canvas && canvas.getContext('2d')) {
       var _radius = radius * devicePixelRatio;
-
       var context = canvas.getContext('2d');
       context.clearRect(0, 0, width * devicePixelRatio, height * devicePixelRatio);
       context.save();
       context.translate(centerX * devicePixelRatio, centerY * devicePixelRatio);
       context.beginPath();
-
-      var _arc = (0, _d3v.arc)().innerRadius(innerRadius * _radius).outerRadius(outerRadius * _radius) // .padAngle(axis.pole.padAngle)
+      var _arc = (0, _d3v.arc)().innerRadius(innerRadius * _radius).outerRadius(outerRadius * _radius)
+      // .padAngle(axis.pole.padAngle)
       // .cornerRadius(axis.pole.cornerRadius)
       .context(context);
-
       arcs.forEach(function (element) {
         var startAngle = element.arc.startAngle()();
         var endAngle = element.arc.endAngle()();
-
         _arc.startAngle(startAngle).endAngle(endAngle)();
-
         context.fillStyle = 'rgba(255, 255, 255, 0)';
         context.fill();
       });
@@ -75,20 +59,18 @@ var _default = function _default(_ref) {
       var conic = new ConicalGradient();
       arcs.reduce(function (reduced, _ref2) {
         var percent = _ref2.percent,
-            _ref2$series$color = _ref2.series.color,
-            type = _ref2$series$color.type,
-            pure = _ref2$series$color.pure,
-            stops = _ref2$series$color.linear.stops;
+          _ref2$series$color = _ref2.series.color,
+          type = _ref2$series$color.type,
+          pure = _ref2$series$color.pure,
+          stops = _ref2$series$color.linear.stops;
         var result = reduced + percent / 100;
         var color = type == 'pure' ? pure : stops[0].color;
-
         if (!!color) {
           var _converColor = (0, _utils.converColor)(color, 1),
-              r = _converColor.r,
-              g = _converColor.g,
-              b = _converColor.b,
-              a = _converColor.a;
-
+            r = _converColor.r,
+            g = _converColor.g,
+            b = _converColor.b,
+            a = _converColor.a;
           conic.addColorStop(reduced, {
             r: r,
             g: g,
@@ -102,7 +84,6 @@ var _default = function _default(_ref) {
             a: a
           });
         }
-
         return result;
       }, 0);
       conic.fill(context, 0, 0, _radius, 0, 2 * Math.PI, false);
@@ -130,15 +111,10 @@ var _default = function _default(_ref) {
 /**
  * ConicalGradient
  */
-
-
-exports["default"] = _default;
-
 function ConicalGradient() {
   this._offsets = [];
   this._colors = [];
 }
-
 ConicalGradient.prototype = {
   /**
    * addColorStop
@@ -148,19 +124,15 @@ ConicalGradient.prototype = {
    */
   addColorStop: function addColorStop(offset, color) {
     this._offsets.push(offset);
-
     this._colors.push(color);
-
     return this;
   },
-
   /**
    * _offsetsReverse (array.forEach callback)
    */
   _offsetsReverse: function _offsetsReverse(offset, index, array) {
     array[index] = 1 - offset;
   },
-
   /**
    * fill
    *
@@ -181,7 +153,6 @@ ConicalGradient.prototype = {
     startAngle %= TWO_PI;
     if (endAngle < 0) endAngle = endAngle % TWO_PI + TWO_PI;
     endAngle %= TWO_PI;
-
     if (anticlockwise) {
       // 逆时针
       var swap = startAngle;
@@ -191,11 +162,9 @@ ConicalGradient.prototype = {
       offsets.reverse();
       offsets.forEach(this._offsetsReverse);
     }
-
     if (startAngle > endAngle || Math.abs(endAngle - startAngle) < 0.0001) {
       endAngle += TWO_PI;
     }
-
     var colorsLength = colors.length;
     var currentColorIndex = 0;
     var currentColor = colors[currentColorIndex];
@@ -208,22 +177,21 @@ ConicalGradient.prototype = {
     var arcStartAngle = startAngle;
     var arcEndAngle;
     var r1 = currentColor.r,
-        g1 = currentColor.g,
-        b1 = currentColor.b,
-        a1 = currentColor.a,
-        r2 = nextColor.r,
-        g2 = nextColor.g,
-        b2 = nextColor.b,
-        a2 = nextColor.a;
+      g1 = currentColor.g,
+      b1 = currentColor.b,
+      a1 = currentColor.a,
+      r2 = nextColor.r,
+      g2 = nextColor.g,
+      b2 = nextColor.b,
+      a2 = nextColor.a;
     if (!a1 && a1 !== 0) a1 = 1;
     if (!a2 && a2 !== 0) a2 = 1;
     var rd = r2 - r1,
-        gd = g2 - g1,
-        bd = b2 - b1,
-        ad = a2 - a1;
+      gd = g2 - g1,
+      bd = b2 - b1,
+      ad = a2 - a1;
     var t, r, g, b, a;
     context.save();
-
     for (var i = 0, n = 1 / totalAngleDeg; i < 1; i += n) {
       if (i >= currentOffset) {
         currentColorIndex++;
@@ -252,7 +220,6 @@ ConicalGradient.prototype = {
         currentOffset = offsets[currentColorIndex];
         offsetDist = currentOffset - prevOffset;
       }
-
       t = (i - prevOffset) / offsetDist;
       r = rd * t + r1 & 255;
       g = gd * t + g1 & 255;
@@ -267,7 +234,6 @@ ConicalGradient.prototype = {
       context.fill();
       arcStartAngle += stepAngleRad;
     }
-
     context.restore();
     return this;
   }