feat: added paragraph spacing support (#73)

Created ParagraphStyle model and used it in StringAttribute and TextStyle. Added paragraph spacing property to it.

models/ParagraphStyle/ParagraphStyle.js

@@ -0,0 +1,39 @@
+/*
+ * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance with
+ * the License. A copy of the License is located at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
+ * CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions
+ * and limitations under the License.
+ */
+
+const { textAlignmentMap } = require('../../utils/maps');
+
+class ParagraphStyle {
+  static get Model() {
+    return {
+      _class: 'paragraphStyle',
+      alignment: 0,
+    };
+  }
+
+  constructor(args, json) {
+    if (json) {
+      Object.assign(this, json);
+    } else {
+      Object.assign(this, ParagraphStyle.Model);
+      if (args.alignment) this.alignment = textAlignmentMap[args.alignment];
+      if (args.lineHeight) {
+        this.maximumLineHeight = args.lineHeight;
+        this.minimumLineHeight = args.lineHeight;
+      }
+      if (args.paragraphSpacing) this.paragraphSpacing = args.paragraphSpacing;
+    }
+  }
+}
+
+module.exports = ParagraphStyle;

models/ParagraphStyle/index.d.ts

@@ -0,0 +1,31 @@
+/*
+ * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance with
+ * the License. A copy of the License is located at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
+ * CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions
+ * and limitations under the License.
+ */
+
+declare const enum Alignment {
+    LEFT = 0,
+    RIGHT = 1,
+    CENTER = 2,
+    JUSTIFY = 3,
+}
+
+declare class ParagraphStyle {
+    _class: 'paragraphStyle';
+    alignment: Alignment;
+    minimumLineHeight: number;
+    maximumLineHeight: number;
+    paragraphSpacing: number;
+
+    constructor(args?: any, json?: any);
+}
+
+export = ParagraphStyle;

models/ParagraphStyle/index.js

@@ -0,0 +1,14 @@
+/*
+ * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance with
+ * the License. A copy of the License is located at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
+ * CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions
+ * and limitations under the License.
+ */
+
+module.exports = require('./ParagraphStyle');

models/StringAttribute/StringAttribute.js

@@ -12,7 +12,8 @@
  */
 
 const Color = require('../Color');
-const { textAlignmentMap, verticalAlignmentMap, textTransformMap } = require('../../utils/maps');
+const ParagraphStyle = require('../ParagraphStyle');
+const { verticalAlignmentMap, textTransformMap } = require('../../utils/maps');
 
 class StringAttribute {
   static get Model() {
@@ -33,10 +34,7 @@ class StringAttribute {
         textStyleVerticalAlignmentKey: 0,
         underlineStyle: 0,
         strikethroughStyle: 0,
-        paragraphStyle: {
-          _class: 'paragraphStyle',
-          alignment: 0,
-        },
+        paragraphStyle: ParagraphStyle.Model,
       },
     };
   }
@@ -62,12 +60,7 @@ class StringAttribute {
           underlineStyle: args.underline ? 1 : 0,
           strikethroughStyle: args.strikethrough ? 1 : 0,
           kerning: args.kerning || undefined,
-          paragraphStyle: {
-            _class: 'paragraphStyle',
-            alignment: textAlignmentMap[args.alignment || 'left'],
-            ...(args.lineHeight && { maximumLineHeight: args.lineHeight }),
-            ...(args.lineHeight && { minimumLineHeight: args.lineHeight }),
-          },
+          paragraphStyle: new ParagraphStyle(args),
         },
       });
     }

models/StringAttribute/index.d.ts

@@ -1,5 +1,5 @@
 import Color from '../Color';
-// import { textAlignmentMap, verticalAlignmentMap } from '../../utils/maps';
+import ParagraphStyle = require('../ParagraphStyle');
 
 declare class StringAttribute {
   _class: 'stringAttribute';
@@ -17,10 +17,7 @@ declare class StringAttribute {
     textStyleVerticalAlignmentKey: number;
     underlineStyle: number;
     strikethroughStyle: number;
-    paragraphStyle: {
-      _class: 'paragraphStyle';
-      alignment: number;
-    };
+    paragraphStyle: ParagraphStyle;
   };
   constructor(args?: any, json?: any);
 }

models/TextStyle/TextStyle.js

@@ -12,7 +12,8 @@
  */
 
 const Color = require('../Color');
-const { textAlignmentMap, verticalAlignmentMap } = require('../../utils/maps');
+const ParagraphStyle = require('../ParagraphStyle');
+const { verticalAlignmentMap } = require('../../utils/maps');
 
 /**
  * TextStyle
@@ -34,12 +35,7 @@ class TextStyle {
         textStyleVerticalAlignmentKey: 0,
         underlineStyle: 0,
         strikethroughStyle: 0,
-        paragraphStyle: {
-          _class: 'paragraphStyle',
-          alignment: 0,
-          minimumLineHeight: 43,
-          maximumLineHeight: 43,
-        },
+        paragraphStyle: ParagraphStyle.Model,
       },
       verticalAlignment: 0,
       kerning: 0,
@@ -73,10 +69,7 @@ class TextStyle {
           },
           MSAttributedStringColorAttribute: new Color(args.color),
           textStyleVerticalAlignmentKey: 2,
-          paragraphStyle: {
-            _class: 'paragraphStyle',
-            alignment: textAlignmentMap[args.alignment || 'left'],
-          },
+          paragraphStyle: new ParagraphStyle(args),
         },
       });
       if (args.lineHeight) {

models/TextStyle/index.d.ts

@@ -1,4 +1,5 @@
 import Color from '../Color';
+import ParagraphStyle = require('../ParagraphStyle');
 // import { textAlignmentMap, verticalAlignmentMap } from '../../utils/maps';
 
 declare class TextStyle {
@@ -16,12 +17,7 @@ declare class TextStyle {
     underlineStyle: number;
     strikethroughStyle: number;
     kerning: number;
-    paragraphStyle: {
-      _class: 'paragraphStyle';
-      alignment: number;
-      minimumLineHeight: number;
-      maximumLineHeight: number;
-    };
+    paragraphStyle: ParagraphStyle;
   };
   verticalAlignment: number;
 

models/index.d.ts

@@ -16,6 +16,7 @@ import _Layer from './Layer';
 import Meta from './Meta';
 import Oval from './Oval';
 import Page from './Page';
+import ParagraphStyle from './ParagraphStyle';
 import Rect from './Rect';
 import Rectangle from './Rectangle';
 import RulerData from './RulerData';
@@ -54,6 +55,7 @@ export {
   Meta,
   Oval,
   Page,
+  ParagraphStyle,
   Rect,
   Rectangle,
   RulerData,

models/index.js

@@ -30,6 +30,7 @@ module.exports = {
   Meta: require('./Meta'),
   Oval: require('./Oval'),
   Page: require('./Page'),
+  ParagraphStyle: require('./ParagraphStyle'),
   Rect: require('./Rect'),
   Rectangle: require('./Rectangle'),
   RulerData: require('./RulerData'),