Skip to content
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.

Sign up for GitHub

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

Fix: (Redo) Copying the messages and marking a message in between as unread generates 'new' in the text #18684

Merged
merged 9 commits into from
May 15, 2023
Merged

Fix: (Redo) Copying the messages and marking a message in between as unread generates 'new' in the text #18684

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
c5c3af7
Remove UnreadActionIndicator from copied content
Victor-Nyagudi May 9, 2023
e9a38a0
Merge with main that has Prettier PR merged
Victor-Nyagudi May 10, 2023
2651a0b
Add check to account for null scenario
Victor-Nyagudi May 10, 2023
76ac7ed
Revert "Merge with main that has Prettier PR merged"
Victor-Nyagudi May 10, 2023
aa760a1
Merge branch 'main' into fix/17838-unread-action-indicator-text-copied
Victor-Nyagudi May 11, 2023
84e5aac
Add parentheses to arrow function arg in line with Prettier
Victor-Nyagudi May 11, 2023
c57d314
Remove UnreadActionIndicator from copied content based on its ID
Victor-Nyagudi May 13, 2023
3eb811c
Merge branch 'Expensify:main' into fix/17838-unread-action-indicator-…
Victor-Nyagudi May 13, 2023
3f3e338
Remove unnecessary string literal
Victor-Nyagudi May 14, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/components/UnreadActionIndicator.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ const UnreadActionIndicator = (props) => (
<View
accessibilityLabel={props.translate('accessibilityHints.newMessageLineIndicator')}
data-action-id={props.reportActionID}
style={styles.unreadIndicatorContainer}
style={[styles.unreadIndicatorContainer, styles.userSelectNone]}
>
<View style={styles.unreadIndicatorLine} />
<Text style={styles.unreadIndicatorText}>{props.translate('common.new')}</Text>
Expand Down
11 changes: 11 additions & 0 deletions src/libs/SelectionScraper/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import render from 'dom-serializer';
import {parseDocument} from 'htmlparser2';
import _ from 'underscore';
import Str from 'expensify-common/lib/str';
import * as Localize from '../Localize';

const elementsWillBeSkipped = ['html', 'body'];
const tagAttribute = 'data-testid';
Expand Down Expand Up @@ -80,6 +81,16 @@ const getHTMLOfSelection = () => {
}
}

// Get the div housing the UnreadActionIndicator and remove it from copied content.
// As it currently stands, 'accessibilityHints.newMessageLineIndicator' is only used inside
// UnreadActionIndicator.js which is also only used in ReportActionItem.js, so this is a relatively
// safe move.
const newMessageLineIndicatorDiv = div.querySelector(`[aria-label="${Localize.translateLocal('accessibilityHints.newMessageLineIndicator')}"]`);

if (newMessageLineIndicatorDiv) {
newMessageLineIndicatorDiv.remove();
}

return div.innerHTML;
};

Expand Down