Merge pull request #882 from jsamr/jsamr-whitespace-collapsing

React Native Render HTML: whitespace collapsing (2d shot)

.gitignore

@@ -32,6 +32,9 @@ build/
 local.properties
 *.iml
 
+# Vscode
+.vscode
+
 # node.js
 #
 node_modules/

config/webpack/webpack.common.js

@@ -52,7 +52,7 @@ module.exports = {
                  */
                 exclude: [
                     // eslint-disable-next-line max-len
-                    /node_modules\/(?!(react-native-render-html|react-native-webview|react-native-onyx)\/).*|\.native\.js$/,
+                    /node_modules\/(?!(react-native-webview|react-native-onyx)\/).*|\.native\.js$/,
                     platformExclude
                 ],
             },

config/webpack/webpack.dev.js

@@ -16,6 +16,11 @@ module.exports = merge(common, {
     plugins: [
         new webpack.DefinePlugin({
             __REACT_WEB_CONFIG__: JSON.stringify(env),
-        })
-    ]
+
+            // React Native JavaScript environment requires the global __DEV__ variable to be accessible.
+            // react-native-render-html uses variable to log exclusively during development.
+            // See https://reactnative.dev/docs/javascript-environment
+            __DEV__: true,
+        }),
+    ],
 });

config/webpack/webpack.prod.js

@@ -12,6 +12,11 @@ module.exports = merge(common, {
     plugins: [
         new webpack.DefinePlugin({
             __REACT_WEB_CONFIG__: JSON.stringify(env),
+
+            // React Native JavaScript environment requires the global __DEV__ variable to be accessible.
+            // react-native-render-html uses variable to log exclusively during development.
+            // See https://reactnative.dev/docs/javascript-environment
+            __DEV__: false,
         })
     ],
 });

package.json

@@ -60,9 +60,9 @@
     "react-native-image-picker": "^2.3.3",
     "react-native-keyboard-spacer": "^0.4.1",
     "react-native-modal": "^11.5.6",
-    "react-native-pdf": "^6.2.2",
     "react-native-onyx": "git+https://[email protected]:Expensify/react-native-onyx.git#8e29d1807382c8a1325c92858c551f6b19e1aaad",
-    "react-native-render-html": "^4.2.3",
+    "react-native-render-html": "^6.0.0-alpha.10",
+    "react-native-pdf": "^6.2.2",
     "react-native-safe-area-context": "^3.1.4",
     "react-native-web": "^0.14.0",
     "react-native-web-webview": "^1.0.2",

src/components/AnchorForCommentsOnly/anchorForCommentsOnlyPropTypes.js

@@ -0,0 +1,27 @@
+import PropTypes from 'prop-types';
+
+/**
+ * Text based component that is passed a URL to open onPress
+ */
+const anchorForCommentsOnlyPropTypes = {
+    // The URL to open
+    href: PropTypes.string,
+
+    // What headers to send to the linked page (usually noopener and noreferrer)
+    // This is unused in native, but is here for parity with web
+    rel: PropTypes.string,
+
+    // Used to determine where to open a link ("_blank" is passed for a new tab)
+    // This is unused in native, but is here for parity with web
+    target: PropTypes.string,
+
+
+    // Any children to display
+    children: PropTypes.node,
+
+    // Any additional styles to apply
+    // eslint-disable-next-line react/forbid-prop-types
+    style: PropTypes.any,
+};
+
+export default anchorForCommentsOnlyPropTypes;