From d5ce56930bd3f43d5f6ce1dc1138d1c3a0569de9 Mon Sep 17 00:00:00 2001
From: Jared Vititoe <jjvititoe1@gmail.com>
Date: Sun, 28 Jun 2026 22:43:18 -0400
Subject: [PATCH] refactor(ui): extract shared SettingsSelect; replace raw
 <select> (native-cinny audit 6/N)

Extracted the folds-native dropdown (Button+PopOut+Menu) from General.tsx into a
shared components/settings-select/SettingsSelect.tsx, and used it to replace raw
native <select> elements (which render OS-styled and broke under non-default
themes via colorScheme:'dark'):
- Profile "auto-clear after" select
- PushRuleEditor add-rule mode select (dropped the now-unused handleModeChange)

The form-tied timezone <select> in Profile is left for a follow-up (it's wired
to native form submission + a disabled state and needs more care).

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
---
 .../settings-select/SettingsSelect.tsx        | 95 +++++++++++++++++++
 src/app/features/settings/account/Profile.tsx | 32 +------
 src/app/features/settings/general/General.tsx | 78 +--------------
 .../settings/notifications/PushRuleEditor.tsx | 27 ++----
 4 files changed, 107 insertions(+), 125 deletions(-)
 create mode 100644 src/app/components/settings-select/SettingsSelect.tsx

diff --git a/src/app/components/settings-select/SettingsSelect.tsx b/src/app/components/settings-select/SettingsSelect.tsx
new file mode 100644
index 000000000..8bb91bb98
--- /dev/null
+++ b/src/app/components/settings-select/SettingsSelect.tsx
@@ -0,0 +1,95 @@
+import React, { MouseEventHandler, useState } from 'react';
+import { Box, Button, config, Icon, Icons, Menu, MenuItem, PopOut, RectCords, Text } from 'folds';
+import FocusTrap from 'focus-trap-react';
+import { stopPropagation } from '../../utils/keyboard';
+
+export type SettingsSelectOption<T extends string> = {
+  value: T;
+  label: string;
+  disabled?: boolean;
+};
+
+/**
+ * A folds-native dropdown (Button + PopOut + Menu) matching Cinny's select
+ * pattern — used instead of a raw `<select>`, which renders OS-styled and
+ * breaks under non-default themes.
+ */
+export function SettingsSelect<T extends string>({
+  value,
+  options,
+  onChange,
+  'aria-label': ariaLabel,
+}: {
+  value: T;
+  options: SettingsSelectOption<T>[];
+  onChange: (v: T) => void;
+  'aria-label'?: string;
+}) {
+  const [menuCords, setMenuCords] = useState<RectCords>();
+  const selectedLabel = options.find((o) => o.value === value)?.label ?? value;
+
+  const handleMenu: MouseEventHandler<HTMLButtonElement> = (evt) => {
+    setMenuCords(evt.currentTarget.getBoundingClientRect());
+  };
+
+  const handleSelect = (v: T) => {
+    onChange(v);
+    setMenuCords(undefined);
+  };
+
+  return (
+    <>
+      <Button
+        size="300"
+        variant="Secondary"
+        outlined
+        fill="Soft"
+        radii="300"
+        after={<Icon size="300" src={Icons.ChevronBottom} />}
+        onClick={handleMenu}
+        aria-label={ariaLabel}
+        aria-haspopup="menu"
+        aria-expanded={!!menuCords}
+      >
+        <Text size="T300">{selectedLabel}</Text>
+      </Button>
+      <PopOut
+        anchor={menuCords}
+        offset={5}
+        position="Bottom"
+        align="End"
+        content={
+          <FocusTrap
+            focusTrapOptions={{
+              initialFocus: false,
+              onDeactivate: () => setMenuCords(undefined),
+              clickOutsideDeactivates: true,
+              isKeyForward: (evt: KeyboardEvent) =>
+                evt.key === 'ArrowDown' || evt.key === 'ArrowRight',
+              isKeyBackward: (evt: KeyboardEvent) =>
+                evt.key === 'ArrowUp' || evt.key === 'ArrowLeft',
+              escapeDeactivates: stopPropagation,
+            }}
+          >
+            <Menu>
+              <Box direction="Column" gap="100" style={{ padding: config.space.S100 }}>
+                {options.map((opt) => (
+                  <MenuItem
+                    key={opt.value}
+                    size="300"
+                    variant={opt.value === value ? 'Primary' : 'Surface'}
+                    radii="300"
+                    disabled={opt.disabled}
+                    onClick={() => !opt.disabled && handleSelect(opt.value)}
+                  >
+                    <Text size="T300">{opt.label}</Text>
+                  </MenuItem>
+                ))}
+              </Box>
+            </Menu>
+          </FocusTrap>
+        }
+      />
+    </>
+  );
+}
diff --git a/src/app/features/settings/account/Profile.tsx b/src/app/features/settings/account/Profile.tsx
index e8df2b0b3..7a6f1da51 100644
--- a/src/app/features/settings/account/Profile.tsx
+++ b/src/app/features/settings/account/Profile.tsx
@@ -30,6 +30,7 @@ import {
 } from 'folds';
 import { Method } from 'matrix-js-sdk';
 import FocusTrap from 'focus-trap-react';
+import { SettingsSelect } from '../../../components/settings-select/SettingsSelect';
 import { SequenceCard } from '../../../components/sequence-card';
 import { SequenceCardStyle } from '../styles.css';
 import { SettingTile } from '../../../components/setting-tile';
@@ -544,35 +545,12 @@ function ProfileStatus() {
           <Text size="T200" style={{ opacity: 0.6, whiteSpace: 'nowrap', flexShrink: 0 }}>
             Auto-clear after:
           </Text>
-          <select
+          <SettingsSelect
             value={clearAfter}
-            onChange={(e) => setClearAfter(e.target.value)}
+            options={CLEAR_AFTER_OPTIONS}
+            onChange={setClearAfter}
             aria-label="Auto-clear status after"
-            style={{
-              background: color.SurfaceVariant.Container,
-              border: `1px solid ${color.SurfaceVariant.ContainerLine}`,
-              borderRadius: config.radii.R300,
-              color: color.SurfaceVariant.OnContainer,
-              colorScheme: 'dark',
-              fontSize: '0.82rem',
-              padding: `${config.space.S100} ${config.space.S200}`,
-              cursor: 'pointer',
-              outline: 'none',
-            }}
-          >
-            {CLEAR_AFTER_OPTIONS.map((opt) => (
-              <option
-                key={opt.value}
-                value={opt.value}
-                style={{
-                  background: color.SurfaceVariant.Container,
-                  color: color.SurfaceVariant.OnContainer,
-                }}
-              >
-                {opt.label}
-              </option>
-            ))}
-          </select>
+          />
         </Box>
         {(presence?.status || statusMsg) && (
           <Button
diff --git a/src/app/features/settings/general/General.tsx b/src/app/features/settings/general/General.tsx
index 96b8c5321..9b43dba9d 100644
--- a/src/app/features/settings/general/General.tsx
+++ b/src/app/features/settings/general/General.tsx
@@ -81,6 +81,7 @@ import { useDateFormatItems } from '../../../hooks/useDateFormat';
 import { playCallJoinSound } from '../../../utils/callSounds';
 import { previewRingtone, RINGTONE_OPTIONS } from '../../../utils/ringtones';
 import { DenoiseTester } from './DenoiseTester';
+import { SettingsSelect } from '../../../components/settings-select/SettingsSelect';
 
 type ThemeSelectorProps = {
   themeNames: Record<string, string>;
@@ -169,83 +170,6 @@ function SelectTheme({ disabled }: { disabled?: boolean }) {
   );
 }
 
-type SettingsSelectOption<T extends string> = { value: T; label: string; disabled?: boolean };
-
-function SettingsSelect<T extends string>({
-  value,
-  options,
-  onChange,
-}: {
-  value: T;
-  options: SettingsSelectOption<T>[];
-  onChange: (v: T) => void;
-}) {
-  const [menuCords, setMenuCords] = useState<RectCords>();
-  const selectedLabel = options.find((o) => o.value === value)?.label ?? value;
-
-  const handleMenu: MouseEventHandler<HTMLButtonElement> = (evt) => {
-    setMenuCords(evt.currentTarget.getBoundingClientRect());
-  };
-
-  const handleSelect = (v: T) => {
-    onChange(v);
-    setMenuCords(undefined);
-  };
-
-  return (
-    <>
-      <Button
-        size="300"
-        variant="Secondary"
-        outlined
-        fill="Soft"
-        radii="300"
-        after={<Icon size="300" src={Icons.ChevronBottom} />}
-        onClick={handleMenu}
-      >
-        <Text size="T300">{selectedLabel}</Text>
-      </Button>
-      <PopOut
-        anchor={menuCords}
-        offset={5}
-        position="Bottom"
-        align="End"
-        content={
-          <FocusTrap
-            focusTrapOptions={{
-              initialFocus: false,
-              onDeactivate: () => setMenuCords(undefined),
-              clickOutsideDeactivates: true,
-              isKeyForward: (evt: KeyboardEvent) =>
-                evt.key === 'ArrowDown' || evt.key === 'ArrowRight',
-              isKeyBackward: (evt: KeyboardEvent) =>
-                evt.key === 'ArrowUp' || evt.key === 'ArrowLeft',
-              escapeDeactivates: stopPropagation,
-            }}
-          >
-            <Menu>
-              <Box direction="Column" gap="100" style={{ padding: config.space.S100 }}>
-                {options.map((opt) => (
-                  <MenuItem
-                    key={opt.value}
-                    size="300"
-                    variant={opt.value === value ? 'Primary' : 'Surface'}
-                    radii="300"
-                    disabled={opt.disabled}
-                    onClick={() => !opt.disabled && handleSelect(opt.value)}
-                  >
-                    <Text size="T300">{opt.label}</Text>
-                  </MenuItem>
-                ))}
-              </Box>
-            </Menu>
-          </FocusTrap>
-        }
-      />
-    </>
-  );
-}
-
 function SystemThemePreferences() {
   const themeKind = useSystemThemeKind();
   const themeNames = useThemeNames();
diff --git a/src/app/features/settings/notifications/PushRuleEditor.tsx b/src/app/features/settings/notifications/PushRuleEditor.tsx
index 95594446b..df57676db 100644
--- a/src/app/features/settings/notifications/PushRuleEditor.tsx
+++ b/src/app/features/settings/notifications/PushRuleEditor.tsx
@@ -1,6 +1,7 @@
 import React, { ChangeEventHandler, FormEventHandler, useCallback, useMemo, useState } from 'react';
 import { IPushRule, IPushRules, PushRuleKind } from 'matrix-js-sdk';
 import { Box, Text, Button, Input, config, IconButton, Icons, Icon, Spinner, Switch } from 'folds';
+import { SettingsSelect } from '../../../components/settings-select/SettingsSelect';
 import { useAccountData } from '../../../hooks/useAccountData';
 import { AccountDataEvent } from '../../../../types/matrix/accountData';
 import { SequenceCard } from '../../../components/sequence-card';
@@ -193,10 +194,6 @@ function AddRuleForm({ kind, placeholder, label }: AddRuleFormProps) {
     setRuleId(evt.currentTarget.value);
   };
 
-  const handleModeChange: ChangeEventHandler<HTMLSelectElement> = (evt) => {
-    setMode(evt.target.value as NotificationMode);
-  };
-
   return (
     <Box as="form" onSubmit={handleSubmit} direction="Column" gap="200">
       <Text size="T200" priority="300">
@@ -217,24 +214,12 @@ function AddRuleForm({ kind, placeholder, label }: AddRuleFormProps) {
           />
         </Box>
         <Box shrink="No">
-          <select
+          <SettingsSelect
             value={mode}
-            onChange={handleModeChange}
-            style={{
-              background: 'transparent',
-              border: '1px solid currentColor',
-              borderRadius: config.radii.R300,
-              padding: `${config.space.S100} ${config.space.S200}`,
-              color: 'inherit',
-              fontSize: 'inherit',
-            }}
-          >
-            {ADD_MODES.map((m) => (
-              <option key={m} value={m}>
-                {MODE_LABELS[m]}
-              </option>
-            ))}
-          </select>
+            options={ADD_MODES.map((m) => ({ value: m, label: MODE_LABELS[m] }))}
+            onChange={setMode}
+            aria-label="Notification mode"
+          />
         </Box>
         <Button
           size="400"