@deephaven/chart 0.6.1-fixed-deps.2 → 0.6.3-alpha.5

package/dist/Chart.js

@@ -1,4 +1,4 @@
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); keys.push.apply(keys, symbols); } return keys; }
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (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 = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
 
@@ -195,7 +195,7 @@ export class Chart extends Component {
   }
 
   handleDownsampleClick() {
-    this.setState((_ref) => {
+    this.setState(_ref => {
       var {
         isDownsamplingDisabled
       } = _ref;

package/dist/ChartModelFactory.d.ts

@@ -11,6 +11,7 @@ declare class ChartModelFactory {
      * @param {string} settings.xAxis The column name to use for the x-axis
      * @param {string[]} settings.hiddenSeries Array of hidden series names
      * @param {dh.Table} table The table to build the model for
+     * @param {Object} theme The theme for the figure. Defaults to ChartTheme
      * @returns {Promise<FigureChartModel>} The FigureChartModel representing the figure
      */
     static makeModelFromSettings(settings: {
@@ -20,7 +21,7 @@ declare class ChartModelFactory {
         type: string;
         xAxis: string;
         hiddenSeries: string[];
-    }, table: any): Promise<FigureChartModel>;
+    }, table: any, theme?: Object): Promise<FigureChartModel>;
     /**
      * Creates a model from the settings provided.
      * Tries to create a Figure in the API with it.
@@ -32,6 +33,7 @@ declare class ChartModelFactory {
      * @param {string} settings.xAxis The column name to use for the x-axis
      * @param {string[]} settings.hiddenSeries Array of hidden series names
      * @param {dh.Figure} figure The figure to build the model for
+     * @param {Object} theme The theme for the figure. Defaults to ChartTheme
      * @returns {Promise<FigureChartModel>} The FigureChartModel representing the figure
      */
     static makeModel(settings: {
@@ -41,7 +43,7 @@ declare class ChartModelFactory {
         type: string;
         xAxis: string;
         hiddenSeries: string[];
-    }, figure: any): Promise<FigureChartModel>;
+    }, figure: any, theme?: Object): Promise<FigureChartModel>;
 }
 import FigureChartModel from "./FigureChartModel";
 //# sourceMappingURL=ChartModelFactory.d.ts.map

package/dist/ChartModelFactory.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ChartModelFactory.d.ts","sourceRoot":"","sources":["../src/ChartModelFactory.js"],"names":[],"mappings":";AAIA;IACE;;;;;;;;;;;;OAYG;IACH;QAT6B,QAAQ,EAA1B,OAAO;QACY,MAAM,EAAzB,MAAM,EAAE;QACS,aAAa,EAA9B,MAAM;QACW,IAAI,EAArB,MAAM;QACW,KAAK,EAAtB,MAAM;QACa,YAAY,EAA/B,MAAM,EAAE;oBAEN,QAAQ,gBAAgB,CAAC,CAgBrC;IAED;;;;;;;;;;;;OAYG;IACH;QAT6B,QAAQ,EAA1B,OAAO;QACY,MAAM,EAAzB,MAAM,EAAE;QACS,aAAa,EAA9B,MAAM;QACW,IAAI,EAArB,MAAM;QACW,KAAK,EAAtB,MAAM;QACa,YAAY,EAA/B,MAAM,EAAE;qBAEN,QAAQ,gBAAgB,CAAC,CAIrC;CACF"}
+{"version":3,"file":"ChartModelFactory.d.ts","sourceRoot":"","sources":["../src/ChartModelFactory.js"],"names":[],"mappings":";AAKA;IACE;;;;;;;;;;;;;OAaG;IACH;QAV6B,QAAQ,EAA1B,OAAO;QACY,MAAM,EAAzB,MAAM,EAAE;QACS,aAAa,EAA9B,MAAM;QACW,IAAI,EAArB,MAAM;QACW,KAAK,EAAtB,MAAM;QACa,YAAY,EAA/B,MAAM,EAAE;2BAER,MAAM,GACJ,QAAQ,gBAAgB,CAAC,CAgBrC;IAED;;;;;;;;;;;;;OAaG;IACH;QAV6B,QAAQ,EAA1B,OAAO;QACY,MAAM,EAAzB,MAAM,EAAE;QACS,aAAa,EAA9B,MAAM;QACW,IAAI,EAArB,MAAM;QACW,KAAK,EAAtB,MAAM;QACa,YAAY,EAA/B,MAAM,EAAE;4BAER,MAAM,GACJ,QAAQ,gBAAgB,CAAC,CAIrC;CACF"}

package/dist/ChartModelFactory.js

@@ -5,6 +5,7 @@ function _asyncToGenerator(fn) { return function () { var self = this, args = ar
 import dh from '@deephaven/jsapi-shim';
 import ChartUtils from "./ChartUtils.js";
 import FigureChartModel from "./FigureChartModel.js";
+import ChartTheme from "./ChartTheme.js";
 
 class ChartModelFactory {
   /**
@@ -18,10 +19,13 @@ class ChartModelFactory {
    * @param {string} settings.xAxis The column name to use for the x-axis
    * @param {string[]} settings.hiddenSeries Array of hidden series names
    * @param {dh.Table} table The table to build the model for
+   * @param {Object} theme The theme for the figure. Defaults to ChartTheme
    * @returns {Promise<FigureChartModel>} The FigureChartModel representing the figure
    */
   static makeModelFromSettings(settings, table) {
+    var _arguments = arguments;
     return _asyncToGenerator(function* () {
+      var theme = _arguments.length > 2 && _arguments[2] !== undefined ? _arguments[2] : ChartTheme;
       // Copy the table first and then re-apply the filters from the original table
       // When we add table linking we'll want to listen to the original table and update
       // the copied table with any changes that occur.
@@ -30,7 +34,7 @@ class ChartModelFactory {
         tableCopy.applyCustomColumns(table.customColumns);
         tableCopy.applyFilter(table.filter);
         tableCopy.applySort(table.sort);
-        return dh.plot.Figure.create(ChartUtils.makeFigureSettings(settings, tableCopy)).then(figure => new FigureChartModel(figure, settings));
+        return dh.plot.Figure.create(ChartUtils.makeFigureSettings(settings, tableCopy)).then(figure => new FigureChartModel(figure, settings, theme));
       });
     })();
   }
@@ -45,13 +49,16 @@ class ChartModelFactory {
    * @param {string} settings.xAxis The column name to use for the x-axis
    * @param {string[]} settings.hiddenSeries Array of hidden series names
    * @param {dh.Figure} figure The figure to build the model for
+   * @param {Object} theme The theme for the figure. Defaults to ChartTheme
    * @returns {Promise<FigureChartModel>} The FigureChartModel representing the figure
    */
 
 
   static makeModel(settings, figure) {
+    var _arguments2 = arguments;
     return _asyncToGenerator(function* () {
-      return new FigureChartModel(figure, settings);
+      var theme = _arguments2.length > 2 && _arguments2[2] !== undefined ? _arguments2[2] : ChartTheme;
+      return new FigureChartModel(figure, settings, theme);
     })();
   }
 

package/dist/ChartModelFactory.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/ChartModelFactory.js"],"names":["dh","ChartUtils","FigureChartModel","ChartModelFactory","makeModelFromSettings","settings","table","copy","then","tableCopy","applyCustomColumns","customColumns","applyFilter","filter","applySort","sort","plot","Figure","create","makeFigureSettings","figure","makeModel"],"mappings":";;;;AAAA,OAAOA,EAAP,MAAe,uBAAf;OACOC,U;OACAC,gB;;AAEP,MAAMC,iBAAN,CAAwB;AACtB;AACF;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACoC,SAArBC,qBAAqB,CAACC,QAAD,EAAWC,KAAX,EAAkB;AAAA;AAClD;AACA;AACA;AACA;AACA,aAAOA,KAAK,CAACC,IAAN,GAAaC,IAAb,CAAkBC,SAAS,IAAI;AACpCA,QAAAA,SAAS,CAACC,kBAAV,CAA6BJ,KAAK,CAACK,aAAnC;AACAF,QAAAA,SAAS,CAACG,WAAV,CAAsBN,KAAK,CAACO,MAA5B;AACAJ,QAAAA,SAAS,CAACK,SAAV,CAAoBR,KAAK,CAACS,IAA1B;AAEA,eAAOf,EAAE,CAACgB,IAAH,CAAQC,MAAR,CAAeC,MAAf,CACLjB,UAAU,CAACkB,kBAAX,CAA8Bd,QAA9B,EAAwCI,SAAxC,CADK,EAELD,IAFK,CAEAY,MAAM,IAAI,IAAIlB,gBAAJ,CAAqBkB,MAArB,EAA6Bf,QAA7B,CAFV,CAAP;AAGD,OARM,CAAP;AALkD;AAcnD;AAED;AACF;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;;AACwB,SAATgB,SAAS,CAAChB,QAAD,EAAWe,MAAX,EAAmB;AAAA;AACvC,aAAO,IAAIlB,gBAAJ,CAAqBkB,MAArB,EAA6Bf,QAA7B,CAAP;AADuC;AAExC;;AA7CqB;;AAgDxB,eAAeF,iBAAf","sourcesContent":["import dh from '@deephaven/jsapi-shim';\nimport ChartUtils from './ChartUtils';\nimport FigureChartModel from './FigureChartModel';\n\nclass ChartModelFactory {\n  /**\n   * Creates a model from the settings provided.\n   * Tries to create a Figure in the API with it.\n   * @param {Object} settings The chart builder settings\n   * @param {boolean} settings.isLinked Whether the newly created chart should stay linked with the original table, update when filters are updated\n   * @param {string[]} settings.series The column names to use for creating the series of this chart\n   * @param {string} settings.sourcePanelId The panel ID the chart was created from\n   * @param {string} settings.type Chart builder type, from ChartBuilder.types\n   * @param {string} settings.xAxis The column name to use for the x-axis\n   * @param {string[]} settings.hiddenSeries Array of hidden series names\n   * @param {dh.Table} table The table to build the model for\n   * @returns {Promise<FigureChartModel>} The FigureChartModel representing the figure\n   */\n  static async makeModelFromSettings(settings, table) {\n    // Copy the table first and then re-apply the filters from the original table\n    // When we add table linking we'll want to listen to the original table and update\n    // the copied table with any changes that occur.\n    // The table gets owned by the Figure that gets created, which closes the table\n    return table.copy().then(tableCopy => {\n      tableCopy.applyCustomColumns(table.customColumns);\n      tableCopy.applyFilter(table.filter);\n      tableCopy.applySort(table.sort);\n\n      return dh.plot.Figure.create(\n        ChartUtils.makeFigureSettings(settings, tableCopy)\n      ).then(figure => new FigureChartModel(figure, settings));\n    });\n  }\n\n  /**\n   * Creates a model from the settings provided.\n   * Tries to create a Figure in the API with it.\n   * @param {Object} settings The chart builder settings\n   * @param {boolean} settings.isLinked Whether the newly created chart should stay linked with the original table, update when filters are updated\n   * @param {string[]} settings.series The column names to use for creating the series of this chart\n   * @param {string} settings.sourcePanelId The panel ID the chart was created from\n   * @param {string} settings.type Chart builder type, from ChartBuilder.types\n   * @param {string} settings.xAxis The column name to use for the x-axis\n   * @param {string[]} settings.hiddenSeries Array of hidden series names\n   * @param {dh.Figure} figure The figure to build the model for\n   * @returns {Promise<FigureChartModel>} The FigureChartModel representing the figure\n   */\n  static async makeModel(settings, figure) {\n    return new FigureChartModel(figure, settings);\n  }\n}\n\nexport default ChartModelFactory;\n"],"file":"ChartModelFactory.js"}
+{"version":3,"sources":["../src/ChartModelFactory.js"],"names":["dh","ChartUtils","FigureChartModel","ChartTheme","ChartModelFactory","makeModelFromSettings","settings","table","theme","copy","then","tableCopy","applyCustomColumns","customColumns","applyFilter","filter","applySort","sort","plot","Figure","create","makeFigureSettings","figure","makeModel"],"mappings":";;;;AAAA,OAAOA,EAAP,MAAe,uBAAf;OACOC,U;OACAC,gB;OACAC,U;;AAEP,MAAMC,iBAAN,CAAwB;AACtB;AACF;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACoC,SAArBC,qBAAqB,CAACC,QAAD,EAAWC,KAAX,EAAsC;AAAA;AAAA;AAAA,UAApBC,KAAoB,0EAAZL,UAAY;AACtE;AACA;AACA;AACA;AACA,aAAOI,KAAK,CAACE,IAAN,GAAaC,IAAb,CAAkBC,SAAS,IAAI;AACpCA,QAAAA,SAAS,CAACC,kBAAV,CAA6BL,KAAK,CAACM,aAAnC;AACAF,QAAAA,SAAS,CAACG,WAAV,CAAsBP,KAAK,CAACQ,MAA5B;AACAJ,QAAAA,SAAS,CAACK,SAAV,CAAoBT,KAAK,CAACU,IAA1B;AAEA,eAAOjB,EAAE,CAACkB,IAAH,CAAQC,MAAR,CAAeC,MAAf,CACLnB,UAAU,CAACoB,kBAAX,CAA8Bf,QAA9B,EAAwCK,SAAxC,CADK,EAELD,IAFK,CAEAY,MAAM,IAAI,IAAIpB,gBAAJ,CAAqBoB,MAArB,EAA6BhB,QAA7B,EAAuCE,KAAvC,CAFV,CAAP;AAGD,OARM,CAAP;AALsE;AAcvE;AAED;AACF;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;;AACwB,SAATe,SAAS,CAACjB,QAAD,EAAWgB,MAAX,EAAuC;AAAA;AAAA;AAAA,UAApBd,KAAoB,6EAAZL,UAAY;AAC3D,aAAO,IAAID,gBAAJ,CAAqBoB,MAArB,EAA6BhB,QAA7B,EAAuCE,KAAvC,CAAP;AAD2D;AAE5D;;AA/CqB;;AAkDxB,eAAeJ,iBAAf","sourcesContent":["import dh from '@deephaven/jsapi-shim';\nimport ChartUtils from './ChartUtils';\nimport FigureChartModel from './FigureChartModel';\nimport ChartTheme from './ChartTheme';\n\nclass ChartModelFactory {\n  /**\n   * Creates a model from the settings provided.\n   * Tries to create a Figure in the API with it.\n   * @param {Object} settings The chart builder settings\n   * @param {boolean} settings.isLinked Whether the newly created chart should stay linked with the original table, update when filters are updated\n   * @param {string[]} settings.series The column names to use for creating the series of this chart\n   * @param {string} settings.sourcePanelId The panel ID the chart was created from\n   * @param {string} settings.type Chart builder type, from ChartBuilder.types\n   * @param {string} settings.xAxis The column name to use for the x-axis\n   * @param {string[]} settings.hiddenSeries Array of hidden series names\n   * @param {dh.Table} table The table to build the model for\n   * @param {Object} theme The theme for the figure. Defaults to ChartTheme\n   * @returns {Promise<FigureChartModel>} The FigureChartModel representing the figure\n   */\n  static async makeModelFromSettings(settings, table, theme = ChartTheme) {\n    // Copy the table first and then re-apply the filters from the original table\n    // When we add table linking we'll want to listen to the original table and update\n    // the copied table with any changes that occur.\n    // The table gets owned by the Figure that gets created, which closes the table\n    return table.copy().then(tableCopy => {\n      tableCopy.applyCustomColumns(table.customColumns);\n      tableCopy.applyFilter(table.filter);\n      tableCopy.applySort(table.sort);\n\n      return dh.plot.Figure.create(\n        ChartUtils.makeFigureSettings(settings, tableCopy)\n      ).then(figure => new FigureChartModel(figure, settings, theme));\n    });\n  }\n\n  /**\n   * Creates a model from the settings provided.\n   * Tries to create a Figure in the API with it.\n   * @param {Object} settings The chart builder settings\n   * @param {boolean} settings.isLinked Whether the newly created chart should stay linked with the original table, update when filters are updated\n   * @param {string[]} settings.series The column names to use for creating the series of this chart\n   * @param {string} settings.sourcePanelId The panel ID the chart was created from\n   * @param {string} settings.type Chart builder type, from ChartBuilder.types\n   * @param {string} settings.xAxis The column name to use for the x-axis\n   * @param {string[]} settings.hiddenSeries Array of hidden series names\n   * @param {dh.Figure} figure The figure to build the model for\n   * @param {Object} theme The theme for the figure. Defaults to ChartTheme\n   * @returns {Promise<FigureChartModel>} The FigureChartModel representing the figure\n   */\n  static async makeModel(settings, figure, theme = ChartTheme) {\n    return new FigureChartModel(figure, settings, theme);\n  }\n}\n\nexport default ChartModelFactory;\n"],"file":"ChartModelFactory.js"}

package/dist/ChartUtils.d.ts

@@ -38,7 +38,7 @@ declare class ChartUtils {
      * @param {dh.plot.SeriesPlotStyle} plotStyle The plot style of the series
      * @param {dh.plot.SourceType} sourceType The source type for the series
      */
-    static getPlotlyProperty(plotStyle: any, sourceType: any): "labels" | "values" | "x" | "y" | "z" | "xLow" | "xHigh" | "yLow" | "yHigh" | "time" | "open" | "high" | "low" | "shape" | "size" | "label" | "color";
+    static getPlotlyProperty(plotStyle: any, sourceType: any): "labels" | "values" | "x" | "y" | "z" | "xLow" | "xHigh" | "yLow" | "yHigh" | "time" | "open" | "high" | "low" | "close" | "shape" | "size" | "label" | "color";
     static getPlotlySeriesOrientation(series: any): string;
     /**
      * Generate the plotly error bar data from the passed in data.
@@ -106,11 +106,12 @@ declare class ChartUtils {
      * @param {dh.plot.Series} series The series to create the series data with
      * @param {Map<dh.plot.AxisType, dh.plot.Axis[]>} axisTypeMap The map of axes grouped by type
      * @param {boolean|string} seriesVisibility Visibility setting for the series
+     * @param {Object} theme The theme properties for the plot. See ChartTheme.js for an example
      * @returns {Object} The series data (trace) object for use with plotly.
      */
-    static makeSeriesDataFromSeries(series: any, axisTypeMap: Map<any, any[]>, seriesVisibility: boolean | string): Object;
+    static makeSeriesDataFromSeries(series: any, axisTypeMap: Map<any, any[]>, seriesVisibility: boolean | string, theme: Object): Object;
     static addSourcesToSeriesData(seriesDataParam: any, plotStyle: any, sources: any, axisTypeMap: any): void;
-    static addStylingToSeriesData(seriesDataParam: any, plotStyle: any, lineColor?: any, shapeColor?: any, seriesVisibility?: any): void;
+    static addStylingToSeriesData(seriesDataParam: any, plotStyle: any, theme?: {}, lineColor?: any, shapeColor?: any, seriesVisibility?: any): void;
     /**
      * Retrieve the axis formats from the provided figure.
      * Currently defaults to just the x/y axes.
@@ -153,7 +154,7 @@ declare class ChartUtils {
      * @param {number} plotHeight The height of the plot to calculate the axis sizes for
      * @param {func} getRangeParser A function to retrieve the range parser for a given axis
      */
-    static updateLayoutAxes(layoutParam: object, axes: any[], plotWidth?: number, plotHeight?: number, getRangeParser?: any): void;
+    static updateLayoutAxes(layoutParam: object, axes: any[], plotWidth?: number, plotHeight?: number, getRangeParser?: any, theme?: {}): void;
     static getAxisLayoutProperty(axisProperty: any, axisIndex: any): string;
     /**
      * Updates the layout axis object in place
@@ -239,7 +240,7 @@ declare class ChartUtils {
      * @param {dh.i18n.TimeZone} timeZone The time zone if applicable
      */
     static wrapValue(value: any, columnType: string, timeZone?: any): any;
-    static makeLayoutAxis(type: any): {
+    static makeLayoutAxis(type: any, theme?: {}): {
         automargin: boolean;
         gridcolor: any;
         linecolor: any;
@@ -258,9 +259,16 @@ declare class ChartUtils {
             };
         };
     };
-    static makeDefaultLayout(): {
+    /**
+     * Parses the colorway property of a theme and returns an array of colors
+     * Theme could have a single string with space separated colors or an array of strings representing the colorway
+     * @param {ChartTheme} theme The theme to get colorway from
+     * @returns {string[]} Colorway array for the theme
+     */
+    static getColorwayFromTheme(theme: any): string[];
+    static makeDefaultLayout(theme?: {}): {
         autosize: boolean;
-        colorway: any;
+        colorway: string[];
         font: {
             family: string;
         };
@@ -273,7 +281,6 @@ declare class ChartUtils {
                 t: number;
             };
             y: number;
-            text: string;
         };
         legend: {
             font: {
@@ -325,21 +332,6 @@ declare class ChartUtils {
                 };
             };
         };
-        paper_bgcolor: any;
-        plot_bgcolor: any;
-        title_color: any;
-        gridcolor: any;
-        linecolor: any;
-        zerolinecolor: any;
-        activecolor: any;
-        rangebgcolor: any;
-        area_color: any;
-        trend_color: any;
-        line_color: any;
-        error_band_line_color: any;
-        error_band_fill_color: any;
-        ohlc_increasing: any;
-        ohlc_decreasing: any;
     };
     /**
      * Dehydrate settings so they can be JSONified

package/dist/ChartUtils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ChartUtils.d.ts","sourceRoot":"","sources":["../src/ChartUtils.js"],"names":[],"mappings":";AAeA;IACE,iCAAgC;IAEhC,6BAA6B;IAE7B,6BAA2B;IAE3B,4BAAyB;IAEzB,+BAA4B;IAE5B,+BAA8B;IAE9B;;;OAGG;IAEH,2BAAkD;IAElD;;;;;;OAA8E;IAE9E;;OAAuD;IAEvD,oCAAiC;IAEjC;;;;OAIG;IACH,6DAFW,OAAO,yEA4BjB;IAED;;;OAGG;IACH,yEASC;IAED;;;;OAIG;IACH,iNA0DC;IAED,uDAOC;IAED;;;;;;;;OAQG;IACH,6BANW,aAAa,QACb,aAAa,SACb,aAAa,GAEX,MAAM,CAWlB;IAED;;;;MA4CC;IAED,6CAEC;IAED;;;;;aA2CC;IAED;;;;OAIG;IACH,wEA8BC;IAED;;;;;;OAMG;IACH,kCAJW,MAAM,QACN,MAAM,cACN,OAAO,UAqBjB;IAED;;;;;OAKG;IACH,oDAYC;IAED;;;;;OAKG;IACH,iCAJW,MAAM,YACN,MAAM,GACJ,OAAO,GAAC,MAAM,CAO1B;IAED;;;;OAIG;IACH,iCAHW,MAAM,GACJ,MAAM,EAAE,CAOpB;IAED;;;OAGG;IACH,8EAFa,MAAM,CASlB;IAED;;;;;;OAMG;IACH,0DAJW,SAAsB,KAAc,CAAC,oBACrC,OAAO,GAAC,MAAM,GACZ,MAAM,CA4BlB;IAED,0GAyBC;IAED,qIAyDC;IAED;;;;;;OAMG;IACH,oDAFa,IAAI,MAAM,EAAE,MAAM,CAAC,CAkG/B;IAED,gIASC;IAED;;;OAGG;IACH,4DASC;IAED;;;OAGG;IACH,kFAaC;IAED;;;;OAIG;IACH,wDAaC;IAED;;;;OAIG;IACH,+BAHW,MAAM,GACJ,MAAM,CAclB;IAED;;;;;;;;;;OAUG;IACH,qCANW,MAAM,QACN,KAAc,cACd,MAAM,eACN,MAAM,8BAyHhB;IAED,wEAGC;IAED;;;;;;;;OAQG;IACH,yCAPW,MAAM,wBAEN,MAAM,mBACN,aAAuC,0CAEvC,MAAM,QAkEhB;IAED;;;;OAIG;IACH,+CAGC;IAED;;;;;;;OAOG;IACH,wDA6BC;IAED;;;;;;OAMG;IACH,iHA2BC;IAED;;;;;;OAMG;IACH,2FAMC;IAED;;;;;;;OAOG;IACH;;;QAoCC;IAED;;;;;;OAMG;IACH,yCAJW,MAAM,sDAuBhB;IAED;;;;;OAKG;IACH,yBAJW,MAAM,EAAE,YACR,MAAM,GACJ,IAAI,MAAM,EAAE,MAAM,CAAC,CAU/B;IAED;;OAEG;IACH,4BAAwB;IAExB;;;OAGG;IACH,oDAgBC;IAED;;;;;OAKG;IACH,wBAJW,GAAG,cACH,MAAM,uBAqChB;IAED;;;;;;;;;;;;;;;;;;MA+BC;IAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;MA4BC;IAED;;;OAGG;IACH,mCAFW,MAAM;;MAOhB;IAED;;;OAGG;IACH,iCAFW,MAAM;;MAOhB;IAED,6CAQC;IAED;;;;;;;;;;;OAWG;IACH;QAL4B,KAAK,EAAtB,MAAM;QACW,KAAK,EAAtB,MAAM;QACa,MAAM,EAAzB,MAAM,EAAE;QAC0B,IAAI;;;;;;;;;;;;;;;;;;;;;;;;;MA2ChD;CACF"}
+{"version":3,"file":"ChartUtils.d.ts","sourceRoot":"","sources":["../src/ChartUtils.js"],"names":[],"mappings":";AAcA;IACE,iCAAgC;IAEhC,6BAA6B;IAE7B,6BAA2B;IAE3B,4BAAyB;IAEzB,+BAA4B;IAE5B,+BAA8B;IAE9B;;;OAGG;IAEH,2BAAkD;IAElD;;;;;;OAA8E;IAE9E;;OAAuD;IAEvD,oCAAiC;IAEjC;;;;OAIG;IACH,6DAFW,OAAO,yEA4BjB;IAED;;;OAGG;IACH,yEASC;IAED;;;;OAIG;IACH,2NA4DC;IAED,uDAOC;IAED;;;;;;;;OAQG;IACH,6BANW,aAAa,QACb,aAAa,SACb,aAAa,GAEX,MAAM,CAWlB;IAED;;;;MA4CC;IAED,6CAEC;IAED;;;;;aA2CC;IAED;;;;OAIG;IACH,wEA8BC;IAED;;;;;;OAMG;IACH,kCAJW,MAAM,QACN,MAAM,cACN,OAAO,UAqBjB;IAED;;;;;OAKG;IACH,oDAYC;IAED;;;;;OAKG;IACH,iCAJW,MAAM,YACN,MAAM,GACJ,OAAO,GAAC,MAAM,CAO1B;IAED;;;;OAIG;IACH,iCAHW,MAAM,GACJ,MAAM,EAAE,CAOpB;IAED;;;OAGG;IACH,8EAFa,MAAM,CASlB;IAED;;;;;;;OAOG;IACH,0DALW,SAAsB,KAAc,CAAC,oBACrC,OAAO,GAAC,MAAM,SACd,MAAM,GACJ,MAAM,CAkClB;IAED,0GAyBC;IAED,iJA0DC;IAED;;;;;;OAMG;IACH,oDAFa,IAAI,MAAM,EAAE,MAAM,CAAC,CAkG/B;IAED,gIASC;IAED;;;OAGG;IACH,4DASC;IAED;;;OAGG;IACH,kFAaC;IAED;;;;OAIG;IACH,wDAaC;IAED;;;;OAIG;IACH,+BAHW,MAAM,GACJ,MAAM,CAclB;IAED;;;;;;;;;;OAUG;IACH,qCANW,MAAM,QACN,KAAc,cACd,MAAM,eACN,MAAM,0CA6HhB;IAED,wEAGC;IAED;;;;;;;;OAQG;IACH,yCAPW,MAAM,wBAEN,MAAM,mBACN,aAAuC,0CAEvC,MAAM,QAkEhB;IAED;;;;OAIG;IACH,+CAGC;IAED;;;;;;;OAOG;IACH,wDA6BC;IAED;;;;;;OAMG;IACH,iHA2BC;IAED;;;;;;OAMG;IACH,2FAMC;IAED;;;;;;;OAOG;IACH;;;QAoCC;IAED;;;;;;OAMG;IACH,yCAJW,MAAM,sDAuBhB;IAED;;;;;OAKG;IACH,yBAJW,MAAM,EAAE,YACR,MAAM,GACJ,IAAI,MAAM,EAAE,MAAM,CAAC,CAU/B;IAED;;OAEG;IACH,4BAAwB;IAExB;;;OAGG;IACH,oDAgBC;IAED;;;;;OAKG;IACH,wBAJW,GAAG,cACH,MAAM,uBAqChB;IAED;;;;;;;;;;;;;;;;;;MA+BC;IAED;;;;;OAKG;IACH,yCAFa,MAAM,EAAE,CAepB;IAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;MA2BC;IAED;;;OAGG;IACH,mCAFW,MAAM;;MAOhB;IAED;;;OAGG;IACH,iCAFW,MAAM;;MAOhB;IAED,6CAQC;IAED;;;;;;;;;;;OAWG;IACH;QAL4B,KAAK,EAAtB,MAAM;QACW,KAAK,EAAtB,MAAM;QACa,MAAM,EAAzB,MAAM,EAAE;QAC0B,IAAI;;;;;;;;;;;;;;;;;;;;;;;;;MA2ChD;CACF"}

package/dist/ChartUtils.js

@@ -1,13 +1,12 @@
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); keys.push.apply(keys, symbols); } return keys; }
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (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 = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { 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; }
 
 import Log from '@deephaven/log';
-import { TableUtils } from '@deephaven/iris-grid';
+import TableUtils from '@deephaven/iris-grid/dist/TableUtils.js';
 import dh from '@deephaven/jsapi-shim';
-import ChartTheme from "./ChartTheme.js";
 var log = Log.module('ChartUtils');
 var DAYS = Object.freeze(dh.calendar.DayOfWeek.values());
 var BUSINESS_COLUMN_TYPE = 'io.deephaven.db.tables.utils.DBDateTime';
@@ -140,6 +139,9 @@ class ChartUtils {
         return 'low';
 
       case dh.plot.SourceType.CLOSE:
+        return 'close';
+
+      case dh.plot.SourceType.SHAPE:
         return 'shape';
 
       case dh.plot.SourceType.SIZE:
@@ -391,11 +393,12 @@ class ChartUtils {
    * @param {dh.plot.Series} series The series to create the series data with
    * @param {Map<dh.plot.AxisType, dh.plot.Axis[]>} axisTypeMap The map of axes grouped by type
    * @param {boolean|string} seriesVisibility Visibility setting for the series
+   * @param {Object} theme The theme properties for the plot. See ChartTheme.js for an example
    * @returns {Object} The series data (trace) object for use with plotly.
    */
 
 
-  static makeSeriesDataFromSeries(series, axisTypeMap, seriesVisibility) {
+  static makeSeriesDataFromSeries(series, axisTypeMap, seriesVisibility, theme) {
     var {
       name,
       plotStyle,
@@ -409,7 +412,7 @@ class ChartUtils {
     var orientation = ChartUtils.getPlotlySeriesOrientation(series);
     var seriesData = ChartUtils.makeSeriesData(type, mode, name, orientation);
     ChartUtils.addSourcesToSeriesData(seriesData, plotStyle, sources, axisTypeMap);
-    ChartUtils.addStylingToSeriesData(seriesData, plotStyle, lineColor, shapeColor, seriesVisibility);
+    ChartUtils.addStylingToSeriesData(seriesData, plotStyle, theme, lineColor, shapeColor, seriesVisibility);
     return seriesData;
   }
 
@@ -436,9 +439,10 @@ class ChartUtils {
   }
 
   static addStylingToSeriesData(seriesDataParam, plotStyle) {
-    var lineColor = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : null;
-    var shapeColor = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : null;
-    var seriesVisibility = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : null;
+    var theme = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
+    var lineColor = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : null;
+    var shapeColor = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : null;
+    var seriesVisibility = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : null;
     var seriesData = seriesDataParam; // Add some empty objects so we can fill them in later with details without checking for existence
 
     seriesData.marker = {
@@ -461,24 +465,24 @@ class ChartUtils {
       // Since it's converted to bar, just set the widths of each bar
       seriesData.width = [];
       Object.assign(seriesData.marker.line, {
-        color: ChartTheme.paper_bgcolor,
+        color: theme.paper_bgcolor,
         width: 1
       });
     } else if (plotStyle === dh.plot.SeriesPlotStyle.OHLC) {
       seriesData.increasing = {
         line: {
-          color: ChartTheme.ohlc_increasing
+          color: theme.ohlc_increasing
         }
       };
       seriesData.decreasing = {
         line: {
-          color: ChartTheme.ohlc_decreasing
+          color: theme.ohlc_decreasing
         }
       };
     } else if (plotStyle === dh.plot.SeriesPlotStyle.PIE) {
       seriesData.textinfo = 'label+percent';
       seriesData.outsidetextfont = {
-        color: ChartTheme.title_color
+        color: theme.title_color
       };
     }
 
@@ -720,6 +724,7 @@ class ChartUtils {
     var plotWidth = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 0;
     var plotHeight = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : 0;
     var getRangeParser = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : null;
+    var theme = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : {};
     var xAxisSize = plotWidth > 0 ? Math.max(ChartUtils.MIN_AXIS_SIZE, Math.min(ChartUtils.AXIS_SIZE_PX / plotHeight, ChartUtils.MAX_AXIS_SIZE)) : ChartUtils.DEFAULT_AXIS_SIZE;
     var yAxisSize = plotHeight > 0 ? Math.max(ChartUtils.MIN_AXIS_SIZE, Math.min(ChartUtils.AXIS_SIZE_PX / plotWidth, ChartUtils.MAX_AXIS_SIZE)) : ChartUtils.DEFAULT_AXIS_SIZE; // Adjust the bounds based on where the legend is
     // For now, always assume the legend is shown on the right
@@ -761,7 +766,7 @@ class ChartUtils {
           var _axisLayoutProperty = ChartUtils.getAxisLayoutProperty(axisProperty, axisIndex);
 
           if (layout[_axisLayoutProperty] == null) {
-            layout[_axisLayoutProperty] = ChartUtils.makeLayoutAxis(axisType);
+            layout[_axisLayoutProperty] = ChartUtils.makeLayoutAxis(axisType, theme);
           }
 
           var layoutAxis = layout[_axisLayoutProperty];
@@ -1076,24 +1081,25 @@ class ChartUtils {
   }
 
   static makeLayoutAxis(type) {
+    var theme = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
     var axis = {
       automargin: true,
-      gridcolor: ChartTheme.gridcolor,
-      linecolor: ChartTheme.linecolor,
+      gridcolor: theme.gridcolor,
+      linecolor: theme.linecolor,
       rangeslider: {
         visible: false
       },
       showline: true,
       ticklen: 5,
       // act as padding, can't find a tick padding
-      tickcolor: ChartTheme.paper_bgcolor,
+      tickcolor: theme.paper_bgcolor,
       // hide ticks as padding
       tickfont: {
-        color: ChartTheme.zerolinecolor
+        color: theme.zerolinecolor
       },
       title: {
         font: {
-          color: ChartTheme.title_color
+          color: theme.title_color
         }
       }
     };
@@ -1104,38 +1110,62 @@ class ChartUtils {
       });
     } else if (type === dh.plot.AxisType.Y) {
       Object.assign(axis, {
-        zerolinecolor: ChartTheme.zerolinecolor,
+        zerolinecolor: theme.zerolinecolor,
         zerolinewidth: 2
       });
     }
 
     return axis;
   }
+  /**
+   * Parses the colorway property of a theme and returns an array of colors
+   * Theme could have a single string with space separated colors or an array of strings representing the colorway
+   * @param {ChartTheme} theme The theme to get colorway from
+   * @returns {string[]} Colorway array for the theme
+   */
+
+
+  static getColorwayFromTheme(theme) {
+    var colorway = [];
+
+    if (theme.colorway) {
+      if (Array.isArray(theme.colorway)) {
+        colorway = theme.colorway;
+      } else if (typeof theme.colorway === 'string') {
+        colorway = theme.colorway.split(' ');
+      } else {
+        log.warn("Unable to handle colorway property: ".concat(theme.colorway));
+      }
+    }
+
+    return colorway;
+  }
 
   static makeDefaultLayout() {
-    var layout = _objectSpread(_objectSpread({}, ChartTheme), {}, {
+    var theme = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+
+    var layout = _objectSpread(_objectSpread({}, theme), {}, {
       autosize: true,
-      colorway: ChartTheme.colorway ? ChartTheme.colorway.split(' ') : [],
+      colorway: ChartUtils.getColorwayFromTheme(theme),
       font: {
         family: "'Fira Sans', sans-serif"
       },
       title: {
         font: {
-          color: ChartTheme.title_color
+          color: theme.title_color
         },
         yanchor: 'top',
         pad: _objectSpread({}, ChartUtils.DEFAULT_TITLE_PADDING),
-        y: 1,
-        text: 'Untitled'
+        y: 1
       },
       legend: {
         font: {
-          color: ChartTheme.title_color
+          color: theme.title_color
         }
       },
       margin: _objectSpread({}, ChartUtils.DEFAULT_MARGIN),
-      xaxis: ChartUtils.makeLayoutAxis(dh.plot.AxisType.X),
-      yaxis: ChartUtils.makeLayoutAxis(dh.plot.AxisType.Y)
+      xaxis: ChartUtils.makeLayoutAxis(dh.plot.AxisType.X, theme),
+      yaxis: ChartUtils.makeLayoutAxis(dh.plot.AxisType.Y, theme)
     });
 
     layout.datarevision = 0;