Skip to content

Commit 7c133d8

Browse files
K-Kumar-01K-Kumar-01
authored
Margin: Check Zero or Truth Values for Margin (#29)
* refactor: remove unused import Signed-off-by: K-Kumar-01 <[email protected]> * feat: add util to check zero or truthy value Signed-off-by: K-Kumar-01 <[email protected]> * fix: margin attributes building Signed-off-by: K-Kumar-01 <[email protected]> * docs: update example for lists Signed-off-by: K-Kumar-01 <[email protected]> --------- Signed-off-by: K-Kumar-01 <[email protected]>
1 parent 08be315 commit 7c133d8

File tree

3 files changed

+41
-13
lines changed

3 files changed

+41
-13
lines changed

‎example/example-node.js

Lines changed: 29 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1614,7 +1614,34 @@ const htmlString = `<!DOCTYPE html>
16141614
</ul>
16151615
</li>
16161616
<li style="font-family: arial, helvetica, sans-serif; font-size: 12pt; line-height: 1.15;"><span style="font-family: arial, helvetica, sans-serif; font-size: 12pt;">Heading 3</span></li>
1617-
</ul>
1617+
</ul>
1618+
<div>
1619+
<p>One More test case</p>
1620+
<p style="margin: 0in; line-height: normal; font-size: 11pt; font-family: Calibri, sans-serif;"><strong><span style="font-size: 10.0pt; font-family: Arial, sans-serif;">PHASE ONE</span></strong><br /><strong><span style="font-size: 10.0pt; font-family: Arial, sans-serif; color: red;">CONFIDENTIAL <br />HOURS: 1 – 2</span></strong></p>
1621+
<p style="margin: 0in; line-height: normal; font-size: 11pt; font-family: Calibri, sans-serif;"><strong><span style="font-size: 10.0pt; font-family: Arial, sans-serif; color: red;">TIER: 1 </span></strong></p>
1622+
<p style="line-height: normal; margin: 0in 0in 10pt; font-size: 11pt; font-family: Calibri, sans-serif;"><strong><span style="font-size: 10.0pt; font-family: Arial, sans-serif;">Scheduled Work</span></strong><span style="font-size: 10.0pt; font-family: Arial, sans-serif;">: Business Hours </span><br /><strong><span style="font-size: 10.0pt; font-family: Arial, sans-serif;">Location:</span></strong>
1623+
<span style="font-size: 10.0pt; font-family: Arial, sans-serif;"> Remote</span>
1624+
</p>
1625+
<ul style="margin-bottom: 0in; margin-top: 0px;">
1626+
<li style="line-height: normal; margin: 0in 0in 0in 0px; font-size: 11pt; font-family: Calibri, sans-serif;"><span style="font-size: 9.0pt; font-family: Arial, sans-serif;">Item 1k</span>
1627+
<ul style="list-style-type: circle; margin-bottom: 0in; margin-top: 0px;">
1628+
<li style="line-height: normal; margin: 0in 0in 0in 0px; font-size: 11pt; font-family: Calibri, sans-serif;"><span style="font-size: 9.0pt; font-family: Arial, sans-serif;">Sub item 1</span></li>
1629+
<li style="line-height: normal; margin: 0in 0in 0in 0px; font-size: 11pt; font-family: Calibri, sans-serif;"><span style="font-size: 9.0pt; font-family: Arial, sans-serif;">Sub item 2</span></li>
1630+
<li style="line-height: normal; margin: 0in 0in 0in 0px; font-size: 11pt; font-family: Calibri, sans-serif;"><span style="font-size: 9.0pt; font-family: Arial, sans-serif;">Sub item 3</span></li>
1631+
<li style="line-height: normal; margin: 0in 0in 0in 0px; font-size: 11pt; font-family: Calibri, sans-serif;"><span style="font-size: 9.0pt; font-family: Arial, sans-serif;">Sub item 4</span></li>
1632+
<li style="line-height: normal; margin: 0in 0in 0in 0px; font-size: 11pt; font-family: Calibri, sans-serif;"><span style="font-size: 9.0pt; font-family: Arial, sans-serif;">Sub item 5</span></li>
1633+
<li style="line-height: normal; margin: 0in 0in 0in 0px; font-size: 11pt; font-family: Calibri, sans-serif;"><span style="font-size: 9.0pt; font-family: Arial, sans-serif;">Sub item 6</span></li>
1634+
</ul>
1635+
</li>
1636+
<li style="line-height: normal; margin: 0in 0in 0in 0px; font-size: 11pt; font-family: Calibri, sans-serif;"><span style="font-size: 9.0pt; font-family: Arial, sans-serif;">Item 2</span>
1637+
<ul style="list-style-type: circle; margin-bottom: 0in; margin-top: 0px;">
1638+
<li style="line-height: normal; margin: 0in 0in 0in 0px; font-size: 11pt; font-family: Calibri, sans-serif;"><span style="font-size: 9.0pt; font-family: Arial, sans-serif;">Sub item 1</span></li>
1639+
<li style="line-height: normal; margin: 0in 0in 0in 0px; font-size: 11pt; font-family: Calibri, sans-serif;"><span style="font-size: 9.0pt; font-family: Arial, sans-serif;">Sub item 2</span></li>
1640+
<li style="line-height: normal; margin: 0in 0in 10pt 0px; font-size: 11pt; font-family: Calibri, sans-serif;"><span style="font-size: 9.0pt; font-family: Arial, sans-serif;">Sub item 1</span></li>
1641+
</ul>
1642+
</li>
1643+
</ul>
1644+
</div>
16181645
</body>
16191646
</html>`;
16201647

@@ -1632,5 +1659,4 @@ const htmlString = `<!DOCTYPE html>
16321659
}
16331660
console.log('Docx file created successfully');
16341661
});
1635-
})();
1636-
1662+
})();

‎src/helpers/xml-builder.js

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -54,12 +54,12 @@ import {
5454
verticalAlignValues,
5555
imageType,
5656
internalRelationship,
57-
defaultPercentageMarginValue,
5857
defaultTableBorderOptions,
5958
defaultTableBorderAttributeOptions
6059
} from '../constants';
6160
import { vNodeHasChildren } from '../utils/vnode';
6261
import { isValidUrl } from '../utils/url';
62+
import { isZeroOrTruthy } from '../utils/truthy-check';
6363

6464
const setUpDirectionalBorderStroke = (borderStrike = 'nil') => ({
6565
top: borderStrike,
@@ -335,7 +335,7 @@ const fixupLineHeight = (lineHeight, fontSize) => {
335335
if (!isNaN(lineHeight)) {
336336
if (fontSize) {
337337
const actualLineHeight = +lineHeight * fontSize;
338-
338+
339339
return HIPToTWIP(actualLineHeight);
340340
} else {
341341
// 240 TWIP or 12 point is default line height
@@ -356,7 +356,7 @@ const fixupLineHeight = (lineHeight, fontSize) => {
356356
} else if (percentageRegex.test(lineHeight)) {
357357
const matchedParts = lineHeight.match(percentageRegex);
358358
return HIPToTWIP((matchedParts[1] * fontSize) / 100);
359-
}
359+
}
360360
else {
361361
// 240 TWIP or 12 point is default line height
362362
return 240;
@@ -522,7 +522,6 @@ const cssBorderParser = (borderString, defaultBorderOptions = { ...defaultTableB
522522
return [size, stroke, color];
523523
};
524524

525-
526525
const modifiedStyleAttributesBuilder = (docxDocumentInstance, vNode, attributes, options) => {
527526
const modifiedAttributes = { ...attributes };
528527

@@ -602,23 +601,23 @@ const modifiedStyleAttributesBuilder = (docxDocumentInstance, vNode, attributes,
602601

603602
const { left, right, bottom } = margins
604603
const indentation = { left, right }
605-
if (left || right) {
604+
if (isZeroOrTruthy(left) || isZeroOrTruthy(right)) {
606605
modifiedAttributes.indentation = indentation;
607606
}
608-
if (bottom) {
607+
if (isZeroOrTruthy(bottom)) {
609608
modifiedAttributes.afterSpacing = bottom;
610609
}
611610
} else if (vNodeStyleKey === 'margin-left' || vNodeStyleKey === 'margin-right') {
612611
const leftMargin = fixupMargin(vNodeStyle['margin-left']);
613612
const rightMargin = fixupMargin(vNodeStyle['margin-right']);
614613
const indentation = {};
615-
if (leftMargin) {
614+
if (isZeroOrTruthy(leftMargin)) {
616615
indentation.left = leftMargin;
617616
}
618-
if (rightMargin) {
617+
if (isZeroOrTruthy(rightMargin)) {
619618
indentation.right = rightMargin;
620619
}
621-
if (leftMargin || rightMargin) {
620+
if (isZeroOrTruthy(leftMargin) || isZeroOrTruthy(rightMargin)) {
622621
modifiedAttributes.indentation = indentation;
623622
}
624623
} else if (vNodeStyleKey === 'margin-bottom') {
@@ -759,7 +758,7 @@ const buildRunProperties = (attributes) => {
759758
if (key === 'textDecoration') {
760759
options.textDecoration = attributes[key];
761760
}
762-
761+
763762
if (key === 'textShadow') {
764763
options.textShadow = attributes[key];
765764
}

‎src/utils/truthy-check.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
export const isZeroOrTruthy = (value) => {
2+
return value === 0 || !!value;
3+
}

0 commit comments

Comments
 (0)