Skip to content

Commit d55aaab

Browse files
Merge branch 'main' into fix/svg-file-viewer
2 parents c65b7ba + db5919d commit d55aaab

259 files changed

Lines changed: 13153 additions & 12388 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎apps/mobile/src/features/settings/SettingsProviderAccountsRouteScreen.tsx‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,14 @@ import {
55
type AtomCommandResult,
66
} from "@t3tools/client-runtime/state/runtime";
77
import type { ProviderAuthResponse, ServerProvider } from "@t3tools/contracts";
8+
import { useAtomValue } from "@effect/atom-react";
89
import { useRef, useState } from "react";
910
import { Linking, Pressable, ScrollView, TextInput, View } from "react-native";
1011
import { useSafeAreaInsets } from "react-native-safe-area-context";
1112

1213
import { AppText as Text } from "../../components/ui/AppText";
1314
import { ScreenScrollView } from "../../components/ui/ScreenScrollView";
15+
import { environmentPresentations } from "../../state/presentation";
1416
import { useEnvironmentQuery } from "../../state/query";
1517
import { serverEnvironment } from "../../state/server";
1618
import { useAtomCommand } from "../../state/use-atom-command";
@@ -25,6 +27,7 @@ import { useSettingsEnvironmentFilter, type SettingsTarget } from "./settings-en
2527

2628
export function SettingsProviderAccountsRouteScreen() {
2729
const { selectedTargets } = useSettingsEnvironmentFilter();
30+
const providersByEnvironment = useAtomValue(environmentPresentations.providersByEnvironmentAtom);
2831
const insets = useSafeAreaInsets();
2932
return (
3033
<>
@@ -41,7 +44,7 @@ export function SettingsProviderAccountsRouteScreen() {
4144
) : (
4245
selectedTargets.map((environment) => (
4346
<SettingsSection key={environment.environmentId} title={environment.label}>
44-
{environment.serverConfig.providers
47+
{(providersByEnvironment.get(environment.environmentId) ?? [])
4548
.filter(
4649
(provider) =>
4750
provider.setup?.canAuthenticate ||
@@ -54,7 +57,7 @@ export function SettingsProviderAccountsRouteScreen() {
5457
provider={provider}
5558
/>
5659
))}
57-
{!environment.serverConfig.providers.some(
60+
{!(providersByEnvironment.get(environment.environmentId) ?? []).some(
5861
(provider) =>
5962
provider.setup?.canAuthenticate ||
6063
(provider.driver === "acpRegistry" && provider.installed),

‎apps/mobile/src/features/usage/ChatGptUsageSummary.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ export function ChatGptUsageSummary({
1111
}: {
1212
selectedEnvironmentIds: ReadonlySet<EnvironmentId> | null;
1313
}) {
14-
const presentations = useAtomValue(environmentPresentations.presentationsAtom);
14+
const presentations = useAtomValue(environmentPresentations.presentationsWithProvidersAtom);
1515
const selected =
1616
selectedEnvironmentIds === null
1717
? presentations

‎apps/mobile/src/features/usage/UsageLimitsPooled.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -222,7 +222,7 @@ export function UsageLimitsSection({
222222
readonly selectedEnvironmentIds: ReadonlySet<EnvironmentId> | null;
223223
readonly cursorPrompt?: ReactNode;
224224
}) {
225-
const presentations = useAtomValue(environmentPresentations.presentationsAtom);
225+
const presentations = useAtomValue(environmentPresentations.presentationsWithProvidersAtom);
226226
const selected =
227227
selectedEnvironmentIds === null
228228
? presentations
@@ -345,7 +345,7 @@ type AccountScreenProps = StaticScreenProps<{
345345

346346
export function UsageLimitAccountScreen({ route }: AccountScreenProps) {
347347
const insets = useSafeAreaInsets();
348-
const presentations = useAtomValue(environmentPresentations.presentationsAtom);
348+
const presentations = useAtomValue(environmentPresentations.presentationsWithProvidersAtom);
349349
const { accountKey, windowId, windowKind, environmentIds, now } = route.params;
350350
const selectedIds =
351351
environmentIds === null ? null : new Set(environmentIds.map((id) => EnvironmentId.make(id)));

‎apps/mobile/src/widgets/SubscriptionUsageCoordinator.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import { buildSubscriptionUsageSnapshot } from "./subscriptionUsageSnapshot";
1212
// Isolate quota changes from the much busier thread/config presentation stream.
1313
const snapshotAtom = Atom.make((get) =>
1414
buildSubscriptionUsageSnapshot(
15-
get(environmentPresentations.presentationsAtom),
15+
get(environmentPresentations.presentationsWithProvidersAtom),
1616
Linking.createURL("settings/usage", { queryParams: { tab: "limits" } }),
1717
Platform.OS === "android" ? Infinity : 6,
1818
),

‎apps/web/package.json‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,7 @@
7171
"remark-gfm": "catalog:",
7272
"tailwind-merge": "^3.4.0",
7373
"unbash": "^5.0.0",
74+
"use-sync-external-store": "^1.6.0",
7475
"zustand": "^5.0.11"
7576
},
7677
"devDependencies": {
@@ -84,6 +85,7 @@
8485
"@types/react": "~19.3.0",
8586
"@types/react-dom": "~19.2.3",
8687
"@types/react-test-renderer": "19.1.0",
88+
"@types/use-sync-external-store": "^0.0.6",
8789
"@vercel/config": "^0.3.0",
8890
"@vitejs/plugin-react": "^6.1.2",
8991
"@vitest/browser-playwright": "5.0.1",

apps/web/src/browser/HostedBrowserWebview.test.tsx renamed to apps/web/src/browser/HostedBrowserWebview.browser.test.tsx

Lines changed: 49 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import {
77
type DesktopPreviewBridge,
88
} from "@t3tools/contracts";
99
import { act } from "react";
10-
import { create, type ReactTestRenderer } from "react-test-renderer";
10+
import { createRoot, type Root } from "react-dom/client";
1111
import { afterEach, beforeEach, describe, expect, it, vi } from "vite-plus/test";
1212

1313
const mocks = vi.hoisted(() => ({
@@ -20,28 +20,32 @@ const mocks = vi.hoisted(() => ({
2020
activeRecordings: new Set<string>(),
2121
}));
2222

23-
vi.mock("~/localApi", () => ({
24-
ensureLocalApi: () => ({ persistence: mocks }),
25-
}));
23+
vi.mock(import("~/localApi"), async (original) => {
24+
const actual = await original();
25+
return {
26+
...actual,
27+
ensureLocalApi: () => ({ ...actual.ensureLocalApi(), persistence: mocks as never }),
28+
};
29+
});
30+
31+
vi.mock(import("./desktopTabLifetime"), { spy: true });
2632

27-
vi.mock("~/components/preview/previewBridge", () => ({
33+
// The Electron desktop bridge; a browser has none.
34+
vi.mock(import("~/components/preview/previewBridge"), async (original) => ({
35+
...(await original()),
2836
previewBridge: {
2937
createTab: mocks.createTab,
3038
closeTab: mocks.closeTab,
3139
registerWebview: mocks.registerWebview,
3240
getPreviewConfig: mocks.getPreviewConfig,
33-
},
41+
} as unknown as DesktopPreviewBridge,
3442
}));
3543

36-
vi.mock("~/components/preview/usePreviewBridge", () => ({
44+
vi.mock(import("~/components/preview/usePreviewBridge"), async (original) => ({
45+
...(await original()),
3746
usePreviewBridge: () => undefined,
3847
}));
3948

40-
vi.mock("./browserRecording", () => ({
41-
useActiveBrowserRecordingTabIds: () => mocks.activeRecordings,
42-
stopBrowserRecording: async () => null,
43-
}));
44-
4549
import {
4650
__resetClientSettingsPersistenceForTests,
4751
ensureClientSettingsHydrated,
@@ -50,7 +54,8 @@ import { useBrowserSurfaceStore } from "./browserSurfaceStore";
5054
import * as desktopTabLifetime from "./desktopTabLifetime";
5155
import { HostedBrowserWebview } from "./HostedBrowserWebview";
5256

53-
let renderer: ReactTestRenderer | undefined;
57+
let root: Root | undefined;
58+
let container: HTMLDivElement;
5459

5560
function deferred<A>() {
5661
let resolve!: (value: A) => void;
@@ -76,20 +81,16 @@ beforeEach(() => {
7681
preloadUrl: null,
7782
});
7883
vi.stubGlobal("IS_REACT_ACT_ENVIRONMENT", true);
79-
vi.stubGlobal("window", globalThis);
80-
vi.stubGlobal("navigator", { platform: "Linux" });
81-
vi.stubGlobal(
82-
"requestAnimationFrame",
83-
vi.fn(() => 0),
84-
);
85-
vi.stubGlobal("cancelAnimationFrame", vi.fn());
8684
vi.spyOn(console, "error").mockImplementation(() => undefined);
85+
container = document.createElement("div");
86+
document.body.append(container);
8787
});
8888

8989
afterEach(async () => {
9090
vi.useFakeTimers();
91-
await act(() => renderer?.unmount());
92-
renderer = undefined;
91+
await act(async () => root?.unmount());
92+
root = undefined;
93+
container.remove();
9394
await vi.advanceTimersByTimeAsync(0);
9495
vi.useRealTimers();
9596
__resetClientSettingsPersistenceForTests();
@@ -107,19 +108,31 @@ describe("HostedBrowserWebview settings hydration", () => {
107108
.mockReturnValueOnce(firstRead.promise)
108109
.mockReturnValueOnce(retryRead.promise);
109110
mocks.createTab.mockReturnValueOnce(tabCreation.promise);
110-
const acquire = vi.spyOn(desktopTabLifetime, "acquireDesktopTab");
111-
const createGuest = vi.fn((_attributes: unknown) =>
112-
Object.assign(new EventTarget(), { getWebContentsId: () => 41 }),
113-
);
111+
const acquire = vi.mocked(desktopTabLifetime.acquireDesktopTab);
112+
// Chromium treats <webview> as an unknown element; give it the one Electron method the
113+
// host calls once the guest attaches.
114+
const createElement = document.createElement.bind(document);
115+
const createGuest = vi.spyOn(document, "createElement").mockImplementation(((
116+
tagName: string,
117+
options?: ElementCreationOptions,
118+
) => {
119+
const element = createElement(tagName, options);
120+
return tagName === "webview"
121+
? Object.assign(element, { getWebContentsId: () => 41 })
122+
: element;
123+
}) as typeof document.createElement);
124+
const guests = () => createGuest.mock.calls.filter(([tagName]) => tagName === "webview");
125+
const guest = () => container.querySelector("webview");
114126
const threadRef = {
115127
environmentId: EnvironmentId.make("host-settings-retry"),
116128
threadId: ThreadId.make("thread-settings-retry"),
117129
};
118130
const runtimeTabId = "retained-background-tab";
119131
useBrowserSurfaceStore.getState().acquireActivity(runtimeTabId);
120132

121-
await act(() => {
122-
renderer = create(
133+
root = createRoot(container);
134+
await act(async () =>
135+
root!.render(
123136
<HostedBrowserWebview
124137
threadRef={threadRef}
125138
tabId="server-tab"
@@ -130,18 +143,12 @@ describe("HostedBrowserWebview settings hydration", () => {
130143
profileId="work"
131144
zoomFactor={1.25}
132145
/>,
133-
{
134-
createNodeMock: (element) =>
135-
element.type === "webview"
136-
? createGuest(element.props)
137-
: { scrollLeft: 0, scrollTop: 0, scrollTo: () => undefined },
138-
},
139-
);
140-
});
146+
),
147+
);
141148

142149
expect(mocks.getClientSettings).toHaveBeenCalledOnce();
143150
expect(acquire).not.toHaveBeenCalled();
144-
expect(createGuest).not.toHaveBeenCalled();
151+
expect(guest()).toBeNull();
145152
expect(mocks.createTab).not.toHaveBeenCalled();
146153

147154
const failure = new Error("Saved settings are unavailable");
@@ -151,7 +158,7 @@ describe("HostedBrowserWebview settings hydration", () => {
151158
await expect(hydration).rejects.toBe(failure);
152159
});
153160
expect(acquire).not.toHaveBeenCalled();
154-
expect(createGuest).not.toHaveBeenCalled();
161+
expect(guest()).toBeNull();
155162
expect(mocks.createTab).not.toHaveBeenCalled();
156163

157164
let retry!: Promise<void>;
@@ -160,7 +167,7 @@ describe("HostedBrowserWebview settings hydration", () => {
160167
});
161168
expect(mocks.getClientSettings).toHaveBeenCalledTimes(2);
162169
expect(acquire).not.toHaveBeenCalled();
163-
expect(createGuest).not.toHaveBeenCalled();
170+
expect(guest()).toBeNull();
164171
expect(mocks.createTab).not.toHaveBeenCalled();
165172

166173
await act(async () => {
@@ -176,13 +183,9 @@ describe("HostedBrowserWebview settings hydration", () => {
176183

177184
expect(acquire).toHaveBeenCalledExactlyOnceWith(runtimeTabId, undefined);
178185
expect(mocks.getPreviewConfig).toHaveBeenCalledExactlyOnceWith(threadRef.environmentId, "work");
179-
expect(createGuest).toHaveBeenCalledOnce();
180-
expect(createGuest).toHaveBeenCalledWith(
181-
expect.objectContaining({
182-
partition: "persist:t3-preview-work",
183-
src: "https://example.com",
184-
}),
185-
);
186+
expect(guests()).toHaveLength(1);
187+
expect(guest()?.getAttribute("partition")).toBe("persist:t3-preview-work");
188+
expect(guest()?.getAttribute("src")).toBe("https://example.com");
186189
expect(mocks.createTab).toHaveBeenCalledExactlyOnceWith(runtimeTabId, {
187190
zoomFactor: 1.25,
188191
colorScheme: "dark",

0 commit comments

Comments
 (0)