@deephaven/chart 0.15.5-vite.12 → 0.15.6-beta.3

package/dist/FigureChartModel.d.ts

@@ -1,124 +1,80 @@
-export default FigureChartModel;
+import memoize from 'memoizee';
+import { Axis, Chart, Figure, OneClick, Series, SourceType } from '@deephaven/jsapi-shim';
+import { Range } from '@deephaven/utils';
+import { Layout, PlotData } from 'plotly.js';
+import { Formatter } from '@deephaven/jsapi-utils';
+import ChartModel, { ChartEvent, FilterColumnMap } from './ChartModel';
+import { ChartModelSettings } from './ChartUtils';
+import ChartTheme from './ChartTheme';
 /**
  * Takes a Figure object from a widget to make a model for a chart
  */
 declare class FigureChartModel extends ChartModel {
     static ADD_SERIES_DEBOUNCE: number;
     /**
-     * @param {dh.plot.Figure} figure The figure object created by the API
-     * @param {Object} settings Chart settings
+     * @param figure The figure object created by the API
+     * @param settings Chart settings
      */
-    constructor(figure: dh.plot.Figure, settings?: Object, theme?: {});
-    handleFigureUpdated(event: any): void;
-    handleFigureDisconnected(event: any): void;
-    handleFigureReconnected(event: any): void;
-    handleFigureSeriesAdded(event: any): void;
-    handleDownsampleStart(event: any): void;
-    handleDownsampleFinish(event: any): void;
-    handleDownsampleFail(event: any): void;
-    handleDownsampleNeeded(event: any): void;
-    handleRequestFailed(event: any): void;
-    addPendingSeries(): void;
-    figure: dh.plot.Figure;
-    settings: Object;
-    theme: {};
-    data: any[];
-    layout: {
-        autosize: boolean;
-        colorway: string[];
-        font: {
-            family: string;
-        };
-        title: {
-            font: {
-                color: any;
-            };
-            yanchor: string;
-            pad: {
-                t: number;
-            };
-            y: number;
-        };
-        legend: {
-            font: {
-                color: any;
-            };
-        };
-        margin: {
-            l: number;
-            r: number;
-            t: number;
-            b: number;
-            pad: number;
-        };
-        xaxis: {
-            automargin: boolean;
-            gridcolor: any;
-            linecolor: any;
-            rangeslider: {
-                visible: boolean;
-            };
-            showline: boolean;
-            ticklen: number;
-            tickcolor: any;
-            tickfont: {
-                color: any;
-            };
-            title: {
-                font: {
-                    color: any;
-                };
-            };
-        };
-        yaxis: {
-            automargin: boolean;
-            gridcolor: any;
-            linecolor: any;
-            rangeslider: {
-                visible: boolean;
-            };
-            showline: boolean;
-            ticklen: number;
-            tickcolor: any;
-            tickfont: {
-                color: any;
-            };
-            title: {
-                font: {
-                    color: any;
-                };
-            };
-        };
-    };
-    seriesDataMap: Map<any, any>;
-    pendingSeries: any[];
-    oneClicks: any[];
-    filterColumnMap: Map<any, any>;
-    lastFilter: Map<any, any>;
+    constructor(figure: Figure, settings?: Partial<ChartModelSettings>, theme?: typeof ChartTheme);
+    figure: Figure;
+    settings: Partial<ChartModelSettings>;
+    theme: typeof ChartTheme;
+    data: Partial<PlotData>[];
+    layout: Partial<Layout>;
+    seriesDataMap: Map<string, Partial<PlotData> & {
+        xLow?: number[];
+        xHigh?: number[];
+        yLow?: number[];
+        yHigh?: number[];
+    }>;
+    pendingSeries: Series[];
+    oneClicks: OneClick[];
+    filterColumnMap: FilterColumnMap;
+    lastFilter: Map<string, string>;
     isConnected: boolean;
-    seriesToProcess: Set<any>;
+    seriesToProcess: Set<unknown>;
+    close(): void;
+    getDefaultTitle(): string;
     initAllSeries(): void;
-    addSeries(series: any): void;
+    addSeries(series: Series): void;
+    addPendingSeries: import("lodash").DebouncedFunc<() => void>;
+    subscribe(callback: (event: ChartEvent) => void): void;
+    unsubscribe(callback: (event: ChartEvent) => void): void;
     subscribeFigure(): void;
     unsubscribeFigure(): void;
     startListeningFigure(): void;
     stopListeningFigure(): void;
     getTimeZone: ((columnType: any, formatter: any) => any) & memoize.Memoized<(columnType: any, formatter: any) => any>;
-    getValueTranslator: ((columnType: any, formatter: any) => (value: any) => any) & memoize.Memoized<(columnType: any, formatter: any) => (value: any) => any>;
+    getValueTranslator: ((columnType: any, formatter: any) => (value: unknown) => unknown) & memoize.Memoized<(columnType: any, formatter: any) => (value: unknown) => unknown>;
     /** Gets the parser for a value with the provided column type */
-    getValueParser: ((columnType: any, formatter: any) => (value: any) => any) & memoize.Memoized<(columnType: any, formatter: any) => (value: any) => any>;
+    getValueParser: ((columnType: any, formatter: any) => (value: unknown) => unknown) & memoize.Memoized<(columnType: any, formatter: any) => (value: unknown) => unknown>;
     /**
      * Gets the range parser for a particular column type
      */
-    getRangeParser: ((columnType: any, formatter: any) => (range: any) => any[]) & memoize.Memoized<(columnType: any, formatter: any) => (range: any) => any[]>;
+    getRangeParser: ((columnType: string, formatter?: Formatter | undefined) => (range: Range) => unknown[]) & memoize.Memoized<(columnType: string, formatter?: Formatter | undefined) => (range: Range) => unknown[]>;
     /**
      * Gets the parser for parsing the range from an axis within the given chart
      */
-    getAxisRangeParser: ((chart: any, formatter: any) => (axis: any) => (range: any) => any) & memoize.Memoized<(chart: any, formatter: any) => (axis: any) => (range: any) => any>;
+    getAxisRangeParser: ((chart: Chart, formatter?: Formatter | undefined) => (axis: Axis) => (range: Range) => unknown[]) & memoize.Memoized<(chart: Chart, formatter?: Formatter | undefined) => (axis: Axis) => (range: Range) => unknown[]>;
+    handleDownsampleStart(event: ChartEvent): void;
+    handleDownsampleFinish(event: ChartEvent): void;
+    handleDownsampleFail(event: ChartEvent): void;
+    handleDownsampleNeeded(event: ChartEvent): void;
+    handleFigureUpdated(event: ChartEvent): void;
+    handleRequestFailed(event: ChartEvent): void;
     /**
      * Resubscribe to the figure, should be done if settings change
      */
     resubscribe(): void;
+    setFormatter(formatter: Formatter): void;
+    setDownsamplingDisabled(isDownsamplingDisabled: boolean): void;
+    handleFigureDisconnected(event: CustomEvent): void;
+    handleFigureReconnected(event: CustomEvent): void;
+    handleFigureSeriesAdded(event: {
+        detail: Series;
+    }): void;
+    setDimensions(rect: DOMRect): void;
+    setTitle(title: string): void;
     getPlotWidth(): number;
     getPlotHeight(): number;
     updateAxisPositions(): void;
@@ -128,21 +84,29 @@ declare class FigureChartModel extends ChartModel {
     updateLayoutFormats(): void;
     /**
      * Set a specific array for the array of series properties specified.
-     * @param {dh.Series} series The series to set the data array for.
-     * @param {dh.plot.SourceType} sourceType The source type within that series to set the data for.
-     * @param {Any[]} dataArray The array to use for the data for this series source.
+     * @param series The series to set the data array for.
+     * @param sourceType The source type within that series to set the data for.
+     * @param dataArray The array to use for the data for this series source.
      */
-    setDataArrayForSeries(series: dh.Series, sourceType: dh.plot.SourceType, dataArray: Any[]): void;
+    setDataArrayForSeries(series: Series, sourceType: SourceType, dataArray: unknown[]): void;
     /**
      * After setting all the data in the series data, we may need to adjust some other properties
      * Eg. Calculating the width from the xLow/xHigh values; Plot.ly uses `width` instead of a low/high
      * value for x.
-     * @param {dh.Series} series The series to clean the data for
+     * @param series The series to clean the data for
+     */
+    cleanSeries(series: Series): void;
+    getData(): Partial<PlotData>[];
+    getLayout(): Partial<Layout>;
+    getFilterColumnMap(): FilterColumnMap;
+    isFilterRequired(): boolean;
+    /**
+     * Sets the filter on the model. Will only set the values that have changed.
+     * @param filterMap Map of filter column names to values
      */
-    cleanSeries(series: dh.Series): void;
-    setFigure(figure: any): void;
-    updateSettings(settings: any): void;
+    setFilter(filterMap: Map<string, string>): void;
+    setFigure(figure: Figure): void;
+    updateSettings(settings: Partial<ChartModelSettings>): void;
 }
-import ChartModel from "./ChartModel";
-import memoize from "memoizee";
+export default FigureChartModel;
 //# sourceMappingURL=FigureChartModel.d.ts.map

package/dist/FigureChartModel.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"FigureChartModel.d.ts","sourceRoot":"","sources":["../src/FigureChartModel.js"],"names":[],"mappings":";AAWA;;GAEG;AACH;IACE,mCAAgC;IAEhC;;;OAGG;IACH,+CAFW,MAAM,cAuChB;IAyRD,sCAqCC;IAgCD,2CAUC;IAED,0CAaC;IAED,0CAOC;IA/HD,wCAIC;IAED,yCAIC;IAED,uCAIC;IAED,yCAIC;IAyCD,sCAEC;IA3OD,yBAWC;IAnHC,uBAAoB;IACpB,iBAAwB;IACxB,UAAkB;IAClB,YAAc;IACd;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;MAAiD;IACjD,6BAA8B;IAC9B,qBAAuB;IACvB,iBAAmB;IACnB,+BAAgC;IAChC,0BAA2B;IAC3B,qBAAuB;IACvB,0BAAgC;IAuBlC,sBA0BC;IAED,6BAwCC;IAiCD,wBAWC;IAED,0BAEC;IAED,6BAqCC;IAED,4BAqCC;IAED,qHAQG;IAEH,4JAGG;IAEH,gEAAgE;IAChE,wJAGG;IAEH;;OAEG;IACH,4JAMG;IAEH;;OAEG;IACH,gLAOG;IAqEH;;OAEG;IACH,oBAKC;IA2ED,uBASC;IAED,wBASC;IAED,4BAgBC;IAED;;OAEG;IACH,4BAkBC;IAED;;;;;OAKG;IACH,oFAFW,KAAK,QAQf;IAED;;;;;OAKG;IACH,qCA4BC;IAoDD,6BAYC;IAED,oCAEC;CACF"}
+{"version":3,"file":"FigureChartModel.d.ts","sourceRoot":"","sources":["../src/FigureChartModel.ts"],"names":[],"mappings":"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"}

package/dist/FigureChartModel.js

@@ -1,3 +1,7 @@
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 
 /* eslint class-methods-use-this: "off" */
@@ -8,6 +12,7 @@ import dh from '@deephaven/jsapi-shim';
 import Log from '@deephaven/log';
 import ChartModel from "./ChartModel.js";
 import ChartUtils from "./ChartUtils.js";
+import ChartTheme from "./ChartTheme.js";
 var log = Log.module('FigureChartModel');
 /**
  * Takes a Figure object from a widget to make a model for a chart
@@ -15,14 +20,52 @@ var log = Log.module('FigureChartModel');
 
 class FigureChartModel extends ChartModel {
   /**
-   * @param {dh.plot.Figure} figure The figure object created by the API
-   * @param {Object} settings Chart settings
+   * @param figure The figure object created by the API
+   * @param settings Chart settings
    */
   constructor(figure) {
     var settings = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
-    var theme = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
+    var theme = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : ChartTheme;
     super();
 
+    _defineProperty(this, "figure", void 0);
+
+    _defineProperty(this, "settings", void 0);
+
+    _defineProperty(this, "theme", void 0);
+
+    _defineProperty(this, "data", void 0);
+
+    _defineProperty(this, "layout", void 0);
+
+    _defineProperty(this, "seriesDataMap", void 0);
+
+    _defineProperty(this, "pendingSeries", void 0);
+
+    _defineProperty(this, "oneClicks", void 0);
+
+    _defineProperty(this, "filterColumnMap", void 0);
+
+    _defineProperty(this, "lastFilter", void 0);
+
+    _defineProperty(this, "isConnected", void 0);
+
+    _defineProperty(this, "seriesToProcess", void 0);
+
+    _defineProperty(this, "addPendingSeries", debounce(() => {
+      var {
+        pendingSeries
+      } = this;
+
+      for (var i = 0; i < pendingSeries.length; i += 1) {
+        var series = pendingSeries[i];
+        this.addSeries(series);
+        series.subscribe(); // We'll get an update with the data after subscribing
+      }
+
+      this.pendingSeries = [];
+    }, FigureChartModel.ADD_SERIES_DEBOUNCE));
+
     _defineProperty(this, "getTimeZone", memoize((columnType, formatter) => {
       if (formatter != null) {
         var dataFormatter = formatter.getColumnTypeFormatter(columnType);
@@ -74,7 +117,6 @@ class FigureChartModel extends ChartModel {
     this.handleRequestFailed = this.handleRequestFailed.bind(this); // We need to debounce adding series so we subscribe to them all in the same tick
     // This should no longer be necessary after IDS-5049 lands
 
-    this.addPendingSeries = debounce(this.addPendingSeries.bind(this), FigureChartModel.ADD_SERIES_DEBOUNCE);
     this.figure = figure;
     this.settings = settings;
     this.theme = theme;
@@ -131,7 +173,7 @@ class FigureChartModel extends ChartModel {
     var allSeriesNames = [...this.seriesDataMap.keys()];
     var inactiveSeriesNames = allSeriesNames.filter(seriesName => activeSeriesNames.indexOf(seriesName) < 0);
 
-    for (var _i = 0; _i < inactiveSeriesNames; _i += 1) {
+    for (var _i = 0; _i < inactiveSeriesNames.length; _i += 1) {
       var seriesName = inactiveSeriesNames[_i];
       this.seriesDataMap.delete(seriesName);
     }
@@ -178,22 +220,8 @@ class FigureChartModel extends ChartModel {
     this.updateLayoutFormats();
   }
 
-  addPendingSeries() {
-    var {
-      pendingSeries
-    } = this;
-
-    for (var i = 0; i < pendingSeries.length; i += 1) {
-      var series = pendingSeries[i];
-      this.addSeries(series);
-      series.subscribe(); // We'll get an update with the data after subscribing
-    }
-
-    this.pendingSeries = [];
-  }
-
-  subscribe() {
-    super.subscribe(...arguments);
+  subscribe(callback) {
+    super.subscribe(callback);
 
     if (this.listeners.length === 1) {
       // Need to initialize the series here as we may have missed some series when not subscribed
@@ -202,8 +230,8 @@ class FigureChartModel extends ChartModel {
     }
   }
 
-  unsubscribe() {
-    super.unsubscribe(...arguments);
+  unsubscribe(callback) {
+    super.unsubscribe(callback);
 
     if (this.listeners.length === 0) {
       this.unsubscribeFigure();
@@ -332,8 +360,8 @@ class FigureChartModel extends ChartModel {
     this.resubscribe();
   }
 
-  setDownsamplingDisabled() {
-    super.setDownsamplingDisabled(...arguments);
+  setDownsamplingDisabled(isDownsamplingDisabled) {
+    super.setDownsamplingDisabled(isDownsamplingDisabled);
     this.resubscribe();
   }
 
@@ -381,25 +409,44 @@ class FigureChartModel extends ChartModel {
     // Plotly doesn't handle positioning it correctly, and it's an undocumented feature
 
     var subtitleCount = (_match$length = (_match = (title !== null && title !== void 0 ? title : '').match(/<br>/g)) === null || _match === void 0 ? void 0 : _match.length) !== null && _match$length !== void 0 ? _match$length : 0;
-    this.layout.margin.t = ChartUtils.DEFAULT_MARGIN.t + subtitleCount * ChartUtils.SUBTITLE_LINE_HEIGHT;
-    this.layout.title.text = title;
-    this.layout.title.pad.t = ChartUtils.DEFAULT_TITLE_PADDING.t + subtitleCount * ChartUtils.SUBTITLE_LINE_HEIGHT * 0.5;
+    var margin = ChartUtils.DEFAULT_MARGIN.t + subtitleCount * ChartUtils.SUBTITLE_LINE_HEIGHT;
+
+    if (this.layout.margin) {
+      this.layout.margin.t = margin;
+    } else {
+      this.layout.margin = {
+        t: margin
+      };
+    }
+
+    if (typeof this.layout.title === 'string') {
+      this.layout.title = title;
+    } else {
+      this.layout.title = _objectSpread({}, this.layout.title);
+      this.layout.title.text = title;
+      this.layout.title.pad = _objectSpread({}, this.layout.title.pad);
+      this.layout.title.pad.t = ChartUtils.DEFAULT_TITLE_PADDING.t + subtitleCount * ChartUtils.SUBTITLE_LINE_HEIGHT * 0.5;
+    }
   }
 
   getPlotWidth() {
+    var _this$layout$margin$l, _this$layout$margin, _this$layout$margin$r, _this$layout$margin2;
+
     if (!this.rect || !this.rect.width) {
       return 0;
     }
 
-    return Math.max(this.rect.width - this.layout.margin.l - this.layout.margin.r, 0);
+    return Math.max(this.rect.width - ((_this$layout$margin$l = (_this$layout$margin = this.layout.margin) === null || _this$layout$margin === void 0 ? void 0 : _this$layout$margin.l) !== null && _this$layout$margin$l !== void 0 ? _this$layout$margin$l : 0) - ((_this$layout$margin$r = (_this$layout$margin2 = this.layout.margin) === null || _this$layout$margin2 === void 0 ? void 0 : _this$layout$margin2.r) !== null && _this$layout$margin$r !== void 0 ? _this$layout$margin$r : 0), 0);
   }
 
   getPlotHeight() {
+    var _this$layout$margin$t, _this$layout$margin3, _this$layout$margin$b, _this$layout$margin4;
+
     if (!this.rect || !this.rect.height) {
       return 0;
     }
 
-    return Math.max(this.rect.height - this.layout.margin.t - this.layout.margin.b, 0);
+    return Math.max(this.rect.height - ((_this$layout$margin$t = (_this$layout$margin3 = this.layout.margin) === null || _this$layout$margin3 === void 0 ? void 0 : _this$layout$margin3.t) !== null && _this$layout$margin$t !== void 0 ? _this$layout$margin$t : 0) - ((_this$layout$margin$b = (_this$layout$margin4 = this.layout.margin) === null || _this$layout$margin4 === void 0 ? void 0 : _this$layout$margin4.b) !== null && _this$layout$margin$b !== void 0 ? _this$layout$margin$b : 0), 0);
   }
 
   updateAxisPositions() {
@@ -435,9 +482,9 @@ class FigureChartModel extends ChartModel {
   }
   /**
    * Set a specific array for the array of series properties specified.
-   * @param {dh.Series} series The series to set the data array for.
-   * @param {dh.plot.SourceType} sourceType The source type within that series to set the data for.
-   * @param {Any[]} dataArray The array to use for the data for this series source.
+   * @param series The series to set the data array for.
+   * @param sourceType The source type within that series to set the data for.
+   * @param dataArray The array to use for the data for this series source.
    */
 
 
@@ -448,13 +495,16 @@ class FigureChartModel extends ChartModel {
     } = series;
     var seriesData = this.seriesDataMap.get(name);
     var property = ChartUtils.getPlotlyProperty(plotStyle, sourceType);
-    set(seriesData, property, dataArray);
+
+    if (seriesData) {
+      set(seriesData, property, dataArray);
+    }
   }
   /**
    * After setting all the data in the series data, we may need to adjust some other properties
    * Eg. Calculating the width from the xLow/xHigh values; Plot.ly uses `width` instead of a low/high
    * value for x.
-   * @param {dh.Series} series The series to clean the data for
+   * @param series The series to clean the data for
    */
 
 
@@ -465,6 +515,10 @@ class FigureChartModel extends ChartModel {
     } = series;
     var seriesData = this.seriesDataMap.get(name);
 
+    if (seriesData == null) {
+      return;
+    }
+
     if (plotStyle === dh.plot.SeriesPlotStyle.HISTOGRAM) {
       var {
         xLow,
@@ -528,7 +582,7 @@ class FigureChartModel extends ChartModel {
   }
   /**
    * Sets the filter on the model. Will only set the values that have changed.
-   * @param {Map<String, String>} filterMap Map of filter column names to values
+   * @param filterMap Map of filter column names to values
    */