refactor: Fix fast refresh invalidations

packages/code-studio/src/index.tsx

@@ -8,6 +8,7 @@ import logInit from './log/LogInit';
 
 logInit();
 
+// eslint-disable-next-line react-refresh/only-export-components
 const AppRoot = React.lazy(() => import('./AppRoot'));
 
 ReactDOM.render(

packages/code-studio/src/main/AppInit.tsx

@@ -377,7 +377,7 @@ const mapStateToProps = (state: RootState) => ({
   workspaceStorage: getWorkspaceStorage(state),
 });
 
-export default connect(mapStateToProps, {
+const ConnectedAppInit = connect(mapStateToProps, {
   setActiveTool: setActiveToolAction,
   setCommandHistoryStorage: setCommandHistoryStorageAction,
   setDashboardData: setDashboardDataAction,
@@ -391,3 +391,5 @@ export default connect(mapStateToProps, {
   setWorkspaceStorage: setWorkspaceStorageAction,
   setServerConfigValues: setServerConfigValuesAction,
 })(AppInit);
+
+export default ConnectedAppInit;

packages/code-studio/src/main/AppMainContainer.tsx

@@ -904,8 +904,10 @@ const mapStateToProps = (state: RootState) => ({
   serverConfigValues: getServerConfigValues(state),
 });
 
-export default connect(mapStateToProps, {
+const ConnectedAppMainContainer = connect(mapStateToProps, {
   setActiveTool: setActiveToolAction,
   updateDashboardData: updateDashboardDataAction,
   updateWorkspaceData: updateWorkspaceDataAction,
 })(withRouter(AppMainContainer));
+
+export default ConnectedAppMainContainer;

packages/code-studio/src/settings/ColumnSpecificSectionContent.tsx

@@ -645,6 +645,8 @@ const mapStateToProps = (state: RootState) => ({
   settings: getSettings(state),
 });
 
-export default connect(mapStateToProps, { saveSettings: saveSettingsAction })(
-  ColumnSpecificSectionContent
-);
+const ConnectedColumnSpecificSectionContent = connect(mapStateToProps, {
+  saveSettings: saveSettingsAction,
+})(ColumnSpecificSectionContent);
+
+export default ConnectedColumnSpecificSectionContent;

packages/code-studio/src/settings/FormattingSectionContent.tsx

@@ -632,6 +632,8 @@ const mapStateToProps = (state: RootState) => ({
   settings: getSettings(state),
 });
 
-export default connect(mapStateToProps, { saveSettings: saveSettingsAction })(
-  FormattingSectionContent
-);
+const ConnectedFormattingSectionContent = connect(mapStateToProps, {
+  saveSettings: saveSettingsAction,
+})(FormattingSectionContent);
+
+export default ConnectedFormattingSectionContent;

packages/code-studio/src/settings/ShortcutsSectionContent.tsx

@@ -143,7 +143,9 @@ const mapStateToProps = (state: RootState) => ({
 
 const mapDispatchToProps = { saveSettings: saveSettingsAction };
 
-export default connect(
+const ConnectedShortcutSectionContent = connect(
   mapStateToProps,
   mapDispatchToProps
 )(ShortcutSectionContent);
+
+export default ConnectedShortcutSectionContent;

packages/code-studio/src/styleguide/StyleGuideInit.tsx

@@ -44,6 +44,8 @@ const mapStateToProps = (state: RootState) => ({
   workspace: getWorkspace(state),
 });
 
-export default connect(mapStateToProps, {
+const ConnectedStyleGuideInit = connect(mapStateToProps, {
   setWorkspace: setWorkspaceAction,
 })(StyleGuideInit);
+
+export default ConnectedStyleGuideInit;

packages/code-studio/src/styleguide/index.tsx

@@ -8,6 +8,7 @@ import logInit from '../log/LogInit';
 
 logInit();
 
+// eslint-disable-next-line react-refresh/only-export-components
 const StyleGuideRoot = React.lazy(() => import('./StyleGuideRoot'));
 
 ReactDOM.render(

packages/components/src/DateTimeInput.test.tsx

@@ -1,7 +1,8 @@
 import React from 'react';
 import { render, screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
-import DateTimeInput, { addSeparators } from './DateTimeInput';
+import DateTimeInput from './DateTimeInput';
+import { addSeparators } from './DateTimeInputUtils';
 
 const DEFAULT_DATE_TIME = '2022-02-22 00:00:00.000000000';
 // Zero width space

packages/components/src/DateTimeInput.tsx

@@ -3,6 +3,7 @@ import classNames from 'classnames';
 import Log from '@deephaven/log';
 import MaskedInput, { SelectionSegment } from './MaskedInput';
 import { getNextSegmentValue } from './DateInputUtils';
+import { addSeparators } from './DateTimeInputUtils';
 
 const log = Log.module('DateTimeInput');
 
@@ -26,7 +27,7 @@ type DateTimeInputProps = {
   'data-testid'?: string;
 };
 
-export function fixIncompleteValue(value: string): string {
+function fixIncompleteValue(value: string): string {
   if (value != null && value.length >= DATE_VALUE_STRING.length) {
     return `${value.substring(0, DATE_VALUE_STRING.length)}${value
       .substring(DATE_VALUE_STRING.length)
@@ -35,15 +36,10 @@ export function fixIncompleteValue(value: string): string {
   return value;
 }
 
-export function addSeparators(value: string): string {
-  const dateTimeMillis = value.substring(0, 23);
-  const micros = value.substring(23, 26);
-  const nanos = value.substring(26);
-  return [dateTimeMillis, micros, nanos].filter(v => v !== '').join('\u200B');
+function removeSeparators(value: string): string {
+  return value.replace(/\u200B/g, '');
 }
 
-const removeSeparators = (value: string) => value.replace(/\u200B/g, '');
-
 const EXAMPLES = [addSeparators(DEFAULT_VALUE_STRING)];
 
 const DateTimeInput = React.forwardRef<HTMLInputElement, DateTimeInputProps>(

packages/components/src/DateTimeInputUtils.ts

@@ -0,0 +1,7 @@
+/* eslint-disable import/prefer-default-export */
+export function addSeparators(value: string): string {
+  const dateTimeMillis = value.substring(0, 23);
+  const micros = value.substring(23, 26);
+  const nanos = value.substring(26);
+  return [dateTimeMillis, micros, nanos].filter(v => v !== '').join('\u200B');
+}

packages/components/src/MaskedInput.test.tsx

@@ -1,6 +1,7 @@
 import React from 'react';
 import { render } from '@testing-library/react';
-import MaskedInput, { fillToLength, trimTrailingMask } from './MaskedInput';
+import MaskedInput from './MaskedInput';
+import { fillToLength, trimTrailingMask } from './MaskedInputUtils';
 
 const TIME_PATTERN = '([01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9]';
 

packages/components/src/MaskedInput.tsx

@@ -2,6 +2,11 @@ import React, { useMemo, useEffect, useCallback } from 'react';
 import classNames from 'classnames';
 import Log from '@deephaven/log';
 import { useForwardedRef } from '@deephaven/react-hooks';
+import {
+  DEFAULT_GET_PREFERRED_REPLACEMENT_STRING,
+  fillToLength,
+  trimTrailingMask,
+} from './MaskedInputUtils';
 import './MaskedInput.scss';
 
 const log = Log.module('MaskedInput');
@@ -18,53 +23,6 @@ const SELECTION_DIRECTION = {
  */
 const FIXED_WIDTH_SPACE = '\u2007';
 
-export function DEFAULT_GET_PREFERRED_REPLACEMENT_STRING(
-  value: string,
-  replaceIndex: number,
-  newChar: string
-): string {
-  return (
-    value.substring(0, replaceIndex) +
-    newChar +
-    value.substring(replaceIndex + 1)
-  );
-}
-
-/**
- * Fill the string on the right side with the example value to the given length
- * @param checkValue Initial string to pad
- * @param exampleValue Example value
- * @param length Target length
- * @returns String padded with the given example value
- */
-export function fillToLength(
-  checkValue: string,
-  exampleValue: string,
-  length: number
-): string {
-  return checkValue.length < length
-    ? `${checkValue}${exampleValue.substring(checkValue.length, length)}`
-    : checkValue;
-}
-
-/**
- * Trim all characters matching the empty mask on the right side of the given value
- * @param value String to trim
- * @param emptyMask Empty mask
- * @returns Trimmed string
- */
-export function trimTrailingMask(value: string, emptyMask: string): string {
-  let { length } = value;
-  for (let i = value.length - 1; i >= 0; i -= 1) {
-    if (emptyMask[i] === value[i]) {
-      length = i;
-    } else {
-      break;
-    }
-  }
-  return value.substring(0, length);
-}
-
 export type SelectionSegment = {
   selectionStart: number;
   selectionEnd: number;

packages/components/src/MaskedInputUtils.ts

@@ -0,0 +1,47 @@
+/* eslint-disable import/prefer-default-export */
+export function DEFAULT_GET_PREFERRED_REPLACEMENT_STRING(
+  value: string,
+  replaceIndex: number,
+  newChar: string
+): string {
+  return (
+    value.substring(0, replaceIndex) +
+    newChar +
+    value.substring(replaceIndex + 1)
+  );
+}
+
+/**
+ * Fill the string on the right side with the example value to the given length
+ * @param checkValue Initial string to pad
+ * @param exampleValue Example value
+ * @param length Target length
+ * @returns String padded with the given example value
+ */
+export function fillToLength(
+  checkValue: string,
+  exampleValue: string,
+  length: number
+): string {
+  return checkValue.length < length
+    ? `${checkValue}${exampleValue.substring(checkValue.length, length)}`
+    : checkValue;
+}
+
+/**
+ * Trim all characters matching the empty mask on the right side of the given value
+ * @param value String to trim
+ * @param emptyMask Empty mask
+ * @returns Trimmed string
+ */
+export function trimTrailingMask(value: string, emptyMask: string): string {
+  let { length } = value;
+  for (let i = value.length - 1; i >= 0; i -= 1) {
+    if (emptyMask[i] === value[i]) {
+      length = i;
+    } else {
+      break;
+    }
+  }
+  return value.substring(0, length);
+}

packages/components/src/TimeInput.tsx

@@ -7,10 +7,8 @@ import React, {
 } from 'react';
 import Log from '@deephaven/log';
 import { TimeUtils } from '@deephaven/utils';
-import MaskedInput, {
-  DEFAULT_GET_PREFERRED_REPLACEMENT_STRING,
-  SelectionSegment,
-} from './MaskedInput';
+import MaskedInput, { SelectionSegment } from './MaskedInput';
+import { DEFAULT_GET_PREFERRED_REPLACEMENT_STRING } from './MaskedInputUtils';
 
 export type { SelectionSegment } from './MaskedInput';
 

packages/components/src/index.ts

@@ -29,6 +29,7 @@ export { default as DropdownMenu } from './menu-actions';
 export * from './menu-actions';
 export { default as MaskedInput } from './MaskedInput';
 export * from './MaskedInput';
+export * from './MaskedInputUtils';
 export * from './navigation';
 export { default as Option } from './Option';
 export * from './popper';

packages/dashboard-core-plugins/src/ConsolePlugin.tsx

@@ -44,7 +44,7 @@ export type ConsolePluginProps = DashboardPluginComponentProps & {
   notebooksUrl: string;
 };
 
-export function assertIsConsolePluginProps(
+function assertIsConsolePluginProps(
   props: Partial<ConsolePluginProps>
 ): asserts props is ConsolePluginProps {
   assertIsDashboardPluginProps(props);

packages/dashboard-core-plugins/src/GridPlugin.tsx

@@ -12,7 +12,7 @@ import { Table, VariableDefinition } from '@deephaven/jsapi-shim';
 import shortid from 'shortid';
 import { IrisGridPanel, IrisGridPanelProps } from './panels';
 
-export const SUPPORTED_TYPES: string[] = [
+const SUPPORTED_TYPES: string[] = [
   dh.VariableType.TABLE,
   dh.VariableType.TREETABLE,
   dh.VariableType.HIERARCHICALTABLE,

packages/dashboard-core-plugins/src/linker/Linker.tsx

@@ -748,4 +748,6 @@ export class Linker extends Component<LinkerProps, LinkerState> {
   }
 }
 
-export default connector(Linker);
+const ConnectedLinker = connector(Linker);
+
+export default ConnectedLinker;

packages/dashboard-core-plugins/src/panels/ChartPanel.tsx

@@ -65,6 +65,7 @@ import ChartColumnSelectorOverlay, {
 import './ChartPanel.scss';
 import { Link } from '../linker/LinkerUtils';
 import { PanelState as IrisGridPanelState } from './IrisGridPanel';
+import { isChartPanelTableMetadata } from './ChartPanelUtils';
 import { ColumnSelectionValidator } from '../linker/ColumnSelectionValidator';
 
 const log = Log.module('ChartPanel');
@@ -76,11 +77,6 @@ export type FilterMap = Map<string, string>;
 
 export type LinkedColumnMap = Map<string, { name: string; type: string }>;
 
-export function isChartPanelTableMetadata(
-  metadata: ChartPanelMetadata
-): metadata is ChartPanelTableMetadata {
-  return (metadata as ChartPanelTableMetadata).settings !== undefined;
-}
 export type ChartPanelFigureMetadata = {
   figure: string;
 };
@@ -1198,7 +1194,7 @@ const mapStateToProps = (
   };
 };
 
-export default connect(
+const ConnectedChartPanel = connect(
   mapStateToProps,
   {
     setActiveTool: setActiveToolAction,
@@ -1207,3 +1203,5 @@ export default connect(
   null,
   { forwardRef: true }
 )(ChartPanel);
+
+export default ConnectedChartPanel;

packages/dashboard-core-plugins/src/panels/ChartPanelUtils.ts

@@ -0,0 +1,8 @@
+import type { ChartPanelMetadata, ChartPanelTableMetadata } from './ChartPanel';
+
+// eslint-disable-next-line import/prefer-default-export
+export function isChartPanelTableMetadata(
+  metadata: ChartPanelMetadata
+): metadata is ChartPanelTableMetadata {
+  return (metadata as ChartPanelTableMetadata).settings !== undefined;
+}