Merge pull request #592 from shoutem/release/4.4.3

Release/4.4.3
shoutem · May 10, 2021 · 4324019 · 4324019
2 parents e19a7b3 + 7c26cc6
commit 4324019
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 1 deletion.
diff --git a/html/components/SimpleHtml.js b/html/components/SimpleHtml.js
@@ -71,6 +71,32 @@ class SimpleHtml extends PureComponent {
     return false;
   }
 
+  /**
+   * Removes child break node in case when it's positioned at the end
+   * of parent div node and div has content in it.
+   * Example:
+   * <div>first line<br></div>
+   * <div>second line<br></div>
+   *
+   * If br is left as is, <Html> will show empty line under div, not just
+   * break into new line
+   */
+  alterChildren(node) {
+    const { children, name } = node;
+
+    if ((name === 'div' || name === 'p') && children && children.length > 1) {
+      const brNodes = _.filter(children, { name: 'br' });
+      const lastBrNode = _.last(brNodes);
+
+      if (lastBrNode && lastBrNode.next === null) {
+        const lastBrNodeIndex = _.indexOf(children, lastBrNode);
+        return children.splice(0, lastBrNodeIndex);
+      }
+    }
+
+    return children;
+  }
+
   renderUnorderedListPrefix() {
     const { style } = this.props;
 
@@ -113,6 +139,7 @@ class SimpleHtml extends PureComponent {
       ignoredStyles: ['font-family', 'letter-spacing', 'transform'],
       onLinkPress: this.onLinkPress,
       alterNode: this.alterNode,
+      alterChildren: this.alterChildren,
       listsPrefixesRenderers: listPrefixRenderers,
     };
 

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@shoutem/ui",
-  "version": "4.4.2",
+  "version": "4.4.3",
   "description": "Styleable set of components for React Native applications",
   "scripts": {
     "lint": "eslint .",