Skip to content

Commit 654249b

Browse files
committed
Support useSafeArea
1 parent b7cfdff commit 654249b

File tree

4 files changed

+7
-8
lines changed

4 files changed

+7
-8
lines changed

demo/src/screens/incubatorScreens/IncubatorDialogScreen.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ export default class IncubatorDialogScreen extends Component {
6969
<View flex center>
7070
<Button marginV-20 label="Open Dialog" onPress={this.openDialog}/>
7171
</View>
72-
<Incubator.Dialog visible={visible} onDismiss={this.onDismiss} bottom centerH>
72+
<Incubator.Dialog useSafeArea visible={visible} onDismiss={this.onDismiss} bottom centerH>
7373
<View style={styles.dialog}>
7474
<Text text60 margin-s2>
7575
Title (swipe here)

generatedTypes/src/incubator/Dialog/types.d.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
import { PropsWithChildren } from 'react';
22
import { AlignmentModifiers } from '../../commons/modifiers';
33
import { ModalProps } from '../../components/modal';
4+
import { ViewProps } from '../../components/view';
45
import { PanningDirections, PanningDirectionsEnum } from '../panView';
56
declare type DialogDirections = PanningDirections;
67
declare const DialogDirectionsEnum: typeof PanningDirectionsEnum;
78
export { DialogDirections, DialogDirectionsEnum };
8-
export interface _DialogProps extends AlignmentModifiers {
9+
export interface _DialogProps extends AlignmentModifiers, Pick<ViewProps, 'useSafeArea'> {
910
/**
1011
* The initial visibility of the dialog.
1112
*/

src/incubator/Dialog/ImperativeDialog.tsx

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ const ImperativeDialog = (props: ImperativeDialogProps, ref: any) => {
1717
children,
1818
ignoreBackgroundPress,
1919
modalProps = {},
20+
useSafeArea,
2021
testID
2122
} = props;
2223
const transitionAnimatorRef = React.createRef<typeof TransitionView>();
@@ -69,13 +70,9 @@ const ImperativeDialog = (props: ImperativeDialogProps, ref: any) => {
6970
[onDismiss, setVisible]);
7071

7172
const renderDialog = () => {
72-
{
73-
/* TODO: remove?
74-
{this.renderDialogView()}
75-
{addBottomSafeArea && <View style={{marginTop: bottomInsets}}/>} */
76-
}
7773
return (
7874
<PanView
75+
useSafeArea={useSafeArea}
7976
directions={directions}
8077
dismissible
8178
animateToOrigin

src/incubator/Dialog/types.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
import {PropsWithChildren} from 'react';
22
import {AlignmentModifiers} from '../../commons/modifiers';
33
import {ModalProps} from '../../components/modal';
4+
import {ViewProps} from '../../components/view';
45
import {PanningDirections, PanningDirectionsEnum} from '../panView';
56
type DialogDirections = PanningDirections;
67
const DialogDirectionsEnum = PanningDirectionsEnum;
78
export {DialogDirections, DialogDirectionsEnum};
89

9-
export interface _DialogProps extends AlignmentModifiers {
10+
export interface _DialogProps extends AlignmentModifiers, Pick<ViewProps, 'useSafeArea'> {
1011
/**
1112
* The initial visibility of the dialog.
1213
*/

0 commit comments

Comments
 (0)