Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/inline-assets-scale-order.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@callstack/repack": patch
---

Pass scales of inlined assets to `AssetSourceResolver.pickScale` in ascending order. Previously, assets with fractional scales such as `@1.5x` resolved to the wrong variant, for example the `@1.5x` image on a device with a pixel ratio of 3.5.
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
import vm from 'node:vm';
import { inlineAssets } from '../inlineAssets.js';
import type { Asset } from '../types.js';

// Same logic as `pickScale` from `react-native/Libraries/Image/AssetUtils`,
// which expects `scales` to be sorted in ascending order.
function pickScale(scales: number[], deviceScale: number) {
for (const scale of scales) {
if (scale >= deviceScale) {
return scale;
}
}
return scales[scales.length - 1] || 1;
}

function evaluateInlinedAsset(code: string, pixelRatio: number) {
const module = { exports: {} as { scale?: number } };
const require = (request: string) =>
request === 'react-native'
? { PixelRatio: { get: () => pixelRatio } }
: { pickScale };

vm.runInNewContext(code, { module, require });
return module.exports;
}

// assets are sorted by scale in ascending order, as in the assets loader
const assets: Asset[] = [0.75, 1, 1.5, 2, 3].map((scale) => ({
data: Buffer.from(`star@${scale}x`),
dimensions: { width: 10, height: 10 },
filename: `star@${scale}x.png`,
scale,
}));

describe('inlineAssets', () => {
it.each([
[0.75, 0.75],
[1, 1],
[1.5, 1.5],
[2.625, 3],
[3.5, 3],
])('picks the right scale for pixel ratio %s', (pixelRatio, expected) => {
const code = inlineAssets({ assets, resourcePath: 'star.png' });

expect(evaluateInlinedAsset(code, pixelRatio).scale).toBe(expected);
});
});
5 changes: 4 additions & 1 deletion packages/repack/src/loaders/assetsLoader/inlineAssets.ts
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,10 @@ export function inlineAssets({
{} as Record<string, URISource>
);

const scales = JSON.stringify(Object.keys(sourceSet).map(Number));
// `pickScale` expects scales in ascending order. `assets` are already sorted,
// while `Object.keys` would list integer keys (1, 2, 3) before fractional
// ones (0.75, 1.5).
const scales = JSON.stringify(assets.map(({ scale }) => scale));

/**
* To enable scale resolution in runtime we need to import PixelRatio & AssetSourceResolver
Expand Down