@easyv/charts 1.6.7 → 1.6.8

package/lib/components/CartesianChart.js

@@ -102,18 +102,22 @@ var Chart = /*#__PURE__*/(0, _react.memo)(function (_ref) {
   var controlBarWidth = 0;
   var dragPercent = 1;
   var controlHeight = 0;
+  var controlX = 0;
 
   if (control) {
     var _height = control.height,
         _control$margin = control.margin,
         left = _control$margin.left,
         right = _control$margin.right,
-        dragWidth = control.drag.width;
+        _control$drag = control.drag,
+        start = _control$drag.start,
+        dragWidth = _control$drag.width;
     isControl = true;
     controlHeight = _height;
     controlWidth = width - left - right;
     dragPercent = dragWidth / 100;
     controlBarWidth = controlWidth * dragPercent;
+    controlX = (controlWidth - controlBarWidth) * start / 100;
   }
 
   var _useState3 = (0, _react.useState)({
@@ -122,7 +126,7 @@ var Chart = /*#__PURE__*/(0, _react.memo)(function (_ref) {
     cHeight: controlHeight,
     cBarWidth: controlBarWidth,
     cPercent: dragPercent,
-    cBarX: 0
+    cBarX: controlX
   }),
       _useState4 = (0, _slicedToArray2["default"])(_useState3, 2),
       controlInfo = _useState4[0],
@@ -141,7 +145,7 @@ var Chart = /*#__PURE__*/(0, _react.memo)(function (_ref) {
       cHeight: controlHeight,
       cBarWidth: controlBarWidth,
       cPercent: dragPercent,
-      cBarX: 0
+      cBarX: controlX
     });
   }, [JSON.stringify(control)]);
   var svg = (0, _react.useRef)();

package/lib/utils/index.js

@@ -216,7 +216,6 @@ var getTicksOfAxis = function getTicksOfAxis(domain, ticksCount, showLast) {
       return i % step === 0;
     });
   } else {
-    console.log("noLast");
     ticksArr = domain.filter(function (d, i) {
       return i % (step + 1) === 0;
     });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@easyv/charts",
-  "version": "1.6.7",
+  "version": "1.6.8",
   "description": "",
   "main": "lib/index.js",
   "scripts": {

package/src/components/CartesianChart.js

@@ -83,15 +83,17 @@ const Chart = memo(
     let controlBarWidth = 0;
     let dragPercent = 1;
     let controlHeight = 0;
+    let controlX = 0;
     if(control){
-      const { height, margin:{ left, right }, drag:{ width:dragWidth } } = control;
+      const { height, margin:{ left, right }, drag:{ start, width:dragWidth } } = control;
       isControl = true;
       controlHeight = height;
       controlWidth = width-left-right;
       dragPercent = dragWidth/100;
       controlBarWidth = controlWidth*dragPercent;
+      controlX = (controlWidth-controlBarWidth)*start/100
     }
-    const [controlInfo, setControlInfo] = useState({ isC:isControl, cWidth:controlWidth, cHeight:controlHeight, cBarWidth:controlBarWidth, cPercent:dragPercent, cBarX:0 });
+    const [controlInfo, setControlInfo] = useState({ isC:isControl, cWidth:controlWidth, cHeight:controlHeight, cBarWidth:controlBarWidth, cPercent:dragPercent, cBarX:controlX });
     const { cWidth, cHeight, cBarWidth, cPercent, cBarX } = controlInfo;
     yLineRange -=  cHeight;
     useEffect(()=>{
@@ -101,7 +103,7 @@ const Chart = memo(
         cHeight:controlHeight, 
         cBarWidth:controlBarWidth, 
         cPercent:dragPercent,
-        cBarX:0
+        cBarX:controlX
       });
     },[JSON.stringify(control)]);
 

package/src/utils/index.js

@@ -172,7 +172,6 @@ const getTicksOfAxis = (domain, ticksCount, showLast) => {
       return i % step === 0;
     });
   }else{
-    console.log("noLast")
     ticksArr = domain.filter(function (d, i) {
       return i % (step + 1) === 0;
     });