Skip to content

Fix overflowing content for native Help screen #35552

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

Merged
dcalhoun merged 2 commits into from
Oct 12, 2021
Merged

Fix overflowing content for native Help screen #35552

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0187aa6
Fix overflowing content for Help screen
dcalhoun Oct 12, 2021
a6ed171
Update change log
dcalhoun Oct 12, 2021
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
14 changes: 8 additions & 6 deletions ...components/src/mobile/bottom-sheet/bottom-sheet-navigation/navigation-container.native.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,13 @@ const options = {

const ANIMATION_DURATION = 190;

function BottomSheetNavigationContainer( { children, animate, main, theme } ) {
function BottomSheetNavigationContainer( {
children,
animate,
main,
theme,
style,
} ) {
const Stack = useRef( createStackNavigator() ).current;
const context = useContext( BottomSheetNavigationContext );
const [ currentHeight, setCurrentHeight ] = useState(
Expand Down Expand Up @@ -129,11 +135,7 @@ function BottomSheetNavigationContainer( { children, animate, main, theme } ) {

return useMemo( () => {
return (
<View
style={ {
height: currentHeight,
} }
>
<View style={ [ style, { height: currentHeight } ] }>
<BottomSheetNavigationProvider
value={ {
setHeight,
Expand Down
6 changes: 5 additions & 1 deletion packages/editor/src/components/editor-help/index.native.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,11 @@ function EditorHelpTopics( { close, isVisible, onClose } ) {
contentStyle={ styles.contentContainer }
testID="editor-help-modal"
>
<BottomSheet.NavigationContainer animate main>
<BottomSheet.NavigationContainer
animate
main
style={ styles.navigationContainer }
>
<BottomSheet.NavigationScreen
isScrollable
fullScreen
Expand Down
4 changes: 4 additions & 0 deletions packages/editor/src/components/editor-help/style.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,10 @@
color: $dark-primary;
}

.navigationContainer {
overflow: hidden;
}

.container {
height: 100%;
}
Expand Down
1 change: 1 addition & 0 deletions packages/react-native-editor/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ For each user feature we should also add a importance categorization label to i
## Unreleased
- [*] [Embed block] Fix inline preview cut-off when editing URL [#35321]
- [*] [Unsupported Block Editor] Fix text selection bug for Android [#34668]
- [*] Fixed erroneous overflow within editor Help screens. [#35552]

## 1.63.0
- [**] [Embed block] Add the top 5 specific embed blocks to the Block inserter list [#34967]
Expand Down