mirror of
https://github.com/getpaseo/paseo.git
synced 2026-10-31 13:42:50 +00:00
Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
c9e56e1eb9 | ||
|
|
3274d67959 | ||
|
|
2fbc5f4b59 | ||
|
|
833b4ef80a | ||
|
|
39f1058005 | ||
|
|
fd65985e9d |
@@ -61,6 +61,18 @@ Gradle auto-fetches the platform/build-tools it needs once licenses are accepted
|
||||
|
||||
## Local build + install
|
||||
|
||||
The `react-native-svg@15.15.4` patch prevents header fades retaining their old painted size after
|
||||
rotation. Rebuild native Android after changing it; Metro reloads cannot update this code. Keep the
|
||||
resize hunks until upstream invalidates descendant geometry on canvas resize. Its instrumentation
|
||||
regression renders real gradient pixels across growing and shrinking layouts, including a nested
|
||||
group. From `packages/app/android`, run it on your selected emulator:
|
||||
|
||||
```bash
|
||||
ANDROID_SERIAL=emulator-5562 ./gradlew :react-native-svg:connectedDebugAndroidTest \
|
||||
-Pandroid.testInstrumentationRunnerArguments.class=com.horcrux.svg.SvgResizeTest \
|
||||
--no-daemon --max-workers=2 -Dorg.gradle.parallel=false
|
||||
```
|
||||
|
||||
The locked `expo-modules-core@57.0.23` needs the patch installed by `npm install`.
|
||||
It backports
|
||||
[Expo's Activity-result launcher fix](https://github.com/expo/expo/pull/49634): changing
|
||||
|
||||
@@ -89,7 +89,7 @@
|
||||
"speech:transcribe:local": "tsx scripts/transcribe-local-wav.ts",
|
||||
"test": "npm run test:unit && npm run test:integration",
|
||||
"test:unit": "vitest run --fileParallelism --exclude \"**/*.e2e.test.ts\"",
|
||||
"test:integration": "vitest run --maxWorkers=1 src/server/git-filename-diffs.e2e.test.ts src/server/daemon-e2e/checkout-diff-content.e2e.test.ts src/server/daemon-e2e/filesystem.e2e.test.ts src/server/daemon-e2e/file-download.e2e.test.ts src/server/daemon-e2e/cli-logs-follow.e2e.test.ts src/server/creation/creation.e2e.test.ts src/server/daemon-e2e/terminal-workspace-sdk.e2e.test.ts src/server/daemon-e2e/terminal-worker-lifecycle.e2e.test.ts src/server/workspace-create-worktree-source.e2e.test.ts src/server/daemon-e2e/models.e2e.test.ts src/server/daemon-e2e/live-preferences.e2e.test.ts src/server/daemon-e2e/oversized-message.e2e.test.ts src/server/agent/model-catalog.e2e.test.ts src/server/plugins/plugin-paseo-api.e2e.test.ts src/server/plugins/usage-sources.e2e.test.ts src/server/plugins/lifecycle.e2e.test.ts src/server/connected-hosts/hosts.e2e.test.ts src/server/owned-subscriptions.e2e.test.ts && vitest run --maxWorkers=1 src/server/agent/providers/omp/history.e2e.test.ts src/server/daemon-e2e/git-operations.e2e.test.ts src/server/session.create-agent-worktree-autoarchive.e2e.test.ts src/server/agent/providers/opencode-bridge.local.e2e.test.ts src/server/daemon-e2e/relay-transport.e2e.test.ts -t \"merges into|creates a worktree and auto-archives both|versioned runtime|oversized attachments|connected hosts|password-protected daemon refuses|replays selected OMP history\"",
|
||||
"test:integration": "vitest run --maxWorkers=1 src/server/git-filename-diffs.e2e.test.ts src/server/daemon-e2e/checkout-diff-content.e2e.test.ts src/server/daemon-e2e/filesystem.e2e.test.ts src/server/daemon-e2e/file-download.e2e.test.ts src/server/daemon-e2e/cli-logs-follow.e2e.test.ts src/server/creation/creation.e2e.test.ts src/server/daemon-e2e/terminal-workspace-sdk.e2e.test.ts src/server/daemon-e2e/terminal-worker-lifecycle.e2e.test.ts src/server/workspace-create-worktree-source.e2e.test.ts src/server/daemon-e2e/models.e2e.test.ts src/server/daemon-e2e/live-preferences.e2e.test.ts src/server/daemon-e2e/oversized-message.e2e.test.ts src/server/agent/model-catalog.e2e.test.ts src/server/plugins/plugin-paseo-api.e2e.test.ts src/server/plugins/usage-sources.e2e.test.ts src/server/plugins/lifecycle.e2e.test.ts src/server/connected-hosts/hosts.e2e.test.ts src/server/owned-subscriptions.e2e.test.ts src/server/daemon-e2e/concurrent-agent-refresh.e2e.test.ts && vitest run --maxWorkers=1 src/server/agent/providers/omp/history.e2e.test.ts src/server/daemon-e2e/git-operations.e2e.test.ts src/server/session.create-agent-worktree-autoarchive.e2e.test.ts src/server/agent/providers/opencode-bridge.local.e2e.test.ts src/server/daemon-e2e/relay-transport.e2e.test.ts -t \"merges into|creates a worktree and auto-archives both|versioned runtime|oversized attachments|connected hosts|password-protected daemon refuses|replays selected OMP history\"",
|
||||
"test:hub-cli-contract": "vitest run --maxWorkers=1 src/server/hub/hub-cli-contract.test.ts",
|
||||
"test:integration:all": "npm run test:e2e",
|
||||
"test:integration:real": "vitest run real.e2e.test.ts",
|
||||
|
||||
@@ -0,0 +1,207 @@
|
||||
import { execFileSync } from "node:child_process";
|
||||
import { mkdirSync, mkdtempSync, rmSync } from "node:fs";
|
||||
import path from "node:path";
|
||||
import { afterEach, expect, test } from "vitest";
|
||||
import type { AgentClient, AgentSession } from "../agent/agent-sdk-types.js";
|
||||
import { createTestAgentClient } from "../test-utils/fake-agent-client.js";
|
||||
import { DaemonClient } from "../test-utils/daemon-client.js";
|
||||
import { createTestPaseoDaemon, type TestPaseoDaemon } from "../test-utils/paseo-daemon.js";
|
||||
|
||||
function deferred() {
|
||||
let resolve!: () => void;
|
||||
const promise = new Promise<void>((done) => {
|
||||
resolve = done;
|
||||
});
|
||||
return { promise, resolve };
|
||||
}
|
||||
|
||||
const artifactRoot = path.resolve(".artifacts");
|
||||
mkdirSync(artifactRoot, { recursive: true });
|
||||
const resources: { daemon: TestPaseoDaemon; clients: DaemonClient[]; cwd: string }[] = [];
|
||||
const releases: (() => void)[] = [];
|
||||
afterEach(async () => {
|
||||
releases.splice(0).forEach((release) => release());
|
||||
for (const { daemon, clients, cwd } of resources.splice(0)) {
|
||||
await Promise.all(clients.map((client) => client.close()));
|
||||
await daemon.close();
|
||||
rmSync(cwd, { recursive: true, force: true });
|
||||
}
|
||||
});
|
||||
|
||||
function heldHistoryProvider() {
|
||||
const historyStarted = deferred();
|
||||
const releaseHistory = deferred();
|
||||
releases.push(releaseHistory.resolve);
|
||||
const base = createTestAgentClient("claude");
|
||||
let resumes = 0;
|
||||
const provider: AgentClient = {
|
||||
provider: base.provider,
|
||||
capabilities: base.capabilities,
|
||||
createSession: (...args) => base.createSession(...args),
|
||||
fetchCatalog: (...args) => base.fetchCatalog(...args),
|
||||
isAvailable: (...args) => base.isAvailable(...args),
|
||||
async resumeSession(...args) {
|
||||
resumes += 1;
|
||||
const session = await base.resumeSession(...args);
|
||||
// Delay provider history through its public interface, keeping the manager real.
|
||||
return new Proxy(session, {
|
||||
get(target, key: keyof AgentSession) {
|
||||
if (key === "streamHistory")
|
||||
return async function* () {
|
||||
historyStarted.resolve();
|
||||
await releaseHistory.promise;
|
||||
yield* target.streamHistory();
|
||||
};
|
||||
const value = Reflect.get(target, key);
|
||||
return typeof value === "function" ? value.bind(target) : value;
|
||||
},
|
||||
});
|
||||
},
|
||||
};
|
||||
return { provider, historyStarted, releaseHistory, resumes: () => resumes };
|
||||
}
|
||||
|
||||
async function setup(provider: AgentClient, agentId?: string, appVersions = ["0.14.0", "0.14.0"]) {
|
||||
const cwd = mkdtempSync(path.join(artifactRoot, "concurrent-refresh-"));
|
||||
const daemon = await createTestPaseoDaemon({ agentClients: { claude: provider } });
|
||||
const clients = appVersions.map(
|
||||
(appVersion) => new DaemonClient({ url: `ws://127.0.0.1:${daemon.port}/ws`, appVersion }),
|
||||
);
|
||||
resources.push({ daemon, clients, cwd });
|
||||
await Promise.all(clients.map((client) => client.connect()));
|
||||
await Promise.all(clients.map((client) => client.fetchAgents({ subscribe: {} })));
|
||||
const agent = await daemon.daemon.agentManager.createAgent({ provider: "claude", cwd }, agentId, {
|
||||
workspaceId: undefined,
|
||||
});
|
||||
return { clients, agent, cwd };
|
||||
}
|
||||
|
||||
test("refreshes from separate connections share the reload until history is ready", async () => {
|
||||
const provider = heldHistoryProvider();
|
||||
const { clients, agent } = await setup(provider.provider);
|
||||
const first = clients[0].refreshAgent(agent.id);
|
||||
await provider.historyStarted.promise;
|
||||
const second = clients[1].refreshAgent(agent.id);
|
||||
// The following RPC traverses the same connection after the second refresh request.
|
||||
await clients[1].fetchAgents();
|
||||
provider.releaseHistory.resolve();
|
||||
const results = await Promise.all([first, second]);
|
||||
expect(results.map((result) => result.agentId)).toEqual([agent.id, agent.id]);
|
||||
expect(provider.resumes()).toBe(1);
|
||||
await clients[0].refreshAgent(agent.id);
|
||||
expect(provider.resumes()).toBe(2);
|
||||
});
|
||||
|
||||
test("refreshing the same id in separate daemons does not share a provider reload", async () => {
|
||||
const provider = heldHistoryProvider();
|
||||
const firstDaemon = await setup(provider.provider);
|
||||
const secondDaemon = await setup(createTestAgentClient("claude"), firstDaemon.agent.id);
|
||||
const first = firstDaemon.clients[0].refreshAgent(firstDaemon.agent.id);
|
||||
await provider.historyStarted.promise;
|
||||
const second = secondDaemon.clients[0].refreshAgent(secondDaemon.agent.id);
|
||||
await secondDaemon.clients[0].fetchAgents();
|
||||
// The other daemon must finish without releasing the first one's provider history.
|
||||
let deadline: ReturnType<typeof setTimeout> | undefined;
|
||||
let independent: boolean;
|
||||
try {
|
||||
independent = await Promise.race([
|
||||
second.then(() => true),
|
||||
new Promise<boolean>((resolve) => {
|
||||
deadline = setTimeout(() => resolve(false), 5000);
|
||||
}),
|
||||
]);
|
||||
} finally {
|
||||
clearTimeout(deadline);
|
||||
}
|
||||
provider.releaseHistory.resolve();
|
||||
await Promise.all([first, second]);
|
||||
expect(independent).toBe(true);
|
||||
});
|
||||
|
||||
test("concurrent refreshes share a failure and a later retry starts a new reload", async () => {
|
||||
const resumeStarted = deferred();
|
||||
const releaseResume = deferred();
|
||||
releases.push(releaseResume.resolve);
|
||||
let resumes = 0;
|
||||
const provider = createTestAgentClient("claude", {
|
||||
beforeResumeSession: async () => {
|
||||
resumes += 1;
|
||||
if (resumes === 1) {
|
||||
resumeStarted.resolve();
|
||||
await releaseResume.promise;
|
||||
throw new Error("provider resume failed");
|
||||
}
|
||||
},
|
||||
});
|
||||
const { clients, agent } = await setup(provider);
|
||||
const first = clients[0].refreshAgent(agent.id);
|
||||
// Attach handlers before releasing the rejected provider operation.
|
||||
const outcome = Promise.allSettled([first]);
|
||||
await resumeStarted.promise;
|
||||
const second = clients[1].refreshAgent(agent.id);
|
||||
const retryOutcome = Promise.allSettled([second]);
|
||||
await clients[1].fetchAgents();
|
||||
releaseResume.resolve();
|
||||
const results = [...(await outcome), ...(await retryOutcome)];
|
||||
expect(results.map((result) => result.status)).toEqual(["rejected", "rejected"]);
|
||||
for (const result of results) {
|
||||
if (result.status === "rejected")
|
||||
expect(String(result.reason)).toContain("provider resume failed");
|
||||
}
|
||||
expect(resumes).toBe(1);
|
||||
await expect(clients[0].refreshAgent(agent.id)).resolves.toMatchObject({ agentId: agent.id });
|
||||
expect(resumes).toBe(2);
|
||||
});
|
||||
|
||||
test("a legacy caller restores its workspace when joining a modern refresh", async () => {
|
||||
const provider = heldHistoryProvider();
|
||||
const {
|
||||
clients: [modern, legacy],
|
||||
cwd,
|
||||
} = await setup(provider.provider, undefined, ["0.1.105", "0.1.104"]);
|
||||
// An independent repository prevents archive from owning the enclosing test checkout.
|
||||
execFileSync("git", ["init", "-b", "main", cwd], { stdio: "pipe" });
|
||||
execFileSync(
|
||||
"git",
|
||||
[
|
||||
"-c",
|
||||
"user.name=Paseo Test",
|
||||
"-c",
|
||||
"user.email=test@example.com",
|
||||
"-c",
|
||||
"commit.gpgsign=false",
|
||||
"commit",
|
||||
"--allow-empty",
|
||||
"-m",
|
||||
"fixture",
|
||||
],
|
||||
{ cwd, stdio: "pipe" },
|
||||
);
|
||||
const created = await modern.createWorkspace({ source: { kind: "directory", path: cwd } });
|
||||
expect(created.error).toBeNull();
|
||||
const workspace = created.workspace!;
|
||||
const agent = await modern.createAgent({ provider: "claude", cwd, workspaceId: workspace.id });
|
||||
await modern.archiveWorkspace(workspace.id);
|
||||
expect((await modern.fetchWorkspaces()).entries.some((entry) => entry.id === workspace.id)).toBe(
|
||||
false,
|
||||
);
|
||||
const first = modern.refreshAgent(agent.id);
|
||||
await provider.historyStarted.promise;
|
||||
expect((await modern.fetchWorkspaces()).entries.some((entry) => entry.id === workspace.id)).toBe(
|
||||
false,
|
||||
);
|
||||
const joining = legacy.refreshAgent(agent.id);
|
||||
const outcomes = Promise.allSettled([first, joining]);
|
||||
try {
|
||||
await expect
|
||||
.poll(
|
||||
async () =>
|
||||
(await legacy.fetchWorkspaces()).entries.some((entry) => entry.id === workspace.id),
|
||||
{ timeout: 5000 },
|
||||
)
|
||||
.toBe(true);
|
||||
} finally {
|
||||
provider.releaseHistory.resolve();
|
||||
}
|
||||
expect((await outcomes).map((result) => result.status)).toEqual(["fulfilled", "fulfilled"]);
|
||||
});
|
||||
@@ -682,6 +682,9 @@ interface ClientActivity {
|
||||
appVisibilityChangedAt: Date;
|
||||
}
|
||||
|
||||
// Connections on one daemon share refreshes; independent managers own independent agents.
|
||||
const pendingAgentRefreshes = new WeakMap<AgentManager, Map<string, Promise<ManagedAgent>>>();
|
||||
|
||||
export class Session {
|
||||
private readonly connectedHostSession: ConnectedHostSession | null;
|
||||
private routed = false;
|
||||
@@ -4759,39 +4762,26 @@ export class Session {
|
||||
|
||||
try {
|
||||
await this.restoreOwningWorkspaceForLegacyAgentRefresh(agentId);
|
||||
await unarchiveAgentState(this.agentStorage, this.agentManager, agentId);
|
||||
let snapshot: ManagedAgent;
|
||||
const existing = this.agentManager.getAgent(agentId);
|
||||
if (existing) {
|
||||
await this.interruptAgentIfRunning(agentId);
|
||||
snapshot = await this.agentManager.reloadAgentSession(agentId, undefined, {
|
||||
rehydrateFromDisk: true,
|
||||
});
|
||||
} else {
|
||||
const record = await this.agentStorage.get(agentId);
|
||||
if (!record) {
|
||||
throw new Error(`Agent not found: ${agentId}`);
|
||||
}
|
||||
const registeredProviderIds = this.providerSnapshotManager.listRegisteredProviderIds();
|
||||
if (!isStoredAgentProviderAvailable(record, registeredProviderIds)) {
|
||||
throw new Error(`Agent ${agentId} references unavailable provider '${record.provider}'`);
|
||||
}
|
||||
if (!toAgentPersistenceHandle(registeredProviderIds, record.persistence)) {
|
||||
throw new Error(`Agent ${agentId} cannot be refreshed because it lacks persistence`);
|
||||
}
|
||||
// Share the loader's per-agent in-flight operation with timeline fetches.
|
||||
// Unarchiving publishes the record before provider resume finishes, so
|
||||
// the agent pane can otherwise race this request and resume it twice.
|
||||
snapshot = await ensureAgentLoaded(agentId, {
|
||||
agentManager: this.agentManager,
|
||||
agentStorage: this.agentStorage,
|
||||
broadcastTimeline: true,
|
||||
logger: this.sessionLogger,
|
||||
});
|
||||
// Runtime replacement is serialized, but the reply also needs provider history.
|
||||
// Another replacement during hydration can remove the agent before that reply.
|
||||
// Share the whole reload and hydration across connections, including failures.
|
||||
const refreshes =
|
||||
pendingAgentRefreshes.get(this.agentManager) ?? new Map<string, Promise<ManagedAgent>>();
|
||||
pendingAgentRefreshes.set(this.agentManager, refreshes);
|
||||
let refresh = refreshes.get(agentId);
|
||||
if (!refresh) {
|
||||
const started = this.refreshAgentFromPersistence(agentId);
|
||||
refresh = started;
|
||||
refreshes.set(agentId, started);
|
||||
void started
|
||||
.catch(() => undefined)
|
||||
.finally(() => {
|
||||
if (refreshes.get(agentId) === started) refreshes.delete(agentId);
|
||||
});
|
||||
}
|
||||
await this.agentManager.hydrateTimelineFromProvider(agentId, { broadcast: true });
|
||||
await this.agentUpdates.forwardLiveAgent(snapshot);
|
||||
const snapshot = await refresh;
|
||||
const timelineSize = this.agentManager.getTimeline(agentId).length;
|
||||
await this.agentUpdates.forwardLiveAgent(snapshot);
|
||||
if (requestId) {
|
||||
this.emit({
|
||||
type: "status",
|
||||
@@ -4829,6 +4819,41 @@ export class Session {
|
||||
}
|
||||
}
|
||||
|
||||
private async refreshAgentFromPersistence(agentId: string): Promise<ManagedAgent> {
|
||||
await unarchiveAgentState(this.agentStorage, this.agentManager, agentId);
|
||||
let snapshot: ManagedAgent;
|
||||
const existing = this.agentManager.getAgent(agentId);
|
||||
if (existing) {
|
||||
await this.interruptAgentIfRunning(agentId);
|
||||
snapshot = await this.agentManager.reloadAgentSession(agentId, undefined, {
|
||||
rehydrateFromDisk: true,
|
||||
});
|
||||
} else {
|
||||
const record = await this.agentStorage.get(agentId);
|
||||
if (!record) {
|
||||
throw new Error(`Agent not found: ${agentId}`);
|
||||
}
|
||||
const registeredProviderIds = this.providerSnapshotManager.listRegisteredProviderIds();
|
||||
if (!isStoredAgentProviderAvailable(record, registeredProviderIds)) {
|
||||
throw new Error(`Agent ${agentId} references unavailable provider '${record.provider}'`);
|
||||
}
|
||||
if (!toAgentPersistenceHandle(registeredProviderIds, record.persistence)) {
|
||||
throw new Error(`Agent ${agentId} cannot be refreshed because it lacks persistence`);
|
||||
}
|
||||
// Share the loader's per-agent in-flight operation with timeline fetches.
|
||||
// Unarchiving publishes the record before provider resume finishes, so
|
||||
// the agent pane can otherwise race this request and resume it twice.
|
||||
snapshot = await ensureAgentLoaded(agentId, {
|
||||
agentManager: this.agentManager,
|
||||
agentStorage: this.agentStorage,
|
||||
broadcastTimeline: true,
|
||||
logger: this.sessionLogger,
|
||||
});
|
||||
}
|
||||
await this.agentManager.hydrateTimelineFromProvider(agentId, { broadcast: true });
|
||||
return snapshot;
|
||||
}
|
||||
|
||||
private async handleCancelAgentRequest(agentId: string, requestId?: string): Promise<void> {
|
||||
this.sessionLogger.info({ agentId }, `Cancel request received for agent ${agentId}`);
|
||||
|
||||
|
||||
@@ -59,3 +59,130 @@ index 0c854d6..7dc2828 100644
|
||||
}
|
||||
return props.transform as TransformsStyle['transform'];
|
||||
}
|
||||
diff --git a/node_modules/react-native-svg/android/build.gradle b/node_modules/react-native-svg/android/build.gradle
|
||||
--- a/node_modules/react-native-svg/android/build.gradle
|
||||
+++ b/node_modules/react-native-svg/android/build.gradle
|
||||
@@ -103,6 +103,7 @@
|
||||
}
|
||||
|
||||
defaultConfig {
|
||||
+ testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
|
||||
minSdkVersion safeExtGet('minSdkVersion', 16)
|
||||
//noinspection OldTargetApi
|
||||
targetSdkVersion safeExtGet('targetSdkVersion', 28)
|
||||
@@ -136,6 +137,8 @@
|
||||
}
|
||||
|
||||
dependencies {
|
||||
+ androidTestImplementation 'androidx.test:runner:1.6.2'
|
||||
+ androidTestImplementation 'androidx.test.ext:junit:1.2.1'
|
||||
implementation 'com.facebook.react:react-native:+'
|
||||
implementation("com.facebook.fresco:fresco:${FRESCO_VERSION}") {
|
||||
exclude group: 'com.facebook.soloader'
|
||||
diff --git a/node_modules/react-native-svg/android/src/main/java/com/horcrux/svg/SvgView.java b/node_modules/react-native-svg/android/src/main/java/com/horcrux/svg/SvgView.java
|
||||
--- a/node_modules/react-native-svg/android/src/main/java/com/horcrux/svg/SvgView.java
|
||||
+++ b/node_modules/react-native-svg/android/src/main/java/com/horcrux/svg/SvgView.java
|
||||
@@ -159,6 +159,8 @@
|
||||
@Override
|
||||
protected void onSizeChanged(int w, int h, int oldw, int oldh) {
|
||||
super.onSizeChanged(w, h, oldw, oldh);
|
||||
+ // Percentage lengths and paths depend on the canvas size, not just SVG props.
|
||||
+ clearChildCache();
|
||||
this.invalidate();
|
||||
}
|
||||
|
||||
diff --git a/node_modules/react-native-svg/android/src/androidTest/java/com/horcrux/svg/SvgResizeTest.java b/node_modules/react-native-svg/android/src/androidTest/java/com/horcrux/svg/SvgResizeTest.java
|
||||
new file mode 100644
|
||||
--- /dev/null
|
||||
+++ b/node_modules/react-native-svg/android/src/androidTest/java/com/horcrux/svg/SvgResizeTest.java
|
||||
@@ -0,0 +1,90 @@
|
||||
+package com.horcrux.svg;
|
||||
+
|
||||
+import static org.junit.Assert.assertEquals;
|
||||
+import static org.junit.Assert.assertTrue;
|
||||
+
|
||||
+import android.graphics.Bitmap;
|
||||
+import android.graphics.Canvas;
|
||||
+import android.graphics.Color;
|
||||
+import android.view.View;
|
||||
+import androidx.test.ext.junit.runners.AndroidJUnit4;
|
||||
+import androidx.test.platform.app.InstrumentationRegistry;
|
||||
+import com.facebook.react.bridge.BridgeReactContext;
|
||||
+import com.facebook.react.bridge.DynamicFromObject;
|
||||
+import com.facebook.react.bridge.JavaOnlyArray;
|
||||
+import com.facebook.react.bridge.JavaOnlyMap;
|
||||
+import com.facebook.react.soloader.OpenSourceMergedSoMapping;
|
||||
+import com.facebook.react.uimanager.DisplayMetricsHolder;
|
||||
+import com.facebook.soloader.SoLoader;
|
||||
+import org.junit.Test;
|
||||
+import org.junit.runner.RunWith;
|
||||
+
|
||||
+@RunWith(AndroidJUnit4.class)
|
||||
+public class SvgResizeTest {
|
||||
+ @Test
|
||||
+ public void percentageFadeFollowsCanvasGrowthAndShrinkage() {
|
||||
+ InstrumentationRegistry.getInstrumentation().runOnMainSync(() -> {
|
||||
+ android.content.Context app = InstrumentationRegistry.getInstrumentation().getTargetContext();
|
||||
+ DisplayMetricsHolder.initDisplayMetricsIfNotInitialized(app);
|
||||
+ try {
|
||||
+ SoLoader.init(app, OpenSourceMergedSoMapping.INSTANCE);
|
||||
+ } catch (java.io.IOException exception) {
|
||||
+ throw new RuntimeException(exception);
|
||||
+ }
|
||||
+ BridgeReactContext context = new DrawingContext(app);
|
||||
+ SvgView svg = new SvgView(context);
|
||||
+ LinearGradientView gradient = new LinearGradientView(context);
|
||||
+ gradient.setName("fade");
|
||||
+ gradient.setX1(new DynamicFromObject("0%"));
|
||||
+ gradient.setY1(new DynamicFromObject("0%"));
|
||||
+ gradient.setX2(new DynamicFromObject("0%"));
|
||||
+ gradient.setY2(new DynamicFromObject("100%"));
|
||||
+ gradient.setGradientUnits(0);
|
||||
+ gradient.setGradient(JavaOnlyArray.of(0.0, Color.RED, 1.0, Color.TRANSPARENT));
|
||||
+ svg.addView(gradient);
|
||||
+ // Exercise recursive invalidation as well as the direct child case.
|
||||
+ GroupView group = new GroupView(context);
|
||||
+ RectView rectangle = new RectView(context);
|
||||
+ rectangle.setX(new DynamicFromObject(0.0));
|
||||
+ rectangle.setY(new DynamicFromObject(0.0));
|
||||
+ rectangle.setWidth(new DynamicFromObject("100%"));
|
||||
+ rectangle.setHeight(new DynamicFromObject("100%"));
|
||||
+ rectangle.setFill(JavaOnlyMap.of("type", 1, "brushRef", "fade"));
|
||||
+ group.addView(rectangle);
|
||||
+ svg.addView(group);
|
||||
+
|
||||
+ assertFade(svg, 80, 60);
|
||||
+ assertFade(svg, 160, 120);
|
||||
+ assertFade(svg, 60, 40);
|
||||
+ assertFade(svg, 160, 120);
|
||||
+ });
|
||||
+ }
|
||||
+
|
||||
+ // Pixel rendering needs a React context but does not send layout events to JavaScript.
|
||||
+ private static final class DrawingContext extends BridgeReactContext
|
||||
+ implements com.facebook.react.uimanager.events.EventDispatcherProvider {
|
||||
+ DrawingContext(android.content.Context context) { super(context); }
|
||||
+
|
||||
+ @Override
|
||||
+ public com.facebook.react.uimanager.events.EventDispatcher getEventDispatcher() { return null; }
|
||||
+ }
|
||||
+
|
||||
+ private static void assertFade(SvgView svg, int width, int height) {
|
||||
+ svg.measure(View.MeasureSpec.makeMeasureSpec(width, View.MeasureSpec.EXACTLY),
|
||||
+ View.MeasureSpec.makeMeasureSpec(height, View.MeasureSpec.EXACTLY));
|
||||
+ svg.layout(0, 0, width, height);
|
||||
+ Bitmap image = Bitmap.createBitmap(width, height, Bitmap.Config.ARGB_8888);
|
||||
+ svg.draw(new Canvas(image));
|
||||
+ try {
|
||||
+ int middle = Color.alpha(image.getPixel(width / 2, height / 2));
|
||||
+ int right = Color.alpha(image.getPixel(width - 2, height / 2));
|
||||
+ assertTrue("Gradient midpoint must follow canvas height at " + width + "x" + height
|
||||
+ + "; alpha=" + middle, middle >= 120 && middle <= 135);
|
||||
+ assertEquals("Fade must reach the right edge at " + width + "x" + height, middle, right);
|
||||
+ assertTrue("Fade must end at the new bottom edge",
|
||||
+ Color.alpha(image.getPixel(width / 2, height - 2)) < 20);
|
||||
+ } finally {
|
||||
+ image.recycle();
|
||||
+ }
|
||||
+ }
|
||||
+}
|
||||
|
||||
@@ -59,6 +59,8 @@ const patchedPackages = [
|
||||
nodeModulesPath: "node_modules/@gorhom/bottom-sheet",
|
||||
patchPrefix: "@gorhom+bottom-sheet+",
|
||||
},
|
||||
// Android resize: retain until upstream clears descendant geometry when the SVG canvas resizes.
|
||||
// The native pixel regression is included in the patch; preserve the separate transform hunks.
|
||||
{
|
||||
nodeModulesPath: "packages/app/node_modules/react-native-svg",
|
||||
patchPrefix: "react-native-svg+",
|
||||
|
||||
Reference in New Issue
Block a user