diff --git a/src/html/HtmlNodeTag.js b/src/html/HtmlNodeTag.js
index ed2affe8ed..b8c8a86835 100644
--- a/src/html/HtmlNodeTag.js
+++ b/src/html/HtmlNodeTag.js
@@ -14,11 +14,8 @@ import HtmlTagPre from './tags/HtmlTagPre';
import HtmlTagStrong from './tags/HtmlTagStrong';
import HtmlTagItalic from './tags/HtmlTagItalic';
import HtmlTagDiv from './tags/HtmlTagDiv';
-import HtmlTagBr from './tags/HtmlTagBr';
import { getEmojiUrl } from '../utils/url';
-// br', 'blockquote',
-
const specialTags = {
'span': HtmlTagSpan,
'p': HtmlTagSpan,
@@ -41,7 +38,6 @@ const specialTags = {
'tr': HtmlTagDiv,
'th': HtmlTagDiv,
'td': HtmlTagDiv,
- 'br': HtmlTagBr,
};
const stylesFromClassNames = (classNames = '', styleObj) =>
diff --git a/src/html/HtmlNodeText.js b/src/html/HtmlNodeText.js
index d646ef7257..dd610d46fc 100644
--- a/src/html/HtmlNodeText.js
+++ b/src/html/HtmlNodeText.js
@@ -12,6 +12,6 @@ type Props = {
export default ({ data, cascadingTextStyle }: Props) => (
);
diff --git a/src/html/HtmlStyles.js b/src/html/HtmlStyles.js
index 35719dc6a1..ddb73f3540 100644
--- a/src/html/HtmlStyles.js
+++ b/src/html/HtmlStyles.js
@@ -3,6 +3,7 @@ import { StyleSheet } from 'react-native';
export default StyleSheet.create({
ul: {
+ width: '100%',
flexDirection: 'column',
paddingTop: 4,
paddingBottom: 4,
@@ -10,14 +11,17 @@ export default StyleSheet.create({
ol: {
flexDirection: 'column',
},
+ li: {
+ flexDirection: 'row',
+ marginBottom: 4,
+ },
div: {
flexWrap: 'wrap',
},
p: {
},
- li: {
- flexDirection: 'row',
- marginBottom: 4,
+ br: {
+ width: '100%',
},
span: {
},
diff --git a/src/html/tags/HtmlTagBr.js b/src/html/tags/HtmlTagBr.js
deleted file mode 100644
index 32e53ed031..0000000000
--- a/src/html/tags/HtmlTagBr.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import React from 'react';
-import { Text } from 'react-native';
-
-export default () => {'\n'};
diff --git a/src/html/tags/HtmlTagLi.js b/src/html/tags/HtmlTagLi.js
index a525b7add8..34a9ff15b1 100644
--- a/src/html/tags/HtmlTagLi.js
+++ b/src/html/tags/HtmlTagLi.js
@@ -8,15 +8,18 @@ import renderHtmlChildren from '../renderHtmlChildren';
const BULLET = '\u2022';
const customStyles = StyleSheet.create({
- liText: {
+ text: {
+ flexWrap: 'wrap',
flex: 1,
+ width: '100%',
+ flexDirection: 'row',
}
});
export default ({ style, ...restProps }) => (
-
+
-
+
{renderHtmlChildren({ ...restProps })}
diff --git a/src/message/MessageFull.js b/src/message/MessageFull.js
index 20a23b0901..c3a84c60d2 100644
--- a/src/message/MessageFull.js
+++ b/src/message/MessageFull.js
@@ -21,10 +21,13 @@ const styles = StyleSheet.create({
flexDirection: 'column',
marginLeft: 8,
},
- messageContentWrapper: {
+ contentWrapper: {
flexDirection: 'row',
alignItems: 'flex-start',
- justifyContent: 'space-between'
+ justifyContent: 'space-between',
+ },
+ inner: {
+ flex: 1,
},
});
@@ -72,9 +75,9 @@ class MessageFull extends React.PureComponent {
timestamp={message.timestamp}
twentyFourHourTime={twentyFourHourTime}
/>
-
+
-
+
{children}