Merge pull request #203 from AndrewGable/andrew-fix-html

tgolen · web-flow · commit 5b0f9595b3b3 · 2020-08-15T20:03:32.000-06:00
Fix HTML rendering issues
diff --git a/src/components/webView/index.native.js b/src/components/webView/index.native.js
@@ -5,8 +5,8 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import HTML from 'react-native-render-html';
-import {View, Linking} from 'react-native';
-import styles, {webViewStyles} from '../../style/StyleSheet';
+import {Linking} from 'react-native';
+import {webViewStyles} from '../../style/StyleSheet';
 
 const propTypes = {
     html: PropTypes.string,
@@ -16,14 +16,12 @@ const defaultProps = {
 };
 
 const WebView = ({html}) => (
-    <View style={[styles.flex1, styles.flexRow]}>
-        <HTML
-            baseFontStyle={webViewStyles.baseFontStyle}
-            tagsStyles={webViewStyles.tagStyles}
-            onLinkPress={(event, href) => Linking.openURL(href)}
-            html={html}
-        />
-    </View>
+    <HTML
+        baseFontStyle={webViewStyles.baseFontStyle}
+        tagsStyles={webViewStyles.tagStyles}
+        onLinkPress={(event, href) => Linking.openURL(href)}
+        html={html}
+    />
 );
 
 WebView.propTypes = propTypes;
diff --git a/src/page/HomePage/Report/ReportHistoryItemFragment.js b/src/page/HomePage/Report/ReportHistoryItemFragment.js
@@ -1,9 +1,9 @@
 import React from 'react';
-import {Text} from 'react-native';
 import WebView from '../../../components/webView';
 import Str from '../../../lib/Str';
 import ReportHistoryFragmentPropTypes from './ReportHistoryFragmentPropTypes';
 import styles from '../../../style/StyleSheet';
+import Text from '../../../components/Text'
 
 const propTypes = {
     // The message fragment needing to be displayed
@@ -13,7 +13,8 @@ const propTypes = {
 const ReportHistoryItemFragment = ({fragment}) => {
     switch (fragment.type) {
         case 'COMMENT':
-            return fragment.html
+            // Only render HTML if we have html in the fragment
+            return fragment.html !== fragment.text
                 ? <WebView html={fragment.html} />
                 : <Text>{Str.htmlDecode(fragment.text)}</Text>;
 
diff --git a/src/page/HomePage/Report/ReportHistoryItemSingle.js b/src/page/HomePage/Report/ReportHistoryItemSingle.js
@@ -45,9 +45,7 @@ class ReportHistoryItemSingle extends React.PureComponent {
                         </View>
                     </View>
                     <View style={[styles.chatItemMessage]}>
-                        <Text>
-                            <ReportHistoryItemMessage historyItem={historyItem} />
-                        </Text>
+                        <ReportHistoryItemMessage historyItem={historyItem} />
                     </View>
                 </View>
             </View>
