Merge pull request #14822 from marktoman/main

Preserve text inside code fences
Expensify · Feb 20, 2023 · 80890b9 · 80890b9
2 parents 401cbca + 0557cb5
commit 80890b9
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/src/components/HTMLEngineProvider/BaseHTMLEngineProvider.js b/src/components/HTMLEngineProvider/BaseHTMLEngineProvider.js
@@ -14,12 +14,17 @@ import fontFamily from '../../styles/fontFamily';
 const propTypes = {
     /** Whether text elements should be selectable */
     textSelectable: PropTypes.bool,
+
+    /** Handle line breaks according to the HTML standard (default on web)  */
+    enableExperimentalBRCollapsing: PropTypes.bool,
+
     children: PropTypes.node,
 };
 
 const defaultProps = {
     textSelectable: false,
     children: null,
+    enableExperimentalBRCollapsing: false,
 };
 
 // Declare nonstandard tags and their content model here
@@ -70,6 +75,7 @@ const BaseHTMLEngineProvider = (props) => {
                 defaultViewProps={defaultViewProps}
                 renderers={htmlRenderers}
                 computeEmbeddedMaxWidth={HTMLEngineUtils.computeEmbeddedMaxWidth}
+                enableExperimentalBRCollapsing={props.enableExperimentalBRCollapsing}
             >
                 {props.children}
             </RenderHTMLConfigProvider>

diff --git a/src/components/HTMLEngineProvider/index.native.js b/src/components/HTMLEngineProvider/index.native.js
@@ -3,7 +3,7 @@ import BaseHTMLEngineProvider from './BaseHTMLEngineProvider';
 import {propTypes, defaultProps} from './htmlEnginePropTypes';
 
 const HTMLEngineProvider = props => (
-    <BaseHTMLEngineProvider debug={props.debug}>
+    <BaseHTMLEngineProvider debug={props.debug} enableExperimentalBRCollapsing>
         {props.children}
     </BaseHTMLEngineProvider>
 );