@deephaven/iris-grid 0.8.1-beta.0 → 0.8.2-beta.5

package/dist/Formatter.d.ts

@@ -19,20 +19,13 @@ declare class Formatter {
     };
     /**
      * @param {Array} columnFormattingRules Optional array of column formatting rules
-     * @param {Object} dateTimeOptions Optional object with DateTime configuration
-     * @param {string} dateTimeOptions.timeZone Time zone
-     * @param {boolean} dateTimeOptions.showTimeZone Show time zone in DateTime values
-     * @param {boolean} dateTimeOptions.showTSeparator Show 'T' separator in DateTime values
-     * @param {string} dateTimeOptions.defaultDateTimeFormatString DateTime format to use if columnFormats for DateTime isn't set
+     * @param {DateTimeColumnFormatterOptions} dateTimeOptions Optional object with DateTime configuration
+     * @param {DecimalColumnFormatterOptions} decimalFormatOptions Optional object with Decimal format configuration
+     * @param {IntegerColumnFormatterOptions} integerFormatOptions Optional object with Integer format configuration
      */
-    constructor(columnFormattingRules?: any[], dateTimeOptions?: {
-        timeZone: string;
-        showTimeZone: boolean;
-        showTSeparator: boolean;
-        defaultDateTimeFormatString: string;
-    });
+    constructor(columnFormattingRules?: any[], dateTimeOptions?: any, decimalFormatOptions?: any, integerFormatOptions?: any);
     defaultColumnFormatter: DefaultColumnFormatter;
-    typeFormatterMap: Map<string, DateTimeColumnFormatter>;
+    typeFormatterMap: Map<string, CharColumnFormatter>;
     columnFormatMap: any;
     /**
      * Gets columnFormatMap indexed by name for a given column type, creates new Map entry if necessary
@@ -48,7 +41,7 @@ declare class Formatter {
      * @returns format object or null for Default
      */
     getColumnFormat(columnType: string, columnName: string): any;
-    getColumnTypeFormatter(columnType: any): DateTimeColumnFormatter | DefaultColumnFormatter | undefined;
+    getColumnTypeFormatter(columnType: any): CharColumnFormatter | DefaultColumnFormatter | undefined;
     /**
      * Gets formatted string for a given value, column type and name
      * @param {Any} value Value to format
@@ -64,5 +57,5 @@ declare class Formatter {
     get timeZone(): string;
 }
 import { DefaultColumnFormatter } from "./formatters";
-import { DateTimeColumnFormatter } from "./formatters";
+import { CharColumnFormatter } from "./formatters";
 //# sourceMappingURL=Formatter.d.ts.map

package/dist/Formatter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Formatter.d.ts","sourceRoot":"","sources":["../src/Formatter.js"],"names":[],"mappings":";AAUA;IACE;;;;OAIG;IACH,8DAaC;IAED;;;;;OAKG;IACH;;;;MAMC;IAED;;;;;;;OAOG;IACH;QALmC,QAAQ,EAAhC,MAAM;QACmB,YAAY,EAArC,OAAO;QACkB,cAAc,EAAvC,OAAO;QACiB,2BAA2B,EAAnD,MAAM;OAwBhB;IAhBC,+CAA0D;IAG1D,uDASE;IAGF,qBAA2E;IAG7E;;;;;OAKG;IACH,gFAMC;IAED;;;;;OAKG;IACH,6DAMC;IAED,sGAMC;IAED;;;;;;OAMG;IACH,yGAeC;IAED;;;OAGG;IACH,uBAGC;CACF"}
+{"version":3,"file":"Formatter.d.ts","sourceRoot":"","sources":["../src/Formatter.js"],"names":[],"mappings":";AAUA;IACE;;;;OAIG;IACH,8DAaC;IAED;;;;;OAKG;IACH;;;;MAMC;IAED;;;;;OAKG;IACH,0HAiCC;IAtBC,+CAA0D;IAG1D,mDAeE;IAGF,qBAA2E;IAG7E;;;;;OAKG;IACH,gFAMC;IAED;;;;;OAKG;IACH,6DAMC;IAED,kGAMC;IAED;;;;;;OAMG;IACH,yGAeC;IAED;;;OAGG;IACH,uBAGC;CACF"}

package/dist/Formatter.js

@@ -41,24 +41,24 @@ class Formatter {
   }
   /**
    * @param {Array} columnFormattingRules Optional array of column formatting rules
-   * @param {Object} dateTimeOptions Optional object with DateTime configuration
-   * @param {string} dateTimeOptions.timeZone Time zone
-   * @param {boolean} dateTimeOptions.showTimeZone Show time zone in DateTime values
-   * @param {boolean} dateTimeOptions.showTSeparator Show 'T' separator in DateTime values
-   * @param {string} dateTimeOptions.defaultDateTimeFormatString DateTime format to use if columnFormats for DateTime isn't set
+   * @param {DateTimeColumnFormatterOptions} dateTimeOptions Optional object with DateTime configuration
+   * @param {DecimalColumnFormatterOptions} decimalFormatOptions Optional object with Decimal format configuration
+   * @param {IntegerColumnFormatterOptions} integerFormatOptions Optional object with Integer format configuration
    */
 
 
   constructor() {
     var columnFormattingRules = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
     var dateTimeOptions = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+    var decimalFormatOptions = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
+    var integerFormatOptions = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : {};
     // Formatting order:
     // - columnFormatMap[type][name]
     // - typeFormatterMap[type]
     // - defaultColumnFormatter
     this.defaultColumnFormatter = new DefaultColumnFormatter(); // Default formatters by data type
 
-    this.typeFormatterMap = new Map([[TableUtils.dataType.BOOLEAN, new BooleanColumnFormatter()], [TableUtils.dataType.CHAR, new CharColumnFormatter()], [TableUtils.dataType.DATETIME, new DateTimeColumnFormatter(dateTimeOptions)], [TableUtils.dataType.DECIMAL, new DecimalColumnFormatter()], [TableUtils.dataType.INT, new IntegerColumnFormatter()]]); // Formats indexed by data type and column name
+    this.typeFormatterMap = new Map([[TableUtils.dataType.BOOLEAN, new BooleanColumnFormatter()], [TableUtils.dataType.CHAR, new CharColumnFormatter()], [TableUtils.dataType.DATETIME, new DateTimeColumnFormatter(dateTimeOptions)], [TableUtils.dataType.DECIMAL, new DecimalColumnFormatter(decimalFormatOptions)], [TableUtils.dataType.INT, new IntegerColumnFormatter(integerFormatOptions)]]); // Formats indexed by data type and column name
 
     this.columnFormatMap = Formatter.makeColumnFormatMap(columnFormattingRules);
   }

package/dist/Formatter.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/Formatter.js"],"names":["TableUtils","BooleanColumnFormatter","CharColumnFormatter","DateTimeColumnFormatter","DecimalColumnFormatter","DefaultColumnFormatter","IntegerColumnFormatter","Formatter","makeColumnFormatMap","columnFormattingRules","Map","reduce","map","next","dataType","getNormalizedType","columnType","has","set","formatMap","get","columnName","format","makeColumnFormattingRule","constructor","dateTimeOptions","defaultColumnFormatter","typeFormatterMap","BOOLEAN","CHAR","DATETIME","DECIMAL","INT","columnFormatMap","getColumnFormatMapForType","createIfNecessary","getColumnFormat","getColumnTypeFormatter","getFormattedString","value","formatOverride","formatter","timeZone","dhTimeZone","id"],"mappings":"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","sourcesContent":["import TableUtils from './TableUtils';\nimport {\n  BooleanColumnFormatter,\n  CharColumnFormatter,\n  DateTimeColumnFormatter,\n  DecimalColumnFormatter,\n  DefaultColumnFormatter,\n  IntegerColumnFormatter,\n} from './formatters';\n\nclass Formatter {\n  /**\n   * Converts [{columnType, columnName, format}] to Map { dataType, Map { columnName, format }}\n   * @param {Array} columnFormattingRules Array or column formatting rules\n   * @returns Map of columnName-to-format Maps indexed by normalized dataType\n   */\n  static makeColumnFormatMap(columnFormattingRules) {\n    if (columnFormattingRules == null) {\n      return new Map();\n    }\n    return columnFormattingRules.reduce((map, next) => {\n      const dataType = TableUtils.getNormalizedType(next.columnType);\n      if (!map.has(dataType)) {\n        map.set(dataType, new Map());\n      }\n      const formatMap = map.get(dataType);\n      formatMap.set(next.columnName, next.format);\n      return map;\n    }, new Map());\n  }\n\n  /**\n   * Creates a column formatting rule\n   * @param {String} columnType Normalized data type\n   * @param {String} columnName Column name\n   * @param {String} format Format string\n   */\n  static makeColumnFormattingRule(columnType, columnName, format) {\n    return {\n      columnType,\n      columnName,\n      format,\n    };\n  }\n\n  /**\n   * @param {Array} columnFormattingRules Optional array of column formatting rules\n   * @param {Object} dateTimeOptions Optional object with DateTime configuration\n   * @param {string} dateTimeOptions.timeZone Time zone\n   * @param {boolean} dateTimeOptions.showTimeZone Show time zone in DateTime values\n   * @param {boolean} dateTimeOptions.showTSeparator Show 'T' separator in DateTime values\n   * @param {string} dateTimeOptions.defaultDateTimeFormatString DateTime format to use if columnFormats for DateTime isn't set\n   */\n  constructor(columnFormattingRules = [], dateTimeOptions = {}) {\n    // Formatting order:\n    // - columnFormatMap[type][name]\n    // - typeFormatterMap[type]\n    // - defaultColumnFormatter\n\n    this.defaultColumnFormatter = new DefaultColumnFormatter();\n\n    // Default formatters by data type\n    this.typeFormatterMap = new Map([\n      [TableUtils.dataType.BOOLEAN, new BooleanColumnFormatter()],\n      [TableUtils.dataType.CHAR, new CharColumnFormatter()],\n      [\n        TableUtils.dataType.DATETIME,\n        new DateTimeColumnFormatter(dateTimeOptions),\n      ],\n      [TableUtils.dataType.DECIMAL, new DecimalColumnFormatter()],\n      [TableUtils.dataType.INT, new IntegerColumnFormatter()],\n    ]);\n\n    // Formats indexed by data type and column name\n    this.columnFormatMap = Formatter.makeColumnFormatMap(columnFormattingRules);\n  }\n\n  /**\n   * Gets columnFormatMap indexed by name for a given column type, creates new Map entry if necessary\n   * @param {String} columnType column type\n   * @param {Boolean} createIfNecessary create new entry if true\n   * @returns Map of format strings indexed by column name or undefined if it doesn't exist\n   */\n  getColumnFormatMapForType(columnType, createIfNecessary = false) {\n    const dataType = TableUtils.getNormalizedType(columnType);\n    if (createIfNecessary && !this.columnFormatMap.has(dataType)) {\n      this.columnFormatMap.set(dataType, new Map());\n    }\n    return this.columnFormatMap.get(dataType);\n  }\n\n  /**\n   * Gets a column format object for a given column type and name\n   * @param {String} columnType column type\n   * @param {String} columnName column name\n   * @returns format object or null for Default\n   */\n  getColumnFormat(columnType, columnName) {\n    const columnFormatMap = this.getColumnFormatMapForType(columnType);\n    if (columnFormatMap && columnFormatMap.has(columnName)) {\n      return columnFormatMap.get(columnName);\n    }\n    return null;\n  }\n\n  getColumnTypeFormatter(columnType) {\n    const dataType = TableUtils.getNormalizedType(columnType);\n    if (dataType && this.typeFormatterMap.has(dataType)) {\n      return this.typeFormatterMap.get(dataType);\n    }\n    return this.defaultColumnFormatter;\n  }\n\n  /**\n   * Gets formatted string for a given value, column type and name\n   * @param {Any} value Value to format\n   * @param {String} columnType Column type used to determine the formatting settings\n   * @param {String} columnName Column name used to determine the formatting settings\n   * @param {String} formatOverride Format object passed to the formatter in place of the format defined in columnFormatMap\n   */\n  getFormattedString(\n    value,\n    columnType,\n    columnName = '',\n    formatOverride = null\n  ) {\n    if (value == null) {\n      return '';\n    }\n\n    const formatter = this.getColumnTypeFormatter(columnType);\n    const format =\n      formatOverride || this.getColumnFormat(columnType, columnName);\n\n    return formatter.format(value, format);\n  }\n\n  /**\n   * Gets the timeZone name\n   * @returns {string} The time zone name E.g. America/New_York\n   */\n  get timeZone() {\n    return this.typeFormatterMap.get(TableUtils.dataType.DATETIME)?.dhTimeZone\n      ?.id;\n  }\n}\n\nexport default Formatter;\n"],"file":"Formatter.js"}
+{"version":3,"sources":["../src/Formatter.js"],"names":["TableUtils","BooleanColumnFormatter","CharColumnFormatter","DateTimeColumnFormatter","DecimalColumnFormatter","DefaultColumnFormatter","IntegerColumnFormatter","Formatter","makeColumnFormatMap","columnFormattingRules","Map","reduce","map","next","dataType","getNormalizedType","columnType","has","set","formatMap","get","columnName","format","makeColumnFormattingRule","constructor","dateTimeOptions","decimalFormatOptions","integerFormatOptions","defaultColumnFormatter","typeFormatterMap","BOOLEAN","CHAR","DATETIME","DECIMAL","INT","columnFormatMap","getColumnFormatMapForType","createIfNecessary","getColumnFormat","getColumnTypeFormatter","getFormattedString","value","formatOverride","formatter","timeZone","dhTimeZone","id"],"mappings":"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","sourcesContent":["import TableUtils from './TableUtils';\nimport {\n  BooleanColumnFormatter,\n  CharColumnFormatter,\n  DateTimeColumnFormatter,\n  DecimalColumnFormatter,\n  DefaultColumnFormatter,\n  IntegerColumnFormatter,\n} from './formatters';\n\nclass Formatter {\n  /**\n   * Converts [{columnType, columnName, format}] to Map { dataType, Map { columnName, format }}\n   * @param {Array} columnFormattingRules Array or column formatting rules\n   * @returns Map of columnName-to-format Maps indexed by normalized dataType\n   */\n  static makeColumnFormatMap(columnFormattingRules) {\n    if (columnFormattingRules == null) {\n      return new Map();\n    }\n    return columnFormattingRules.reduce((map, next) => {\n      const dataType = TableUtils.getNormalizedType(next.columnType);\n      if (!map.has(dataType)) {\n        map.set(dataType, new Map());\n      }\n      const formatMap = map.get(dataType);\n      formatMap.set(next.columnName, next.format);\n      return map;\n    }, new Map());\n  }\n\n  /**\n   * Creates a column formatting rule\n   * @param {String} columnType Normalized data type\n   * @param {String} columnName Column name\n   * @param {String} format Format string\n   */\n  static makeColumnFormattingRule(columnType, columnName, format) {\n    return {\n      columnType,\n      columnName,\n      format,\n    };\n  }\n\n  /**\n   * @param {Array} columnFormattingRules Optional array of column formatting rules\n   * @param {DateTimeColumnFormatterOptions} dateTimeOptions Optional object with DateTime configuration\n   * @param {DecimalColumnFormatterOptions} decimalFormatOptions Optional object with Decimal format configuration\n   * @param {IntegerColumnFormatterOptions} integerFormatOptions Optional object with Integer format configuration\n   */\n  constructor(\n    columnFormattingRules = [],\n    dateTimeOptions = {},\n    decimalFormatOptions = {},\n    integerFormatOptions = {}\n  ) {\n    // Formatting order:\n    // - columnFormatMap[type][name]\n    // - typeFormatterMap[type]\n    // - defaultColumnFormatter\n\n    this.defaultColumnFormatter = new DefaultColumnFormatter();\n\n    // Default formatters by data type\n    this.typeFormatterMap = new Map([\n      [TableUtils.dataType.BOOLEAN, new BooleanColumnFormatter()],\n      [TableUtils.dataType.CHAR, new CharColumnFormatter()],\n      [\n        TableUtils.dataType.DATETIME,\n        new DateTimeColumnFormatter(dateTimeOptions),\n      ],\n      [\n        TableUtils.dataType.DECIMAL,\n        new DecimalColumnFormatter(decimalFormatOptions),\n      ],\n      [\n        TableUtils.dataType.INT,\n        new IntegerColumnFormatter(integerFormatOptions),\n      ],\n    ]);\n\n    // Formats indexed by data type and column name\n    this.columnFormatMap = Formatter.makeColumnFormatMap(columnFormattingRules);\n  }\n\n  /**\n   * Gets columnFormatMap indexed by name for a given column type, creates new Map entry if necessary\n   * @param {String} columnType column type\n   * @param {Boolean} createIfNecessary create new entry if true\n   * @returns Map of format strings indexed by column name or undefined if it doesn't exist\n   */\n  getColumnFormatMapForType(columnType, createIfNecessary = false) {\n    const dataType = TableUtils.getNormalizedType(columnType);\n    if (createIfNecessary && !this.columnFormatMap.has(dataType)) {\n      this.columnFormatMap.set(dataType, new Map());\n    }\n    return this.columnFormatMap.get(dataType);\n  }\n\n  /**\n   * Gets a column format object for a given column type and name\n   * @param {String} columnType column type\n   * @param {String} columnName column name\n   * @returns format object or null for Default\n   */\n  getColumnFormat(columnType, columnName) {\n    const columnFormatMap = this.getColumnFormatMapForType(columnType);\n    if (columnFormatMap && columnFormatMap.has(columnName)) {\n      return columnFormatMap.get(columnName);\n    }\n    return null;\n  }\n\n  getColumnTypeFormatter(columnType) {\n    const dataType = TableUtils.getNormalizedType(columnType);\n    if (dataType && this.typeFormatterMap.has(dataType)) {\n      return this.typeFormatterMap.get(dataType);\n    }\n    return this.defaultColumnFormatter;\n  }\n\n  /**\n   * Gets formatted string for a given value, column type and name\n   * @param {Any} value Value to format\n   * @param {String} columnType Column type used to determine the formatting settings\n   * @param {String} columnName Column name used to determine the formatting settings\n   * @param {String} formatOverride Format object passed to the formatter in place of the format defined in columnFormatMap\n   */\n  getFormattedString(\n    value,\n    columnType,\n    columnName = '',\n    formatOverride = null\n  ) {\n    if (value == null) {\n      return '';\n    }\n\n    const formatter = this.getColumnTypeFormatter(columnType);\n    const format =\n      formatOverride || this.getColumnFormat(columnType, columnName);\n\n    return formatter.format(value, format);\n  }\n\n  /**\n   * Gets the timeZone name\n   * @returns {string} The time zone name E.g. America/New_York\n   */\n  get timeZone() {\n    return this.typeFormatterMap.get(TableUtils.dataType.DATETIME)?.dhTimeZone\n      ?.id;\n  }\n}\n\nexport default Formatter;\n"],"file":"Formatter.js"}

package/dist/IrisGrid.d.ts

@@ -80,6 +80,8 @@ export class IrisGrid extends React.Component<any, any, any> {
     pending: Pending;
     globalColumnFormats: any[];
     dateTimeFormatterOptions: {};
+    decimalFormatOptions: {};
+    integerFormatOptions: {};
     loadingScrimStartTime: number | null;
     loadingScrimFinishTime: number | null;
     loadingTimer: NodeJS.Timeout | null;
@@ -467,6 +469,12 @@ export namespace IrisGrid {
             const showTimeZone: boolean;
             const showTSeparator: boolean;
             const formatter: never[];
+            const decimalFormatOptions: PropTypes.Requireable<PropTypes.InferProps<{
+                defaultFormatString: PropTypes.Requireable<string>;
+            }>>;
+            const integerFormatOptions: PropTypes.Requireable<PropTypes.InferProps<{
+                defaultFormatString: PropTypes.Requireable<string>;
+            }>>;
         }
         export { settings_1 as settings };
         const canCopy_1: boolean;

package/dist/IrisGrid.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"IrisGrid.d.ts","sourceRoot":"","sources":["../src/IrisGrid.jsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"IrisGrid.d.ts","sourceRoot":"","sources":["../src/IrisGrid.jsx"],"names":[],"mappings":"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"}

package/dist/IrisGrid.js

@@ -341,7 +341,9 @@ export class IrisGrid extends Component {
     this.tooltip = null;
     this.pending = new Pending();
     this.globalColumnFormats = [];
-    this.dateTimeFormatterOptions = {}; // When the loading scrim started/when it should extend to the end of the screen.
+    this.dateTimeFormatterOptions = {};
+    this.decimalFormatOptions = {};
+    this.integerFormatOptions = {}; // When the loading scrim started/when it should extend to the end of the screen.
 
     this.loadingScrimStartTime = null;
     this.loadingScrimFinishTime = null;
@@ -962,12 +964,20 @@ export class IrisGrid extends Component {
     var forceUpdate = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : true;
     var globalColumnFormats = FormatterUtils.getColumnFormats(settings);
     var dateTimeFormatterOptions = FormatterUtils.getDateTimeFormatterOptions(settings);
+    var {
+      defaultDecimalFormatOptions = {},
+      defaultIntegerFormatOptions = {}
+    } = settings;
     var isColumnFormatChanged = !deepEqual(this.globalColumnFormats, globalColumnFormats);
     var isDateFormattingChanged = !deepEqual(this.dateTimeFormatterOptions, dateTimeFormatterOptions);
+    var isDecimalFormattingChanged = !deepEqual(this.decimalFormatOptions, defaultDecimalFormatOptions);
+    var isIntegerFormattingChanged = !deepEqual(this.integerFormatOptions, defaultIntegerFormatOptions);
 
-    if (isColumnFormatChanged || isDateFormattingChanged) {
+    if (isColumnFormatChanged || isDateFormattingChanged || isDecimalFormattingChanged || isIntegerFormattingChanged) {
       this.globalColumnFormats = globalColumnFormats;
       this.dateTimeFormatterOptions = dateTimeFormatterOptions;
+      this.decimalFormatOptions = defaultDecimalFormatOptions;
+      this.integerFormatOptions = defaultIntegerFormatOptions;
       this.updateFormatter({}, forceUpdate);
 
       if (isDateFormattingChanged && forceUpdate) {
@@ -987,7 +997,7 @@ export class IrisGrid extends Component {
     }, updatedFormats);
 
     var mergedColumnFormats = [...this.globalColumnFormats, ...update.customColumnFormatMap.values()];
-    var formatter = new Formatter(mergedColumnFormats, this.dateTimeFormatterOptions);
+    var formatter = new Formatter(mergedColumnFormats, this.dateTimeFormatterOptions, this.decimalFormatOptions, this.integerFormatOptions);
     log.debug('updateFormatter', this.globalColumnFormats, mergedColumnFormats);
     this.setState(_objectSpread(_objectSpread({}, update), {}, {
       formatter
@@ -3193,7 +3203,13 @@ IrisGrid.defaultProps = {
     defaultDateTimeFormat: DateUtils.FULL_DATE_FORMAT,
     showTimeZone: false,
     showTSeparator: true,
-    formatter: []
+    formatter: [],
+    decimalFormatOptions: PropTypes.shape({
+      defaultFormatString: PropTypes.string
+    }),
+    integerFormatOptions: PropTypes.shape({
+      defaultFormatString: PropTypes.string
+    })
   },
   canCopy: true,
   canDownloadCsv: true,