From 36157bb8db1ddfd0887c784700c57ed4d2b99774 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sergio=20Mendon=C3=A7a?= Date: Tue, 14 Aug 2018 11:06:17 -0300 Subject: [PATCH 1/3] Added optional drawingOptions parameter to addImage and addImageFromBuffer methods. This way it can be passaed to Image constructor. --- src/file/media/media.ts | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/file/media/media.ts b/src/file/media/media.ts index e813a2c051..ccd1c5b5c1 100644 --- a/src/file/media/media.ts +++ b/src/file/media/media.ts @@ -3,6 +3,7 @@ import * as sizeOf from "image-size"; import * as path from "path"; import { File } from "../file"; +import { IDrawingOptions } from "../drawing"; import { Image } from "../paragraph"; import { IMediaData } from "./data"; @@ -11,7 +12,7 @@ interface IHackedFile { } export class Media { - public static addImage(file: File, filePath: string): Image { + public static addImage(file: File, filePath: string, drawingOptions?: IDrawingOptions): Image { // Workaround to expose id without exposing to API const exposedFile = (file as {}) as IHackedFile; const mediaData = file.Media.addMedia(filePath, exposedFile.currentRelationshipId++); @@ -20,10 +21,10 @@ export class Media { "http://schemas.openxmlformats.org/officeDocument/2006/relationships/image", `media/${mediaData.fileName}`, ); - return new Image(mediaData); + return new Image(mediaData, drawingOptions); } - public static addImageFromBuffer(file: File, buffer: Buffer, width?: number, height?: number): Image { + public static addImageFromBuffer(file: File, buffer: Buffer, width?: number, height?: number, drawingOptions?: IDrawingOptions): Image { // Workaround to expose id without exposing to API const exposedFile = (file as {}) as IHackedFile; const mediaData = file.Media.addMediaFromBuffer( @@ -39,7 +40,7 @@ export class Media { `media/${mediaData.fileName}`, ); - return new Image(mediaData); + return new Image(mediaData, drawingOptions); } private static generateId(): string { From 3d91c8496634d7f7f64d7b16ba489dd7f1fee6b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sergio=20Mendon=C3=A7a?= Date: Tue, 14 Aug 2018 11:28:01 -0300 Subject: [PATCH 2/3] alphabetized import sources --- src/file/media/media.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/file/media/media.ts b/src/file/media/media.ts index dcec83de47..704abba6a6 100644 --- a/src/file/media/media.ts +++ b/src/file/media/media.ts @@ -2,8 +2,8 @@ import * as fs from "fs"; import * as sizeOf from "image-size"; import * as path from "path"; -import { File } from "../file"; import { IDrawingOptions } from "../drawing"; +import { File } from "../file"; import { ImageParagraph } from "../paragraph"; import { IMediaData } from "./data"; import { Image } from "./image"; From e68bc50e6eee7cdc1f3b116be13d5c23bd461177 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sergio=20Mendon=C3=A7a?= Date: Wed, 22 Aug 2018 10:39:13 -0300 Subject: [PATCH 3/3] style fixed --- src/file/media/media.ts | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/file/media/media.ts b/src/file/media/media.ts index cd90105581..284ca8806d 100644 --- a/src/file/media/media.ts +++ b/src/file/media/media.ts @@ -9,8 +9,13 @@ interface IHackedFile { } export class Media { - - public static addImage(file: File, buffer: Buffer | string | Uint8Array | ArrayBuffer, width?: number, height?: number, drawingOptions?: IDrawingOptions): Image { + public static addImage( + file: File, + buffer: Buffer | string | Uint8Array | ArrayBuffer, + width?: number, + height?: number, + drawingOptions?: IDrawingOptions, + ): Image { // Workaround to expose id without exposing to API const exposedFile = (file as {}) as IHackedFile; const mediaData = file.Media.addMedia(buffer, exposedFile.currentRelationshipId++, width, height);