Skip to content

Commit fe9d576

Browse files
committed
Temporary rename to onNativeDismiss
1 parent 7ea4db6 commit fe9d576

9 files changed

Lines changed: 13 additions & 13 deletions

File tree

apps/src/tests/component-integration-tests/form-sheet/test-form-sheet-with-nested-stack-v5/index.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ export function App() {
2828
/>
2929
<FormSheet
3030
isOpen={isOpen}
31-
onDismiss={() => setIsOpen(false)}
31+
onNativeDismiss={() => setIsOpen(false)}
3232
detents={[0.6, 1.0]}>
3333
<View style={styles.sheetContent}>
3434
<StackSetup />

apps/src/tests/single-feature-tests/form-sheet/test-form-sheet-base/index.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ export function App() {
2525
/>
2626
<FormSheet
2727
isOpen={isOpen}
28-
onDismiss={() => setIsOpen(false)}
28+
onNativeDismiss={() => setIsOpen(false)}
2929
detents={[0.6, 1.0]}>
3030
<View style={styles.sheetContent}>
3131
<Text style={styles.sheetTitle}>FormSheet content</Text>

ios/gamma/modals/form-sheet/RNSFormSheetHostComponentEventEmitter.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ NS_ASSUME_NONNULL_BEGIN
1313

1414
@interface RNSFormSheetHostComponentEventEmitter : NSObject
1515

16-
- (BOOL)emitOnDismiss;
16+
- (BOOL)emitOnNativeDismiss;
1717

1818
@end
1919

ios/gamma/modals/form-sheet/RNSFormSheetHostComponentEventEmitter.mm

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@ @implementation RNSFormSheetHostComponentEventEmitter {
66
std::shared_ptr<const react::RNSFormSheetHostEventEmitter> _reactEventEmitter;
77
}
88

9-
- (BOOL)emitOnDismiss
9+
- (BOOL)emitOnNativeDismiss
1010
{
1111
if (_reactEventEmitter != nullptr) {
12-
_reactEventEmitter->onDismiss({});
12+
_reactEventEmitter->onNativeDismiss({});
1313
return YES;
1414
} else {
15-
RCTLogWarn(@"[RNScreens] Skipped OnDismiss event emission due to nullish emitter");
15+
RCTLogWarn(@"[RNScreens] Skipped OnNativeDismiss event emission due to nullish emitter");
1616
return NO;
1717
}
1818
}

ios/gamma/modals/form-sheet/RNSFormSheetHostComponentView.mm

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -116,12 +116,12 @@ - (void)updatePresentationState
116116

117117
#pragma mark - RNSFormSheetHostControllerDelegate
118118

119-
- (void)sheetControllerDidDismiss:(RNSFormSheetHostController *)controller
119+
- (void)sheetControllerDidNativeDismiss:(RNSFormSheetHostController *)controller
120120
{
121121
_isOpen = NO;
122122
[self resetShadowNodeSize];
123123

124-
[_reactEventEmitter emitOnDismiss];
124+
[_reactEventEmitter emitOnNativeDismiss];
125125
}
126126

127127
- (void)sheetControllerViewDidLayoutSubviews:(RNSFormSheetHostController *)controller

ios/gamma/modals/form-sheet/RNSFormSheetHostController.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ NS_ASSUME_NONNULL_BEGIN
77
@class RNSFormSheetHostController;
88

99
@protocol RNSFormSheetHostControllerDelegate <NSObject>
10-
- (void)sheetControllerDidDismiss:(RNSFormSheetHostController *)controller;
10+
- (void)sheetControllerDidNativeDismiss:(RNSFormSheetHostController *)controller;
1111
- (void)sheetControllerViewDidLayoutSubviews:(RNSFormSheetHostController *)controller;
1212
@end
1313

ios/gamma/modals/form-sheet/RNSFormSheetHostController.mm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ - (void)viewDidLayoutSubviews
5757

5858
- (void)presentationControllerDidDismiss:(UIPresentationController *)presentationController
5959
{
60-
[self.delegate sheetControllerDidDismiss:self];
60+
[self.delegate sheetControllerDidNativeDismiss:self];
6161
}
6262

6363
@end

src/components/gamma/modals/form-sheet/FormSheet.types.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,12 @@ export interface FormSheetProps {
2525

2626
// Events
2727
/**
28-
* @summary Called when the native sheet is dismissed.
28+
* @summary Called when the sheet is dismissed natively.
2929
*
3030
* It is highly recommended to use this callback to synchronize
3131
* your local React state to prevent UI mismatches (e.g., updating `isOpen` back to `false`).
3232
*
3333
* @platform ios
3434
*/
35-
onDismiss?: (() => void) | undefined;
35+
onNativeDismiss?: (() => void) | undefined;
3636
}

src/fabric/gamma/modals/form-sheet/FormSheetHostNativeComponent.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ type GenericEmptyEvent = Readonly<{}>;
99
interface NativeProps extends ViewProps {
1010
isOpen?: CT.WithDefault<boolean, false>;
1111
detents?: CT.Double[] | undefined;
12-
onDismiss?: CT.DirectEventHandler<GenericEmptyEvent> | undefined;
12+
onNativeDismiss?: CT.DirectEventHandler<GenericEmptyEvent> | undefined;
1313
}
1414

1515
export default codegenNativeComponent<NativeProps>('RNSFormSheetHost', {

0 commit comments

Comments
 (0)