@windborne/grapher 1.0.41 → 1.0.43

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@windborne/grapher",
-  "version": "1.0.41",
+  "version": "1.0.43",
   "description": "Graphing library",
   "main": "src/index.js",
   "module": "dist/bundle.esm.js",

package/readme.md

@@ -141,7 +141,7 @@ Grapher supports multiple data formats within a series:
 | width | `number` | ✗ | Line width. |
 | axis | `string \| object` | ✗ | Axis specification for the series. |
 | rangeSelectorWidth | `number` | ✗ | Width of the range selector for this series. |
-| expandYWith | `number[]` | ✗ | Values to include when calculating y-axis range. |
+| expandYWith | `(number | null)[] | null` | ✗ | Values to include when calculating y-axis range. |
 | defaultAlwaysTooltipped | `boolean` | ✗ | Whether to always show tooltip for this series. |
 | square | `boolean` | ✗ | Whether to render the series with square points. |
 | shiftXBy | `number` | ✗ | Value to shift x-coordinates by. |

package/src/helpers/place_grid.js

@@ -385,17 +385,9 @@ function placeDateOnlyGrid({ min, max, precision, expectedLabelSize, labelPaddin
     const spanMultipleYears = minYear !== maxYear;
 
     const customDateFormatter = (date, options) => {
-        const monthNames = ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec'];
-        const d = new Date(date);
-        const month = monthNames[d.getMonth()];
-        const day = d.getDate();
-        const year = d.getFullYear();
-        
-        if (spanMultipleYears) {
-            return `${month} ${day} ${year}`;
-        } else {
-            return `${month} ${day}`;
-        }
+        const timeZone = formatOptions.timeZone;
+        const result = formatter(date, { ...options, dates: true, justMonthAndDay: !spanMultipleYears, justDate: spanMultipleYears, timeZone });
+        return result;
     };
     
     const placementParams = { scale, min, max, inverted, totalSize, precision, formatter: customDateFormatter, formatOptions, dates: true };

package/src/index.d.ts

@@ -16,7 +16,7 @@ export interface SeriesData {
   width?: number;
   rangeSelectorWidth?: number;
   axis?: string | object;
-  expandYWith?: number[];
+  expandYWith?: (number | null)[] | null;
   defaultAlwaysTooltipped?: boolean;
   square?: boolean;
   shiftXBy?: number;

package/src/state/calculate_data_bounds.js

@@ -13,7 +13,7 @@ function finalizeBounds(bounds, { dates }) {
     return bounds;
 }
 
-function percentileBounds(inDataSpace, bounds, {percentile=100, percentileAsymmetry=0}={}) {
+function percentileBounds(inDataSpace, bounds, {percentile=100, percentileAsymmetry=0, rangeValues=[]}={}) {
     let dates = false;
 
     bounds.minX = inDataSpace[0][0];
@@ -32,6 +32,13 @@ function percentileBounds(inDataSpace, bounds, {percentile=100, percentileAsymme
         .filter(([_x, y]) => typeof y === 'number')
         .sort(([_x1, y1], [_x2, y2]) => y1 - y2);
 
+    for (let rangeValue of rangeValues) {
+        if (typeof rangeValue === 'number') {
+            sortedByY.push([null, rangeValue]);
+        }
+    }
+    sortedByY.sort(([_x1, y1], [_x2, y2]) => y1 - y2);
+
     if (!sortedByY.length) {
         return finalizeBounds(bounds, {dates});
     }
@@ -49,7 +56,7 @@ function percentileBounds(inDataSpace, bounds, {percentile=100, percentileAsymme
     return finalizeBounds(bounds, {dates});
 }
 
-export default function calculateDataBounds(inDataSpace, {percentile=100, percentileAsymmetry=0}={}) {
+export default function calculateDataBounds(inDataSpace, {percentile=100, percentileAsymmetry=0, rangeValues=[]}={}) {
     let bounds = {
         minX: null,
         maxX: null,
@@ -100,5 +107,16 @@ export default function calculateDataBounds(inDataSpace, {percentile=100, percen
         }
     }
 
+    for (let rangeValue of rangeValues) {
+        if (typeof rangeValue === 'number') {
+            if (typeof bounds.minY !== 'number' || rangeValue < bounds.minY) {
+                bounds.minY = rangeValue;
+            }
+            if (typeof bounds.maxY !== 'number' || rangeValue > bounds.maxY) {
+                bounds.maxY = rangeValue;
+            }
+        }
+    }
+
     return finalizeBounds(bounds, {dates});
 }

package/src/state/space_conversions/simple_series_to_data_space.js

@@ -166,6 +166,7 @@ function objectsToDataSpace(data, series, options) {
     }
 
     const inDataSpace = [];
+    const rangeValues = []; 
 
     for (let point of data) {
         if (point.buffer instanceof ArrayBuffer) {
@@ -222,8 +223,24 @@ function objectsToDataSpace(data, series, options) {
             }
 
             inDataSpace.push([xValue, yValue]);
+
+            if (series.rangeKey && point[series.rangeKey]) {
+                const range = point[series.rangeKey];
+                if (typeof range === 'object' && range.min !== undefined && range.max !== undefined) {
+                    if (typeof range.min === 'number') {
+                        rangeValues.push(range.min);
+                    }
+                    if (typeof range.max === 'number') {
+                        rangeValues.push(range.max);
+                    }
+                }
+            }
         }
     }
 
+    if (rangeValues.length > 0) {
+        series._rangeValues = rangeValues;
+    }
+
     return inDataSpace;
 }

package/src/state/state_controller.js

@@ -620,7 +620,9 @@ export default class StateController extends Eventable {
                 stateController: this
             });
             singleSeries.simpleDataSliceStart = simpleData.length;
-            singleSeries.dataBounds = calculateDataBounds(singleSeries.inDataSpace);
+            singleSeries.dataBounds = calculateDataBounds(singleSeries.inDataSpace, { 
+                rangeValues: singleSeries._rangeValues || [] 
+            });
             if (singleSeries.rendering === 'bar') {
                 singleSeries.dataBounds = expandBounds(singleSeries.dataBounds, { extendXForNBars: singleSeries.inDataSpace.length, expandYWith: singleSeries.expandYWith });
             }
@@ -795,6 +797,10 @@ export default class StateController extends Eventable {
                 if (singleSeries.rendering === 'bar') {
                     expandYWith.push(singleSeries.selectedBounds.minY, singleSeries.selectedBounds.maxY);
                 }
+
+                if (singleSeries._rangeValues && singleSeries._rangeValues.length > 0) {
+                    expandYWith.push(...singleSeries._rangeValues);
+                }
             }
 
             axis.selectedDataBounds = mergeBounds(selectedBoundsList);