@deephaven/iris-grid 0.8.2-beta.5 → 0.9.1-beta.2

package/dist/AdvancedFilterCreator.d.ts

@@ -19,10 +19,10 @@ declare class AdvancedFilterCreator extends React.PureComponent<any, any, any> {
     focusTrapContainer: React.RefObject<any>;
     debounceTimeout: NodeJS.Timeout | null;
     filterKey: number;
-    valuesTablePromise: import("@deephaven/utils").CancelablePromise<any> | null;
+    valuesTablePromise: import("@deephaven/utils").CancelablePromise<import("@deephaven/jsapi-shim").Table> | null;
     getFilterChangeHandler(index: any): (selectedType?: any, value?: any) => void;
     getFilterDeleteHandler(index: any): () => void;
-    getFilterTypes: (this: any, columnType: any) => string[];
+    getFilterTypes: (this: any, columnType: any) => import("./filters").FilterType[];
     initValuesTable(): void;
     makeFilterItem(updateKey?: boolean): {
         selectedType: string;

package/dist/AdvancedFilterCreator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"AdvancedFilterCreator.d.ts","sourceRoot":"","sources":["../src/AdvancedFilterCreator.jsx"],"names":[],"mappings":";AAsBA;IACE,oCAAkC;IAElC,wBA2DC;IAmED,qBAKC;IAED,oBAKC;IAED,6CAWC;IA0ED,6BASC;IAjFD,0EASC;IAED,2CAsBC;IAED,yEAIC;IAED,oBAWC;IAED,iCAGC;IAED,+BAGC;IAED,+BAMC;IAxGD,6BAKC;IAZD,2BAKC;IAuHD,4BAGC;IA3NC,yCAA2C;IAC3C,uCAA2B;IAC3B,kBAAkB;IAClB,6EAA8B;IAoDhC,8EAEC;IAED,+CAEC;IAED,yDAA8E;IAE9E,wBAyBC;IAmID;;;;MAMC;IAED;;;;OAIG;IACH,+BAeC;IAED;;;;OAIG;IACH,6CAFW,OAAO,QAKjB;IAED,yBAOC;IAED,wBAKC;IAED,mBAwBC;CAyLF"}
+{"version":3,"file":"AdvancedFilterCreator.d.ts","sourceRoot":"","sources":["../src/AdvancedFilterCreator.jsx"],"names":[],"mappings":";AAsBA;IACE,oCAAkC;IAElC,wBA2DC;IAmED,qBAKC;IAED,oBAKC;IAED,6CAWC;IA0ED,6BASC;IAjFD,0EASC;IAED,2CAsBC;IAED,yEAIC;IAED,oBAWC;IAED,iCAGC;IAED,+BAGC;IAED,+BAMC;IAxGD,6BAKC;IAZD,2BAKC;IAuHD,4BAGC;IA3NC,yCAA2C;IAC3C,uCAA2B;IAC3B,kBAAkB;IAClB,+GAA8B;IAoDhC,8EAEC;IAED,+CAEC;IAED,iFAA8E;IAE9E,wBAyBC;IAmID;;;;MAMC;IAED;;;;OAIG;IACH,+BAeC;IAED;;;;OAIG;IACH,6CAFW,OAAO,QAKjB;IAED,yBAOC;IAED,wBAKC;IAED,mBAwBC;CAyLF"}

package/dist/AdvancedFilterCreatorFilterItem.d.ts

@@ -1,34 +1,33 @@
-export default AdvancedFilterCreatorFilterItem;
-declare class AdvancedFilterCreatorFilterItem extends React.PureComponent<any, any, any> {
-    static getLabelForTextFilter(filterType: any): "" | "contains" | "is exactly" | "is exactly (ignore case)" | "is not exactly" | "is not exactly (ignore case)" | "does not contain" | "starts with" | "ends with";
-    static getLabelForNumberFilter(filterType: any): "" | "is equal to" | "is not equal to" | "greater than" | "greater than or equal to" | "less than" | "less than or equal to";
-    static getLabelForDateFilter(filterType: any): "" | "date is" | "date is not" | "date is before" | "date is before or equal" | "date is after" | "date is after or equal";
-    static getLabelForBooleanFilter(filterType: any): "" | "Is True" | "Is False" | "Is Null";
-    static getLabelForFilter(columnType: any, filterType: any): "" | "contains" | "is equal to" | "is not equal to" | "greater than" | "greater than or equal to" | "less than" | "less than or equal to" | "date is" | "date is not" | "date is before" | "date is before or equal" | "date is after" | "date is after or equal" | "is exactly" | "is exactly (ignore case)" | "is not exactly" | "is not exactly (ignore case)" | "does not contain" | "starts with" | "ends with" | "Is True" | "Is False" | "Is Null";
-    constructor(props: any);
-    handleDelete(): void;
-    handleTypeChange(event: any): void;
-    handleValueChange(event: any): void;
-    typeDropdown: HTMLSelectElement | null;
+import React, { PureComponent } from 'react';
+import { FilterTypeValue } from './filters';
+interface AdvancedFilterCreatorFilterItemProps {
+    column: {
+        type: string;
+    };
+    filterTypes: FilterTypeValue[];
+    onChange(type: FilterTypeValue, value: string): void;
+    onDelete(): void;
+    selectedType?: FilterTypeValue;
+    value?: string;
 }
-declare namespace AdvancedFilterCreatorFilterItem {
-    namespace propTypes {
-        const column: PropTypes.Validator<PropTypes.InferProps<{
-            type: PropTypes.Requireable<string>;
-        }>>;
-        const filterTypes: PropTypes.Validator<(string | null | undefined)[]>;
-        const onChange: PropTypes.Validator<(...args: any[]) => any>;
-        const onDelete: PropTypes.Validator<(...args: any[]) => any>;
-        const selectedType: PropTypes.Requireable<string>;
-        const value: PropTypes.Requireable<string>;
-    }
-    namespace defaultProps {
-        const selectedType_1: string;
-        export { selectedType_1 as selectedType };
-        const value_1: string;
-        export { value_1 as value };
-    }
+export interface AdvancedFilterCreatorFilterItemState {
+    selectedType: FilterTypeValue;
+    value: string;
 }
-import React from "react";
-import PropTypes from "prop-types";
+declare class AdvancedFilterCreatorFilterItem extends PureComponent<AdvancedFilterCreatorFilterItemProps, AdvancedFilterCreatorFilterItemState> {
+    static getLabelForTextFilter(filterType: FilterTypeValue): string;
+    static getLabelForNumberFilter(filterType: FilterTypeValue): string;
+    static getLabelForDateFilter(filterType: FilterTypeValue): string;
+    static getLabelForBooleanFilter(filterType: FilterTypeValue): string;
+    static getLabelForFilter(columnType: string, filterType: FilterTypeValue): string;
+    constructor(props: AdvancedFilterCreatorFilterItemProps);
+    componentDidMount(): void;
+    componentDidUpdate(prevProps: AdvancedFilterCreatorFilterItemProps): void;
+    typeDropdown: HTMLSelectElement | null;
+    handleTypeChange(event: React.ChangeEvent<HTMLSelectElement>): void;
+    handleValueChange(event: React.ChangeEvent<HTMLInputElement>): void;
+    handleDelete(): void;
+    render(): JSX.Element;
+}
+export default AdvancedFilterCreatorFilterItem;
 //# sourceMappingURL=AdvancedFilterCreatorFilterItem.d.ts.map

package/dist/AdvancedFilterCreatorFilterItem.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"AdvancedFilterCreatorFilterItem.d.ts","sourceRoot":"","sources":["../src/AdvancedFilterCreatorFilterItem.jsx"],"names":[],"mappings":";AAYA;IACE,kNAsBC;IAED,8KAkBC;IAED,0KAmBC;IAED,0FAYC;IAED,sfAsBC;IAED,wBAcC;IAuCD,qBAKC;IA/BD,mCAWC;IAED,oCAWC;IA7CC,uCAAwB;CAmH3B"}
+{"version":3,"file":"AdvancedFilterCreatorFilterItem.d.ts","sourceRoot":"","sources":["../src/AdvancedFilterCreatorFilterItem.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,EAAE,aAAa,EAAE,MAAM,OAAO,CAAC;AAM7C,OAAO,EAAc,eAAe,EAAE,MAAM,WAAW,CAAC;AAIxD,UAAU,oCAAoC;IAC5C,MAAM,EAAE;QAAE,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC;IACzB,WAAW,EAAE,eAAe,EAAE,CAAC;IAC/B,QAAQ,CAAC,IAAI,EAAE,eAAe,EAAE,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IACrD,QAAQ,IAAI,IAAI,CAAC;IACjB,YAAY,CAAC,EAAE,eAAe,CAAC;IAC/B,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAED,MAAM,WAAW,oCAAoC;IACnD,YAAY,EAAE,eAAe,CAAC;IAC9B,KAAK,EAAE,MAAM,CAAC;CACf;AAED,cAAM,+BAAgC,SAAQ,aAAa,CACzD,oCAAoC,EACpC,oCAAoC,CACrC;IACC,MAAM,CAAC,qBAAqB,CAAC,UAAU,EAAE,eAAe,GAAG,MAAM;IAwBjE,MAAM,CAAC,uBAAuB,CAAC,UAAU,EAAE,eAAe,GAAG,MAAM;IAoBnE,MAAM,CAAC,qBAAqB,CAAC,UAAU,EAAE,eAAe,GAAG,MAAM;IAqBjE,MAAM,CAAC,wBAAwB,CAAC,UAAU,EAAE,eAAe,GAAG,MAAM;IAcpE,MAAM,CAAC,iBAAiB,CACtB,UAAU,EAAE,MAAM,EAClB,UAAU,EAAE,eAAe,GAC1B,MAAM;gBAwBG,KAAK,EAAE,oCAAoC;IAgBvD,iBAAiB,IAAI,IAAI;IAIzB,kBAAkB,CAAC,SAAS,EAAE,oCAAoC,GAAG,IAAI;IAWzE,YAAY,EAAE,iBAAiB,GAAG,IAAI,CAAC;IAEvC,gBAAgB,CAAC,KAAK,EAAE,KAAK,CAAC,WAAW,CAAC,iBAAiB,CAAC,GAAG,IAAI;IAanE,iBAAiB,CAAC,KAAK,EAAE,KAAK,CAAC,WAAW,CAAC,gBAAgB,CAAC,GAAG,IAAI;IAanE,YAAY,IAAI,IAAI;IAOpB,MAAM,IAAI,GAAG,CAAC,OAAO;CA6DtB;AAED,eAAe,+BAA+B,CAAC"}

package/dist/AdvancedFilterCreatorFilterItem.js

@@ -1,12 +1,13 @@
+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 react/no-did-update-set-state: "off" */
 import React, { PureComponent } from 'react';
-import PropTypes from 'prop-types';
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
 import { Tooltip } from '@deephaven/components';
 import { vsTrash } from '@deephaven/icons';
 import Log from '@deephaven/log';
 import TableUtils from "./TableUtils.js";
-import FilterType from "./filters/FilterType.js";
+import { FilterType } from "./filters/index.js";
 var log = Log.module('AdvancedFilterCreatorFilterItem');
 
 class AdvancedFilterCreatorFilterItem extends PureComponent {
@@ -135,29 +136,35 @@ class AdvancedFilterCreatorFilterItem extends PureComponent {
 
   constructor(props) {
     super(props);
+
+    _defineProperty(this, "typeDropdown", void 0);
+
     this.handleDelete = this.handleDelete.bind(this);
     this.handleTypeChange = this.handleTypeChange.bind(this);
     this.handleValueChange = this.handleValueChange.bind(this);
     this.typeDropdown = null;
     var {
-      selectedType,
-      value,
-      filterTypes
+      value = '',
+      filterTypes,
+      selectedType = filterTypes[0]
     } = props;
     this.state = {
-      selectedType: selectedType || filterTypes[0],
+      selectedType,
       value
     };
   }
 
   componentDidMount() {
-    this.typeDropdown.focus();
+    var _this$typeDropdown;
+
+    (_this$typeDropdown = this.typeDropdown) === null || _this$typeDropdown === void 0 ? void 0 : _this$typeDropdown.focus();
   }
 
   componentDidUpdate(prevProps) {
     var {
-      selectedType,
-      value
+      value = '',
+      filterTypes,
+      selectedType = filterTypes[0]
     } = this.props;
 
     if (prevProps.selectedType !== selectedType || prevProps.value !== value) {
@@ -202,7 +209,7 @@ class AdvancedFilterCreatorFilterItem extends PureComponent {
       selectedType
     } = this.state;
 
-    if (selectedType != null && selectedType.length > 0) {
+    if (selectedType != null) {
       // Don't send an update unless they've already selected a type
       onChange(selectedType, value);
     }
@@ -229,11 +236,11 @@ class AdvancedFilterCreatorFilterItem extends PureComponent {
     var typeOptionElements = [];
 
     for (var i = 0; i < filterTypes.length; i += 1) {
-      var type = filterTypes[i];
-      var label = AdvancedFilterCreatorFilterItem.getLabelForFilter(column.type, type);
+      var _type = filterTypes[i];
+      var label = AdvancedFilterCreatorFilterItem.getLabelForFilter(column.type, _type);
       var element = /*#__PURE__*/React.createElement("option", {
-        key: type,
-        value: type
+        key: _type,
+        value: _type
       }, label);
       typeOptionElements.push(element);
     }
@@ -274,19 +281,5 @@ class AdvancedFilterCreatorFilterItem extends PureComponent {
 
 }
 
-AdvancedFilterCreatorFilterItem.propTypes = {
-  column: PropTypes.shape({
-    type: PropTypes.string
-  }).isRequired,
-  filterTypes: PropTypes.arrayOf(PropTypes.string).isRequired,
-  onChange: PropTypes.func.isRequired,
-  onDelete: PropTypes.func.isRequired,
-  selectedType: PropTypes.string,
-  value: PropTypes.string
-};
-AdvancedFilterCreatorFilterItem.defaultProps = {
-  selectedType: '',
-  value: ''
-};
 export default AdvancedFilterCreatorFilterItem;
 //# sourceMappingURL=AdvancedFilterCreatorFilterItem.js.map

package/dist/AdvancedFilterCreatorFilterItem.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/AdvancedFilterCreatorFilterItem.jsx"],"names":["React","PureComponent","PropTypes","FontAwesomeIcon","Tooltip","vsTrash","Log","TableUtils","FilterType","log","module","AdvancedFilterCreatorFilterItem","getLabelForTextFilter","filterType","eq","eqIgnoreCase","notEq","notEqIgnoreCase","contains","notContains","startsWith","endsWith","warn","getLabelForNumberFilter","greaterThan","greaterThanOrEqualTo","lessThan","lessThanOrEqualTo","getLabelForDateFilter","getLabelForBooleanFilter","isTrue","isFalse","isNull","getLabelForFilter","columnType","isNumberType","isCharType","isTextType","isDateType","isBooleanType","constructor","props","handleDelete","bind","handleTypeChange","handleValueChange","typeDropdown","selectedType","value","filterTypes","state","componentDidMount","focus","componentDidUpdate","prevProps","setState","event","debug2","target","onChange","length","debug","onDelete","render","column","showValueInput","type","typeOptionElements","i","label","element","push","propTypes","shape","string","isRequired","arrayOf","func","defaultProps"],"mappings":"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","sourcesContent":["/* eslint react/no-did-update-set-state: \"off\" */\nimport React, { PureComponent } from 'react';\nimport PropTypes from 'prop-types';\nimport { FontAwesomeIcon } from '@fortawesome/react-fontawesome';\nimport { Tooltip } from '@deephaven/components';\nimport { vsTrash } from '@deephaven/icons';\nimport Log from '@deephaven/log';\nimport TableUtils from './TableUtils';\nimport FilterType from './filters/FilterType';\n\nconst log = Log.module('AdvancedFilterCreatorFilterItem');\n\nclass AdvancedFilterCreatorFilterItem extends PureComponent {\n  static getLabelForTextFilter(filterType) {\n    switch (filterType) {\n      case FilterType.eq:\n        return 'is exactly';\n      case FilterType.eqIgnoreCase:\n        return 'is exactly (ignore case)';\n      case FilterType.notEq:\n        return 'is not exactly';\n      case FilterType.notEqIgnoreCase:\n        return 'is not exactly (ignore case)';\n      case FilterType.contains:\n        return 'contains';\n      case FilterType.notContains:\n        return 'does not contain';\n      case FilterType.startsWith:\n        return 'starts with';\n      case FilterType.endsWith:\n        return 'ends with';\n      default:\n        log.warn('Unrecognized text filter type', filterType);\n        return '';\n    }\n  }\n\n  static getLabelForNumberFilter(filterType) {\n    switch (filterType) {\n      case FilterType.eq:\n        return 'is equal to';\n      case FilterType.notEq:\n        return 'is not equal to';\n      case FilterType.greaterThan:\n        return 'greater than';\n      case FilterType.greaterThanOrEqualTo:\n        return 'greater than or equal to';\n      case FilterType.lessThan:\n        return 'less than';\n      case FilterType.lessThanOrEqualTo:\n        return 'less than or equal to';\n      default:\n        log.warn('Unrecognized number filter type', filterType);\n        return '';\n    }\n  }\n\n  static getLabelForDateFilter(filterType) {\n    switch (filterType) {\n      case FilterType.eq:\n        return 'date is';\n      case FilterType.notEq:\n        return 'date is not';\n      case FilterType.notEqIgnoreCase:\n      case FilterType.greaterThan:\n        return 'date is after';\n      case FilterType.greaterThanOrEqualTo:\n        return 'date is after or equal';\n      case FilterType.lessThan:\n        return 'date is before';\n      case FilterType.lessThanOrEqualTo:\n        return 'date is before or equal';\n      default:\n        log.warn('Unrecognized date filter type', filterType);\n        return '';\n    }\n  }\n\n  static getLabelForBooleanFilter(filterType) {\n    switch (filterType) {\n      case FilterType.isTrue:\n        return 'Is True';\n      case FilterType.isFalse:\n        return 'Is False';\n      case FilterType.isNull:\n        return 'Is Null';\n      default:\n        log.warn('Unrecognized boolean filter type', filterType);\n        return '';\n    }\n  }\n\n  static getLabelForFilter(columnType, filterType) {\n    if (\n      TableUtils.isNumberType(columnType) ||\n      TableUtils.isCharType(columnType)\n    ) {\n      return AdvancedFilterCreatorFilterItem.getLabelForNumberFilter(\n        filterType\n      );\n    }\n    if (TableUtils.isTextType(columnType)) {\n      return AdvancedFilterCreatorFilterItem.getLabelForTextFilter(filterType);\n    }\n    if (TableUtils.isDateType(columnType)) {\n      return AdvancedFilterCreatorFilterItem.getLabelForDateFilter(filterType);\n    }\n    if (TableUtils.isBooleanType(columnType)) {\n      return AdvancedFilterCreatorFilterItem.getLabelForBooleanFilter(\n        filterType\n      );\n    }\n    log.warn('Unrecognized column type: ', columnType);\n    return '';\n  }\n\n  constructor(props) {\n    super(props);\n\n    this.handleDelete = this.handleDelete.bind(this);\n    this.handleTypeChange = this.handleTypeChange.bind(this);\n    this.handleValueChange = this.handleValueChange.bind(this);\n    this.typeDropdown = null;\n\n    const { selectedType, value, filterTypes } = props;\n\n    this.state = {\n      selectedType: selectedType || filterTypes[0],\n      value,\n    };\n  }\n\n  componentDidMount() {\n    this.typeDropdown.focus();\n  }\n\n  componentDidUpdate(prevProps) {\n    const { selectedType, value } = this.props;\n    if (prevProps.selectedType !== selectedType || prevProps.value !== value) {\n      this.setState({ selectedType, value });\n    }\n  }\n\n  handleTypeChange(event) {\n    log.debug2('typeChange');\n    const selectedType = event.target.value;\n    this.setState({ selectedType });\n\n    const { onChange } = this.props;\n    const { value } = this.state;\n    if (value != null && value.length > 0) {\n      // Don't send an update unless there's already a value entered\n      onChange(selectedType, value);\n    }\n  }\n\n  handleValueChange(event) {\n    log.debug2('valueChange');\n    const { value } = event.target;\n    this.setState({ value });\n\n    const { onChange } = this.props;\n    const { selectedType } = this.state;\n    if (selectedType != null && selectedType.length > 0) {\n      // Don't send an update unless they've already selected a type\n      onChange(selectedType, value);\n    }\n  }\n\n  handleDelete() {\n    log.debug('delete');\n\n    const { onDelete } = this.props;\n    onDelete();\n  }\n\n  render() {\n    const { column, filterTypes } = this.props;\n    const { selectedType, value } = this.state;\n    const showValueInput = !TableUtils.isBooleanType(column.type);\n    const typeOptionElements = [];\n    for (let i = 0; i < filterTypes.length; i += 1) {\n      const type = filterTypes[i];\n      const label = AdvancedFilterCreatorFilterItem.getLabelForFilter(\n        column.type,\n        type\n      );\n      const element = (\n        <option key={type} value={type}>\n          {label}\n        </option>\n      );\n      typeOptionElements.push(element);\n    }\n\n    return (\n      <div className=\"advanced-filter-creator-filter-item\">\n        <div className=\"form-row\">\n          <div className=\"form-group col\">\n            <select\n              className=\"form-control custom-select\"\n              value={selectedType}\n              onChange={this.handleTypeChange}\n              ref={typeDropdown => {\n                this.typeDropdown = typeDropdown;\n              }}\n            >\n              {typeOptionElements}\n            </select>\n          </div>\n          {showValueInput && (\n            <div className=\"form-group col\">\n              <div className=\"input-group\">\n                <input\n                  type=\"text\"\n                  className=\"form-control\"\n                  placeholder=\"Enter value\"\n                  value={value}\n                  onChange={this.handleValueChange}\n                />\n              </div>\n            </div>\n          )}\n          <div className=\"form-group col-1 px-0\">\n            <button\n              type=\"button\"\n              className=\"btn btn-link btn-link-icon w-100 h-100 p-0 m-0\"\n              onClick={this.handleDelete}\n            >\n              <FontAwesomeIcon icon={vsTrash} />\n              <Tooltip>Remove Filter</Tooltip>\n            </button>\n          </div>\n        </div>\n      </div>\n    );\n  }\n}\n\nAdvancedFilterCreatorFilterItem.propTypes = {\n  column: PropTypes.shape({ type: PropTypes.string }).isRequired,\n  filterTypes: PropTypes.arrayOf(PropTypes.string).isRequired,\n  onChange: PropTypes.func.isRequired,\n  onDelete: PropTypes.func.isRequired,\n  selectedType: PropTypes.string,\n  value: PropTypes.string,\n};\n\nAdvancedFilterCreatorFilterItem.defaultProps = {\n  selectedType: '',\n  value: '',\n};\n\nexport default AdvancedFilterCreatorFilterItem;\n"],"file":"AdvancedFilterCreatorFilterItem.js"}
+{"version":3,"sources":["../src/AdvancedFilterCreatorFilterItem.tsx"],"names":["React","PureComponent","FontAwesomeIcon","Tooltip","vsTrash","Log","TableUtils","FilterType","log","module","AdvancedFilterCreatorFilterItem","getLabelForTextFilter","filterType","eq","eqIgnoreCase","notEq","notEqIgnoreCase","contains","notContains","startsWith","endsWith","warn","getLabelForNumberFilter","greaterThan","greaterThanOrEqualTo","lessThan","lessThanOrEqualTo","getLabelForDateFilter","getLabelForBooleanFilter","isTrue","isFalse","isNull","getLabelForFilter","columnType","isNumberType","isCharType","isTextType","isDateType","isBooleanType","constructor","props","handleDelete","bind","handleTypeChange","handleValueChange","typeDropdown","value","filterTypes","selectedType","state","componentDidMount","focus","componentDidUpdate","prevProps","setState","event","debug2","target","onChange","length","debug","onDelete","render","column","showValueInput","type","typeOptionElements","i","label","element","push"],"mappings":"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","sourcesContent":["/* eslint react/no-did-update-set-state: \"off\" */\nimport React, { PureComponent } from 'react';\nimport { FontAwesomeIcon } from '@fortawesome/react-fontawesome';\nimport { Tooltip } from '@deephaven/components';\nimport { vsTrash } from '@deephaven/icons';\nimport Log from '@deephaven/log';\nimport TableUtils from './TableUtils';\nimport { FilterType, FilterTypeValue } from './filters';\n\nconst log = Log.module('AdvancedFilterCreatorFilterItem');\n\ninterface AdvancedFilterCreatorFilterItemProps {\n  column: { type: string };\n  filterTypes: FilterTypeValue[];\n  onChange(type: FilterTypeValue, value: string): void;\n  onDelete(): void;\n  selectedType?: FilterTypeValue;\n  value?: string;\n}\n\nexport interface AdvancedFilterCreatorFilterItemState {\n  selectedType: FilterTypeValue;\n  value: string;\n}\n\nclass AdvancedFilterCreatorFilterItem extends PureComponent<\n  AdvancedFilterCreatorFilterItemProps,\n  AdvancedFilterCreatorFilterItemState\n> {\n  static getLabelForTextFilter(filterType: FilterTypeValue): string {\n    switch (filterType) {\n      case FilterType.eq:\n        return 'is exactly';\n      case FilterType.eqIgnoreCase:\n        return 'is exactly (ignore case)';\n      case FilterType.notEq:\n        return 'is not exactly';\n      case FilterType.notEqIgnoreCase:\n        return 'is not exactly (ignore case)';\n      case FilterType.contains:\n        return 'contains';\n      case FilterType.notContains:\n        return 'does not contain';\n      case FilterType.startsWith:\n        return 'starts with';\n      case FilterType.endsWith:\n        return 'ends with';\n      default:\n        log.warn('Unrecognized text filter type', filterType);\n        return '';\n    }\n  }\n\n  static getLabelForNumberFilter(filterType: FilterTypeValue): string {\n    switch (filterType) {\n      case FilterType.eq:\n        return 'is equal to';\n      case FilterType.notEq:\n        return 'is not equal to';\n      case FilterType.greaterThan:\n        return 'greater than';\n      case FilterType.greaterThanOrEqualTo:\n        return 'greater than or equal to';\n      case FilterType.lessThan:\n        return 'less than';\n      case FilterType.lessThanOrEqualTo:\n        return 'less than or equal to';\n      default:\n        log.warn('Unrecognized number filter type', filterType);\n        return '';\n    }\n  }\n\n  static getLabelForDateFilter(filterType: FilterTypeValue): string {\n    switch (filterType) {\n      case FilterType.eq:\n        return 'date is';\n      case FilterType.notEq:\n        return 'date is not';\n      case FilterType.notEqIgnoreCase:\n      case FilterType.greaterThan:\n        return 'date is after';\n      case FilterType.greaterThanOrEqualTo:\n        return 'date is after or equal';\n      case FilterType.lessThan:\n        return 'date is before';\n      case FilterType.lessThanOrEqualTo:\n        return 'date is before or equal';\n      default:\n        log.warn('Unrecognized date filter type', filterType);\n        return '';\n    }\n  }\n\n  static getLabelForBooleanFilter(filterType: FilterTypeValue): string {\n    switch (filterType) {\n      case FilterType.isTrue:\n        return 'Is True';\n      case FilterType.isFalse:\n        return 'Is False';\n      case FilterType.isNull:\n        return 'Is Null';\n      default:\n        log.warn('Unrecognized boolean filter type', filterType);\n        return '';\n    }\n  }\n\n  static getLabelForFilter(\n    columnType: string,\n    filterType: FilterTypeValue\n  ): string {\n    if (\n      TableUtils.isNumberType(columnType) ||\n      TableUtils.isCharType(columnType)\n    ) {\n      return AdvancedFilterCreatorFilterItem.getLabelForNumberFilter(\n        filterType\n      );\n    }\n    if (TableUtils.isTextType(columnType)) {\n      return AdvancedFilterCreatorFilterItem.getLabelForTextFilter(filterType);\n    }\n    if (TableUtils.isDateType(columnType)) {\n      return AdvancedFilterCreatorFilterItem.getLabelForDateFilter(filterType);\n    }\n    if (TableUtils.isBooleanType(columnType)) {\n      return AdvancedFilterCreatorFilterItem.getLabelForBooleanFilter(\n        filterType\n      );\n    }\n    log.warn('Unrecognized column type: ', columnType);\n    return '';\n  }\n\n  constructor(props: AdvancedFilterCreatorFilterItemProps) {\n    super(props);\n\n    this.handleDelete = this.handleDelete.bind(this);\n    this.handleTypeChange = this.handleTypeChange.bind(this);\n    this.handleValueChange = this.handleValueChange.bind(this);\n    this.typeDropdown = null;\n\n    const { value = '', filterTypes, selectedType = filterTypes[0] } = props;\n\n    this.state = {\n      selectedType,\n      value,\n    };\n  }\n\n  componentDidMount(): void {\n    this.typeDropdown?.focus();\n  }\n\n  componentDidUpdate(prevProps: AdvancedFilterCreatorFilterItemProps): void {\n    const {\n      value = '',\n      filterTypes,\n      selectedType = filterTypes[0],\n    } = this.props;\n    if (prevProps.selectedType !== selectedType || prevProps.value !== value) {\n      this.setState({ selectedType, value });\n    }\n  }\n\n  typeDropdown: HTMLSelectElement | null;\n\n  handleTypeChange(event: React.ChangeEvent<HTMLSelectElement>): void {\n    log.debug2('typeChange');\n    const selectedType = event.target.value as FilterTypeValue;\n    this.setState({ selectedType });\n\n    const { onChange } = this.props;\n    const { value } = this.state;\n    if (value != null && value.length > 0) {\n      // Don't send an update unless there's already a value entered\n      onChange(selectedType, value);\n    }\n  }\n\n  handleValueChange(event: React.ChangeEvent<HTMLInputElement>): void {\n    log.debug2('valueChange');\n    const { value } = event.target;\n    this.setState({ value });\n\n    const { onChange } = this.props;\n    const { selectedType } = this.state;\n    if (selectedType != null) {\n      // Don't send an update unless they've already selected a type\n      onChange(selectedType, value);\n    }\n  }\n\n  handleDelete(): void {\n    log.debug('delete');\n\n    const { onDelete } = this.props;\n    onDelete();\n  }\n\n  render(): JSX.Element {\n    const { column, filterTypes } = this.props;\n    const { selectedType, value } = this.state;\n    const showValueInput = !TableUtils.isBooleanType(column.type);\n    const typeOptionElements = [];\n    for (let i = 0; i < filterTypes.length; i += 1) {\n      const type = filterTypes[i];\n      const label = AdvancedFilterCreatorFilterItem.getLabelForFilter(\n        column.type,\n        type\n      );\n      const element = (\n        <option key={type} value={type}>\n          {label}\n        </option>\n      );\n      typeOptionElements.push(element);\n    }\n\n    return (\n      <div className=\"advanced-filter-creator-filter-item\">\n        <div className=\"form-row\">\n          <div className=\"form-group col\">\n            <select\n              className=\"form-control custom-select\"\n              value={selectedType}\n              onChange={this.handleTypeChange}\n              ref={typeDropdown => {\n                this.typeDropdown = typeDropdown;\n              }}\n            >\n              {typeOptionElements}\n            </select>\n          </div>\n          {showValueInput && (\n            <div className=\"form-group col\">\n              <div className=\"input-group\">\n                <input\n                  type=\"text\"\n                  className=\"form-control\"\n                  placeholder=\"Enter value\"\n                  value={value}\n                  onChange={this.handleValueChange}\n                />\n              </div>\n            </div>\n          )}\n          <div className=\"form-group col-1 px-0\">\n            <button\n              type=\"button\"\n              className=\"btn btn-link btn-link-icon w-100 h-100 p-0 m-0\"\n              onClick={this.handleDelete}\n            >\n              <FontAwesomeIcon icon={vsTrash} />\n              <Tooltip>Remove Filter</Tooltip>\n            </button>\n          </div>\n        </div>\n      </div>\n    );\n  }\n}\n\nexport default AdvancedFilterCreatorFilterItem;\n"],"file":"AdvancedFilterCreatorFilterItem.js"}

package/dist/CrossColumnSearch.d.ts

@@ -1,6 +1,6 @@
 export default CrossColumnSearch;
 declare class CrossColumnSearch extends React.PureComponent<any, any, any> {
-    static createSearchFilter(searchValue: any, selectedColumns: any, columns: any, invertSelection: any): any;
+    static createSearchFilter(searchValue: any, selectedColumns: any, columns: any, invertSelection: any): import("@deephaven/jsapi-shim").FilterCondition | null;
     constructor(props: any);
     handleSearchValueChange(event: any): void;
     toggleColumn(name: any): void;

package/dist/CrossColumnSearch.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"CrossColumnSearch.d.ts","sourceRoot":"","sources":["../src/CrossColumnSearch.jsx"],"names":[],"mappings":";AAgBA;IACE,2GAyBC;IAED,wBAaC;IAMD,0CAGC;IAYD,8BAYC;IAED,kBAEC;IAED,cAEC;IAED,sBAQC;IAxDC,kCAAoC;IAOtC,cAEC;IAOD,mEAGC;IAED,+CAGC;CAuLF"}
+{"version":3,"file":"CrossColumnSearch.d.ts","sourceRoot":"","sources":["../src/CrossColumnSearch.jsx"],"names":[],"mappings":";AAgBA;IACE,8JAyBC;IAED,wBAaC;IAMD,0CAGC;IAYD,8BAYC;IAED,kBAEC;IAED,cAEC;IAED,sBAQC;IAxDC,kCAAoC;IAOtC,cAEC;IAOD,mEAGC;IAED,+CAGC;CAuLF"}

package/dist/DateUtils.d.ts

@@ -1,80 +1,82 @@
-export default DateUtils;
+import type { DateWrapper } from '@deephaven/jsapi-shim';
+interface DateParts<T> {
+    year: T;
+    month: T;
+    date: T;
+    hours: T;
+    minutes: T;
+    seconds: T;
+    nanos: T;
+}
 declare class DateUtils {
     static FULL_DATE_FORMAT: string;
     static months: string[];
     /**
      *
-     * @param {string} timeZone The time zone to parse this time in. E.g. America/New_York
-     * @param {Number} year The year for the date
-     * @param {Number} month The month, starting at 0
-     * @param {Number} day The day, starting at 1
-     * @param {Number} hour The hours
-     * @param {Number} minute The minutes
-     * @param {Number} second The seconds
-     * @param {Number} ns The nanoseconds
+     * @param timeZone The time zone to parse this time in. E.g. America/New_York
+     * @param year The year for the date
+     * @param month The month, starting at 0
+     * @param day The day, starting at 1
+     * @param hour The hours
+     * @param minute The minutes
+     * @param second The seconds
+     * @param ns The nanoseconds
      */
-    static makeDateWrapper(timeZone: string, year: number, month?: number, day?: number, hour?: number, minute?: number, second?: number, ns?: number): any;
+    static makeDateWrapper(timeZone: string, year: number, month?: number, day?: number, hour?: number, minute?: number, second?: number, ns?: number): DateWrapper;
     /**
      * Takes the string the user entered and returns the next nanos value
-     * @param {String} nanoString The nano string to get the next one of
-     * @returns {Number} The value of the next nanos
+     * @param nanoString The nano string to get the next one of
+     * @returns The value of the next nanos
      */
     static getNextNanos(nanoString: string): number;
     /**
-     * @param {Object} components The string components that were parsed from the original string
-     * @param {Object} values The values that were parsed from the components
-     * @param {string} timeZone The time zone to parse the date in. E.g. America/New_York
-     * @returns {dh.DateWrapper} Returns the DateWrapper for the next date, or null if a full date was passed in
+     * @param components The string components that were parsed from the original string
+     * @param values The values that were parsed from the components
+     * @param timeZone The time zone to parse the date in. E.g. America/New_York
+     * @returns Returns the DateWrapper for the next date, or null if a full date was passed in
      */
-    static getNextDate(components: Object, values: Object, timeZone: string): any;
+    static getNextDate(components: DateParts<string>, values: DateParts<number>, timeZone: string): DateWrapper | null;
     /**
      * Get the JS month value for the provided string.
      * Matches digits or a month name (eg. '1', '01', 'jan', 'january' should all work)
-     * @param {string} monthString The string to parse to a JS month value
-     * @returns number THe JS month value, which starts at 0 for january, or null if nothing could be parsed
+     * @param monthString The string to parse to a JS month value
+     * @returns number The JS month value, which starts at 0 for january, or NaN if nothing could be parsed
      */
     static parseMonth(monthString: string): number;
     /**
      * Parse a date object out of the provided string segments.
      * Also using `parseMonth` to get month names like Aug/August rather than
      * simply doing `parseInt`.
-     * @param {string} yearString The year part of the string
-     * @param {string} monthString The month part of the string
-     * @param {string} dayString The day part of the string
-     * @param {string} hourString The hour part of the string
-     * @param {string} minuteString The minute part of the string
-     * @param {string} secondString The second part of the string
-     * @param {string} nanoString The milli part of the string
+     * @param yearString The year part of the string
+     * @param monthString The month part of the string
+     * @param dayString The day part of the string
+     * @param hourString The hour part of the string
+     * @param minuteString The minute part of the string
+     * @param secondString The second part of the string
+     * @param nanoString The milli part of the string
      */
-    static parseDateValues(yearString: string, monthString: string, dayString: string, hourString: string, minuteString: string, secondString: string, nanoString: string): {
-        year: number;
-        month: number;
-        date: number;
-        hours: number;
-        minutes: number;
-        seconds: number;
-        nanos: number;
-    } | null;
+    static parseDateValues(yearString: string, monthString: string, dayString: string, hourString: string, minuteString: string, secondString: string, nanoString: string): DateParts<number> | null;
     /**
      * Parse out a date time string into it's string components.
      * Anything that is not captured in the string will be undefined.
      *
-     * @param {string} dateTimeString The date time string to parse
-     * @returns {object} Containing the date time components
+     * @param dateTimeString The date time string to parse
+     * @returns Containing the date time components
      */
-    static parseDateTimeString(dateTimeString: string): object;
+    static parseDateTimeString(dateTimeString: string): DateParts<string>;
     /**
      * Parses the date range provided from a string of text.
-     * @param {string} text The string to parse the date from. Can be a keyword like "today", or in the format "2018-08-04"
-     * @param {string} timeZone The time zone to parse this range in. E.g. America/New_York
-     * @returns {[DateWrapper, DateWrapper]} A tuple with the start/end values for that date range
+     * @param text The string to parse the date from. Can be a keyword like "today", or in the format "2018-08-04"
+     * @param timeZone The time zone to parse this range in. E.g. America/New_York
+     * @returns A tuple with the start and end value/null for that date range, or both null
      */
-    static parseDateRange(text: string, timeZone: string): [any, any];
+    static parseDateRange(text: string, timeZone: string): [DateWrapper, DateWrapper | null] | [null, null];
     /**
      * Gets the Js Date object from the provided DateWrapper.
      * In unit test, DateWrapper is just a number provided in millis, so handles that case.
-     * @param {DateWrapper|number} dateWrapper The DateWrapper object, or time in millis
+     * @param dateWrapper The DateWrapper object, or time in millis
      */
-    static getJsDate(dateWrapper: any | number): any;
+    static getJsDate(dateWrapper: DateWrapper | number): Date;
 }
+export default DateUtils;
 //# sourceMappingURL=DateUtils.d.ts.map

package/dist/DateUtils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"DateUtils.d.ts","sourceRoot":"","sources":["../src/DateUtils.js"],"names":[],"mappings":";AAEA;IACE,gCAA0D;IAE1D,wBAaE;IAEF;;;;;;;;;;OAUG;IACH,iCATW,MAAM,iHAiChB;IAED;;;;OAIG;IACH,gDAMC;IAED;;;;;OAKG;IACH,+BALW,MAAM,UACN,MAAM,YACN,MAAM,OA6ChB;IAED;;;;;OAKG;IACH,+BAHW,MAAM,UAsBhB;IAED;;;;;;;;;;;OAWG;IACH,mCARW,MAAM,eACN,MAAM,aACN,MAAM,cACN,MAAM,gBACN,MAAM,gBACN,MAAM,cACN,MAAM;;;;;;;;aAgChB;IAED;;;;;;OAMG;IACH,2CAHW,MAAM,GACJ,MAAM,CAiClB;IAED;;;;;OAKG;IACH,4BAJW,MAAM,YACN,MAAM,GACJ,UAA0B,CAoFtC;IAED;;;;OAIG;IACH,8BAFW,MAAY,MAAM,OAO5B;CACF"}
+{"version":3,"file":"DateUtils.d.ts","sourceRoot":"","sources":["../src/DateUtils.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAEzD,UAAU,SAAS,CAAC,CAAC;IACnB,IAAI,EAAE,CAAC,CAAC;IACR,KAAK,EAAE,CAAC,CAAC;IACT,IAAI,EAAE,CAAC,CAAC;IACR,KAAK,EAAE,CAAC,CAAC;IACT,OAAO,EAAE,CAAC,CAAC;IACX,OAAO,EAAE,CAAC,CAAC;IACX,KAAK,EAAE,CAAC,CAAC;CACV;AAED,cAAM,SAAS;IACb,MAAM,CAAC,gBAAgB,SAAmC;IAE1D,MAAM,CAAC,MAAM,WAaX;IAEF;;;;;;;;;;OAUG;IACH,MAAM,CAAC,eAAe,CACpB,QAAQ,EAAE,MAAM,EAChB,IAAI,EAAE,MAAM,EACZ,KAAK,SAAI,EACT,GAAG,SAAI,EACP,IAAI,SAAI,EACR,MAAM,SAAI,EACV,MAAM,SAAI,EACV,EAAE,SAAI,GACL,WAAW;IAiBd;;;;OAIG;IACH,MAAM,CAAC,YAAY,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM;IAQ/C;;;;;OAKG;IACH,MAAM,CAAC,WAAW,CAChB,UAAU,EAAE,SAAS,CAAC,MAAM,CAAC,EAC7B,MAAM,EAAE,SAAS,CAAC,MAAM,CAAC,EACzB,QAAQ,EAAE,MAAM,GACf,WAAW,GAAG,IAAI;IA4CrB;;;;;OAKG;IACH,MAAM,CAAC,UAAU,CAAC,WAAW,EAAE,MAAM,GAAG,MAAM;IAqB9C;;;;;;;;;;;OAWG;IACH,MAAM,CAAC,eAAe,CACpB,UAAU,EAAE,MAAM,EAClB,WAAW,EAAE,MAAM,EACnB,SAAS,EAAE,MAAM,EACjB,UAAU,EAAE,MAAM,EAClB,YAAY,EAAE,MAAM,EACpB,YAAY,EAAE,MAAM,EACpB,UAAU,EAAE,MAAM,GACjB,SAAS,CAAC,MAAM,CAAC,GAAG,IAAI;IAwB3B;;;;;;OAMG;IACH,MAAM,CAAC,mBAAmB,CAAC,cAAc,EAAE,MAAM,GAAG,SAAS,CAAC,MAAM,CAAC;IAiCrE;;;;;OAKG;IACH,MAAM,CAAC,cAAc,CACnB,IAAI,EAAE,MAAM,EACZ,QAAQ,EAAE,MAAM,GACf,CAAC,WAAW,EAAE,WAAW,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,EAAE,IAAI,CAAC;IAwFnD;;;;OAIG;IACH,MAAM,CAAC,SAAS,CAAC,WAAW,EAAE,WAAW,GAAG,MAAM,GAAG,IAAI;CAM1D;AAED,eAAe,SAAS,CAAC"}

package/dist/DateUtils.js

@@ -5,14 +5,14 @@ import dh from '@deephaven/jsapi-shim';
 class DateUtils {
   /**
    *
-   * @param {string} timeZone The time zone to parse this time in. E.g. America/New_York
-   * @param {Number} year The year for the date
-   * @param {Number} month The month, starting at 0
-   * @param {Number} day The day, starting at 1
-   * @param {Number} hour The hours
-   * @param {Number} minute The minutes
-   * @param {Number} second The seconds
-   * @param {Number} ns The nanoseconds
+   * @param timeZone The time zone to parse this time in. E.g. America/New_York
+   * @param year The year for the date
+   * @param month The month, starting at 0
+   * @param day The day, starting at 1
+   * @param hour The hours
+   * @param minute The minutes
+   * @param second The seconds
+   * @param ns The nanoseconds
    */
   static makeDateWrapper(timeZone, year) {
     var month = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 0;
@@ -33,8 +33,8 @@ class DateUtils {
   }
   /**
    * Takes the string the user entered and returns the next nanos value
-   * @param {String} nanoString The nano string to get the next one of
-   * @returns {Number} The value of the next nanos
+   * @param nanoString The nano string to get the next one of
+   * @returns The value of the next nanos
    */
 
 
@@ -46,10 +46,10 @@ class DateUtils {
     return parseInt(nextNanoString, 10);
   }
   /**
-   * @param {Object} components The string components that were parsed from the original string
-   * @param {Object} values The values that were parsed from the components
-   * @param {string} timeZone The time zone to parse the date in. E.g. America/New_York
-   * @returns {dh.DateWrapper} Returns the DateWrapper for the next date, or null if a full date was passed in
+   * @param components The string components that were parsed from the original string
+   * @param values The values that were parsed from the components
+   * @param timeZone The time zone to parse the date in. E.g. America/New_York
+   * @returns Returns the DateWrapper for the next date, or null if a full date was passed in
    */
 
 
@@ -100,8 +100,8 @@ class DateUtils {
   /**
    * Get the JS month value for the provided string.
    * Matches digits or a month name (eg. '1', '01', 'jan', 'january' should all work)
-   * @param {string} monthString The string to parse to a JS month value
-   * @returns number THe JS month value, which starts at 0 for january, or null if nothing could be parsed
+   * @param monthString The string to parse to a JS month value
+   * @returns number The JS month value, which starts at 0 for january, or NaN if nothing could be parsed
    */
 
 
@@ -132,13 +132,13 @@ class DateUtils {
    * Parse a date object out of the provided string segments.
    * Also using `parseMonth` to get month names like Aug/August rather than
    * simply doing `parseInt`.
-   * @param {string} yearString The year part of the string
-   * @param {string} monthString The month part of the string
-   * @param {string} dayString The day part of the string
-   * @param {string} hourString The hour part of the string
-   * @param {string} minuteString The minute part of the string
-   * @param {string} secondString The second part of the string
-   * @param {string} nanoString The milli part of the string
+   * @param yearString The year part of the string
+   * @param monthString The month part of the string
+   * @param dayString The day part of the string
+   * @param hourString The hour part of the string
+   * @param minuteString The minute part of the string
+   * @param secondString The second part of the string
+   * @param nanoString The milli part of the string
    */
 
 
@@ -169,8 +169,8 @@ class DateUtils {
    * Parse out a date time string into it's string components.
    * Anything that is not captured in the string will be undefined.
    *
-   * @param {string} dateTimeString The date time string to parse
-   * @returns {object} Containing the date time components
+   * @param dateTimeString The date time string to parse
+   * @returns Containing the date time components
    */
 
 
@@ -200,9 +200,9 @@ class DateUtils {
   }
   /**
    * Parses the date range provided from a string of text.
-   * @param {string} text The string to parse the date from. Can be a keyword like "today", or in the format "2018-08-04"
-   * @param {string} timeZone The time zone to parse this range in. E.g. America/New_York
-   * @returns {[DateWrapper, DateWrapper]} A tuple with the start/end values for that date range
+   * @param text The string to parse the date from. Can be a keyword like "today", or in the format "2018-08-04"
+   * @param timeZone The time zone to parse this range in. E.g. America/New_York
+   * @returns A tuple with the start and end value/null for that date range, or both null
    */
 
 
@@ -251,6 +251,11 @@ class DateUtils {
     }
 
     var values = DateUtils.parseDateValues(components.year, components.month, components.date, components.hours, components.minutes, components.seconds, components.nanos);
+
+    if (values == null) {
+      throw new Error("Unable to extract date values from ".concat(components));
+    }
+
     var startDate = DateUtils.makeDateWrapper(timeZone, values.year, values.month, values.date, values.hours, values.minutes, values.seconds, values.nanos);
     var endDate = DateUtils.getNextDate(components, values, timeZone);
     return [startDate, endDate];
@@ -258,16 +263,16 @@ class DateUtils {
   /**
    * Gets the Js Date object from the provided DateWrapper.
    * In unit test, DateWrapper is just a number provided in millis, so handles that case.
-   * @param {DateWrapper|number} dateWrapper The DateWrapper object, or time in millis
+   * @param dateWrapper The DateWrapper object, or time in millis
    */
 
 
   static getJsDate(dateWrapper) {
-    if (dateWrapper.asDate) {
-      return dateWrapper.asDate();
+    if (typeof dateWrapper === 'number') {
+      return new Date(dateWrapper);
     }
 
-    return new Date(dateWrapper);
+    return dateWrapper.asDate();
   }
 
 }