react-native-windows 0.76.1 → 0.76.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/Libraries/Components/View/View.windows.js +76 -52
- package/Libraries/Core/ReactNativeVersion.js +1 -1
- package/Libraries/Core/setUpErrorHandling.js +1 -7
- package/Libraries/LogBox/Data/LogBoxData.js +2 -2
- package/Libraries/Modal/Modal.windows.js +352 -0
- package/Libraries/ReactNative/AppRegistry.js +3 -3
- package/Libraries/Text/Text.windows.js +1 -1
- package/Microsoft.ReactNative/CompositionComponentView.idl +2 -1
- package/Microsoft.ReactNative/Fabric/AbiComponentDescriptor.cpp +4 -1
- package/Microsoft.ReactNative/Fabric/AbiViewComponentDescriptor.cpp +1 -1
- package/Microsoft.ReactNative/Fabric/AbiViewProps.cpp +7 -0
- package/Microsoft.ReactNative/Fabric/AbiViewProps.h +2 -0
- package/Microsoft.ReactNative/Fabric/ComponentView.cpp +45 -50
- package/Microsoft.ReactNative/Fabric/ComponentView.h +14 -22
- package/Microsoft.ReactNative/Fabric/Composition/BorderPrimitive.cpp +943 -0
- package/Microsoft.ReactNative/Fabric/Composition/BorderPrimitive.h +80 -0
- package/Microsoft.ReactNative/Fabric/Composition/CompositionDynamicAutomationProvider.cpp +26 -3
- package/Microsoft.ReactNative/Fabric/Composition/CompositionEventHandler.cpp +187 -6
- package/Microsoft.ReactNative/Fabric/Composition/CompositionEventHandler.h +10 -1
- package/Microsoft.ReactNative/Fabric/Composition/CompositionRootAutomationProvider.cpp +8 -32
- package/Microsoft.ReactNative/Fabric/Composition/CompositionViewComponentView.cpp +336 -929
- package/Microsoft.ReactNative/Fabric/Composition/CompositionViewComponentView.h +32 -29
- package/Microsoft.ReactNative/Fabric/Composition/ContentIslandComponentView.cpp +9 -2
- package/Microsoft.ReactNative/Fabric/Composition/ContentIslandComponentView.h +2 -1
- package/Microsoft.ReactNative/Fabric/Composition/DebuggingOverlayComponentView.cpp +1 -1
- package/Microsoft.ReactNative/Fabric/Composition/Modal/WindowsModalHostViewComponentView.cpp +181 -123
- package/Microsoft.ReactNative/Fabric/Composition/Modal/WindowsModalHostViewComponentView.h +16 -8
- package/Microsoft.ReactNative/Fabric/Composition/ReactCompositionViewComponentBuilder.cpp +99 -37
- package/Microsoft.ReactNative/Fabric/Composition/ReactCompositionViewComponentBuilder.h +25 -3
- package/Microsoft.ReactNative/Fabric/Composition/ReactNativeIsland.cpp +63 -2
- package/Microsoft.ReactNative/Fabric/Composition/ReactNativeIsland.h +12 -0
- package/Microsoft.ReactNative/Fabric/Composition/RootComponentView.cpp +51 -3
- package/Microsoft.ReactNative/Fabric/Composition/RootComponentView.h +3 -0
- package/Microsoft.ReactNative/Fabric/Composition/ScrollViewComponentView.cpp +18 -8
- package/Microsoft.ReactNative/Fabric/Composition/ScrollViewComponentView.h +3 -0
- package/Microsoft.ReactNative/Fabric/Composition/TextInput/WindowsTextInputComponentView.cpp +54 -5
- package/Microsoft.ReactNative/Fabric/Composition/TextInput/WindowsTextInputComponentView.h +8 -0
- package/Microsoft.ReactNative/Fabric/Composition/Theme.cpp +9 -3
- package/Microsoft.ReactNative/Fabric/Composition/UiaHelpers.cpp +11 -0
- package/Microsoft.ReactNative/Fabric/Composition/UiaHelpers.h +2 -0
- package/Microsoft.ReactNative/Fabric/Composition/UnimplementedNativeViewComponentView.cpp +1 -1
- package/Microsoft.ReactNative/Fabric/platform/react/renderer/components/view/HostPlatformViewTraitsInitializer.h +1 -5
- package/Microsoft.ReactNative/IReactCompositionViewComponentBuilder.idl +26 -0
- package/Microsoft.ReactNative/IReactViewComponentBuilder.idl +1 -1
- package/Microsoft.ReactNative/ReactNativeIsland.idl +3 -2
- package/Microsoft.ReactNative/ViewProps.idl +2 -0
- package/Microsoft.ReactNative.Cxx/ComponentView.Experimental.interop.h +14 -0
- package/PropertySheets/Generated/PackageVersion.g.props +3 -3
- package/Shared/Shared.vcxitems +3 -0
- package/Shared/Shared.vcxitems.filters +1 -0
- package/codegen/NativeAccessibilityInfoSpec.g.h +1 -0
- package/codegen/NativeAccessibilityManagerSpec.g.h +1 -0
- package/codegen/NativeActionSheetManagerSpec.g.h +1 -0
- package/codegen/NativeAlertManagerSpec.g.h +1 -0
- package/codegen/NativeAnimatedModuleSpec.g.h +1 -0
- package/codegen/NativeAnimatedTurboModuleSpec.g.h +1 -0
- package/codegen/NativeAppStateSpec.g.h +1 -0
- package/codegen/NativeAppThemeSpec.g.h +1 -0
- package/codegen/NativeAppearanceSpec.g.h +1 -0
- package/codegen/NativeBlobModuleSpec.g.h +1 -0
- package/codegen/NativeBugReportingSpec.g.h +1 -0
- package/codegen/NativeClipboardSpec.g.h +1 -0
- package/codegen/NativeDOMSpec.g.h +1 -0
- package/codegen/NativeDevLoadingViewSpec.g.h +1 -0
- package/codegen/NativeDevMenuSpec.g.h +1 -0
- package/codegen/NativeDevSettingsSpec.g.h +1 -0
- package/codegen/NativeDevToolsSettingsManagerSpec.g.h +1 -0
- package/codegen/NativeDeviceEventManagerSpec.g.h +1 -0
- package/codegen/NativeDeviceInfoSpec.g.h +1 -0
- package/codegen/NativeDialogManagerAndroidSpec.g.h +1 -0
- package/codegen/NativeDialogManagerWindowsSpec.g.h +1 -0
- package/codegen/NativeExceptionsManagerSpec.g.h +1 -0
- package/codegen/NativeFileReaderModuleSpec.g.h +1 -0
- package/codegen/NativeFrameRateLoggerSpec.g.h +1 -0
- package/codegen/NativeHeadlessJsTaskSupportSpec.g.h +1 -0
- package/codegen/NativeI18nManagerSpec.g.h +1 -0
- package/codegen/NativeIdleCallbacksSpec.g.h +1 -0
- package/codegen/NativeImageEditorSpec.g.h +1 -0
- package/codegen/NativeImageLoaderAndroidSpec.g.h +1 -0
- package/codegen/NativeImageLoaderIOSSpec.g.h +1 -0
- package/codegen/NativeImageStoreAndroidSpec.g.h +1 -0
- package/codegen/NativeImageStoreIOSSpec.g.h +1 -0
- package/codegen/NativeIntentAndroidSpec.g.h +1 -0
- package/codegen/NativeIntersectionObserverSpec.g.h +1 -0
- package/codegen/NativeJSCHeapCaptureSpec.g.h +1 -0
- package/codegen/NativeJSCSamplingProfilerSpec.g.h +1 -0
- package/codegen/NativeKeyboardObserverSpec.g.h +1 -0
- package/codegen/NativeLinkingManagerSpec.g.h +1 -0
- package/codegen/NativeLogBoxSpec.g.h +1 -0
- package/codegen/NativeMicrotasksSpec.g.h +1 -0
- package/codegen/NativeModalManagerSpec.g.h +1 -0
- package/codegen/NativeMutationObserverSpec.g.h +1 -0
- package/codegen/NativeNetworkingAndroidSpec.g.h +1 -0
- package/codegen/NativeNetworkingIOSSpec.g.h +1 -0
- package/codegen/NativePerformanceObserverSpec.g.h +1 -0
- package/codegen/NativePerformanceSpec.g.h +1 -0
- package/codegen/NativePermissionsAndroidSpec.g.h +1 -0
- package/codegen/NativePlatformConstantsAndroidSpec.g.h +1 -0
- package/codegen/NativePlatformConstantsIOSSpec.g.h +1 -0
- package/codegen/NativePlatformConstantsWindowsSpec.g.h +1 -0
- package/codegen/NativePushNotificationManagerIOSSpec.g.h +1 -0
- package/codegen/NativeReactNativeFeatureFlagsSpec.g.h +1 -0
- package/codegen/NativeRedBoxSpec.g.h +1 -0
- package/codegen/NativeSampleTurboModuleSpec.g.h +1 -0
- package/codegen/NativeSegmentFetcherSpec.g.h +1 -0
- package/codegen/NativeSettingsManagerSpec.g.h +1 -0
- package/codegen/NativeShareModuleSpec.g.h +1 -0
- package/codegen/NativeSoundManagerSpec.g.h +1 -0
- package/codegen/NativeSourceCodeSpec.g.h +1 -0
- package/codegen/NativeStatusBarManagerAndroidSpec.g.h +1 -0
- package/codegen/NativeStatusBarManagerIOSSpec.g.h +1 -0
- package/codegen/NativeTimingSpec.g.h +1 -0
- package/codegen/NativeToastAndroidSpec.g.h +1 -0
- package/codegen/NativeUIManagerSpec.g.h +1 -0
- package/codegen/NativeVibrationSpec.g.h +1 -0
- package/codegen/NativeWebSocketModuleSpec.g.h +1 -0
- package/package.json +12 -12
- package/types/modules/Codegen.d.ts +6 -0
|
@@ -134,65 +134,89 @@ const View: React.AbstractComponent<
|
|
|
134
134
|
};
|
|
135
135
|
}
|
|
136
136
|
|
|
137
|
-
const _keyDown =
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
|
|
137
|
+
const _keyDown =
|
|
138
|
+
otherProps.keyDownEvents || otherProps.onKeyDown
|
|
139
|
+
? (event: KeyEvent) => {
|
|
140
|
+
if (
|
|
141
|
+
otherProps.keyDownEvents &&
|
|
142
|
+
event.isPropagationStopped() !== true
|
|
143
|
+
) {
|
|
144
|
+
// $FlowFixMe - keyDownEvents was already checked to not be undefined
|
|
145
|
+
for (const el of otherProps.keyDownEvents) {
|
|
146
|
+
if (
|
|
147
|
+
event.nativeEvent.code === el.code &&
|
|
148
|
+
el.handledEventPhase === 3
|
|
149
|
+
) {
|
|
150
|
+
event.stopPropagation();
|
|
151
|
+
}
|
|
152
|
+
}
|
|
153
|
+
}
|
|
154
|
+
otherProps.onKeyDown && otherProps.onKeyDown(event);
|
|
146
155
|
}
|
|
147
|
-
|
|
148
|
-
}
|
|
149
|
-
otherProps.onKeyDown && otherProps.onKeyDown(event);
|
|
150
|
-
};
|
|
156
|
+
: undefined;
|
|
151
157
|
|
|
152
|
-
const _keyUp =
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
|
|
156
|
-
|
|
157
|
-
|
|
158
|
-
|
|
159
|
-
|
|
160
|
-
|
|
158
|
+
const _keyUp =
|
|
159
|
+
otherProps.keyUpEvents || otherProps.onKeyUp
|
|
160
|
+
? (event: KeyEvent) => {
|
|
161
|
+
if (
|
|
162
|
+
otherProps.keyUpEvents &&
|
|
163
|
+
event.isPropagationStopped() !== true
|
|
164
|
+
) {
|
|
165
|
+
// $FlowFixMe - keyUpEvents was already checked to not be undefined
|
|
166
|
+
for (const el of otherProps.keyUpEvents) {
|
|
167
|
+
if (
|
|
168
|
+
event.nativeEvent.code === el.code &&
|
|
169
|
+
el.handledEventPhase === 3
|
|
170
|
+
) {
|
|
171
|
+
event.stopPropagation();
|
|
172
|
+
}
|
|
173
|
+
}
|
|
174
|
+
}
|
|
175
|
+
otherProps.onKeyUp && otherProps.onKeyUp(event);
|
|
161
176
|
}
|
|
162
|
-
|
|
163
|
-
}
|
|
164
|
-
otherProps.onKeyUp && otherProps.onKeyUp(event);
|
|
165
|
-
};
|
|
177
|
+
: undefined;
|
|
166
178
|
|
|
167
|
-
const _keyDownCapture =
|
|
168
|
-
|
|
169
|
-
|
|
170
|
-
|
|
171
|
-
|
|
172
|
-
|
|
173
|
-
|
|
174
|
-
|
|
175
|
-
|
|
179
|
+
const _keyDownCapture =
|
|
180
|
+
otherProps.keyDownEvents || otherProps.onKeyDownCapture
|
|
181
|
+
? (event: KeyEvent) => {
|
|
182
|
+
if (
|
|
183
|
+
otherProps.keyDownEvents &&
|
|
184
|
+
event.isPropagationStopped() !== true
|
|
185
|
+
) {
|
|
186
|
+
// $FlowFixMe - keyDownEvents was already checked to not be undefined
|
|
187
|
+
for (const el of otherProps.keyDownEvents) {
|
|
188
|
+
if (
|
|
189
|
+
event.nativeEvent.code === el.code &&
|
|
190
|
+
el.handledEventPhase === 1
|
|
191
|
+
) {
|
|
192
|
+
event.stopPropagation();
|
|
193
|
+
}
|
|
194
|
+
}
|
|
195
|
+
}
|
|
196
|
+
otherProps.onKeyDownCapture && otherProps.onKeyDownCapture(event);
|
|
176
197
|
}
|
|
177
|
-
|
|
178
|
-
}
|
|
179
|
-
otherProps.onKeyDownCapture && otherProps.onKeyDownCapture(event);
|
|
180
|
-
};
|
|
198
|
+
: undefined;
|
|
181
199
|
|
|
182
|
-
const _keyUpCapture =
|
|
183
|
-
|
|
184
|
-
|
|
185
|
-
|
|
186
|
-
|
|
187
|
-
|
|
188
|
-
|
|
189
|
-
|
|
190
|
-
|
|
200
|
+
const _keyUpCapture =
|
|
201
|
+
otherProps.keyUpEvents || otherProps.onKeyUpCapture
|
|
202
|
+
? (event: KeyEvent) => {
|
|
203
|
+
if (
|
|
204
|
+
otherProps.keyUpEvents &&
|
|
205
|
+
event.isPropagationStopped() !== true
|
|
206
|
+
) {
|
|
207
|
+
// $FlowFixMe - keyUpEvents was already checked to not be undefined
|
|
208
|
+
for (const el of otherProps.keyUpEvents) {
|
|
209
|
+
if (
|
|
210
|
+
event.nativeEvent.code === el.code &&
|
|
211
|
+
el.handledEventPhase === 1
|
|
212
|
+
) {
|
|
213
|
+
event.stopPropagation();
|
|
214
|
+
}
|
|
215
|
+
}
|
|
216
|
+
}
|
|
217
|
+
otherProps.onKeyUpCapture && otherProps.onKeyUpCapture(event);
|
|
191
218
|
}
|
|
192
|
-
|
|
193
|
-
}
|
|
194
|
-
otherProps.onKeyUpCapture && otherProps.onKeyUpCapture(event);
|
|
195
|
-
};
|
|
219
|
+
: undefined;
|
|
196
220
|
|
|
197
221
|
// [Windows
|
|
198
222
|
const _focusable = tabIndex !== undefined ? !tabIndex : focusable;
|
|
@@ -21,13 +21,7 @@ ExceptionsManager.installConsoleErrorReporter();
|
|
|
21
21
|
if (!global.__fbDisableExceptionsManager) {
|
|
22
22
|
const handleError = (e: mixed, isFatal: boolean) => {
|
|
23
23
|
try {
|
|
24
|
-
|
|
25
|
-
if (
|
|
26
|
-
!global.RN$handleException ||
|
|
27
|
-
!global.RN$handleException(e, isFatal)
|
|
28
|
-
) {
|
|
29
|
-
ExceptionsManager.handleException(e, isFatal);
|
|
30
|
-
}
|
|
24
|
+
ExceptionsManager.handleException(e, isFatal);
|
|
31
25
|
} catch (ee) {
|
|
32
26
|
console.log('Failed to print error: ', ee.message);
|
|
33
27
|
throw e;
|
|
@@ -82,9 +82,9 @@ let warningFilter: WarningFilter = function (format) {
|
|
|
82
82
|
return {
|
|
83
83
|
finalFormat: format,
|
|
84
84
|
forceDialogImmediately: false,
|
|
85
|
-
suppressDialog_LEGACY:
|
|
85
|
+
suppressDialog_LEGACY: false,
|
|
86
86
|
suppressCompletely: false,
|
|
87
|
-
monitorEvent: '
|
|
87
|
+
monitorEvent: 'warning_unhandled',
|
|
88
88
|
monitorListVersion: 0,
|
|
89
89
|
monitorSampleRate: 1,
|
|
90
90
|
};
|
|
@@ -0,0 +1,352 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Copyright (c) Meta Platforms, Inc. and affiliates.
|
|
3
|
+
*
|
|
4
|
+
* This source code is licensed under the MIT license found in the
|
|
5
|
+
* LICENSE file in the root directory of this source tree.
|
|
6
|
+
*
|
|
7
|
+
* @format
|
|
8
|
+
* @flow strict-local
|
|
9
|
+
*/
|
|
10
|
+
|
|
11
|
+
import type {ViewProps} from '../Components/View/ViewPropTypes';
|
|
12
|
+
import type {RootTag} from '../ReactNative/RootTag';
|
|
13
|
+
import type {DirectEventHandler} from '../Types/CodegenTypes';
|
|
14
|
+
|
|
15
|
+
import NativeEventEmitter from '../EventEmitter/NativeEventEmitter';
|
|
16
|
+
import {type EventSubscription} from '../vendor/emitter/EventEmitter';
|
|
17
|
+
import ModalInjection from './ModalInjection';
|
|
18
|
+
import NativeModalManager from './NativeModalManager';
|
|
19
|
+
import RCTModalHostView from './RCTModalHostViewNativeComponent';
|
|
20
|
+
import {VirtualizedListContextResetter} from '@react-native/virtualized-lists';
|
|
21
|
+
|
|
22
|
+
const ScrollView = require('../Components/ScrollView/ScrollView');
|
|
23
|
+
const View = require('../Components/View/View');
|
|
24
|
+
const AppContainer = require('../ReactNative/AppContainer');
|
|
25
|
+
const I18nManager = require('../ReactNative/I18nManager');
|
|
26
|
+
const {RootTagContext} = require('../ReactNative/RootTag');
|
|
27
|
+
const StyleSheet = require('../StyleSheet/StyleSheet');
|
|
28
|
+
const Platform = require('../Utilities/Platform');
|
|
29
|
+
const React = require('react');
|
|
30
|
+
|
|
31
|
+
type ModalEventDefinitions = {
|
|
32
|
+
modalDismissed: [{modalID: number}],
|
|
33
|
+
};
|
|
34
|
+
|
|
35
|
+
const ModalEventEmitter =
|
|
36
|
+
(Platform.OS === 'ios' || Platform.OS === 'windows') && // [Windows]
|
|
37
|
+
NativeModalManager != null
|
|
38
|
+
? new NativeEventEmitter<ModalEventDefinitions>(
|
|
39
|
+
// T88715063: NativeEventEmitter only used this parameter on iOS. Now it uses it on all platforms, so this code was modified automatically to preserve its behavior
|
|
40
|
+
// If you want to use the native module on other platforms, please remove this condition and test its behavior
|
|
41
|
+
Platform.OS !== 'ios' && Platform.OS !== 'windows' // [Windows]
|
|
42
|
+
? null
|
|
43
|
+
: NativeModalManager,
|
|
44
|
+
)
|
|
45
|
+
: null;
|
|
46
|
+
|
|
47
|
+
/**
|
|
48
|
+
* The Modal component is a simple way to present content above an enclosing view.
|
|
49
|
+
*
|
|
50
|
+
* See https://reactnative.dev/docs/modal
|
|
51
|
+
*/
|
|
52
|
+
|
|
53
|
+
// In order to route onDismiss callbacks, we need to uniquely identifier each
|
|
54
|
+
// <Modal> on screen. There can be different ones, either nested or as siblings.
|
|
55
|
+
// We cannot pass the onDismiss callback to native as the view will be
|
|
56
|
+
// destroyed before the callback is fired.
|
|
57
|
+
let uniqueModalIdentifier = 0;
|
|
58
|
+
|
|
59
|
+
type OrientationChangeEvent = $ReadOnly<{|
|
|
60
|
+
orientation: 'portrait' | 'landscape',
|
|
61
|
+
|}>;
|
|
62
|
+
|
|
63
|
+
export type Props = $ReadOnly<{|
|
|
64
|
+
...ViewProps,
|
|
65
|
+
|
|
66
|
+
/**
|
|
67
|
+
* The `animationType` prop controls how the modal animates.
|
|
68
|
+
*
|
|
69
|
+
* See https://reactnative.dev/docs/modal#animationtype
|
|
70
|
+
*/
|
|
71
|
+
animationType?: ?('none' | 'slide' | 'fade'),
|
|
72
|
+
|
|
73
|
+
/**
|
|
74
|
+
* The `presentationStyle` prop controls how the modal appears.
|
|
75
|
+
*
|
|
76
|
+
* See https://reactnative.dev/docs/modal#presentationstyle
|
|
77
|
+
*/
|
|
78
|
+
presentationStyle?: ?(
|
|
79
|
+
| 'fullScreen'
|
|
80
|
+
| 'pageSheet'
|
|
81
|
+
| 'formSheet'
|
|
82
|
+
| 'overFullScreen'
|
|
83
|
+
),
|
|
84
|
+
|
|
85
|
+
/**
|
|
86
|
+
* The `transparent` prop determines whether your modal will fill the
|
|
87
|
+
* entire view.
|
|
88
|
+
*
|
|
89
|
+
* See https://reactnative.dev/docs/modal#transparent
|
|
90
|
+
*/
|
|
91
|
+
transparent?: ?boolean,
|
|
92
|
+
|
|
93
|
+
/**
|
|
94
|
+
* The `statusBarTranslucent` prop determines whether your modal should go under
|
|
95
|
+
* the system statusbar.
|
|
96
|
+
*
|
|
97
|
+
* See https://reactnative.dev/docs/modal.html#statusbartranslucent-android
|
|
98
|
+
*/
|
|
99
|
+
statusBarTranslucent?: ?boolean,
|
|
100
|
+
|
|
101
|
+
/**
|
|
102
|
+
* The `hardwareAccelerated` prop controls whether to force hardware
|
|
103
|
+
* acceleration for the underlying window.
|
|
104
|
+
*
|
|
105
|
+
* This prop works only on Android.
|
|
106
|
+
*
|
|
107
|
+
* See https://reactnative.dev/docs/modal#hardwareaccelerated
|
|
108
|
+
*/
|
|
109
|
+
hardwareAccelerated?: ?boolean,
|
|
110
|
+
|
|
111
|
+
/**
|
|
112
|
+
* The `visible` prop determines whether your modal is visible.
|
|
113
|
+
*
|
|
114
|
+
* See https://reactnative.dev/docs/modal#visible
|
|
115
|
+
*/
|
|
116
|
+
visible?: ?boolean,
|
|
117
|
+
|
|
118
|
+
/**
|
|
119
|
+
* The `onRequestClose` callback is called when the user taps the hardware
|
|
120
|
+
* back button on Android or the menu button on Apple TV.
|
|
121
|
+
*
|
|
122
|
+
* This is required on Apple TV and Android.
|
|
123
|
+
*
|
|
124
|
+
* See https://reactnative.dev/docs/modal#onrequestclose
|
|
125
|
+
*/
|
|
126
|
+
onRequestClose?: ?DirectEventHandler<null>,
|
|
127
|
+
|
|
128
|
+
/**
|
|
129
|
+
* The `onShow` prop allows passing a function that will be called once the
|
|
130
|
+
* modal has been shown.
|
|
131
|
+
*
|
|
132
|
+
* See https://reactnative.dev/docs/modal#onshow
|
|
133
|
+
*/
|
|
134
|
+
onShow?: ?DirectEventHandler<null>,
|
|
135
|
+
|
|
136
|
+
/**
|
|
137
|
+
* The `onDismiss` prop allows passing a function that will be called once
|
|
138
|
+
* the modal has been dismissed.
|
|
139
|
+
*
|
|
140
|
+
* See https://reactnative.dev/docs/modal#ondismiss
|
|
141
|
+
*/
|
|
142
|
+
onDismiss?: ?() => mixed,
|
|
143
|
+
|
|
144
|
+
/**
|
|
145
|
+
* The `supportedOrientations` prop allows the modal to be rotated to any of the specified orientations.
|
|
146
|
+
*
|
|
147
|
+
* See https://reactnative.dev/docs/modal#supportedorientations
|
|
148
|
+
*/
|
|
149
|
+
supportedOrientations?: ?$ReadOnlyArray<
|
|
150
|
+
| 'portrait'
|
|
151
|
+
| 'portrait-upside-down'
|
|
152
|
+
| 'landscape'
|
|
153
|
+
| 'landscape-left'
|
|
154
|
+
| 'landscape-right',
|
|
155
|
+
>,
|
|
156
|
+
|
|
157
|
+
/**
|
|
158
|
+
* The `onOrientationChange` callback is called when the orientation changes while the modal is being displayed.
|
|
159
|
+
*
|
|
160
|
+
* See https://reactnative.dev/docs/modal#onorientationchange
|
|
161
|
+
*/
|
|
162
|
+
onOrientationChange?: ?DirectEventHandler<OrientationChangeEvent>,
|
|
163
|
+
|
|
164
|
+
/**
|
|
165
|
+
* The `backdropColor` props sets the background color of the modal's container.
|
|
166
|
+
* Defaults to `white` if not provided and transparent is `false`. Ignored if `transparent` is `true`.
|
|
167
|
+
*/
|
|
168
|
+
backdropColor?: ?string,
|
|
169
|
+
|}>;
|
|
170
|
+
|
|
171
|
+
function confirmProps(props: Props) {
|
|
172
|
+
if (__DEV__) {
|
|
173
|
+
if (
|
|
174
|
+
props.presentationStyle &&
|
|
175
|
+
props.presentationStyle !== 'overFullScreen' &&
|
|
176
|
+
props.transparent === true
|
|
177
|
+
) {
|
|
178
|
+
console.warn(
|
|
179
|
+
`Modal with '${props.presentationStyle}' presentation style and 'transparent' value is not supported.`,
|
|
180
|
+
);
|
|
181
|
+
}
|
|
182
|
+
}
|
|
183
|
+
}
|
|
184
|
+
|
|
185
|
+
// Create a state to track whether the Modal is rendering or not.
|
|
186
|
+
// This is the only prop that controls whether the modal is rendered or not.
|
|
187
|
+
type State = {
|
|
188
|
+
isRendered: boolean,
|
|
189
|
+
};
|
|
190
|
+
|
|
191
|
+
class Modal extends React.Component<Props, State> {
|
|
192
|
+
static defaultProps: {|hardwareAccelerated: boolean, visible: boolean|} = {
|
|
193
|
+
visible: true,
|
|
194
|
+
hardwareAccelerated: false,
|
|
195
|
+
};
|
|
196
|
+
|
|
197
|
+
static contextType: React.Context<RootTag> = RootTagContext;
|
|
198
|
+
|
|
199
|
+
_identifier: number;
|
|
200
|
+
_eventSubscription: ?EventSubscription;
|
|
201
|
+
|
|
202
|
+
constructor(props: Props) {
|
|
203
|
+
super(props);
|
|
204
|
+
if (__DEV__) {
|
|
205
|
+
confirmProps(props);
|
|
206
|
+
}
|
|
207
|
+
this._identifier = uniqueModalIdentifier++;
|
|
208
|
+
this.state = {
|
|
209
|
+
isRendered: props.visible === true,
|
|
210
|
+
};
|
|
211
|
+
}
|
|
212
|
+
|
|
213
|
+
componentDidMount() {
|
|
214
|
+
// 'modalDismissed' is for the old renderer in iOS only
|
|
215
|
+
if (ModalEventEmitter) {
|
|
216
|
+
this._eventSubscription = ModalEventEmitter.addListener(
|
|
217
|
+
'modalDismissed',
|
|
218
|
+
event => {
|
|
219
|
+
this.setState({isRendered: false}, () => {
|
|
220
|
+
if (event.modalID === this._identifier && this.props.onDismiss) {
|
|
221
|
+
this.props.onDismiss();
|
|
222
|
+
}
|
|
223
|
+
});
|
|
224
|
+
},
|
|
225
|
+
);
|
|
226
|
+
}
|
|
227
|
+
}
|
|
228
|
+
|
|
229
|
+
componentWillUnmount() {
|
|
230
|
+
if (this._eventSubscription) {
|
|
231
|
+
this._eventSubscription.remove();
|
|
232
|
+
}
|
|
233
|
+
}
|
|
234
|
+
|
|
235
|
+
componentDidUpdate(prevProps: Props) {
|
|
236
|
+
if (prevProps.visible === false && this.props.visible === true) {
|
|
237
|
+
this.setState({isRendered: true});
|
|
238
|
+
}
|
|
239
|
+
|
|
240
|
+
if (__DEV__) {
|
|
241
|
+
confirmProps(this.props);
|
|
242
|
+
}
|
|
243
|
+
}
|
|
244
|
+
|
|
245
|
+
// Helper function to encapsulate platform specific logic to show or not the Modal.
|
|
246
|
+
_shouldShowModal(): boolean {
|
|
247
|
+
if (Platform.OS === 'ios' || Platform.OS === 'windows') {
|
|
248
|
+
// [Windows]
|
|
249
|
+
return this.props.visible === true || this.state.isRendered === true;
|
|
250
|
+
}
|
|
251
|
+
|
|
252
|
+
return this.props.visible === true;
|
|
253
|
+
}
|
|
254
|
+
|
|
255
|
+
render(): React.Node {
|
|
256
|
+
if (!this._shouldShowModal()) {
|
|
257
|
+
return null;
|
|
258
|
+
}
|
|
259
|
+
|
|
260
|
+
const containerStyles = {
|
|
261
|
+
backgroundColor:
|
|
262
|
+
this.props.transparent === true
|
|
263
|
+
? 'transparent'
|
|
264
|
+
: this.props.backdropColor ?? 'white',
|
|
265
|
+
};
|
|
266
|
+
|
|
267
|
+
let animationType = this.props.animationType || 'none';
|
|
268
|
+
|
|
269
|
+
let presentationStyle = this.props.presentationStyle;
|
|
270
|
+
if (!presentationStyle) {
|
|
271
|
+
presentationStyle = 'fullScreen';
|
|
272
|
+
if (this.props.transparent === true) {
|
|
273
|
+
presentationStyle = 'overFullScreen';
|
|
274
|
+
}
|
|
275
|
+
}
|
|
276
|
+
|
|
277
|
+
const innerChildren = __DEV__ ? (
|
|
278
|
+
<AppContainer rootTag={this.context}>{this.props.children}</AppContainer>
|
|
279
|
+
) : (
|
|
280
|
+
this.props.children
|
|
281
|
+
);
|
|
282
|
+
|
|
283
|
+
const onDismiss = () => {
|
|
284
|
+
// OnDismiss is implemented on iOS/Windows only. // [Windows]
|
|
285
|
+
if (Platform.OS === 'ios' || Platform.OS === 'windows') {
|
|
286
|
+
// [Windows]
|
|
287
|
+
this.setState({isRendered: false}, () => {
|
|
288
|
+
if (this.props.onDismiss) {
|
|
289
|
+
this.props.onDismiss();
|
|
290
|
+
}
|
|
291
|
+
});
|
|
292
|
+
}
|
|
293
|
+
};
|
|
294
|
+
|
|
295
|
+
return (
|
|
296
|
+
<RCTModalHostView
|
|
297
|
+
animationType={animationType}
|
|
298
|
+
presentationStyle={presentationStyle}
|
|
299
|
+
transparent={this.props.transparent}
|
|
300
|
+
hardwareAccelerated={this.props.hardwareAccelerated}
|
|
301
|
+
onRequestClose={this.props.onRequestClose}
|
|
302
|
+
onShow={this.props.onShow}
|
|
303
|
+
onDismiss={onDismiss}
|
|
304
|
+
visible={this.props.visible}
|
|
305
|
+
statusBarTranslucent={this.props.statusBarTranslucent}
|
|
306
|
+
identifier={this._identifier}
|
|
307
|
+
style={styles.modal}
|
|
308
|
+
// $FlowFixMe[method-unbinding] added when improving typing for this parameters
|
|
309
|
+
onStartShouldSetResponder={this._shouldSetResponder}
|
|
310
|
+
supportedOrientations={this.props.supportedOrientations}
|
|
311
|
+
onOrientationChange={this.props.onOrientationChange}
|
|
312
|
+
testID={this.props.testID}>
|
|
313
|
+
<VirtualizedListContextResetter>
|
|
314
|
+
<ScrollView.Context.Provider value={null}>
|
|
315
|
+
<View
|
|
316
|
+
style={[styles.container, containerStyles]}
|
|
317
|
+
collapsable={false}>
|
|
318
|
+
{innerChildren}
|
|
319
|
+
</View>
|
|
320
|
+
</ScrollView.Context.Provider>
|
|
321
|
+
</VirtualizedListContextResetter>
|
|
322
|
+
</RCTModalHostView>
|
|
323
|
+
);
|
|
324
|
+
}
|
|
325
|
+
|
|
326
|
+
// We don't want any responder events bubbling out of the modal.
|
|
327
|
+
_shouldSetResponder(): boolean {
|
|
328
|
+
return true;
|
|
329
|
+
}
|
|
330
|
+
}
|
|
331
|
+
|
|
332
|
+
const side = I18nManager.getConstants().isRTL ? 'right' : 'left';
|
|
333
|
+
const styles = StyleSheet.create({
|
|
334
|
+
modal: {
|
|
335
|
+
position: 'absolute',
|
|
336
|
+
},
|
|
337
|
+
container: {
|
|
338
|
+
/* $FlowFixMe[invalid-computed-prop] (>=0.111.0 site=react_native_fb) This
|
|
339
|
+
* comment suppresses an error found when Flow v0.111 was deployed. To see
|
|
340
|
+
* the error, delete this comment and run Flow. */
|
|
341
|
+
[side]: 0,
|
|
342
|
+
top: 0,
|
|
343
|
+
flex: 1,
|
|
344
|
+
},
|
|
345
|
+
});
|
|
346
|
+
|
|
347
|
+
const ExportedModal: React.AbstractComponent<
|
|
348
|
+
React.ElementConfig<typeof Modal>,
|
|
349
|
+
// $FlowFixMe[incompatible-type-arg]
|
|
350
|
+
> = ModalInjection.unstable_Modal ?? Modal;
|
|
351
|
+
|
|
352
|
+
module.exports = ExportedModal;
|
|
@@ -13,7 +13,7 @@ import type {RootTag} from '../Types/RootTagTypes';
|
|
|
13
13
|
import type {IPerformanceLogger} from '../Utilities/createPerformanceLogger';
|
|
14
14
|
import type {DisplayModeType} from './DisplayMode';
|
|
15
15
|
|
|
16
|
-
import
|
|
16
|
+
import registerCallableModule from '../Core/registerCallableModule';
|
|
17
17
|
import BugReporting from '../BugReporting/BugReporting';
|
|
18
18
|
import createPerformanceLogger from '../Utilities/createPerformanceLogger';
|
|
19
19
|
import infoLog from '../Utilities/infoLog';
|
|
@@ -363,8 +363,8 @@ global.RN$SurfaceRegistry = {
|
|
|
363
363
|
|
|
364
364
|
if (global.RN$Bridgeless === true) {
|
|
365
365
|
console.log('Bridgeless mode is enabled');
|
|
366
|
-
} else {
|
|
367
|
-
BatchedBridge.registerCallableModule('AppRegistry', AppRegistry);
|
|
368
366
|
}
|
|
369
367
|
|
|
368
|
+
registerCallableModule('AppRegistry', AppRegistry);
|
|
369
|
+
|
|
370
370
|
module.exports = AppRegistry;
|
|
@@ -324,7 +324,7 @@ const Text: React.AbstractComponent<TextProps, TextForwardRef> =
|
|
|
324
324
|
|
|
325
325
|
// [Windows
|
|
326
326
|
// $FlowFixMe[unclear-type]
|
|
327
|
-
let styleProps: ViewStyleProp = (
|
|
327
|
+
let styleProps: ViewStyleProp = (processedStyle: any); // Flow style type casting
|
|
328
328
|
if (
|
|
329
329
|
global.RN$Bridgeless !== true && // [Windows] Fabric text handles borders, but on paper we need to wrap it in an extra view
|
|
330
330
|
styleProps &&
|
|
@@ -22,8 +22,9 @@ namespace Microsoft.ReactNative.Composition
|
|
|
22
22
|
NativeBorder = 0x00000001,
|
|
23
23
|
ShadowProps = 0x00000002,
|
|
24
24
|
Background = 0x00000004,
|
|
25
|
+
FocusVisual = 0x00000008,
|
|
25
26
|
|
|
26
|
-
Default =
|
|
27
|
+
Default = 0x0000000F, // ShadowProps | NativeBorder | Background | FocusVisual
|
|
27
28
|
};
|
|
28
29
|
|
|
29
30
|
namespace Experimental {
|
|
@@ -106,7 +106,10 @@ facebook::react::Props::Shared AbiComponentDescriptor::cloneProps(
|
|
|
106
106
|
rawProps);
|
|
107
107
|
auto userProps =
|
|
108
108
|
winrt::get_self<winrt::Microsoft::ReactNative::Composition::ReactCompositionViewComponentBuilder>(m_builder)
|
|
109
|
-
->CreateProps(
|
|
109
|
+
->CreateProps(
|
|
110
|
+
nullptr,
|
|
111
|
+
props ? static_cast<winrt::Microsoft::ReactNative::implementation::AbiProps const &>(*props).UserProps()
|
|
112
|
+
: nullptr);
|
|
110
113
|
shadowNodeProps->SetUserProps(userProps);
|
|
111
114
|
|
|
112
115
|
const auto &dynamic = static_cast<folly::dynamic>(rawProps);
|
|
@@ -103,7 +103,7 @@ facebook::react::Props::Shared AbiViewComponentDescriptor::cloneProps(
|
|
|
103
103
|
winrt::make<winrt::Microsoft::ReactNative::implementation::ViewProps>(shadowNodeProps, false /*holdRef*/);
|
|
104
104
|
auto userProps =
|
|
105
105
|
winrt::get_self<winrt::Microsoft::ReactNative::Composition::ReactCompositionViewComponentBuilder>(m_builder)
|
|
106
|
-
->CreateProps(viewProps);
|
|
106
|
+
->CreateProps(viewProps, props ? static_cast<AbiViewProps const &>(*props).UserProps() : nullptr);
|
|
107
107
|
shadowNodeProps->SetUserProps(userProps, viewProps);
|
|
108
108
|
|
|
109
109
|
const auto &dynamic = static_cast<folly::dynamic>(rawProps);
|
|
@@ -65,6 +65,13 @@ winrt::Microsoft::ReactNative::Composition::Experimental::IBrush Color::AsIntern
|
|
|
65
65
|
return winrt::get_self<winrt::Microsoft::ReactNative::Composition::implementation::Theme>(theme)->Brush(*m_color);
|
|
66
66
|
}
|
|
67
67
|
|
|
68
|
+
bool Color::Equals(const winrt::Microsoft::ReactNative::Color &color) const noexcept {
|
|
69
|
+
if (!color) {
|
|
70
|
+
return false;
|
|
71
|
+
}
|
|
72
|
+
return m_color == winrt::get_self<Color>(color)->m_color;
|
|
73
|
+
}
|
|
74
|
+
|
|
68
75
|
winrt::Microsoft::ReactNative::Color Color::ReadValue(
|
|
69
76
|
const winrt::Microsoft::ReactNative::IJSValueReader &reader) noexcept {
|
|
70
77
|
switch (reader.ValueType()) {
|
|
@@ -50,6 +50,8 @@ struct Color : ColorT<Color, Composition::Experimental::IInternalColor> {
|
|
|
50
50
|
winrt::Microsoft::ReactNative::Composition::Experimental::IBrush AsInternalBrush(
|
|
51
51
|
const winrt::Microsoft::ReactNative::Composition::Theme theme) noexcept;
|
|
52
52
|
|
|
53
|
+
bool Equals(const winrt::Microsoft::ReactNative::Color &color) const noexcept;
|
|
54
|
+
|
|
53
55
|
static winrt::Microsoft::ReactNative::Color ReadValue(
|
|
54
56
|
const winrt::Microsoft::ReactNative::IJSValueReader &reader) noexcept;
|
|
55
57
|
static void WriteValue(
|