@fishawack/lab-d3 - npm Package Compare versions

Comparing version 2.9.1 to 3.0.0

package.json

 {
   "name": "@fishawack/lab-d3",
-  "version": "2.9.1",
+  "version": "3.0.0",
   "description": "Abstract layer built on top of d3",
@@ -5,0 +5,0 @@ "scripts": {

src/chart_group.js

@@ -22,7 +22,3 @@ "use strict";
   });
-  this.att({
-    padding: {
-      inner: 0.05
-    }
-  });
+  this.att({});
 }
@@ -81,3 +77,2 @@ Chart_Group.prototype = Object.create(Chart.prototype);
   var outerPad = 0;
-  var innerPad = local.padding[levelIndex] == null ? local.padding.inner : local.padding[levelIndex];
   var levelWidth = 0;
@@ -90,3 +85,3 @@ if (levelIndex === local.levels) {
   }
-  innerPad *= levelWidth;
+  var innerPad = local.padding[levelIndex] == null ? local.padding.inner * (att.padding.ratio ? levelWidth : local.width) : local.padding[levelIndex] * (att.padding.ratio ? levelWidth : 1);
 
@@ -185,4 +180,2 @@ // LOCAL VARIABLES
     for (var levelIndex = levelData.length; levelIndex--;) {
-      var innerPad = local.padding[levelIndex] == null ? local.padding.inner : local.padding[levelIndex];
-
       // LevelWidth either level above or total width - outer padding
@@ -201,3 +194,3 @@ var levelWidth = 0;
       // Calculate inner padding as percentage of levelWidth
-      innerPad *= levelWidth;
+      var innerPad = local.padding[levelIndex] == null ? local.padding.inner * (att.padding.ratio ? levelWidth : local.width) : local.padding[levelIndex] * (att.padding.ratio ? levelWidth : 1);
 
@@ -204,0 +197,0 @@ // Used to find biggest dataset at current levelIndex

src/chart.js

@@ -226,5 +226,11 @@ "use strict";
 
-  // These two are already ratio by nature so set back
-  local.padding.outer = att.padding.outer;
-  local.padding.inner = att.padding.inner;
+  // These two are expected to be ratios in d3's native calls so convert to ratio
+  if (!att.padding.ratio) {
+    local.padding.outer = local.padding.outer / att.width;
+    local.padding.inner = local.padding.inner / att.width;
+  } else {
+    // Set these back to the raw ratios rather than the calculated size
+    local.padding.outer = att.padding.outer;
+    local.padding.inner = att.padding.inner;
+  }
   if (att.autoAxis === 'x') {
@@ -231,0 +237,0 @@ local.width = att.width - local.margin.left - local.margin.right;

src/charts/bar.js

@@ -21,5 +21,2 @@ "use strict";
       x: 'group'
-    },
-    padding: {
-      outer: 0.025
     }
@@ -26,0 +23,0 @@ });

src/charts/barstacked.js

@@ -36,6 +36,2 @@ "use strict";
     },
-    padding: {
-      inner: 0.05,
-      outer: 0.025
-    },
     primaryIndex: 0
@@ -364,3 +360,3 @@ });
   var outerPad = 0;
-  var innerPad = local.padding[levelIndex] == null ? local.padding.inner : local.padding[levelIndex];
+  var innerPad = local.padding[levelIndex] == null ? local.padding.inner * (att.padding.ratio ? levelWidth : local.width) : local.padding[levelIndex] * (att.padding.ratio ? levelWidth : 1);
   var levelWidth = 0;
@@ -373,3 +369,2 @@ if (levelIndex === local.levels) {
   }
-  innerPad *= levelWidth;
 
@@ -546,6 +541,4 @@ // LOCAL VARIABLES
       if (levelIndex) {
-        var innerPad = local.padding[levelIndex] == null ? local.padding.inner : local.padding[levelIndex];
-
         // Calculate inner padding as percentage of levelWidth
-        innerPad *= local.levelWidth[levelIndex];
+        var innerPad = local.padding[levelIndex] == null ? local.padding.inner * (att.padding.ratio ? levelWidth : local.width) : local.padding[levelIndex] * (att.padding.ratio ? levelWidth : 1);
 
@@ -552,0 +545,0 @@ // Level width is biggestDataset / currentLevel - inner padding

No alert changes

Improved metrics

Total package byte prevSize

559157

increased by0.06%

Worsened metrics

Lines of code

5619

decreased by-0.16%

No dependency changes