@solidtv/renderer 1.2.10 → 1.3.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (34) hide show
  1. package/dist/src/core/CoreTextNode.js +3 -1
  2. package/dist/src/core/CoreTextNode.js.map +1 -1
  3. package/dist/src/core/CoreTextureManager.d.ts +10 -0
  4. package/dist/src/core/CoreTextureManager.js +38 -5
  5. package/dist/src/core/CoreTextureManager.js.map +1 -1
  6. package/dist/src/core/Stage.js +3 -1
  7. package/dist/src/core/Stage.js.map +1 -1
  8. package/dist/src/core/lib/ImageWorker.js +22 -6
  9. package/dist/src/core/lib/ImageWorker.js.map +1 -1
  10. package/dist/src/core/lib/textureSvg.js +4 -1
  11. package/dist/src/core/lib/textureSvg.js.map +1 -1
  12. package/dist/src/core/lib/validateImageBitmap.d.ts +18 -0
  13. package/dist/src/core/lib/validateImageBitmap.js +66 -0
  14. package/dist/src/core/lib/validateImageBitmap.js.map +1 -1
  15. package/dist/src/core/renderers/webgl/WebGlCtxTexture.js +5 -1
  16. package/dist/src/core/renderers/webgl/WebGlCtxTexture.js.map +1 -1
  17. package/dist/src/core/textures/ImageTexture.js +21 -7
  18. package/dist/src/core/textures/ImageTexture.js.map +1 -1
  19. package/dist/src/main-api/Renderer.d.ts +18 -0
  20. package/dist/src/main-api/Renderer.js +6 -0
  21. package/dist/src/main-api/Renderer.js.map +1 -1
  22. package/dist/tsconfig.dist.tsbuildinfo +1 -1
  23. package/package.json +1 -1
  24. package/src/core/CoreTextNode.test.ts +145 -0
  25. package/src/core/CoreTextNode.ts +3 -1
  26. package/src/core/CoreTextureManager.ts +61 -8
  27. package/src/core/Stage.ts +3 -0
  28. package/src/core/lib/ImageWorker.ts +30 -6
  29. package/src/core/lib/textureSvg.ts +4 -1
  30. package/src/core/lib/validateImageBitmap.test.ts +119 -0
  31. package/src/core/lib/validateImageBitmap.ts +89 -0
  32. package/src/core/renderers/webgl/WebGlCtxTexture.ts +5 -1
  33. package/src/core/textures/ImageTexture.ts +25 -7
  34. package/src/main-api/Renderer.ts +26 -0
@@ -192,6 +192,18 @@ export class ImageTexture extends Texture {
192
192
  const hasAlphaChannel = premultiplyAlpha ?? blob.type.includes('image/png');
193
193
  const imageBitmapSupported = this.txManager.imageBitmapSupported;
194
194
 
195
+ // When the device does NOT honor the createImageBitmap premultiply option
196
+ // (e.g. older Safari), request a straight ('none') bitmap and let WebGL
197
+ // premultiply on upload instead. `premultiplyAlpha` in the returned
198
+ // TextureData means "WebGL should premultiply this source on upload".
199
+ const useGlPremultiply =
200
+ hasAlphaChannel === true &&
201
+ imageBitmapSupported.premultiplyHonored === false;
202
+ const bitmapMode: 'premultiply' | 'none' =
203
+ hasAlphaChannel === true && useGlPremultiply === false
204
+ ? 'premultiply'
205
+ : 'none';
206
+
195
207
  if (imageBitmapSupported.full === true && sw !== null && sh !== null) {
196
208
  // createImageBitmap with crop
197
209
  const bitmap = await this.platform.createImageBitmap(
@@ -201,28 +213,29 @@ export class ImageTexture extends Texture {
201
213
  sw,
202
214
  sh,
203
215
  {
204
- premultiplyAlpha: hasAlphaChannel ? 'premultiply' : 'none',
216
+ premultiplyAlpha: bitmapMode,
205
217
  colorSpaceConversion: 'none',
206
218
  imageOrientation: 'none',
207
219
  },
208
220
  );
209
- return { data: bitmap, premultiplyAlpha: hasAlphaChannel };
221
+ return { data: bitmap, premultiplyAlpha: useGlPremultiply };
210
222
  } else if (imageBitmapSupported.basic === true) {
211
223
  // basic createImageBitmap without options or crop
212
- // this is supported for Chrome v50 to v52/54 that doesn't support options
224
+ // this is supported for Chrome v50 to v52/54 that doesn't support options.
225
+ // The browser default premultiplies, so WebGL must not premultiply again.
213
226
  return {
214
227
  data: await this.platform.createImageBitmap(blob),
215
- premultiplyAlpha: hasAlphaChannel,
228
+ premultiplyAlpha: false,
216
229
  };
217
230
  }
218
231
 
219
232
  // default createImageBitmap without crop but with options
220
233
  const bitmap = await this.platform.createImageBitmap(blob, {
221
- premultiplyAlpha: hasAlphaChannel ? 'premultiply' : 'none',
234
+ premultiplyAlpha: bitmapMode,
222
235
  colorSpaceConversion: 'none',
223
236
  imageOrientation: 'none',
224
237
  });
225
- return { data: bitmap, premultiplyAlpha: hasAlphaChannel };
238
+ return { data: bitmap, premultiplyAlpha: useGlPremultiply };
226
239
  }
227
240
 
228
241
  async loadImage(src: string) {
@@ -274,9 +287,14 @@ export class ImageTexture extends Texture {
274
287
  };
275
288
  }
276
289
 
290
+ // The loader computes whether WebGL should premultiply this source on
291
+ // upload (it depends on the source type and on whether createImageBitmap
292
+ // honored the premultiply option). Preserve it; fall back to the prop only
293
+ // when the loader didn't decide.
277
294
  return {
278
295
  data: resp.data,
279
- premultiplyAlpha: this.props.premultiplyAlpha ?? true,
296
+ premultiplyAlpha:
297
+ resp.premultiplyAlpha ?? this.props.premultiplyAlpha ?? true,
280
298
  };
281
299
  }
282
300
 
@@ -458,6 +458,25 @@ export type RendererMainSettings = RendererRuntimeSettings & {
458
458
  */
459
459
  createImageBitmapSupport: 'auto' | 'basic' | 'options' | 'full';
460
460
 
461
+ /**
462
+ * Override for whether `createImageBitmap(..., { premultiplyAlpha: 'premultiply' })`
463
+ * is actually honored by the target device.
464
+ *
465
+ * @remarks
466
+ * Some older browsers (notably older Safari/WebKit) accept the
467
+ * `premultiplyAlpha: 'premultiply'` option without throwing but silently
468
+ * ignore it, returning straight (non-premultiplied) alpha. This causes edge
469
+ * "ghosting" on images with transparency.
470
+ *
471
+ * Set to `'auto'` to detect via a cheap startup probe (one 1×1 texture
472
+ * upload + framebuffer readback). Set to a boolean to force the value. Leave
473
+ * unset to assume the option is honored — the default, which preserves
474
+ * existing behavior with no probe overhead.
475
+ *
476
+ * @defaultValue `true` (assume honored; no probe)
477
+ */
478
+ premultiplyAlphaHonored?: boolean | 'auto';
479
+
461
480
  /**
462
481
  * Provide an alternative platform abstraction layer
463
482
  *
@@ -586,6 +605,12 @@ export class RendererMain extends EventEmitter {
586
605
  textureProcessingTimeLimit: settings.textureProcessingTimeLimit || 10,
587
606
  canvas: settings.canvas,
588
607
  createImageBitmapSupport: settings.createImageBitmapSupport || 'full',
608
+ // undefined -> true (assume honored, no probe); 'auto' -> probe;
609
+ // explicit boolean -> force the value.
610
+ premultiplyAlphaHonored:
611
+ settings.premultiplyAlphaHonored === undefined
612
+ ? true
613
+ : settings.premultiplyAlphaHonored,
589
614
  platform: settings.platform || null,
590
615
  maxRetryCount: settings.maxRetryCount ?? 5,
591
616
  };
@@ -646,6 +671,7 @@ export class RendererMain extends EventEmitter {
646
671
  targetFPS: settings.targetFPS!,
647
672
  textureProcessingTimeLimit: settings.textureProcessingTimeLimit!,
648
673
  createImageBitmapSupport: settings.createImageBitmapSupport!,
674
+ premultiplyAlphaHonored: settings.premultiplyAlphaHonored,
649
675
  platform,
650
676
  maxRetryCount: settings.maxRetryCount ?? 5,
651
677
  });