From a40c9f891bff6913c98a9ca64753c21fb49193a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Ska=C5=82ka?= Date: Fri, 15 Dec 2023 09:23:10 +0100 Subject: [PATCH 1/3] Add temporary video tag handling --- src/components/HTMLEngineProvider/HTMLRenderers/index.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/components/HTMLEngineProvider/HTMLRenderers/index.js b/src/components/HTMLEngineProvider/HTMLRenderers/index.js index 69f8eeac798e..13e410db8e3d 100644 --- a/src/components/HTMLEngineProvider/HTMLRenderers/index.js +++ b/src/components/HTMLEngineProvider/HTMLRenderers/index.js @@ -14,6 +14,7 @@ export default { a: AnchorRenderer, code: CodeRenderer, img: ImageRenderer, + video: AnchorRenderer, // temporary until we have a video player component // Custom tag renderers edited: EditedRenderer, From bddf4d835e3a5104e331b4e6e36b8368ef1351a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Ska=C5=82ka?= Date: Fri, 15 Dec 2023 10:42:57 +0100 Subject: [PATCH 2/3] Update BaseHTMLProvider --- src/components/HTMLEngineProvider/BaseHTMLEngineProvider.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/components/HTMLEngineProvider/BaseHTMLEngineProvider.js b/src/components/HTMLEngineProvider/BaseHTMLEngineProvider.js index 86ddf0a52bb3..58d7ae48647c 100755 --- a/src/components/HTMLEngineProvider/BaseHTMLEngineProvider.js +++ b/src/components/HTMLEngineProvider/BaseHTMLEngineProvider.js @@ -64,6 +64,10 @@ function BaseHTMLEngineProvider(props) { tagName: 'next-steps', mixedUAStyles: {...styles.textLabelSupporting}, }), + video: defaultHTMLElementModels.div.extend({ + tagName: 'video', + mixedUAStyles: {whiteSpace: 'pre'}, + }), }), [styles.colorMuted, styles.formError, styles.mb0, styles.textLabelSupporting], ); @@ -71,7 +75,6 @@ function BaseHTMLEngineProvider(props) { // We need to memoize this prop to make it referentially stable. const defaultTextProps = useMemo(() => ({selectable: props.textSelectable, allowFontScaling: false, textBreakStrategy: 'simple'}), [props.textSelectable]); const defaultViewProps = {style: [styles.alignItemsStart, styles.userSelectText]}; - return ( Date: Fri, 15 Dec 2023 11:40:26 +0100 Subject: [PATCH 3/3] Fix getting href for video tags in AnchorRenderer --- .../HTMLEngineProvider/HTMLRenderers/AnchorRenderer.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/HTMLEngineProvider/HTMLRenderers/AnchorRenderer.js b/src/components/HTMLEngineProvider/HTMLRenderers/AnchorRenderer.js index 8fd907470c19..c1cd5d6839a2 100644 --- a/src/components/HTMLEngineProvider/HTMLRenderers/AnchorRenderer.js +++ b/src/components/HTMLEngineProvider/HTMLRenderers/AnchorRenderer.js @@ -20,7 +20,7 @@ function AnchorRenderer(props) { const isAttachment = Boolean(htmlAttribs[CONST.ATTACHMENT_SOURCE_ATTRIBUTE]); const displayName = lodashGet(props.tnode, 'domNode.children[0].data', ''); const parentStyle = lodashGet(props.tnode, 'parent.styles.nativeTextRet', {}); - const attrHref = htmlAttribs.href || ''; + const attrHref = htmlAttribs.href || htmlAttribs[CONST.ATTACHMENT_SOURCE_ATTRIBUTE] || ''; const internalNewExpensifyPath = Link.getInternalNewExpensifyPath(attrHref); const internalExpensifyPath = Link.getInternalExpensifyPath(attrHref);