diff --git a/src/components/AnchorForAttachmentsOnly/index.native.js b/src/components/AnchorForAttachmentsOnly/index.native.js index 0a98ee0bb4ec..a07aef5f8952 100644 --- a/src/components/AnchorForAttachmentsOnly/index.native.js +++ b/src/components/AnchorForAttachmentsOnly/index.native.js @@ -1,10 +1,11 @@ import React from 'react'; import * as anchorForAttachmentsOnlyPropTypes from './anchorForAttachmentsOnlyPropTypes'; import BaseAnchorForAttachmentsOnly from './BaseAnchorForAttachmentsOnly'; +import * as StyleUtils from '../../styles/StyleUtils'; import styles from '../../styles/styles'; // eslint-disable-next-line react/jsx-props-no-spreading -const AnchorForAttachmentsOnly = props => ; +const AnchorForAttachmentsOnly = props => ; AnchorForAttachmentsOnly.propTypes = anchorForAttachmentsOnlyPropTypes.propTypes; AnchorForAttachmentsOnly.defaultProps = anchorForAttachmentsOnlyPropTypes.defaultProps; diff --git a/src/components/HTMLEngineProvider/BaseHTMLEngineProvider.js b/src/components/HTMLEngineProvider/BaseHTMLEngineProvider.js index fbda8b4941dd..f195d4bc624d 100755 --- a/src/components/HTMLEngineProvider/BaseHTMLEngineProvider.js +++ b/src/components/HTMLEngineProvider/BaseHTMLEngineProvider.js @@ -10,6 +10,7 @@ import htmlRenderers from './HTMLRenderers'; import * as HTMLEngineUtils from './htmlEngineUtils'; import styles from '../../styles/styles'; import fontFamily from '../../styles/fontFamily'; +import defaultViewProps from './defaultViewProps'; const propTypes = { /** Whether text elements should be selectable */ @@ -50,8 +51,6 @@ const customHTMLElementModels = { }), }; -const defaultViewProps = {style: [styles.alignItemsStart, styles.userSelectText]}; - // We are using the explicit composite architecture for performance gains. // Configuration for RenderHTML is handled in a top-level component providing // context to RenderHTMLSource components. See https://git.io/JRcZb diff --git a/src/components/HTMLEngineProvider/HTMLRenderers/AnchorRenderer.js b/src/components/HTMLEngineProvider/HTMLRenderers/AnchorRenderer.js index 2d400d31fe12..25149adcb02c 100644 --- a/src/components/HTMLEngineProvider/HTMLRenderers/AnchorRenderer.js +++ b/src/components/HTMLEngineProvider/HTMLRenderers/AnchorRenderer.js @@ -80,6 +80,7 @@ const AnchorRenderer = (props) => { if (isAttachment) { return ( diff --git a/src/components/HTMLEngineProvider/HTMLRenderers/ImageRenderer.js b/src/components/HTMLEngineProvider/HTMLRenderers/ImageRenderer.js index 750f316030bf..db799785f7a3 100644 --- a/src/components/HTMLEngineProvider/HTMLRenderers/ImageRenderer.js +++ b/src/components/HTMLEngineProvider/HTMLRenderers/ImageRenderer.js @@ -66,7 +66,7 @@ const ImageRenderer = (props) => { > {({show}) => ( showContextMenuForReport(event, anchor, reportID, action, checkIfContextMenuActive)} > diff --git a/src/components/HTMLEngineProvider/defaultViewProps/index.native.js b/src/components/HTMLEngineProvider/defaultViewProps/index.native.js new file mode 100644 index 000000000000..0a9917ebcdf7 --- /dev/null +++ b/src/components/HTMLEngineProvider/defaultViewProps/index.native.js @@ -0,0 +1,5 @@ +import styles from '../../../styles/styles'; + +export default { + style: [styles.dFlex, styles.userSelectText], +}; diff --git a/src/components/HTMLEngineProvider/defaultViewProps/index.web.js b/src/components/HTMLEngineProvider/defaultViewProps/index.web.js new file mode 100644 index 000000000000..65b8174ceac5 --- /dev/null +++ b/src/components/HTMLEngineProvider/defaultViewProps/index.web.js @@ -0,0 +1,9 @@ +import styles from '../../../styles/styles'; + +export default { + // For web platform default to block display. Using flex on root view will force all + // child elements to be block elements even when they have display inline added to them. + // This will affect elements like which are inline by default. + style: [styles.dBlock, styles.userSelectText], +}; + diff --git a/src/styles/utilities/display.js b/src/styles/utilities/display.js index a16a62694af8..9e7e4107a937 100644 --- a/src/styles/utilities/display.js +++ b/src/styles/utilities/display.js @@ -20,4 +20,7 @@ export default { dInline: { display: 'inline', }, + dBlock: { + display: 'block', + }, };