fix: fixed margin issues

privateOmega · May 28, 2020 · f841b76 · f841b76
1 parent c7e29af
commit f841b76
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 11 deletions.
diff --git a/src/docx-document.js b/src/docx-document.js
@@ -16,13 +16,19 @@ const landscapeMargins = {
   right: 1440,
   bottom: 1800,
   left: 1440,
+  header: 720,
+  footer: 720,
+  gutter: 0,
 };
 
 const portraitMargins = {
   top: 1440,
   right: 1800,
   bottom: 1440,
   left: 1800,
+  header: 720,
+  footer: 720,
+  gutter: 0,
 };
 
 class DocxDocument {
@@ -46,7 +52,13 @@ class DocxDocument {
     this.orientation = orientation;
     this.width = orientation === 'landscape' ? 15840 : 12240;
     this.height = orientation === 'landscape' ? 12240 : 15840;
-    this.margins = margins || orientation === 'landscape' ? landscapeMargins : portraitMargins;
+    this.margins =
+      // eslint-disable-next-line no-nested-ternary
+      margins && Object.keys(margins).length
+        ? margins
+        : orientation === 'landscape'
+        ? landscapeMargins
+        : portraitMargins;
     this.title = title || '';
     this.subject = subject || '';
     this.creator = creator || 'html-to-docx';

diff --git a/template/document.template.js b/template/document.template.js
@@ -1,13 +1,3 @@
-export const defaultMargins = {
-  top: 1440,
-  right: 1440,
-  bottom: 1440,
-  left: 1440,
-  header: 720,
-  footer: 720,
-  gutter: 0,
-};
-
 const generateDocumentTemplate = (width, height, orientation, margins) => {
   return `
   <?xml version="1.0" encoding="UTF-8" standalone="yes"?>