Merge remote-tracking branch 'origin/main' into dmckenzie_ui_flex_def…

…aults

plugins/plotly-express/src/js/src/PlotlyExpressChartModel.ts

@@ -126,7 +126,7 @@ export class PlotlyExpressChartModel extends ChartModel {
     return this.layout;
   }
 
-  override close() {
+  override close(): void {
     super.close();
     this.widget?.close();
     this.widget = undefined;
@@ -180,7 +180,7 @@ export class PlotlyExpressChartModel extends ChartModel {
     this.widget = undefined;
   }
 
-  updateLayout(data: PlotlyChartWidgetData) {
+  updateLayout(data: PlotlyChartWidgetData): void {
     const { figure } = data;
     const { plotly } = figure;
     const { layout: plotlyLayout = {} } = plotly;
@@ -255,7 +255,7 @@ export class PlotlyExpressChartModel extends ChartModel {
     this.fireUpdate(this.getData());
   }
 
-  addTable(id: number, table: Table) {
+  addTable(id: number, table: Table): void {
     if (this.tableReferenceMap.has(id)) {
       return;
     }
@@ -267,7 +267,7 @@ export class PlotlyExpressChartModel extends ChartModel {
     }
   }
 
-  subscribeTable(id: number) {
+  subscribeTable(id: number): void {
     const table = this.tableReferenceMap.get(id);
     const columnReplacements = this.tableColumnReplacementMap.get(id);
 
@@ -292,7 +292,7 @@ export class PlotlyExpressChartModel extends ChartModel {
     }
   }
 
-  removeTable(id: number) {
+  removeTable(id: number): void {
     this.subscriptionCleanupMap.get(id)?.();
     this.tableSubscriptionMap.get(id)?.close();
 

plugins/plotly-express/src/js/src/PlotlyExpressChartPanel.tsx

@@ -7,7 +7,9 @@ import { useApi } from '@deephaven/jsapi-bootstrap';
 import PlotlyExpressChartModel from './PlotlyExpressChartModel.js';
 import { useHandleSceneTicks } from './useHandleSceneTicks.js';
 
-export function PlotlyExpressChartPanel(props: WidgetPanelProps<Widget>) {
+export function PlotlyExpressChartPanel(
+  props: WidgetPanelProps<Widget>
+): JSX.Element {
   const dh = useApi();
   const { fetch, metadata = {}, ...rest } = props;
   const containerRef = useRef<HTMLDivElement>(null);

plugins/plotly-express/src/js/src/PlotlyExpressChartUtils.ts

@@ -2,12 +2,12 @@ import type { Data, PlotlyDataLayoutConfig } from 'plotly.js';
 import type { Table, Widget } from '@deephaven/jsapi-types';
 
 export interface PlotlyChartWidget {
-  getDataAsBase64(): string;
-  exportedObjects: { fetch(): Promise<Table> }[];
-  addEventListener(
+  getDataAsBase64: () => string;
+  exportedObjects: { fetch: () => Promise<Table> }[];
+  addEventListener: (
     type: string,
     fn: (event: CustomEvent<PlotlyChartWidget>) => () => void
-  ): void;
+  ) => void;
 }
 
 export interface PlotlyChartWidgetData {

plugins/plotly-express/src/js/src/useHandleSceneTicks.ts

@@ -4,7 +4,7 @@ import PlotlyExpressChartModel from './PlotlyExpressChartModel.js';
 export function useHandleSceneTicks(
   model: PlotlyExpressChartModel | undefined,
   container: HTMLDivElement | null
-) {
+): void {
   useEffect(() => {
     // Plotly scenes and geo views reset when our data ticks
     // Pause rendering data updates when the user is manipulating a scene

plugins/ui/src/js/src/elements/ElementUtils.tsx

@@ -25,7 +25,7 @@ export type ObjectNode = {
  */
 export type ElementNode<
   K extends string = string,
-  P extends Record<string, unknown> = Record<string, unknown>
+  P extends Record<string, unknown> = Record<string, unknown>,
 > = {
   /**
    * The type of this element. Can be something like `deephaven.ui.components.Panel`, or
@@ -37,7 +37,7 @@ export type ElementNode<
 
 export type ElementNodeWithChildren<
   K extends string = string,
-  P extends Record<string, unknown> = Record<string, unknown>
+  P extends Record<string, unknown> = Record<string, unknown>,
 > = ElementNode<K, P> & {
   props: React.PropsWithChildren<P>;
 };

plugins/ui/src/js/src/elements/ObjectView.tsx

@@ -6,7 +6,7 @@ import type { dh } from '@deephaven/jsapi-types';
 const log = Log.module('@deephaven/js-plugin-ui/ObjectView');
 
 export type ObjectViewProps = { object: dh.WidgetExportedObject };
-function ObjectView(props: ObjectViewProps) {
+function ObjectView(props: ObjectViewProps): JSX.Element {
   const { object } = props;
   log.info('Object is', object);
   const { type } = object;

plugins/ui/src/js/src/elements/Picker.tsx

@@ -22,7 +22,7 @@ type WrappedDHPickerJSApiProps = Omit<DHPickerJSApiProps, 'table'> & {
 export type PickerProps = (DHPickerProps | WrappedDHPickerJSApiProps) &
   SerializedPickerEventProps;
 
-function Picker({ children, ...props }: PickerProps) {
+function Picker({ children, ...props }: PickerProps): JSX.Element {
   const settings = useSelector(getSettings<RootState>);
   const pickerProps = usePickerProps(props);
 

plugins/ui/src/js/src/elements/UITable.tsx

@@ -30,7 +30,7 @@ function UITable({
   sorts,
   alwaysFetchColumns,
   table: exportedTable,
-}: UITableProps) {
+}: UITableProps): JSX.Element | null {
   const dh = useApi();
   const [model, setModel] = useState<IrisGridModel>();
   const [columns, setColumns] = useState<dh.Table['columns']>();

plugins/ui/src/js/src/elements/spectrum/ActionButton.tsx

@@ -7,7 +7,7 @@ import { SerializedButtonEventProps, useButtonProps } from './useButtonProps';
 
 function ActionButton(
   props: SpectrumActionButtonProps & SerializedButtonEventProps
-) {
+): JSX.Element {
   const buttonProps = useButtonProps(props);
 
   // eslint-disable-next-line react/jsx-props-no-spreading

plugins/ui/src/js/src/elements/spectrum/Button.tsx

@@ -5,7 +5,10 @@ import {
 } from '@adobe/react-spectrum';
 import { SerializedButtonEventProps, useButtonProps } from './useButtonProps';
 
-function Button(props: SpectrumButtonProps & SerializedButtonEventProps) {
+function Button(
+  variant: SpectrumButtonProps['variant'],
+  props: SpectrumButtonProps & SerializedButtonEventProps
+): JSX.Element {
   const buttonProps = useButtonProps(props);
 
   // eslint-disable-next-line react/jsx-props-no-spreading

plugins/ui/src/js/src/elements/spectrum/Form.tsx

@@ -5,7 +5,7 @@ function Form(
   props: SpectrumFormProps & {
     onSubmit?: (data: { [key: string]: FormDataEntryValue }) => void;
   }
-) {
+): JSX.Element {
   const { onSubmit: propOnSubmit, ...otherProps } = props;
 
   const onSubmit = useCallback(

plugins/ui/src/js/src/elements/spectrum/RangeSlider.tsx

@@ -9,7 +9,7 @@ const VALUE_CHANGE_DEBOUNCE = 250;
 
 const EMPTY_FUNCTION = () => undefined;
 
-function RangeSlider(props: SpectrumRangeSliderProps) {
+function RangeSlider(props: SpectrumRangeSliderProps): JSX.Element {
   const {
     defaultValue = { start: 0, end: 0 },
     value: propValue,

plugins/ui/src/js/src/elements/spectrum/Slider.tsx

@@ -9,7 +9,7 @@ const VALUE_CHANGE_DEBOUNCE = 250;
 
 const EMPTY_FUNCTION = () => undefined;
 
-function Slider(props: SpectrumSliderProps) {
+function Slider(props: SpectrumSliderProps): JSX.Element {
   const {
     defaultValue = 0,
     value: propValue,

plugins/ui/src/js/src/elements/spectrum/TabPanels.tsx

@@ -4,7 +4,9 @@ import {
   SpectrumTabPanelsProps,
 } from '@adobe/react-spectrum';
 
-function TabPanels(props: SpectrumTabPanelsProps<React.ReactNode>) {
+function TabPanels(
+  props: SpectrumTabPanelsProps<React.ReactNode>
+): JSX.Element {
   const { UNSAFE_style: unsafeStyle, ...otherProps } = props;
 
   return (

plugins/ui/src/js/src/elements/spectrum/TextField.tsx

@@ -9,7 +9,7 @@ const VALUE_CHANGE_DEBOUNCE = 250;
 
 const EMPTY_FUNCTION = () => undefined;
 
-function TextField(props: SpectrumTextFieldProps) {
+function TextField(props: SpectrumTextFieldProps): JSX.Element {
   const {
     defaultValue = '',
     value: propValue,

plugins/ui/src/js/src/elements/spectrum/mapSpectrumProps.ts

@@ -6,7 +6,7 @@ import mapSpectrumChildren from './mapSpectrumChildren';
  * @param props Props to map as spectrum props
  */
 export function mapSpectrumProps<
-  T extends PropsWithChildren<Record<string, unknown>>
+  T extends PropsWithChildren<Record<string, unknown>>,
 >(props: T): T {
   return {
     ...props,

plugins/ui/src/js/src/elements/spectrum/useButtonProps.ts

@@ -43,7 +43,10 @@ export type SerializedButtonEventProps = {
   onKeyUp?: SerializedKeyboardEventCallback;
 };
 
-export function useButtonProps<T>(props: SerializedButtonEventProps & T) {
+// returns SpectrumButtonProps
+export function useButtonProps<T>(
+  props: SerializedButtonEventProps & T
+): T & SerializedButtonEventProps {
   const {
     onPress: propOnPress,
     onPressStart: propsOnPressStart,
@@ -75,5 +78,5 @@ export function useButtonProps<T>(props: SerializedButtonEventProps & T) {
     onKeyDown,
     onKeyUp,
     ...mapSpectrumProps(otherProps),
-  };
+  } as T & SerializedButtonEventProps;
 }

plugins/ui/src/js/src/elements/spectrum/useFocusEventCallback.ts

@@ -31,7 +31,9 @@ export type SerializedFocusEventCallback = (
  * @param callback FocusEvent callback to be called with the serialized event
  * @returns A callback to be passed into the Spectrum component that transforms the event and calls the provided callback
  */
-export function useFocusEventCallback(callback?: SerializedFocusEventCallback) {
+export function useFocusEventCallback(
+  callback?: SerializedFocusEventCallback
+): (e: FocusEvent) => void {
   return useCallback(
     (e: FocusEvent) => {
       callback?.(serializeFocusEvent(e));

plugins/ui/src/js/src/elements/spectrum/useKeyboardEventCallback.ts

@@ -33,7 +33,7 @@ export type SerializedKeyboardEventCallback = (
  */
 export function useKeyboardEventCallback(
   callback?: SerializedKeyboardEventCallback
-) {
+): (e: KeyboardEvent) => void {
   return useCallback(
     (e: KeyboardEvent) => {
       callback?.(serializeKeyboardEvent(e));

plugins/ui/src/js/src/elements/spectrum/usePressEventCallback.ts

@@ -34,7 +34,9 @@ export type SerializedPressEventCallback = (
  * @param callback PressEvent callback to be called with the serialized event
  * @returns A callback to be passed into the Spectrum component that transforms the event and calls the provided callback
  */
-export function usePressEventCallback(callback?: SerializedPressEventCallback) {
+export function usePressEventCallback(
+  callback?: SerializedPressEventCallback
+): (e: PressEvent) => void {
   return useCallback(
     (e: PressEvent) => {
       callback?.(serializePressEvent(e));

plugins/ui/src/js/src/elements/usePickerProps.ts

@@ -26,7 +26,9 @@ export interface SerializedPickerEventProps {
  * @param props Props to wrap
  * @returns Wrapped props
  */
-export function usePickerProps<T>(props: SerializedPickerEventProps & T) {
+export function usePickerProps<T>(
+  props: SerializedPickerEventProps & T
+): T & SerializedPickerEventProps {
   const { onFocus, onBlur, onKeyDown, onKeyUp, ...otherProps } = props;
 
   const serializedOnFocus = useFocusEventCallback(onFocus);
@@ -44,5 +46,5 @@ export function usePickerProps<T>(props: SerializedPickerEventProps & T) {
     // handles nested children inside of `Item` and `Section` components, so
     // we are intentionally not wrapping `otherProps` in `mapSpectrumProps`
     ...otherProps,
-  };
+  } as T & SerializedPickerEventProps;
 }

plugins/ui/src/js/src/layout/ParentItemContext.ts

@@ -4,7 +4,7 @@ import type { ContentItem } from '@deephaven/golden-layout';
 
 export const ParentItemContext = createContext<ContentItem | null>(null);
 
-export function useParentItem() {
+export function useParentItem(): ContentItem {
   const layoutManager = useLayoutManager();
   const parentContextItem = useContext(ParentItemContext);
   const parentItem = useMemo(

plugins/ui/src/js/src/layout/PortalPanelManagerContext.ts

@@ -7,7 +7,7 @@ export type PortalPanelMap = ReadonlyMap<string, HTMLElement>;
 export const PortalPanelManagerContext =
   React.createContext<PortalPanelMap | null>(null);
 
-export function usePortalPanelManager() {
+export function usePortalPanelManager(): PortalPanelMap {
   return useContextOrThrow(PortalPanelManagerContext, 'PortalPanelManager');
 }
 

plugins/ui/src/js/src/layout/ReactPanelContext.ts

@@ -9,6 +9,6 @@ export const ReactPanelContext = createContext<string | null>(null);
  * Gets the panel ID from the nearest panel context.
  * @returns The panel ID or null if not in a panel
  */
-export function usePanelId() {
+export function usePanelId(): string | null {
   return useContext(ReactPanelContext);
 }

plugins/ui/src/js/src/widget/DashboardWidgetHandler.tsx

@@ -35,7 +35,7 @@ function DashboardWidgetHandler({
   onClose,
   onDataChange,
   ...otherProps
-}: DashboardWidgetHandlerProps) {
+}: DashboardWidgetHandlerProps): JSX.Element {
   const handleClose = useCallback(() => {
     log.debug('handleClose', id);
     onClose?.(id);

plugins/ui/src/js/src/widget/DocumentHandler.tsx

@@ -44,7 +44,7 @@ function DocumentHandler({
   initialData: data = EMPTY_OBJECT,
   onDataChange = EMPTY_FUNCTION,
   onClose,
-}: DocumentHandlerProps) {
+}: DocumentHandlerProps): JSX.Element {
   log.debug('Rendering document', widget);
   const panelOpenCountRef = useRef(0);
   const panelIdIndex = useRef(0);

plugins/ui/src/js/src/widget/WidgetHandler.tsx

@@ -58,7 +58,7 @@ function WidgetHandler({
   fetch,
   widget: descriptor,
   initialData: initialDataProp,
-}: WidgetHandlerProps) {
+}: WidgetHandlerProps): JSX.Element | null {
   const [widget, setWidget] = useState<dh.Widget>();
   const [document, setDocument] = useState<ReactNode>();
   const [initialData] = useState(initialDataProp);

plugins/ui/src/js/src/widget/WidgetTestUtils.ts

@@ -4,7 +4,7 @@ import type { dh } from '@deephaven/jsapi-types';
 
 export function makeDocumentUpdatedJsonRpc(
   document: Record<string, unknown> = {}
-) {
+): { jsonrpc: string; method: string; params: string[] } {
   return {
     jsonrpc: '2.0',
     method: 'documentUpdated',
@@ -14,7 +14,7 @@ export function makeDocumentUpdatedJsonRpc(
 
 export function makeDocumentUpdatedJsonRpcString(
   document: Record<string, unknown> = {}
-) {
+): string {
   return JSON.stringify(makeDocumentUpdatedJsonRpc(document));
 }
 

plugins/ui/src/js/src/widget/WidgetTypes.ts

@@ -3,8 +3,8 @@ import type { dh } from '@deephaven/jsapi-types';
 export type WidgetId = string;
 
 export interface WidgetMessageDetails {
-  getDataAsBase64(): string;
-  getDataAsString(): string;
+  getDataAsBase64: () => string;
+  getDataAsString: () => string;
   exportedObjects: dh.WidgetExportedObject[];
 }