@cj-tech-master/excelts 6.0.0 → 6.1.0

package/dist/browser/modules/excel/xlsx/xform/sheet/worksheet-xform.js

@@ -26,7 +26,8 @@ import { ColBreaksXform } from "./col-breaks-xform.js";
 import { HeaderFooterXform } from "./header-footer-xform.js";
 import { ConditionalFormattingsXform } from "./cf/conditional-formattings-xform.js";
 import { ExtLstXform } from "./ext-lst-xform.js";
-import { commentsRelTargetFromWorksheet, ctrlPropRelTargetFromWorksheet, drawingRelTargetFromWorksheet, mediaRelTargetFromRels, pivotTableRelTargetFromWorksheet, tableRelTargetFromWorksheet, vmlDrawingRelTargetFromWorksheet } from "../../../utils/ooxml-paths.js";
+import { commentsRelTargetFromWorksheet, ctrlPropRelTargetFromWorksheet, drawingRelTargetFromWorksheet, pivotTableRelTargetFromWorksheet, tableRelTargetFromWorksheet, vmlDrawingRelTargetFromWorksheet } from "../../../utils/ooxml-paths.js";
+import { buildDrawingAnchorsAndRels, resolveMediaTarget } from "../../../utils/drawing-utils.js";
 const mergeRule = (rule, extRule) => {
     Object.keys(extRule).forEach(key => {
         const value = rule[key];
@@ -223,75 +224,53 @@ class WorkSheetXform extends BaseXform {
                 Target: drawingRelTargetFromWorksheet(drawing.name)
             });
         }
-        const drawingRelsHash = [];
-        let bookImage;
+        // Process background and image media entries
+        const backgroundMedia = [];
+        const imageMedia = [];
         model.media.forEach(medium => {
             if (medium.type === "background") {
-                const rId = nextRid(rels);
-                bookImage = options.media[medium.imageId];
-                rels.push({
-                    Id: rId,
-                    Type: RelType.Image,
-                    Target: mediaRelTargetFromRels(`${bookImage.name}.${bookImage.extension}`)
-                });
-                model.background = {
-                    rId
-                };
-                model.image = options.media[medium.imageId];
+                backgroundMedia.push(medium);
             }
             else if (medium.type === "image") {
-                let { drawing } = model;
-                bookImage = options.media[medium.imageId];
-                if (!drawing) {
-                    drawing = model.drawing = {
-                        rId: nextRid(rels),
-                        name: `drawing${++options.drawingsCount}`,
-                        anchors: [],
-                        rels: []
-                    };
-                    options.drawings.push(drawing);
-                    rels.push({
-                        Id: drawing.rId,
-                        Type: "http://schemas.openxmlformats.org/officeDocument/2006/relationships/drawing",
-                        Target: drawingRelTargetFromWorksheet(drawing.name)
-                    });
-                }
-                let rIdImage = this.preImageId === medium.imageId
-                    ? drawingRelsHash[medium.imageId]
-                    : drawingRelsHash[drawing.rels.length];
-                if (!rIdImage) {
-                    rIdImage = nextRid(drawing.rels);
-                    drawingRelsHash[drawing.rels.length] = rIdImage;
-                    drawing.rels.push({
-                        Id: rIdImage,
-                        Type: "http://schemas.openxmlformats.org/officeDocument/2006/relationships/image",
-                        Target: mediaRelTargetFromRels(`${bookImage.name}.${bookImage.extension}`)
-                    });
-                }
-                const anchor = {
-                    picture: {
-                        rId: rIdImage
-                    },
-                    range: medium.range
-                };
-                if (medium.hyperlinks && medium.hyperlinks.hyperlink) {
-                    const rIdHyperLink = nextRid(drawing.rels);
-                    drawingRelsHash[drawing.rels.length] = rIdHyperLink;
-                    anchor.picture.hyperlinks = {
-                        tooltip: medium.hyperlinks.tooltip,
-                        rId: rIdHyperLink
-                    };
-                    drawing.rels.push({
-                        Id: rIdHyperLink,
-                        Type: RelType.Hyperlink,
-                        Target: medium.hyperlinks.hyperlink,
-                        TargetMode: "External"
-                    });
-                }
-                this.preImageId = medium.imageId;
-                drawing.anchors.push(anchor);
+                imageMedia.push(medium);
             }
         });
+        // Handle background images
+        backgroundMedia.forEach(medium => {
+            const rId = nextRid(rels);
+            const bookImage = options.media[medium.imageId];
+            rels.push({
+                Id: rId,
+                Type: RelType.Image,
+                Target: resolveMediaTarget(bookImage)
+            });
+            model.background = { rId };
+            model.image = options.media[medium.imageId];
+        });
+        // Handle embedded images — create drawing model using shared utility
+        if (imageMedia.length > 0) {
+            let { drawing } = model;
+            if (!drawing) {
+                drawing = model.drawing = {
+                    rId: nextRid(rels),
+                    name: `drawing${++options.drawingsCount}`,
+                    anchors: [],
+                    rels: []
+                };
+                options.drawings.push(drawing);
+                rels.push({
+                    Id: drawing.rId,
+                    Type: "http://schemas.openxmlformats.org/officeDocument/2006/relationships/drawing",
+                    Target: drawingRelTargetFromWorksheet(drawing.name)
+                });
+            }
+            const result = buildDrawingAnchorsAndRels(imageMedia, drawing.rels, {
+                getBookImage: id => options.media[id],
+                nextRId: currentRels => nextRid(currentRels)
+            });
+            drawing.anchors.push(...result.anchors);
+            drawing.rels = result.rels;
+        }
         // prepare tables
         model.tables.forEach(table => {
             // relationships

package/dist/browser/modules/excel/xlsx/xlsx.browser.js

@@ -36,6 +36,7 @@ import { ZipParser } from "../../archive/unzip/zip-parser.js";
 import { PassThrough } from "../../stream/index.browser.js";
 import { concatUint8Arrays } from "../../../utils/binary.js";
 import { commentsPath, commentsRelTargetFromWorksheetName, ctrlPropPath, drawingPath, drawingRelsPath, OOXML_REL_TARGETS, pivotTableRelTargetFromWorksheetName, pivotCacheDefinitionRelTargetFromWorkbook, getCommentsIndexFromPath, getDrawingNameFromPath, getDrawingNameFromRelsPath, getMediaFilenameFromPath, mediaPath, getPivotCacheDefinitionNameFromPath, getPivotCacheDefinitionNameFromRelsPath, getPivotCacheRecordsNameFromPath, getPivotTableNameFromPath, getPivotTableNameFromRelsPath, pivotCacheDefinitionPath, pivotCacheDefinitionRelsPath, pivotCacheDefinitionRelTargetFromPivotTable, pivotCacheRecordsPath, pivotCacheRecordsRelTarget, pivotTablePath, pivotTableRelsPath, getTableNameFromPath, tablePath, tableRelTargetFromWorksheetName, themePath, getThemeNameFromPath, getVmlDrawingNameFromPath, getWorksheetNoFromWorksheetPath, getWorksheetNoFromWorksheetRelsPath, isBinaryEntryPath, normalizeZipPath, OOXML_PATHS, vmlDrawingRelTargetFromWorksheetName, vmlDrawingPath, worksheetPath, worksheetRelsPath, worksheetRelTarget } from "../utils/ooxml-paths.js";
+import { filterDrawingAnchors } from "../utils/drawing-utils.js";
 import { PassthroughManager } from "../utils/passthrough-manager.js";
 class StreamingZipWriterAdapter {
     constructor(options) {
@@ -1147,25 +1148,7 @@ class XLSX {
                 }
                 else {
                     // Use regenerated XML for normal drawings (images, shapes)
-                    // Filter out invalid anchors (null, undefined, or missing content)
-                    const filteredAnchors = (drawing.anchors ?? []).filter((a) => {
-                        if (a == null) {
-                            return false;
-                        }
-                        // Form controls have range.br and shape properties
-                        if (a.range?.br && a.shape) {
-                            return true;
-                        }
-                        // One-cell anchors need a valid picture
-                        if (!a.br && !a.picture) {
-                            return false;
-                        }
-                        // Two-cell anchors need either picture or shape
-                        if (a.br && !a.picture && !a.shape) {
-                            return false;
-                        }
-                        return true;
-                    });
+                    const filteredAnchors = filterDrawingAnchors(drawing.anchors ?? []);
                     const drawingForWrite = drawing.anchors
                         ? { ...drawing, anchors: filteredAnchors }
                         : drawing;

package/dist/cjs/modules/excel/anchor.js

@@ -55,18 +55,24 @@ class Anchor {
         return new Anchor(undefined, model);
     }
     get col() {
-        return this.nativeCol + Math.min(this.colWidth - 1, this.nativeColOff) / this.colWidth;
+        return this.nativeColOff === 0
+            ? this.nativeCol
+            : this.nativeCol + Math.min(this.colWidth - 1, this.nativeColOff) / this.colWidth;
     }
     set col(v) {
         this.nativeCol = Math.floor(v);
-        this.nativeColOff = Math.floor((v - this.nativeCol) * this.colWidth);
+        const fraction = v - this.nativeCol;
+        this.nativeColOff = fraction === 0 ? 0 : Math.floor(fraction * this.colWidth);
     }
     get row() {
-        return this.nativeRow + Math.min(this.rowHeight - 1, this.nativeRowOff) / this.rowHeight;
+        return this.nativeRowOff === 0
+            ? this.nativeRow
+            : this.nativeRow + Math.min(this.rowHeight - 1, this.nativeRowOff) / this.rowHeight;
     }
     set row(v) {
         this.nativeRow = Math.floor(v);
-        this.nativeRowOff = Math.floor((v - this.nativeRow) * this.rowHeight);
+        const fraction = v - this.nativeRow;
+        this.nativeRowOff = fraction === 0 ? 0 : Math.floor(fraction * this.rowHeight);
     }
     get colWidth() {
         return this.worksheet &&

package/dist/cjs/modules/excel/stream/workbook-writer.browser.js

@@ -25,10 +25,12 @@ const app_xform_1 = require("../xlsx/xform/core/app-xform.js");
 const workbook_xform_1 = require("../xlsx/xform/book/workbook-xform.js");
 const shared_strings_xform_1 = require("../xlsx/xform/strings/shared-strings-xform.js");
 const feature_property_bag_xform_1 = require("../xlsx/xform/core/feature-property-bag-xform.js");
+const drawing_xform_1 = require("../xlsx/xform/drawing/drawing-xform.js");
 const theme1_1 = require("../xlsx/xml/theme1.js");
 const _stream_1 = require("../../stream/index.js");
 const binary_1 = require("../../../utils/binary.js");
 const ooxml_paths_1 = require("../utils/ooxml-paths.js");
+const drawing_utils_1 = require("../utils/drawing-utils.js");
 const worksheet_writer_1 = require("./worksheet-writer.js");
 const EMPTY_U8 = new Uint8Array(0);
 const TEXT_DECODER = new TextDecoder();
@@ -138,6 +140,7 @@ class WorkbookWriterBase {
         await this.promise;
         await this._commitWorksheets();
         await this.addMedia();
+        this.addDrawings();
         await Promise.all([
             this.addThemes(),
             this.addOfficeRels(),
@@ -241,11 +244,14 @@ class WorkbookWriterBase {
             worksheets.forEach((ws) => {
                 ws.fileIndex = ws.id;
             });
+            // Collect drawing models from worksheets that have images
+            const drawings = worksheets.filter(ws => ws.drawing).map(ws => ws.drawing);
             const model = {
                 worksheets,
                 sharedStrings: this.sharedStrings,
                 commentRefs: this.commentRefs,
                 media: this.media,
+                drawings,
                 hasCheckboxes: this.styles.hasCheckboxes
             };
             const xform = new content_types_xform_1.ContentTypesXform();
@@ -276,6 +282,31 @@ class WorkbookWriterBase {
             throw new errors_1.ImageError("Unsupported media");
         }));
     }
+    /**
+     * Generate drawing XML and drawing relationship files for worksheets that have images.
+     * Must be called after _commitWorksheets() so that each WorksheetWriter has built its
+     * drawing model, and after addMedia() so that media files are already in the ZIP.
+     */
+    addDrawings() {
+        const drawingXform = new drawing_xform_1.DrawingXform();
+        const relsXform = new relationships_xform_1.RelationshipsXform();
+        for (const ws of this._worksheets) {
+            if (!ws?.drawing) {
+                continue;
+            }
+            const { drawing } = ws;
+            // Filter out invalid anchors using shared utility
+            const filteredAnchors = (0, drawing_utils_1.filterDrawingAnchors)(drawing.anchors);
+            const drawingForWrite = { ...drawing, anchors: filteredAnchors };
+            // Prepare and generate drawing XML
+            drawingXform.prepare(drawingForWrite);
+            const xml = drawingXform.toXml(drawingForWrite);
+            this._addFile(xml, (0, ooxml_paths_1.drawingPath)(drawing.name));
+            // Generate drawing relationships
+            const relsXml = relsXform.toXml(drawing.rels);
+            this._addFile(relsXml, (0, ooxml_paths_1.drawingRelsPath)(drawing.name));
+        }
+    }
     addApp() {
         return new Promise(resolve => {
             const xform = new app_xform_1.AppXform();

package/dist/cjs/modules/excel/stream/worksheet-writer.js

@@ -10,11 +10,13 @@ const range_1 = require("../range.js");
 const string_buf_1 = require("../utils/string-buf.js");
 const row_1 = require("../row.js");
 const column_1 = require("../column.js");
+const anchor_1 = require("../anchor.js");
 const sheet_rels_writer_1 = require("./sheet-rels-writer.js");
 const sheet_comments_writer_1 = require("./sheet-comments-writer.js");
 const data_validations_1 = require("../data-validations.js");
 const merge_borders_1 = require("../utils/merge-borders.js");
 const ooxml_paths_1 = require("../utils/ooxml-paths.js");
+const drawing_utils_1 = require("../utils/drawing-utils.js");
 const xmlBuffer = /* @__PURE__ */ new string_buf_1.StringBuf();
 // ============================================================================================
 // Xforms
@@ -35,6 +37,7 @@ const conditional_formattings_xform_1 = require("../xlsx/xform/sheet/cf/conditio
 const header_footer_xform_1 = require("../xlsx/xform/sheet/header-footer-xform.js");
 const row_breaks_xform_1 = require("../xlsx/xform/sheet/row-breaks-xform.js");
 const col_breaks_xform_1 = require("../xlsx/xform/sheet/col-breaks-xform.js");
+const drawing_xform_1 = require("../xlsx/xform/sheet/drawing-xform.js");
 // since prepare and render are functional, we can use singletons
 const xform = {
     dataValidations: new data_validations_xform_1.DataValidationsXform(),
@@ -57,6 +60,7 @@ const xform = {
     pageSeteup: new page_setup_xform_1.PageSetupXform(),
     autoFilter: new auto_filter_xform_1.AutoFilterXform(),
     picture: new picture_xform_1.PictureXform(),
+    drawing: new drawing_xform_1.DrawingXform(),
     conditionalFormattings: new conditional_formattings_xform_1.ConditionalFormattingsXform(),
     headerFooter: new header_footer_xform_1.HeaderFooterXform(),
     rowBreaks: new row_breaks_xform_1.RowBreaksXform(),
@@ -201,10 +205,11 @@ class WorksheetWriter {
         this._writeDataValidations();
         this._writePageMargins();
         this._writePageSetup();
-        this._writeBackground();
         this._writeHeaderFooter();
         this._writeRowBreaks();
         this._writeColBreaks();
+        this._writeDrawing(); // Note: must be after rowBreaks/colBreaks
+        this._writeBackground(); // Note: must be after drawing
         // Legacy Data tag for comments
         this._writeLegacyData();
         this._writeCloseWorksheet();
@@ -424,13 +429,65 @@ class WorksheetWriter {
     // =========================================================================
     addBackgroundImage(imageId) {
         this._background = {
-            imageId
+            imageId: Number(imageId)
         };
     }
     getBackgroundImageId() {
         return this._background && this._background.imageId;
     }
     // =========================================================================
+    // Images
+    /**
+     * Using the image id from `WorkbookWriter.addImage`,
+     * embed an image within the worksheet to cover a range.
+     */
+    addImage(imageId, range) {
+        const model = this._parseImageRange(String(imageId), range);
+        this._media.push(model);
+    }
+    /**
+     * Return the images that have been added to this worksheet.
+     * Each entry contains imageId and the normalised range (with native anchors).
+     */
+    getImages() {
+        return this._media;
+    }
+    /**
+     * Parse the user-supplied range into a normalised internal model
+     * mirroring what the regular Worksheet / Image class does.
+     */
+    _parseImageRange(imageId, range) {
+        if (typeof range === "string") {
+            // e.g. "A1:C3"
+            const decoded = col_cache_1.colCache.decode(range);
+            if ("top" in decoded) {
+                return {
+                    type: "image",
+                    imageId,
+                    range: {
+                        tl: new anchor_1.Anchor(this, { col: decoded.left, row: decoded.top }, -1).model,
+                        br: new anchor_1.Anchor(this, { col: decoded.right, row: decoded.bottom }, 0).model,
+                        editAs: "oneCell"
+                    }
+                };
+            }
+            throw new Error(`Invalid image range: "${range}". Expected a range like "A1:C3".`);
+        }
+        const tl = new anchor_1.Anchor(this, range.tl, 0).model;
+        const br = range.br ? new anchor_1.Anchor(this, range.br, 0).model : undefined;
+        return {
+            type: "image",
+            imageId,
+            range: {
+                tl,
+                br,
+                ext: range.ext,
+                editAs: range.editAs
+            },
+            hyperlinks: range.hyperlinks
+        };
+    }
+    // =========================================================================
     // Worksheet Protection
     async protect(password, options) {
         this.sheetProtection = {
@@ -587,6 +644,36 @@ class WorksheetWriter {
     _writeAutoFilter() {
         this.stream.write(xform.autoFilter.toXml(this.autoFilter));
     }
+    _writeDrawing() {
+        if (this._media.length === 0) {
+            return;
+        }
+        // Build the drawing model from the stored images.
+        // The drawing XML will be generated later by WorkbookWriterBase.addDrawings().
+        const drawingName = `drawing${this.id}`;
+        const drawingRId = this._sheetRelsWriter.addRelationship({
+            Type: "http://schemas.openxmlformats.org/officeDocument/2006/relationships/drawing",
+            Target: (0, ooxml_paths_1.drawingRelTargetFromWorksheet)(drawingName)
+        });
+        // Build anchors and drawing-level rels using the shared utility
+        const { anchors, rels } = (0, drawing_utils_1.buildDrawingAnchorsAndRels)(this._media, [], {
+            getBookImage: id => this._workbook.getImage(Number(id)),
+            nextRId: currentRels => `rId${currentRels.length + 1}`
+        });
+        // Store drawing model for the workbook writer to generate the actual drawing XML
+        this._drawing = {
+            rId: drawingRId,
+            name: drawingName,
+            anchors,
+            rels
+        };
+        // Write <drawing r:id="rIdN"/> into the worksheet XML
+        this.stream.write(xform.drawing.toXml({ rId: drawingRId }));
+    }
+    /** Returns the drawing model if images were added, for the workbook writer. */
+    get drawing() {
+        return this._drawing;
+    }
     _writeBackground() {
         if (this._background) {
             if (this._background.imageId !== undefined) {

package/dist/cjs/modules/excel/utils/drawing-utils.js

@@ -0,0 +1,118 @@
+"use strict";
+/**
+ * Shared utilities for building drawing models (anchors + relationships)
+ * used by both the streaming WorksheetWriter and the non-streaming WorkSheetXform.
+ *
+ * This eliminates the duplicated anchor/rel building logic and provides
+ * a single, correct image-rel deduplication strategy.
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.resolveMediaTarget = resolveMediaTarget;
+exports.buildDrawingAnchorsAndRels = buildDrawingAnchorsAndRels;
+exports.filterDrawingAnchors = filterDrawingAnchors;
+const rel_type_1 = require("../xlsx/rel-type.js");
+const ooxml_paths_1 = require("./ooxml-paths.js");
+/**
+ * Resolves a media filename into the drawing-level relative target path.
+ *
+ * In the non-streaming path, media entries have separate `name` and `extension`
+ * fields (e.g. name="image0", extension="png").
+ * In the streaming path, `name` already includes the extension (e.g. "image0.png").
+ *
+ * This function accepts both forms and returns e.g. `"../media/image0.png"`.
+ */
+function resolveMediaTarget(medium) {
+    // When name already contains the extension (streaming path), use it directly.
+    // Otherwise concatenate name + extension (non-streaming path).
+    // Note: name may be undefined in the non-streaming path; we preserve the legacy
+    // behavior of `${undefined}.${ext}` = "undefined.ext" to match addMedia().
+    const filename = medium.name && medium.extension && medium.name.endsWith(`.${medium.extension}`)
+        ? medium.name
+        : `${medium.name}.${medium.extension}`;
+    return (0, ooxml_paths_1.mediaRelTargetFromRels)(filename);
+}
+/**
+ * Build the drawing anchors and relationships from a list of image media entries.
+ *
+ * This is the core logic shared between:
+ * - `WorksheetWriter._writeDrawing()` (streaming)
+ * - `WorkSheetXform.prepare()` (non-streaming)
+ *
+ * It correctly deduplicates image rels: if the same `imageId` is used for
+ * multiple anchors, only one image relationship is created and shared.
+ */
+function buildDrawingAnchorsAndRels(media, existingRels, options) {
+    const anchors = [];
+    const rels = [...existingRels];
+    // Map imageId → rId for deduplication (handles non-consecutive duplicates correctly)
+    const imageRIdMap = {};
+    for (const medium of media) {
+        const imageId = String(medium.imageId);
+        const bookImage = options.getBookImage(medium.imageId);
+        if (!bookImage) {
+            continue;
+        }
+        // Deduplicate: reuse rId if same imageId already has a drawing rel
+        let rIdImage = imageRIdMap[imageId];
+        if (!rIdImage) {
+            rIdImage = options.nextRId(rels);
+            imageRIdMap[imageId] = rIdImage;
+            rels.push({
+                Id: rIdImage,
+                Type: "http://schemas.openxmlformats.org/officeDocument/2006/relationships/image",
+                Target: resolveMediaTarget(bookImage)
+            });
+        }
+        const anchor = {
+            picture: {
+                rId: rIdImage
+            },
+            range: medium.range
+        };
+        // Handle image hyperlinks
+        if (medium.hyperlinks && medium.hyperlinks.hyperlink) {
+            const rIdHyperlink = options.nextRId(rels);
+            anchor.picture.hyperlinks = {
+                tooltip: medium.hyperlinks.tooltip,
+                rId: rIdHyperlink
+            };
+            rels.push({
+                Id: rIdHyperlink,
+                Type: rel_type_1.RelType.Hyperlink,
+                Target: medium.hyperlinks.hyperlink,
+                TargetMode: "External"
+            });
+        }
+        anchors.push(anchor);
+    }
+    return { anchors, rels };
+}
+// =============================================================================
+// Anchor Filtering
+// =============================================================================
+/**
+ * Filter drawing anchors to remove invalid entries before XML generation.
+ *
+ * Shared between streaming `WorkbookWriterBase.addDrawings()` and
+ * non-streaming `XLSX.addDrawings()`.
+ */
+function filterDrawingAnchors(anchors) {
+    return anchors.filter(a => {
+        if (a == null) {
+            return false;
+        }
+        // Form controls have range.br and shape properties
+        if (a.range?.br && a.shape) {
+            return true;
+        }
+        // One-cell anchors need a valid picture
+        if (!a.range?.br && !a.picture) {
+            return false;
+        }
+        // Two-cell anchors need either picture or shape
+        if (a.range?.br && !a.picture && !a.shape) {
+            return false;
+        }
+        return true;
+    });
+}

package/dist/cjs/modules/excel/worksheet.js

@@ -489,7 +489,7 @@ class Worksheet {
     duplicateRow(rowNum, count, insert = false) {
         // create count duplicates of rowNum
         // either inserting new or overwriting existing rows
-        const rSrc = this._rows[rowNum - 1];
+        const rSrc = this.getRow(rowNum);
         const inserts = Array.from({ length: count }).fill(rSrc.values);
         // Collect single-row merges from the source row before splicing
         // (only merges where top == bottom == rowNum, i.e. horizontal merges within one row)

package/dist/cjs/modules/excel/xlsx/xform/sheet/worksheet-xform.js

@@ -30,6 +30,7 @@ const header_footer_xform_1 = require("./header-footer-xform.js");
 const conditional_formattings_xform_1 = require("./cf/conditional-formattings-xform.js");
 const ext_lst_xform_1 = require("./ext-lst-xform.js");
 const ooxml_paths_1 = require("../../../utils/ooxml-paths.js");
+const drawing_utils_1 = require("../../../utils/drawing-utils.js");
 const mergeRule = (rule, extRule) => {
     Object.keys(extRule).forEach(key => {
         const value = rule[key];
@@ -226,75 +227,53 @@ class WorkSheetXform extends base_xform_1.BaseXform {
                 Target: (0, ooxml_paths_1.drawingRelTargetFromWorksheet)(drawing.name)
             });
         }
-        const drawingRelsHash = [];
-        let bookImage;
+        // Process background and image media entries
+        const backgroundMedia = [];
+        const imageMedia = [];
         model.media.forEach(medium => {
             if (medium.type === "background") {
-                const rId = nextRid(rels);
-                bookImage = options.media[medium.imageId];
-                rels.push({
-                    Id: rId,
-                    Type: rel_type_1.RelType.Image,
-                    Target: (0, ooxml_paths_1.mediaRelTargetFromRels)(`${bookImage.name}.${bookImage.extension}`)
-                });
-                model.background = {
-                    rId
-                };
-                model.image = options.media[medium.imageId];
+                backgroundMedia.push(medium);
             }
             else if (medium.type === "image") {
-                let { drawing } = model;
-                bookImage = options.media[medium.imageId];
-                if (!drawing) {
-                    drawing = model.drawing = {
-                        rId: nextRid(rels),
-                        name: `drawing${++options.drawingsCount}`,
-                        anchors: [],
-                        rels: []
-                    };
-                    options.drawings.push(drawing);
-                    rels.push({
-                        Id: drawing.rId,
-                        Type: "http://schemas.openxmlformats.org/officeDocument/2006/relationships/drawing",
-                        Target: (0, ooxml_paths_1.drawingRelTargetFromWorksheet)(drawing.name)
-                    });
-                }
-                let rIdImage = this.preImageId === medium.imageId
-                    ? drawingRelsHash[medium.imageId]
-                    : drawingRelsHash[drawing.rels.length];
-                if (!rIdImage) {
-                    rIdImage = nextRid(drawing.rels);
-                    drawingRelsHash[drawing.rels.length] = rIdImage;
-                    drawing.rels.push({
-                        Id: rIdImage,
-                        Type: "http://schemas.openxmlformats.org/officeDocument/2006/relationships/image",
-                        Target: (0, ooxml_paths_1.mediaRelTargetFromRels)(`${bookImage.name}.${bookImage.extension}`)
-                    });
-                }
-                const anchor = {
-                    picture: {
-                        rId: rIdImage
-                    },
-                    range: medium.range
-                };
-                if (medium.hyperlinks && medium.hyperlinks.hyperlink) {
-                    const rIdHyperLink = nextRid(drawing.rels);
-                    drawingRelsHash[drawing.rels.length] = rIdHyperLink;
-                    anchor.picture.hyperlinks = {
-                        tooltip: medium.hyperlinks.tooltip,
-                        rId: rIdHyperLink
-                    };
-                    drawing.rels.push({
-                        Id: rIdHyperLink,
-                        Type: rel_type_1.RelType.Hyperlink,
-                        Target: medium.hyperlinks.hyperlink,
-                        TargetMode: "External"
-                    });
-                }
-                this.preImageId = medium.imageId;
-                drawing.anchors.push(anchor);
+                imageMedia.push(medium);
             }
         });
+        // Handle background images
+        backgroundMedia.forEach(medium => {
+            const rId = nextRid(rels);
+            const bookImage = options.media[medium.imageId];
+            rels.push({
+                Id: rId,
+                Type: rel_type_1.RelType.Image,
+                Target: (0, drawing_utils_1.resolveMediaTarget)(bookImage)
+            });
+            model.background = { rId };
+            model.image = options.media[medium.imageId];
+        });
+        // Handle embedded images — create drawing model using shared utility
+        if (imageMedia.length > 0) {
+            let { drawing } = model;
+            if (!drawing) {
+                drawing = model.drawing = {
+                    rId: nextRid(rels),
+                    name: `drawing${++options.drawingsCount}`,
+                    anchors: [],
+                    rels: []
+                };
+                options.drawings.push(drawing);
+                rels.push({
+                    Id: drawing.rId,
+                    Type: "http://schemas.openxmlformats.org/officeDocument/2006/relationships/drawing",
+                    Target: (0, ooxml_paths_1.drawingRelTargetFromWorksheet)(drawing.name)
+                });
+            }
+            const result = (0, drawing_utils_1.buildDrawingAnchorsAndRels)(imageMedia, drawing.rels, {
+                getBookImage: id => options.media[id],
+                nextRId: currentRels => nextRid(currentRels)
+            });
+            drawing.anchors.push(...result.anchors);
+            drawing.rels = result.rels;
+        }
         // prepare tables
         model.tables.forEach(table => {
             // relationships