-
Notifications
You must be signed in to change notification settings - Fork 3.1k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
[CP Staging] added component #30081
Merged
mountiny
merged 4 commits into
Expensify:main
from
ayazalavi:ayaz/GH-29021_am_pm_selection_bug
Oct 20, 2023
Merged
[CP Staging] added component #30081
Changes from 2 commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,32 @@ | ||
import React from 'react'; | ||
import PropTypes from 'prop-types'; | ||
import * as EmojiUtils from '../../libs/EmojiUtils'; | ||
import * as Browser from '../../libs/Browser'; | ||
import Text from '../Text'; | ||
|
||
const propTypes = { | ||
/** If this is the Concierge chat, we'll open the modal for requesting a setup call instead of showing popover menu */ | ||
text: PropTypes.string, | ||
|
||
/** URL to the assigned guide's appointment booking calendar */ | ||
displayAsGroup: PropTypes.bool, | ||
}; | ||
|
||
const defaultProps = { | ||
text: '', | ||
displayAsGroup: false, | ||
}; | ||
|
||
function ZeroWidthComponent({text, displayAsGroup}) { | ||
const firstLetterIsEmoji = EmojiUtils.isFirstLetterEmoji(text); | ||
if (firstLetterIsEmoji && !displayAsGroup && !Browser.isMobile()) { | ||
return <Text>​</Text>; | ||
} | ||
return null; | ||
} | ||
|
||
ZeroWidthComponent.propTypes = propTypes; | ||
ZeroWidthComponent.defaultProps = defaultProps; | ||
ZeroWidthComponent.displayName = 'ZeroWidthComponent'; | ||
|
||
export default ZeroWidthComponent; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
const checkForEmojiForSelection = () => null; | ||
mountiny marked this conversation as resolved.
Show resolved
Hide resolved
|
||
|
||
export default checkForEmojiForSelection; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -18,7 +18,7 @@ import CONST from '../../../CONST'; | |
import editedLabelStyles from '../../../styles/editedLabelStyles'; | ||
import UserDetailsTooltip from '../../../components/UserDetailsTooltip'; | ||
import avatarPropTypes from '../../../components/avatarPropTypes'; | ||
import * as Browser from '../../../libs/Browser'; | ||
import ZeroWidthComponent from '../../../components/ZeroWidthComponent'; | ||
|
||
const propTypes = { | ||
/** Users accountID */ | ||
|
@@ -90,24 +90,6 @@ const defaultProps = { | |
}; | ||
|
||
function ReportActionItemFragment(props) { | ||
/** | ||
* Checks text element for presence of emoji as first character | ||
* and insert Zero-Width character to avoid selection issue | ||
* mentioned here https://github.com/Expensify/App/issues/29021 | ||
* | ||
* @param {String} text | ||
* @param {Boolean} displayAsGroup | ||
* @returns {ReactNode | null} Text component with zero width character | ||
*/ | ||
|
||
const checkForEmojiForSelection = (text, displayAsGroup) => { | ||
const firstLetterIsEmoji = EmojiUtils.isFirstLetterEmoji(text); | ||
if (firstLetterIsEmoji && !displayAsGroup && !Browser.isMobile()) { | ||
return <Text>​</Text>; | ||
} | ||
return null; | ||
}; | ||
|
||
switch (props.fragment.type) { | ||
case 'COMMENT': { | ||
const {html, text} = props.fragment; | ||
|
@@ -139,7 +121,10 @@ function ReportActionItemFragment(props) { | |
|
||
return ( | ||
<Text style={[containsOnlyEmojis ? styles.onlyEmojisText : undefined, styles.ltr, ...props.style]}> | ||
{checkForEmojiForSelection(text, props.displayAsGroup)} | ||
<ZeroWidthComponent | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. |
||
text={text} | ||
displayAsGroup={props.displayAsGroup} | ||
/> | ||
<Text | ||
selectable={!DeviceCapabilities.canUseTouchScreen() || !props.isSmallScreenWidth} | ||
style={[containsOnlyEmojis ? styles.onlyEmojisText : undefined, styles.ltr, ...props.style, isPendingDelete ? styles.offlineFeedback.deleted : undefined]} | ||
|
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
i do not see import for Text tag