-
Notifications
You must be signed in to change notification settings - Fork 3.5k
Fix iOS multi-level tags text overlap in WorkspaceTagsPage #81738
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
Open
MobileMage
wants to merge
6
commits into
Expensify:main
Choose a base branch
from
MobileMage:fix/81022-ios-tags-text-overlap
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+67
−8
Open
Changes from all commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
5b5afbd
Fix iOS multi-level tags text overlap in WorkspaceTagsPage
MobileMage ff5b587
Add dev-time error when RenderHTML is nested inside Text
MobileMage f0660df
Add test for RenderHTML Text ancestor guard
MobileMage d1641d7
Fix ESLint errors in RenderHTMLTest
MobileMage 3a6b67f
Merge branch 'main' of https://github.com/Expensify/App into fix/8102…
MobileMage 498d1e1
Use platform-specific hook for TextAncestor check
MobileMage 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 hidden or 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
This file contains hidden or 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,7 @@ | ||
| import {useContext} from 'react'; | ||
| // eslint-disable-next-line no-restricted-imports | ||
| import {unstable_TextAncestorContext as TextAncestorContext} from 'react-native'; | ||
|
|
||
| export default function useHasTextAncestor(): boolean { | ||
| return useContext(TextAncestorContext); | ||
| } | ||
This file contains hidden or 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,4 @@ | ||
| // TextAncestorContext is not available on web (react-native-web), so always return false. | ||
| export default function useHasTextAncestor(): boolean { | ||
| return false; | ||
| } |
This file contains hidden or 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
This file contains hidden or 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,41 @@ | ||
| import {render} from '@testing-library/react-native'; | ||
| import React from 'react'; | ||
| import {View} from 'react-native'; | ||
| import RenderHTML from '@components/RenderHTML'; | ||
|
|
||
| jest.mock('@hooks/useWindowDimensions', () => () => ({windowWidth: 400})); | ||
| jest.mock('react-native-render-html', () => { | ||
| // eslint-disable-next-line @typescript-eslint/no-require-imports, @typescript-eslint/no-unsafe-assignment | ||
| const {View: MockView} = require('react-native'); | ||
| return { | ||
| RenderHTMLConfigProvider: ({children}: {children: React.ReactNode}) => children, | ||
| RenderHTMLSource: () => <MockView />, | ||
| }; | ||
| }); | ||
|
|
||
| const mockUseHasTextAncestor = jest.fn(() => false); | ||
| jest.mock('@hooks/useHasTextAncestor', () => () => mockUseHasTextAncestor()); | ||
|
|
||
| describe('RenderHTML', () => { | ||
| it('throws when rendered inside a Text ancestor', () => { | ||
| mockUseHasTextAncestor.mockReturnValue(true); | ||
| expect(() => | ||
| render( | ||
| <View> | ||
|
Member
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 |
||
| <RenderHTML html="<p>test</p>" /> | ||
| </View>, | ||
| ), | ||
| ).toThrow('RenderHTML must not be rendered inside a <Text> component'); | ||
| }); | ||
|
|
||
| it('does not throw when rendered outside a Text ancestor', () => { | ||
| mockUseHasTextAncestor.mockReturnValue(false); | ||
| expect(() => | ||
| render( | ||
| <View> | ||
| <RenderHTML html="<p>test</p>" /> | ||
| </View>, | ||
| ), | ||
| ).not.toThrow(); | ||
| }); | ||
| }); | ||
Oops, something went wrong.
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.
Use index.tsx or index.native format