Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Fabric] Support blob: images, and provide better image.onError callbacks #13285

Merged
merged 13 commits into from
Jun 4, 2024
Merged

[Fabric] Support blob: images, and provide better image.onError callbacks #13285

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
a436510
[Fabric] Support blob: images, and provide better image.onError callb…
acoates-ms May 30, 2024
64a5ffb
Change files
acoates-ms May 30, 2024
fc43dd3
Remove some test code
acoates-ms May 30, 2024
7ebd491
Merge remote-tracking branch 'upstream/main' into imgFailedAndBlobs
acoates-ms May 30, 2024
f530a37
Add user-agent
acoates-ms May 30, 2024
263a5ce
Add public API to set default User-Agent header
acoates-ms May 31, 2024
0783bbc
various fixes
acoates-ms May 31, 2024
3b933c7
fix snapshots
acoates-ms May 31, 2024
e20d475
Rename Networking -> HttpSettings
acoates-ms Jun 3, 2024
b8e200c
Merge branch 'main' into imgFailedAndBlobs
acoates-ms Jun 3, 2024
c4da04c
Change files
acoates-ms Jun 3, 2024
dd0c6f9
fix
acoates-ms Jun 3, 2024
24038c9
Http.UserAgent RuntimeOption needs to be set before the HttpResource …
acoates-ms Jun 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 7 additions & 0 deletions change/react-native-windows-c33514c0-2412-40ff-b4ad-4739c95260e7.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "prerelease",
"comment": "[Fabric] Support blob: images, and provide better image.onError callbacks",
"packageName": "react-native-windows",
"email": "30809111+acoates-ms@users.noreply.github.com",
"dependentChangeType": "patch"
}
2 changes: 2 additions & 0 deletions packages/@react-native-windows/automation-commands/src/dumpVisualTree.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,8 @@ function removeGuidsFromImageSourcesHelper(node: ComponentNode) {
source.Uri = source.Uri.replace(/size=\d{5}/, 'size=<size>');
} else if (source.Uri.startsWith('https://www.facebook.com/assets/fb_lite_messaging/E2EE-settings@3x.png?r=1&t=')) {
source.Uri = 'https://www.facebook.com/assets/fb_lite_messaging/E2EE-settings@3x.png?r=1&t=<some_hash_here>';
} else if (source.Uri.startsWith('https://www.facebook.com/ar_effect/external_textures/648609739826677.png?hash=')) {
source.Uri = 'https://www.facebook.com/ar_effect/external_textures/648609739826677.png?hash=<some_hash_here>';
} else if (source.Uri.startsWith('https://www.facebook.com/ads/pics/successstories.png?hash=')) {
source.Uri = 'https://www.facebook.com/ads/pics/successstories.png?hash=<some_hash_here>';
} else {
Expand Down
8 changes: 4 additions & 4 deletions packages/@react-native-windows/tester/src/js/examples/Image/ImageExample.windows.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,8 @@ const {

const IMAGE1 =
'https://www.facebook.com/assets/fb_lite_messaging/E2EE-settings@3x.png';

const IMAGE2 =
// [Windows #13284 - this image crashes e2etests]
// 'https://www.facebook.com/ar_effect/external_textures/648609739826677.png';
'https://www.facebook.com/ads/pics/successstories.png';
'https://www.facebook.com/ar_effect/external_textures/648609739826677.png';
acoates-ms marked this conversation as resolved.
Show resolved Hide resolved

const base64Icon =
'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEsAAABLCAQAAACSR7JhAAADtUlEQVR4Ac3YA2Bj6QLH0XPT1Fzbtm29tW3btm3bfLZtv7e2ObZnms7d8Uw098tuetPzrxv8wiISrtVudrG2JXQZ4VOv+qUfmqCGGl1mqLhoA52oZlb0mrjsnhKpgeUNEs91Z0pd1kvihA3ULGVHiQO2narKSHKkEMulm9VgUyE60s1aWoMQUbpZOWE+kaqs4eLEjdIlZTcFZB0ndc1+lhB1lZrIuk5P2aib1NBpZaL+JaOGIt0ls47SKzLC7CqrlGF6RZ09HGoNy1lYl2aRSWL5GuzqWU1KafRdoRp0iOQEiDzgZPnG6DbldcomadViflnl/cL93tOoVbsOLVM2jylvdWjXolWX1hmfZbGR/wjypDjFLSZIRov09BgYmtUqPQPlQrPapecLgTIy0jMgPKtTeob2zWtrGH3xvjUkPCtNg/tm1rjwrMa+mdUkPd3hWbH0jArPGiU9ufCsNNWFZ40wpwn+62/66R2RUtoso1OB34tnLOcy7YB1fUdc9e0q3yru8PGM773vXsuZ5YIZX+5xmHwHGVvlrGPN6ZSiP1smOsMMde40wKv2VmwPPVXNut4sVpUreZiLBHi0qln/VQeI/LTMYXpsJtFiclUN+5HVZazim+Ky+7sAvxWnvjXrJFneVtLWLyPJu9K3cXLWeOlbMTlrIelbMDlrLenrjEQOtIF+fuI9xRp9ZBFp6+b6WT8RrxEpdK64BuvHgDk+vUy+b5hYk6zfyfs051gRoNO1usU12WWRWL73/MMEy9pMi9qIrR4ZpV16Rrvduxazmy1FSvuFXRkqTnE7m2kdb5U8xGjLw/spRr1uTov4uOgQE+0N/DvFrG/Jt7i/FzwxbA9kDanhf2w+t4V97G8lrT7wc08aA2QNUkuTfW/KimT01wdlfK4yEw030VfT0RtZbzjeMprNq8m8tnSTASrTLti64oBNdpmMQm0eEwvfPwRbUBywG5TzjPCsdwk3IeAXjQblLCoXnDVeoAz6SfJNk5TTzytCNZk/POtTSV40NwOFWzw86wNJRpubpXsn60NJFlHeqlYRbslqZm2jnEZ3qcSKgm0kTli3zZVS7y/iivZTweYXJ26Y+RTbV1zh3hYkgyFGSTKPfRVbRqWWVReaxYeSLarYv1Qqsmh1s95S7G+eEWK0f3jYKTbV6bOwepjfhtafsvUsqrQvrGC8YhmnO9cSCk3yuY984F1vesdHYhWJ5FvASlacshUsajFt2mUM9pqzvKGcyNJW0arTKN1GGGzQlH0tXwLDgQTurS8eIQAAAABJRU5ErkJggg==';
Expand Down Expand Up @@ -1466,6 +1463,8 @@ exports.examples = [
return <MultipleSourcesExample />;
},
},
/*
// Windows doesn't support legacy image format.
{
title: 'Legacy local image',
description: ('Images shipped with the native bundle, but not managed ' +
Expand All @@ -1480,6 +1479,7 @@ exports.examples = [
);
},
},
*/
{
title: 'Bundled images',
description: 'Images shipped in a separate native bundle',
Expand Down
6 changes: 0 additions & 6 deletions packages/e2e-test-app-fabric/test/ImageComponentTest.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,12 +142,6 @@ describe('Image Tests', () => {
const dump = await dumpVisualTree('image-resize-mode');
expect(dump).toMatchSnapshot();
});
test('A legacy local image can still render', async () => {
const component = await app.findElementByTestID('image-legacy');
await component.waitForDisplayed({timeout: 5000});
const dump = await dumpVisualTree('image-legacy');
expect(dump).toMatchSnapshot();
});
test('An Image can have a custom blur radius', async () => {
const component = await app.findElementByTestID('image-blur-radius');
await component.waitForDisplayed({timeout: 5000});
Expand Down