@pushwoosh/kit-charts 0.0.7 → 0.0.8

package/core/scale/time.js

@@ -63,6 +63,10 @@ const LADDER = [{
   unit: 'week',
   step: 1,
   approx: WEEK
+}, {
+  unit: 'week',
+  step: 2,
+  approx: 2 * WEEK
 }, {
   unit: 'month',
   step: 1,
@@ -84,9 +88,10 @@ const LADDER = [{
   approx: 365 * DAY,
   calendar: true
 }];
-const pickRung = (span, count) => {
+const pickRungIndex = (span, count) => {
   const target = span / Math.max(1, count);
-  return LADDER.find(rung => rung.approx >= target) ?? LADDER[LADDER.length - 1];
+  const found = LADDER.findIndex(rung => rung.approx >= target);
+  return found === -1 ? LADDER.length - 1 : found;
 };
 const alignUp = (from, rung) => {
   const date = new Date(from);
@@ -119,6 +124,20 @@ const advance = (timestamp, rung) => {
   return Date.UTC(date.getUTCFullYear(), date.getUTCMonth() + months, date.getUTCDate(), date.getUTCHours(), date.getUTCMinutes(), date.getUTCSeconds());
 };
 const rungFor = unit => LADDER.find(rung => rung.unit === unit && rung.step === 1) ?? LADDER[LADDER.length - 1];
+const ticksFor = (min, max, rung) => {
+  const ticks = [];
+  // Calendar alignment lands on the start of the current unit, which can sit
+  // before the domain — a tick there would be drawn outside the plot.
+  let cursor = alignUp(min, rung);
+  if (cursor < min) {
+    cursor = advance(cursor, rung);
+  }
+  for (let i = 0; cursor <= max && i < 1000; i += 1) {
+    ticks.push(cursor);
+    cursor = advance(cursor, rung);
+  }
+  return ticks;
+};
 export function timeTicks(min, max, options = {}) {
   const {
     count = 6,
@@ -130,17 +149,17 @@ export function timeTicks(min, max, options = {}) {
   if (min === max) {
     return [min];
   }
-  const rung = unit ? rungFor(unit) : pickRung(max - min, count);
-  const ticks = [];
-  // Calendar alignment lands on the start of the current unit, which can sit
-  // before the domain — a tick there would be drawn outside the plot.
-  let cursor = alignUp(min, rung);
-  if (cursor < min) {
-    cursor = advance(cursor, rung);
+  if (unit) {
+    const fixed = ticksFor(min, max, rungFor(unit));
+    return fixed.length ? fixed : [min, max];
   }
-  for (let i = 0; cursor <= max && i < 1000; i += 1) {
-    ticks.push(cursor);
-    cursor = advance(cursor, rung);
+  // A rung as coarse as the span lands a single tick inside it — a month step on
+  // a month of data — so step down until the axis has something to read.
+  let index = pickRungIndex(max - min, count);
+  let ticks = ticksFor(min, max, LADDER[index]);
+  while (ticks.length < 2 && index > 0) {
+    index -= 1;
+    ticks = ticksFor(min, max, LADDER[index]);
   }
   return ticks.length ? ticks : [min, max];
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pushwoosh/kit-charts",
-  "version": "0.0.7",
+  "version": "0.0.8",
   "description": "Small React chart library on SVG, with a Highcharts-shaped configuration model",
   "license": "MIT",
   "repository": {