Fix dark mode styling (#19392)

dannyroosevelt · web-flow · commit a5e39f45d589 · 2025-12-07T21:12:38.000-08:00
* improving dark mode (esp for highlighted and selected states)

* linting

* PR feedback

* PR feedback

* Update ControlSelect.tsx
diff --git a/packages/connect-react/CHANGELOG.md b/packages/connect-react/CHANGELOG.md
@@ -2,6 +2,13 @@
 
 # Changelog
 
+## [2.3.0] - 2025-12-07
+
+### Added
+
+- Dark mode support for select components with new theme color tokens (`optionHover`, `optionSelected`, `optionSelectedHover`, `appIconBackground`)
+- App icon backgrounds in `SelectApp` for better visibility in dark mode
+
 ## [2.2.0] - 2025-11-29
 
 ### Added
diff --git a/packages/connect-react/package.json b/packages/connect-react/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@pipedream/connect-react",
-  "version": "2.2.0",
+  "version": "2.3.0",
   "description": "Pipedream Connect library for React",
   "files": [
     "dist"
diff --git a/packages/connect-react/src/components/ControlApp.tsx b/packages/connect-react/src/components/ControlApp.tsx
@@ -55,15 +55,27 @@ export function ControlApp({ app }: ControlAppProps) {
     getProps, select, theme,
   } = useCustomize();
 
-  const {
-    surface,
-    border,
-    text,
-    textStrong,
-    hoverBg,
-    selectedBg,
-    selectedHoverBg,
-  } = resolveSelectColors(theme.colors);
+  // Memoize color resolution to avoid recalculating on every render
+  const resolvedColors = useMemo(() => resolveSelectColors(theme.colors), [
+    theme.colors,
+  ]);
+
+  // Memoize base select styles - only recalculate when colors or boxShadow change
+  const baseSelectStyles = useMemo(() => createBaseSelectStyles<SelectValue>({
+    colors: {
+      surface: resolvedColors.surface,
+      border: resolvedColors.border,
+      text: resolvedColors.text,
+      textStrong: resolvedColors.textStrong,
+      hoverBg: resolvedColors.hoverBg,
+      selectedBg: resolvedColors.selectedBg,
+      selectedHoverBg: resolvedColors.selectedHoverBg,
+    },
+    boxShadow: theme.boxShadow,
+  }), [
+    resolvedColors,
+    theme.boxShadow,
+  ]);
 
   const baseStyles: CSSProperties = {
     color: theme.colors.neutral60,
@@ -79,27 +91,14 @@ export function ControlApp({ app }: ControlAppProps) {
     gridArea: "control",
   };
 
-  const selectStyles = createBaseSelectStyles<SelectValue>({
-    colors: {
-      surface,
-      border,
-      text,
-      textStrong,
-      hoverBg,
-      selectedBg,
-      selectedHoverBg,
-    },
-    boxShadow: theme.boxShadow,
-  });
-
   const baseSelectProps: BaseReactSelectProps<SelectValue> = {
     components: {
       Option: BaseOption,
     },
     styles: {
-      ...selectStyles,
+      ...baseSelectStyles,
       control: (base, state) => ({
-        ...(selectStyles.control?.(base, state) ?? base),
+        ...(baseSelectStyles.control?.(base, state) ?? base),
         gridArea: "control",
       }),
     },
diff --git a/packages/connect-react/src/components/ControlSelect.tsx b/packages/connect-react/src/components/ControlSelect.tsx
@@ -5,15 +5,12 @@ import {
   useState,
   useRef,
 } from "react";
-import type {
-  CSSObjectWithLabel, MenuListProps,
-} from "react-select";
+import type { MenuListProps } from "react-select";
 import Select, {
   components,
   Props as ReactSelectProps,
 } from "react-select";
 import CreatableSelect from "react-select/creatable";
-import type { BaseReactSelectProps } from "../hooks/customization-context";
 import { useCustomize } from "../hooks/customization-context";
 import { useFormFieldContext } from "../hooks/form-field-context";
 import type {
@@ -28,6 +25,10 @@ import {
   isArrayOfLabelValueWrapped,
   isLabelValueWrapped,
 } from "../utils/label-value";
+import {
+  createBaseSelectStyles,
+  resolveSelectColors,
+} from "../utils/select-styles";
 import { LoadMoreButton } from "./LoadMoreButton";
 
 // XXX T and ConfigurableProp should be related
@@ -55,6 +56,29 @@ export function ControlSelect<T extends PropOptionValue>({
   const {
     select, theme,
   } = useCustomize();
+
+  // Memoize color resolution to avoid recalculating on every render
+  const resolvedColors = useMemo(() => resolveSelectColors(theme.colors), [
+    theme.colors,
+  ]);
+
+  // Memoize base select styles - only recalculate when colors or boxShadow change
+  const baseSelectStyles = useMemo(() => createBaseSelectStyles<LabelValueOption<T>, boolean>({
+    colors: {
+      surface: resolvedColors.surface,
+      border: resolvedColors.border,
+      text: resolvedColors.text,
+      textStrong: resolvedColors.textStrong,
+      hoverBg: resolvedColors.hoverBg,
+      selectedBg: resolvedColors.selectedBg,
+      selectedHoverBg: resolvedColors.selectedHoverBg,
+    },
+    boxShadow: theme.boxShadow,
+  }), [
+    resolvedColors,
+    theme.boxShadow,
+  ]);
+
   const [
     selectOptions,
     setSelectOptions,
@@ -77,16 +101,6 @@ export function ControlSelect<T extends PropOptionValue>({
     value,
   ])
 
-  const baseSelectProps: BaseReactSelectProps<LabelValueOption<T>, boolean> = {
-    styles: {
-      container: (base): CSSObjectWithLabel => ({
-        ...base,
-        gridArea: "control",
-        boxShadow: theme.boxShadow.input,
-      }),
-    },
-  };
-
   const selectValue: LabelValueOption<T> | LabelValueOption<T>[] | null = useMemo(() => {
     if (rawValue == null) {
       return null;
@@ -130,7 +144,15 @@ export function ControlSelect<T extends PropOptionValue>({
     selectOptions,
   ]);
 
-  const props = select.getProps("controlSelect", baseSelectProps)
+  // Get customization props from context
+  // We pass our dark mode base styles as the base, so user customizations merge on top
+  const customizationProps = select.getProps<
+    "controlSelect",
+    LabelValueOption<T>,
+    boolean
+  >("controlSelect", {
+    styles: baseSelectStyles,
+  })
 
   // Use ref to store latest onLoadMore callback
   // This allows stable component reference while calling current callback
@@ -145,10 +167,10 @@ export function ControlSelect<T extends PropOptionValue>({
   showLoadMoreButtonRef.current = showLoadMoreButton;
 
   // Memoize custom components to prevent remounting
-  // Recompute when caller/customizer supplies new component overrides
+  // Merge: customization context components -> caller overrides -> our MenuList wrapper
   const finalComponents = useMemo(() => {
     const mergedComponents = {
-      ...(props.components ?? {}),
+      ...(customizationProps.components ?? {}),
       ...(componentsOverride ?? {}),
     };
     const ParentMenuList = mergedComponents.MenuList ?? components.MenuList;
@@ -174,8 +196,8 @@ export function ControlSelect<T extends PropOptionValue>({
       MenuList: CustomMenuList,
     };
   }, [
-    props.components,
     componentsOverride,
+    customizationProps.components,
   ]);
 
   const handleCreate = (inputValue: string) => {
@@ -254,21 +276,26 @@ export function ControlSelect<T extends PropOptionValue>({
       getOptionLabel={(option) => sanitizeOption(option).label}
       getOptionValue={(option) => String(sanitizeOption(option).value)}
       onChange={handleChange}
-      {...props}
+      // Apply customization context values as defaults
+      classNamePrefix={customizationProps.classNamePrefix || "react-select"}
+      classNames={customizationProps.classNames}
+      theme={customizationProps.theme}
+      // Spread selectProps after defaults so callers can override theme/classNames/classNamePrefix
       {...selectProps}
       {...additionalProps}
-      // These must come AFTER spreads to avoid being overridden
-      classNamePrefix="react-select"
       menuPortalTarget={
         typeof document !== "undefined"
           ? document.body
           : null
       }
       menuPosition="fixed"
       styles={{
-        // eslint-disable-next-line react/prop-types
-        ...props.styles,
-        ...selectProps?.styles,
+        ...customizationProps.styles,
+        ...(selectProps?.styles ?? {}),
+        container: (base) => ({
+          ...base,
+          gridArea: "control",
+        }),
         menuPortal: (base) => ({
           ...base,
           zIndex: 99999,
diff --git a/packages/connect-react/src/components/SelectApp.tsx b/packages/connect-react/src/components/SelectApp.tsx
@@ -98,30 +98,30 @@ export function SelectApp({
     loadMore,
   ]);
 
-  const {
-    surface,
-    border,
-    text,
-    textStrong,
-    hoverBg,
-    selectedBg,
-    selectedHoverBg,
-    appIconBg,
-  } = resolveSelectColors(theme.colors);
+  // Memoize color resolution to avoid recalculating on every render
+  const resolvedColors = useMemo(() => resolveSelectColors(theme.colors), [
+    theme.colors,
+  ]);
+
+  // Memoize base select styles - only recalculate when colors or boxShadow change
+  const baseSelectStyles = useMemo(() => createBaseSelectStyles<App>({
+    colors: {
+      surface: resolvedColors.surface,
+      border: resolvedColors.border,
+      text: resolvedColors.text,
+      textStrong: resolvedColors.textStrong,
+      hoverBg: resolvedColors.hoverBg,
+      selectedBg: resolvedColors.selectedBg,
+      selectedHoverBg: resolvedColors.selectedHoverBg,
+    },
+    boxShadow: theme.boxShadow,
+  }), [
+    resolvedColors,
+    theme.boxShadow,
+  ]);
 
   const baseSelectProps: BaseReactSelectProps<App> = {
-    styles: createBaseSelectStyles<App>({
-      colors: {
-        surface,
-        border,
-        text,
-        textStrong,
-        hoverBg,
-        selectedBg,
-        selectedHoverBg,
-      },
-      boxShadow: theme.boxShadow,
-    }),
+    styles: baseSelectStyles,
   };
 
   const selectProps = select.getProps("selectApp", baseSelectProps);
@@ -139,7 +139,7 @@ export function SelectApp({
             style={{
               height: 24,
               width: 24,
-              backgroundColor: appIconBg,
+              backgroundColor: resolvedColors.appIconBg,
               borderRadius: 6,
               padding: 2,
             }}
@@ -163,7 +163,7 @@ export function SelectApp({
             style={{
               height: 24,
               width: 24,
-              backgroundColor: appIconBg,
+              backgroundColor: resolvedColors.appIconBg,
               borderRadius: 6,
               padding: 2,
             }}
@@ -197,7 +197,7 @@ export function SelectApp({
     Option,
     SingleValue,
     MenuList,
-    appIconBg,
+    resolvedColors.appIconBg,
   ]);
   return (
     <Select
diff --git a/packages/connect-react/src/components/SelectComponent.tsx b/packages/connect-react/src/components/SelectComponent.tsx
@@ -50,15 +50,27 @@ export function SelectComponent({
     select, theme,
   } = useCustomize();
 
-  const {
-    surface,
-    border,
-    text,
-    textStrong,
-    hoverBg,
-    selectedBg,
-    selectedHoverBg,
-  } = resolveSelectColors(theme.colors);
+  // Memoize color resolution to avoid recalculating on every render
+  const resolvedColors = useMemo(() => resolveSelectColors(theme.colors), [
+    theme.colors,
+  ]);
+
+  // Memoize base select styles - only recalculate when colors or boxShadow change
+  const baseSelectStyles = useMemo(() => createBaseSelectStyles<Component>({
+    colors: {
+      surface: resolvedColors.surface,
+      border: resolvedColors.border,
+      text: resolvedColors.text,
+      textStrong: resolvedColors.textStrong,
+      hoverBg: resolvedColors.hoverBg,
+      selectedBg: resolvedColors.selectedBg,
+      selectedHoverBg: resolvedColors.selectedHoverBg,
+    },
+    boxShadow: theme.boxShadow,
+  }), [
+    resolvedColors,
+    theme.boxShadow,
+  ]);
 
   const isLoadingMoreRef = useRef(isLoadingMore);
   isLoadingMoreRef.current = isLoadingMore;
@@ -83,18 +95,7 @@ export function SelectComponent({
   ]);
 
   const baseSelectProps: BaseReactSelectProps<Component> = {
-    styles: createBaseSelectStyles<Component>({
-      colors: {
-        surface,
-        border,
-        text,
-        textStrong,
-        hoverBg,
-        selectedBg,
-        selectedHoverBg,
-      },
-      boxShadow: theme.boxShadow,
-    }),
+    styles: baseSelectStyles,
   };
 
   const selectProps = select.getProps("selectComponent", baseSelectProps);
diff --git a/packages/connect-react/src/utils/select-styles.ts b/packages/connect-react/src/utils/select-styles.ts

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@pipedream/connect-react",`
`3`		`- "version": "2.2.0",`
	`3`	`+ "version": "2.3.0",`
`4`	`4`	`"description": "Pipedream Connect library for React",`
`5`	`5`	`"files": [`
`6`	`6`	`"dist"`