react-native-windows 0.70.9 → 0.71.0-preview.2
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/.flowconfig +3 -6
- package/Directory.Build.props +2 -2
- package/Folly/Folly.vcxproj +4 -2
- package/Folly/Folly.vcxproj.filters +7 -3
- package/Folly/TEMP_UntilFollyUpdate/dynamic-inl.h +59 -43
- package/Folly/TEMP_UntilFollyUpdate/lang/SafeAssert.h +192 -0
- package/Folly/TEMP_UntilFollyUpdate/lang/ToAscii.cpp +7 -5
- package/Folly/cgmanifest.json +2 -1
- package/Libraries/ActionSheetIOS/ActionSheetIOS.d.ts +80 -0
- package/Libraries/ActionSheetIOS/ActionSheetIOS.js +4 -3
- package/Libraries/ActionSheetIOS/NativeActionSheetManager.js +1 -0
- package/Libraries/Alert/Alert.d.ts +90 -0
- package/Libraries/Alert/Alert.js +7 -1
- package/Libraries/Alert/Alert.windows.js +2 -1
- package/Libraries/Alert/NativeAlertManager.js +2 -0
- package/Libraries/Alert/RCTAlertManager.ios.js +2 -1
- package/Libraries/Animated/Animated.d.ts +587 -0
- package/Libraries/Animated/Animated.js +13 -11
- package/Libraries/Animated/AnimatedEvent.js +12 -17
- package/Libraries/Animated/AnimatedImplementation.js +21 -23
- package/Libraries/Animated/AnimatedMock.js +11 -13
- package/Libraries/Animated/AnimatedWeb.js +2 -2
- package/Libraries/Animated/Easing.d.ts +37 -0
- package/Libraries/Animated/Easing.js +2 -2
- package/Libraries/Animated/NativeAnimatedHelper.js +32 -22
- package/Libraries/Animated/NativeAnimatedModule.js +1 -0
- package/Libraries/Animated/NativeAnimatedTurboModule.js +1 -0
- package/Libraries/Animated/SpringConfig.js +2 -7
- package/Libraries/Animated/animations/Animation.js +3 -4
- package/Libraries/Animated/animations/DecayAnimation.js +5 -8
- package/Libraries/Animated/animations/SpringAnimation.js +9 -14
- package/Libraries/Animated/animations/TimingAnimation.js +9 -13
- package/Libraries/Animated/bezier.js +2 -2
- package/Libraries/Animated/components/AnimatedFlatList.js +5 -6
- package/Libraries/Animated/components/AnimatedImage.js +5 -6
- package/Libraries/Animated/components/AnimatedScrollView.js +110 -14
- package/Libraries/Animated/components/AnimatedSectionList.js +4 -5
- package/Libraries/Animated/components/AnimatedText.js +5 -6
- package/Libraries/Animated/components/AnimatedView.js +5 -6
- package/Libraries/Animated/createAnimatedComponent.js +13 -20
- package/Libraries/Animated/createAnimatedComponent_EXPERIMENTAL.js +2 -2
- package/Libraries/Animated/nodes/AnimatedAddition.js +6 -8
- package/Libraries/Animated/nodes/AnimatedColor.js +7 -7
- package/Libraries/Animated/nodes/AnimatedDiffClamp.js +6 -8
- package/Libraries/Animated/nodes/AnimatedDivision.js +7 -9
- package/Libraries/Animated/nodes/AnimatedInterpolation.js +7 -10
- package/Libraries/Animated/nodes/AnimatedModulo.js +6 -8
- package/Libraries/Animated/nodes/AnimatedMultiplication.js +7 -9
- package/Libraries/Animated/nodes/AnimatedNode.js +10 -8
- package/Libraries/Animated/nodes/AnimatedProps.js +12 -30
- package/Libraries/Animated/nodes/AnimatedStyle.js +12 -22
- package/Libraries/Animated/nodes/AnimatedSubtraction.js +7 -9
- package/Libraries/Animated/nodes/AnimatedTracking.js +8 -12
- package/Libraries/Animated/nodes/AnimatedTransform.js +38 -31
- package/Libraries/Animated/nodes/AnimatedValue.js +9 -10
- package/Libraries/Animated/nodes/AnimatedValueXY.js +4 -7
- package/Libraries/Animated/nodes/AnimatedWithChildren.js +4 -5
- package/Libraries/Animated/useAnimatedProps.js +8 -16
- package/Libraries/Animated/useAnimatedValue.d.ts +15 -0
- package/Libraries/Animated/useAnimatedValue.js +25 -0
- package/Libraries/AppState/AppState.d.ts +58 -0
- package/Libraries/AppState/AppState.js +3 -7
- package/Libraries/AppState/NativeAppState.js +1 -0
- package/Libraries/BatchedBridge/MessageQueue.js +9 -5
- package/Libraries/BatchedBridge/NativeModules.d.ts +25 -0
- package/Libraries/BatchedBridge/NativeModules.js +1 -0
- package/Libraries/Blob/BlobManager.js +5 -3
- package/Libraries/Blob/File.js +2 -3
- package/Libraries/Blob/FileReader.js +6 -5
- package/Libraries/Blob/NativeBlobModule.js +1 -0
- package/Libraries/Blob/NativeFileReaderModule.js +1 -0
- package/Libraries/Blob/URL.js +11 -9
- package/Libraries/BugReporting/NativeBugReporting.js +1 -0
- package/Libraries/BugReporting/getReactData.js +1 -1
- package/Libraries/Components/AccessibilityInfo/AccessibilityInfo.d.ts +128 -0
- package/Libraries/Components/AccessibilityInfo/AccessibilityInfo.flow.js +208 -0
- package/Libraries/Components/AccessibilityInfo/AccessibilityInfo.js +40 -8
- package/Libraries/Components/AccessibilityInfo/AccessibilityInfo.windows.js +40 -8
- package/Libraries/Components/AccessibilityInfo/NativeAccessibilityInfo.js +1 -0
- package/Libraries/Components/AccessibilityInfo/NativeAccessibilityManager.js +5 -0
- package/Libraries/Components/ActivityIndicator/ActivityIndicator.d.ts +86 -0
- package/Libraries/Components/ActivityIndicator/ActivityIndicator.flow.js +58 -0
- package/Libraries/Components/ActivityIndicator/ActivityIndicator.js +7 -8
- package/Libraries/Components/ActivityIndicator/ActivityIndicatorViewNativeComponent.js +2 -3
- package/Libraries/Components/Button.d.ts +42 -0
- package/Libraries/Components/Button.flow.js +265 -0
- package/Libraries/Components/Button.js +62 -18
- package/Libraries/Components/Button.windows.js +62 -18
- package/Libraries/Components/Clipboard/Clipboard.d.ts +28 -0
- package/Libraries/Components/Clipboard/NativeClipboard.js +1 -0
- package/Libraries/Components/DatePicker/DatePickerIOS.android.js +4 -2
- package/Libraries/Components/DatePicker/DatePickerIOS.d.ts +92 -0
- package/Libraries/Components/{MaskedView/MaskedViewIOS.android.js → DatePicker/DatePickerIOS.flow.android.js} +3 -2
- package/Libraries/Components/DatePicker/DatePickerIOS.flow.ios.js +113 -0
- package/Libraries/Components/DatePicker/DatePickerIOS.ios.js +8 -7
- package/Libraries/Components/DatePicker/DatePickerIOS.windows.js +4 -2
- package/Libraries/Components/DatePicker/RCTDatePickerNativeComponent.js +7 -6
- package/Libraries/Components/DatePickerAndroid/NativeDatePickerAndroid.js +1 -0
- package/Libraries/Components/DrawerAndroid/AndroidDrawerLayoutNativeComponent.js +9 -8
- package/Libraries/Components/DrawerAndroid/DrawerLayoutAndroid.android.js +13 -14
- package/Libraries/Components/DrawerAndroid/DrawerLayoutAndroid.d.ts +141 -0
- package/Libraries/Components/Keyboard/Keyboard.d.ts +109 -0
- package/Libraries/Components/Keyboard/Keyboard.js +35 -8
- package/Libraries/Components/Keyboard/KeyboardAvoidingView.d.ts +46 -0
- package/Libraries/Components/Keyboard/KeyboardAvoidingView.js +35 -15
- package/Libraries/Components/Keyboard/NativeKeyboardObserver.js +1 -0
- package/Libraries/Components/Popup/PopupProps.d.ts +1 -0
- package/Libraries/Components/Popup/PopupProps.js.map +1 -1
- package/Libraries/Components/Pressable/Pressable.d.ts +167 -0
- package/Libraries/Components/Pressable/Pressable.js +73 -15
- package/Libraries/Components/Pressable/Pressable.windows.js +78 -20
- package/Libraries/Components/Pressable/useAndroidRippleForView.js +6 -3
- package/Libraries/Components/ProgressBarAndroid/ProgressBarAndroid.android.js +3 -3
- package/Libraries/Components/ProgressBarAndroid/ProgressBarAndroid.d.ts +83 -0
- package/Libraries/Components/ProgressBarAndroid/ProgressBarAndroidNativeComponent.js +2 -2
- package/Libraries/Components/ProgressViewIOS/ProgressViewIOS.android.js +1 -1
- package/Libraries/Components/ProgressViewIOS/ProgressViewIOS.d.ts +62 -0
- package/Libraries/Components/ProgressViewIOS/ProgressViewIOS.ios.js +4 -4
- package/Libraries/Components/ProgressViewIOS/ProgressViewIOS.windows.js +1 -1
- package/Libraries/Components/ProgressViewIOS/RCTProgressViewNativeComponent.js +2 -2
- package/Libraries/Components/RefreshControl/AndroidSwipeRefreshLayoutNativeComponent.js +5 -6
- package/Libraries/Components/RefreshControl/PullToRefreshViewNativeComponent.js +4 -4
- package/Libraries/Components/RefreshControl/RefreshControl.d.ts +87 -0
- package/Libraries/Components/RefreshControl/RefreshControl.js +4 -3
- package/Libraries/Components/RefreshControl/RefreshControl.windows.js +4 -3
- package/Libraries/Components/RefreshControl/__mocks__/RefreshControlMock.js +2 -3
- package/Libraries/Components/SafeAreaView/RCTSafeAreaViewNativeComponent.js +1 -1
- package/Libraries/Components/SafeAreaView/SafeAreaView.d.ts +24 -0
- package/Libraries/Components/SafeAreaView/SafeAreaView.flow.js +19 -0
- package/Libraries/Components/SafeAreaView/SafeAreaView.js +5 -4
- package/Libraries/Components/SafeAreaView/SafeAreaView.windows.js +5 -4
- package/Libraries/Components/ScrollView/AndroidHorizontalScrollContentViewNativeComponent.js +2 -1
- package/Libraries/Components/ScrollView/AndroidHorizontalScrollViewNativeComponent.js +2 -1
- package/Libraries/Components/ScrollView/ScrollContentViewNativeComponent.js +2 -1
- package/Libraries/Components/ScrollView/ScrollView.d.ts +911 -0
- package/Libraries/Components/ScrollView/ScrollView.js +87 -52
- package/Libraries/Components/ScrollView/ScrollViewCommands.js +3 -3
- package/Libraries/Components/ScrollView/ScrollViewNativeComponent.js +2 -1
- package/Libraries/Components/ScrollView/ScrollViewNativeComponentType.js +3 -3
- package/Libraries/Components/ScrollView/ScrollViewStickyHeader.js +243 -269
- package/Libraries/Components/Slider/Slider.d.ts +132 -0
- package/Libraries/Components/Slider/Slider.js +9 -9
- package/Libraries/Components/Slider/SliderNativeComponent.js +4 -5
- package/Libraries/Components/Sound/NativeSoundManager.js +1 -0
- package/Libraries/Components/StatusBar/NativeStatusBarManagerAndroid.js +1 -0
- package/Libraries/Components/StatusBar/NativeStatusBarManagerIOS.js +1 -0
- package/Libraries/Components/StatusBar/StatusBar.d.ts +138 -0
- package/Libraries/Components/StatusBar/StatusBar.js +7 -7
- package/Libraries/Components/Switch/AndroidSwitchNativeComponent.js +10 -10
- package/Libraries/Components/Switch/Switch.d.ts +115 -0
- package/Libraries/Components/Switch/Switch.js +7 -7
- package/Libraries/Components/Switch/SwitchNativeComponent.js +9 -4
- package/Libraries/Components/TextInput/AndroidTextInputNativeComponent.js +40 -12
- package/Libraries/Components/TextInput/InputAccessoryView.d.ts +34 -0
- package/Libraries/Components/TextInput/InputAccessoryView.js +3 -4
- package/Libraries/Components/TextInput/RCTInputAccessoryViewNativeComponent.js +1 -1
- package/Libraries/Components/TextInput/RCTMultilineTextInputNativeComponent.js +3 -2
- package/Libraries/Components/TextInput/RCTSingelineTextInputNativeComponent.js +3 -2
- package/Libraries/Components/TextInput/RCTTextInputViewConfig.js +3 -1
- package/Libraries/Components/TextInput/TextInput.d.ts +840 -0
- package/Libraries/Components/TextInput/TextInput.flow.js +1057 -0
- package/Libraries/Components/TextInput/TextInput.js +344 -38
- package/Libraries/Components/TextInput/TextInput.windows.js +348 -38
- package/Libraries/Components/TextInput/TextInputNativeCommands.js +2 -2
- package/Libraries/Components/TextInput/TextInputState.js +22 -5
- package/Libraries/Components/TextInput/TextInputState.windows.js +22 -5
- package/Libraries/Components/ToastAndroid/NativeToastAndroid.js +1 -0
- package/Libraries/Components/ToastAndroid/ToastAndroid.d.ts +47 -0
- package/Libraries/Components/Touchable/Touchable.d.ts +90 -0
- package/Libraries/Components/Touchable/Touchable.flow.js +258 -0
- package/Libraries/Components/Touchable/Touchable.js +12 -12
- package/Libraries/Components/Touchable/Touchable.windows.js +12 -12
- package/Libraries/Components/Touchable/TouchableBounce.js +44 -10
- package/Libraries/Components/Touchable/TouchableHighlight.d.ts +68 -0
- package/Libraries/Components/Touchable/TouchableHighlight.js +32 -9
- package/Libraries/Components/Touchable/TouchableHighlight.windows.js +32 -9
- package/Libraries/Components/Touchable/TouchableNativeFeedback.d.ts +114 -0
- package/Libraries/Components/Touchable/TouchableNativeFeedback.js +54 -20
- package/Libraries/Components/Touchable/TouchableOpacity.d.ts +109 -0
- package/Libraries/Components/Touchable/TouchableOpacity.js +54 -16
- package/Libraries/Components/Touchable/TouchableOpacity.windows.js +54 -16
- package/Libraries/Components/Touchable/TouchableWithoutFeedback.d.ts +143 -0
- package/Libraries/Components/Touchable/TouchableWithoutFeedback.js +64 -10
- package/Libraries/Components/Touchable/TouchableWithoutFeedback.windows.js +64 -10
- package/Libraries/Components/UnimplementedViews/UnimplementedNativeViewNativeComponent.js +1 -1
- package/Libraries/Components/UnimplementedViews/UnimplementedView.js +1 -1
- package/Libraries/Components/View/ReactNativeStyleAttributes.js +13 -2
- package/Libraries/Components/View/View.d.ts +29 -0
- package/Libraries/Components/View/View.js +91 -8
- package/Libraries/Components/View/View.windows.js +181 -94
- package/Libraries/Components/View/ViewAccessibility.d.ts +360 -0
- package/Libraries/Components/View/ViewAccessibility.js +70 -1
- package/Libraries/Components/View/ViewAccessibility.windows.js +69 -0
- package/Libraries/Components/View/ViewNativeComponent.js +3 -3
- package/Libraries/Components/View/ViewPropTypes.d.ts +245 -0
- package/Libraries/Components/View/ViewPropTypes.js +105 -13
- package/Libraries/Components/View/ViewPropTypes.windows.js +105 -13
- package/Libraries/Core/Devtools/openFileInEditor.js +3 -0
- package/Libraries/Core/Devtools/parseErrorStack.js +1 -1
- package/Libraries/Core/Devtools/symbolicateStackTrace.js +2 -2
- package/Libraries/Core/ExceptionsManager.js +8 -0
- package/Libraries/Core/ExtendedError.js +11 -8
- package/Libraries/Core/InitializeCore.js +2 -1
- package/Libraries/Core/NativeExceptionsManager.js +3 -4
- package/Libraries/Core/RawEventEmitter.js +2 -1
- package/Libraries/Core/ReactFiberErrorDialog.js +2 -2
- package/Libraries/Core/ReactNativeVersion.js +2 -2
- package/Libraries/Core/ReactNativeVersionCheck.js +1 -0
- package/Libraries/Core/SegmentFetcher/NativeSegmentFetcher.js +1 -0
- package/Libraries/Core/Timers/JSTimers.js +13 -11
- package/Libraries/Core/Timers/NativeTiming.js +1 -0
- package/Libraries/Core/setUpBatchedBridge.js +1 -5
- package/Libraries/Core/setUpDeveloperTools.js +4 -6
- package/Libraries/Core/setUpReactDevTools.js +4 -1
- package/Libraries/Core/setUpRegeneratorRuntime.js +1 -1
- package/Libraries/Core/setUpTimers.js +1 -1
- package/Libraries/EventEmitter/NativeEventEmitter.d.ts +70 -0
- package/Libraries/EventEmitter/NativeEventEmitter.js +1 -0
- package/Libraries/EventEmitter/RCTDeviceEventEmitter.d.ts +30 -0
- package/Libraries/EventEmitter/RCTDeviceEventEmitter.js +2 -1
- package/Libraries/EventEmitter/RCTNativeAppEventEmitter.d.ts +32 -0
- package/Libraries/EventEmitter/__mocks__/NativeEventEmitter.js +1 -0
- package/Libraries/Events/EventPolyfill.js +1 -1
- package/Libraries/HeapCapture/NativeJSCHeapCapture.js +1 -0
- package/Libraries/Image/AssetSourceResolver.js +4 -6
- package/Libraries/Image/Image.android.js +63 -45
- package/Libraries/Image/Image.d.ts +322 -0
- package/Libraries/Image/Image.flow.js +64 -0
- package/Libraries/Image/Image.ios.js +55 -28
- package/Libraries/Image/Image.windows.js +56 -30
- package/Libraries/Image/ImageBackground.js +18 -7
- package/Libraries/Image/ImageInjection.js +2 -1
- package/Libraries/Image/ImageProps.js +88 -5
- package/Libraries/Image/ImageResizeMode.d.ts +49 -0
- package/Libraries/Image/ImageSource.d.ts +76 -0
- package/Libraries/Image/ImageSourceUtils.js +80 -0
- package/Libraries/Image/ImageUtils.js +21 -0
- package/Libraries/Image/ImageViewNativeComponent.js +8 -5
- package/Libraries/Image/NativeImageEditor.js +1 -0
- package/Libraries/Image/NativeImageLoaderAndroid.js +1 -0
- package/Libraries/Image/NativeImageLoaderIOS.js +1 -0
- package/Libraries/Image/NativeImageStoreAndroid.js +1 -0
- package/Libraries/Image/NativeImageStoreIOS.js +1 -0
- package/Libraries/Image/TextInlineImageNativeComponent.js +4 -3
- package/Libraries/Image/nativeImageSource.js +2 -2
- package/Libraries/Image/resolveAssetSource.js +5 -5
- package/Libraries/Inspector/BorderBox.js +1 -1
- package/Libraries/Inspector/BoxInspector.js +3 -4
- package/Libraries/Inspector/DevtoolsOverlay.js +213 -0
- package/Libraries/Inspector/ElementBox.js +4 -5
- package/Libraries/Inspector/ElementProperties.js +10 -11
- package/Libraries/Inspector/Inspector.js +22 -108
- package/Libraries/Inspector/InspectorOverlay.js +5 -5
- package/Libraries/Inspector/InspectorPanel.js +12 -10
- package/Libraries/Inspector/NetworkOverlay.js +7 -3
- package/Libraries/Inspector/PerformanceOverlay.js +3 -3
- package/Libraries/Inspector/StyleInspector.js +2 -2
- package/Libraries/Inspector/getInspectorDataForViewAtPoint.js +71 -0
- package/Libraries/Interaction/BridgeSpyStallHandler.js +1 -1
- package/Libraries/Interaction/InteractionManager.d.ts +74 -0
- package/Libraries/Interaction/InteractionManager.js +8 -8
- package/Libraries/Interaction/NativeFrameRateLogger.js +1 -0
- package/Libraries/Interaction/PanResponder.d.ts +202 -0
- package/Libraries/Interaction/PanResponder.flow.js +257 -0
- package/Libraries/Interaction/PanResponder.js +4 -3
- package/Libraries/JSInspector/JSInspector.js +0 -3
- package/Libraries/JSInspector/NetworkAgent.js +3 -3
- package/Libraries/LayoutAnimation/LayoutAnimation.d.ts +84 -0
- package/Libraries/LayoutAnimation/LayoutAnimation.js +4 -3
- package/Libraries/Linking/Linking.d.ts +61 -0
- package/Libraries/Linking/Linking.js +3 -2
- package/Libraries/Linking/NativeIntentAndroid.js +1 -0
- package/Libraries/Linking/NativeLinkingManager.js +1 -0
- package/Libraries/Lists/CellRenderMask.js +13 -3
- package/Libraries/Lists/ChildListCollection.js +72 -0
- package/Libraries/Lists/FillRateHelper.js +28 -17
- package/Libraries/Lists/FlatList.d.ts +292 -0
- package/Libraries/Lists/FlatList.js +70 -70
- package/Libraries/Lists/SectionList.d.ts +300 -0
- package/Libraries/Lists/SectionList.js +5 -5
- package/Libraries/Lists/SectionListModern.js +6 -6
- package/Libraries/Lists/StateSafePureComponent.js +85 -0
- package/Libraries/Lists/ViewabilityHelper.js +33 -12
- package/Libraries/Lists/VirtualizeUtils.js +17 -13
- package/Libraries/Lists/VirtualizedList.d.ts +317 -0
- package/Libraries/Lists/VirtualizedList.js +548 -890
- package/Libraries/Lists/VirtualizedListCellRenderer.js +259 -0
- package/Libraries/Lists/VirtualizedListContext.js +7 -48
- package/Libraries/Lists/VirtualizedListProps.js +279 -0
- package/Libraries/Lists/VirtualizedSectionList.js +6 -3
- package/Libraries/Lists/__flowtests__/SectionList-flowtest.js +1 -1
- package/Libraries/LogBox/Data/LogBoxData.js +9 -8
- package/Libraries/LogBox/Data/LogBoxLog.js +5 -5
- package/Libraries/LogBox/Data/LogBoxSymbolication.js +4 -4
- package/Libraries/LogBox/Data/parseLogBoxLog.js +5 -3
- package/Libraries/LogBox/LogBox.d.ts +28 -0
- package/Libraries/LogBox/LogBox.js +11 -11
- package/Libraries/LogBox/LogBoxInspectorContainer.js +5 -3
- package/Libraries/LogBox/LogBoxNotificationContainer.js +2 -2
- package/Libraries/LogBox/UI/AnsiHighlight.js +5 -3
- package/Libraries/LogBox/UI/LogBoxButton.js +6 -5
- package/Libraries/LogBox/UI/LogBoxInspector.js +6 -6
- package/Libraries/LogBox/UI/LogBoxInspectorCodeFrame.js +9 -8
- package/Libraries/LogBox/UI/LogBoxInspectorFooter.js +3 -3
- package/Libraries/LogBox/UI/LogBoxInspectorHeader.js +7 -6
- package/Libraries/LogBox/UI/LogBoxInspectorMessageHeader.js +6 -5
- package/Libraries/LogBox/UI/LogBoxInspectorReactFrames.js +7 -6
- package/Libraries/LogBox/UI/LogBoxInspectorSection.js +2 -2
- package/Libraries/LogBox/UI/LogBoxInspectorSourceMapStatus.js +3 -3
- package/Libraries/LogBox/UI/LogBoxInspectorStackFrame.js +5 -5
- package/Libraries/LogBox/UI/LogBoxInspectorStackFrames.js +5 -5
- package/Libraries/LogBox/UI/LogBoxMessage.js +3 -3
- package/Libraries/LogBox/UI/LogBoxNotification.js +6 -5
- package/Libraries/Modal/Modal.d.ts +104 -0
- package/Libraries/Modal/Modal.js +14 -14
- package/Libraries/Modal/NativeModalManager.js +1 -0
- package/Libraries/Modal/RCTModalHostViewNativeComponent.js +3 -3
- package/Libraries/NativeComponent/BaseViewConfig.android.js +27 -2
- package/Libraries/NativeComponent/BaseViewConfig.ios.js +8 -3
- package/Libraries/NativeComponent/BaseViewConfig.windows.js +8 -3
- package/Libraries/NativeComponent/NativeComponentRegistry.js +5 -4
- package/Libraries/NativeComponent/PlatformBaseViewConfig.js +1 -0
- package/Libraries/NativeComponent/StaticViewConfigValidator.js +1 -1
- package/Libraries/NativeComponent/ViewConfig.js +1 -0
- package/Libraries/NativeModules/specs/NativeAnimationsDebugModule.js +1 -0
- package/Libraries/NativeModules/specs/NativeDevMenu.js +1 -0
- package/Libraries/NativeModules/specs/NativeDevSettings.js +1 -0
- package/Libraries/NativeModules/specs/NativeDeviceEventManager.js +1 -0
- package/Libraries/NativeModules/specs/NativeDialogManagerAndroid.js +1 -0
- package/Libraries/NativeModules/specs/NativeLogBox.js +3 -2
- package/Libraries/NativeModules/specs/NativeRedBox.js +1 -0
- package/Libraries/NativeModules/specs/NativeSourceCode.js +1 -0
- package/Libraries/Network/NativeNetworkingAndroid.js +1 -0
- package/Libraries/Network/NativeNetworkingIOS.js +1 -0
- package/Libraries/Network/RCTNetworking.android.js +4 -3
- package/Libraries/Network/RCTNetworking.ios.js +3 -2
- package/Libraries/Network/RCTNetworking.windows.js +1 -0
- package/Libraries/Network/convertRequestBody.js +1 -2
- package/Libraries/NewAppScreen/components/DebugInstructions.js +4 -1
- package/Libraries/NewAppScreen/components/Header.js +6 -2
- package/Libraries/NewAppScreen/components/HermesBadge.js +6 -2
- package/Libraries/NewAppScreen/components/LearnMoreLinks.js +8 -9
- package/Libraries/NewAppScreen/components/ReloadInstructions.js +4 -1
- package/Libraries/NewAppScreen/index.js +1 -1
- package/Libraries/Performance/NativeJSCSamplingProfiler.js +1 -0
- package/Libraries/Performance/QuickPerformanceLogger.js +34 -10
- package/Libraries/Performance/Systrace.d.ts +66 -0
- package/Libraries/Performance/Systrace.js +110 -195
- package/Libraries/PermissionsAndroid/NativePermissionsAndroid.js +1 -0
- package/Libraries/PermissionsAndroid/PermissionsAndroid.d.ts +115 -0
- package/Libraries/PermissionsAndroid/PermissionsAndroid.js +5 -4
- package/Libraries/Pressability/Pressability.js +12 -10
- package/Libraries/Pressability/Pressability.windows.js +21 -12
- package/Libraries/Pressability/PressabilityDebug.js +2 -2
- package/Libraries/PushNotificationIOS/NativePushNotificationManagerIOS.js +1 -0
- package/Libraries/PushNotificationIOS/PushNotificationIOS.d.ts +275 -0
- package/Libraries/PushNotificationIOS/PushNotificationIOS.js +19 -14
- package/Libraries/ReactNative/AppContainer.js +17 -7
- package/Libraries/ReactNative/AppRegistry.d.ts +68 -0
- package/Libraries/ReactNative/AppRegistry.js +11 -14
- package/Libraries/ReactNative/BridgelessUIManager.js +4 -3
- package/Libraries/ReactNative/FabricUIManager.js +3 -3
- package/Libraries/ReactNative/I18nManager.d.ts +25 -0
- package/Libraries/ReactNative/NativeHeadlessJsTaskSupport.js +1 -0
- package/Libraries/ReactNative/NativeI18nManager.js +1 -0
- package/Libraries/ReactNative/NativeUIManager.js +1 -0
- package/Libraries/ReactNative/PaperUIManager.js +2 -2
- package/Libraries/ReactNative/PaperUIManager.windows.js +1 -1
- package/Libraries/ReactNative/ReactNativeFeatureFlags.js +9 -0
- package/Libraries/ReactNative/RendererImplementation.js +112 -0
- package/Libraries/ReactNative/RendererProxy.d.ts +20 -0
- package/Libraries/ReactNative/RendererProxy.js +26 -0
- package/Libraries/ReactNative/RootTag.js +0 -1
- package/Libraries/ReactNative/UIManager.d.ts +157 -0
- package/Libraries/ReactNative/UIManager.js +1 -1
- package/Libraries/ReactNative/getCachedComponentWithDebugName.js +1 -0
- package/Libraries/ReactNative/renderApplication.js +38 -20
- package/Libraries/ReactNative/requireNativeComponent.d.ts +23 -0
- package/Libraries/ReactNative/requireNativeComponent.js +2 -2
- package/Libraries/ReactPrivate/ReactNativePrivateInterface.js +10 -9
- package/Libraries/Renderer/implementations/ReactFabric-dev.js +312 -217
- package/Libraries/Renderer/implementations/ReactFabric-prod.js +212 -177
- package/Libraries/Renderer/implementations/ReactFabric-profiling.js +248 -213
- package/Libraries/Renderer/implementations/ReactNativeRenderer-dev.js +311 -218
- package/Libraries/Renderer/implementations/ReactNativeRenderer-prod.js +226 -196
- package/Libraries/Renderer/implementations/ReactNativeRenderer-profiling.js +262 -232
- package/Libraries/Renderer/implementations/ReactNativeRenderer.d.ts +149 -0
- package/Libraries/Renderer/shims/ReactFabric.js +2 -2
- package/Libraries/Renderer/shims/ReactFeatureFlags.js +2 -2
- package/Libraries/Renderer/shims/ReactNative.js +2 -2
- package/Libraries/Renderer/shims/ReactNativeTypes.d.ts +141 -0
- package/Libraries/Renderer/shims/ReactNativeTypes.js +23 -22
- package/Libraries/Renderer/shims/ReactNativeViewConfigRegistry.js +8 -8
- package/Libraries/Renderer/shims/createReactNativeComponentClass.js +2 -2
- package/Libraries/Settings/NativeSettingsManager.js +1 -0
- package/Libraries/Settings/Settings.d.ts +18 -0
- package/Libraries/Share/NativeShareModule.js +1 -0
- package/Libraries/Share/Share.d.ts +80 -0
- package/Libraries/Share/Share.js +7 -5
- package/Libraries/StyleSheet/PlatformColorValueTypes.android.js +1 -1
- package/Libraries/StyleSheet/PlatformColorValueTypes.d.ts +18 -0
- package/Libraries/StyleSheet/PlatformColorValueTypes.ios.js +1 -1
- package/Libraries/StyleSheet/PlatformColorValueTypesIOS.d.ts +25 -0
- package/Libraries/StyleSheet/PlatformColorValueTypesIOS.ios.js +1 -0
- package/Libraries/StyleSheet/StyleSheet.d.ts +156 -0
- package/Libraries/StyleSheet/StyleSheet.js +15 -11
- package/Libraries/StyleSheet/StyleSheetTypes.d.ts +332 -0
- package/Libraries/StyleSheet/StyleSheetTypes.js +101 -24
- package/Libraries/StyleSheet/__flowtests__/StyleSheet-flowtest.js +2 -2
- package/Libraries/StyleSheet/normalizeColor.js +3 -3
- package/Libraries/StyleSheet/private/_TransformStyle.js +26 -24
- package/Libraries/StyleSheet/processAspectRatio.js +53 -0
- package/Libraries/StyleSheet/processColor.d.ts +16 -0
- package/Libraries/StyleSheet/processColor.js +3 -4
- package/Libraries/StyleSheet/processColorArray.js +1 -0
- package/Libraries/StyleSheet/processFontVariant.js +30 -0
- package/Libraries/StyleSheet/processTransform.js +114 -105
- package/Libraries/StyleSheet/splitLayoutProps.js +5 -0
- package/Libraries/Text/Text.d.ts +209 -0
- package/Libraries/Text/Text.js +94 -12
- package/Libraries/Text/Text.windows.js +87 -11
- package/Libraries/Text/TextNativeComponent.js +49 -41
- package/Libraries/Text/TextProps.js +64 -7
- package/Libraries/TurboModule/RCTExport.d.ts +12 -0
- package/Libraries/TurboModule/TurboModuleRegistry.d.ts +15 -0
- package/Libraries/TurboModule/TurboModuleRegistry.js +3 -1
- package/Libraries/TurboModule/samples/NativeSampleTurboModule.js +1 -0
- package/Libraries/Types/CoreEventTypes.d.ts +263 -0
- package/Libraries/Types/CoreEventTypes.js +2 -1
- package/Libraries/Types/CoreEventTypes.windows.js +2 -1
- package/Libraries/Utilities/AcessibilityMapping.js +154 -0
- package/Libraries/Utilities/Appearance.d.ts +43 -0
- package/Libraries/Utilities/Appearance.js +3 -3
- package/Libraries/Utilities/BackHandler.android.js +3 -5
- package/Libraries/Utilities/BackHandler.d.ts +38 -0
- package/Libraries/Utilities/BackHandler.windows.js +3 -5
- package/Libraries/Utilities/DevSettings.d.ts +32 -0
- package/Libraries/Utilities/DevSettings.js +4 -2
- package/Libraries/Utilities/Dimensions.d.ts +79 -0
- package/Libraries/Utilities/Dimensions.js +2 -2
- package/Libraries/Utilities/GlobalPerformanceLogger.js +2 -1
- package/Libraries/Utilities/HMRClient.js +23 -8
- package/Libraries/Utilities/LoadingView.ios.js +1 -1
- package/Libraries/Utilities/NativeAppearance.js +1 -0
- package/Libraries/Utilities/NativeDevLoadingView.js +1 -0
- package/Libraries/Utilities/NativeDevSplitBundleLoader.js +1 -0
- package/Libraries/Utilities/NativeDeviceInfo.js +1 -0
- package/Libraries/Utilities/NativePlatformConstantsAndroid.js +1 -0
- package/Libraries/Utilities/NativePlatformConstantsIOS.js +1 -0
- package/Libraries/Utilities/NativePlatformConstantsWin.js +1 -0
- package/Libraries/Utilities/PerformanceLoggerContext.js +3 -2
- package/Libraries/Utilities/PixelRatio.d.ts +64 -0
- package/Libraries/Utilities/Platform.android.js +11 -5
- package/Libraries/Utilities/Platform.d.ts +102 -0
- package/Libraries/Utilities/Platform.ios.js +12 -5
- package/Libraries/Utilities/Platform.windows.js +11 -5
- package/Libraries/Utilities/PolyfillFunctions.js +1 -1
- package/Libraries/Utilities/ReactNativeTestTools.js +9 -15
- package/Libraries/Utilities/codegenNativeCommands.js +1 -10
- package/Libraries/Utilities/codegenNativeComponent.js +4 -1
- package/Libraries/Utilities/createPerformanceLogger.js +7 -8
- package/Libraries/Utilities/differ/deepDiffer.js +1 -1
- package/Libraries/Utilities/groupByEveryN.js +1 -1
- package/Libraries/Utilities/stringifySafe.js +3 -1
- package/Libraries/Utilities/useColorScheme.js +3 -2
- package/Libraries/Utilities/useRefEffect.js +1 -1
- package/Libraries/Vibration/NativeVibration.js +1 -0
- package/Libraries/Vibration/Vibration.d.ts +43 -0
- package/Libraries/Vibration/Vibration.js +1 -0
- package/Libraries/WebPerformance/NativePerformanceObserver.js +41 -0
- package/Libraries/WebPerformance/PerformanceObserver.js +223 -0
- package/Libraries/WebSocket/NativeWebSocketModule.js +1 -0
- package/Libraries/WebSocket/WebSocket.js +11 -3
- package/Libraries/WebSocket/WebSocketInterceptor.js +1 -1
- package/Libraries/YellowBox/YellowBoxDeprecated.d.ts +19 -0
- package/Libraries/YellowBox/YellowBoxDeprecated.js +2 -3
- package/Libraries/__flowtests__/ReactNativeTypes-flowtest.js +2 -1
- package/Libraries/__tests__/ViewWindows-test.js +16 -0
- package/Libraries/platform-types.d.ts +17 -0
- package/Libraries/vendor/core/ErrorUtils.d.ts +15 -0
- package/Libraries/vendor/emitter/EventEmitter.d.ts +164 -0
- package/Microsoft.ReactNative/ABIViewManager.cpp +19 -1
- package/Microsoft.ReactNative/ABIViewManager.h +9 -0
- package/Microsoft.ReactNative/Base/CoreNativeModules.cpp +0 -22
- package/Microsoft.ReactNative/Base/CoreNativeModules.h +0 -2
- package/Microsoft.ReactNative/CompositionContext.idl +31 -0
- package/Microsoft.ReactNative/CompositionHwndHost.idl +33 -0
- package/Microsoft.ReactNative/CompositionRootView.idl +45 -0
- package/Microsoft.ReactNative/CompositionSwitcher.idl +123 -0
- package/Microsoft.ReactNative/CompositionUIService.idl +24 -0
- package/Microsoft.ReactNative/Fabric/ComponentView.h +10 -0
- package/Microsoft.ReactNative/Fabric/Composition/ComponentViewRegistry.cpp +83 -0
- package/Microsoft.ReactNative/Fabric/{ComponentViewRegistry.h → Composition/ComponentViewRegistry.h} +9 -12
- package/Microsoft.ReactNative/Fabric/Composition/CompositionContextHelper.cpp +816 -0
- package/Microsoft.ReactNative/Fabric/Composition/CompositionContextHelper.h +33 -0
- package/Microsoft.ReactNative/Fabric/Composition/CompositionEventHandler.cpp +833 -0
- package/Microsoft.ReactNative/Fabric/Composition/CompositionEventHandler.h +116 -0
- package/Microsoft.ReactNative/Fabric/Composition/CompositionHelpers.cpp +137 -0
- package/Microsoft.ReactNative/Fabric/Composition/CompositionHelpers.h +44 -0
- package/Microsoft.ReactNative/Fabric/Composition/CompositionHwndHost.cpp +145 -0
- package/Microsoft.ReactNative/Fabric/Composition/CompositionHwndHost.h +49 -0
- package/Microsoft.ReactNative/Fabric/Composition/CompositionRootView.cpp +359 -0
- package/Microsoft.ReactNative/Fabric/Composition/CompositionRootView.h +81 -0
- package/Microsoft.ReactNative/Fabric/Composition/CompositionUIService.cpp +27 -0
- package/Microsoft.ReactNative/Fabric/Composition/CompositionUIService.h +23 -0
- package/Microsoft.ReactNative/Fabric/Composition/CompositionViewComponentView.cpp +1217 -0
- package/Microsoft.ReactNative/Fabric/Composition/CompositionViewComponentView.h +113 -0
- package/Microsoft.ReactNative/Fabric/Composition/ImageComponentView.cpp +332 -0
- package/Microsoft.ReactNative/Fabric/Composition/ImageComponentView.h +90 -0
- package/Microsoft.ReactNative/Fabric/Composition/ParagraphComponentView.cpp +415 -0
- package/Microsoft.ReactNative/Fabric/Composition/ParagraphComponentView.h +62 -0
- package/Microsoft.ReactNative/Fabric/Composition/ScrollViewComponentView.cpp +355 -0
- package/Microsoft.ReactNative/Fabric/Composition/ScrollViewComponentView.h +103 -0
- package/Microsoft.ReactNative/Fabric/Composition/TextInput/WindowsTextInputComponentDescriptor.h +177 -0
- package/Microsoft.ReactNative/Fabric/Composition/TextInput/WindowsTextInputComponentView.cpp +1076 -0
- package/Microsoft.ReactNative/Fabric/Composition/TextInput/WindowsTextInputComponentView.h +99 -0
- package/Microsoft.ReactNative/Fabric/{TextInput → Composition/TextInput}/WindowsTextInputEventEmitter.cpp +0 -0
- package/Microsoft.ReactNative/Fabric/{TextInput → Composition/TextInput}/WindowsTextInputEventEmitter.h +0 -0
- package/Microsoft.ReactNative/Fabric/{TextInput → Composition/TextInput}/WindowsTextInputProps.cpp +1 -31
- package/Microsoft.ReactNative/Fabric/{TextInput → Composition/TextInput}/WindowsTextInputProps.h +15 -28
- package/Microsoft.ReactNative/Fabric/{TextInput → Composition/TextInput}/WindowsTextInputShadowNode.cpp +16 -14
- package/Microsoft.ReactNative/Fabric/{TextInput → Composition/TextInput}/WindowsTextInputShadowNode.h +3 -3
- package/Microsoft.ReactNative/Fabric/{TextInput → Composition/TextInput}/WindowsTextInputState.cpp +27 -10
- package/Microsoft.ReactNative/Fabric/{TextInput → Composition/TextInput}/WindowsTextInputState.h +5 -16
- package/Microsoft.ReactNative/Fabric/FabricUIManagerModule.cpp +65 -157
- package/Microsoft.ReactNative/Fabric/FabricUIManagerModule.h +10 -9
- package/Microsoft.ReactNative/Fabric/IComponentViewRegistry.h +34 -0
- package/Microsoft.ReactNative/Fabric/ImageManager.cpp +5 -7
- package/Microsoft.ReactNative/Fabric/ImageRequest.cpp +23 -8
- package/Microsoft.ReactNative/Fabric/ReactTaggedView.h +35 -0
- package/Microsoft.ReactNative/Fabric/WindowsImageManager.cpp +125 -0
- package/Microsoft.ReactNative/Fabric/WindowsImageManager.h +20 -0
- package/Microsoft.ReactNative/Fabric/platform/react/renderer/components/rncore/States.h +5 -0
- package/Microsoft.ReactNative/Fabric/platform/react/renderer/components/rnwcore/States.h +5 -0
- package/Microsoft.ReactNative/Fabric/platform/react/renderer/graphics/Color.cpp +4 -6
- package/Microsoft.ReactNative/Fabric/platform/react/renderer/graphics/platform/cxx/react/renderer/graphics/Color.h +17 -0
- package/Microsoft.ReactNative/INativeUIManager.h +1 -1
- package/Microsoft.ReactNative/IReactPackageBuilder.idl +6 -9
- package/Microsoft.ReactNative/IViewManager.idl +14 -0
- package/Microsoft.ReactNative/IViewManagerCore.idl +1 -0
- package/Microsoft.ReactNative/JsiApi.cpp +94 -0
- package/Microsoft.ReactNative/JsiApi.h +13 -0
- package/Microsoft.ReactNative/JsiApi.idl +13 -0
- package/Microsoft.ReactNative/LayoutService.cpp +51 -0
- package/Microsoft.ReactNative/LayoutService.h +32 -0
- package/Microsoft.ReactNative/LayoutService.idl +41 -0
- package/Microsoft.ReactNative/Microsoft.ReactNative.vcxproj +32 -20
- package/Microsoft.ReactNative/Microsoft.ReactNative.vcxproj.filters +11 -1
- package/Microsoft.ReactNative/Modules/Animated/AdditionAnimatedNode.cpp +33 -16
- package/Microsoft.ReactNative/Modules/Animated/AdditionAnimatedNode.h +3 -2
- package/Microsoft.ReactNative/Modules/Animated/AnimatedNode.cpp +17 -2
- package/Microsoft.ReactNative/Modules/Animated/AnimatedNode.h +19 -1
- package/Microsoft.ReactNative/Modules/Animated/AnimatedPlatformConfig.cpp +23 -0
- package/Microsoft.ReactNative/Modules/Animated/AnimatedPlatformConfig.h +17 -0
- package/Microsoft.ReactNative/Modules/Animated/AnimationDriver.cpp +49 -18
- package/Microsoft.ReactNative/Modules/Animated/AnimationDriver.h +29 -7
- package/Microsoft.ReactNative/Modules/Animated/AnimationUtils.h +45 -0
- package/Microsoft.ReactNative/Modules/Animated/CalculatedAnimationDriver.cpp +6 -5
- package/Microsoft.ReactNative/Modules/Animated/CalculatedAnimationDriver.h +1 -3
- package/Microsoft.ReactNative/Modules/Animated/DecayAnimationDriver.cpp +31 -5
- package/Microsoft.ReactNative/Modules/Animated/DecayAnimationDriver.h +3 -1
- package/Microsoft.ReactNative/Modules/Animated/DiffClampAnimatedNode.cpp +30 -15
- package/Microsoft.ReactNative/Modules/Animated/DiffClampAnimatedNode.h +4 -2
- package/Microsoft.ReactNative/Modules/Animated/DivisionAnimatedNode.cpp +43 -20
- package/Microsoft.ReactNative/Modules/Animated/DivisionAnimatedNode.h +3 -2
- package/Microsoft.ReactNative/Modules/Animated/EventAnimationDriver.cpp +2 -2
- package/Microsoft.ReactNative/Modules/Animated/EventAnimationDriver.h +1 -1
- package/Microsoft.ReactNative/Modules/Animated/FrameAnimationDriver.cpp +45 -8
- package/Microsoft.ReactNative/Modules/Animated/FrameAnimationDriver.h +7 -2
- package/Microsoft.ReactNative/Modules/Animated/InterpolationAnimatedNode.cpp +76 -38
- package/Microsoft.ReactNative/Modules/Animated/InterpolationAnimatedNode.h +6 -5
- package/Microsoft.ReactNative/Modules/Animated/ModulusAnimatedNode.cpp +25 -13
- package/Microsoft.ReactNative/Modules/Animated/ModulusAnimatedNode.h +4 -2
- package/Microsoft.ReactNative/Modules/Animated/MultiplicationAnimatedNode.cpp +33 -16
- package/Microsoft.ReactNative/Modules/Animated/MultiplicationAnimatedNode.h +3 -2
- package/Microsoft.ReactNative/Modules/Animated/NativeAnimatedModule.cpp +245 -209
- package/Microsoft.ReactNative/Modules/Animated/NativeAnimatedModule.h +91 -41
- package/Microsoft.ReactNative/Modules/Animated/NativeAnimatedNodeManager.cpp +336 -82
- package/Microsoft.ReactNative/Modules/Animated/NativeAnimatedNodeManager.h +33 -10
- package/Microsoft.ReactNative/Modules/Animated/PropsAnimatedNode.cpp +185 -57
- package/Microsoft.ReactNative/Modules/Animated/PropsAnimatedNode.h +28 -5
- package/Microsoft.ReactNative/Modules/Animated/SpringAnimationDriver.cpp +72 -20
- package/Microsoft.ReactNative/Modules/Animated/SpringAnimationDriver.h +8 -4
- package/Microsoft.ReactNative/Modules/Animated/StyleAnimatedNode.cpp +20 -5
- package/Microsoft.ReactNative/Modules/Animated/StyleAnimatedNode.h +3 -2
- package/Microsoft.ReactNative/Modules/Animated/SubtractionAnimatedNode.cpp +42 -20
- package/Microsoft.ReactNative/Modules/Animated/SubtractionAnimatedNode.h +3 -1
- package/Microsoft.ReactNative/Modules/Animated/TrackingAnimatedNode.cpp +20 -11
- package/Microsoft.ReactNative/Modules/Animated/TrackingAnimatedNode.h +5 -6
- package/Microsoft.ReactNative/Modules/Animated/TransformAnimatedNode.cpp +36 -9
- package/Microsoft.ReactNative/Modules/Animated/TransformAnimatedNode.h +5 -2
- package/Microsoft.ReactNative/Modules/Animated/ValueAnimatedNode.cpp +60 -32
- package/Microsoft.ReactNative/Modules/Animated/ValueAnimatedNode.h +11 -4
- package/Microsoft.ReactNative/Modules/AppearanceModule.cpp +58 -37
- package/Microsoft.ReactNative/Modules/AppearanceModule.h +25 -32
- package/Microsoft.ReactNative/Modules/DeviceInfoModule.cpp +3 -1
- package/Microsoft.ReactNative/Modules/ImageViewManagerModule.cpp +42 -10
- package/Microsoft.ReactNative/Modules/LogBoxModule.cpp +157 -39
- package/Microsoft.ReactNative/Modules/LogBoxModule.h +6 -0
- package/Microsoft.ReactNative/Modules/NativeUIManager.cpp +72 -85
- package/Microsoft.ReactNative/Modules/NativeUIManager.h +8 -4
- package/Microsoft.ReactNative/Modules/PaperUIManagerModule.cpp +7 -19
- package/Microsoft.ReactNative/Modules/PaperUIManagerModule.h +1 -0
- package/Microsoft.ReactNative/Modules/TimingModule.cpp +48 -87
- package/Microsoft.ReactNative/Modules/TimingModule.h +20 -30
- package/Microsoft.ReactNative/QuirkSettings.cpp +22 -0
- package/Microsoft.ReactNative/QuirkSettings.h +9 -0
- package/Microsoft.ReactNative/QuirkSettings.idl +7 -0
- package/Microsoft.ReactNative/ReactCoreInjection.cpp +7 -2
- package/Microsoft.ReactNative/ReactCoreInjection.h +4 -1
- package/Microsoft.ReactNative/ReactCoreInjection.idl +4 -1
- package/Microsoft.ReactNative/ReactHost/React.h +0 -3
- package/Microsoft.ReactNative/ReactHost/ReactInstanceWin.cpp +28 -23
- package/Microsoft.ReactNative/ReactHost/ReactInstanceWin.h +0 -3
- package/Microsoft.ReactNative/ReactNativeHost.cpp +2 -1
- package/Microsoft.ReactNative/ReactPackageBuilder.cpp +8 -3
- package/Microsoft.ReactNative/ReactPackageBuilder.h +4 -3
- package/Microsoft.ReactNative/ReactRootView.cpp +3 -75
- package/Microsoft.ReactNative/ReactRootView.h +0 -6
- package/Microsoft.ReactNative/ReactRootView.idl +1 -9
- package/Microsoft.ReactNative/RedBox.cpp +69 -8
- package/Microsoft.ReactNative/RedBox.h +2 -0
- package/Microsoft.ReactNative/RedBoxHandler.cpp +3 -1
- package/Microsoft.ReactNative/Utils/Helpers.cpp +13 -0
- package/Microsoft.ReactNative/Utils/Helpers.h +1 -0
- package/Microsoft.ReactNative/Utils/ImageUtils.cpp +94 -0
- package/Microsoft.ReactNative/Utils/ImageUtils.h +35 -0
- package/Microsoft.ReactNative/Utils/LocalBundleReader.cpp +3 -2
- package/Microsoft.ReactNative/Utils/PropertyUtils.h +31 -9
- package/Microsoft.ReactNative/Views/ControlViewManager.cpp +19 -0
- package/Microsoft.ReactNative/Views/ControlViewManager.h +7 -0
- package/Microsoft.ReactNative/Views/FlyoutViewManager.cpp +8 -4
- package/Microsoft.ReactNative/Views/ICompositionRootView.h +19 -0
- package/Microsoft.ReactNative/Views/Image/ImageViewManager.cpp +14 -0
- package/Microsoft.ReactNative/Views/Image/ImageViewManager.h +7 -0
- package/Microsoft.ReactNative/Views/Image/ReactImage.cpp +8 -76
- package/Microsoft.ReactNative/Views/Image/ReactImage.h +1 -23
- package/Microsoft.ReactNative/Views/KeyboardEventHandler.cpp +16 -3
- package/Microsoft.ReactNative/Views/PopupViewManager.cpp +1 -2
- package/Microsoft.ReactNative/Views/ScrollViewManager.cpp +1 -3
- package/Microsoft.ReactNative/Views/ShadowNodeBase.h +10 -1
- package/Microsoft.ReactNative/Views/ShadowNodeRegistry.cpp +0 -12
- package/Microsoft.ReactNative/Views/ShadowNodeRegistry.h +2 -4
- package/Microsoft.ReactNative/Views/Text/TextPropertyChangedParentVisitor.cpp +1 -7
- package/Microsoft.ReactNative/Views/TextInputViewManager.cpp +58 -42
- package/Microsoft.ReactNative/Views/TextViewManager.cpp +47 -31
- package/Microsoft.ReactNative/Views/TextViewManager.h +2 -0
- package/Microsoft.ReactNative/Views/TouchEventHandler.cpp +22 -247
- package/Microsoft.ReactNative/Views/TouchEventHandler.h +1 -6
- package/Microsoft.ReactNative/Views/ViewControl.cpp +2 -2
- package/Microsoft.ReactNative/Views/ViewControl.h +1 -1
- package/Microsoft.ReactNative/Views/ViewManagerBase.cpp +25 -13
- package/Microsoft.ReactNative/Views/ViewManagerBase.h +4 -0
- package/Microsoft.ReactNative/Views/ViewViewManager.cpp +74 -35
- package/Microsoft.ReactNative/Views/ViewViewManager.h +1 -0
- package/Microsoft.ReactNative/Views/cppwinrt/ViewPanel.idl +4 -4
- package/Microsoft.ReactNative/XamlHelper.cpp +13 -0
- package/Microsoft.ReactNative/XamlHelper.h +4 -0
- package/Microsoft.ReactNative/XamlHelper.idl +9 -0
- package/Microsoft.ReactNative/XamlUIService.cpp +16 -0
- package/Microsoft.ReactNative/XamlUIService.h +2 -0
- package/Microsoft.ReactNative/XamlUIService.idl +4 -0
- package/Microsoft.ReactNative/XamlView.cpp +10 -0
- package/Microsoft.ReactNative/XamlView.h +7 -2
- package/Microsoft.ReactNative.Cxx/JSI/JsiAbiApi.cpp +76 -0
- package/Microsoft.ReactNative.Cxx/JSI/JsiAbiApi.h +13 -0
- package/Microsoft.ReactNative.Cxx/JSI/NodeApiJsiRuntime.cpp +71 -2
- package/Microsoft.ReactNative.Cxx/JSI/NodeApiJsiRuntime.h +3 -3
- package/Microsoft.ReactNative.Cxx/Microsoft.ReactNative.Cxx.vcxitems +1 -2
- package/Microsoft.ReactNative.Cxx/ModuleRegistration.cpp +14 -4
- package/Microsoft.ReactNative.Cxx/ModuleRegistration.h +5 -2
- package/Microsoft.ReactNative.Cxx/NamespaceRedirect.h +2 -0
- package/Microsoft.ReactNative.Cxx/TurboModuleProvider.h +1 -2
- package/Microsoft.ReactNative.Managed/IReactPromise.cs +0 -20
- package/Microsoft.ReactNative.Managed/JSValue.cs +1 -1
- package/Microsoft.ReactNative.Managed/JSValueReader.cs +438 -444
- package/Microsoft.ReactNative.Managed/JSValueWriter.cs +8 -7
- package/Microsoft.ReactNative.Managed/Microsoft.ReactNative.Managed.csproj +22 -7
- package/Microsoft.ReactNative.Managed/ReactAttributes.cs +16 -0
- package/Microsoft.ReactNative.Managed/ReactConstantProvider.cs +5 -0
- package/Microsoft.ReactNative.Managed/ReactContext.cs +19 -2
- package/Microsoft.ReactNative.Managed/ReactDispatcher.cs +34 -0
- package/Microsoft.ReactNative.Managed/ReactError.cs +36 -0
- package/Microsoft.ReactNative.Managed/ReactNotificationArgsOf.cs +23 -0
- package/Microsoft.ReactNative.Managed/ReactNotificationHandlerOf.cs +7 -0
- package/Microsoft.ReactNative.Managed/ReactNotificationIdOf.cs +44 -0
- package/Microsoft.ReactNative.Managed/ReactNotificationService.cs +146 -0
- package/Microsoft.ReactNative.Managed/ReactNotificationSubscription.cs +43 -0
- package/Microsoft.ReactNative.Managed/ReactNotificationSubscriptionRevoker.cs +64 -0
- package/Microsoft.ReactNative.Managed/ReactPromise.cs +123 -81
- package/Microsoft.ReactNative.Managed/ReactPropertyBag.cs +91 -0
- package/Microsoft.ReactNative.Managed/ReactPropertyIdOf.cs +44 -0
- package/Microsoft.ReactNative.Managed/ReactPropertyName.cs +39 -0
- package/Microsoft.ReactNative.Managed/ReactPropertyNamespace.cs +26 -0
- package/Microsoft.ReactNative.Managed/ReactSettingsSnapshot.cs +44 -0
- package/Microsoft.ReactNative.Managed/ReactTaskExtensions.cs +15 -4
- package/Microsoft.ReactNative.Managed/packages.lock.json +51 -2
- package/Microsoft.ReactNative.Managed.CodeGen/App.cs +1 -1
- package/Microsoft.ReactNative.Managed.CodeGen/CodeAnalyzer.cs +793 -731
- package/Microsoft.ReactNative.Managed.CodeGen/CodeGenerator.Module.cs +81 -44
- package/Microsoft.ReactNative.Managed.CodeGen/CodeGenerator.Serializers.cs +57 -18
- package/Microsoft.ReactNative.Managed.CodeGen/DiagnosticDescriptors.cs +36 -4
- package/Microsoft.ReactNative.Managed.CodeGen/Microsoft.ReactNative.Managed.CodeGen.csproj +5 -5
- package/Microsoft.ReactNative.Managed.CodeGen/Model/ReactAssembly.cs +3 -3
- package/Microsoft.ReactNative.Managed.CodeGen/Model/ReactGetConstants.cs +17 -0
- package/Microsoft.ReactNative.Managed.CodeGen/Model/ReactMethod.cs +11 -2
- package/Microsoft.ReactNative.Managed.CodeGen/Model/ReactModule.cs +2 -0
- package/Microsoft.ReactNative.Managed.CodeGen/Model/ReactTypes.cs +10 -4
- package/Microsoft.ReactNative.Managed.CodeGen/Properties/PublishProfiles/DeployAsTool-Debug.pubxml +1 -1
- package/Microsoft.ReactNative.Managed.CodeGen/Properties/PublishProfiles/DeployAsTool-Release.pubxml +1 -1
- package/Microsoft.ReactNative.Managed.CodeGen/ReactNativeNames.cs +29 -3
- package/Microsoft.ReactNative.Managed.CodeGen/SyntaxHelpers.cs +6 -0
- package/Mso/smartPtr/cntPtr.h +21 -21
- package/PropertySheets/Codegen.props +15 -0
- package/PropertySheets/Codegen.targets +19 -0
- package/PropertySheets/CppAppConsumeCSharpModule.props +3 -0
- package/PropertySheets/External/Microsoft.ReactNative.CSharp.Dependencies.props +17 -0
- package/PropertySheets/External/Microsoft.ReactNative.Common.props +3 -0
- package/PropertySheets/External/Microsoft.ReactNative.Cpp.ProjectReferences.props +0 -3
- package/PropertySheets/External/Microsoft.ReactNative.Uwp.CSharpApp.props +1 -0
- package/PropertySheets/External/Microsoft.ReactNative.Uwp.CSharpApp.targets +3 -0
- package/PropertySheets/External/Microsoft.ReactNative.Uwp.CSharpLib.targets +1 -0
- package/PropertySheets/External/Microsoft.ReactNative.Uwp.CppApp.props +1 -0
- package/PropertySheets/External/Microsoft.ReactNative.Uwp.CppApp.targets +3 -0
- package/PropertySheets/External/Microsoft.ReactNative.Uwp.CppLib.targets +1 -0
- package/PropertySheets/External/Microsoft.ReactNative.WinAppSDK.CSharp.PackageReferences.props +11 -0
- package/PropertySheets/External/Microsoft.ReactNative.WinAppSDK.CSharpApp.props +1 -0
- package/PropertySheets/External/Microsoft.ReactNative.WinAppSDK.CSharpApp.targets +51 -0
- package/PropertySheets/External/Microsoft.ReactNative.WindowsSdk.Default.props +10 -1
- package/PropertySheets/Generated/PackageVersion.g.props +3 -3
- package/PropertySheets/JSEngine.props +10 -3
- package/PropertySheets/ManagedCodeGen/Microsoft.ReactNative.Managed.CodeGen.targets +1 -1
- package/PropertySheets/NewAPIDeclarations.props +25 -0
- package/PropertySheets/React.Cpp.props +2 -2
- package/PropertySheets/WinUI.props +1 -1
- package/README.md +2 -2
- package/ReactCommon/TEMP_UntilReactCommonUpdate/react/renderer/core/ConcreteComponentDescriptor.h +2 -1
- package/ReactCommon/TEMP_UntilReactCommonUpdate/react/renderer/mapbuffer/MapBufferBuilder.cpp +182 -0
- package/ReactCommon/Yoga.cpp +76 -29
- package/Scripts/IntegrationTests.ps1 +1 -1
- package/Scripts/JustMyXaml.ps1 +8 -8
- package/Scripts/Microsoft.ReactNative.Managed.nuspec +1 -1
- package/Scripts/Microsoft.ReactNative.WindowsAppSDK.nuspec +3 -3
- package/Scripts/OfficeReact.Win32.nuspec +2 -0
- package/Scripts/Tfs/Layout-Desktop-Headers.ps1 +31 -1
- package/Scripts/UnitTest.ps1 +1 -1
- package/Scripts/rnw-dependencies.ps1 +317 -162
- package/Shared/Composition/CompositionSwitcher.interop.h +39 -0
- package/Shared/HermesShim.h +1 -1
- package/Shared/JSI/ChakraRuntime.cpp +42 -0
- package/Shared/JSI/ChakraRuntime.h +13 -0
- package/Shared/JSI/NapiJsiV8RuntimeHolder.h +0 -2
- package/Shared/Networking/IWebSocketResource.h +1 -0
- package/Shared/Networking/OriginPolicyHttpFilter.cpp +6 -6
- package/Shared/OInstance.cpp +2 -0
- package/Shared/Shared.vcxitems +34 -4
- package/Shared/Shared.vcxitems.filters +1 -12
- package/Shared/V8JSIRuntimeHolder.h +0 -2
- package/codegen/NativeAccessibilityInfoSpec.g.h +12 -12
- package/codegen/NativeAccessibilityManagerSpec.g.h +37 -31
- package/codegen/NativeActionSheetManagerSpec.g.h +6 -6
- package/codegen/NativeAlertManagerSpec.g.h +4 -2
- package/codegen/NativeAnimatedModuleSpec.g.h +48 -48
- package/codegen/NativeAnimatedTurboModuleSpec.g.h +48 -48
- package/codegen/NativeAnimationsDebugModuleSpec.g.h +4 -4
- package/codegen/NativeAppStateSpec.g.h +6 -6
- package/codegen/NativeAppearanceSpec.g.h +6 -6
- package/codegen/NativeBlobModuleSpec.g.h +12 -12
- package/codegen/NativeBugReportingSpec.g.h +6 -6
- package/codegen/NativeClipboardSpec.g.h +4 -4
- package/codegen/NativeDatePickerAndroidSpec.g.h +2 -2
- package/codegen/NativeDevLoadingViewSpec.g.h +4 -4
- package/codegen/NativeDevMenuSpec.g.h +10 -10
- package/codegen/NativeDevSettingsSpec.g.h +22 -22
- package/codegen/NativeDevSplitBundleLoaderSpec.g.h +2 -2
- package/codegen/NativeDeviceEventManagerSpec.g.h +2 -2
- package/codegen/NativeDialogManagerAndroidSpec.g.h +2 -2
- package/codegen/NativeDialogManagerWindowsSpec.g.h +2 -2
- package/codegen/NativeExceptionsManagerSpec.g.h +10 -10
- package/codegen/NativeFileReaderModuleSpec.g.h +4 -4
- package/codegen/NativeFrameRateLoggerSpec.g.h +8 -8
- package/codegen/NativeHeadlessJsTaskSupportSpec.g.h +4 -4
- package/codegen/NativeI18nManagerSpec.g.h +6 -6
- package/codegen/NativeImageEditorSpec.g.h +2 -2
- package/codegen/NativeImageLoaderAndroidSpec.g.h +10 -10
- package/codegen/NativeImageLoaderIOSSpec.g.h +10 -10
- package/codegen/NativeImageStoreAndroidSpec.g.h +2 -2
- package/codegen/NativeImageStoreIOSSpec.g.h +8 -8
- package/codegen/NativeIntentAndroidSpec.g.h +10 -10
- package/codegen/NativeJSCHeapCaptureSpec.g.h +2 -2
- package/codegen/NativeJSCSamplingProfilerSpec.g.h +2 -2
- package/codegen/NativeKeyboardObserverSpec.g.h +4 -4
- package/codegen/NativeLinkingManagerSpec.g.h +12 -12
- package/codegen/NativeLogBoxSpec.g.h +4 -4
- package/codegen/NativeModalManagerSpec.g.h +4 -4
- package/codegen/NativeNetworkingAndroidSpec.g.h +10 -10
- package/codegen/NativeNetworkingIOSSpec.g.h +10 -10
- package/codegen/NativePerformanceObserverSpec.g.h +69 -0
- package/codegen/NativePermissionsAndroidSpec.g.h +8 -8
- package/codegen/NativePlatformConstantsAndroidSpec.g.h +2 -2
- package/codegen/NativePushNotificationManagerIOSSpec.g.h +36 -36
- package/codegen/NativeRedBoxSpec.g.h +4 -4
- package/codegen/NativeSampleTurboModuleSpec.g.h +22 -22
- package/codegen/NativeSegmentFetcherSpec.g.h +4 -4
- package/codegen/NativeSettingsManagerSpec.g.h +4 -4
- package/codegen/NativeShareModuleSpec.g.h +2 -2
- package/codegen/NativeSoundManagerSpec.g.h +2 -2
- package/codegen/NativeStatusBarManagerAndroidSpec.g.h +8 -8
- package/codegen/NativeStatusBarManagerIOSSpec.g.h +12 -12
- package/codegen/NativeTimingSpec.g.h +6 -6
- package/codegen/NativeToastAndroidSpec.g.h +6 -6
- package/codegen/NativeUIManagerSpec.g.h +50 -50
- package/codegen/NativeVibrationSpec.g.h +6 -6
- package/codegen/NativeWebSocketModuleSpec.g.h +14 -14
- package/codegen/react/components/rnwcore/ComponentDescriptors.h +3 -4
- package/codegen/react/components/rnwcore/EventEmitters.cpp +5 -4
- package/codegen/react/components/rnwcore/EventEmitters.h +21 -26
- package/codegen/react/components/rnwcore/Props.cpp +3 -10
- package/codegen/react/components/rnwcore/Props.h +19 -28
- package/codegen/react/components/rnwcore/ShadowNodes.cpp +3 -4
- package/codegen/react/components/rnwcore/ShadowNodes.h +36 -30
- package/codegen/react/components/rnwcore/States.cpp +18 -0
- package/codegen/react/components/rnwcore/States.h +156 -0
- package/codegen/rnwcoreJSI-generated.cpp +1670 -0
- package/codegen/rnwcoreJSI.h +5620 -0
- package/fmt/cgmanifest.json +1 -0
- package/fmt/fmt.vcxproj +2 -1
- package/index.js +89 -55
- package/index.windows.js +89 -55
- package/interface.js +8 -0
- package/jest/react-native-env.js +18 -0
- package/jest/renderer.js +2 -2
- package/jest/setup.js +7 -9
- package/just-task.js +5 -1
- package/package.json +37 -37
- package/template/cpp-app/proj/MyApp.sln +2 -2
- package/template/cpp-app/proj/MyApp.vcxproj +3 -3
- package/template/cpp-app/src/ReactPackageProvider.cpp +1 -1
- package/template/cpp-lib/proj/MyLib.sln +2 -2
- package/template/cpp-lib/proj/MyLib.vcxproj +3 -3
- package/template/cpp-lib/src/ReactPackageProvider.cpp +1 -1
- package/template/cs-app/proj/MyApp.csproj +10 -8
- package/template/cs-app/proj/MyApp.sln +2 -2
- package/template/cs-app-WinAppSDK/MyApp/App.xaml.cs +3 -3
- package/template/cs-app-WinAppSDK/proj/ExperimentalFeatures.props +2 -1
- package/template/cs-app-WinAppSDK/proj/MyApp.csproj +19 -15
- package/template/cs-app-WinAppSDK/proj/MyApp.sln +2 -2
- package/template/cs-lib/proj/MyLib.csproj +14 -8
- package/template/cs-lib/proj/MyLib.sln +2 -2
- package/template/shared-app/proj/ExperimentalFeatures.props +2 -0
- package/template/shared-lib/proj/ExperimentalFeatures.props +2 -0
- package/Libraries/Components/MaskedView/MaskedViewIOS.ios.js +0 -93
- package/Libraries/Components/MaskedView/MaskedViewIOS.windows.js +0 -9
- package/Libraries/Components/MaskedView/RCTMaskedViewNativeComponent.js +0 -21
- package/Libraries/Core/setUpSystrace.js +0 -21
- package/Libraries/Image/ImagePickerIOS.js +0 -103
- package/Libraries/Image/NativeImagePickerIOS.js +0 -38
- package/Libraries/Lists/VirtualizedList.windows.js +0 -9
- package/Libraries/Lists/__tests__/CellRenderMask-test.js +0 -179
- package/Libraries/Lists/__tests__/FillRateHelper-test.js +0 -120
- package/Libraries/Lists/__tests__/FlatList-test.js +0 -155
- package/Libraries/Lists/__tests__/SectionList-test.js +0 -109
- package/Libraries/Lists/__tests__/ViewabilityHelper-test.js +0 -440
- package/Libraries/Lists/__tests__/VirtualizeUtils-test.js +0 -91
- package/Libraries/Lists/__tests__/VirtualizedList-test.js +0 -1587
- package/Libraries/Lists/__tests__/VirtualizedSectionList-test.js +0 -269
- package/Libraries/Storage/AsyncStorage.js +0 -385
- package/Libraries/Storage/NativeAsyncLocalStorage.js +0 -44
- package/Libraries/Storage/NativeAsyncSQLiteDBStorage.js +0 -44
- package/Libraries/StyleSheet/processTransform.windows.js +0 -274
- package/Libraries/Utilities/JSDevSupportModule.js +0 -37
- package/Libraries/Utilities/NativeJSDevSupport.js +0 -23
- package/Microsoft.ReactNative/Fabric/ActivityIndicatorComponentView.cpp +0 -81
- package/Microsoft.ReactNative/Fabric/ActivityIndicatorComponentView.h +0 -46
- package/Microsoft.ReactNative/Fabric/ComponentViewRegistry.cpp +0 -118
- package/Microsoft.ReactNative/Fabric/ImageComponentView.cpp +0 -138
- package/Microsoft.ReactNative/Fabric/ImageComponentView.h +0 -49
- package/Microsoft.ReactNative/Fabric/ParagraphComponentView.cpp +0 -160
- package/Microsoft.ReactNative/Fabric/ParagraphComponentView.h +0 -40
- package/Microsoft.ReactNative/Fabric/ScrollViewComponentView.cpp +0 -200
- package/Microsoft.ReactNative/Fabric/ScrollViewComponentView.h +0 -62
- package/Microsoft.ReactNative/Fabric/SliderComponentView.cpp +0 -107
- package/Microsoft.ReactNative/Fabric/SliderComponentView.h +0 -51
- package/Microsoft.ReactNative/Fabric/SwitchComponentView.cpp +0 -109
- package/Microsoft.ReactNative/Fabric/SwitchComponentView.h +0 -52
- package/Microsoft.ReactNative/Fabric/TextComponentView.cpp +0 -98
- package/Microsoft.ReactNative/Fabric/TextComponentView.h +0 -39
- package/Microsoft.ReactNative/Fabric/TextInput/WindowsTextInputComponentDescriptor.h +0 -197
- package/Microsoft.ReactNative/Fabric/TextInput/WindowsTextInputComponentView.cpp +0 -308
- package/Microsoft.ReactNative/Fabric/TextInput/WindowsTextInputComponentView.h +0 -52
- package/Microsoft.ReactNative/Fabric/ViewComponentView.cpp +0 -229
- package/Microsoft.ReactNative/Fabric/ViewComponentView.h +0 -56
- package/Microsoft.ReactNative/Fabric/platform/react/renderer/components/slider/SliderMeasurementsManager.cpp +0 -46
- package/Microsoft.ReactNative/Fabric/platform/react/renderer/components/slider/SliderMeasurementsManager.h +0 -30
- package/ReactCommon/TEMP_UntilReactCommonUpdate/cxxreact/JSExecutor.h +0 -145
- package/ReactCommon/TEMP_UntilReactCommonUpdate/cxxreact/NativeToJsBridge.cpp +0 -344
- package/ReactCommon/TEMP_UntilReactCommonUpdate/react/renderer/components/text/BaseTextProps.cpp +0 -313
- package/ReactCommon/TEMP_UntilReactCommonUpdate/react/renderer/components/view/ViewProps.cpp +0 -455
- package/ReactCommon/TEMP_UntilReactCommonUpdate/react/renderer/core/PropsMacros.h +0 -91
- package/ReactCommon/TEMP_UntilReactCommonUpdate/yoga/yoga/CompactValue.h +0 -206
- package/codegen/NativeAsyncLocalStorageSpec.g.h +0 -111
- package/codegen/NativeAsyncSQLiteDBStorageSpec.g.h +0 -111
- package/codegen/NativeImagePickerIOSSpec.g.h +0 -79
- package/codegen/NativeJSDevSupportSpec.g.h +0 -57
- package/rntypes/BatchedBridge.d.ts +0 -23
- package/rntypes/Devtools.d.ts +0 -20
- package/rntypes/LaunchScreen.d.ts +0 -9
- package/rntypes/globals.d.ts +0 -497
- package/rntypes/index.d.ts +0 -9754
- package/rntypes/legacy-properties.d.ts +0 -238
- package/typings-index.d.ts +0 -19
- package/typings-index.js +0 -44
- package/typings-index.js.map +0 -1
|
@@ -0,0 +1,1217 @@
|
|
|
1
|
+
|
|
2
|
+
// Copyright (c) Microsoft Corporation.
|
|
3
|
+
// Licensed under the MIT License.
|
|
4
|
+
|
|
5
|
+
#pragma once
|
|
6
|
+
|
|
7
|
+
#include "CompositionViewComponentView.h"
|
|
8
|
+
|
|
9
|
+
#include <UI.Xaml.Controls.h>
|
|
10
|
+
#include <Utils/ValueUtils.h>
|
|
11
|
+
#include <Views/FrameworkElementTransferProperties.h>
|
|
12
|
+
#include <winrt/Windows.UI.Composition.h>
|
|
13
|
+
#include "CompositionContextHelper.h"
|
|
14
|
+
#include "CompositionHelpers.h"
|
|
15
|
+
#include "d2d1helper.h"
|
|
16
|
+
|
|
17
|
+
namespace Microsoft::ReactNative {
|
|
18
|
+
|
|
19
|
+
// TODO where should we store focus - a more complete focus management needs to be added in the future
|
|
20
|
+
static CompositionBaseComponentView *g_focusedComponent = nullptr;
|
|
21
|
+
|
|
22
|
+
CompositionBaseComponentView *GetFocusedComponent() noexcept {
|
|
23
|
+
return g_focusedComponent;
|
|
24
|
+
}
|
|
25
|
+
void SetFocusedComponent(CompositionBaseComponentView *value) noexcept {
|
|
26
|
+
if (g_focusedComponent == value)
|
|
27
|
+
return;
|
|
28
|
+
|
|
29
|
+
if (g_focusedComponent) {
|
|
30
|
+
g_focusedComponent->onFocusLost();
|
|
31
|
+
}
|
|
32
|
+
|
|
33
|
+
if (value)
|
|
34
|
+
value->onFocusGained();
|
|
35
|
+
|
|
36
|
+
g_focusedComponent = value;
|
|
37
|
+
}
|
|
38
|
+
|
|
39
|
+
CompositionBaseComponentView::CompositionBaseComponentView(
|
|
40
|
+
const winrt::Microsoft::ReactNative::Composition::ICompositionContext &compContext,
|
|
41
|
+
facebook::react::Tag tag)
|
|
42
|
+
: m_tag(tag), m_compContext(compContext) {}
|
|
43
|
+
|
|
44
|
+
facebook::react::Tag CompositionBaseComponentView::tag() const noexcept {
|
|
45
|
+
return m_tag;
|
|
46
|
+
}
|
|
47
|
+
|
|
48
|
+
void CompositionBaseComponentView::parent(IComponentView *parent) noexcept {
|
|
49
|
+
m_parent = parent;
|
|
50
|
+
}
|
|
51
|
+
|
|
52
|
+
IComponentView *CompositionBaseComponentView::parent() const noexcept {
|
|
53
|
+
return m_parent;
|
|
54
|
+
}
|
|
55
|
+
|
|
56
|
+
void CompositionBaseComponentView::onFocusLost() noexcept {}
|
|
57
|
+
|
|
58
|
+
void CompositionBaseComponentView::onFocusGained() noexcept {}
|
|
59
|
+
|
|
60
|
+
void CompositionBaseComponentView::updateEventEmitter(
|
|
61
|
+
facebook::react::EventEmitter::Shared const &eventEmitter) noexcept {
|
|
62
|
+
m_eventEmitter = std::static_pointer_cast<facebook::react::ViewEventEmitter const>(eventEmitter);
|
|
63
|
+
}
|
|
64
|
+
|
|
65
|
+
void CompositionBaseComponentView::handleCommand(std::string const &commandName, folly::dynamic const &arg) noexcept {
|
|
66
|
+
assert(false); // Unhandled command
|
|
67
|
+
}
|
|
68
|
+
|
|
69
|
+
int64_t CompositionBaseComponentView::SendMessage(uint32_t msg, uint64_t wParam, int64_t lParam) noexcept {
|
|
70
|
+
return 0;
|
|
71
|
+
}
|
|
72
|
+
|
|
73
|
+
RECT CompositionBaseComponentView::getClientRect() const noexcept {
|
|
74
|
+
RECT rc{0};
|
|
75
|
+
if (m_parent) {
|
|
76
|
+
rc = m_parent->getClientRect();
|
|
77
|
+
}
|
|
78
|
+
|
|
79
|
+
rc.left += static_cast<LONG>(m_layoutMetrics.frame.origin.x * m_layoutMetrics.pointScaleFactor);
|
|
80
|
+
rc.top += static_cast<LONG>(m_layoutMetrics.frame.origin.y * m_layoutMetrics.pointScaleFactor);
|
|
81
|
+
rc.right = rc.left + static_cast<LONG>(m_layoutMetrics.frame.size.width * m_layoutMetrics.pointScaleFactor);
|
|
82
|
+
rc.bottom = rc.top + static_cast<LONG>(m_layoutMetrics.frame.size.height * m_layoutMetrics.pointScaleFactor);
|
|
83
|
+
return rc;
|
|
84
|
+
}
|
|
85
|
+
|
|
86
|
+
const facebook::react::SharedViewEventEmitter &CompositionBaseComponentView::GetEventEmitter() const noexcept {
|
|
87
|
+
return m_eventEmitter;
|
|
88
|
+
}
|
|
89
|
+
|
|
90
|
+
bool CompositionBaseComponentView::ScrollWheel(facebook::react::Point pt, int32_t delta) noexcept {
|
|
91
|
+
return false;
|
|
92
|
+
}
|
|
93
|
+
|
|
94
|
+
std::array<
|
|
95
|
+
winrt::Microsoft::ReactNative::Composition::SpriteVisual,
|
|
96
|
+
CompositionBaseComponentView::SpecialBorderLayerCount>
|
|
97
|
+
CompositionBaseComponentView::FindSpecialBorderLayers() const noexcept {
|
|
98
|
+
std::array<winrt::Microsoft::ReactNative::Composition::SpriteVisual, SpecialBorderLayerCount> layers{
|
|
99
|
+
nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr};
|
|
100
|
+
|
|
101
|
+
if (m_numBorderVisuals) {
|
|
102
|
+
for (uint8_t i = 0; i < m_numBorderVisuals; i++) {
|
|
103
|
+
auto visual = Visual().GetAt(i);
|
|
104
|
+
layers[i] = visual.as<winrt::Microsoft::ReactNative::Composition::SpriteVisual>();
|
|
105
|
+
}
|
|
106
|
+
}
|
|
107
|
+
|
|
108
|
+
return layers;
|
|
109
|
+
}
|
|
110
|
+
|
|
111
|
+
struct RoundedPathParameters {
|
|
112
|
+
float topLeftRadiusX = 0;
|
|
113
|
+
float topLeftRadiusY = 0;
|
|
114
|
+
float topRightRadiusX = 0;
|
|
115
|
+
float topRightRadiusY = 0;
|
|
116
|
+
float bottomRightRadiusX = 0;
|
|
117
|
+
float bottomRightRadiusY = 0;
|
|
118
|
+
float bottomLeftRadiusX = 0;
|
|
119
|
+
float bottomLeftRadiusY = 0;
|
|
120
|
+
};
|
|
121
|
+
|
|
122
|
+
/*
|
|
123
|
+
* Creates and returns a PathGeometry object used to clip the visuals of an element when a BorderRadius is set.
|
|
124
|
+
* Can also be used as part of a GeometryGroup for drawing a rounded border / innerstroke when called from
|
|
125
|
+
* GetGeometryForRoundedBorder. "params" defines the radii (horizontal and vertical) for each corner (top left, top
|
|
126
|
+
* right, bottom right, bottom left). "rectPathGeometry" defines the bounding box of the generated shape.
|
|
127
|
+
*/
|
|
128
|
+
static winrt::com_ptr<ID2D1PathGeometry> GenerateRoundedRectPathGeometry(
|
|
129
|
+
winrt::Microsoft::ReactNative::Composition::ICompositionContext &compContext,
|
|
130
|
+
const RoundedPathParameters ¶ms,
|
|
131
|
+
const facebook::react::RectangleEdges<float> &rectPathGeometry) noexcept {
|
|
132
|
+
winrt::com_ptr<ID2D1PathGeometry> pathGeometry;
|
|
133
|
+
winrt::com_ptr<ID2D1Factory1> spD2dFactory;
|
|
134
|
+
compContext.as<Composition::ICompositionContextInterop>()->D2DFactory(spD2dFactory.put());
|
|
135
|
+
|
|
136
|
+
// Create a path geometry.
|
|
137
|
+
HRESULT hr = spD2dFactory->CreatePathGeometry(pathGeometry.put());
|
|
138
|
+
if (FAILED(hr)) {
|
|
139
|
+
assert(false);
|
|
140
|
+
return nullptr;
|
|
141
|
+
}
|
|
142
|
+
|
|
143
|
+
// Write to the path geometry using the geometry sink.
|
|
144
|
+
winrt::com_ptr<ID2D1GeometrySink> spSink = nullptr;
|
|
145
|
+
hr = pathGeometry->Open(spSink.put());
|
|
146
|
+
|
|
147
|
+
if (FAILED(hr)) {
|
|
148
|
+
assert(false);
|
|
149
|
+
return nullptr;
|
|
150
|
+
}
|
|
151
|
+
|
|
152
|
+
float left = rectPathGeometry.left;
|
|
153
|
+
float right = rectPathGeometry.right;
|
|
154
|
+
float top = rectPathGeometry.top;
|
|
155
|
+
float bottom = rectPathGeometry.bottom;
|
|
156
|
+
|
|
157
|
+
// This function uses Cubic Beziers to approximate Arc segments, even though D2D supports arcs.
|
|
158
|
+
// This is INTENTIONAL. D2D Arc Segments are eventually converted into cubic beziers, but this
|
|
159
|
+
// is done in such a way that we don't have control over how many bezier curve segments are used
|
|
160
|
+
// for each arc. We need to ensure that we always use the same number of control points so that
|
|
161
|
+
// our paths can be used in a PathKeyFrameAnimation.
|
|
162
|
+
// Value for control point scale factor derived from methods described in:
|
|
163
|
+
// https://web.archive.org/web/20200322075504/http://itc.ktu.lt/index.php/ITC/article/download/11812/6479
|
|
164
|
+
constexpr float controlPointScaleFactor = 0.44771528244f; // 1 - (4 * (sqrtf(2.0f) - 1) / 3.0f);
|
|
165
|
+
|
|
166
|
+
#ifdef DEBUG
|
|
167
|
+
// std::sqrtf is not constexpr, so we precalculated this and wrote it in a constexpr form above.
|
|
168
|
+
// On debug, we should still check that the values are equivalent, though.
|
|
169
|
+
static float calculatedScaleFactor = 1 - (4 * (sqrtf(2.0f) - 1) / 3.0f);
|
|
170
|
+
assert(controlPointScaleFactor == calculatedScaleFactor);
|
|
171
|
+
#endif // DEBUG
|
|
172
|
+
|
|
173
|
+
bool needsConsistentNumberOfControlPoints = true; // VisualVersion::IsUseWinCompClippingRegionEnabled();
|
|
174
|
+
|
|
175
|
+
if (needsConsistentNumberOfControlPoints || (params.topLeftRadiusX != 0.0 && params.topLeftRadiusY != 0.0)) {
|
|
176
|
+
spSink->BeginFigure(D2D1::Point2F(left + params.topLeftRadiusX, top), D2D1_FIGURE_BEGIN_FILLED);
|
|
177
|
+
} else {
|
|
178
|
+
spSink->BeginFigure(D2D1::Point2F(left, top), D2D1_FIGURE_BEGIN_FILLED);
|
|
179
|
+
}
|
|
180
|
+
|
|
181
|
+
// Move to the top right corner
|
|
182
|
+
spSink->AddLine(D2D1::Point2F(right - params.topRightRadiusX, top));
|
|
183
|
+
if (needsConsistentNumberOfControlPoints) {
|
|
184
|
+
D2D1_BEZIER_SEGMENT arcSegmentTopRight = {
|
|
185
|
+
D2D1::Point2F(right - controlPointScaleFactor * params.topRightRadiusX, top),
|
|
186
|
+
D2D1::Point2F(right, top + controlPointScaleFactor * params.topRightRadiusY),
|
|
187
|
+
D2D1::Point2F(right, top + params.topRightRadiusY)};
|
|
188
|
+
|
|
189
|
+
spSink->AddBezier(&arcSegmentTopRight);
|
|
190
|
+
} else if (params.topRightRadiusX != 0.0 && params.topRightRadiusY != 0.0) {
|
|
191
|
+
D2D1_ARC_SEGMENT arcSegmentTopRight = {
|
|
192
|
+
D2D1::Point2F(right, top + params.topRightRadiusY),
|
|
193
|
+
D2D1::SizeF(params.topRightRadiusX, params.topRightRadiusY),
|
|
194
|
+
0.0f,
|
|
195
|
+
D2D1_SWEEP_DIRECTION_CLOCKWISE,
|
|
196
|
+
D2D1_ARC_SIZE_SMALL};
|
|
197
|
+
|
|
198
|
+
spSink->AddArc(&arcSegmentTopRight);
|
|
199
|
+
} else {
|
|
200
|
+
spSink->AddLine(D2D1::Point2F(right, top));
|
|
201
|
+
}
|
|
202
|
+
|
|
203
|
+
// Move to the bottom right corner
|
|
204
|
+
spSink->AddLine(D2D1::Point2F(right, bottom - params.bottomRightRadiusY));
|
|
205
|
+
if (needsConsistentNumberOfControlPoints) {
|
|
206
|
+
D2D1_BEZIER_SEGMENT arcSegmentBottomRight = {
|
|
207
|
+
D2D1::Point2F(right, bottom - controlPointScaleFactor * params.bottomRightRadiusY),
|
|
208
|
+
D2D1::Point2F(right - controlPointScaleFactor * params.bottomRightRadiusX, bottom),
|
|
209
|
+
D2D1::Point2F(right - params.bottomRightRadiusX, bottom)};
|
|
210
|
+
|
|
211
|
+
spSink->AddBezier(&arcSegmentBottomRight);
|
|
212
|
+
} else if (params.bottomRightRadiusX != 0.0 && params.bottomRightRadiusY != 0.0) {
|
|
213
|
+
D2D1_ARC_SEGMENT arcSegmentBottomRight = {
|
|
214
|
+
D2D1::Point2F(right - params.bottomRightRadiusX, bottom),
|
|
215
|
+
D2D1::SizeF(params.bottomRightRadiusX, params.bottomRightRadiusY),
|
|
216
|
+
0.0f,
|
|
217
|
+
D2D1_SWEEP_DIRECTION_CLOCKWISE,
|
|
218
|
+
D2D1_ARC_SIZE_SMALL};
|
|
219
|
+
|
|
220
|
+
spSink->AddArc(&arcSegmentBottomRight);
|
|
221
|
+
} else {
|
|
222
|
+
spSink->AddLine(D2D1::Point2F(right, bottom));
|
|
223
|
+
}
|
|
224
|
+
|
|
225
|
+
// Move to the bottom left corner
|
|
226
|
+
spSink->AddLine(D2D1::Point2F(left + params.bottomLeftRadiusX, bottom));
|
|
227
|
+
if (needsConsistentNumberOfControlPoints) {
|
|
228
|
+
D2D1_BEZIER_SEGMENT arcSegmentBottomLeft = {
|
|
229
|
+
D2D1::Point2F(left + controlPointScaleFactor * params.bottomLeftRadiusX, bottom),
|
|
230
|
+
D2D1::Point2F(left, bottom - controlPointScaleFactor * params.bottomLeftRadiusY),
|
|
231
|
+
D2D1::Point2F(left, bottom - params.bottomLeftRadiusY)};
|
|
232
|
+
|
|
233
|
+
spSink->AddBezier(&arcSegmentBottomLeft);
|
|
234
|
+
} else if (params.bottomLeftRadiusX != 0.0 && params.bottomLeftRadiusY != 0.0) {
|
|
235
|
+
D2D1_ARC_SEGMENT arcSegmentBottomLeft = {
|
|
236
|
+
D2D1::Point2F(left, bottom - params.bottomLeftRadiusY),
|
|
237
|
+
D2D1::SizeF(params.bottomLeftRadiusX, params.bottomLeftRadiusY),
|
|
238
|
+
0.0f,
|
|
239
|
+
D2D1_SWEEP_DIRECTION_CLOCKWISE,
|
|
240
|
+
D2D1_ARC_SIZE_SMALL};
|
|
241
|
+
|
|
242
|
+
spSink->AddArc(&arcSegmentBottomLeft);
|
|
243
|
+
} else {
|
|
244
|
+
spSink->AddLine(D2D1::Point2F(left, bottom));
|
|
245
|
+
}
|
|
246
|
+
|
|
247
|
+
// Move to the top left corner
|
|
248
|
+
spSink->AddLine(D2D1::Point2F(left, top + params.topLeftRadiusY));
|
|
249
|
+
if (needsConsistentNumberOfControlPoints) {
|
|
250
|
+
D2D1_BEZIER_SEGMENT arcSegmentTopLeft = {
|
|
251
|
+
D2D1::Point2F(left, top + controlPointScaleFactor * params.topLeftRadiusY),
|
|
252
|
+
D2D1::Point2F(left + controlPointScaleFactor * params.topLeftRadiusX, top),
|
|
253
|
+
D2D1::Point2F(left + params.topLeftRadiusX, top)};
|
|
254
|
+
|
|
255
|
+
spSink->AddBezier(&arcSegmentTopLeft);
|
|
256
|
+
} else if (params.topLeftRadiusX != 0.0 && params.topLeftRadiusY != 0.0) {
|
|
257
|
+
D2D1_ARC_SEGMENT arcSegmentTopLeft = {
|
|
258
|
+
D2D1::Point2F(left + params.topLeftRadiusX, top),
|
|
259
|
+
D2D1::SizeF(params.topLeftRadiusX, params.topLeftRadiusY),
|
|
260
|
+
0.0f,
|
|
261
|
+
D2D1_SWEEP_DIRECTION_CLOCKWISE,
|
|
262
|
+
D2D1_ARC_SIZE_SMALL};
|
|
263
|
+
|
|
264
|
+
spSink->AddArc(&arcSegmentTopLeft);
|
|
265
|
+
} else {
|
|
266
|
+
spSink->AddLine(D2D1::Point2F(left, top));
|
|
267
|
+
}
|
|
268
|
+
|
|
269
|
+
spSink->EndFigure(D2D1_FIGURE_END_CLOSED);
|
|
270
|
+
spSink->Close();
|
|
271
|
+
|
|
272
|
+
return pathGeometry;
|
|
273
|
+
}
|
|
274
|
+
|
|
275
|
+
RoundedPathParameters GenerateRoundedPathParameters(
|
|
276
|
+
const facebook::react::RectangleCorners<float> &baseRadius,
|
|
277
|
+
const facebook::react::RectangleEdges<float> &inset,
|
|
278
|
+
const facebook::react::Size &pathSize) noexcept {
|
|
279
|
+
RoundedPathParameters result;
|
|
280
|
+
|
|
281
|
+
if (pathSize.width == 0 || pathSize.height == 0) {
|
|
282
|
+
return result;
|
|
283
|
+
}
|
|
284
|
+
|
|
285
|
+
float totalTopRadius = baseRadius.topLeft + baseRadius.topRight;
|
|
286
|
+
float totalRightRadius = baseRadius.topRight + baseRadius.bottomRight;
|
|
287
|
+
float totalBottomRadius = baseRadius.bottomRight + baseRadius.bottomLeft;
|
|
288
|
+
float totalLeftRadius = baseRadius.bottomLeft + baseRadius.topLeft;
|
|
289
|
+
|
|
290
|
+
float maxHorizontalRadius = std::max(totalTopRadius, totalBottomRadius);
|
|
291
|
+
float maxVerticalRadius = std::max(totalLeftRadius, totalRightRadius);
|
|
292
|
+
|
|
293
|
+
double totalWidth = inset.left + inset.right + pathSize.width;
|
|
294
|
+
double totalHeight = inset.top + inset.bottom + pathSize.height;
|
|
295
|
+
|
|
296
|
+
float scaleHoriz = static_cast<float>(maxHorizontalRadius / totalWidth);
|
|
297
|
+
float scaleVert = static_cast<float>(maxVerticalRadius / totalHeight);
|
|
298
|
+
|
|
299
|
+
float maxScale = std::max(1.0f, std::max(scaleHoriz, scaleVert));
|
|
300
|
+
|
|
301
|
+
result.topLeftRadiusX = std::max(0.0f, baseRadius.topLeft / maxScale - inset.left);
|
|
302
|
+
result.topLeftRadiusY = std::max(0.0f, baseRadius.topLeft / maxScale - inset.top);
|
|
303
|
+
result.topRightRadiusX = std::max(0.0f, baseRadius.topRight / maxScale - inset.right);
|
|
304
|
+
result.topRightRadiusY = std::max(0.0f, baseRadius.topRight / maxScale - inset.top);
|
|
305
|
+
result.bottomRightRadiusX = std::max(0.0f, baseRadius.bottomRight / maxScale - inset.right);
|
|
306
|
+
result.bottomRightRadiusY = std::max(0.0f, baseRadius.bottomRight / maxScale - inset.bottom);
|
|
307
|
+
result.bottomLeftRadiusX = std::max(0.0f, baseRadius.bottomLeft / maxScale - inset.left);
|
|
308
|
+
result.bottomLeftRadiusY = std::max(0.0f, baseRadius.bottomLeft / maxScale - inset.bottom);
|
|
309
|
+
|
|
310
|
+
return result;
|
|
311
|
+
}
|
|
312
|
+
|
|
313
|
+
static winrt::com_ptr<ID2D1PathGeometry> GenerateRoundedRectPathGeometry(
|
|
314
|
+
winrt::Microsoft::ReactNative::Composition::ICompositionContext &compContext,
|
|
315
|
+
const facebook::react::RectangleCorners<float> &baseRadius,
|
|
316
|
+
const facebook::react::RectangleEdges<float> &inset,
|
|
317
|
+
const facebook::react::RectangleEdges<float> &rectPathGeometry) noexcept {
|
|
318
|
+
RoundedPathParameters params = GenerateRoundedPathParameters(
|
|
319
|
+
baseRadius,
|
|
320
|
+
inset,
|
|
321
|
+
{rectPathGeometry.right - rectPathGeometry.left, rectPathGeometry.bottom - rectPathGeometry.top});
|
|
322
|
+
|
|
323
|
+
return GenerateRoundedRectPathGeometry(compContext, params, rectPathGeometry);
|
|
324
|
+
}
|
|
325
|
+
|
|
326
|
+
void DrawShape(
|
|
327
|
+
ID2D1RenderTarget *pRT,
|
|
328
|
+
const D2D1_RECT_F &rect,
|
|
329
|
+
ID2D1Brush *brush,
|
|
330
|
+
FLOAT strokeWidth,
|
|
331
|
+
ID2D1StrokeStyle *strokeStyle) {
|
|
332
|
+
pRT->DrawRectangle(rect, brush, strokeWidth, strokeStyle);
|
|
333
|
+
}
|
|
334
|
+
|
|
335
|
+
void DrawShape(ID2D1RenderTarget *pRT, ID2D1GeometryGroup &geometry, ID2D1Brush *brush, FLOAT, ID2D1StrokeStyle *) {
|
|
336
|
+
pRT->FillGeometry(&geometry, brush);
|
|
337
|
+
}
|
|
338
|
+
|
|
339
|
+
void DrawShape(
|
|
340
|
+
ID2D1RenderTarget *pRT,
|
|
341
|
+
ID2D1PathGeometry &geometry,
|
|
342
|
+
ID2D1Brush *brush,
|
|
343
|
+
FLOAT strokeWidth,
|
|
344
|
+
ID2D1StrokeStyle *strokeStyle) {
|
|
345
|
+
pRT->DrawGeometry(&geometry, brush, strokeWidth, strokeStyle);
|
|
346
|
+
}
|
|
347
|
+
|
|
348
|
+
struct AutoDrawHelper {
|
|
349
|
+
AutoDrawHelper(winrt::com_ptr<Composition::ICompositionDrawingSurfaceInterop> &surface) {
|
|
350
|
+
m_surface = surface;
|
|
351
|
+
m_surface->BeginDraw(m_pRT.put(), &m_offset);
|
|
352
|
+
}
|
|
353
|
+
|
|
354
|
+
~AutoDrawHelper() {
|
|
355
|
+
m_surface->EndDraw();
|
|
356
|
+
}
|
|
357
|
+
|
|
358
|
+
const winrt::com_ptr<ID2D1DeviceContext> &GetRenderTarget() const noexcept {
|
|
359
|
+
return m_pRT;
|
|
360
|
+
}
|
|
361
|
+
|
|
362
|
+
POINT Offset() const noexcept {
|
|
363
|
+
return m_offset;
|
|
364
|
+
}
|
|
365
|
+
|
|
366
|
+
private:
|
|
367
|
+
winrt::com_ptr<Composition::ICompositionDrawingSurfaceInterop> m_surface;
|
|
368
|
+
POINT m_offset;
|
|
369
|
+
winrt::com_ptr<ID2D1DeviceContext> m_pRT;
|
|
370
|
+
};
|
|
371
|
+
|
|
372
|
+
template <typename TShape>
|
|
373
|
+
void SetBorderLayerPropertiesCommon(
|
|
374
|
+
winrt::Microsoft::ReactNative::Composition::ICompositionContext &compContext,
|
|
375
|
+
winrt::Microsoft::ReactNative::Composition::SpriteVisual &layer,
|
|
376
|
+
TShape &shape,
|
|
377
|
+
winrt::com_ptr<Composition::ICompositionDrawingSurfaceInterop> &borderTexture,
|
|
378
|
+
const D2D1_RECT_F &textureRect,
|
|
379
|
+
facebook::react::Point anchorPoint,
|
|
380
|
+
facebook::react::Point anchorOffset,
|
|
381
|
+
winrt::Windows::Foundation::Numerics::float2 size,
|
|
382
|
+
winrt::Windows::Foundation::Numerics::float2 relativeSizeAdjustment,
|
|
383
|
+
FLOAT strokeWidth,
|
|
384
|
+
const facebook::react::SharedColor &borderColor,
|
|
385
|
+
facebook::react::BorderStyle borderStyle) {
|
|
386
|
+
if ((textureRect.right - textureRect.left) <= 0 && (textureRect.bottom - textureRect.top) <= 0)
|
|
387
|
+
return;
|
|
388
|
+
|
|
389
|
+
auto surface = compContext.CreateDrawingSurface(
|
|
390
|
+
{(textureRect.right - textureRect.left), (textureRect.bottom - textureRect.top)},
|
|
391
|
+
winrt::Windows::Graphics::DirectX::DirectXPixelFormat::B8G8R8A8UIntNormalized,
|
|
392
|
+
winrt::Windows::Graphics::DirectX::DirectXAlphaMode::Premultiplied);
|
|
393
|
+
surface.as(borderTexture);
|
|
394
|
+
|
|
395
|
+
layer.Brush(compContext.CreateSurfaceBrush(surface));
|
|
396
|
+
layer.Offset({anchorOffset.x, anchorOffset.y, 0}, {anchorPoint.x, anchorPoint.y, 0});
|
|
397
|
+
layer.RelativeSizeWithOffset(size, relativeSizeAdjustment);
|
|
398
|
+
|
|
399
|
+
AutoDrawHelper autoDraw(borderTexture);
|
|
400
|
+
|
|
401
|
+
winrt::com_ptr<ID2D1DeviceContext> pRT{autoDraw.GetRenderTarget()};
|
|
402
|
+
|
|
403
|
+
if (!pRT) {
|
|
404
|
+
return;
|
|
405
|
+
}
|
|
406
|
+
|
|
407
|
+
// Clear with transparency
|
|
408
|
+
pRT->Clear();
|
|
409
|
+
|
|
410
|
+
if (!facebook::react::isColorMeaningful(borderColor)) {
|
|
411
|
+
return;
|
|
412
|
+
}
|
|
413
|
+
|
|
414
|
+
winrt::com_ptr<ID2D1Factory> spFactory;
|
|
415
|
+
pRT->GetFactory(spFactory.put());
|
|
416
|
+
assert(spFactory);
|
|
417
|
+
if (spFactory == nullptr)
|
|
418
|
+
return;
|
|
419
|
+
|
|
420
|
+
winrt::com_ptr<ID2D1SolidColorBrush> spBorderBrush;
|
|
421
|
+
pRT->CreateSolidColorBrush(borderColor.AsD2DColor(), spBorderBrush.put());
|
|
422
|
+
assert(spBorderBrush);
|
|
423
|
+
if (spBorderBrush == nullptr)
|
|
424
|
+
return;
|
|
425
|
+
|
|
426
|
+
winrt::com_ptr<ID2D1StrokeStyle> spStrokeStyle;
|
|
427
|
+
|
|
428
|
+
enum class BorderStyle { Solid, Dotted, Dashed };
|
|
429
|
+
|
|
430
|
+
if (borderStyle == facebook::react::BorderStyle::Dotted || borderStyle == facebook::react::BorderStyle::Dashed) {
|
|
431
|
+
const auto capStyle =
|
|
432
|
+
borderStyle == facebook::react::BorderStyle::Dashed ? D2D1_CAP_STYLE_FLAT : D2D1_CAP_STYLE_ROUND;
|
|
433
|
+
const auto strokeStyleProps = D2D1::StrokeStyleProperties(
|
|
434
|
+
capStyle,
|
|
435
|
+
capStyle,
|
|
436
|
+
capStyle,
|
|
437
|
+
D2D1_LINE_JOIN_MITER,
|
|
438
|
+
10.0f,
|
|
439
|
+
borderStyle == facebook::react::BorderStyle::Dashed ? D2D1_DASH_STYLE_DASH : D2D1_DASH_STYLE_DOT,
|
|
440
|
+
0.0f);
|
|
441
|
+
spFactory->CreateStrokeStyle(&strokeStyleProps, nullptr, 0, spStrokeStyle.put());
|
|
442
|
+
}
|
|
443
|
+
D2D1::Matrix3x2F originalTransform;
|
|
444
|
+
D2D1::Matrix3x2F translationTransform =
|
|
445
|
+
D2D1::Matrix3x2F::Translation(-textureRect.left + autoDraw.Offset().x, -textureRect.top + autoDraw.Offset().y);
|
|
446
|
+
|
|
447
|
+
pRT->GetTransform(&originalTransform);
|
|
448
|
+
translationTransform = originalTransform * translationTransform;
|
|
449
|
+
|
|
450
|
+
float oldDpiX, oldDpiY;
|
|
451
|
+
pRT->SetTransform(translationTransform);
|
|
452
|
+
pRT->GetDpi(&oldDpiX, &oldDpiY);
|
|
453
|
+
pRT->SetDpi(96.0f, 96.0f); // We have already done the dpi scaling...
|
|
454
|
+
|
|
455
|
+
DrawShape(pRT.get(), shape, spBorderBrush.get(), strokeWidth, spStrokeStyle.get());
|
|
456
|
+
|
|
457
|
+
pRT->SetDpi(oldDpiX, oldDpiY);
|
|
458
|
+
pRT->SetTransform(originalTransform);
|
|
459
|
+
}
|
|
460
|
+
|
|
461
|
+
template <typename TShape>
|
|
462
|
+
void SetBorderLayerProperties(
|
|
463
|
+
winrt::Microsoft::ReactNative::Composition::ICompositionContext &compContext,
|
|
464
|
+
winrt::Microsoft::ReactNative::Composition::SpriteVisual &layer,
|
|
465
|
+
TShape &shape,
|
|
466
|
+
winrt::com_ptr<Composition::ICompositionDrawingSurfaceInterop> &borderTexture,
|
|
467
|
+
const D2D1_RECT_F &textureRect,
|
|
468
|
+
facebook::react::Point anchorPoint,
|
|
469
|
+
facebook::react::Point anchorOffset,
|
|
470
|
+
winrt::Windows::Foundation::Numerics::float2 size,
|
|
471
|
+
winrt::Windows::Foundation::Numerics::float2 relativeSizeAdjustment,
|
|
472
|
+
FLOAT strokeWidth,
|
|
473
|
+
const facebook::react::SharedColor &borderColor,
|
|
474
|
+
facebook::react::BorderStyle borderStyle) {
|
|
475
|
+
if constexpr (!std::is_base_of_v<ID2D1GeometryGroup, TShape>) {
|
|
476
|
+
SetBorderLayerPropertiesCommon(
|
|
477
|
+
compContext,
|
|
478
|
+
layer,
|
|
479
|
+
shape,
|
|
480
|
+
borderTexture,
|
|
481
|
+
textureRect,
|
|
482
|
+
anchorPoint,
|
|
483
|
+
anchorOffset,
|
|
484
|
+
size,
|
|
485
|
+
relativeSizeAdjustment,
|
|
486
|
+
strokeWidth,
|
|
487
|
+
borderColor,
|
|
488
|
+
borderStyle);
|
|
489
|
+
} else {
|
|
490
|
+
// if (VisualVersion::IsUseWinCompClippingRegionEnabled())
|
|
491
|
+
{
|
|
492
|
+
layer.Offset({anchorOffset.x, anchorOffset.y, 0}, {anchorPoint.x, anchorPoint.y, 0});
|
|
493
|
+
layer.Size({textureRect.right - textureRect.left, textureRect.bottom - textureRect.top});
|
|
494
|
+
|
|
495
|
+
layer.Brush(compContext.CreateColorBrush(borderColor.AsWindowsColor()));
|
|
496
|
+
|
|
497
|
+
winrt::com_ptr<ID2D1Factory1> spD2dFactory;
|
|
498
|
+
compContext.as<Composition::ICompositionContextInterop>()->D2DFactory(spD2dFactory.put());
|
|
499
|
+
|
|
500
|
+
winrt::com_ptr<ID2D1TransformedGeometry> transformedShape;
|
|
501
|
+
D2D1::Matrix3x2F translationTransform = D2D1::Matrix3x2F::Translation(-textureRect.left, -textureRect.top);
|
|
502
|
+
winrt::check_hresult(
|
|
503
|
+
spD2dFactory->CreateTransformedGeometry(&shape, &translationTransform, transformedShape.put()));
|
|
504
|
+
|
|
505
|
+
layer.as<Composition::IVisualInterop>()->SetClippingPath(transformedShape.get());
|
|
506
|
+
}
|
|
507
|
+
/*
|
|
508
|
+
else
|
|
509
|
+
{
|
|
510
|
+
SetBorderLayerPropertiesCommon(comContext, layer, shape, borderTexture, textureRect,
|
|
511
|
+
anchorPoint, anchorOffset, strokeWidth, borderColor, borderStyle);
|
|
512
|
+
}
|
|
513
|
+
*/
|
|
514
|
+
}
|
|
515
|
+
}
|
|
516
|
+
|
|
517
|
+
namespace AnchorPosition {
|
|
518
|
+
const float Left = 0.0;
|
|
519
|
+
const float Center = 0.5;
|
|
520
|
+
const float Right = 1.0;
|
|
521
|
+
const float Top = 0.0;
|
|
522
|
+
const float Bottom = 1.0;
|
|
523
|
+
} // namespace AnchorPosition
|
|
524
|
+
|
|
525
|
+
template <typename TShape>
|
|
526
|
+
void DrawAllBorderLayers(
|
|
527
|
+
winrt::Microsoft::ReactNative::Composition::ICompositionContext &compContext,
|
|
528
|
+
std::array<
|
|
529
|
+
winrt::Microsoft::ReactNative::Composition::SpriteVisual,
|
|
530
|
+
CompositionBaseComponentView::SpecialBorderLayerCount> &spBorderLayers,
|
|
531
|
+
TShape &shape,
|
|
532
|
+
const facebook::react::BorderWidths &borderWidths,
|
|
533
|
+
const facebook::react::BorderRadii &borderRadii,
|
|
534
|
+
float textureWidth,
|
|
535
|
+
float textureHeight,
|
|
536
|
+
const facebook::react::BorderColors &borderColors,
|
|
537
|
+
facebook::react::BorderStyle borderStyle) {
|
|
538
|
+
// Now that we've drawn our nice border in one layer, split it into its component layers
|
|
539
|
+
winrt::com_ptr<Composition::ICompositionDrawingSurfaceInterop>
|
|
540
|
+
spTextures[CompositionBaseComponentView::SpecialBorderLayerCount];
|
|
541
|
+
|
|
542
|
+
// Set component border properties
|
|
543
|
+
// Top Left Corner
|
|
544
|
+
SetBorderLayerProperties(
|
|
545
|
+
compContext,
|
|
546
|
+
spBorderLayers[0],
|
|
547
|
+
shape,
|
|
548
|
+
spTextures[0], // Target Layer, Source Texture, Target Texture
|
|
549
|
+
{0,
|
|
550
|
+
0,
|
|
551
|
+
borderRadii.topLeft + borderWidths.left,
|
|
552
|
+
borderRadii.topLeft + borderWidths.top}, // Texture Left, Top, Width, Height
|
|
553
|
+
{AnchorPosition::Left, AnchorPosition::Top}, // Layer Anchor Point
|
|
554
|
+
{0, 0}, // Layer Anchor Offset
|
|
555
|
+
{borderRadii.topLeft + borderWidths.left, borderRadii.topLeft + borderWidths.top}, // size
|
|
556
|
+
{0.0f, 0.0f}, // relativeSize
|
|
557
|
+
std::max(borderWidths.left, borderWidths.top),
|
|
558
|
+
borderColors.left ? borderColors.left : borderColors.top,
|
|
559
|
+
borderStyle);
|
|
560
|
+
|
|
561
|
+
// Top Edge Border
|
|
562
|
+
SetBorderLayerProperties(
|
|
563
|
+
compContext,
|
|
564
|
+
spBorderLayers[1],
|
|
565
|
+
shape,
|
|
566
|
+
spTextures[1],
|
|
567
|
+
{borderRadii.topLeft + borderWidths.left,
|
|
568
|
+
0,
|
|
569
|
+
textureWidth - (borderRadii.topRight + borderWidths.right),
|
|
570
|
+
borderWidths.top},
|
|
571
|
+
{AnchorPosition::Left, AnchorPosition::Top},
|
|
572
|
+
{borderRadii.topLeft + borderWidths.left, 0},
|
|
573
|
+
{-(borderRadii.topLeft + borderWidths.left + borderRadii.topRight + borderWidths.right),
|
|
574
|
+
borderWidths.top}, // size
|
|
575
|
+
{1.0f, 0.0f}, // relativeSize
|
|
576
|
+
borderWidths.top,
|
|
577
|
+
borderColors.top,
|
|
578
|
+
borderStyle);
|
|
579
|
+
|
|
580
|
+
// Top Right Corner Border
|
|
581
|
+
SetBorderLayerProperties(
|
|
582
|
+
compContext,
|
|
583
|
+
spBorderLayers[2],
|
|
584
|
+
shape,
|
|
585
|
+
spTextures[2],
|
|
586
|
+
{textureWidth - (borderRadii.topRight + borderWidths.right),
|
|
587
|
+
0,
|
|
588
|
+
textureWidth,
|
|
589
|
+
borderRadii.topRight + borderWidths.top},
|
|
590
|
+
{AnchorPosition::Right, AnchorPosition::Top},
|
|
591
|
+
{-(borderRadii.topRight + borderWidths.right), 0},
|
|
592
|
+
{borderRadii.topRight + borderWidths.right, borderRadii.topRight + borderWidths.top},
|
|
593
|
+
{0.0f, 0.0f},
|
|
594
|
+
std::max(borderWidths.right, borderWidths.top),
|
|
595
|
+
borderColors.right ? borderColors.right : borderColors.top,
|
|
596
|
+
borderStyle);
|
|
597
|
+
|
|
598
|
+
// Right Edge Border
|
|
599
|
+
SetBorderLayerProperties(
|
|
600
|
+
compContext,
|
|
601
|
+
spBorderLayers[3],
|
|
602
|
+
shape,
|
|
603
|
+
spTextures[3],
|
|
604
|
+
{textureWidth - borderWidths.right,
|
|
605
|
+
borderWidths.top + borderRadii.topRight,
|
|
606
|
+
textureWidth,
|
|
607
|
+
textureHeight - (borderWidths.bottom + borderRadii.bottomRight)},
|
|
608
|
+
{AnchorPosition::Right, AnchorPosition::Top},
|
|
609
|
+
{-borderWidths.right, borderWidths.top + borderRadii.topRight},
|
|
610
|
+
{borderWidths.right,
|
|
611
|
+
-(borderWidths.top + borderRadii.topRight + borderWidths.bottom + borderRadii.bottomRight)}, // size
|
|
612
|
+
{0.0f, 1.0f},
|
|
613
|
+
borderWidths.right,
|
|
614
|
+
borderColors.right,
|
|
615
|
+
borderStyle);
|
|
616
|
+
|
|
617
|
+
// Bottom Right Corner Border
|
|
618
|
+
SetBorderLayerProperties(
|
|
619
|
+
compContext,
|
|
620
|
+
spBorderLayers[4],
|
|
621
|
+
shape,
|
|
622
|
+
spTextures[4],
|
|
623
|
+
{textureWidth - (borderWidths.right + borderRadii.bottomRight),
|
|
624
|
+
textureHeight - (borderWidths.bottom + borderRadii.bottomRight),
|
|
625
|
+
textureWidth,
|
|
626
|
+
textureHeight},
|
|
627
|
+
{AnchorPosition::Right, AnchorPosition::Bottom},
|
|
628
|
+
{-(borderWidths.right + borderRadii.bottomRight), -(borderWidths.bottom + borderRadii.bottomRight)},
|
|
629
|
+
{borderWidths.right + borderRadii.bottomRight, borderWidths.bottom + borderRadii.bottomRight},
|
|
630
|
+
{0, 0},
|
|
631
|
+
std::max(borderWidths.right, borderWidths.bottom),
|
|
632
|
+
borderColors.right ? borderColors.right : borderColors.bottom,
|
|
633
|
+
borderStyle);
|
|
634
|
+
|
|
635
|
+
// Bottom Edge Border
|
|
636
|
+
SetBorderLayerProperties(
|
|
637
|
+
compContext,
|
|
638
|
+
spBorderLayers[5],
|
|
639
|
+
shape,
|
|
640
|
+
spTextures[5],
|
|
641
|
+
{borderWidths.left + borderRadii.bottomLeft,
|
|
642
|
+
textureHeight - borderWidths.bottom,
|
|
643
|
+
textureWidth - (borderWidths.right + borderRadii.bottomLeft),
|
|
644
|
+
textureHeight},
|
|
645
|
+
{AnchorPosition::Left, AnchorPosition::Bottom},
|
|
646
|
+
{borderWidths.left + borderRadii.bottomLeft, -borderWidths.bottom},
|
|
647
|
+
{-(borderWidths.right + borderRadii.bottomLeft + borderWidths.left + borderRadii.bottomLeft),
|
|
648
|
+
borderWidths.bottom},
|
|
649
|
+
{1.0f, 0.0f},
|
|
650
|
+
borderWidths.bottom,
|
|
651
|
+
borderColors.bottom,
|
|
652
|
+
borderStyle);
|
|
653
|
+
|
|
654
|
+
// Bottom Left Corner Border
|
|
655
|
+
SetBorderLayerProperties(
|
|
656
|
+
compContext,
|
|
657
|
+
spBorderLayers[6],
|
|
658
|
+
shape,
|
|
659
|
+
spTextures[6],
|
|
660
|
+
{0,
|
|
661
|
+
textureHeight - (borderWidths.bottom + borderRadii.bottomLeft),
|
|
662
|
+
borderWidths.left + borderRadii.bottomLeft,
|
|
663
|
+
textureHeight},
|
|
664
|
+
{AnchorPosition::Left, AnchorPosition::Bottom},
|
|
665
|
+
{0, -(borderWidths.bottom + borderRadii.bottomLeft)},
|
|
666
|
+
{borderWidths.left + borderRadii.bottomLeft, borderWidths.bottom + borderRadii.bottomLeft},
|
|
667
|
+
{0, 0},
|
|
668
|
+
std::max(borderWidths.left, borderWidths.bottom),
|
|
669
|
+
borderColors.left ? borderColors.left : borderColors.bottom,
|
|
670
|
+
borderStyle);
|
|
671
|
+
|
|
672
|
+
// Left Edge Border
|
|
673
|
+
SetBorderLayerProperties(
|
|
674
|
+
compContext,
|
|
675
|
+
spBorderLayers[7],
|
|
676
|
+
shape,
|
|
677
|
+
spTextures[7],
|
|
678
|
+
{0,
|
|
679
|
+
borderWidths.top + borderRadii.topLeft,
|
|
680
|
+
borderWidths.left,
|
|
681
|
+
textureHeight - (borderWidths.bottom + borderRadii.bottomLeft)},
|
|
682
|
+
{AnchorPosition::Left, AnchorPosition::Top},
|
|
683
|
+
{0, borderWidths.top + borderRadii.topLeft},
|
|
684
|
+
{borderWidths.left, -(borderWidths.top + borderRadii.topLeft + borderWidths.bottom + borderRadii.bottomLeft)},
|
|
685
|
+
{0, 1},
|
|
686
|
+
borderWidths.left,
|
|
687
|
+
borderColors.left,
|
|
688
|
+
borderStyle);
|
|
689
|
+
}
|
|
690
|
+
|
|
691
|
+
winrt::com_ptr<ID2D1GeometryGroup> GetGeometryForRoundedBorder(
|
|
692
|
+
winrt::Microsoft::ReactNative::Composition::ICompositionContext &compContext,
|
|
693
|
+
const facebook::react::RectangleCorners<float> &radius,
|
|
694
|
+
const facebook::react::RectangleEdges<float> &inset,
|
|
695
|
+
const facebook::react::RectangleEdges<float> &thickness,
|
|
696
|
+
const facebook::react::RectangleEdges<float> &rectPathGeometry) noexcept {
|
|
697
|
+
winrt::com_ptr<ID2D1PathGeometry> outerPathGeometry =
|
|
698
|
+
GenerateRoundedRectPathGeometry(compContext, radius, inset, rectPathGeometry);
|
|
699
|
+
|
|
700
|
+
if (outerPathGeometry == nullptr) {
|
|
701
|
+
assert(false);
|
|
702
|
+
return nullptr;
|
|
703
|
+
}
|
|
704
|
+
|
|
705
|
+
facebook::react::RectangleEdges<float> rectInnerPathGeometry = {
|
|
706
|
+
rectPathGeometry.left + thickness.left,
|
|
707
|
+
rectPathGeometry.top + thickness.top,
|
|
708
|
+
rectPathGeometry.right - thickness.right,
|
|
709
|
+
rectPathGeometry.bottom - thickness.bottom};
|
|
710
|
+
|
|
711
|
+
// Total thickness is larger than original element size.
|
|
712
|
+
// Clamp inner rect to have a width/height of 0, but placed such that the ratio of side-thicknesses is respected.
|
|
713
|
+
// We need to respect this ratio so that any animations work properly.
|
|
714
|
+
|
|
715
|
+
if (rectInnerPathGeometry.left > rectInnerPathGeometry.right) {
|
|
716
|
+
float leftRatio = thickness.left / (thickness.left + thickness.right);
|
|
717
|
+
auto x = std::floor(rectPathGeometry.left + ((rectPathGeometry.right - rectPathGeometry.left) * leftRatio));
|
|
718
|
+
rectInnerPathGeometry.left = x;
|
|
719
|
+
rectInnerPathGeometry.right = x;
|
|
720
|
+
}
|
|
721
|
+
|
|
722
|
+
if (rectInnerPathGeometry.top > rectInnerPathGeometry.bottom) {
|
|
723
|
+
float topRatio = thickness.top / (thickness.top + thickness.bottom);
|
|
724
|
+
auto y = rectPathGeometry.top + std::floor((rectPathGeometry.top - rectPathGeometry.bottom) * topRatio);
|
|
725
|
+
rectInnerPathGeometry.top = y;
|
|
726
|
+
rectInnerPathGeometry.bottom = y;
|
|
727
|
+
}
|
|
728
|
+
|
|
729
|
+
facebook::react::RectangleEdges<float> innerInset = {
|
|
730
|
+
inset.left + thickness.left,
|
|
731
|
+
inset.top + thickness.top,
|
|
732
|
+
inset.right + thickness.right,
|
|
733
|
+
inset.bottom + thickness.bottom};
|
|
734
|
+
|
|
735
|
+
winrt::com_ptr<ID2D1PathGeometry> innerPathGeometry =
|
|
736
|
+
GenerateRoundedRectPathGeometry(compContext, radius, innerInset, rectInnerPathGeometry);
|
|
737
|
+
|
|
738
|
+
if (innerPathGeometry == nullptr) {
|
|
739
|
+
assert(false); // Failed to create inner pathGeometry for rounded border
|
|
740
|
+
return nullptr;
|
|
741
|
+
}
|
|
742
|
+
|
|
743
|
+
ID2D1Geometry *ppGeometries[] = {outerPathGeometry.get(), innerPathGeometry.get()};
|
|
744
|
+
winrt::com_ptr<ID2D1Factory1> spD2dFactory;
|
|
745
|
+
compContext.as<Composition::ICompositionContextInterop>()->D2DFactory(spD2dFactory.put());
|
|
746
|
+
|
|
747
|
+
winrt::com_ptr<ID2D1GeometryGroup> geometryGroup = nullptr;
|
|
748
|
+
// Create a geometry group.
|
|
749
|
+
HRESULT hr = spD2dFactory->CreateGeometryGroup(
|
|
750
|
+
D2D1_FILL_MODE_ALTERNATE, ppGeometries, ARRAYSIZE(ppGeometries), geometryGroup.put());
|
|
751
|
+
|
|
752
|
+
if (SUCCEEDED(hr)) {
|
|
753
|
+
return geometryGroup;
|
|
754
|
+
}
|
|
755
|
+
return nullptr;
|
|
756
|
+
}
|
|
757
|
+
|
|
758
|
+
// We dont want half pixel borders, or border radii - they lead to blurry borders
|
|
759
|
+
// Also apply scale factor to the radii at this point
|
|
760
|
+
void pixelRoundBorderRadii(facebook::react::BorderRadii &borderRadii, float scaleFactor) noexcept {
|
|
761
|
+
// Always round radii down to avoid spikey circles
|
|
762
|
+
borderRadii.topLeft = std::floor(borderRadii.topLeft * scaleFactor);
|
|
763
|
+
borderRadii.topRight = std::floor(borderRadii.topRight * scaleFactor);
|
|
764
|
+
borderRadii.bottomLeft = std::floor(borderRadii.bottomLeft * scaleFactor);
|
|
765
|
+
borderRadii.bottomRight = std::floor(borderRadii.bottomRight * scaleFactor);
|
|
766
|
+
}
|
|
767
|
+
|
|
768
|
+
void scaleAndPixelRoundBorderWidths(
|
|
769
|
+
facebook::react::LayoutMetrics const &layoutMetrics,
|
|
770
|
+
facebook::react::BorderMetrics &borderMetrics,
|
|
771
|
+
float scaleFactor) noexcept {
|
|
772
|
+
borderMetrics.borderWidths.left = (borderMetrics.borderWidths.left == 0)
|
|
773
|
+
? 0.f
|
|
774
|
+
: std::max(1.f, std::round(borderMetrics.borderWidths.left * scaleFactor));
|
|
775
|
+
borderMetrics.borderWidths.top = (borderMetrics.borderWidths.top == 0)
|
|
776
|
+
? 0.f
|
|
777
|
+
: std::max(1.f, std::round(borderMetrics.borderWidths.top * scaleFactor));
|
|
778
|
+
borderMetrics.borderWidths.right = (borderMetrics.borderWidths.right == 0)
|
|
779
|
+
? 0.f
|
|
780
|
+
: std::max(1.f, std::round(borderMetrics.borderWidths.right * scaleFactor));
|
|
781
|
+
borderMetrics.borderWidths.bottom = (borderMetrics.borderWidths.bottom == 0)
|
|
782
|
+
? 0.f
|
|
783
|
+
: std::max(1.f, std::round(borderMetrics.borderWidths.bottom * scaleFactor));
|
|
784
|
+
|
|
785
|
+
// If we rounded both sides of the borderWidths up, we may have made the borderWidths larger than the total
|
|
786
|
+
if (layoutMetrics.frame.size.width * scaleFactor <
|
|
787
|
+
(borderMetrics.borderWidths.left + borderMetrics.borderWidths.right)) {
|
|
788
|
+
borderMetrics.borderWidths.right--;
|
|
789
|
+
}
|
|
790
|
+
if (layoutMetrics.frame.size.height * scaleFactor <
|
|
791
|
+
(borderMetrics.borderWidths.top + borderMetrics.borderWidths.bottom)) {
|
|
792
|
+
borderMetrics.borderWidths.bottom--;
|
|
793
|
+
}
|
|
794
|
+
}
|
|
795
|
+
|
|
796
|
+
// react-native uses black as a default color when none is specified.
|
|
797
|
+
void assignDefaultBlackBorders(facebook::react::BorderMetrics &borderMetrics) noexcept {
|
|
798
|
+
if (!borderMetrics.borderColors.left) {
|
|
799
|
+
borderMetrics.borderColors.left = facebook::react::blackColor();
|
|
800
|
+
}
|
|
801
|
+
if (!borderMetrics.borderColors.top) {
|
|
802
|
+
borderMetrics.borderColors.top = facebook::react::blackColor();
|
|
803
|
+
}
|
|
804
|
+
if (!borderMetrics.borderColors.right) {
|
|
805
|
+
borderMetrics.borderColors.right = facebook::react::blackColor();
|
|
806
|
+
}
|
|
807
|
+
if (!borderMetrics.borderColors.bottom) {
|
|
808
|
+
borderMetrics.borderColors.bottom = facebook::react::blackColor();
|
|
809
|
+
}
|
|
810
|
+
}
|
|
811
|
+
|
|
812
|
+
facebook::react::BorderMetrics resolveAndAlignBorderMetrics(
|
|
813
|
+
facebook::react::LayoutMetrics const &layoutMetrics,
|
|
814
|
+
const facebook::react::ViewProps &viewProps) noexcept {
|
|
815
|
+
auto borderMetrics = viewProps.resolveBorderMetrics(layoutMetrics);
|
|
816
|
+
|
|
817
|
+
pixelRoundBorderRadii(borderMetrics.borderRadii, layoutMetrics.pointScaleFactor);
|
|
818
|
+
scaleAndPixelRoundBorderWidths(layoutMetrics, borderMetrics, layoutMetrics.pointScaleFactor);
|
|
819
|
+
assignDefaultBlackBorders(borderMetrics);
|
|
820
|
+
return borderMetrics;
|
|
821
|
+
}
|
|
822
|
+
|
|
823
|
+
bool CompositionBaseComponentView::TryUpdateSpecialBorderLayers(
|
|
824
|
+
std::array<winrt::Microsoft::ReactNative::Composition::SpriteVisual, SpecialBorderLayerCount> &spBorderVisuals,
|
|
825
|
+
facebook::react::LayoutMetrics const &layoutMetrics,
|
|
826
|
+
const facebook::react::ViewProps &viewProps) noexcept {
|
|
827
|
+
auto borderMetrics = resolveAndAlignBorderMetrics(layoutMetrics, viewProps);
|
|
828
|
+
// We only handle a single borderStyle for now
|
|
829
|
+
auto borderStyle = borderMetrics.borderStyles.left;
|
|
830
|
+
|
|
831
|
+
if (borderMetrics.borderColors.isUniform()) {
|
|
832
|
+
if (!borderMetrics.borderWidths.left)
|
|
833
|
+
return false;
|
|
834
|
+
if (!facebook::react::isColorMeaningful(borderMetrics.borderColors.left))
|
|
835
|
+
return false;
|
|
836
|
+
}
|
|
837
|
+
|
|
838
|
+
// Create the special border layers if they don't exist yet
|
|
839
|
+
if (!spBorderVisuals[0]) {
|
|
840
|
+
for (uint8_t i = 0; i < SpecialBorderLayerCount; i++) {
|
|
841
|
+
auto visual = m_compContext.CreateSpriteVisual();
|
|
842
|
+
Visual().InsertAt(visual, i);
|
|
843
|
+
spBorderVisuals[i] = std::move(visual);
|
|
844
|
+
m_numBorderVisuals++;
|
|
845
|
+
}
|
|
846
|
+
}
|
|
847
|
+
|
|
848
|
+
float extentWidth = layoutMetrics.frame.size.width * layoutMetrics.pointScaleFactor;
|
|
849
|
+
float extentHeight = layoutMetrics.frame.size.height * layoutMetrics.pointScaleFactor;
|
|
850
|
+
|
|
851
|
+
if (borderMetrics.borderRadii.topLeft != 0 || borderMetrics.borderRadii.topRight != 0 ||
|
|
852
|
+
borderMetrics.borderRadii.bottomLeft != 0 || borderMetrics.borderRadii.bottomRight != 0) {
|
|
853
|
+
if (borderStyle == facebook::react::BorderStyle::Dotted || borderStyle == facebook::react::BorderStyle::Dashed) {
|
|
854
|
+
// Because in DirectX geometry starts at the center of the stroke, we need to deflate
|
|
855
|
+
// rectangle by half the stroke width to render correctly.
|
|
856
|
+
facebook::react::RectangleEdges<float> rectPathGeometry = {
|
|
857
|
+
borderMetrics.borderWidths.left / 2.0f,
|
|
858
|
+
borderMetrics.borderWidths.top / 2.0f,
|
|
859
|
+
extentWidth - borderMetrics.borderWidths.right / 2.0f,
|
|
860
|
+
extentHeight - borderMetrics.borderWidths.bottom / 2.0f};
|
|
861
|
+
|
|
862
|
+
winrt::com_ptr<ID2D1PathGeometry> pathGeometry =
|
|
863
|
+
GenerateRoundedRectPathGeometry(m_compContext, borderMetrics.borderRadii, {0, 0, 0, 0}, rectPathGeometry);
|
|
864
|
+
|
|
865
|
+
if (pathGeometry) {
|
|
866
|
+
DrawAllBorderLayers(
|
|
867
|
+
m_compContext,
|
|
868
|
+
spBorderVisuals,
|
|
869
|
+
*pathGeometry,
|
|
870
|
+
borderMetrics.borderWidths,
|
|
871
|
+
borderMetrics.borderRadii,
|
|
872
|
+
extentWidth,
|
|
873
|
+
extentHeight,
|
|
874
|
+
borderMetrics.borderColors,
|
|
875
|
+
borderStyle);
|
|
876
|
+
} else {
|
|
877
|
+
assert(false);
|
|
878
|
+
}
|
|
879
|
+
} else {
|
|
880
|
+
facebook::react::RectangleEdges<float> rectPathGeometry = {0, 0, extentWidth, extentHeight};
|
|
881
|
+
|
|
882
|
+
winrt::com_ptr<ID2D1GeometryGroup> pathGeometry = GetGeometryForRoundedBorder(
|
|
883
|
+
m_compContext,
|
|
884
|
+
borderMetrics.borderRadii,
|
|
885
|
+
{0, 0, 0, 0}, // inset
|
|
886
|
+
borderMetrics.borderWidths,
|
|
887
|
+
rectPathGeometry);
|
|
888
|
+
|
|
889
|
+
DrawAllBorderLayers(
|
|
890
|
+
m_compContext,
|
|
891
|
+
spBorderVisuals,
|
|
892
|
+
*pathGeometry,
|
|
893
|
+
borderMetrics.borderWidths,
|
|
894
|
+
borderMetrics.borderRadii,
|
|
895
|
+
extentWidth,
|
|
896
|
+
extentHeight,
|
|
897
|
+
borderMetrics.borderColors,
|
|
898
|
+
borderStyle);
|
|
899
|
+
}
|
|
900
|
+
} else {
|
|
901
|
+
// Because in DirectX geometry starts at the center of the stroke, we need to deflate rectangle by half the stroke
|
|
902
|
+
// width / height to render correctly.
|
|
903
|
+
D2D1_RECT_F rectShape{
|
|
904
|
+
borderMetrics.borderWidths.left / 2.0f,
|
|
905
|
+
borderMetrics.borderWidths.top / 2.0f,
|
|
906
|
+
extentWidth - (borderMetrics.borderWidths.right / 2.0f),
|
|
907
|
+
extentHeight - (borderMetrics.borderWidths.bottom / 2.0f)};
|
|
908
|
+
DrawAllBorderLayers(
|
|
909
|
+
m_compContext,
|
|
910
|
+
spBorderVisuals,
|
|
911
|
+
rectShape,
|
|
912
|
+
borderMetrics.borderWidths,
|
|
913
|
+
borderMetrics.borderRadii,
|
|
914
|
+
extentWidth,
|
|
915
|
+
extentHeight,
|
|
916
|
+
borderMetrics.borderColors,
|
|
917
|
+
borderStyle);
|
|
918
|
+
}
|
|
919
|
+
return true;
|
|
920
|
+
}
|
|
921
|
+
|
|
922
|
+
void CompositionBaseComponentView::UpdateSpecialBorderLayers(
|
|
923
|
+
facebook::react::LayoutMetrics const &layoutMetrics,
|
|
924
|
+
const facebook::react::ViewProps &viewProps) noexcept {
|
|
925
|
+
auto spBorderLayers = FindSpecialBorderLayers();
|
|
926
|
+
|
|
927
|
+
if (!TryUpdateSpecialBorderLayers(spBorderLayers, layoutMetrics, viewProps)) {
|
|
928
|
+
for (auto &spBorderLayer : spBorderLayers) {
|
|
929
|
+
if (spBorderLayer) {
|
|
930
|
+
spBorderLayer.as<winrt::Microsoft::ReactNative::Composition::SpriteVisual>().Brush(nullptr);
|
|
931
|
+
}
|
|
932
|
+
}
|
|
933
|
+
}
|
|
934
|
+
}
|
|
935
|
+
|
|
936
|
+
void CompositionBaseComponentView::updateBorderProps(
|
|
937
|
+
const facebook::react::ViewProps &oldViewProps,
|
|
938
|
+
const facebook::react::ViewProps &newViewProps) noexcept {
|
|
939
|
+
if (oldViewProps.borderColors != newViewProps.borderColors || oldViewProps.borderRadii != newViewProps.borderRadii ||
|
|
940
|
+
!(oldViewProps.yogaStyle.border() == newViewProps.yogaStyle.border()) ||
|
|
941
|
+
oldViewProps.borderStyles != newViewProps.borderStyles) {
|
|
942
|
+
m_needsBorderUpdate = true;
|
|
943
|
+
}
|
|
944
|
+
}
|
|
945
|
+
|
|
946
|
+
void CompositionBaseComponentView::updateBorderLayoutMetrics(
|
|
947
|
+
facebook::react::LayoutMetrics const &layoutMetrics,
|
|
948
|
+
const facebook::react::ViewProps &viewProps) noexcept {
|
|
949
|
+
auto borderMetrics = resolveAndAlignBorderMetrics(layoutMetrics, viewProps);
|
|
950
|
+
|
|
951
|
+
if (borderMetrics.borderRadii.topLeft == 0 && borderMetrics.borderRadii.topRight == 0 &&
|
|
952
|
+
borderMetrics.borderRadii.bottomLeft == 0 && borderMetrics.borderRadii.bottomRight == 0) {
|
|
953
|
+
Visual().as<Composition::IVisualInterop>()->SetClippingPath(nullptr);
|
|
954
|
+
} else {
|
|
955
|
+
winrt::com_ptr<ID2D1PathGeometry> pathGeometry = GenerateRoundedRectPathGeometry(
|
|
956
|
+
m_compContext,
|
|
957
|
+
borderMetrics.borderRadii,
|
|
958
|
+
{0, 0, 0, 0},
|
|
959
|
+
{0,
|
|
960
|
+
0,
|
|
961
|
+
layoutMetrics.frame.size.width * layoutMetrics.pointScaleFactor,
|
|
962
|
+
layoutMetrics.frame.size.height * layoutMetrics.pointScaleFactor});
|
|
963
|
+
|
|
964
|
+
Visual().as<Composition::IVisualInterop>()->SetClippingPath(pathGeometry.get());
|
|
965
|
+
}
|
|
966
|
+
|
|
967
|
+
if (m_needsBorderUpdate || m_layoutMetrics != layoutMetrics) {
|
|
968
|
+
m_needsBorderUpdate = false;
|
|
969
|
+
UpdateSpecialBorderLayers(layoutMetrics, viewProps);
|
|
970
|
+
}
|
|
971
|
+
}
|
|
972
|
+
|
|
973
|
+
void CompositionBaseComponentView::indexOffsetForBorder(uint32_t &index) const noexcept {
|
|
974
|
+
index += m_numBorderVisuals;
|
|
975
|
+
}
|
|
976
|
+
|
|
977
|
+
void CompositionBaseComponentView::OnRenderingDeviceLost() noexcept {}
|
|
978
|
+
|
|
979
|
+
comp::CompositionPropertySet CompositionBaseComponentView::EnsureCenterPointPropertySet() noexcept {
|
|
980
|
+
if (m_centerPropSet == nullptr) {
|
|
981
|
+
auto compositor =
|
|
982
|
+
winrt::Microsoft::ReactNative::Composition::implementation::CompositionContextHelper::InnerCompositor(
|
|
983
|
+
m_compContext);
|
|
984
|
+
|
|
985
|
+
m_centerPropSet = compositor.CreatePropertySet();
|
|
986
|
+
UpdateCenterPropertySet();
|
|
987
|
+
m_centerPropSet.InsertMatrix4x4(L"transform", winrt::Windows::Foundation::Numerics::float4x4::identity());
|
|
988
|
+
m_centerPropSet.InsertVector3(L"translation", {0, 0, 0});
|
|
989
|
+
}
|
|
990
|
+
|
|
991
|
+
return m_centerPropSet;
|
|
992
|
+
}
|
|
993
|
+
|
|
994
|
+
// Create a PropertySet that will hold properties used for animation facades:
|
|
995
|
+
// "center": This is the center of the Visual, which is used by animations and transforms to rotate around the
|
|
996
|
+
// correct center
|
|
997
|
+
// "dpiScale3": This is a vector3 containing the scale factor for this view, used in expressions to convert from
|
|
998
|
+
// dips to px
|
|
999
|
+
// "dpiScale3": This is a vector3 containing the inverse scale factor for this view, used in expressions to
|
|
1000
|
+
// convert from px to dips "translation": An additional translation to apply to the to the visual in
|
|
1001
|
+
// addition to Offset. This is used to apply any translation properties set, or animated
|
|
1002
|
+
// "transform": A transform to apply to the visual. This transform is in dips.
|
|
1003
|
+
void CompositionBaseComponentView::UpdateCenterPropertySet() noexcept {
|
|
1004
|
+
if (m_centerPropSet != nullptr) {
|
|
1005
|
+
m_centerPropSet.InsertVector3(
|
|
1006
|
+
L"center",
|
|
1007
|
+
{m_layoutMetrics.frame.size.width * m_layoutMetrics.pointScaleFactor / 2,
|
|
1008
|
+
m_layoutMetrics.frame.size.height * m_layoutMetrics.pointScaleFactor / 2,
|
|
1009
|
+
0});
|
|
1010
|
+
m_centerPropSet.InsertVector3(
|
|
1011
|
+
L"dpiScale3",
|
|
1012
|
+
{m_layoutMetrics.pointScaleFactor, m_layoutMetrics.pointScaleFactor, m_layoutMetrics.pointScaleFactor});
|
|
1013
|
+
m_centerPropSet.InsertVector3(
|
|
1014
|
+
L"dpiScale3Inv",
|
|
1015
|
+
{1 / m_layoutMetrics.pointScaleFactor,
|
|
1016
|
+
1 / m_layoutMetrics.pointScaleFactor,
|
|
1017
|
+
1 / m_layoutMetrics.pointScaleFactor});
|
|
1018
|
+
}
|
|
1019
|
+
}
|
|
1020
|
+
|
|
1021
|
+
void CompositionBaseComponentView::EnsureTransformMatrixFacade() noexcept {
|
|
1022
|
+
if (m_hasTransformMatrixFacade)
|
|
1023
|
+
return;
|
|
1024
|
+
m_hasTransformMatrixFacade = true;
|
|
1025
|
+
|
|
1026
|
+
auto centerPointPropSet = EnsureCenterPointPropertySet();
|
|
1027
|
+
// TODO cache expression instead of creating new ones all the time
|
|
1028
|
+
auto expression =
|
|
1029
|
+
winrt::Microsoft::ReactNative::Composition::implementation::CompositionContextHelper::InnerCompositor(
|
|
1030
|
+
m_compContext)
|
|
1031
|
+
.CreateExpressionAnimation(
|
|
1032
|
+
L"Matrix4x4.CreateFromScale(PS.dpiScale3Inv) * Matrix4x4.CreateFromTranslation(PS.translation) * PS.transform * Matrix4x4.CreateFromScale(PS.dpiScale3)");
|
|
1033
|
+
expression.SetReferenceParameter(L"PS", centerPointPropSet);
|
|
1034
|
+
winrt::Microsoft::ReactNative::Composition::implementation::CompositionContextHelper::InnerVisual(Visual())
|
|
1035
|
+
.StartAnimation(L"TransformMatrix", expression);
|
|
1036
|
+
}
|
|
1037
|
+
|
|
1038
|
+
CompositionViewComponentView::CompositionViewComponentView(
|
|
1039
|
+
const winrt::Microsoft::ReactNative::Composition::ICompositionContext &compContext,
|
|
1040
|
+
facebook::react::Tag tag)
|
|
1041
|
+
: Super(compContext, tag) {
|
|
1042
|
+
static auto const defaultProps = std::make_shared<facebook::react::ViewProps const>();
|
|
1043
|
+
m_props = defaultProps;
|
|
1044
|
+
m_visual = m_compContext.CreateSpriteVisual();
|
|
1045
|
+
}
|
|
1046
|
+
|
|
1047
|
+
std::vector<facebook::react::ComponentDescriptorProvider>
|
|
1048
|
+
CompositionViewComponentView::supplementalComponentDescriptorProviders() noexcept {
|
|
1049
|
+
return {};
|
|
1050
|
+
}
|
|
1051
|
+
|
|
1052
|
+
void CompositionViewComponentView::mountChildComponentView(
|
|
1053
|
+
const IComponentView &childComponentView,
|
|
1054
|
+
uint32_t index) noexcept {
|
|
1055
|
+
m_children.insert(std::next(m_children.begin(), index), &childComponentView);
|
|
1056
|
+
|
|
1057
|
+
indexOffsetForBorder(index);
|
|
1058
|
+
|
|
1059
|
+
const_cast<IComponentView &>(childComponentView).parent(this);
|
|
1060
|
+
|
|
1061
|
+
m_visual.InsertAt(static_cast<const CompositionBaseComponentView &>(childComponentView).Visual(), index);
|
|
1062
|
+
}
|
|
1063
|
+
|
|
1064
|
+
void CompositionViewComponentView::unmountChildComponentView(
|
|
1065
|
+
const IComponentView &childComponentView,
|
|
1066
|
+
uint32_t index) noexcept {
|
|
1067
|
+
m_children.erase(std::next(m_children.begin(), index));
|
|
1068
|
+
|
|
1069
|
+
indexOffsetForBorder(index);
|
|
1070
|
+
|
|
1071
|
+
const_cast<IComponentView &>(childComponentView).parent(nullptr);
|
|
1072
|
+
m_visual.Remove(static_cast<const CompositionBaseComponentView &>(childComponentView).Visual());
|
|
1073
|
+
}
|
|
1074
|
+
|
|
1075
|
+
void CompositionViewComponentView::updateProps(
|
|
1076
|
+
facebook::react::Props::Shared const &props,
|
|
1077
|
+
facebook::react::Props::Shared const &oldProps) noexcept {
|
|
1078
|
+
const auto &oldViewProps = *std::static_pointer_cast<const facebook::react::ViewProps>(m_props);
|
|
1079
|
+
const auto &newViewProps = *std::static_pointer_cast<const facebook::react::ViewProps>(props);
|
|
1080
|
+
|
|
1081
|
+
if (oldViewProps.backgroundColor != newViewProps.backgroundColor) {
|
|
1082
|
+
if (newViewProps.backgroundColor) {
|
|
1083
|
+
m_visual.Brush(m_compContext.CreateColorBrush((*newViewProps.backgroundColor).m_color));
|
|
1084
|
+
} else {
|
|
1085
|
+
m_visual.Brush(nullptr);
|
|
1086
|
+
}
|
|
1087
|
+
}
|
|
1088
|
+
|
|
1089
|
+
if (oldViewProps.opacity != newViewProps.opacity) {
|
|
1090
|
+
m_visual.Opacity(newViewProps.opacity);
|
|
1091
|
+
}
|
|
1092
|
+
|
|
1093
|
+
updateBorderProps(oldViewProps, newViewProps);
|
|
1094
|
+
|
|
1095
|
+
// Shadow
|
|
1096
|
+
if (oldViewProps.shadowOffset != newViewProps.shadowOffset || oldViewProps.shadowColor != newViewProps.shadowColor ||
|
|
1097
|
+
oldViewProps.shadowOpacity != newViewProps.shadowOpacity ||
|
|
1098
|
+
oldViewProps.shadowRadius != newViewProps.shadowRadius) {
|
|
1099
|
+
auto shadow = m_compContext.CreateDropShadow();
|
|
1100
|
+
shadow.Offset({newViewProps.shadowOffset.width, newViewProps.shadowOffset.height, 0});
|
|
1101
|
+
shadow.Opacity(newViewProps.shadowOpacity);
|
|
1102
|
+
shadow.BlurRadius(newViewProps.shadowRadius);
|
|
1103
|
+
if (newViewProps.shadowColor)
|
|
1104
|
+
shadow.Color(newViewProps.shadowColor.AsWindowsColor());
|
|
1105
|
+
m_visual.Shadow(shadow);
|
|
1106
|
+
}
|
|
1107
|
+
|
|
1108
|
+
// Transform - TODO doesn't handle multiple of the same kind of transform -- Doesn't handle hittesting updates
|
|
1109
|
+
if (oldViewProps.transform != newViewProps.transform) {
|
|
1110
|
+
winrt::Windows::Foundation::Numerics::float4x4 transformMatrix;
|
|
1111
|
+
transformMatrix.m11 = newViewProps.transform.matrix[0];
|
|
1112
|
+
transformMatrix.m12 = newViewProps.transform.matrix[1];
|
|
1113
|
+
transformMatrix.m13 = newViewProps.transform.matrix[2];
|
|
1114
|
+
transformMatrix.m14 = newViewProps.transform.matrix[3];
|
|
1115
|
+
transformMatrix.m21 = newViewProps.transform.matrix[4];
|
|
1116
|
+
transformMatrix.m22 = newViewProps.transform.matrix[5];
|
|
1117
|
+
transformMatrix.m23 = newViewProps.transform.matrix[6];
|
|
1118
|
+
transformMatrix.m24 = newViewProps.transform.matrix[7];
|
|
1119
|
+
transformMatrix.m31 = newViewProps.transform.matrix[8];
|
|
1120
|
+
transformMatrix.m32 = newViewProps.transform.matrix[9];
|
|
1121
|
+
transformMatrix.m33 = newViewProps.transform.matrix[10];
|
|
1122
|
+
transformMatrix.m34 = newViewProps.transform.matrix[11];
|
|
1123
|
+
transformMatrix.m41 = newViewProps.transform.matrix[12];
|
|
1124
|
+
transformMatrix.m42 = newViewProps.transform.matrix[13];
|
|
1125
|
+
transformMatrix.m43 = newViewProps.transform.matrix[14];
|
|
1126
|
+
transformMatrix.m44 = newViewProps.transform.matrix[15];
|
|
1127
|
+
|
|
1128
|
+
auto centerPointPropSet = EnsureCenterPointPropertySet();
|
|
1129
|
+
centerPointPropSet.InsertMatrix4x4(L"transform", transformMatrix);
|
|
1130
|
+
|
|
1131
|
+
EnsureTransformMatrixFacade();
|
|
1132
|
+
}
|
|
1133
|
+
|
|
1134
|
+
m_props = std::static_pointer_cast<facebook::react::ViewProps const>(props);
|
|
1135
|
+
}
|
|
1136
|
+
|
|
1137
|
+
facebook::react::Tag CompositionViewComponentView::hitTest(facebook::react::Point pt, facebook::react::Point &localPt)
|
|
1138
|
+
const noexcept {
|
|
1139
|
+
facebook::react::Point ptLocal{pt.x - m_layoutMetrics.frame.origin.x, pt.y - m_layoutMetrics.frame.origin.y};
|
|
1140
|
+
|
|
1141
|
+
facebook::react::Tag targetTag;
|
|
1142
|
+
|
|
1143
|
+
if ((m_props->pointerEvents == facebook::react::PointerEventsMode::Auto ||
|
|
1144
|
+
m_props->pointerEvents == facebook::react::PointerEventsMode::BoxNone) &&
|
|
1145
|
+
std::any_of(m_children.rbegin(), m_children.rend(), [&targetTag, &ptLocal, &localPt](auto child) {
|
|
1146
|
+
targetTag = static_cast<const CompositionBaseComponentView *>(child)->hitTest(ptLocal, localPt);
|
|
1147
|
+
return targetTag != -1;
|
|
1148
|
+
}))
|
|
1149
|
+
return targetTag;
|
|
1150
|
+
|
|
1151
|
+
if ((m_props->pointerEvents == facebook::react::PointerEventsMode::Auto ||
|
|
1152
|
+
m_props->pointerEvents == facebook::react::PointerEventsMode::BoxOnly) &&
|
|
1153
|
+
ptLocal.x >= 0 && ptLocal.x <= m_layoutMetrics.frame.size.width && ptLocal.y >= 0 &&
|
|
1154
|
+
ptLocal.y <= m_layoutMetrics.frame.size.height) {
|
|
1155
|
+
localPt = ptLocal;
|
|
1156
|
+
return tag();
|
|
1157
|
+
}
|
|
1158
|
+
|
|
1159
|
+
return -1;
|
|
1160
|
+
}
|
|
1161
|
+
|
|
1162
|
+
facebook::react::SharedTouchEventEmitter CompositionViewComponentView::touchEventEmitter() noexcept {
|
|
1163
|
+
return m_eventEmitter;
|
|
1164
|
+
}
|
|
1165
|
+
|
|
1166
|
+
bool CompositionViewComponentView::ScrollWheel(facebook::react::Point pt, int32_t delta) noexcept {
|
|
1167
|
+
facebook::react::Point ptLocal{pt.x - m_layoutMetrics.frame.origin.x, pt.y - m_layoutMetrics.frame.origin.y};
|
|
1168
|
+
|
|
1169
|
+
facebook::react::Tag tag;
|
|
1170
|
+
if (std::any_of(m_children.rbegin(), m_children.rend(), [ptLocal, delta](auto child) {
|
|
1171
|
+
return const_cast<CompositionBaseComponentView *>(static_cast<const CompositionBaseComponentView *>(child))
|
|
1172
|
+
->ScrollWheel(ptLocal, delta);
|
|
1173
|
+
}))
|
|
1174
|
+
return true;
|
|
1175
|
+
|
|
1176
|
+
return false;
|
|
1177
|
+
}
|
|
1178
|
+
|
|
1179
|
+
void CompositionViewComponentView::updateState(
|
|
1180
|
+
facebook::react::State::Shared const &state,
|
|
1181
|
+
facebook::react::State::Shared const &oldState) noexcept {}
|
|
1182
|
+
|
|
1183
|
+
void CompositionViewComponentView::updateLayoutMetrics(
|
|
1184
|
+
facebook::react::LayoutMetrics const &layoutMetrics,
|
|
1185
|
+
facebook::react::LayoutMetrics const &oldLayoutMetrics) noexcept {
|
|
1186
|
+
// Set Position & Size Properties
|
|
1187
|
+
if ((layoutMetrics.displayType != m_layoutMetrics.displayType)) {
|
|
1188
|
+
m_visual.IsVisible(layoutMetrics.displayType != facebook::react::DisplayType::None);
|
|
1189
|
+
}
|
|
1190
|
+
|
|
1191
|
+
updateBorderLayoutMetrics(layoutMetrics, *m_props);
|
|
1192
|
+
|
|
1193
|
+
m_layoutMetrics = layoutMetrics;
|
|
1194
|
+
|
|
1195
|
+
UpdateCenterPropertySet();
|
|
1196
|
+
m_visual.Size(
|
|
1197
|
+
{layoutMetrics.frame.size.width * layoutMetrics.pointScaleFactor,
|
|
1198
|
+
layoutMetrics.frame.size.height * layoutMetrics.pointScaleFactor});
|
|
1199
|
+
m_visual.Offset({
|
|
1200
|
+
layoutMetrics.frame.origin.x * layoutMetrics.pointScaleFactor,
|
|
1201
|
+
layoutMetrics.frame.origin.y * layoutMetrics.pointScaleFactor,
|
|
1202
|
+
0.0f,
|
|
1203
|
+
});
|
|
1204
|
+
}
|
|
1205
|
+
|
|
1206
|
+
void CompositionViewComponentView::finalizeUpdates(RNComponentViewUpdateMask updateMask) noexcept {}
|
|
1207
|
+
|
|
1208
|
+
void CompositionViewComponentView::prepareForRecycle() noexcept {}
|
|
1209
|
+
facebook::react::Props::Shared CompositionViewComponentView::props() noexcept {
|
|
1210
|
+
return m_props;
|
|
1211
|
+
}
|
|
1212
|
+
|
|
1213
|
+
winrt::Microsoft::ReactNative::Composition::IVisual CompositionViewComponentView::Visual() const noexcept {
|
|
1214
|
+
return m_visual;
|
|
1215
|
+
}
|
|
1216
|
+
|
|
1217
|
+
} // namespace Microsoft::ReactNative
|