chore: sync upstream (84 commits)

apps/mobile/modules/t3-native-controls/ios/T3SegmentedControlView.swift

@@ -15,12 +15,15 @@ final class T3SegmentedControlView: ExpoView {
     }
   }
   var selectedIndex = -1 { didSet { updateSelection() } }
-  var trackColor: UIColor = .secondarySystemBackground { didSet { control.backgroundColor = trackColor } }
-  var selectedColor: UIColor = .secondarySystemFill { didSet { control.selectedSegmentTintColor = selectedColor } }
-  var textColor: UIColor = .label { didSet { updateColors() } }
-  var mutedColor: UIColor = .secondaryLabel { didSet { updateColors() } }
+  var trackColor: UIColor = .secondarySystemBackground { didSet { if trackColor != oldValue { control.backgroundColor = trackColor } } }
+  var selectedColor: UIColor = .secondarySystemFill { didSet { if selectedColor != oldValue { control.selectedSegmentTintColor = selectedColor } } }
+  var textColor: UIColor = .label { didSet { if textColor != oldValue { updateColors() } } }
+  var mutedColor: UIColor = .secondaryLabel { didSet { if mutedColor != oldValue { updateColors() } } }
   var appearance = "light" {
-    didSet { overrideUserInterfaceStyle = appearance == "dark" ? .dark : .light }
+    didSet {
+      guard appearance != oldValue else { return }
+      overrideUserInterfaceStyle = appearance == "dark" ? .dark : .light
+    }
   }
 
   required init(appContext: AppContext? = nil) {
@@ -31,11 +34,20 @@ final class T3SegmentedControlView: ExpoView {
 
   override func layoutSubviews() {
     super.layoutSubviews()
-    control.frame = bounds
+    guard control.frame != bounds else { return }
+    UIView.performWithoutAnimation {
+      control.frame = bounds
+    }
   }
 
   private func updateSelection() {
-    control.selectedSegmentIndex = labels.indices.contains(selectedIndex) ? selectedIndex : UISegmentedControl.noSegment
+    let index = labels.indices.contains(selectedIndex) ? selectedIndex : UISegmentedControl.noSegment
+    // React echoes native selections while UIKit is still settling the glass lens.
+    guard control.selectedSegmentIndex != index else { return }
+    UIView.performWithoutAnimation {
+      control.selectedSegmentIndex = index
+      control.layoutIfNeeded()
+    }
   }
 
   private func updateColors() {

apps/mobile/src/components/ui/SegmentedControl.ios.tsx

@@ -29,14 +29,14 @@ export function SegmentedControl<Value extends string | number>(
 ) {
   const { colors, colorScheme } = useControlTheme();
   const trackColor = flattenThemeColor(
-    themeColorWithAlpha(colors["--color-primary"], colorScheme === "dark" ? 0.18 : 0.07),
+    themeColorWithAlpha(colors["--color-prominent-action"], colorScheme === "dark" ? 0.18 : 0.07),
     colors["--color-screen"],
   );
   const selectedColor =
-    colorScheme === "dark" ? colors["--color-primary"] : colors["--color-secondary"];
+    colorScheme === "dark" ? colors["--color-prominent-action"] : colors["--color-secondary"];
   const selectedTextColor =
     colorScheme === "dark"
-      ? colors["--color-primary-foreground"]
+      ? colors["--color-prominent-action-foreground"]
       : colors["--color-secondary-foreground"];
   return (
     <View className={props.className}>

apps/mobile/src/features/pull-requests/PullRequestRouteScreen.tsx

@@ -685,7 +685,6 @@ export function PullRequestRouteScreen({ route }: StaticScreenProps<PullRequestP
                         >
                           <PullRequestIdentity pr={identity} params={params} />
                           <SegmentedControl
-                            className={Platform.OS === "android" ? undefined : "bg-grouped-card"}
                             options={[
                               { value: "overview", label: "Overview" },
                               ...(guidesEnabled

apps/web/reactCompiledFiles.ts

@@ -96,4 +96,6 @@ export const REACT_COMPILED_FILES = [
   "apps/web/src/components/pullRequest/PullRequestDetailPanel.tsx",
   "apps/web/src/components/ThreadTerminalDrawer.tsx",
   "apps/web/src/components/settings/SettingsPanels.tsx",
+  "apps/web/src/routes/_chat.pull-requests.tsx",
+  "apps/web/src/components/LegacySidebar.tsx",
 ] as const;

apps/web/src/browser/ElectronBrowserHost.tsx

@@ -1,15 +1,18 @@
 "use client";
 
 import { parseScopedThreadKey } from "@t3tools/client-runtime/environment";
-import { AuthPreviewOperateScope, FILL_PREVIEW_VIEWPORT } from "@t3tools/contracts";
+import {
+  AuthPreviewOperateScope,
+  type DesktopPreviewOpenLinkEvent,
+  FILL_PREVIEW_VIEWPORT,
+} from "@t3tools/contracts";
 import { useAtomValue } from "@effect/atom-react";
-import { type ComponentProps, useEffect, useMemo, useRef, useState } from "react";
+import { type ComponentProps, useEffect, useEffectEvent, useState } from "react";
 
 import { primaryEnvironmentIdAtom } from "~/state/primaryEnvironment";
 
 import { isElectron } from "~/env";
 import { useClientSettingsHydrated } from "~/hooks/useSettings";
-import { useTheme } from "~/hooks/useTheme";
 import { useActivePreviewSessions } from "~/previewStateStore";
 import { previewEnvironment } from "~/state/preview";
 import { useEnvironmentScope } from "~/state/session";
@@ -24,36 +27,27 @@ import { rendersServerTabNatively } from "./previewRuntime";
 import { previewRuntimeTabId } from "./previewRuntimeTabId";
 
 export function ElectronBrowserHost() {
-  const { resolvedTheme } = useTheme();
   const previewByThreadKey = useActivePreviewSessions();
   const primaryEnvironmentId = useAtomValue(primaryEnvironmentIdAtom);
-  const sessions = useMemo(
-    () =>
-      Object.entries(previewByThreadKey).flatMap(([threadKey, previewState]) => {
-        const threadRef = parseScopedThreadKey(threadKey);
-        return threadRef
-          ? Object.values(previewState.sessions)
-              .filter(
-                (snapshot) =>
-                  snapshot.runtime !== "server" ||
-                  rendersServerTabNatively(threadRef.environmentId, primaryEnvironmentId, snapshot),
-              )
-              .map((snapshot) => ({
-                threadRef,
-                snapshot,
-                runtimeTabId: previewRuntimeTabId(
-                  threadRef,
-                  previewState.serverEpoch,
-                  snapshot.tabId,
-                ),
-                pictureInPicture:
-                  previewState.desktopByTabId[snapshot.tabId]?.pictureInPicture ?? false,
-                zoomFactor: previewState.desktopByTabId[snapshot.tabId]?.zoomFactor ?? 1,
-              }))
-          : [];
-      }),
-    [previewByThreadKey, primaryEnvironmentId],
-  );
+  const sessions = Object.entries(previewByThreadKey).flatMap(([threadKey, previewState]) => {
+    const threadRef = parseScopedThreadKey(threadKey);
+    return threadRef
+      ? Object.values(previewState.sessions)
+          .filter(
+            (snapshot) =>
+              snapshot.runtime !== "server" ||
+              rendersServerTabNatively(threadRef.environmentId, primaryEnvironmentId, snapshot),
+          )
+          .map((snapshot) => ({
+            threadRef,
+            snapshot,
+            runtimeTabId: previewRuntimeTabId(threadRef, previewState.serverEpoch, snapshot.tabId),
+            pictureInPicture:
+              previewState.desktopByTabId[snapshot.tabId]?.pictureInPicture ?? false,
+            zoomFactor: previewState.desktopByTabId[snapshot.tabId]?.zoomFactor ?? 1,
+          }))
+      : [];
+  });
 
   useEffect(() => {
     const preview = window.desktopBridge?.preview;
@@ -86,7 +80,7 @@ export function ElectronBrowserHost() {
       observer.disconnect();
       headObserver.disconnect();
     };
-  }, [resolvedTheme]);
+  }, []);
 
   useEffect(() => {
     const preview = window.desktopBridge?.preview;
@@ -97,27 +91,22 @@ export function ElectronBrowserHost() {
   }, []);
 
   const openPreview = useAtomCommand(previewEnvironment.open, { reportFailure: true });
-  const sessionByRuntimeTabId = useRef(new Map<string, (typeof sessions)[number]>());
-  useEffect(() => {
-    sessionByRuntimeTabId.current = new Map(
-      sessions.map((session) => [session.runtimeTabId, session]),
-    );
-  }, [sessions]);
+  const onOpenLink = useEffectEvent(({ tabId, url, background }: DesktopPreviewOpenLinkEvent) => {
+    const source = sessions.find((session) => session.runtimeTabId === tabId);
+    if (!source) return;
+    void openUrlInPreview({
+      threadRef: source.threadRef,
+      url,
+      openPreview,
+      profileId: source.snapshot.profileId,
+      background,
+    });
+  });
   useEffect(() => {
     const preview = window.desktopBridge?.preview;
     if (!preview) return;
-    return preview.onOpenLink(({ tabId, url, background }) => {
-      const source = sessionByRuntimeTabId.current.get(tabId);
-      if (!source) return;
-      void openUrlInPreview({
-        threadRef: source.threadRef,
-        url,
-        openPreview,
-        profileId: source.snapshot.profileId,
-        background,
-      });
-    });
-  }, [openPreview]);
+    return preview.onOpenLink(onOpenLink);
+  }, []);
 
   if (!isElectron) return null;
   return (