@deephaven/components 0.53.1-layout-manager.4 → 0.54.0

package/dist/DateInput.d.ts

@@ -1,7 +1,7 @@
 import React from 'react';
 type DateInputProps = {
     className?: string;
-    onChange?: (date?: string) => void;
+    onChange?: (date: string) => void;
     defaultValue?: string;
     onFocus?: () => void;
     onBlur?: () => void;

package/dist/DateInput.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"DateInput.d.ts","sourceRoot":"","sources":["../src/DateInput.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAgC,MAAM,OAAO,CAAC;AAYrD,KAAK,cAAc,GAAG;IACpB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,QAAQ,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,MAAM,KAAK,IAAI,CAAC;IACnC,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,OAAO,CAAC,EAAE,MAAM,IAAI,CAAC;IACrB,MAAM,CAAC,EAAE,MAAM,IAAI,CAAC;IACpB,aAAa,CAAC,EAAE,MAAM,CAAC;CACxB,CAAC;AAEF,QAAA,MAAM,SAAS,yFA0Cd,CAAC;AAaF,eAAe,SAAS,CAAC"}
+{"version":3,"file":"DateInput.d.ts","sourceRoot":"","sources":["../src/DateInput.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAgC,MAAM,OAAO,CAAC;AAYrD,KAAK,cAAc,GAAG;IACpB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,QAAQ,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;IAClC,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,OAAO,CAAC,EAAE,MAAM,IAAI,CAAC;IACrB,MAAM,CAAC,EAAE,MAAM,IAAI,CAAC;IACpB,aAAa,CAAC,EAAE,MAAM,CAAC;CACxB,CAAC;AAEF,QAAA,MAAM,SAAS,yFA0Cd,CAAC;AAGF,eAAe,SAAS,CAAC"}

package/dist/DateInput.js

@@ -44,13 +44,5 @@ var DateInput = /*#__PURE__*/React.forwardRef((props, ref) => {
   });
 });
 DateInput.displayName = 'DateInput';
-DateInput.defaultProps = {
-  className: '',
-  onChange: () => false,
-  defaultValue: '',
-  onFocus: () => false,
-  onBlur: () => false,
-  'data-testid': undefined
-};
 export default DateInput;
 //# sourceMappingURL=DateInput.js.map

package/dist/DateInput.js.map

@@ -1 +1 @@
-{"version":3,"file":"DateInput.js","names":["React","useCallback","useState","classNames","Log","MaskedInput","getNextSegmentValue","jsx","_jsx","log","module","DATE_PATTERN","EXAMPLES","DATE_FORMAT","DateInput","forwardRef","props","ref","className","onChange","undefined","defaultValue","onFocus","onBlur","dataTestId","value","setValue","selection","setSelection","handleChange","newValue","debug","children","example","onSelect","pattern","placeholder","displayName","defaultProps"],"sources":["../src/DateInput.tsx"],"sourcesContent":["import React, { useCallback, useState } from 'react';\nimport classNames from 'classnames';\nimport Log from '@deephaven/log';\nimport MaskedInput, { SelectionSegment } from './MaskedInput';\nimport { getNextSegmentValue } from './DateInputUtils';\n\nconst log = Log.module('DateInput');\n\nconst DATE_PATTERN = '[12][0-9]{3}-(0[1-9]|1[0-2])-(0[1-9]|[1-2][0-9]|3[0-1])';\nconst EXAMPLES = ['2000-01-01', '2022-12-31'];\nconst DATE_FORMAT = 'YYYY-MM-DD';\n\ntype DateInputProps = {\n  className?: string;\n  onChange?: (date?: string) => void;\n  defaultValue?: string;\n  onFocus?: () => void;\n  onBlur?: () => void;\n  'data-testid'?: string;\n};\n\nconst DateInput = React.forwardRef<HTMLInputElement, DateInputProps>(\n  (props: DateInputProps, ref) => {\n    const {\n      className = '',\n      onChange = () => undefined,\n      defaultValue = '',\n      onFocus = () => undefined,\n      onBlur = () => undefined,\n      'data-testid': dataTestId,\n    } = props;\n    const [value, setValue] = useState(defaultValue);\n    const [selection, setSelection] = useState<SelectionSegment>();\n\n    const handleChange = useCallback(\n      (newValue: string): void => {\n        log.debug('handleChange', newValue);\n        setValue(newValue);\n        onChange(newValue);\n      },\n      [onChange]\n    );\n\n    return (\n      <div className=\"d-flex flex-row align-items-center\">\n        <MaskedInput\n          ref={ref}\n          className={classNames(className)}\n          example={EXAMPLES}\n          getNextSegmentValue={getNextSegmentValue}\n          onChange={handleChange}\n          onSelect={setSelection}\n          pattern={DATE_PATTERN}\n          placeholder={DATE_FORMAT}\n          selection={selection}\n          value={value}\n          onFocus={onFocus}\n          onBlur={onBlur}\n          data-testid={dataTestId}\n        />\n      </div>\n    );\n  }\n);\n\nDateInput.displayName = 'DateInput';\n\nDateInput.defaultProps = {\n  className: '',\n  onChange: () => false,\n  defaultValue: '',\n  onFocus: () => false,\n  onBlur: () => false,\n  'data-testid': undefined,\n};\n\nexport default DateInput;\n"],"mappings":"AAAA,OAAOA,KAAK,IAAIC,WAAW,EAAEC,QAAQ,QAAQ,OAAO;AACpD,OAAOC,UAAU,MAAM,YAAY;AACnC,OAAOC,GAAG,MAAM,gBAAgB;AAAC,OAC1BC,WAAW;AAAA,SACTC,mBAAmB;AAAA,SAAAC,GAAA,IAAAC,IAAA;AAE5B,IAAMC,GAAG,GAAGL,GAAG,CAACM,MAAM,CAAC,WAAW,CAAC;AAEnC,IAAMC,YAAY,GAAG,yDAAyD;AAC9E,IAAMC,QAAQ,GAAG,CAAC,YAAY,EAAE,YAAY,CAAC;AAC7C,IAAMC,WAAW,GAAG,YAAY;AAWhC,IAAMC,SAAS,gBAAGd,KAAK,CAACe,UAAU,CAChC,CAACC,KAAqB,EAAEC,GAAG,KAAK;EAC9B,IAAM;IACJC,SAAS,GAAG,EAAE;IACdC,QAAQ,GAAGA,CAAA,KAAMC,SAAS;IAC1BC,YAAY,GAAG,EAAE;IACjBC,OAAO,GAAGA,CAAA,KAAMF,SAAS;IACzBG,MAAM,GAAGA,CAAA,KAAMH,SAAS;IACxB,aAAa,EAAEI;EACjB,CAAC,GAAGR,KAAK;EACT,IAAM,CAACS,KAAK,EAAEC,QAAQ,CAAC,GAAGxB,QAAQ,CAACmB,YAAY,CAAC;EAChD,IAAM,CAACM,SAAS,EAAEC,YAAY,CAAC,GAAG1B,QAAQ,CAAmB,CAAC;EAE9D,IAAM2B,YAAY,GAAG5B,WAAW,CAC7B6B,QAAgB,IAAW;IAC1BrB,GAAG,CAACsB,KAAK,CAAC,cAAc,EAAED,QAAQ,CAAC;IACnCJ,QAAQ,CAACI,QAAQ,CAAC;IAClBX,QAAQ,CAACW,QAAQ,CAAC;EACpB,CAAC,EACD,CAACX,QAAQ,CACX,CAAC;EAED,oBACEX,IAAA;IAAKU,SAAS,EAAC,oCAAoC;IAAAc,QAAA,eACjDxB,IAAA,CAACH,WAAW;MACVY,GAAG,EAAEA,GAAI;MACTC,SAAS,EAAEf,UAAU,CAACe,SAAS,CAAE;MACjCe,OAAO,EAAErB,QAAS;MAClBN,mBAAmB,EAAEA,mBAAoB;MACzCa,QAAQ,EAAEU,YAAa;MACvBK,QAAQ,EAAEN,YAAa;MACvBO,OAAO,EAAExB,YAAa;MACtByB,WAAW,EAAEvB,WAAY;MACzBc,SAAS,EAAEA,SAAU;MACrBF,KAAK,EAAEA,KAAM;MACbH,OAAO,EAAEA,OAAQ;MACjBC,MAAM,EAAEA,MAAO;MACf,eAAaC;IAAW,CACzB;EAAC,CACC,CAAC;AAEV,CACF,CAAC;AAEDV,SAAS,CAACuB,WAAW,GAAG,WAAW;AAEnCvB,SAAS,CAACwB,YAAY,GAAG;EACvBpB,SAAS,EAAE,EAAE;EACbC,QAAQ,EAAEA,CAAA,KAAM,KAAK;EACrBE,YAAY,EAAE,EAAE;EAChBC,OAAO,EAAEA,CAAA,KAAM,KAAK;EACpBC,MAAM,EAAEA,CAAA,KAAM,KAAK;EACnB,aAAa,EAAEH;AACjB,CAAC;AAED,eAAeN,SAAS"}
+{"version":3,"file":"DateInput.js","names":["React","useCallback","useState","classNames","Log","MaskedInput","getNextSegmentValue","jsx","_jsx","log","module","DATE_PATTERN","EXAMPLES","DATE_FORMAT","DateInput","forwardRef","props","ref","className","onChange","undefined","defaultValue","onFocus","onBlur","dataTestId","value","setValue","selection","setSelection","handleChange","newValue","debug","children","example","onSelect","pattern","placeholder","displayName"],"sources":["../src/DateInput.tsx"],"sourcesContent":["import React, { useCallback, useState } from 'react';\nimport classNames from 'classnames';\nimport Log from '@deephaven/log';\nimport MaskedInput, { SelectionSegment } from './MaskedInput';\nimport { getNextSegmentValue } from './DateInputUtils';\n\nconst log = Log.module('DateInput');\n\nconst DATE_PATTERN = '[12][0-9]{3}-(0[1-9]|1[0-2])-(0[1-9]|[1-2][0-9]|3[0-1])';\nconst EXAMPLES = ['2000-01-01', '2022-12-31'];\nconst DATE_FORMAT = 'YYYY-MM-DD';\n\ntype DateInputProps = {\n  className?: string;\n  onChange?: (date: string) => void;\n  defaultValue?: string;\n  onFocus?: () => void;\n  onBlur?: () => void;\n  'data-testid'?: string;\n};\n\nconst DateInput = React.forwardRef<HTMLInputElement, DateInputProps>(\n  (props: DateInputProps, ref) => {\n    const {\n      className = '',\n      onChange = () => undefined,\n      defaultValue = '',\n      onFocus = () => undefined,\n      onBlur = () => undefined,\n      'data-testid': dataTestId,\n    } = props;\n    const [value, setValue] = useState(defaultValue);\n    const [selection, setSelection] = useState<SelectionSegment>();\n\n    const handleChange = useCallback(\n      (newValue: string): void => {\n        log.debug('handleChange', newValue);\n        setValue(newValue);\n        onChange(newValue);\n      },\n      [onChange]\n    );\n\n    return (\n      <div className=\"d-flex flex-row align-items-center\">\n        <MaskedInput\n          ref={ref}\n          className={classNames(className)}\n          example={EXAMPLES}\n          getNextSegmentValue={getNextSegmentValue}\n          onChange={handleChange}\n          onSelect={setSelection}\n          pattern={DATE_PATTERN}\n          placeholder={DATE_FORMAT}\n          selection={selection}\n          value={value}\n          onFocus={onFocus}\n          onBlur={onBlur}\n          data-testid={dataTestId}\n        />\n      </div>\n    );\n  }\n);\nDateInput.displayName = 'DateInput';\n\nexport default DateInput;\n"],"mappings":"AAAA,OAAOA,KAAK,IAAIC,WAAW,EAAEC,QAAQ,QAAQ,OAAO;AACpD,OAAOC,UAAU,MAAM,YAAY;AACnC,OAAOC,GAAG,MAAM,gBAAgB;AAAC,OAC1BC,WAAW;AAAA,SACTC,mBAAmB;AAAA,SAAAC,GAAA,IAAAC,IAAA;AAE5B,IAAMC,GAAG,GAAGL,GAAG,CAACM,MAAM,CAAC,WAAW,CAAC;AAEnC,IAAMC,YAAY,GAAG,yDAAyD;AAC9E,IAAMC,QAAQ,GAAG,CAAC,YAAY,EAAE,YAAY,CAAC;AAC7C,IAAMC,WAAW,GAAG,YAAY;AAWhC,IAAMC,SAAS,gBAAGd,KAAK,CAACe,UAAU,CAChC,CAACC,KAAqB,EAAEC,GAAG,KAAK;EAC9B,IAAM;IACJC,SAAS,GAAG,EAAE;IACdC,QAAQ,GAAGA,CAAA,KAAMC,SAAS;IAC1BC,YAAY,GAAG,EAAE;IACjBC,OAAO,GAAGA,CAAA,KAAMF,SAAS;IACzBG,MAAM,GAAGA,CAAA,KAAMH,SAAS;IACxB,aAAa,EAAEI;EACjB,CAAC,GAAGR,KAAK;EACT,IAAM,CAACS,KAAK,EAAEC,QAAQ,CAAC,GAAGxB,QAAQ,CAACmB,YAAY,CAAC;EAChD,IAAM,CAACM,SAAS,EAAEC,YAAY,CAAC,GAAG1B,QAAQ,CAAmB,CAAC;EAE9D,IAAM2B,YAAY,GAAG5B,WAAW,CAC7B6B,QAAgB,IAAW;IAC1BrB,GAAG,CAACsB,KAAK,CAAC,cAAc,EAAED,QAAQ,CAAC;IACnCJ,QAAQ,CAACI,QAAQ,CAAC;IAClBX,QAAQ,CAACW,QAAQ,CAAC;EACpB,CAAC,EACD,CAACX,QAAQ,CACX,CAAC;EAED,oBACEX,IAAA;IAAKU,SAAS,EAAC,oCAAoC;IAAAc,QAAA,eACjDxB,IAAA,CAACH,WAAW;MACVY,GAAG,EAAEA,GAAI;MACTC,SAAS,EAAEf,UAAU,CAACe,SAAS,CAAE;MACjCe,OAAO,EAAErB,QAAS;MAClBN,mBAAmB,EAAEA,mBAAoB;MACzCa,QAAQ,EAAEU,YAAa;MACvBK,QAAQ,EAAEN,YAAa;MACvBO,OAAO,EAAExB,YAAa;MACtByB,WAAW,EAAEvB,WAAY;MACzBc,SAAS,EAAEA,SAAU;MACrBF,KAAK,EAAEA,KAAM;MACbH,OAAO,EAAEA,OAAQ;MACjBC,MAAM,EAAEA,MAAO;MACf,eAAaC;IAAW,CACzB;EAAC,CACC,CAAC;AAEV,CACF,CAAC;AACDV,SAAS,CAACuB,WAAW,GAAG,WAAW;AAEnC,eAAevB,SAAS"}

package/dist/theme/ThemeUtils.d.ts

@@ -1,5 +1,8 @@
 import { ThemeData, ThemePreloadData, ThemePreloadStyleContent, ThemeRegistrationData } from './ThemeModel';
+export declare const CSS_VAR_EXPRESSION_PREFIX = "var(--";
 export declare const TMP_CSS_PROP_PREFIX = "dh-tmp";
+export declare const NON_WHITESPACE_REGEX: RegExp;
+export declare const WHITESPACE_REGEX: RegExp;
 export type VarExpressionResolver = (varExpression: string) => string;
 /**
  * Creates a string containing preload style content for the current theme.
@@ -28,31 +31,32 @@ export declare function getDefaultBaseThemes(): ThemeData[];
  */
 export declare function getThemePreloadData(): ThemePreloadData | null;
 /**
- * Identifies start and end indices of any css variable expressions in the given
+ * Identifies start and end indices of any top-level expressions in the given
  * string.
  *
  * e.g.
- * getCssVariableRanges('var(--aaa-aa) var(--bbb-bb)')
+ * getExpressionRanges('var(--aaa-aa) #fff var(--bbb-bb)')
  * yields:
  * [
- *   [0, 12],
- *   [14, 26],
+ *   [0, 12],  // 'var(--aaa-aa)'
+ *   [14, 17]  // '#fff'
+ *   [19, 31], // 'var(--bbb-bb)'
  * ]
  *
  * In cases where there are nested expressions, only the indices of the outermost
  * expression will be included.
  *
  * e.g.
- * getCssVariableRanges('var(--ccc-cc, var(--aaa-aa, green)) var(--bbb-bb)')
+ * getExpressionRanges('var(--ccc-cc, var(--aaa-aa, green)) var(--bbb-bb)')
  * yields:
  * [
- *   [0, 34], // range for --ccc-cc expression
- *   [36, 48], // range for --bbb-bb expression
+ *   [0, 34],  // 'var(--ccc-cc, var(--aaa-aa, green))'
+ *   [36, 48], // 'var(--bbb-bb)'
  * ]
- * @param value The string to search for css variable expressions
- * @returns An array of [start, end] index pairs for each css variable expression
+ * @param value The string to search for expressions
+ * @returns An array of [start, end] index pairs for each expression
  */
-export declare function getCssVariableRanges(value: string): [number, number][];
+export declare function getExpressionRanges(value: string): [number, number][];
 /**
  * Make a copy of the given object replacing any css variable expressions
  * contained in its prop values with values resolved from the given HTML element.

package/dist/theme/ThemeUtils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ThemeUtils.d.ts","sourceRoot":"","sources":["../../src/theme/ThemeUtils.ts"],"names":[],"mappings":"AAgBA,OAAO,EAIL,SAAS,EACT,gBAAgB,EAChB,wBAAwB,EACxB,qBAAqB,EAEtB,MAAM,cAAc,CAAC;AAItB,eAAO,MAAM,mBAAmB,WAAW,CAAC;AAE5C,MAAM,MAAM,qBAAqB,GAAG,CAAC,aAAa,EAAE,MAAM,KAAK,MAAM,CAAC;AAEtE;;;;GAIG;AACH,wBAAgB,4BAA4B,IAAI,wBAAwB,CAWvE;AAED;;;;GAIG;AACH,wBAAgB,qCAAqC,CACnD,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAC7B,GAAG,CAAC,MAAM,CAAC,CAUb;AAED;;;GAGG;AACH,wBAAgB,eAAe,CAC7B,QAAQ,EAAE,MAAM,EAChB,iBAAiB,EAAE,qBAAqB,GACvC,CAAC,SAAS,CAAC,GAAG,CAAC,SAAS,EAAE,SAAS,CAAC,CA+BtC;AAED;;GAEG;AACH,wBAAgB,oBAAoB,IAAI,SAAS,EAAE,CAalD;AAED;;;GAGG;AACH,wBAAgB,mBAAmB,IAAI,gBAAgB,GAAG,IAAI,CAU7D;AAED;;;;;;;;;;;;;;;;;;;;;;;;GAwBG;AACH,wBAAgB,oBAAoB,CAAC,KAAK,EAAE,MAAM,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,CAgCtE;AAED;;;;;;;;;;;;;;;;;GAiBG;AACH,wBAAgB,2BAA2B,CAAC,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EAC1E,MAAM,EAAE,CAAC,EACT,aAAa,GAAE,WAA2B,GACzC,CAAC,CA2CH;AAED;;;;;;GAMG;AACH,wBAAgB,2BAA2B,CACzC,QAAQ,EAAE,qBAAqB,EAC/B,KAAK,EAAE,MAAM,GACZ,MAAM,CAmBR;AAED;;;GAGG;AACH,wBAAgB,mBAAmB,CAAC,WAAW,EAAE,gBAAgB,GAAG,IAAI,CAKvE;AAED;;;;GAIG;AACH,wBAAgB,WAAW,CAAC,UAAU,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,MAAM,CAEzE;AAED;;GAEG;AACH,wBAAgB,YAAY,IAAI,IAAI,CAUnC"}
+{"version":3,"file":"ThemeUtils.d.ts","sourceRoot":"","sources":["../../src/theme/ThemeUtils.ts"],"names":[],"mappings":"AAgBA,OAAO,EAIL,SAAS,EACT,gBAAgB,EAChB,wBAAwB,EACxB,qBAAqB,EAEtB,MAAM,cAAc,CAAC;AAItB,eAAO,MAAM,yBAAyB,WAAW,CAAC;AAClD,eAAO,MAAM,mBAAmB,WAAW,CAAC;AAC5C,eAAO,MAAM,oBAAoB,QAAO,CAAC;AACzC,eAAO,MAAM,gBAAgB,QAAO,CAAC;AAErC,MAAM,MAAM,qBAAqB,GAAG,CAAC,aAAa,EAAE,MAAM,KAAK,MAAM,CAAC;AAEtE;;;;GAIG;AACH,wBAAgB,4BAA4B,IAAI,wBAAwB,CAWvE;AAED;;;;GAIG;AACH,wBAAgB,qCAAqC,CACnD,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAC7B,GAAG,CAAC,MAAM,CAAC,CAcb;AAED;;;GAGG;AACH,wBAAgB,eAAe,CAC7B,QAAQ,EAAE,MAAM,EAChB,iBAAiB,EAAE,qBAAqB,GACvC,CAAC,SAAS,CAAC,GAAG,CAAC,SAAS,EAAE,SAAS,CAAC,CA+BtC;AAED;;GAEG;AACH,wBAAgB,oBAAoB,IAAI,SAAS,EAAE,CAalD;AAED;;;GAGG;AACH,wBAAgB,mBAAmB,IAAI,gBAAgB,GAAG,IAAI,CAU7D;AAED;;;;;;;;;;;;;;;;;;;;;;;;;GAyBG;AACH,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,MAAM,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,CAiCrE;AAED;;;;;;;;;;;;;;;;;GAiBG;AACH,wBAAgB,2BAA2B,CAAC,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EAC1E,MAAM,EAAE,CAAC,EACT,aAAa,GAAE,WAA2B,GACzC,CAAC,CA2CH;AAED;;;;;;GAMG;AACH,wBAAgB,2BAA2B,CACzC,QAAQ,EAAE,qBAAqB,EAC/B,KAAK,EAAE,MAAM,GACZ,MAAM,CAyBR;AAED;;;GAGG;AACH,wBAAgB,mBAAmB,CAAC,WAAW,EAAE,gBAAgB,GAAG,IAAI,CAKvE;AAED;;;;GAIG;AACH,wBAAgB,WAAW,CAAC,UAAU,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,MAAM,CAEzE;AAED;;GAEG;AACH,wBAAgB,YAAY,IAAI,IAAI,CAUnC"}

package/dist/theme/ThemeUtils.js

@@ -16,7 +16,10 @@ import { themeDark } from "./theme-dark/index.js";
 import { themeLight } from "./theme-light/index.js";
 import { DEFAULT_DARK_THEME_KEY, DEFAULT_LIGHT_THEME_KEY, DEFAULT_PRELOAD_DATA_VARIABLES, THEME_CACHE_LOCAL_STORAGE_KEY } from "./ThemeModel.js";
 var log = Log.module('ThemeUtils');
+export var CSS_VAR_EXPRESSION_PREFIX = 'var(--';
 export var TMP_CSS_PROP_PREFIX = 'dh-tmp';
+export var NON_WHITESPACE_REGEX = /\S/;
+export var WHITESPACE_REGEX = /\s/;
 /**
  * Creates a string containing preload style content for the current theme.
  * This resolves the current values of a few CSS variables that can be used
@@ -42,9 +45,12 @@ export function calculatePreloadStyleContent() {
 export function extractDistinctCssVariableExpressions(record) {
   var set = new Set();
   Object.values(record).forEach(value => {
-    getCssVariableRanges(value).forEach(_ref2 => {
+    getExpressionRanges(value).forEach(_ref2 => {
       var [start, end] = _ref2;
-      set.add(value.substring(start, end + 1));
+      var expression = value.substring(start, end + 1);
+      if (expression.includes(CSS_VAR_EXPRESSION_PREFIX)) {
+        set.add(expression);
+      }
     });
   });
   return set;
@@ -98,54 +104,53 @@ export function getThemePreloadData() {
 }
 
 /**
- * Identifies start and end indices of any css variable expressions in the given
+ * Identifies start and end indices of any top-level expressions in the given
  * string.
  *
  * e.g.
- * getCssVariableRanges('var(--aaa-aa) var(--bbb-bb)')
+ * getExpressionRanges('var(--aaa-aa) #fff var(--bbb-bb)')
  * yields:
  * [
- *   [0, 12],
- *   [14, 26],
+ *   [0, 12],  // 'var(--aaa-aa)'
+ *   [14, 17]  // '#fff'
+ *   [19, 31], // 'var(--bbb-bb)'
  * ]
  *
  * In cases where there are nested expressions, only the indices of the outermost
  * expression will be included.
  *
  * e.g.
- * getCssVariableRanges('var(--ccc-cc, var(--aaa-aa, green)) var(--bbb-bb)')
+ * getExpressionRanges('var(--ccc-cc, var(--aaa-aa, green)) var(--bbb-bb)')
  * yields:
  * [
- *   [0, 34], // range for --ccc-cc expression
- *   [36, 48], // range for --bbb-bb expression
+ *   [0, 34],  // 'var(--ccc-cc, var(--aaa-aa, green))'
+ *   [36, 48], // 'var(--bbb-bb)'
  * ]
- * @param value The string to search for css variable expressions
- * @returns An array of [start, end] index pairs for each css variable expression
+ * @param value The string to search for expressions
+ * @returns An array of [start, end] index pairs for each expression
  */
-export function getCssVariableRanges(value) {
+export function getExpressionRanges(value) {
+  var _NON_WHITESPACE_REGEX, _NON_WHITESPACE_REGEX2;
   var ranges = [];
-  var cssVarPrefix = 'var(--';
-  var start = value.indexOf(cssVarPrefix);
+  var start = (_NON_WHITESPACE_REGEX = (_NON_WHITESPACE_REGEX2 = NON_WHITESPACE_REGEX.exec(value)) === null || _NON_WHITESPACE_REGEX2 === void 0 ? void 0 : _NON_WHITESPACE_REGEX2.index) !== null && _NON_WHITESPACE_REGEX !== void 0 ? _NON_WHITESPACE_REGEX : 0;
   var parenLevel = 0;
-  while (start > -1) {
-    parenLevel = 1;
-    var i = start + cssVarPrefix.length;
-    for (; i < value.length; i += 1) {
-      if (value[i] === '(') {
-        parenLevel += 1;
-      } else if (value[i] === ')') {
-        parenLevel -= 1;
-      }
-      if (parenLevel === 0) {
-        ranges.push([start, i]);
-        break;
-      }
+  for (var i = 0; i < value.length; i += 1) {
+    if (value[i] === '(') {
+      parenLevel += 1;
+    } else if (value[i] === ')') {
+      parenLevel -= 1;
     }
-    if (parenLevel !== 0) {
-      log.error('Unbalanced parentheses in css var expression', value);
-      return [];
+    if (i === value.length - 1 || WHITESPACE_REGEX.test(value[i + 1]) && parenLevel === 0) {
+      ranges.push([start, i]);
+      while (i < value.length - 1 && WHITESPACE_REGEX.test(value[i + 1])) {
+        i += 1;
+      }
+      start = i + 1;
     }
-    start = value.indexOf(cssVarPrefix, i + 1);
+  }
+  if (parenLevel !== 0) {
+    log.error('Unbalanced parentheses in css var expression', value);
+    return [];
   }
   return ranges;
 }
@@ -212,13 +217,14 @@ export function resolveCssVariablesInRecord(record) {
 export function resolveCssVariablesInString(resolver, value) {
   var result = [];
   var i = 0;
-  getCssVariableRanges(value).forEach(_ref4 => {
+  getExpressionRanges(value).forEach(_ref4 => {
     var [start, end] = _ref4;
     if (i < start) {
       result.push(value.substring(i, start));
       i += start - i;
     }
-    result.push(resolver(value.substring(start, end + 1)));
+    var expression = value.substring(start, end + 1);
+    result.push(expression.includes(CSS_VAR_EXPRESSION_PREFIX) ? resolver(expression) : expression);
     i += end - start + 1;
   });
   if (result.length === 0) {

package/dist/theme/ThemeUtils.js.map

@@ -1 +1 @@
-{"version":3,"file":"ThemeUtils.js","names":["Log","assertNotNull","ColorUtils","themeDark","themeLight","DEFAULT_DARK_THEME_KEY","DEFAULT_LIGHT_THEME_KEY","DEFAULT_PRELOAD_DATA_VARIABLES","THEME_CACHE_LOCAL_STORAGE_KEY","log","module","TMP_CSS_PROP_PREFIX","calculatePreloadStyleContent","bodyStyle","getComputedStyle","document","body","pairs","Object","entries","map","_ref","key","defaultValue","concat","getPropertyValue","join","extractDistinctCssVariableExpressions","record","set","Set","values","forEach","value","getCssVariableRanges","_ref2","start","end","add","substring","getActiveThemes","themeKey","themeRegistration","_custom$baseThemeKey","custom","find","theme","baseThemeKey","base","error","debug","getDefaultBaseThemes","name","styleContent","getThemePreloadData","data","localStorage","getItem","JSON","parse","_unused","ranges","cssVarPrefix","indexOf","parenLevel","i","length","push","resolveCssVariablesInRecord","targetElement","arguments","undefined","perfStart","performance","now","tmpPropEl","createElement","appendChild","varExpressions","varExpression","tmpPropKey","style","setProperty","result","computedStyle","window","resolver","resolved","normalizeCssColor","_ref3","resolveCssVariablesInString","remove","_ref4","setThemePreloadData","preloadData","setItem","stringify","getThemeKey","pluginName","themeName","preloadTheme","_getThemePreloadData$","_getThemePreloadData","preloadStyleContent","innerHTML","head"],"sources":["../../src/theme/ThemeUtils.ts"],"sourcesContent":["import Log from '@deephaven/log';\nimport { assertNotNull, ColorUtils } from '@deephaven/utils';\n// Note that ?inline imports are natively supported by Vite, but consumers of\n// @deephaven/components using Webpack will need to add a rule to their module\n// config.\n// e.g.\n// module: {\n//  rules: [\n//    {\n//      resourceQuery: /inline/,\n//      type: 'asset/source',\n//    },\n//  ],\n// },\nimport { themeDark } from './theme-dark';\nimport { themeLight } from './theme-light';\nimport {\n  DEFAULT_DARK_THEME_KEY,\n  DEFAULT_LIGHT_THEME_KEY,\n  DEFAULT_PRELOAD_DATA_VARIABLES,\n  ThemeData,\n  ThemePreloadData,\n  ThemePreloadStyleContent,\n  ThemeRegistrationData,\n  THEME_CACHE_LOCAL_STORAGE_KEY,\n} from './ThemeModel';\n\nconst log = Log.module('ThemeUtils');\n\nexport const TMP_CSS_PROP_PREFIX = 'dh-tmp';\n\nexport type VarExpressionResolver = (varExpression: string) => string;\n\n/**\n * Creates a string containing preload style content for the current theme.\n * This resolves the current values of a few CSS variables that can be used\n * to style the page before the theme is loaded on next page load.\n */\nexport function calculatePreloadStyleContent(): ThemePreloadStyleContent {\n  const bodyStyle = getComputedStyle(document.body);\n\n  // Calculate the current preload variables. If the variable is not set, use\n  // the default value.\n  const pairs = Object.entries(DEFAULT_PRELOAD_DATA_VARIABLES).map(\n    ([key, defaultValue]) =>\n      `${key}:${bodyStyle.getPropertyValue(key) || defaultValue}`\n  );\n\n  return `:root{${pairs.join(';')}}`;\n}\n\n/**\n * Extracts all css variable expressions from the given record and returns\n * a set of unique expressions.\n * @param record The record to extract css variable expressions from\n */\nexport function extractDistinctCssVariableExpressions(\n  record: Record<string, string>\n): Set<string> {\n  const set = new Set<string>();\n\n  Object.values(record).forEach(value => {\n    getCssVariableRanges(value).forEach(([start, end]) => {\n      set.add(value.substring(start, end + 1));\n    });\n  });\n\n  return set;\n}\n\n/**\n * Returns an array of the active themes. The first item will always be one\n * of the base themes. Optionally, the second item will be a custom theme.\n */\nexport function getActiveThemes(\n  themeKey: string,\n  themeRegistration: ThemeRegistrationData\n): [ThemeData] | [ThemeData, ThemeData] {\n  const custom = themeRegistration.custom.find(\n    theme => theme.themeKey === themeKey\n  );\n\n  const baseThemeKey = custom?.baseThemeKey ?? themeKey;\n\n  let base = themeRegistration.base.find(\n    theme => theme.themeKey === baseThemeKey\n  );\n\n  if (base == null) {\n    log.error(\n      `No registered base theme found for theme key: '${baseThemeKey}'`,\n      'Registered:',\n      themeRegistration.base.map(theme => theme.themeKey),\n      themeRegistration.custom.map(theme => theme.themeKey)\n    );\n    base = themeRegistration.base.find(\n      theme => theme.themeKey === DEFAULT_DARK_THEME_KEY\n    );\n\n    assertNotNull(\n      base,\n      `Default base theme '${DEFAULT_DARK_THEME_KEY}' is not registered`\n    );\n  }\n\n  log.debug('Applied themes:', base.themeKey, custom?.themeKey);\n\n  return custom == null ? [base] : [base, custom];\n}\n\n/**\n * Get default base theme data.\n */\nexport function getDefaultBaseThemes(): ThemeData[] {\n  return [\n    {\n      name: 'Default Dark',\n      themeKey: DEFAULT_DARK_THEME_KEY,\n      styleContent: themeDark,\n    },\n    {\n      name: 'Default Light',\n      themeKey: DEFAULT_LIGHT_THEME_KEY,\n      styleContent: themeLight,\n    },\n  ];\n}\n\n/**\n * Get the preload data from local storage or null if it does not exist or is\n * invalid\n */\nexport function getThemePreloadData(): ThemePreloadData | null {\n  const data = localStorage.getItem(THEME_CACHE_LOCAL_STORAGE_KEY);\n\n  try {\n    return data == null ? null : JSON.parse(data);\n  } catch {\n    // ignore\n  }\n\n  return null;\n}\n\n/**\n * Identifies start and end indices of any css variable expressions in the given\n * string.\n *\n * e.g.\n * getCssVariableRanges('var(--aaa-aa) var(--bbb-bb)')\n * yields:\n * [\n *   [0, 12],\n *   [14, 26],\n * ]\n *\n * In cases where there are nested expressions, only the indices of the outermost\n * expression will be included.\n *\n * e.g.\n * getCssVariableRanges('var(--ccc-cc, var(--aaa-aa, green)) var(--bbb-bb)')\n * yields:\n * [\n *   [0, 34], // range for --ccc-cc expression\n *   [36, 48], // range for --bbb-bb expression\n * ]\n * @param value The string to search for css variable expressions\n * @returns An array of [start, end] index pairs for each css variable expression\n */\nexport function getCssVariableRanges(value: string): [number, number][] {\n  const ranges: [number, number][] = [];\n\n  const cssVarPrefix = 'var(--';\n  let start = value.indexOf(cssVarPrefix);\n  let parenLevel = 0;\n\n  while (start > -1) {\n    parenLevel = 1;\n    let i = start + cssVarPrefix.length;\n    for (; i < value.length; i += 1) {\n      if (value[i] === '(') {\n        parenLevel += 1;\n      } else if (value[i] === ')') {\n        parenLevel -= 1;\n      }\n\n      if (parenLevel === 0) {\n        ranges.push([start, i]);\n        break;\n      }\n    }\n\n    if (parenLevel !== 0) {\n      log.error('Unbalanced parentheses in css var expression', value);\n      return [];\n    }\n\n    start = value.indexOf(cssVarPrefix, i + 1);\n  }\n\n  return ranges;\n}\n\n/**\n * Make a copy of the given object replacing any css variable expressions\n * contained in its prop values with values resolved from the given HTML element.\n * Variables that resolve to color strings will also be normalized to rgb or\n * rgba color strings.\n *\n * Note that the browser will force a reflow when calling `getComputedStyle` if\n * css properties have changed. In order to avoid a reflow for every property\n * check we use distinct setup, resolve / normalize, and cleanup passes:\n * 1. Setup - Create a tmp element and set all css props we want to evaluate\n * 2. Resolve / Normalize - Evaluate all css props via `getPropertyValue` calls\n *    and replace the original expressions with resolved values. Also normalize\n *    css colors to rgb/a.\n * 3. Cleanup - Remove the tmp element\n * @param record An object whose values may contain css var expressions\n * @param targetElement The element to resolve css variables against. Defaults\n * to document.body\n */\nexport function resolveCssVariablesInRecord<T extends Record<string, string>>(\n  record: T,\n  targetElement: HTMLElement = document.body\n): T {\n  const perfStart = performance.now();\n\n  // Add a temporary div to attach temp css variables to\n  const tmpPropEl = document.createElement('div');\n  targetElement.appendChild(tmpPropEl);\n\n  const varExpressions = [...extractDistinctCssVariableExpressions(record)];\n\n  // Set temporary css variables for resolving var expressions\n  varExpressions.forEach((varExpression, i) => {\n    const tmpPropKey = `--${TMP_CSS_PROP_PREFIX}-${i}`;\n    tmpPropEl.style.setProperty(tmpPropKey, varExpression);\n  });\n\n  const result = {} as T;\n\n  const computedStyle = window.getComputedStyle(tmpPropEl);\n\n  const resolver = (varExpression: string): string => {\n    const tmpPropKey = `--${TMP_CSS_PROP_PREFIX}-${varExpressions.indexOf(\n      varExpression\n    )}`;\n\n    const resolved = computedStyle.getPropertyValue(tmpPropKey);\n\n    return ColorUtils.normalizeCssColor(resolved);\n  };\n\n  // Resolve the temporary css variables\n  Object.entries(record).forEach(([key, value]) => {\n    result[key as keyof T] = resolveCssVariablesInString(\n      resolver,\n      value\n    ) as T[keyof T];\n  });\n\n  // Remove the temporary css variables\n  tmpPropEl.remove();\n\n  log.debug('Resolved css variables', performance.now() - perfStart, 'ms');\n\n  return result;\n}\n\n/**\n * Resolve css variable expressions in the given string using the\n * given resolver and replace the original expressions with the resolved values.\n *\n * @param resolver Function that can resolve a css variable expression\n * @param value Value that may contain css variable expressions\n */\nexport function resolveCssVariablesInString(\n  resolver: VarExpressionResolver,\n  value: string\n): string {\n  const result: string[] = [];\n  let i = 0;\n  getCssVariableRanges(value).forEach(([start, end]) => {\n    if (i < start) {\n      result.push(value.substring(i, start));\n      i += start - i;\n    }\n\n    result.push(resolver(value.substring(start, end + 1)));\n\n    i += end - start + 1;\n  });\n\n  if (result.length === 0) {\n    return value;\n  }\n\n  return result.join('');\n}\n\n/**\n * Store theme preload data in local storage.\n * @param preloadData The preload data to set\n */\nexport function setThemePreloadData(preloadData: ThemePreloadData): void {\n  localStorage.setItem(\n    THEME_CACHE_LOCAL_STORAGE_KEY,\n    JSON.stringify(preloadData)\n  );\n}\n\n/**\n * Derive unique theme key from plugin root path and theme name.\n * @param pluginName The root path of the plugin\n * @param themeName The name of the theme\n */\nexport function getThemeKey(pluginName: string, themeName: string): string {\n  return `${pluginName}_${themeName}`;\n}\n\n/**\n * Preload minimal theme variables from the cache.\n */\nexport function preloadTheme(): void {\n  const preloadStyleContent =\n    getThemePreloadData()?.preloadStyleContent ??\n    calculatePreloadStyleContent();\n\n  log.debug('Preloading theme content:', `'${preloadStyleContent}'`);\n\n  const style = document.createElement('style');\n  style.innerHTML = preloadStyleContent;\n  document.head.appendChild(style);\n}\n"],"mappings":"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"}
+{"version":3,"file":"ThemeUtils.js","names":["Log","assertNotNull","ColorUtils","themeDark","themeLight","DEFAULT_DARK_THEME_KEY","DEFAULT_LIGHT_THEME_KEY","DEFAULT_PRELOAD_DATA_VARIABLES","THEME_CACHE_LOCAL_STORAGE_KEY","log","module","CSS_VAR_EXPRESSION_PREFIX","TMP_CSS_PROP_PREFIX","NON_WHITESPACE_REGEX","WHITESPACE_REGEX","calculatePreloadStyleContent","bodyStyle","getComputedStyle","document","body","pairs","Object","entries","map","_ref","key","defaultValue","concat","getPropertyValue","join","extractDistinctCssVariableExpressions","record","set","Set","values","forEach","value","getExpressionRanges","_ref2","start","end","expression","substring","includes","add","getActiveThemes","themeKey","themeRegistration","_custom$baseThemeKey","custom","find","theme","baseThemeKey","base","error","debug","getDefaultBaseThemes","name","styleContent","getThemePreloadData","data","localStorage","getItem","JSON","parse","_unused","_NON_WHITESPACE_REGEX","_NON_WHITESPACE_REGEX2","ranges","exec","index","parenLevel","i","length","test","push","resolveCssVariablesInRecord","targetElement","arguments","undefined","perfStart","performance","now","tmpPropEl","createElement","appendChild","varExpressions","varExpression","tmpPropKey","style","setProperty","result","computedStyle","window","resolver","indexOf","resolved","normalizeCssColor","_ref3","resolveCssVariablesInString","remove","_ref4","setThemePreloadData","preloadData","setItem","stringify","getThemeKey","pluginName","themeName","preloadTheme","_getThemePreloadData$","_getThemePreloadData","preloadStyleContent","innerHTML","head"],"sources":["../../src/theme/ThemeUtils.ts"],"sourcesContent":["import Log from '@deephaven/log';\nimport { assertNotNull, ColorUtils } from '@deephaven/utils';\n// Note that ?inline imports are natively supported by Vite, but consumers of\n// @deephaven/components using Webpack will need to add a rule to their module\n// config.\n// e.g.\n// module: {\n//  rules: [\n//    {\n//      resourceQuery: /inline/,\n//      type: 'asset/source',\n//    },\n//  ],\n// },\nimport { themeDark } from './theme-dark';\nimport { themeLight } from './theme-light';\nimport {\n  DEFAULT_DARK_THEME_KEY,\n  DEFAULT_LIGHT_THEME_KEY,\n  DEFAULT_PRELOAD_DATA_VARIABLES,\n  ThemeData,\n  ThemePreloadData,\n  ThemePreloadStyleContent,\n  ThemeRegistrationData,\n  THEME_CACHE_LOCAL_STORAGE_KEY,\n} from './ThemeModel';\n\nconst log = Log.module('ThemeUtils');\n\nexport const CSS_VAR_EXPRESSION_PREFIX = 'var(--';\nexport const TMP_CSS_PROP_PREFIX = 'dh-tmp';\nexport const NON_WHITESPACE_REGEX = /\\S/;\nexport const WHITESPACE_REGEX = /\\s/;\n\nexport type VarExpressionResolver = (varExpression: string) => string;\n\n/**\n * Creates a string containing preload style content for the current theme.\n * This resolves the current values of a few CSS variables that can be used\n * to style the page before the theme is loaded on next page load.\n */\nexport function calculatePreloadStyleContent(): ThemePreloadStyleContent {\n  const bodyStyle = getComputedStyle(document.body);\n\n  // Calculate the current preload variables. If the variable is not set, use\n  // the default value.\n  const pairs = Object.entries(DEFAULT_PRELOAD_DATA_VARIABLES).map(\n    ([key, defaultValue]) =>\n      `${key}:${bodyStyle.getPropertyValue(key) || defaultValue}`\n  );\n\n  return `:root{${pairs.join(';')}}`;\n}\n\n/**\n * Extracts all css variable expressions from the given record and returns\n * a set of unique expressions.\n * @param record The record to extract css variable expressions from\n */\nexport function extractDistinctCssVariableExpressions(\n  record: Record<string, string>\n): Set<string> {\n  const set = new Set<string>();\n\n  Object.values(record).forEach(value => {\n    getExpressionRanges(value).forEach(([start, end]) => {\n      const expression = value.substring(start, end + 1);\n\n      if (expression.includes(CSS_VAR_EXPRESSION_PREFIX)) {\n        set.add(expression);\n      }\n    });\n  });\n\n  return set;\n}\n\n/**\n * Returns an array of the active themes. The first item will always be one\n * of the base themes. Optionally, the second item will be a custom theme.\n */\nexport function getActiveThemes(\n  themeKey: string,\n  themeRegistration: ThemeRegistrationData\n): [ThemeData] | [ThemeData, ThemeData] {\n  const custom = themeRegistration.custom.find(\n    theme => theme.themeKey === themeKey\n  );\n\n  const baseThemeKey = custom?.baseThemeKey ?? themeKey;\n\n  let base = themeRegistration.base.find(\n    theme => theme.themeKey === baseThemeKey\n  );\n\n  if (base == null) {\n    log.error(\n      `No registered base theme found for theme key: '${baseThemeKey}'`,\n      'Registered:',\n      themeRegistration.base.map(theme => theme.themeKey),\n      themeRegistration.custom.map(theme => theme.themeKey)\n    );\n    base = themeRegistration.base.find(\n      theme => theme.themeKey === DEFAULT_DARK_THEME_KEY\n    );\n\n    assertNotNull(\n      base,\n      `Default base theme '${DEFAULT_DARK_THEME_KEY}' is not registered`\n    );\n  }\n\n  log.debug('Applied themes:', base.themeKey, custom?.themeKey);\n\n  return custom == null ? [base] : [base, custom];\n}\n\n/**\n * Get default base theme data.\n */\nexport function getDefaultBaseThemes(): ThemeData[] {\n  return [\n    {\n      name: 'Default Dark',\n      themeKey: DEFAULT_DARK_THEME_KEY,\n      styleContent: themeDark,\n    },\n    {\n      name: 'Default Light',\n      themeKey: DEFAULT_LIGHT_THEME_KEY,\n      styleContent: themeLight,\n    },\n  ];\n}\n\n/**\n * Get the preload data from local storage or null if it does not exist or is\n * invalid\n */\nexport function getThemePreloadData(): ThemePreloadData | null {\n  const data = localStorage.getItem(THEME_CACHE_LOCAL_STORAGE_KEY);\n\n  try {\n    return data == null ? null : JSON.parse(data);\n  } catch {\n    // ignore\n  }\n\n  return null;\n}\n\n/**\n * Identifies start and end indices of any top-level expressions in the given\n * string.\n *\n * e.g.\n * getExpressionRanges('var(--aaa-aa) #fff var(--bbb-bb)')\n * yields:\n * [\n *   [0, 12],  // 'var(--aaa-aa)'\n *   [14, 17]  // '#fff'\n *   [19, 31], // 'var(--bbb-bb)'\n * ]\n *\n * In cases where there are nested expressions, only the indices of the outermost\n * expression will be included.\n *\n * e.g.\n * getExpressionRanges('var(--ccc-cc, var(--aaa-aa, green)) var(--bbb-bb)')\n * yields:\n * [\n *   [0, 34],  // 'var(--ccc-cc, var(--aaa-aa, green))'\n *   [36, 48], // 'var(--bbb-bb)'\n * ]\n * @param value The string to search for expressions\n * @returns An array of [start, end] index pairs for each expression\n */\nexport function getExpressionRanges(value: string): [number, number][] {\n  const ranges: [number, number][] = [];\n\n  let start = NON_WHITESPACE_REGEX.exec(value)?.index ?? 0;\n  let parenLevel = 0;\n\n  for (let i = 0; i < value.length; i += 1) {\n    if (value[i] === '(') {\n      parenLevel += 1;\n    } else if (value[i] === ')') {\n      parenLevel -= 1;\n    }\n\n    if (\n      i === value.length - 1 ||\n      (WHITESPACE_REGEX.test(value[i + 1]) && parenLevel === 0)\n    ) {\n      ranges.push([start, i]);\n\n      while (i < value.length - 1 && WHITESPACE_REGEX.test(value[i + 1])) {\n        i += 1;\n      }\n\n      start = i + 1;\n    }\n  }\n\n  if (parenLevel !== 0) {\n    log.error('Unbalanced parentheses in css var expression', value);\n    return [];\n  }\n\n  return ranges;\n}\n\n/**\n * Make a copy of the given object replacing any css variable expressions\n * contained in its prop values with values resolved from the given HTML element.\n * Variables that resolve to color strings will also be normalized to rgb or\n * rgba color strings.\n *\n * Note that the browser will force a reflow when calling `getComputedStyle` if\n * css properties have changed. In order to avoid a reflow for every property\n * check we use distinct setup, resolve / normalize, and cleanup passes:\n * 1. Setup - Create a tmp element and set all css props we want to evaluate\n * 2. Resolve / Normalize - Evaluate all css props via `getPropertyValue` calls\n *    and replace the original expressions with resolved values. Also normalize\n *    css colors to rgb/a.\n * 3. Cleanup - Remove the tmp element\n * @param record An object whose values may contain css var expressions\n * @param targetElement The element to resolve css variables against. Defaults\n * to document.body\n */\nexport function resolveCssVariablesInRecord<T extends Record<string, string>>(\n  record: T,\n  targetElement: HTMLElement = document.body\n): T {\n  const perfStart = performance.now();\n\n  // Add a temporary div to attach temp css variables to\n  const tmpPropEl = document.createElement('div');\n  targetElement.appendChild(tmpPropEl);\n\n  const varExpressions = [...extractDistinctCssVariableExpressions(record)];\n\n  // Set temporary css variables for resolving var expressions\n  varExpressions.forEach((varExpression, i) => {\n    const tmpPropKey = `--${TMP_CSS_PROP_PREFIX}-${i}`;\n    tmpPropEl.style.setProperty(tmpPropKey, varExpression);\n  });\n\n  const result = {} as T;\n\n  const computedStyle = window.getComputedStyle(tmpPropEl);\n\n  const resolver = (varExpression: string): string => {\n    const tmpPropKey = `--${TMP_CSS_PROP_PREFIX}-${varExpressions.indexOf(\n      varExpression\n    )}`;\n\n    const resolved = computedStyle.getPropertyValue(tmpPropKey);\n\n    return ColorUtils.normalizeCssColor(resolved);\n  };\n\n  // Resolve the temporary css variables\n  Object.entries(record).forEach(([key, value]) => {\n    result[key as keyof T] = resolveCssVariablesInString(\n      resolver,\n      value\n    ) as T[keyof T];\n  });\n\n  // Remove the temporary css variables\n  tmpPropEl.remove();\n\n  log.debug('Resolved css variables', performance.now() - perfStart, 'ms');\n\n  return result;\n}\n\n/**\n * Resolve css variable expressions in the given string using the\n * given resolver and replace the original expressions with the resolved values.\n *\n * @param resolver Function that can resolve a css variable expression\n * @param value Value that may contain css variable expressions\n */\nexport function resolveCssVariablesInString(\n  resolver: VarExpressionResolver,\n  value: string\n): string {\n  const result: string[] = [];\n  let i = 0;\n  getExpressionRanges(value).forEach(([start, end]) => {\n    if (i < start) {\n      result.push(value.substring(i, start));\n      i += start - i;\n    }\n\n    const expression = value.substring(start, end + 1);\n\n    result.push(\n      expression.includes(CSS_VAR_EXPRESSION_PREFIX)\n        ? resolver(expression)\n        : expression\n    );\n\n    i += end - start + 1;\n  });\n\n  if (result.length === 0) {\n    return value;\n  }\n\n  return result.join('');\n}\n\n/**\n * Store theme preload data in local storage.\n * @param preloadData The preload data to set\n */\nexport function setThemePreloadData(preloadData: ThemePreloadData): void {\n  localStorage.setItem(\n    THEME_CACHE_LOCAL_STORAGE_KEY,\n    JSON.stringify(preloadData)\n  );\n}\n\n/**\n * Derive unique theme key from plugin root path and theme name.\n * @param pluginName The root path of the plugin\n * @param themeName The name of the theme\n */\nexport function getThemeKey(pluginName: string, themeName: string): string {\n  return `${pluginName}_${themeName}`;\n}\n\n/**\n * Preload minimal theme variables from the cache.\n */\nexport function preloadTheme(): void {\n  const preloadStyleContent =\n    getThemePreloadData()?.preloadStyleContent ??\n    calculatePreloadStyleContent();\n\n  log.debug('Preloading theme content:', `'${preloadStyleContent}'`);\n\n  const style = document.createElement('style');\n  style.innerHTML = preloadStyleContent;\n  document.head.appendChild(style);\n}\n"],"mappings":"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"}

package/dist/theme/theme-dark/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/theme/theme-dark/index.ts"],"names":[],"mappings":"AAMA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAoCG;AACH,eAAO,MAAM,SAAS,QAMV,CAAC;AAEb,eAAe,SAAS,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/theme/theme-dark/index.ts"],"names":[],"mappings":"AAOA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAoCG;AACH,eAAO,MAAM,SAAS,QAOV,CAAC;AAEb,eAAe,SAAS,CAAC"}

package/dist/theme/theme-dark/index.js

@@ -1,5 +1,6 @@
 import themeDarkPalette from "./theme-dark-palette.css?raw";
 import themeDarkSemantic from "./theme-dark-semantic.css?raw";
+import themeDarkSemanticChart from "./theme-dark-semantic-chart.css?raw";
 import themeDarkSemanticEditor from "./theme-dark-semantic-editor.css?raw";
 import themeDarkSemanticGrid from "./theme-dark-semantic-grid.css?raw";
 import themeDarkComponents from "./theme-dark-components.css?raw";
@@ -40,6 +41,6 @@ import themeDarkComponents from "./theme-dark-components.css?raw";
  *   --dh-color-from-dark-components: #000;
  * }
  */
-export var themeDark = [themeDarkPalette, themeDarkSemantic, themeDarkSemanticEditor, themeDarkSemanticGrid, themeDarkComponents].join('\n');
+export var themeDark = [themeDarkPalette, themeDarkSemantic, themeDarkSemanticChart, themeDarkSemanticEditor, themeDarkSemanticGrid, themeDarkComponents].join('\n');
 export default themeDark;
 //# sourceMappingURL=index.js.map

package/dist/theme/theme-dark/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","names":["themeDarkPalette","themeDarkSemantic","themeDarkSemanticEditor","themeDarkSemanticGrid","themeDarkComponents","themeDark","join"],"sources":["../../../src/theme/theme-dark/index.ts"],"sourcesContent":["import themeDarkPalette from './theme-dark-palette.css?raw';\nimport themeDarkSemantic from './theme-dark-semantic.css?raw';\nimport themeDarkSemanticEditor from './theme-dark-semantic-editor.css?raw';\nimport themeDarkSemanticGrid from './theme-dark-semantic-grid.css?raw';\nimport themeDarkComponents from './theme-dark-components.css?raw';\n\n/**\n * DH theme variables are imported via Vite `?raw` query which provides the\n * text content of the variable files as a string. The exported theme is just a\n * concatenation of the contents of all of these imports.\n *\n * Note that ?raw / ?inline imports are natively supported by Vite, but consumers\n * of @deephaven/components using Webpack will need to add a rule to their module\n * config.\n * e.g.\n * module: {\n *  rules: [\n *    {\n *      resourceQuery: /inline/,\n *      type: 'asset/source',\n *    },\n *  ],\n * },\n *\n * e.g.\n *\n * :root {\n *   --dh-color-from-dark-palette: #fff;\n *   --dh-color-from-dark-palette2: #ccc;\n * }\n * :root {\n *   --dh-color-from-dark-semantic: #000;\n * }\n * :root {\n *   --dh-color-from-dark-semantic-editor: #000;\n * }\n * :root {\n *   --dh-color-from-dark-semantic-grid: #000;\n * }\n * :root {\n *   --dh-color-from-dark-components: #000;\n * }\n */\nexport const themeDark = [\n  themeDarkPalette,\n  themeDarkSemantic,\n  themeDarkSemanticEditor,\n  themeDarkSemanticGrid,\n  themeDarkComponents,\n].join('\\n');\n\nexport default themeDark;\n"],"mappings":"OAAOA,gBAAgB;AAAA,OAChBC,iBAAiB;AAAA,OACjBC,uBAAuB;AAAA,OACvBC,qBAAqB;AAAA,OACrBC,mBAAmB;AAE1B;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,IAAMC,SAAS,GAAG,CACvBL,gBAAgB,EAChBC,iBAAiB,EACjBC,uBAAuB,EACvBC,qBAAqB,EACrBC,mBAAmB,CACpB,CAACE,IAAI,CAAC,IAAI,CAAC;AAEZ,eAAeD,SAAS"}
+{"version":3,"file":"index.js","names":["themeDarkPalette","themeDarkSemantic","themeDarkSemanticChart","themeDarkSemanticEditor","themeDarkSemanticGrid","themeDarkComponents","themeDark","join"],"sources":["../../../src/theme/theme-dark/index.ts"],"sourcesContent":["import themeDarkPalette from './theme-dark-palette.css?raw';\nimport themeDarkSemantic from './theme-dark-semantic.css?raw';\nimport themeDarkSemanticChart from './theme-dark-semantic-chart.css?raw';\nimport themeDarkSemanticEditor from './theme-dark-semantic-editor.css?raw';\nimport themeDarkSemanticGrid from './theme-dark-semantic-grid.css?raw';\nimport themeDarkComponents from './theme-dark-components.css?raw';\n\n/**\n * DH theme variables are imported via Vite `?raw` query which provides the\n * text content of the variable files as a string. The exported theme is just a\n * concatenation of the contents of all of these imports.\n *\n * Note that ?raw / ?inline imports are natively supported by Vite, but consumers\n * of @deephaven/components using Webpack will need to add a rule to their module\n * config.\n * e.g.\n * module: {\n *  rules: [\n *    {\n *      resourceQuery: /inline/,\n *      type: 'asset/source',\n *    },\n *  ],\n * },\n *\n * e.g.\n *\n * :root {\n *   --dh-color-from-dark-palette: #fff;\n *   --dh-color-from-dark-palette2: #ccc;\n * }\n * :root {\n *   --dh-color-from-dark-semantic: #000;\n * }\n * :root {\n *   --dh-color-from-dark-semantic-editor: #000;\n * }\n * :root {\n *   --dh-color-from-dark-semantic-grid: #000;\n * }\n * :root {\n *   --dh-color-from-dark-components: #000;\n * }\n */\nexport const themeDark = [\n  themeDarkPalette,\n  themeDarkSemantic,\n  themeDarkSemanticChart,\n  themeDarkSemanticEditor,\n  themeDarkSemanticGrid,\n  themeDarkComponents,\n].join('\\n');\n\nexport default themeDark;\n"],"mappings":"OAAOA,gBAAgB;AAAA,OAChBC,iBAAiB;AAAA,OACjBC,sBAAsB;AAAA,OACtBC,uBAAuB;AAAA,OACvBC,qBAAqB;AAAA,OACrBC,mBAAmB;AAE1B;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,IAAMC,SAAS,GAAG,CACvBN,gBAAgB,EAChBC,iBAAiB,EACjBC,sBAAsB,EACtBC,uBAAuB,EACvBC,qBAAqB,EACrBC,mBAAmB,CACpB,CAACE,IAAI,CAAC,IAAI,CAAC;AAEZ,eAAeD,SAAS"}

package/dist/theme/theme-dark/theme-dark-semantic-chart.css

@@ -0,0 +1 @@
+:root{--dh-color-chart-bg: var(--dh-color-content-background);--dh-color-chart-plot-bg: var(--dh-color-gray-200);--dh-color-chart-title: var(--dh-color-white);--dh-color-chart-colorway: var(--dh-color-visual-cyan) var(--dh-color-visual-green) var(--dh-color-visual-yellow) var(--dh-color-visual-purple) var(--dh-color-visual-orange) var(--dh-color-visual-red) var(--dh-color-visual-chartreuse) var(--dh-color-visual-fuchsia) var(--dh-color-visual-seafoam) var(--dh-color-visual-magenta) var(--dh-color-white);--dh-color-chart-grid: var(--dh-color-gray-400);--dh-color-chart-axis-line: var(--dh-color-gray-500);--dh-color-chart-axis-line-zero: var(--dh-color-gray-700);--dh-color-chart-active: var(--dh-color-accent-600);--dh-color-chart-range-bg: hsla(var(--dh-color-gray-hue), 1%, 36%, 0.7);--dh-color-chart-area: var(--dh-color-visual-blue);--dh-color-chart-trend: var(--dh-color-green-1200);--dh-color-chart-error-band-line: var(--dh-color-green-1400);--dh-color-chart-error-band-fill: hsla( var(--dh-color-green-hue), 71%, 70%, 0.1 );--dh-color-chart-ohlc-increase: var(--dh-color-visual-green);--dh-color-chart-ohlc-decrease: var(--dh-color-visual-red);--dh-color-chart-line-deprecated: var(--dh-color-visual-green)}/*# sourceMappingURL=theme-dark-semantic-chart.css.map */

package/dist/theme/theme-dark/theme-dark-semantic-chart.css.map

@@ -0,0 +1 @@
+{"version":3,"sourceRoot":"","sources":["../../../src/theme/theme-dark/theme-dark-semantic-chart.css"],"names":[],"mappings":"AAEA,MACE,wDACA,mDACA,8CAGA,8VAMA,gDACA,qDACA,0DACA,oDAGA,wEACA,mDACA,mDAGA,6DAGA,mFAQA,6DACA,2DAOA","file":"theme-dark-semantic-chart.css","sourcesContent":["/* stylelint-disable alpha-value-notation */\n/* stylelint-disable custom-property-empty-line-before */\n:root {\n  --dh-color-chart-bg: var(--dh-color-content-background);\n  --dh-color-chart-plot-bg: var(--dh-color-gray-200);\n  --dh-color-chart-title: var(--dh-color-white);\n\n  /* Colorway */\n  --dh-color-chart-colorway: var(--dh-color-visual-cyan)\n    var(--dh-color-visual-green) var(--dh-color-visual-yellow)\n    var(--dh-color-visual-purple) var(--dh-color-visual-orange)\n    var(--dh-color-visual-red) var(--dh-color-visual-chartreuse)\n    var(--dh-color-visual-fuchsia) var(--dh-color-visual-seafoam)\n    var(--dh-color-visual-magenta) var(--dh-color-white);\n  --dh-color-chart-grid: var(--dh-color-gray-400);\n  --dh-color-chart-axis-line: var(--dh-color-gray-500);\n  --dh-color-chart-axis-line-zero: var(--dh-color-gray-700);\n  --dh-color-chart-active: var(--dh-color-accent-600);\n\n  /* Update hsl components to --dh-color-gray-500-hsl as part of PR #1603 */\n  --dh-color-chart-range-bg: hsla(var(--dh-color-gray-hue), 1%, 36%, 0.7);\n  --dh-color-chart-area: var(--dh-color-visual-blue);\n  --dh-color-chart-trend: var(--dh-color-green-1200);\n\n  /* Error band */\n  --dh-color-chart-error-band-line: var(--dh-color-green-1400);\n\n  /* Update hsl components to --dh-color-green-1200-hsl base color defined by PR #1603 */\n  --dh-color-chart-error-band-fill: hsla(\n    var(--dh-color-green-hue),\n    71%,\n    70%,\n    0.1\n  );\n\n  /* OHLC */\n  --dh-color-chart-ohlc-increase: var(--dh-color-visual-green);\n  --dh-color-chart-ohlc-decrease: var(--dh-color-visual-red);\n\n  /* \n   * This color shows up in the styleguide, but it doesn't seem to be consumed\n   * in production code. There has been discussion about it not being needed \n   * anymore. \n   */\n  --dh-color-chart-line-deprecated: var(--dh-color-visual-green);\n}\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@deephaven/components",
-  "version": "0.53.1-layout-manager.4+35156012",
+  "version": "0.54.0",
   "description": "Deephaven React component library",
   "author": "Deephaven Data Labs LLC",
   "license": "Apache-2.0",
@@ -25,10 +25,10 @@
   },
   "dependencies": {
     "@adobe/react-spectrum": "^3.29.0",
-    "@deephaven/icons": "^0.53.1-layout-manager.4+35156012",
-    "@deephaven/log": "^0.53.1-layout-manager.4+35156012",
-    "@deephaven/react-hooks": "^0.53.1-layout-manager.4+35156012",
-    "@deephaven/utils": "^0.53.1-layout-manager.4+35156012",
+    "@deephaven/icons": "^0.54.0",
+    "@deephaven/log": "^0.54.0",
+    "@deephaven/react-hooks": "^0.54.0",
+    "@deephaven/utils": "^0.54.0",
     "@fortawesome/fontawesome-svg-core": "^6.2.1",
     "@fortawesome/react-fontawesome": "^0.2.0",
     "@react-spectrum/theme-default": "^3.5.1",
@@ -52,7 +52,7 @@
     "react-dom": "^17.x"
   },
   "devDependencies": {
-    "@deephaven/mocks": "^0.53.1-layout-manager.4+35156012"
+    "@deephaven/mocks": "^0.54.0"
   },
   "files": [
     "dist",
@@ -65,5 +65,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "35156012036ec087dbc366e5439b85ff6d1f71ff"
+  "gitHead": "724c84e40aa8a716f10f39c33019a5301bfd5dab"
 }