@easyv/charts 1.3.36 → 1.3.38

package/lib/hooks/useAxes.js

@@ -110,13 +110,13 @@ var _default = function _default(_ref) {
       var range = direction === 'horizontal' ? [start, end] : direction === 'vertical' ? [end, start] : [0, 0];
       var newDomain = domain;
 
-      if (mode == "count" && type !== 'ordinal' && !isNaN(domain[1])) {
+      if (type !== 'ordinal' && !isNaN(domain[1])) {
         newDomain = getNewDomain(domain, mode, step);
       }
 
       var scaler = scales[type]().domain(newDomain).range(range);
       scaler.type = type;
-      if (type !== 'ordinal') scaler.nice().clamp(true);
+      if (type !== 'ordinal') scaler.clamp(true);
       var allTicks = ticks ? ticks : scaler.ticks ? scaler.ticks(tickCount) : scaler.domain();
       var _ticks = allTicks;
 
@@ -128,7 +128,7 @@ var _default = function _default(_ref) {
         if (auto === false) {
           switch (mode) {
             case 'count':
-              _ticks = (0, _utils2.getYTicks)(domain[1], domain[0], +tickCount);
+              _ticks = (0, _utils2.getYTicks)(newDomain[1], newDomain[0], +tickCount);
               break;
 
             case 'step':
@@ -138,6 +138,7 @@ var _default = function _default(_ref) {
         }
       }
 
+      console.log(newDomain, _ticks, allTicks);
       var lengthWithoutPaddingOuter = length - _paddingOuter;
 
       if (type == 'linear' && config.on) {

package/package.json

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

package/src/hooks/useAxes.js

@@ -20,7 +20,6 @@ const getNewDomain=(domain, mode, step)=>{
   let newDomain=[];
   let min = domain[0], max = domain[1];
   let minCount = Math.pow(10,getCount(min)), maxCount = Math.pow(10,getCount(max));
-
   switch(mode){
     case 'count':
       newDomain[0] = Math.floor(domain[0]/minCount)*minCount;
@@ -71,14 +70,13 @@ export default ({ axes, context: { width, height } }) => {
         carousel,
         config,
       } = item;
-
+      
       const direction =
         orientation === 'top' || orientation === 'bottom'
           ? 'horizontal'
           : orientation === 'left' || orientation === 'right'
             ? 'vertical'
             : '';
-
       const length =
         direction === 'horizontal'
           ? width
@@ -97,13 +95,13 @@ export default ({ axes, context: { width, height } }) => {
             ? [end, start]
             : [0, 0];
       let newDomain = domain;
-      if(mode == "count" && type !== 'ordinal' && !isNaN(domain[1])){
+      if(type !== 'ordinal' && !isNaN(domain[1])){
         newDomain = getNewDomain(domain, mode, step);
       }
       
       const scaler = scales[type]().domain(newDomain).range(range);
       scaler.type = type;
-      if (type !== 'ordinal') scaler.nice().clamp(true);
+      if (type !== 'ordinal') scaler.clamp(true); //scaler.nice().clamp(true)
       const allTicks = ticks
         ? ticks
         : scaler.ticks
@@ -119,8 +117,8 @@ export default ({ axes, context: { width, height } }) => {
           switch (mode) {
             case 'count':
               _ticks = getYTicks(
-                domain[1],
-                domain[0],
+                newDomain[1],
+                newDomain[0],
                 +tickCount
               );
               break;