From 0ab9aeb80cbfe8b41f79ab7569e038b044c5c50f Mon Sep 17 00:00:00 2001 From: jeet-dhandha Date: Sun, 8 Oct 2023 00:26:24 +0530 Subject: [PATCH 1/2] fix: extra space when code added to private note --- src/components/MenuItemRenderHTMLTitle/index.native.js | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/components/MenuItemRenderHTMLTitle/index.native.js b/src/components/MenuItemRenderHTMLTitle/index.native.js index b3dff8d77eff..66154ef480cc 100644 --- a/src/components/MenuItemRenderHTMLTitle/index.native.js +++ b/src/components/MenuItemRenderHTMLTitle/index.native.js @@ -1,4 +1,5 @@ import React from 'react'; +import {View} from 'react-native'; import RenderHTML from '../RenderHTML'; import menuItemRenderHTMLTitlePropTypes from './propTypes'; @@ -7,7 +8,11 @@ const propTypes = menuItemRenderHTMLTitlePropTypes; const defaultProps = {}; function MenuItemRenderHTMLTitle(props) { - return ; + return ( + + + + ); } MenuItemRenderHTMLTitle.propTypes = propTypes; From a0e2a84ec977c5e26034a6cb13da0636fd6c2684 Mon Sep 17 00:00:00 2001 From: jeet-dhandha Date: Mon, 9 Oct 2023 22:23:33 +0530 Subject: [PATCH 2/2] removed extra files and moved component code to MenuItem --- src/components/MenuItem.js | 6 +++-- .../MenuItemRenderHTMLTitle/index.js | 23 ------------------- .../MenuItemRenderHTMLTitle/index.native.js | 22 ------------------ .../MenuItemRenderHTMLTitle/propTypes.js | 8 ------- 4 files changed, 4 insertions(+), 55 deletions(-) delete mode 100644 src/components/MenuItemRenderHTMLTitle/index.js delete mode 100644 src/components/MenuItemRenderHTMLTitle/index.native.js delete mode 100644 src/components/MenuItemRenderHTMLTitle/propTypes.js diff --git a/src/components/MenuItem.js b/src/components/MenuItem.js index d5c753d83735..6c41290f1d17 100644 --- a/src/components/MenuItem.js +++ b/src/components/MenuItem.js @@ -24,7 +24,7 @@ import variables from '../styles/variables'; import * as Session from '../libs/actions/Session'; import Hoverable from './Hoverable'; import useWindowDimensions from '../hooks/useWindowDimensions'; -import MenuItemRenderHTMLTitle from './MenuItemRenderHTMLTitle'; +import RenderHTML from './RenderHTML'; const propTypes = menuItemPropTypes; @@ -252,7 +252,9 @@ const MenuItem = React.forwardRef((props, ref) => { )} {Boolean(props.title) && (Boolean(props.shouldRenderAsHTML) || (Boolean(props.shouldParseTitle) && Boolean(html.length))) && ( - + + + )} {!props.shouldRenderAsHTML && !props.shouldParseTitle && Boolean(props.title) && ( - - - ); -} - -MenuItemRenderHTMLTitle.propTypes = propTypes; -MenuItemRenderHTMLTitle.defaultProps = defaultProps; -MenuItemRenderHTMLTitle.displayName = 'MenuItemRenderHTMLTitle'; - -export default MenuItemRenderHTMLTitle; diff --git a/src/components/MenuItemRenderHTMLTitle/index.native.js b/src/components/MenuItemRenderHTMLTitle/index.native.js deleted file mode 100644 index 66154ef480cc..000000000000 --- a/src/components/MenuItemRenderHTMLTitle/index.native.js +++ /dev/null @@ -1,22 +0,0 @@ -import React from 'react'; -import {View} from 'react-native'; -import RenderHTML from '../RenderHTML'; -import menuItemRenderHTMLTitlePropTypes from './propTypes'; - -const propTypes = menuItemRenderHTMLTitlePropTypes; - -const defaultProps = {}; - -function MenuItemRenderHTMLTitle(props) { - return ( - - - - ); -} - -MenuItemRenderHTMLTitle.propTypes = propTypes; -MenuItemRenderHTMLTitle.defaultProps = defaultProps; -MenuItemRenderHTMLTitle.displayName = 'MenuItemRenderHTMLTitle'; - -export default MenuItemRenderHTMLTitle; diff --git a/src/components/MenuItemRenderHTMLTitle/propTypes.js b/src/components/MenuItemRenderHTMLTitle/propTypes.js deleted file mode 100644 index 68e279eb28c3..000000000000 --- a/src/components/MenuItemRenderHTMLTitle/propTypes.js +++ /dev/null @@ -1,8 +0,0 @@ -import PropTypes from 'prop-types'; - -const propTypes = { - /** Processed title to display for the MenuItem */ - title: PropTypes.string.isRequired, -}; - -export default propTypes;