refactor: unify pdfkit image mixin

diegomura · Feb 5, 2025 · 45f46fc · 45f46fc
1 parent 6d87505
commit 45f46fc
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 23 deletions.
diff --git a/packages/pdfkit/src/mixins/images.js b/packages/pdfkit/src/mixins/images.js
@@ -6,28 +6,6 @@ export default {
     return (this._imageCount = 0);
   },
 
-  embedImage(src) {
-    let image;
-
-    if (typeof src === 'string') {
-      image = this._imageRegistry[src];
-    }
-
-    if (!image) {
-      if (src.width && src.height) {
-        image = src;
-      } else {
-        image = this.openImage(src);
-      }
-    }
-
-    if (!image.obj) {
-      image.embed(this);
-    }
-
-    return image;
-  },
-
   image(src, x, y, options = {}) {
     let bh, bp, bw, image, ip, left, left1, rotateAngle, originX, originY;
     if (typeof x === 'object') {

diff --git a/packages/render/src/operations/embedImage.js b/packages/render/src/operations/embedImage.js
@@ -0,0 +1,25 @@
+const embedImage = (ctx, node) => {
+  const src = node.image.data;
+
+  let image;
+
+  if (typeof src === 'string') {
+    image = ctx._imageRegistry[src];
+  }
+
+  if (!image) {
+    if (src.width && src.height) {
+      image = src;
+    } else {
+      image = ctx.openImage(src);
+    }
+  }
+
+  if (!image.obj) {
+    image.embed(ctx);
+  }
+
+  return image;
+};
+
+export default embedImage;
diff --git a/packages/render/src/primitives/renderImage.js b/packages/render/src/primitives/renderImage.js
@@ -1,6 +1,7 @@
 import { isNil } from '@react-pdf/fns';
 
 import clipNode from '../operations/clipNode';
+import embedImage from '../operations/embedImage';
 import resolveObjectFit from '../utils/resolveObjectFit';
 
 const drawImage = (ctx, node, options = {}) => {
@@ -29,7 +30,7 @@ const drawImage = (ctx, node, options = {}) => {
     if (width !== 0 && height !== 0) {
       const cacheKey = node.image.key;
 
-      const image = imageCache.get(cacheKey) || ctx.embedImage(node.image.data);
+      const image = imageCache.get(cacheKey) || embedImage(ctx, node);
 
       if (cacheKey) imageCache.set(cacheKey, image);