react-native-tvos 0.82.1-0 → 0.83.0-0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/Libraries/Animated/components/AnimatedFlatList.js +5 -3
- package/Libraries/Animated/components/AnimatedImage.js +4 -3
- package/Libraries/Animated/components/AnimatedSectionList.js +2 -2
- package/Libraries/Animated/components/AnimatedText.js +7 -3
- package/Libraries/Animated/components/AnimatedView.js +3 -2
- package/Libraries/Animated/createAnimatedComponent.js +24 -12
- package/Libraries/Animated/nodes/AnimatedColor.js +26 -10
- package/Libraries/AppDelegate/RCTAppDelegate.h +0 -2
- package/Libraries/AppDelegate/RCTAppDelegate.mm +1 -0
- package/Libraries/AppDelegate/RCTAppSetupUtils.mm +16 -4
- package/Libraries/AppDelegate/RCTDefaultReactNativeFactoryDelegate.mm +5 -3
- package/Libraries/AppDelegate/RCTReactNativeFactory.h +3 -0
- package/Libraries/AppDelegate/RCTReactNativeFactory.mm +36 -1
- package/Libraries/AppDelegate/RCTRootViewFactory.h +13 -1
- package/Libraries/AppDelegate/RCTRootViewFactory.mm +33 -6
- package/Libraries/Blob/RCTBlobCollector.mm +1 -1
- package/Libraries/Blob/RCTFileReaderModule.mm +6 -9
- package/Libraries/Components/AccessibilityInfo/AccessibilityInfo.js +43 -15
- package/Libraries/Components/ActivityIndicator/ActivityIndicator.d.ts +2 -2
- package/Libraries/Components/DrawerAndroid/DrawerLayoutAndroid.d.ts +2 -2
- package/Libraries/Components/ProgressBarAndroid/ProgressBarAndroid.d.ts +2 -2
- package/Libraries/Components/RefreshControl/RefreshControl.d.ts +3 -3
- package/Libraries/Components/SafeAreaView/SafeAreaView.d.ts +2 -2
- package/Libraries/Components/ScrollView/ScrollView.js +1 -0
- package/Libraries/Components/ScrollView/ScrollViewStickyHeader.js +6 -6
- package/Libraries/Components/Switch/Switch.d.ts +2 -2
- package/Libraries/Components/TextInput/TextInput.d.ts +2 -5
- package/Libraries/Components/TextInput/TextInput.js +6 -0
- package/Libraries/Components/Touchable/TouchableBounce.js +7 -7
- package/Libraries/Components/View/ReactNativeStyleAttributes.js +19 -1
- package/Libraries/Components/View/View.d.ts +2 -2
- package/Libraries/Components/View/ViewNativeComponent.js +14 -0
- package/Libraries/Core/ReactNativeVersion.js +2 -2
- package/Libraries/Core/setUpPerformance.js +2 -0
- package/Libraries/Debugging/DebuggingOverlay.js +14 -14
- package/Libraries/Debugging/DebuggingOverlayRegistry.js +8 -2
- package/Libraries/EventEmitter/RCTDeviceEventEmitter.js +5 -2
- package/Libraries/FBLazyVector/FBLazyVector/FBLazyIterator.h +39 -23
- package/Libraries/FBLazyVector/FBLazyVector/FBLazyVector.h +25 -15
- package/Libraries/Image/Image.d.ts +3 -3
- package/Libraries/Image/ImageInjection.js +3 -6
- package/Libraries/Image/ImageTypes.flow.js +3 -7
- package/Libraries/Image/RCTBundleAssetImageLoader.mm +2 -2
- package/Libraries/Image/RCTGIFImageDecoder.mm +2 -2
- package/Libraries/Image/RCTImageBlurUtils.mm +6 -5
- package/Libraries/Image/RCTImageEditingManager.mm +3 -5
- package/Libraries/Image/RCTImageLoader.mm +26 -37
- package/Libraries/Image/RCTImageShadowView.h +1 -1
- package/Libraries/Image/RCTImageShadowView.mm +1 -1
- package/Libraries/Image/RCTImageStoreManager.mm +13 -15
- package/Libraries/Image/RCTImageUtils.mm +41 -30
- package/Libraries/Image/RCTImageView.h +2 -2
- package/Libraries/Image/RCTImageView.mm +2 -2
- package/Libraries/Image/RCTImageViewManager.h +2 -2
- package/Libraries/Image/RCTImageViewManager.mm +13 -18
- package/Libraries/Image/RCTLocalAssetImageLoader.mm +2 -2
- package/Libraries/LinkingIOS/RCTLinkingManager.mm +8 -14
- package/Libraries/Lists/FlatList.js +8 -8
- package/Libraries/Lists/SectionList.d.ts +5 -1
- package/Libraries/Lists/ViewabilityHelper.js +1 -1
- package/Libraries/Lists/VirtualizedList.js +1 -0
- package/Libraries/LogBox/UI/AnsiHighlight.js +4 -1
- package/Libraries/NativeAnimation/Drivers/RCTEventAnimation.mm +1 -1
- package/Libraries/NativeAnimation/Nodes/RCTAnimatedNode.mm +9 -9
- package/Libraries/NativeAnimation/Nodes/RCTInterpolationAnimatedNode.mm +3 -3
- package/Libraries/NativeAnimation/Nodes/RCTObjectAnimatedNode.mm +1 -1
- package/Libraries/NativeAnimation/Nodes/RCTStyleAnimatedNode.mm +3 -3
- package/Libraries/NativeAnimation/Nodes/RCTTrackingAnimatedNode.mm +1 -1
- package/Libraries/NativeAnimation/Nodes/RCTTransformAnimatedNode.mm +1 -1
- package/Libraries/NativeAnimation/RCTAnimationUtils.mm +8 -2
- package/Libraries/NativeAnimation/RCTNativeAnimatedModule.mm +9 -13
- package/Libraries/NativeAnimation/RCTNativeAnimatedNodesManager.mm +9 -9
- package/Libraries/NativeAnimation/RCTNativeAnimatedTurboModule.mm +9 -13
- package/Libraries/NativeComponent/BaseViewConfig.android.js +11 -2
- package/Libraries/NativeComponent/NativeComponentRegistry.d.ts +98 -0
- package/Libraries/NativeComponent/NativeComponentRegistry.js +2 -0
- package/Libraries/NativeComponent/NativeComponentRegistryUnstable.js +3 -1
- package/Libraries/Network/RCTDataRequestHandler.mm +4 -4
- package/Libraries/Network/RCTHTTPRequestHandler.h +1 -1
- package/Libraries/Network/RCTHTTPRequestHandler.mm +4 -4
- package/Libraries/Network/RCTInspectorNetworkReporter.h +8 -8
- package/Libraries/Network/RCTInspectorNetworkReporter.mm +20 -22
- package/Libraries/Network/RCTNetworkTask.h +5 -1
- package/Libraries/Network/RCTNetworkTask.mm +13 -0
- package/Libraries/Network/RCTNetworking+Internal.h +21 -0
- package/Libraries/Network/RCTNetworking.android.js +3 -1
- package/Libraries/Network/RCTNetworking.h +3 -0
- package/Libraries/Network/RCTNetworking.ios.js +3 -0
- package/Libraries/Network/RCTNetworking.mm +84 -37
- package/Libraries/Network/React-RCTNetwork.podspec +1 -0
- package/Libraries/Network/XMLHttpRequest.js +1 -41
- package/Libraries/Pressability/usePressability.js +14 -3
- package/Libraries/PushNotificationIOS/RCTPushNotificationManager.mm +5 -7
- package/Libraries/ReactNative/ReactFabricPublicInstance/ReactFabricPublicInstance.js +20 -82
- package/Libraries/ReactNative/getNativeComponentAttributes.js +12 -0
- package/Libraries/Renderer/implementations/ReactFabric-dev.js +6759 -4478
- package/Libraries/Renderer/implementations/ReactFabric-prod.js +3169 -3119
- package/Libraries/Renderer/implementations/ReactFabric-profiling.js +4732 -3535
- package/Libraries/Renderer/implementations/ReactNativeRenderer-dev.js +6646 -4070
- package/Libraries/Renderer/implementations/ReactNativeRenderer-prod.js +3136 -2825
- package/Libraries/Renderer/implementations/ReactNativeRenderer-profiling.js +4761 -3312
- package/Libraries/Renderer/shims/ReactNative.js +3 -1
- package/Libraries/Renderer/shims/ReactNativeTypes.js +2 -1
- package/Libraries/Required/RCTRequired.h +14 -10
- package/Libraries/Settings/RCTSettingsManager.mm +2 -2
- package/Libraries/StyleSheet/StyleSheetTypes.d.ts +1 -1
- package/Libraries/StyleSheet/StyleSheetTypes.js +44 -0
- package/Libraries/StyleSheet/processBackgroundPosition.js +284 -0
- package/Libraries/StyleSheet/processBackgroundRepeat.js +105 -0
- package/Libraries/StyleSheet/processBackgroundSize.js +104 -0
- package/Libraries/Text/BaseText/RCTBaseTextShadowView.h +2 -2
- package/Libraries/Text/BaseText/RCTBaseTextShadowView.mm +2 -2
- package/Libraries/Text/BaseText/RCTBaseTextViewManager.h +2 -2
- package/Libraries/Text/BaseText/RCTBaseTextViewManager.mm +2 -2
- package/Libraries/Text/RCTTextAttributes.h +2 -2
- package/Libraries/Text/RCTTextAttributes.mm +2 -2
- package/Libraries/Text/RawText/RCTRawTextShadowView.h +2 -2
- package/Libraries/Text/RawText/RCTRawTextShadowView.mm +2 -2
- package/Libraries/Text/RawText/RCTRawTextViewManager.h +2 -2
- package/Libraries/Text/RawText/RCTRawTextViewManager.mm +2 -2
- package/Libraries/Text/Text/RCTTextShadowView.h +2 -2
- package/Libraries/Text/Text/RCTTextShadowView.mm +6 -7
- package/Libraries/Text/Text/RCTTextView.h +2 -2
- package/Libraries/Text/Text/RCTTextView.mm +2 -2
- package/Libraries/Text/Text/RCTTextViewManager.h +2 -2
- package/Libraries/Text/Text/RCTTextViewManager.mm +2 -2
- package/Libraries/Text/Text.d.ts +2 -2
- package/Libraries/Text/TextInput/Multiline/RCTMultilineTextInputView.h +2 -2
- package/Libraries/Text/TextInput/Multiline/RCTMultilineTextInputView.mm +2 -2
- package/Libraries/Text/TextInput/Multiline/RCTMultilineTextInputViewManager.h +2 -2
- package/Libraries/Text/TextInput/Multiline/RCTMultilineTextInputViewManager.mm +2 -2
- package/Libraries/Text/TextInput/RCTBaseTextInputShadowView.h +2 -2
- package/Libraries/Text/TextInput/RCTBaseTextInputShadowView.mm +6 -7
- package/Libraries/Text/TextInput/RCTBaseTextInputView.h +2 -2
- package/Libraries/Text/TextInput/RCTBaseTextInputView.mm +2 -2
- package/Libraries/Text/TextInput/RCTBaseTextInputViewManager.h +2 -2
- package/Libraries/Text/TextInput/RCTBaseTextInputViewManager.mm +6 -9
- package/Libraries/Text/TextInput/RCTInputAccessoryShadowView.h +2 -2
- package/Libraries/Text/TextInput/RCTInputAccessoryShadowView.mm +2 -2
- package/Libraries/Text/TextInput/RCTInputAccessoryView.h +2 -2
- package/Libraries/Text/TextInput/RCTInputAccessoryView.mm +2 -2
- package/Libraries/Text/TextInput/RCTInputAccessoryViewContent.h +2 -2
- package/Libraries/Text/TextInput/RCTInputAccessoryViewContent.mm +2 -2
- package/Libraries/Text/TextInput/RCTInputAccessoryViewManager.h +2 -2
- package/Libraries/Text/TextInput/RCTInputAccessoryViewManager.mm +2 -2
- package/Libraries/Text/TextInput/Singleline/RCTSinglelineTextInputView.h +2 -2
- package/Libraries/Text/TextInput/Singleline/RCTSinglelineTextInputView.mm +2 -2
- package/Libraries/Text/TextInput/Singleline/RCTSinglelineTextInputViewManager.h +2 -2
- package/Libraries/Text/TextInput/Singleline/RCTSinglelineTextInputViewManager.mm +2 -2
- package/Libraries/Text/TextNativeComponent.js +10 -0
- package/Libraries/Text/VirtualText/RCTVirtualTextShadowView.h +2 -2
- package/Libraries/Text/VirtualText/RCTVirtualTextShadowView.mm +2 -2
- package/Libraries/Text/VirtualText/RCTVirtualTextView.h +2 -2
- package/Libraries/Text/VirtualText/RCTVirtualTextView.mm +2 -2
- package/Libraries/Text/VirtualText/RCTVirtualTextViewManager.h +2 -2
- package/Libraries/Text/VirtualText/RCTVirtualTextViewManager.mm +2 -2
- package/Libraries/TurboModule/TurboModuleRegistry.js +3 -9
- package/Libraries/TypeSafety/RCTConvertHelpers.h +1 -1
- package/Libraries/TypeSafety/RCTTypedModuleConstants.mm +3 -5
- package/Libraries/Utilities/DevLoadingView.js +14 -6
- package/Libraries/Utilities/HMRClient.js +13 -5
- package/Libraries/Wrapper/Example/RCTWrapperExampleView.h +2 -2
- package/Libraries/Wrapper/Example/RCTWrapperExampleView.m +2 -2
- package/Libraries/Wrapper/Example/RCTWrapperExampleViewController.h +2 -2
- package/Libraries/Wrapper/Example/RCTWrapperExampleViewController.m +2 -2
- package/Libraries/Wrapper/Example/RCTWrapperReactRootViewController.h +2 -2
- package/Libraries/Wrapper/Example/RCTWrapperReactRootViewController.m +2 -2
- package/Libraries/Wrapper/Example/RCTWrapperReactRootViewManager.h +2 -2
- package/Libraries/Wrapper/Example/RCTWrapperReactRootViewManager.m +2 -2
- package/Libraries/Wrapper/RCTWrapper.h +2 -2
- package/Libraries/Wrapper/RCTWrapperShadowView.h +2 -2
- package/Libraries/Wrapper/RCTWrapperShadowView.m +2 -2
- package/Libraries/Wrapper/RCTWrapperView.h +2 -2
- package/Libraries/Wrapper/RCTWrapperView.m +2 -2
- package/Libraries/Wrapper/RCTWrapperViewControllerHostingView.h +2 -2
- package/Libraries/Wrapper/RCTWrapperViewControllerHostingView.m +2 -2
- package/Libraries/Wrapper/RCTWrapperViewManager.h +2 -2
- package/Libraries/Wrapper/RCTWrapperViewManager.m +2 -2
- package/README-core.md +5 -2
- package/React/Base/RCTAssert.h +7 -42
- package/React/Base/RCTAssert.m +1 -113
- package/React/Base/RCTBridge+Private.h +4 -4
- package/React/Base/RCTBridge.mm +5 -6
- package/React/Base/RCTBridgeDelegate.h +2 -2
- package/React/Base/RCTBridgeModule.h +24 -10
- package/React/Base/RCTBridgeProxy.mm +8 -8
- package/React/Base/RCTBundleManager.h +2 -2
- package/React/Base/RCTBundleManager.m +10 -10
- package/React/Base/RCTBundleURLProvider.mm +4 -4
- package/React/Base/RCTCallableJSModules.m +6 -6
- package/React/Base/RCTConvert.h +8 -3
- package/React/Base/RCTConvert.mm +2 -2
- package/React/Base/RCTDefines.h +0 -10
- package/React/Base/RCTJavaScriptExecutor.h +2 -2
- package/React/Base/RCTLog.h +6 -4
- package/React/Base/RCTMockDef.h +3 -6
- package/React/Base/RCTModuleData.mm +3 -3
- package/React/Base/RCTModuleMethod.mm +13 -11
- package/React/Base/RCTModuleRegistry.m +8 -8
- package/React/Base/RCTRootContentView.h +2 -2
- package/React/Base/RCTRootContentView.m +2 -2
- package/React/Base/RCTRootView.m +3 -3
- package/React/Base/RCTRootViewInternal.h +2 -2
- package/React/Base/RCTUtils.mm +5 -5
- package/React/Base/RCTVersion.m +2 -2
- package/React/Base/RCTViewRegistry.m +8 -8
- package/React/Base/Surface/RCTSurface.mm +3 -4
- package/React/Base/Surface/RCTSurfaceRootShadowView.m +3 -3
- package/React/Base/Surface/SurfaceHostingView/RCTSurfaceSizeMeasureMode.mm +4 -4
- package/React/CoreModules/RCTAccessibilityManager.mm +25 -30
- package/React/CoreModules/RCTActionSheetManager.mm +38 -20
- package/React/CoreModules/RCTAlertController.mm +2 -2
- package/React/CoreModules/RCTAlertManager.mm +2 -2
- package/React/CoreModules/RCTAppearance.h +1 -1
- package/React/CoreModules/RCTDevLoadingView.mm +6 -14
- package/React/CoreModules/RCTDevMenu.h +30 -1
- package/React/CoreModules/RCTDevMenu.mm +99 -19
- package/React/CoreModules/RCTDevMenuConfigurationDecorator.h +23 -0
- package/React/CoreModules/RCTDevMenuConfigurationDecorator.mm +52 -0
- package/React/CoreModules/RCTDevSettings.h +5 -0
- package/React/CoreModules/RCTDevSettings.mm +8 -1
- package/React/CoreModules/RCTDevToolsRuntimeSettingsModule.mm +2 -2
- package/React/CoreModules/RCTDeviceInfo.h +2 -0
- package/React/CoreModules/RCTDeviceInfo.mm +21 -4
- package/React/CoreModules/RCTEventDispatcher.mm +10 -8
- package/React/CoreModules/RCTExceptionsManager.mm +13 -15
- package/React/CoreModules/RCTFPSGraph.mm +3 -3
- package/React/CoreModules/RCTLogBox.mm +8 -8
- package/React/CoreModules/RCTLogBoxView.h +2 -2
- package/React/CoreModules/RCTLogBoxView.mm +7 -9
- package/React/CoreModules/RCTPerfMonitor.mm +19 -19
- package/React/CoreModules/RCTTiming.mm +3 -5
- package/React/CoreModules/RCTWebSocketModule.mm +3 -5
- package/React/CoreModules/React-CoreModules.podspec +1 -0
- package/React/CxxBridge/RCTCxxBridge.mm +9 -28
- package/React/CxxBridge/RCTJSIExecutorRuntimeInstaller.h +3 -4
- package/React/CxxBridge/RCTJSIExecutorRuntimeInstaller.mm +2 -2
- package/React/CxxBridge/RCTMessageThread.h +6 -7
- package/React/CxxBridge/RCTMessageThread.mm +1 -1
- package/React/CxxBridge/RCTObjcExecutor.h +4 -7
- package/React/CxxBridge/RCTObjcExecutor.mm +5 -5
- package/React/CxxLogUtils/RCTDefaultCxxLogFunction.h +1 -1
- package/React/CxxModule/DispatchMessageQueueThread.h +2 -2
- package/React/CxxModule/RCTCxxMethod.mm +1 -1
- package/React/CxxModule/RCTCxxUtils.h +2 -2
- package/React/CxxModule/RCTCxxUtils.mm +8 -7
- package/React/CxxModule/RCTNativeModule.h +8 -12
- package/React/CxxModule/RCTNativeModule.mm +7 -7
- package/React/DevSupport/RCTInspectorDevServerHelper.mm +4 -4
- package/React/DevSupport/RCTInspectorNetworkHelper.mm +2 -2
- package/React/DevSupport/RCTPackagerConnection.h +1 -1
- package/React/DevSupport/RCTPackagerConnection.mm +1 -0
- package/React/DevSupport/RCTPausedInDebuggerOverlayController.mm +1 -1
- package/React/FBReactNativeSpec/FBReactNativeSpec/FBReactNativeSpec.h +6 -0
- package/React/FBReactNativeSpec/FBReactNativeSpecJSI.h +3709 -5764
- package/React/FBReactNativeSpec/react/renderer/components/FBReactNativeSpec/Props.cpp +8 -2
- package/React/FBReactNativeSpec/react/renderer/components/FBReactNativeSpec/Props.h +1 -0
- package/React/Fabric/AppleEventBeat.h +3 -4
- package/React/Fabric/Mounting/ComponentViews/Modal/RCTFabricModalHostViewController.mm +2 -2
- package/React/Fabric/Mounting/ComponentViews/Modal/RCTModalHostViewComponentView.mm +6 -2
- package/React/Fabric/Mounting/ComponentViews/ScrollView/RCTEnhancedScrollView.mm +2 -1
- package/React/Fabric/Mounting/ComponentViews/View/RCTViewComponentView.mm +311 -51
- package/React/Fabric/Mounting/RCTComponentViewFactory.mm +3 -11
- package/React/Fabric/Mounting/RCTMountingManager.mm +1 -1
- package/React/Fabric/Mounting/RCTMountingTransactionObserverCoordinator.h +7 -10
- package/React/Fabric/RCTSurfacePointerHandler.mm +1 -1
- package/React/Fabric/RCTSurfaceTouchHandler.mm +1 -1
- package/React/Fabric/Utils/PlatformRunLoopObserver.h +5 -11
- package/React/Fabric/Utils/PlatformRunLoopObserver.mm +1 -1
- package/React/Fabric/Utils/RCTBackgroundImageUtils.h +28 -0
- package/React/Fabric/Utils/RCTBackgroundImageUtils.mm +209 -0
- package/React/Fabric/Utils/RCTBoxShadow.mm +1 -1
- package/React/Fabric/Utils/RCTGradientUtils.mm +4 -0
- package/React/Fabric/Utils/RCTIdentifierPool.h +6 -3
- package/React/Fabric/Utils/RCTLinearGradient.mm +1 -0
- package/React/Fabric/Utils/RCTRadialGradient.mm +11 -9
- package/React/Inspector/RCTCxxInspectorPackagerConnectionDelegate.h +5 -8
- package/React/Inspector/RCTCxxInspectorPackagerConnectionDelegate.mm +1 -1
- package/React/Inspector/RCTCxxInspectorWebSocketAdapter.mm +2 -2
- package/React/Modules/RCTUIManager.mm +36 -55
- package/React/Profiler/RCTProfile.h +6 -6
- package/React/Profiler/RCTProfile.m +47 -44
- package/React/React-RCTFabric.podspec +2 -1
- package/React/Runtime/React-RCTRuntime.podspec +1 -0
- package/React/Views/RCTActivityIndicatorView.h +2 -2
- package/React/Views/RCTActivityIndicatorView.m +2 -2
- package/React/Views/RCTActivityIndicatorViewManager.h +3 -3
- package/React/Views/RCTActivityIndicatorViewManager.m +2 -2
- package/React/Views/RCTBorderDrawing.h +1 -1
- package/React/Views/RCTBorderDrawing.m +37 -35
- package/React/Views/RCTComponentData.mm +19 -19
- package/React/Views/RCTConvert+CoreLocation.m +2 -2
- package/React/Views/RCTDebuggingOverlayManager.h +2 -2
- package/React/Views/RCTDebuggingOverlayManager.m +2 -2
- package/React/Views/RCTFont+Private.h +16 -0
- package/React/Views/RCTFont.h +3 -1
- package/React/Views/RCTFont.mm +13 -2
- package/React/Views/RCTLayout.m +21 -25
- package/React/Views/RCTModalHostView.h +2 -2
- package/React/Views/RCTModalHostView.m +2 -2
- package/React/Views/RCTModalHostViewController.h +2 -2
- package/React/Views/RCTModalHostViewController.m +2 -2
- package/React/Views/RCTModalHostViewManager.h +2 -2
- package/React/Views/RCTModalHostViewManager.m +2 -2
- package/React/Views/RCTModalManager.h +2 -2
- package/React/Views/RCTModalManager.m +2 -2
- package/React/Views/RCTRootShadowView.m +3 -3
- package/React/Views/RCTShadowView+Layout.m +12 -15
- package/React/Views/RCTShadowView.m +5 -6
- package/React/Views/RCTSwitch.h +2 -2
- package/React/Views/RCTSwitch.m +2 -2
- package/React/Views/RCTSwitchManager.h +2 -2
- package/React/Views/RCTSwitchManager.m +2 -2
- package/React/Views/RCTViewManager.m +2 -2
- package/React/Views/RefreshControl/RCTRefreshControl.h +2 -2
- package/React/Views/RefreshControl/RCTRefreshControl.m +2 -2
- package/React/Views/RefreshControl/RCTRefreshControlManager.h +2 -2
- package/React/Views/RefreshControl/RCTRefreshControlManager.m +2 -2
- package/React/Views/SafeAreaView/RCTSafeAreaShadowView.h +2 -2
- package/React/Views/SafeAreaView/RCTSafeAreaShadowView.m +2 -2
- package/React/Views/SafeAreaView/RCTSafeAreaView.h +2 -2
- package/React/Views/SafeAreaView/RCTSafeAreaView.m +2 -2
- package/React/Views/SafeAreaView/RCTSafeAreaViewLocalData.h +2 -2
- package/React/Views/SafeAreaView/RCTSafeAreaViewLocalData.m +2 -2
- package/React/Views/SafeAreaView/RCTSafeAreaViewManager.h +2 -2
- package/React/Views/SafeAreaView/RCTSafeAreaViewManager.m +2 -2
- package/React/Views/ScrollView/RCTScrollContentShadowView.h +2 -2
- package/React/Views/ScrollView/RCTScrollContentShadowView.m +2 -2
- package/React/Views/ScrollView/RCTScrollContentView.h +2 -2
- package/React/Views/ScrollView/RCTScrollContentView.m +2 -2
- package/React/Views/ScrollView/RCTScrollContentViewManager.h +2 -2
- package/React/Views/ScrollView/RCTScrollContentViewManager.m +2 -2
- package/React/Views/ScrollView/RCTScrollView.h +2 -2
- package/React/Views/ScrollView/RCTScrollView.m +6 -7
- package/React/Views/ScrollView/RCTScrollViewManager.h +3 -3
- package/React/Views/ScrollView/RCTScrollViewManager.m +4 -7
- package/ReactAndroid/api/ReactAndroid.api +92 -10
- package/ReactAndroid/build.gradle.kts +8 -5
- package/ReactAndroid/external-artifacts/build.gradle.kts +2 -47
- package/ReactAndroid/gradle.properties +1 -1
- package/ReactAndroid/hermes-engine/build.gradle.kts +4 -11
- package/ReactAndroid/proguard-rules.pro +5 -0
- package/ReactAndroid/src/main/java/com/facebook/react/ReactActivityDelegate.java +25 -1
- package/ReactAndroid/src/main/java/com/facebook/react/ReactDelegate.kt +5 -1
- package/ReactAndroid/src/main/java/com/facebook/react/ReactHost.kt +21 -0
- package/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManager.java +0 -11
- package/ReactAndroid/src/main/java/com/facebook/react/animated/InterpolationAnimatedNode.kt +2 -2
- package/ReactAndroid/src/main/java/com/facebook/react/bridge/CatalystInstanceImpl.java +1 -1
- package/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactContextBaseJavaModule.kt +1 -1
- package/ReactAndroid/src/main/java/com/facebook/react/bridge/ReadableNativeArray.kt +37 -9
- package/ReactAndroid/src/main/java/com/facebook/react/bridge/ReadableNativeMap.kt +87 -50
- package/ReactAndroid/src/main/java/com/facebook/react/defaults/DefaultNewArchitectureEntryPoint.kt +1 -7
- package/ReactAndroid/src/main/java/com/facebook/react/devsupport/BridgelessDevSupportManager.kt +1 -1
- package/ReactAndroid/src/main/java/com/facebook/react/devsupport/CxxInspectorPackagerConnection.kt +1 -0
- package/ReactAndroid/src/main/java/com/facebook/react/devsupport/DefaultDevLoadingViewImplementation.kt +13 -3
- package/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevMenuConfiguration.kt +20 -0
- package/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevServerHelper.kt +5 -1
- package/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevSupportManagerBase.kt +134 -31
- package/ReactAndroid/src/main/java/com/facebook/react/devsupport/ReleaseDevSupportManager.kt +13 -1
- package/ReactAndroid/src/main/java/com/facebook/react/devsupport/inspector/InspectorNetworkRequestListener.kt +7 -0
- package/ReactAndroid/src/main/java/com/facebook/react/devsupport/interfaces/DevLoadingViewManager.kt +2 -0
- package/ReactAndroid/src/main/java/com/facebook/react/devsupport/interfaces/DevSupportManager.kt +16 -0
- package/ReactAndroid/src/main/java/com/facebook/react/devsupport/perfmonitor/PerfMonitorDevHelper.kt +4 -0
- package/ReactAndroid/src/main/java/com/facebook/react/devsupport/perfmonitor/PerfMonitorInspectorTargetBinding.kt +13 -2
- package/ReactAndroid/src/main/java/com/facebook/react/devsupport/perfmonitor/PerfMonitorOverlayManager.kt +108 -0
- package/ReactAndroid/src/main/java/com/facebook/react/devsupport/perfmonitor/PerfMonitorOverlayView.kt +219 -0
- package/ReactAndroid/src/main/java/com/facebook/react/devsupport/perfmonitor/PerfMonitorUpdateListener.kt +4 -9
- package/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricUIManager.java +41 -56
- package/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/MountItemDispatcher.kt +47 -32
- package/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/MountingManager.kt +13 -26
- package/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/SurfaceMountingManager.java +143 -5
- package/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/mountitems/DestroyUnmountedViewMountItem.kt +3 -3
- package/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/mountitems/IntBufferBatchMountItem.kt +2 -4
- package/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/mountitems/PrefetchResourcesMountItem.kt +35 -0
- package/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/mountitems/SendAccessibilityEventMountItem.kt +6 -6
- package/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/mountitems/SynchronousMountItem.kt +38 -0
- package/ReactAndroid/src/main/java/com/facebook/react/internal/featureflags/ReactNativeFeatureFlags.kt +101 -11
- package/ReactAndroid/src/main/java/com/facebook/react/internal/featureflags/ReactNativeFeatureFlagsCxxAccessor.kt +170 -20
- package/ReactAndroid/src/main/java/com/facebook/react/internal/featureflags/ReactNativeFeatureFlagsCxxInterop.kt +35 -5
- package/ReactAndroid/src/main/java/com/facebook/react/internal/featureflags/ReactNativeFeatureFlagsDefaults.kt +40 -10
- package/ReactAndroid/src/main/java/com/facebook/react/internal/featureflags/ReactNativeFeatureFlagsLocalAccessor.kt +188 -23
- package/ReactAndroid/src/main/java/com/facebook/react/internal/featureflags/ReactNativeFeatureFlagsOverrides_RNOSS_Canary_Android.kt +2 -2
- package/ReactAndroid/src/main/java/com/facebook/react/internal/featureflags/ReactNativeFeatureFlagsOverrides_RNOSS_Experimental_Android.kt +3 -1
- package/ReactAndroid/src/main/java/com/facebook/react/internal/featureflags/ReactNativeFeatureFlagsOverrides_RNOSS_Stable_Android.kt +3 -9
- package/ReactAndroid/src/main/java/com/facebook/react/internal/featureflags/ReactNativeFeatureFlagsProvider.kt +35 -5
- package/ReactAndroid/src/main/java/com/facebook/react/internal/featureflags/ReactNativeNewArchitectureFeatureFlagsDefaults.kt +5 -3
- package/ReactAndroid/src/main/java/com/facebook/react/internal/tracing/PerformanceTracer.kt +109 -0
- package/ReactAndroid/src/main/java/com/facebook/react/modules/accessibilityinfo/AccessibilityInfoModule.kt +3 -3
- package/ReactAndroid/src/main/java/com/facebook/react/modules/appearance/AppearanceModule.kt +12 -0
- package/ReactAndroid/src/main/java/com/facebook/react/modules/core/JavaTimerManager.kt +9 -2
- package/ReactAndroid/src/main/java/com/facebook/react/modules/devloading/DevLoadingModule.kt +3 -1
- package/ReactAndroid/src/main/java/com/facebook/react/modules/image/ImageLoaderModule.kt +2 -2
- package/ReactAndroid/src/main/java/com/facebook/react/modules/network/InspectorNetworkReporter.kt +11 -11
- package/ReactAndroid/src/main/java/com/facebook/react/modules/network/NetworkEventUtil.kt +20 -11
- package/ReactAndroid/src/main/java/com/facebook/react/modules/network/NetworkingModule.kt +126 -11
- package/ReactAndroid/src/main/java/com/facebook/react/modules/network/ProgressRequestBody.kt +20 -0
- package/ReactAndroid/src/main/java/com/facebook/react/modules/systeminfo/AndroidInfoHelpers.kt +3 -3
- package/ReactAndroid/src/main/java/com/facebook/react/modules/systeminfo/AndroidInfoModule.kt +1 -10
- package/ReactAndroid/src/main/java/com/facebook/react/modules/systeminfo/ReactNativeVersion.kt +2 -2
- package/ReactAndroid/src/main/java/com/facebook/react/packagerconnection/PackagerConnectionSettings.kt +20 -4
- package/ReactAndroid/src/main/java/com/facebook/react/runtime/BridgelessReactContext.kt +13 -2
- package/ReactAndroid/src/main/java/com/facebook/react/runtime/JSTimerExecutor.kt +9 -4
- package/ReactAndroid/src/main/java/com/facebook/react/runtime/ReactHostImpl.kt +127 -91
- package/ReactAndroid/src/main/java/com/facebook/react/runtime/ReactHostImplDevHelper.kt +1 -1
- package/ReactAndroid/src/main/java/com/facebook/react/runtime/ReactHostInspectorTarget.kt +15 -12
- package/ReactAndroid/src/main/java/com/facebook/react/runtime/{BridgelessReactStateTracker.kt → ReactHostStateTracker.kt} +6 -7
- package/ReactAndroid/src/main/java/com/facebook/react/runtime/ReactInstance.kt +1 -5
- package/ReactAndroid/src/main/java/com/facebook/react/runtime/ReactLifecycleStateManager.kt +9 -11
- package/ReactAndroid/src/main/java/com/facebook/react/shell/MainReactPackage.kt +0 -8
- package/ReactAndroid/src/main/java/com/facebook/react/uimanager/BackgroundStyleApplicator.kt +261 -147
- package/ReactAndroid/src/main/java/com/facebook/react/uimanager/BlendModeHelper.kt +14 -1
- package/ReactAndroid/src/main/java/com/facebook/react/uimanager/ComponentNameResolver.kt +11 -1
- package/ReactAndroid/src/main/java/com/facebook/react/uimanager/ComponentNameResolverBinding.kt +12 -0
- package/ReactAndroid/src/main/java/com/facebook/react/uimanager/DisplayMetricsHolder.kt +6 -1
- package/ReactAndroid/src/main/java/com/facebook/react/uimanager/FilterHelper.kt +16 -0
- package/ReactAndroid/src/main/java/com/facebook/react/uimanager/FloatUtil.kt +33 -0
- package/ReactAndroid/src/main/java/com/facebook/react/uimanager/LengthPercentage.kt +7 -9
- package/ReactAndroid/src/main/java/com/facebook/react/uimanager/NativeViewHierarchyManager.java +3 -5
- package/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactRoot.kt +66 -0
- package/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactShadowNodeImpl.java +1 -3
- package/ReactAndroid/src/main/java/com/facebook/react/uimanager/UIManagerHelper.kt +2 -1
- package/ReactAndroid/src/main/java/com/facebook/react/uimanager/UIManagerModule.java +1 -6
- package/ReactAndroid/src/main/java/com/facebook/react/uimanager/UIViewOperationQueue.java +2 -2
- package/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewManager.java +3 -2
- package/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewProps.kt +3 -0
- package/ReactAndroid/src/main/java/com/facebook/react/uimanager/drawable/BackgroundDrawable.kt +0 -48
- package/ReactAndroid/src/main/java/com/facebook/react/uimanager/drawable/BackgroundImageDrawable.kt +415 -0
- package/ReactAndroid/src/main/java/com/facebook/react/uimanager/drawable/CompositeBackgroundDrawable.kt +15 -18
- package/ReactAndroid/src/main/java/com/facebook/react/uimanager/layoutanimation/LayoutAnimationController.kt +22 -174
- package/ReactAndroid/src/main/java/com/facebook/react/uimanager/style/BackgroundImageLayer.kt +1 -3
- package/ReactAndroid/src/main/java/com/facebook/react/uimanager/style/BackgroundPosition.kt +59 -0
- package/ReactAndroid/src/main/java/com/facebook/react/uimanager/style/BackgroundRepeat.kt +46 -0
- package/ReactAndroid/src/main/java/com/facebook/react/uimanager/style/BackgroundSize.kt +103 -0
- package/ReactAndroid/src/main/java/com/facebook/react/uimanager/style/BorderColors.kt +5 -5
- package/ReactAndroid/src/main/java/com/facebook/react/uimanager/style/BoxShadow.kt +1 -1
- package/ReactAndroid/src/main/java/com/facebook/react/views/image/MultiPostprocessor.kt +1 -1
- package/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactHorizontalScrollView.java +107 -14
- package/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactHorizontalScrollViewManager.kt +6 -0
- package/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactScrollView.java +101 -16
- package/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactScrollViewHelper.kt +63 -18
- package/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactScrollViewManager.kt +6 -0
- package/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ScrollEvent.kt +5 -1
- package/ReactAndroid/src/main/java/com/facebook/react/views/scroll/VirtualViewContainer.kt +50 -51
- package/ReactAndroid/src/main/java/com/facebook/react/views/scroll/VirtualViewContainerStateClassic.kt +92 -0
- package/ReactAndroid/src/main/java/com/facebook/react/views/scroll/VirtualViewContainerStateExperimental.kt +526 -0
- package/ReactAndroid/src/main/java/com/facebook/react/views/text/DefaultStyleValuesUtil.kt +4 -0
- package/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactBaseTextShadowNode.kt +3 -5
- package/ReactAndroid/src/main/java/com/facebook/react/views/text/frescosupport/FrescoBasedReactTextInlineImageShadowNode.kt +2 -0
- package/ReactAndroid/src/main/java/com/facebook/react/views/text/internal/ReactTextInlineImageShadowNode.kt +7 -0
- package/ReactAndroid/src/main/java/com/facebook/react/views/text/internal/span/CustomStyleSpan.kt +4 -0
- package/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactEditText.kt +16 -7
- package/ReactAndroid/src/main/java/com/facebook/react/views/view/ReactViewGroup.kt +22 -0
- package/ReactAndroid/src/main/java/com/facebook/react/views/view/ReactViewManager.kt +78 -1
- package/ReactAndroid/src/main/java/com/facebook/react/views/virtual/view/ReactVirtualView.kt +16 -5
- package/ReactAndroid/src/main/java/com/facebook/react/views/virtual/viewexperimental/ReactVirtualViewExperimental.kt +61 -3
- package/ReactAndroid/src/main/java/com/facebook/react/views/virtual/viewexperimental/ReactVirtualViewExperimentalManager.kt +2 -2
- package/ReactAndroid/src/main/jni/CMakeLists.txt +15 -0
- package/ReactAndroid/src/main/jni/first-party/fbgloginit/fb/glog_init.h +1 -1
- package/ReactAndroid/src/main/jni/first-party/fbgloginit/glog_init.cpp +1 -1
- package/ReactAndroid/src/main/jni/first-party/jni-hack/real/jni.h +656 -643
- package/ReactAndroid/src/main/jni/first-party/jni-lib-merge/jni_lib_merge.h +57 -59
- package/ReactAndroid/src/main/jni/first-party/yogajni/jni/YGJNIVanilla.cpp +3 -2
- package/ReactAndroid/src/main/jni/react/devsupport/CMakeLists.txt +8 -1
- package/ReactAndroid/src/main/jni/react/devsupport/JCxxInspectorPackagerConnection.h +10 -12
- package/ReactAndroid/src/main/jni/react/devsupport/JCxxInspectorPackagerConnectionDelegateImpl.h +6 -14
- package/ReactAndroid/src/main/jni/react/devsupport/JCxxInspectorPackagerConnectionWebSocket.h +2 -4
- package/ReactAndroid/src/main/jni/react/devsupport/JCxxInspectorPackagerConnectionWebSocketDelegate.h +4 -8
- package/ReactAndroid/src/main/jni/react/devsupport/JInspectorFlags.h +3 -4
- package/ReactAndroid/src/main/jni/react/devsupport/JInspectorNetworkReporter.cpp +26 -23
- package/ReactAndroid/src/main/jni/react/devsupport/JInspectorNetworkReporter.h +13 -21
- package/ReactAndroid/src/main/jni/react/fabric/AndroidEventBeat.h +4 -5
- package/ReactAndroid/src/main/jni/react/fabric/ComponentFactory.h +2 -3
- package/ReactAndroid/src/main/jni/react/fabric/CoreComponentsRegistry.cpp +53 -47
- package/ReactAndroid/src/main/jni/react/fabric/CoreComponentsRegistry.h +3 -2
- package/ReactAndroid/src/main/jni/react/fabric/EventBeatManager.h +4 -6
- package/ReactAndroid/src/main/jni/react/fabric/EventEmitterWrapper.h +5 -7
- package/ReactAndroid/src/main/jni/react/fabric/FabricMountingManager.cpp +87 -58
- package/ReactAndroid/src/main/jni/react/fabric/FabricMountingManager.h +12 -23
- package/ReactAndroid/src/main/jni/react/fabric/FabricUIManagerBinding.h +22 -46
- package/ReactAndroid/src/main/jni/react/fabric/FocusOrderingHelper.cpp +6 -4
- package/ReactAndroid/src/main/jni/react/fabric/FocusOrderingHelper.h +7 -7
- package/ReactAndroid/src/main/jni/react/fabric/JFabricUIManager.h +2 -3
- package/ReactAndroid/src/main/jni/react/fabric/MountItem.h +11 -19
- package/ReactAndroid/src/main/jni/react/fabric/StateWrapperImpl.h +3 -5
- package/ReactAndroid/src/main/jni/react/fabric/SurfaceHandlerBinding.h +5 -9
- package/ReactAndroid/src/main/jni/react/featureflags/JReactNativeFeatureFlagsCxxInterop.cpp +236 -26
- package/ReactAndroid/src/main/jni/react/featureflags/JReactNativeFeatureFlagsCxxInterop.h +51 -6
- package/ReactAndroid/src/main/jni/react/hermes/instrumentation/HermesMemoryDumper.h +13 -14
- package/ReactAndroid/src/main/jni/react/hermes/instrumentation/HermesSamplingProfiler.h +4 -7
- package/ReactAndroid/src/main/jni/react/hermes/reactexecutor/OnLoad.cpp +2 -1
- package/ReactAndroid/src/main/jni/react/jni/CatalystInstanceImpl.cpp +5 -5
- package/ReactAndroid/src/main/jni/react/jni/CatalystInstanceImpl.h +23 -40
- package/ReactAndroid/src/main/jni/react/jni/CxxModuleWrapper.h +7 -8
- package/ReactAndroid/src/main/jni/react/jni/CxxModuleWrapperBase.h +6 -9
- package/ReactAndroid/src/main/jni/react/jni/InspectorNetworkRequestListener.h +5 -11
- package/ReactAndroid/src/main/jni/react/jni/JCallback.h +6 -6
- package/ReactAndroid/src/main/jni/react/jni/JDynamicNative.cpp +7 -4
- package/ReactAndroid/src/main/jni/react/jni/JDynamicNative.h +3 -3
- package/ReactAndroid/src/main/jni/react/jni/JMessageQueueThread.h +3 -4
- package/ReactAndroid/src/main/jni/react/jni/JReactCxxErrorHandler.h +1 -2
- package/ReactAndroid/src/main/jni/react/jni/JReactMarker.h +8 -22
- package/ReactAndroid/src/main/jni/react/jni/JReactSoftExceptionLogger.h +3 -7
- package/ReactAndroid/src/main/jni/react/jni/JRuntimeExecutor.h +1 -2
- package/ReactAndroid/src/main/jni/react/jni/JRuntimeScheduler.h +1 -2
- package/ReactAndroid/src/main/jni/react/jni/JSLoader.cpp +1 -1
- package/ReactAndroid/src/main/jni/react/jni/JSLoader.h +2 -5
- package/ReactAndroid/src/main/jni/react/jni/JSLogging.h +1 -1
- package/ReactAndroid/src/main/jni/react/jni/JWeakRefUtils.h +2 -2
- package/ReactAndroid/src/main/jni/react/jni/JavaModuleWrapper.cpp +1 -1
- package/ReactAndroid/src/main/jni/react/jni/JavaModuleWrapper.h +19 -28
- package/ReactAndroid/src/main/jni/react/jni/JavaScriptExecutorHolder.h +6 -8
- package/ReactAndroid/src/main/jni/react/jni/JniJSModulesUnbundle.cpp +1 -1
- package/ReactAndroid/src/main/jni/react/jni/JniJSModulesUnbundle.h +10 -17
- package/ReactAndroid/src/main/jni/react/jni/MethodInvoker.cpp +1 -1
- package/ReactAndroid/src/main/jni/react/jni/MethodInvoker.h +11 -13
- package/ReactAndroid/src/main/jni/react/jni/ModuleRegistryBuilder.cpp +10 -8
- package/ReactAndroid/src/main/jni/react/jni/ModuleRegistryBuilder.h +6 -11
- package/ReactAndroid/src/main/jni/react/jni/NativeArray.h +7 -7
- package/ReactAndroid/src/main/jni/react/jni/NativeCommon.h +5 -6
- package/ReactAndroid/src/main/jni/react/jni/NativeMap.h +6 -6
- package/ReactAndroid/src/main/jni/react/jni/OnLoad.cpp +1 -1
- package/ReactAndroid/src/main/jni/react/jni/ReactInstanceManagerInspectorTarget.h +16 -28
- package/ReactAndroid/src/main/jni/react/jni/ReadableNativeArray.h +6 -8
- package/ReactAndroid/src/main/jni/react/jni/ReadableNativeMap.h +4 -9
- package/ReactAndroid/src/main/jni/react/jni/SafeReleaseJniRef.h +20 -12
- package/ReactAndroid/src/main/jni/react/jni/TransformHelper.h +1 -2
- package/ReactAndroid/src/main/jni/react/jni/WritableNativeArray.h +6 -9
- package/ReactAndroid/src/main/jni/react/jni/WritableNativeMap.h +7 -10
- package/ReactAndroid/src/main/jni/react/mapbuffer/react/common/mapbuffer/JReadableMapBuffer.h +3 -5
- package/ReactAndroid/src/main/jni/react/mapbuffer/react/common/mapbuffer/JWritableMapBuffer.h +1 -2
- package/ReactAndroid/src/main/jni/react/newarchdefaults/DefaultComponentsRegistry.cpp +7 -6
- package/ReactAndroid/src/main/jni/react/newarchdefaults/DefaultComponentsRegistry.h +5 -11
- package/ReactAndroid/src/main/jni/react/newarchdefaults/DefaultTurboModuleManagerDelegate.h +12 -21
- package/ReactAndroid/src/main/jni/react/reactnativeblob/BlobCollector.h +4 -8
- package/ReactAndroid/src/main/jni/react/reactperflogger/reactperflogger/JNativeModulePerfLogger.h +2 -4
- package/ReactAndroid/src/main/jni/react/runtime/cxxreactpackage/ReactCommon/CxxReactPackage.h +3 -4
- package/ReactAndroid/src/main/jni/react/runtime/hermes/jni/JHermesInstance.h +5 -11
- package/ReactAndroid/src/main/jni/react/runtime/jni/JBindingsInstaller.h +2 -4
- package/ReactAndroid/src/main/jni/react/runtime/jni/JJSRuntimeFactory.h +2 -4
- package/ReactAndroid/src/main/jni/react/runtime/jni/JJSTimerExecutor.cpp +6 -0
- package/ReactAndroid/src/main/jni/react/runtime/jni/JJSTimerExecutor.h +6 -5
- package/ReactAndroid/src/main/jni/react/runtime/jni/JJavaTimerManager.h +1 -2
- package/ReactAndroid/src/main/jni/react/runtime/jni/JReactExceptionManager.h +3 -7
- package/ReactAndroid/src/main/jni/react/runtime/jni/JReactHostInspectorTarget.cpp +15 -12
- package/ReactAndroid/src/main/jni/react/runtime/jni/JReactHostInspectorTarget.h +44 -58
- package/ReactAndroid/src/main/jni/react/runtime/jni/JReactInstance.cpp +2 -10
- package/ReactAndroid/src/main/jni/react/runtime/jni/JReactInstance.h +14 -36
- package/ReactAndroid/src/main/jni/react/runtime/jni/JavaTimerRegistry.h +1 -2
- package/ReactAndroid/src/main/jni/react/tracing/OnLoad.cpp +16 -0
- package/ReactAndroid/src/main/jni/react/tracing/PerformanceTracerCxxInterop.cpp +241 -0
- package/ReactAndroid/src/main/jni/react/tracing/PerformanceTracerCxxInterop.h +63 -0
- package/ReactAndroid/src/main/jni/react/turbomodule/ReactCommon/BindingsInstallerHolder.h +7 -14
- package/ReactAndroid/src/main/jni/react/turbomodule/ReactCommon/CallInvokerHolder.h +3 -3
- package/ReactAndroid/src/main/jni/react/turbomodule/ReactCommon/NativeMethodCallInvokerHolder.h +5 -7
- package/ReactAndroid/src/main/jni/react/turbomodule/ReactCommon/TurboModuleManager.h +9 -19
- package/ReactAndroid/src/main/jni/react/turbomodule/ReactCommon/TurboModuleManagerDelegate.h +6 -8
- package/ReactAndroid/src/main/jni/react/uimanager/ComponentNameResolverBinding.h +2 -4
- package/ReactAndroid/src/main/jni/react/uimanager/UIConstantsProviderBinding.h +19 -30
- package/ReactAndroid/src/main/res/devsupport/values/strings.xml +2 -0
- package/ReactAndroid/src/main/res/views/uimanager/values-bn/strings.xml +1 -1
- package/ReactApple/RCTAnimatedModuleProvider/RCTAnimatedModuleProvider.h +26 -0
- package/ReactApple/RCTAnimatedModuleProvider/RCTAnimatedModuleProvider.mm +94 -0
- package/ReactApple/RCTSwiftUI/RCTSwiftUI.podspec +39 -0
- package/ReactApple/RCTSwiftUI/RCTSwiftUIContainerView.swift +132 -0
- package/ReactApple/RCTSwiftUIWrapper/RCTSwiftUIContainerViewWrapper.h +29 -0
- package/ReactApple/RCTSwiftUIWrapper/RCTSwiftUIContainerViewWrapper.m +81 -0
- package/ReactApple/RCTSwiftUIWrapper/RCTSwiftUIWrapper.podspec +38 -0
- package/ReactCommon/React-Fabric.podspec +17 -0
- package/ReactCommon/callinvoker/ReactCommon/CallInvoker.h +13 -16
- package/ReactCommon/callinvoker/ReactCommon/tests/TestCallInvoker.h +10 -7
- package/ReactCommon/cxxreact/CxxModule.h +58 -87
- package/ReactCommon/cxxreact/CxxNativeModule.cpp +2 -2
- package/ReactCommon/cxxreact/CxxNativeModule.h +10 -19
- package/ReactCommon/cxxreact/ErrorUtils.h +4 -6
- package/ReactCommon/cxxreact/Instance.cpp +2 -2
- package/ReactCommon/cxxreact/Instance.h +24 -41
- package/ReactCommon/cxxreact/JSBigString.cpp +1 -1
- package/ReactCommon/cxxreact/JSBigString.h +28 -20
- package/ReactCommon/cxxreact/JSBundleType.h +5 -4
- package/ReactCommon/cxxreact/JSExecutor.cpp +2 -2
- package/ReactCommon/cxxreact/JSExecutor.h +22 -40
- package/ReactCommon/cxxreact/JSIndexedRAMBundle.cpp +2 -2
- package/ReactCommon/cxxreact/JSIndexedRAMBundle.h +13 -20
- package/ReactCommon/cxxreact/JSModulesUnbundle.h +7 -7
- package/ReactCommon/cxxreact/JsArgumentHelpers-inl.h +33 -41
- package/ReactCommon/cxxreact/JsArgumentHelpers.h +17 -26
- package/ReactCommon/cxxreact/MessageQueueThread.h +2 -2
- package/ReactCommon/cxxreact/MethodCall.cpp +2 -2
- package/ReactCommon/cxxreact/MethodCall.h +8 -10
- package/ReactCommon/cxxreact/ModuleRegistry.cpp +3 -3
- package/ReactCommon/cxxreact/ModuleRegistry.h +10 -23
- package/ReactCommon/cxxreact/MoveWrapper.h +17 -11
- package/ReactCommon/cxxreact/NativeModule.h +9 -15
- package/ReactCommon/cxxreact/NativeToJsBridge.cpp +4 -4
- package/ReactCommon/cxxreact/NativeToJsBridge.h +11 -17
- package/ReactCommon/cxxreact/RAMBundleRegistry.cpp +4 -4
- package/ReactCommon/cxxreact/RAMBundleRegistry.h +8 -11
- package/ReactCommon/cxxreact/React-cxxreact.podspec +1 -0
- package/ReactCommon/cxxreact/ReactMarker.h +15 -23
- package/ReactCommon/cxxreact/ReactNativeVersion.h +4 -4
- package/ReactCommon/cxxreact/RecoverableError.h +6 -5
- package/ReactCommon/cxxreact/SystraceSection.h +4 -4
- package/ReactCommon/cxxreact/TraceSection.h +25 -35
- package/ReactCommon/devtoolsruntimesettings/DevToolsRuntimeSettings.h +9 -12
- package/ReactCommon/hermes/executor/HermesExecutorFactory.h +9 -14
- package/ReactCommon/hermes/inspector-modern/chrome/ConnectionDemux.cpp +3 -2
- package/ReactCommon/hermes/inspector-modern/chrome/ConnectionDemux.h +7 -14
- package/ReactCommon/hermes/inspector-modern/chrome/HermesRuntimeAgentDelegate.cpp +26 -25
- package/ReactCommon/hermes/inspector-modern/chrome/HermesRuntimeAgentDelegate.h +8 -11
- package/ReactCommon/hermes/inspector-modern/chrome/HermesRuntimeSamplingProfileSerializer.h +4 -3
- package/ReactCommon/hermes/inspector-modern/chrome/HermesRuntimeTargetDelegate.cpp +54 -0
- package/ReactCommon/hermes/inspector-modern/chrome/HermesRuntimeTargetDelegate.h +9 -15
- package/ReactCommon/hermes/inspector-modern/chrome/Registration.h +1 -3
- package/ReactCommon/jsc/JSCRuntime.cpp +85 -62
- package/ReactCommon/jserrorhandler/JsErrorHandler.cpp +1 -1
- package/ReactCommon/jserrorhandler/JsErrorHandler.h +7 -21
- package/ReactCommon/jserrorhandler/StackTraceParser.h +1 -3
- package/ReactCommon/jserrorhandler/tests/StackTraceParserTest.cpp +599 -233
- package/ReactCommon/jsi/jsi/decorator.h +112 -108
- package/ReactCommon/jsi/jsi/hermes.h +189 -0
- package/ReactCommon/jsi/jsi/instrumentation.h +3 -0
- package/ReactCommon/jsi/jsi/jsi.cpp +4 -0
- package/ReactCommon/jsi/jsi/test/testlib.cpp +86 -67
- package/ReactCommon/jsiexecutor/React-jsiexecutor.podspec +1 -0
- package/ReactCommon/jsiexecutor/jsireact/JSIExecutor.cpp +13 -8
- package/ReactCommon/jsiexecutor/jsireact/JSIExecutor.h +32 -43
- package/ReactCommon/jsiexecutor/jsireact/JSINativeModules.cpp +2 -2
- package/ReactCommon/jsiexecutor/jsireact/JSINativeModules.h +5 -8
- package/ReactCommon/jsinspector-modern/Base64.h +11 -10
- package/ReactCommon/jsinspector-modern/CMakeLists.txt +1 -0
- package/ReactCommon/jsinspector-modern/ConsoleMessage.h +13 -18
- package/ReactCommon/jsinspector-modern/EnumArray.h +46 -0
- package/ReactCommon/jsinspector-modern/ExecutionContext.h +14 -22
- package/ReactCommon/jsinspector-modern/FallbackRuntimeAgentDelegate.cpp +10 -9
- package/ReactCommon/jsinspector-modern/FallbackRuntimeAgentDelegate.h +2 -2
- package/ReactCommon/jsinspector-modern/FallbackRuntimeTargetDelegate.cpp +6 -0
- package/ReactCommon/jsinspector-modern/FallbackRuntimeTargetDelegate.h +7 -9
- package/ReactCommon/jsinspector-modern/HostAgent.cpp +124 -40
- package/ReactCommon/jsinspector-modern/HostAgent.h +30 -14
- package/ReactCommon/jsinspector-modern/HostTarget.cpp +75 -34
- package/ReactCommon/jsinspector-modern/HostTarget.h +73 -51
- package/ReactCommon/jsinspector-modern/HostTargetTraceRecording.h +7 -7
- package/ReactCommon/jsinspector-modern/InspectorFlags.cpp +9 -5
- package/ReactCommon/jsinspector-modern/InspectorFlags.h +14 -7
- package/ReactCommon/jsinspector-modern/InspectorInterfaces.cpp +42 -0
- package/ReactCommon/jsinspector-modern/InspectorInterfaces.h +22 -16
- package/ReactCommon/jsinspector-modern/InspectorPackagerConnection.cpp +9 -7
- package/ReactCommon/jsinspector-modern/InspectorPackagerConnection.h +2 -4
- package/ReactCommon/jsinspector-modern/InspectorPackagerConnectionImpl.h +18 -29
- package/ReactCommon/jsinspector-modern/InstanceAgent.cpp +17 -15
- package/ReactCommon/jsinspector-modern/InstanceAgent.h +7 -10
- package/ReactCommon/jsinspector-modern/InstanceTarget.h +15 -22
- package/ReactCommon/jsinspector-modern/NetworkIOAgent.cpp +84 -68
- package/ReactCommon/jsinspector-modern/NetworkIOAgent.h +30 -34
- package/ReactCommon/jsinspector-modern/PerfMonitorV2.cpp +6 -68
- package/ReactCommon/jsinspector-modern/PerfMonitorV2.h +7 -28
- package/ReactCommon/jsinspector-modern/React-jsinspector.podspec +1 -1
- package/ReactCommon/jsinspector-modern/RuntimeAgent.cpp +52 -34
- package/ReactCommon/jsinspector-modern/RuntimeAgent.h +10 -29
- package/ReactCommon/jsinspector-modern/RuntimeAgentDelegate.h +3 -2
- package/ReactCommon/jsinspector-modern/RuntimeTarget.cpp +95 -18
- package/ReactCommon/jsinspector-modern/RuntimeTarget.h +93 -44
- package/ReactCommon/jsinspector-modern/RuntimeTargetConsole.cpp +43 -45
- package/ReactCommon/jsinspector-modern/RuntimeTargetNetwork.cpp +98 -0
- package/ReactCommon/jsinspector-modern/ScopedExecutor.h +43 -18
- package/ReactCommon/jsinspector-modern/SessionState.h +2 -2
- package/ReactCommon/jsinspector-modern/StackTrace.h +6 -5
- package/ReactCommon/jsinspector-modern/TracingAgent.cpp +40 -26
- package/ReactCommon/jsinspector-modern/TracingAgent.h +10 -11
- package/ReactCommon/jsinspector-modern/UniqueMonostate.h +14 -9
- package/ReactCommon/jsinspector-modern/Utf8.h +4 -5
- package/ReactCommon/jsinspector-modern/WeakList.h +9 -5
- package/ReactCommon/jsinspector-modern/WebSocketInterfaces.h +1 -3
- package/ReactCommon/jsinspector-modern/cdp/CdpJson.cpp +2 -2
- package/ReactCommon/jsinspector-modern/cdp/CdpJson.h +6 -15
- package/ReactCommon/jsinspector-modern/network/BoundedRequestBuffer.cpp +2 -2
- package/ReactCommon/jsinspector-modern/network/BoundedRequestBuffer.h +3 -7
- package/ReactCommon/jsinspector-modern/network/CMakeLists.txt +1 -3
- package/ReactCommon/jsinspector-modern/network/CdpNetwork.cpp +9 -20
- package/ReactCommon/jsinspector-modern/network/CdpNetwork.h +7 -14
- package/ReactCommon/jsinspector-modern/network/HttpUtils.cpp +2 -1
- package/ReactCommon/jsinspector-modern/network/HttpUtils.h +4 -3
- package/ReactCommon/jsinspector-modern/network/NetworkHandler.cpp +246 -0
- package/ReactCommon/jsinspector-modern/network/NetworkHandler.h +147 -0
- package/ReactCommon/jsinspector-modern/network/React-jsinspectornetwork.podspec +0 -3
- package/ReactCommon/jsinspector-modern/tests/ConsoleApiTest.cpp +24 -14
- package/ReactCommon/jsinspector-modern/tests/DebuggerSessionObserverTest.cpp +195 -0
- package/ReactCommon/jsinspector-modern/tests/FollyDynamicMatchers.h +16 -22
- package/ReactCommon/jsinspector-modern/tests/GmockHelpers.h +25 -0
- package/ReactCommon/jsinspector-modern/tests/HostTargetTest.cpp +8 -5
- package/ReactCommon/jsinspector-modern/tests/InspectorMocks.h +55 -57
- package/ReactCommon/jsinspector-modern/tests/InspectorPackagerConnectionTest.cpp +163 -124
- package/ReactCommon/jsinspector-modern/tests/JsiIntegrationTest.cpp +120 -24
- package/ReactCommon/jsinspector-modern/tests/JsiIntegrationTest.h +107 -43
- package/ReactCommon/jsinspector-modern/tests/NetworkReporterTest.cpp +825 -0
- package/ReactCommon/jsinspector-modern/tests/ReactInstanceIntegrationTest.cpp +15 -28
- package/ReactCommon/jsinspector-modern/tests/ReactInstanceIntegrationTest.h +9 -12
- package/ReactCommon/jsinspector-modern/tests/ReactNativeMocks.h +5 -4
- package/ReactCommon/jsinspector-modern/tests/UniquePtrFactory.h +21 -20
- package/ReactCommon/jsinspector-modern/tests/engines/JsiIntegrationTestGenericEngineAdapter.cpp +0 -5
- package/ReactCommon/jsinspector-modern/tests/engines/JsiIntegrationTestGenericEngineAdapter.h +4 -4
- package/ReactCommon/jsinspector-modern/tests/engines/JsiIntegrationTestHermesEngineAdapter.cpp +6 -5
- package/ReactCommon/jsinspector-modern/tests/engines/JsiIntegrationTestHermesEngineAdapter.h +4 -4
- package/ReactCommon/jsinspector-modern/tests/utils/InspectorFlagOverridesGuard.cpp +12 -0
- package/ReactCommon/jsinspector-modern/tests/utils/InspectorFlagOverridesGuard.h +6 -7
- package/ReactCommon/jsinspector-modern/tracing/CMakeLists.txt +2 -0
- package/ReactCommon/jsinspector-modern/tracing/ConsoleTimeStamp.cpp +22 -0
- package/ReactCommon/jsinspector-modern/tracing/ConsoleTimeStamp.h +8 -3
- package/ReactCommon/jsinspector-modern/tracing/EventLoopReporter.h +4 -4
- package/ReactCommon/jsinspector-modern/tracing/PerformanceTracer.cpp +369 -123
- package/ReactCommon/jsinspector-modern/tracing/PerformanceTracer.h +144 -30
- package/ReactCommon/jsinspector-modern/tracing/ProfileTreeNode.h +22 -20
- package/ReactCommon/jsinspector-modern/tracing/React-jsinspectortracing.podspec +6 -0
- package/ReactCommon/jsinspector-modern/tracing/RuntimeSamplingProfile.h +22 -18
- package/ReactCommon/jsinspector-modern/tracing/RuntimeSamplingProfileTraceEventSerializer.h +8 -9
- package/ReactCommon/jsinspector-modern/tracing/TargetTracingAgent.h +3 -2
- package/ReactCommon/jsinspector-modern/tracing/Timing.h +8 -12
- package/ReactCommon/jsinspector-modern/tracing/TraceEvent.h +8 -2
- package/ReactCommon/jsinspector-modern/tracing/TraceEventSerializer.cpp +3 -0
- package/ReactCommon/jsinspector-modern/tracing/TraceEventSerializer.h +6 -10
- package/ReactCommon/jsinspector-modern/tracing/TraceRecordingStateSerializer.h +4 -4
- package/ReactCommon/jsinspector-modern/tracing/tests/ProfileTreeNodeTest.cpp +12 -4
- package/ReactCommon/jsitooling/React-jsitooling.podspec +1 -0
- package/ReactCommon/jsitooling/react/runtime/JSRuntimeFactory.h +7 -9
- package/ReactCommon/jsitooling/react/runtime/JSRuntimeFactoryCAPI.h +1 -1
- package/ReactCommon/logger/react_native_log.h +7 -7
- package/ReactCommon/react/bridging/AString.h +8 -6
- package/ReactCommon/react/bridging/Array.h +32 -49
- package/ReactCommon/react/bridging/Base.h +27 -76
- package/ReactCommon/react/bridging/Bool.h +4 -2
- package/ReactCommon/react/bridging/CallbackWrapper.h +19 -18
- package/ReactCommon/react/bridging/Class.h +25 -48
- package/ReactCommon/react/bridging/Convert.h +38 -31
- package/ReactCommon/react/bridging/Dynamic.h +4 -2
- package/ReactCommon/react/bridging/Error.h +11 -6
- package/ReactCommon/react/bridging/EventEmitter.h +47 -45
- package/ReactCommon/react/bridging/Function.h +69 -89
- package/ReactCommon/react/bridging/HighResTimeStamp.h +8 -8
- package/ReactCommon/react/bridging/LongLivedObject.h +6 -6
- package/ReactCommon/react/bridging/Number.h +16 -8
- package/ReactCommon/react/bridging/Object.h +17 -24
- package/ReactCommon/react/bridging/Promise.h +17 -17
- package/ReactCommon/react/bridging/Value.h +20 -29
- package/ReactCommon/react/bridging/tests/BridgingTest.cpp +16 -13
- package/ReactCommon/react/bridging/tests/BridgingTest.h +24 -16
- package/ReactCommon/react/bridging/tests/ClassTest.cpp +6 -5
- package/ReactCommon/react/debug/react_native_assert.h +2 -7
- package/ReactCommon/react/featureflags/ReactNativeFeatureFlags.cpp +69 -9
- package/ReactCommon/react/featureflags/ReactNativeFeatureFlags.h +85 -10
- package/ReactCommon/react/featureflags/ReactNativeFeatureFlagsAccessor.cpp +361 -91
- package/ReactCommon/react/featureflags/ReactNativeFeatureFlagsAccessor.h +36 -6
- package/ReactCommon/react/featureflags/ReactNativeFeatureFlagsDefaults.h +70 -10
- package/ReactCommon/react/featureflags/ReactNativeFeatureFlagsDynamicProvider.h +151 -16
- package/ReactCommon/react/featureflags/ReactNativeFeatureFlagsOverridesOSSCanary.h +2 -2
- package/ReactCommon/react/featureflags/ReactNativeFeatureFlagsOverridesOSSExperimental.h +5 -1
- package/ReactCommon/react/featureflags/ReactNativeFeatureFlagsOverridesOSSStable.h +11 -7
- package/ReactCommon/react/featureflags/ReactNativeFeatureFlagsProvider.h +18 -3
- package/ReactCommon/react/nativemodule/core/ReactCommon/CxxTurboModuleUtils.h +2 -6
- package/ReactCommon/react/nativemodule/core/ReactCommon/TurboCxxModule.h +7 -16
- package/ReactCommon/react/nativemodule/core/ReactCommon/TurboModule.h +24 -36
- package/ReactCommon/react/nativemodule/core/ReactCommon/TurboModuleBinding.cpp +0 -1
- package/ReactCommon/react/nativemodule/core/ReactCommon/TurboModuleBinding.h +8 -10
- package/ReactCommon/react/nativemodule/core/ReactCommon/TurboModulePerfLogger.h +38 -67
- package/ReactCommon/react/nativemodule/core/ReactCommon/TurboModuleUtils.h +5 -8
- package/ReactCommon/react/nativemodule/core/ReactCommon/TurboModuleWithJSIBindings.h +2 -4
- package/ReactCommon/react/nativemodule/core/platform/android/ReactCommon/JavaInteropTurboModule.h +5 -7
- package/ReactCommon/react/nativemodule/core/platform/android/ReactCommon/JavaTurboModule.cpp +2 -1
- package/ReactCommon/react/nativemodule/core/platform/android/ReactCommon/JavaTurboModule.h +11 -13
- package/ReactCommon/react/nativemodule/core/platform/ios/ReactCommon/RCTInteropTurboModule.mm +8 -7
- package/ReactCommon/react/nativemodule/core/platform/ios/ReactCommon/RCTTurboModule.mm +15 -15
- package/ReactCommon/react/nativemodule/core/platform/ios/ReactCommon/RCTTurboModuleManager.h +7 -0
- package/ReactCommon/react/nativemodule/core/platform/ios/ReactCommon/RCTTurboModuleManager.mm +38 -12
- package/ReactCommon/react/nativemodule/core/tests/TurboModuleTestFixture.h +57 -37
- package/ReactCommon/react/nativemodule/cputime/CPUTime.h +17 -14
- package/ReactCommon/react/nativemodule/cputime/NativeCPUTime.h +2 -2
- package/ReactCommon/react/nativemodule/defaults/CMakeLists.txt +1 -0
- package/ReactCommon/react/nativemodule/defaults/DefaultTurboModules.cpp +7 -0
- package/ReactCommon/react/nativemodule/defaults/DefaultTurboModules.h +2 -2
- package/ReactCommon/react/nativemodule/defaults/React-defaultsnativemodule.podspec +7 -2
- package/ReactCommon/react/nativemodule/devtoolsruntimesettings/DevToolsRuntimeSettingsModule.h +3 -6
- package/ReactCommon/react/nativemodule/dom/NativeDOM.h +28 -66
- package/ReactCommon/react/nativemodule/fantomtestspecificmethods/NativeFantomTestSpecificMethods.h +4 -7
- package/ReactCommon/react/nativemodule/fantomtestspecificmethods/internal/FantomForcedCloneCommitHook.cpp +4 -3
- package/ReactCommon/react/nativemodule/fantomtestspecificmethods/internal/FantomForcedCloneCommitHook.h +5 -7
- package/ReactCommon/react/nativemodule/featureflags/NativeReactNativeFeatureFlags.cpp +86 -11
- package/ReactCommon/react/nativemodule/featureflags/NativeReactNativeFeatureFlags.h +36 -6
- package/ReactCommon/react/nativemodule/idlecallbacks/NativeIdleCallbacks.h +6 -10
- package/ReactCommon/react/nativemodule/intersectionobserver/NativeIntersectionObserver.cpp +2 -0
- package/ReactCommon/react/nativemodule/intersectionobserver/NativeIntersectionObserver.h +43 -48
- package/ReactCommon/react/nativemodule/intersectionobserver/React-intersectionobservernativemodule.podspec +66 -0
- package/ReactCommon/react/nativemodule/microtasks/NativeMicrotasks.h +1 -1
- package/ReactCommon/react/nativemodule/mutationobserver/NativeMutationObserver.cpp +8 -7
- package/ReactCommon/react/nativemodule/mutationobserver/NativeMutationObserver.h +20 -31
- package/ReactCommon/react/nativemodule/samples/platform/android/ReactCommon/SampleTurboModuleJSIBindings.h +4 -6
- package/ReactCommon/react/nativemodule/samples/platform/android/ReactCommon/SampleTurboModuleSpec.h +3 -3
- package/ReactCommon/react/nativemodule/samples/platform/ios/ReactCommon/RCTSampleLegacyModule.mm +10 -16
- package/ReactCommon/react/nativemodule/samples/platform/ios/ReactCommon/RCTSampleTurboModule.mm +6 -8
- package/ReactCommon/react/nativemodule/webperformance/NativePerformance.cpp +3 -0
- package/ReactCommon/react/nativemodule/webperformance/NativePerformance.h +40 -58
- package/ReactCommon/react/nativemodule/webperformance/React-webperformancenativemodule.podspec +2 -0
- package/ReactCommon/react/networking/CMakeLists.txt +30 -0
- package/ReactCommon/react/networking/NetworkReporter.cpp +251 -0
- package/ReactCommon/react/networking/NetworkReporter.h +148 -0
- package/ReactCommon/{jsinspector-modern/network → react/networking}/NetworkTypes.h +2 -2
- package/ReactCommon/react/networking/React-networking.podspec +52 -0
- package/ReactCommon/react/performance/cdpmetrics/CdpInteractionTypes.cpp +1 -1
- package/ReactCommon/react/performance/cdpmetrics/CdpInteractionTypes.h +3 -4
- package/ReactCommon/react/performance/cdpmetrics/CdpMetricsReporter.cpp +1 -24
- package/ReactCommon/react/performance/cdpmetrics/CdpMetricsReporter.h +5 -6
- package/ReactCommon/react/performance/cdpmetrics/CdpPerfIssuesReporter.cpp +60 -0
- package/ReactCommon/react/performance/cdpmetrics/CdpPerfIssuesReporter.h +37 -0
- package/ReactCommon/react/performance/timeline/CircularBuffer.h +24 -19
- package/ReactCommon/react/performance/timeline/PerformanceEntry.h +10 -9
- package/ReactCommon/react/performance/timeline/PerformanceEntryBuffer.h +4 -6
- package/ReactCommon/react/performance/timeline/PerformanceEntryCircularBuffer.h +4 -6
- package/ReactCommon/react/performance/timeline/PerformanceEntryKeyedBuffer.h +5 -7
- package/ReactCommon/react/performance/timeline/PerformanceEntryReporter.cpp +33 -26
- package/ReactCommon/react/performance/timeline/PerformanceEntryReporter.h +42 -51
- package/ReactCommon/react/performance/timeline/PerformanceEntryReporterListeners.h +10 -4
- package/ReactCommon/react/performance/timeline/PerformanceObserver.h +16 -19
- package/ReactCommon/react/performance/timeline/PerformanceObserverRegistry.h +2 -5
- package/ReactCommon/react/performance/timeline/tests/PerformanceObserverTest.cpp +6 -2
- package/ReactCommon/react/renderer/animated/AnimatedModule.cpp +17 -14
- package/ReactCommon/react/renderer/animated/AnimatedModule.h +31 -40
- package/ReactCommon/react/renderer/animated/CMakeLists.txt +2 -0
- package/ReactCommon/react/renderer/animated/EventEmitterListener.h +10 -11
- package/ReactCommon/react/renderer/animated/MergedValueDispatcher.h +4 -7
- package/ReactCommon/react/renderer/animated/NativeAnimatedNodesManager.cpp +250 -30
- package/ReactCommon/react/renderer/animated/NativeAnimatedNodesManager.h +55 -51
- package/ReactCommon/react/renderer/animated/NativeAnimatedNodesManagerProvider.cpp +52 -25
- package/ReactCommon/react/renderer/animated/NativeAnimatedNodesManagerProvider.h +18 -21
- package/ReactCommon/react/renderer/animated/drivers/AnimationDriver.h +16 -12
- package/ReactCommon/react/renderer/animated/drivers/AnimationDriverUtils.h +3 -3
- package/ReactCommon/react/renderer/animated/drivers/DecayAnimationDriver.h +1 -1
- package/ReactCommon/react/renderer/animated/drivers/FrameAnimationDriver.h +1 -1
- package/ReactCommon/react/renderer/animated/drivers/SpringAnimationDriver.h +2 -3
- package/ReactCommon/react/renderer/animated/event_drivers/EventAnimationDriver.h +9 -10
- package/ReactCommon/react/renderer/animated/internal/AnimatedMountingOverrideDelegate.cpp +6 -5
- package/ReactCommon/react/renderer/animated/internal/AnimatedMountingOverrideDelegate.h +4 -6
- package/ReactCommon/react/renderer/animated/internal/NativeAnimatedAllowlist.h +2 -1
- package/ReactCommon/react/renderer/animated/nodes/AdditionAnimatedNode.h +4 -5
- package/ReactCommon/react/renderer/animated/nodes/AnimatedNode.cpp +2 -0
- package/ReactCommon/react/renderer/animated/nodes/AnimatedNode.h +20 -17
- package/ReactCommon/react/renderer/animated/nodes/ColorAnimatedNode.h +1 -4
- package/ReactCommon/react/renderer/animated/nodes/DiffClampAnimatedNode.h +1 -4
- package/ReactCommon/react/renderer/animated/nodes/DivisionAnimatedNode.h +4 -5
- package/ReactCommon/react/renderer/animated/nodes/InterpolationAnimatedNode.h +1 -4
- package/ReactCommon/react/renderer/animated/nodes/ModulusAnimatedNode.h +1 -4
- package/ReactCommon/react/renderer/animated/nodes/MultiplicationAnimatedNode.h +4 -5
- package/ReactCommon/react/renderer/animated/nodes/ObjectAnimatedNode.cpp +121 -0
- package/ReactCommon/react/renderer/animated/nodes/ObjectAnimatedNode.h +33 -0
- package/ReactCommon/react/renderer/animated/nodes/PropsAnimatedNode.cpp +7 -0
- package/ReactCommon/react/renderer/animated/nodes/PropsAnimatedNode.h +5 -6
- package/ReactCommon/react/renderer/animated/nodes/RoundAnimatedNode.h +1 -4
- package/ReactCommon/react/renderer/animated/nodes/StyleAnimatedNode.cpp +7 -0
- package/ReactCommon/react/renderer/animated/nodes/StyleAnimatedNode.h +4 -6
- package/ReactCommon/react/renderer/animated/nodes/SubtractionAnimatedNode.h +4 -5
- package/ReactCommon/react/renderer/animated/nodes/TrackingAnimatedNode.h +1 -4
- package/ReactCommon/react/renderer/animated/nodes/TransformAnimatedNode.h +2 -5
- package/ReactCommon/react/renderer/animated/nodes/ValueAnimatedNode.h +5 -10
- package/ReactCommon/react/renderer/animated/tests/AnimatedNodeTests.cpp +51 -0
- package/ReactCommon/react/renderer/animated/tests/AnimationTestsBase.h +9 -5
- package/ReactCommon/react/renderer/animationbackend/AnimatedProps.h +40 -0
- package/ReactCommon/react/renderer/animationbackend/AnimatedPropsBuilder.h +52 -0
- package/ReactCommon/react/renderer/animationbackend/AnimationBackend.cpp +176 -0
- package/ReactCommon/react/renderer/animationbackend/AnimationBackend.h +59 -0
- package/ReactCommon/react/renderer/animationbackend/CMakeLists.txt +28 -0
- package/ReactCommon/react/renderer/animations/LayoutAnimationCallbackWrapper.h +6 -3
- package/ReactCommon/react/renderer/animations/LayoutAnimationDriver.cpp +3 -2
- package/ReactCommon/react/renderer/animations/LayoutAnimationDriver.h +7 -10
- package/ReactCommon/react/renderer/animations/LayoutAnimationKeyFrameManager.cpp +52 -42
- package/ReactCommon/react/renderer/animations/LayoutAnimationKeyFrameManager.h +35 -47
- package/ReactCommon/react/renderer/animations/conversions.h +36 -45
- package/ReactCommon/react/renderer/animations/primitives.h +2 -9
- package/ReactCommon/react/renderer/animations/tests/LayoutAnimationTest.cpp +50 -35
- package/ReactCommon/react/renderer/animations/utils.h +24 -38
- package/ReactCommon/react/renderer/attributedstring/AttributedString.cpp +6 -5
- package/ReactCommon/react/renderer/attributedstring/AttributedString.h +17 -18
- package/ReactCommon/react/renderer/attributedstring/AttributedStringBox.cpp +2 -2
- package/ReactCommon/react/renderer/attributedstring/AttributedStringBox.h +12 -14
- package/ReactCommon/react/renderer/attributedstring/ParagraphAttributes.h +4 -4
- package/ReactCommon/react/renderer/attributedstring/PlaceholderAttributedString.h +3 -5
- package/ReactCommon/react/renderer/attributedstring/TextAttributes.cpp +6 -6
- package/ReactCommon/react/renderer/attributedstring/TextAttributes.h +3 -3
- package/ReactCommon/react/renderer/attributedstring/conversions.h +145 -208
- package/ReactCommon/react/renderer/attributedstring/primitives.h +1 -6
- package/ReactCommon/react/renderer/bridging/bridging.h +7 -12
- package/ReactCommon/react/renderer/componentregistry/ComponentDescriptorFactory.h +3 -4
- package/ReactCommon/react/renderer/componentregistry/ComponentDescriptorProvider.h +6 -6
- package/ReactCommon/react/renderer/componentregistry/ComponentDescriptorProviderRegistry.h +7 -12
- package/ReactCommon/react/renderer/componentregistry/ComponentDescriptorRegistry.cpp +3 -3
- package/ReactCommon/react/renderer/componentregistry/ComponentDescriptorRegistry.h +11 -18
- package/ReactCommon/react/renderer/componentregistry/native/NativeComponentRegistryBinding.h +2 -5
- package/ReactCommon/react/renderer/components/image/ImageComponentDescriptor.cpp +2 -1
- package/ReactCommon/react/renderer/components/image/ImageComponentDescriptor.h +3 -5
- package/ReactCommon/react/renderer/components/image/ImageEventEmitter.h +2 -2
- package/ReactCommon/react/renderer/components/image/ImageProps.cpp +2 -2
- package/ReactCommon/react/renderer/components/image/ImageProps.h +4 -10
- package/ReactCommon/react/renderer/components/image/ImageShadowNode.cpp +18 -0
- package/ReactCommon/react/renderer/components/image/ImageShadowNode.h +9 -10
- package/ReactCommon/react/renderer/components/image/ImageState.h +9 -10
- package/ReactCommon/react/renderer/components/image/conversions.h +16 -25
- package/ReactCommon/react/renderer/components/inputaccessory/InputAccessoryComponentDescriptor.h +6 -12
- package/ReactCommon/react/renderer/components/inputaccessory/InputAccessoryShadowNode.h +2 -1
- package/ReactCommon/react/renderer/components/inputaccessory/InputAccessoryState.h +2 -2
- package/ReactCommon/react/renderer/components/legacyviewmanagerinterop/LegacyViewManagerInteropComponentDescriptor.h +2 -3
- package/ReactCommon/react/renderer/components/legacyviewmanagerinterop/LegacyViewManagerInteropComponentDescriptor.mm +3 -3
- package/ReactCommon/react/renderer/components/legacyviewmanagerinterop/LegacyViewManagerInteropViewProps.h +3 -3
- package/ReactCommon/react/renderer/components/legacyviewmanagerinterop/UnstableLegacyViewManagerAutomaticComponentDescriptor.h +5 -5
- package/ReactCommon/react/renderer/components/legacyviewmanagerinterop/UnstableLegacyViewManagerAutomaticShadowNode.h +2 -3
- package/ReactCommon/react/renderer/components/legacyviewmanagerinterop/UnstableLegacyViewManagerInteropComponentDescriptor.h +6 -7
- package/ReactCommon/react/renderer/components/modal/ModalHostViewComponentDescriptor.h +9 -18
- package/ReactCommon/react/renderer/components/modal/ModalHostViewShadowNode.h +2 -1
- package/ReactCommon/react/renderer/components/modal/ModalHostViewState.h +5 -7
- package/ReactCommon/react/renderer/components/progressbar/android/react/renderer/components/progressbar/AndroidProgressBarComponentDescriptor.h +10 -14
- package/ReactCommon/react/renderer/components/progressbar/android/react/renderer/components/progressbar/AndroidProgressBarMeasurementsManager.h +5 -7
- package/ReactCommon/react/renderer/components/progressbar/android/react/renderer/components/progressbar/AndroidProgressBarShadowNode.cpp +1 -0
- package/ReactCommon/react/renderer/components/progressbar/android/react/renderer/components/progressbar/AndroidProgressBarShadowNode.h +4 -6
- package/ReactCommon/react/renderer/components/progressbar/android/react/renderer/components/progressbar/conversions.h +2 -1
- package/ReactCommon/react/renderer/components/root/RootProps.cpp +1 -1
- package/ReactCommon/react/renderer/components/root/RootProps.h +5 -8
- package/ReactCommon/react/renderer/components/root/RootShadowNode.h +7 -8
- package/ReactCommon/react/renderer/components/safeareaview/SafeAreaViewComponentDescriptor.h +5 -8
- package/ReactCommon/react/renderer/components/safeareaview/SafeAreaViewShadowNode.h +2 -5
- package/ReactCommon/react/renderer/components/safeareaview/SafeAreaViewState.h +8 -9
- package/ReactCommon/react/renderer/components/scrollview/BaseScrollViewProps.h +7 -12
- package/ReactCommon/react/renderer/components/scrollview/ScrollEvent.h +8 -8
- package/ReactCommon/react/renderer/components/scrollview/ScrollViewComponentDescriptor.h +1 -2
- package/ReactCommon/react/renderer/components/scrollview/ScrollViewEventEmitter.h +7 -8
- package/ReactCommon/react/renderer/components/scrollview/ScrollViewShadowNode.h +5 -8
- package/ReactCommon/react/renderer/components/scrollview/ScrollViewState.h +7 -12
- package/ReactCommon/react/renderer/components/scrollview/conversions.h +26 -34
- package/ReactCommon/react/renderer/components/scrollview/platform/android/react/renderer/components/scrollview/AndroidHorizontalScrollContentViewShadowNode.h +5 -1
- package/ReactCommon/react/renderer/components/scrollview/platform/android/react/renderer/components/scrollview/HostPlatformScrollViewProps.cpp +52 -4
- package/ReactCommon/react/renderer/components/scrollview/platform/android/react/renderer/components/scrollview/HostPlatformScrollViewProps.h +10 -10
- package/ReactCommon/react/renderer/components/scrollview/primitives.h +5 -8
- package/ReactCommon/react/renderer/components/switch/androidswitch/react/renderer/components/androidswitch/AndroidSwitchComponentDescriptor.h +9 -11
- package/ReactCommon/react/renderer/components/switch/androidswitch/react/renderer/components/androidswitch/AndroidSwitchMeasurementsManager.h +4 -3
- package/ReactCommon/react/renderer/components/switch/androidswitch/react/renderer/components/androidswitch/AndroidSwitchShadowNode.h +6 -10
- package/ReactCommon/react/renderer/components/switch/iosswitch/react/renderer/components/switch/AppleSwitchComponentDescriptor.h +6 -5
- package/ReactCommon/react/renderer/components/switch/iosswitch/react/renderer/components/switch/AppleSwitchShadowNode.h +5 -8
- package/ReactCommon/react/renderer/components/text/BaseParagraphProps.h +6 -9
- package/ReactCommon/react/renderer/components/text/BaseTextProps.cpp +1 -1
- package/ReactCommon/react/renderer/components/text/BaseTextProps.h +4 -12
- package/ReactCommon/react/renderer/components/text/BaseTextShadowNode.cpp +3 -2
- package/ReactCommon/react/renderer/components/text/BaseTextShadowNode.h +5 -5
- package/ReactCommon/react/renderer/components/text/ParagraphComponentDescriptor.h +8 -9
- package/ReactCommon/react/renderer/components/text/ParagraphEventEmitter.h +1 -1
- package/ReactCommon/react/renderer/components/text/ParagraphShadowNode.cpp +19 -16
- package/ReactCommon/react/renderer/components/text/ParagraphShadowNode.h +19 -29
- package/ReactCommon/react/renderer/components/text/RawTextComponentDescriptor.h +1 -2
- package/ReactCommon/react/renderer/components/text/RawTextProps.cpp +1 -1
- package/ReactCommon/react/renderer/components/text/RawTextProps.h +2 -5
- package/ReactCommon/react/renderer/components/text/RawTextShadowNode.cpp +1 -0
- package/ReactCommon/react/renderer/components/text/RawTextShadowNode.h +1 -4
- package/ReactCommon/react/renderer/components/text/TextProps.cpp +1 -1
- package/ReactCommon/react/renderer/components/text/TextProps.h +4 -10
- package/ReactCommon/react/renderer/components/text/TextShadowNode.h +8 -17
- package/ReactCommon/react/renderer/components/text/platform/android/react/renderer/components/text/HostPlatformParagraphProps.cpp +1 -1
- package/ReactCommon/react/renderer/components/text/platform/android/react/renderer/components/text/HostPlatformParagraphProps.h +6 -9
- package/ReactCommon/react/renderer/components/text/platform/android/react/renderer/components/text/ParagraphState.h +8 -9
- package/ReactCommon/react/renderer/components/text/platform/android/react/renderer/components/text/conversions.h +4 -5
- package/ReactCommon/react/renderer/components/text/stateConversions.h +2 -1
- package/ReactCommon/react/renderer/components/text/tests/BaseTextShadowNodeTest.cpp +26 -24
- package/ReactCommon/react/renderer/components/textinput/BaseTextInputProps.h +6 -9
- package/ReactCommon/react/renderer/components/textinput/BaseTextInputShadowNode.h +56 -78
- package/ReactCommon/react/renderer/components/textinput/TextInputEventEmitter.h +12 -14
- package/ReactCommon/react/renderer/components/textinput/TextInputState.h +3 -1
- package/ReactCommon/react/renderer/components/textinput/baseConversions.h +4 -5
- package/ReactCommon/react/renderer/components/textinput/platform/android/react/renderer/components/androidtextinput/AndroidTextInputComponentDescriptor.h +31 -49
- package/ReactCommon/react/renderer/components/textinput/platform/android/react/renderer/components/androidtextinput/AndroidTextInputProps.h +16 -19
- package/ReactCommon/react/renderer/components/textinput/platform/android/react/renderer/components/androidtextinput/AndroidTextInputShadowNode.cpp +6 -5
- package/ReactCommon/react/renderer/components/textinput/platform/android/react/renderer/components/androidtextinput/AndroidTextInputShadowNode.h +10 -16
- package/ReactCommon/react/renderer/components/textinput/platform/android/react/renderer/components/androidtextinput/AndroidTextInputState.h +8 -12
- package/ReactCommon/react/renderer/components/textinput/platform/ios/react/renderer/components/iostextinput/TextInputComponentDescriptor.h +8 -7
- package/ReactCommon/react/renderer/components/textinput/platform/ios/react/renderer/components/iostextinput/TextInputProps.cpp +1 -1
- package/ReactCommon/react/renderer/components/textinput/platform/ios/react/renderer/components/iostextinput/TextInputProps.h +1 -4
- package/ReactCommon/react/renderer/components/textinput/platform/ios/react/renderer/components/iostextinput/TextInputShadowNode.h +2 -5
- package/ReactCommon/react/renderer/components/textinput/platform/ios/react/renderer/components/iostextinput/conversions.h +11 -20
- package/ReactCommon/react/renderer/components/textinput/platform/ios/react/renderer/components/iostextinput/primitives.h +2 -4
- package/ReactCommon/react/renderer/components/textinput/platform/ios/react/renderer/components/iostextinput/propsConversions.h +37 -115
- package/ReactCommon/react/renderer/components/unimplementedview/UnimplementedViewComponentDescriptor.h +3 -6
- package/ReactCommon/react/renderer/components/unimplementedview/UnimplementedViewProps.h +1 -1
- package/ReactCommon/react/renderer/components/unimplementedview/UnimplementedViewShadowNode.h +1 -3
- package/ReactCommon/react/renderer/components/view/AccessibilityPrimitives.h +25 -95
- package/ReactCommon/react/renderer/components/view/AccessibilityProps.h +7 -12
- package/ReactCommon/react/renderer/components/view/BackgroundImagePropsConversions.cpp +619 -0
- package/ReactCommon/react/renderer/components/view/BackgroundImagePropsConversions.h +44 -0
- package/ReactCommon/react/renderer/components/view/BaseTouch.h +7 -10
- package/ReactCommon/react/renderer/components/view/BaseViewEventEmitter.h +3 -4
- package/ReactCommon/react/renderer/components/view/BaseViewProps.cpp +36 -0
- package/ReactCommon/react/renderer/components/view/BaseViewProps.h +23 -17
- package/ReactCommon/react/renderer/components/view/BoxShadowPropsConversions.h +27 -40
- package/ReactCommon/react/renderer/components/view/CSSConversions.h +12 -11
- package/ReactCommon/react/renderer/components/view/ConcreteViewShadowNode.h +27 -34
- package/ReactCommon/react/renderer/components/view/FilterPropsConversions.h +46 -70
- package/ReactCommon/react/renderer/components/view/LayoutConformanceComponentDescriptor.h +1 -2
- package/ReactCommon/react/renderer/components/view/LayoutConformanceProps.h +6 -9
- package/ReactCommon/react/renderer/components/view/LayoutConformanceShadowNode.h +6 -7
- package/ReactCommon/react/renderer/components/view/PointerEvent.cpp +40 -21
- package/ReactCommon/react/renderer/components/view/PointerEvent.h +3 -3
- package/ReactCommon/react/renderer/components/view/TouchEvent.cpp +6 -4
- package/ReactCommon/react/renderer/components/view/TouchEvent.h +2 -2
- package/ReactCommon/react/renderer/components/view/TouchEventEmitter.h +2 -8
- package/ReactCommon/react/renderer/components/view/ViewComponentDescriptor.h +5 -4
- package/ReactCommon/react/renderer/components/view/ViewPropsInterpolation.h +14 -20
- package/ReactCommon/react/renderer/components/view/ViewShadowNode.cpp +1 -1
- package/ReactCommon/react/renderer/components/view/ViewShadowNode.h +7 -15
- package/ReactCommon/react/renderer/components/view/YogaLayoutableShadowNode.cpp +11 -9
- package/ReactCommon/react/renderer/components/view/YogaLayoutableShadowNode.h +20 -40
- package/ReactCommon/react/renderer/components/view/YogaStylableProps.h +10 -14
- package/ReactCommon/react/renderer/components/view/accessibilityPropsConversions.h +85 -42
- package/ReactCommon/react/renderer/components/view/conversions.h +375 -430
- package/ReactCommon/react/renderer/components/view/platform/android/react/renderer/components/view/HostPlatformViewProps.cpp +97 -40
- package/ReactCommon/react/renderer/components/view/platform/android/react/renderer/components/view/HostPlatformViewProps.h +14 -12
- package/ReactCommon/react/renderer/components/view/platform/android/react/renderer/components/view/HostPlatformViewTraitsInitializer.h +9 -9
- package/ReactCommon/react/renderer/components/view/platform/android/react/renderer/components/view/NativeDrawable.h +15 -21
- package/ReactCommon/react/renderer/components/view/platform/cxx/react/renderer/components/view/HostPlatformViewTraitsInitializer.h +6 -3
- package/ReactCommon/react/renderer/components/view/primitives.h +32 -34
- package/ReactCommon/react/renderer/components/view/propsConversions.h +135 -522
- package/ReactCommon/react/renderer/components/view/tests/ConversionsTest.cpp +11 -8
- package/ReactCommon/react/renderer/components/view/tests/LayoutTest.cpp +1 -1
- package/ReactCommon/react/renderer/components/view/tests/ViewTest.cpp +13 -13
- package/ReactCommon/react/renderer/components/virtualview/VirtualViewComponentDescriptor.h +1 -2
- package/ReactCommon/react/renderer/components/virtualview/VirtualViewShadowNode.h +4 -5
- package/ReactCommon/react/renderer/components/virtualviewexperimental/VirtualViewExperimentalComponentDescriptor.h +1 -2
- package/ReactCommon/react/renderer/components/virtualviewexperimental/VirtualViewExperimentalShadowNode.h +7 -8
- package/ReactCommon/react/renderer/consistency/ScopedShadowTreeRevisionLock.h +10 -11
- package/ReactCommon/react/renderer/core/ComponentDescriptor.h +15 -23
- package/ReactCommon/react/renderer/core/ConcreteComponentDescriptor.h +49 -63
- package/ReactCommon/react/renderer/core/ConcreteShadowNode.h +34 -35
- package/ReactCommon/react/renderer/core/ConcreteState.h +23 -23
- package/ReactCommon/react/renderer/core/DynamicEventPayload.cpp +3 -3
- package/ReactCommon/react/renderer/core/DynamicEventPayload.h +3 -4
- package/ReactCommon/react/renderer/core/DynamicPropsUtilities.h +4 -8
- package/ReactCommon/react/renderer/core/EventBeat.h +6 -9
- package/ReactCommon/react/renderer/core/EventDispatcher.h +5 -8
- package/ReactCommon/react/renderer/core/EventEmitter.h +11 -16
- package/ReactCommon/react/renderer/core/EventListener.h +3 -3
- package/ReactCommon/react/renderer/core/EventPayload.h +7 -7
- package/ReactCommon/react/renderer/core/EventPipe.h +5 -5
- package/ReactCommon/react/renderer/core/EventQueue.h +6 -10
- package/ReactCommon/react/renderer/core/EventQueueProcessor.h +2 -2
- package/ReactCommon/react/renderer/core/EventTarget.h +4 -6
- package/ReactCommon/react/renderer/core/InstanceHandle.h +2 -5
- package/ReactCommon/react/renderer/core/LayoutConstraints.cpp +4 -2
- package/ReactCommon/react/renderer/core/LayoutConstraints.h +10 -17
- package/ReactCommon/react/renderer/core/LayoutContext.h +5 -3
- package/ReactCommon/react/renderer/core/LayoutMetrics.cpp +14 -14
- package/ReactCommon/react/renderer/core/LayoutMetrics.h +30 -25
- package/ReactCommon/react/renderer/core/LayoutableShadowNode.cpp +16 -12
- package/ReactCommon/react/renderer/core/LayoutableShadowNode.h +14 -26
- package/ReactCommon/react/renderer/core/Props.h +16 -19
- package/ReactCommon/react/renderer/core/PropsMacros.h +50 -79
- package/ReactCommon/react/renderer/core/PropsParserContext.h +7 -7
- package/ReactCommon/react/renderer/core/RawProps.cpp +2 -1
- package/ReactCommon/react/renderer/core/RawProps.h +11 -14
- package/ReactCommon/react/renderer/core/RawPropsKey.h +6 -6
- package/ReactCommon/react/renderer/core/RawPropsKeyMap.h +4 -8
- package/ReactCommon/react/renderer/core/RawPropsParser.h +7 -10
- package/ReactCommon/react/renderer/core/RawPropsPrimitives.h +2 -5
- package/ReactCommon/react/renderer/core/RawValue.h +145 -183
- package/ReactCommon/react/renderer/core/ReactEventPriority.h +3 -4
- package/ReactCommon/react/renderer/core/ReactPrimitives.h +1 -1
- package/ReactCommon/react/renderer/core/Sealable.cpp +1 -1
- package/ReactCommon/react/renderer/core/Sealable.h +6 -5
- package/ReactCommon/react/renderer/core/ShadowNode.cpp +1 -1
- package/ReactCommon/react/renderer/core/ShadowNode.h +44 -70
- package/ReactCommon/react/renderer/core/ShadowNodeFamily.h +15 -21
- package/ReactCommon/react/renderer/core/ShadowNodeFragment.h +6 -6
- package/ReactCommon/react/renderer/core/ShadowNodeTraits.h +8 -4
- package/ReactCommon/react/renderer/core/State.cpp +1 -1
- package/ReactCommon/react/renderer/core/State.h +4 -3
- package/ReactCommon/react/renderer/core/StateData.h +1 -1
- package/ReactCommon/react/renderer/core/StatePipe.h +1 -1
- package/ReactCommon/react/renderer/core/StateUpdate.h +1 -2
- package/ReactCommon/react/renderer/core/ValueFactory.h +1 -1
- package/ReactCommon/react/renderer/core/ValueFactoryEventPayload.h +1 -1
- package/ReactCommon/react/renderer/core/conversions.h +13 -10
- package/ReactCommon/react/renderer/core/graphicsConversions.h +49 -62
- package/ReactCommon/react/renderer/core/propsConversions.h +62 -42
- package/ReactCommon/react/renderer/core/tests/ComponentDescriptorTest.cpp +47 -36
- package/ReactCommon/react/renderer/core/tests/ConcreteShadowNodeTest.cpp +4 -1
- package/ReactCommon/react/renderer/core/tests/FindNodeAtPointTest.cpp +53 -50
- package/ReactCommon/react/renderer/core/tests/LayoutableShadowNodeTest.cpp +95 -95
- package/ReactCommon/react/renderer/core/tests/RawPropsTest.cpp +12 -9
- package/ReactCommon/react/renderer/core/tests/ShadowNodeFamilyTest.cpp +4 -1
- package/ReactCommon/react/renderer/core/tests/ShadowNodeTest.cpp +81 -67
- package/ReactCommon/react/renderer/core/tests/TestComponent.h +14 -17
- package/ReactCommon/react/renderer/core/tests/benchmarks/RawPropsBenchmark.cpp +4 -2
- package/ReactCommon/react/renderer/css/CSSAngle.h +3 -3
- package/ReactCommon/react/renderer/css/CSSAngleUnit.h +4 -2
- package/ReactCommon/react/renderer/css/CSSBackgroundImage.h +864 -0
- package/ReactCommon/react/renderer/css/CSSColor.h +9 -8
- package/ReactCommon/react/renderer/css/CSSColorFunction.h +65 -102
- package/ReactCommon/react/renderer/css/CSSCompoundDataType.h +14 -46
- package/ReactCommon/react/renderer/css/CSSDataType.h +10 -15
- package/ReactCommon/react/renderer/css/CSSFilter.h +38 -58
- package/ReactCommon/react/renderer/css/CSSFontVariant.h +1 -2
- package/ReactCommon/react/renderer/css/CSSHexColor.h +10 -9
- package/ReactCommon/react/renderer/css/CSSKeyword.h +6 -6
- package/ReactCommon/react/renderer/css/CSSLength.h +5 -5
- package/ReactCommon/react/renderer/css/CSSLengthUnit.h +2 -2
- package/ReactCommon/react/renderer/css/CSSList.h +7 -12
- package/ReactCommon/react/renderer/css/CSSNamedColor.h +2 -1
- package/ReactCommon/react/renderer/css/CSSNumber.h +3 -3
- package/ReactCommon/react/renderer/css/CSSPercentage.h +3 -3
- package/ReactCommon/react/renderer/css/CSSRatio.h +10 -13
- package/ReactCommon/react/renderer/css/CSSShadow.h +15 -32
- package/ReactCommon/react/renderer/css/CSSSyntaxParser.h +66 -73
- package/ReactCommon/react/renderer/css/CSSToken.h +18 -14
- package/ReactCommon/react/renderer/css/CSSTokenizer.h +41 -32
- package/ReactCommon/react/renderer/css/CSSTransform.h +70 -107
- package/ReactCommon/react/renderer/css/CSSTransformOrigin.h +28 -49
- package/ReactCommon/react/renderer/css/CSSValueParser.h +46 -76
- package/ReactCommon/react/renderer/css/CSSZero.h +3 -3
- package/ReactCommon/react/renderer/css/tests/CSSBackgroundImageTest.cpp +560 -0
- package/ReactCommon/react/renderer/css/tests/CSSColorTest.cpp +6 -4
- package/ReactCommon/react/renderer/css/tests/CSSFilterTest.cpp +5 -5
- package/ReactCommon/react/renderer/css/tests/CSSFontVariantTest.cpp +3 -2
- package/ReactCommon/react/renderer/css/tests/CSSListTest.cpp +12 -8
- package/ReactCommon/react/renderer/css/tests/CSSShadowTest.cpp +6 -6
- package/ReactCommon/react/renderer/css/tests/CSSSyntaxParserTest.cpp +11 -9
- package/ReactCommon/react/renderer/debug/DebugStringConvertible.h +78 -92
- package/ReactCommon/react/renderer/debug/DebugStringConvertibleItem.h +1 -1
- package/ReactCommon/react/renderer/debug/debugStringConvertibleUtils.h +18 -26
- package/ReactCommon/react/renderer/dom/DOM.cpp +3 -1
- package/ReactCommon/react/renderer/dom/DOM.h +24 -42
- package/ReactCommon/react/renderer/element/ComponentBuilder.cpp +12 -9
- package/ReactCommon/react/renderer/element/ComponentBuilder.h +8 -9
- package/ReactCommon/react/renderer/element/Element.h +37 -35
- package/ReactCommon/react/renderer/element/ElementFragment.h +3 -5
- package/ReactCommon/react/renderer/element/testUtils.h +12 -20
- package/ReactCommon/react/renderer/graphics/BackgroundImage.cpp +23 -0
- package/ReactCommon/react/renderer/graphics/BackgroundImage.h +28 -2
- package/ReactCommon/react/renderer/graphics/BackgroundPosition.h +27 -0
- package/ReactCommon/react/renderer/graphics/BackgroundRepeat.h +29 -0
- package/ReactCommon/react/renderer/graphics/BackgroundSize.h +39 -0
- package/ReactCommon/react/renderer/graphics/BlendMode.h +4 -3
- package/ReactCommon/react/renderer/graphics/BoxShadow.h +5 -3
- package/ReactCommon/react/renderer/graphics/Color.cpp +22 -3
- package/ReactCommon/react/renderer/graphics/Color.h +20 -10
- package/ReactCommon/react/renderer/graphics/ColorStop.cpp +21 -0
- package/ReactCommon/react/renderer/graphics/ColorStop.h +20 -2
- package/ReactCommon/react/renderer/graphics/DoubleConversions.cpp +38 -0
- package/ReactCommon/react/renderer/graphics/DoubleConversions.h +16 -0
- package/ReactCommon/react/renderer/graphics/Filter.h +13 -8
- package/ReactCommon/react/renderer/graphics/Isolation.h +2 -2
- package/ReactCommon/react/renderer/graphics/LinearGradient.cpp +92 -0
- package/ReactCommon/react/renderer/graphics/LinearGradient.h +19 -15
- package/ReactCommon/react/renderer/graphics/Point.h +16 -9
- package/ReactCommon/react/renderer/graphics/RadialGradient.cpp +138 -0
- package/ReactCommon/react/renderer/graphics/RadialGradient.h +47 -29
- package/ReactCommon/react/renderer/graphics/Rect.h +39 -33
- package/ReactCommon/react/renderer/graphics/RectangleCorners.h +11 -17
- package/ReactCommon/react/renderer/graphics/RectangleEdges.h +27 -31
- package/ReactCommon/react/renderer/graphics/Size.h +10 -5
- package/ReactCommon/react/renderer/graphics/Transform.cpp +91 -64
- package/ReactCommon/react/renderer/graphics/Transform.h +39 -49
- package/ReactCommon/react/renderer/graphics/ValueUnit.cpp +41 -0
- package/ReactCommon/react/renderer/graphics/ValueUnit.h +24 -4
- package/ReactCommon/react/renderer/graphics/fromRawValueShared.h +7 -7
- package/ReactCommon/react/renderer/graphics/platform/android/react/renderer/graphics/HostPlatformColor.h +19 -14
- package/ReactCommon/react/renderer/graphics/platform/android/react/renderer/graphics/PlatformColorParser.h +56 -36
- package/ReactCommon/react/renderer/graphics/platform/android/react/renderer/graphics/configurePlatformColorCacheInvalidationHook.cpp +27 -0
- package/ReactCommon/react/renderer/graphics/platform/android/react/renderer/graphics/configurePlatformColorCacheInvalidationHook.h +12 -0
- package/ReactCommon/react/renderer/graphics/platform/cxx/react/renderer/graphics/HostPlatformColor.h +21 -14
- package/ReactCommon/react/renderer/graphics/platform/cxx/react/renderer/graphics/PlatformColorParser.h +7 -11
- package/ReactCommon/react/renderer/graphics/platform/ios/react/renderer/graphics/HostPlatformColor.h +37 -26
- package/ReactCommon/react/renderer/graphics/platform/ios/react/renderer/graphics/HostPlatformColor.mm +14 -14
- package/ReactCommon/react/renderer/graphics/platform/ios/react/renderer/graphics/PlatformColorParser.h +5 -11
- package/ReactCommon/react/renderer/graphics/platform/ios/react/renderer/graphics/PlatformColorParser.mm +10 -9
- package/ReactCommon/react/renderer/graphics/platform/ios/react/renderer/graphics/RCTPlatformColorUtils.h +3 -5
- package/ReactCommon/react/renderer/graphics/platform/ios/react/renderer/graphics/RCTPlatformColorUtils.mm +3 -3
- package/ReactCommon/react/renderer/graphics/rounding.h +28 -18
- package/ReactCommon/react/renderer/imagemanager/ImageManager.h +5 -7
- package/ReactCommon/react/renderer/imagemanager/ImageRequest.h +8 -9
- package/ReactCommon/react/renderer/imagemanager/ImageResponseObserver.h +3 -4
- package/ReactCommon/react/renderer/imagemanager/ImageResponseObserverCoordinator.cpp +3 -5
- package/ReactCommon/react/renderer/imagemanager/ImageResponseObserverCoordinator.h +7 -12
- package/ReactCommon/react/renderer/imagemanager/ImageTelemetry.h +2 -1
- package/ReactCommon/react/renderer/imagemanager/platform/android/react/renderer/imagemanager/ImageFetcher.cpp +19 -41
- package/ReactCommon/react/renderer/imagemanager/platform/android/react/renderer/imagemanager/ImageFetcher.h +14 -23
- package/ReactCommon/react/renderer/imagemanager/platform/android/react/renderer/imagemanager/ImageRequestParams.h +7 -4
- package/ReactCommon/react/renderer/imagemanager/platform/android/react/renderer/imagemanager/conversions.h +21 -39
- package/ReactCommon/react/renderer/imagemanager/platform/cxx/react/renderer/imagemanager/ImageRequestParams.h +4 -2
- package/ReactCommon/react/renderer/imagemanager/platform/ios/react/renderer/imagemanager/ImageRequestParams.h +4 -2
- package/ReactCommon/react/renderer/imagemanager/platform/ios/react/renderer/imagemanager/RCTImagePrimitivesConversions.h +2 -2
- package/ReactCommon/react/renderer/imagemanager/platform/ios/react/renderer/imagemanager/RCTSyncImageManager.mm +1 -1
- package/ReactCommon/react/renderer/imagemanager/primitives.h +25 -31
- package/ReactCommon/react/renderer/leakchecker/LeakChecker.h +1 -2
- package/ReactCommon/react/renderer/leakchecker/WeakFamilyRegistry.h +1 -1
- package/ReactCommon/react/renderer/mapbuffer/MapBuffer.h +6 -7
- package/ReactCommon/react/renderer/mapbuffer/MapBufferBuilder.h +4 -10
- package/ReactCommon/react/renderer/mounting/Differentiator.cpp +3 -2
- package/ReactCommon/react/renderer/mounting/Differentiator.h +2 -2
- package/ReactCommon/react/renderer/mounting/MountingCoordinator.h +6 -9
- package/ReactCommon/react/renderer/mounting/MountingOverrideDelegate.h +1 -1
- package/ReactCommon/react/renderer/mounting/MountingTransaction.h +8 -10
- package/ReactCommon/react/renderer/mounting/ShadowTree.cpp +22 -13
- package/ReactCommon/react/renderer/mounting/ShadowTree.h +12 -23
- package/ReactCommon/react/renderer/mounting/ShadowTreeDelegate.h +4 -4
- package/ReactCommon/react/renderer/mounting/ShadowTreeRegistry.h +4 -9
- package/ReactCommon/react/renderer/mounting/ShadowView.cpp +11 -8
- package/ReactCommon/react/renderer/mounting/ShadowView.h +11 -10
- package/ReactCommon/react/renderer/mounting/ShadowViewMutation.h +14 -30
- package/ReactCommon/react/renderer/mounting/TelemetryController.h +9 -11
- package/ReactCommon/react/renderer/mounting/internal/CullingContext.cpp +14 -0
- package/ReactCommon/react/renderer/mounting/internal/CullingContext.h +2 -3
- package/ReactCommon/react/renderer/mounting/internal/ShadowViewNodePair.h +9 -6
- package/ReactCommon/react/renderer/mounting/internal/TinyMap.h +18 -14
- package/ReactCommon/react/renderer/mounting/internal/sliceChildShadowNodeViewPairs.cpp +5 -3
- package/ReactCommon/react/renderer/mounting/internal/sliceChildShadowNodeViewPairs.h +4 -4
- package/ReactCommon/react/renderer/mounting/stubs/StubView.h +7 -9
- package/ReactCommon/react/renderer/mounting/stubs/StubViewTree.h +14 -16
- package/ReactCommon/react/renderer/mounting/stubs/stubs.cpp +13 -10
- package/ReactCommon/react/renderer/mounting/stubs/stubs.h +2 -4
- package/ReactCommon/react/renderer/mounting/tests/OrderIndexTest.cpp +2 -1
- package/ReactCommon/react/renderer/mounting/tests/ShadowTreeLifeCycleTest.cpp +40 -22
- package/ReactCommon/react/renderer/mounting/tests/StackingContextTest.cpp +3 -2
- package/ReactCommon/react/renderer/mounting/updateMountedFlag.cpp +6 -0
- package/ReactCommon/react/renderer/mounting/updateMountedFlag.h +2 -2
- package/ReactCommon/react/renderer/observers/events/EventPerformanceLogger.cpp +3 -1
- package/ReactCommon/react/renderer/observers/events/EventPerformanceLogger.h +6 -10
- package/ReactCommon/react/renderer/observers/intersection/IntersectionObserver.cpp +175 -56
- package/ReactCommon/react/renderer/observers/intersection/IntersectionObserver.h +34 -19
- package/ReactCommon/react/renderer/observers/intersection/IntersectionObserverManager.cpp +15 -6
- package/ReactCommon/react/renderer/observers/intersection/IntersectionObserverManager.h +18 -30
- package/ReactCommon/react/renderer/observers/intersection/IntersectionObserverState.h +4 -9
- package/ReactCommon/react/renderer/observers/mutation/MutationObserver.cpp +6 -5
- package/ReactCommon/react/renderer/observers/mutation/MutationObserver.h +20 -24
- package/ReactCommon/react/renderer/observers/mutation/MutationObserverManager.h +14 -17
- package/ReactCommon/react/renderer/runtimescheduler/RuntimeScheduler.h +36 -62
- package/ReactCommon/react/renderer/runtimescheduler/RuntimeSchedulerBinding.cpp +1 -1
- package/ReactCommon/react/renderer/runtimescheduler/RuntimeSchedulerBinding.h +4 -5
- package/ReactCommon/react/renderer/runtimescheduler/RuntimeSchedulerCallInvoker.h +3 -4
- package/ReactCommon/react/renderer/runtimescheduler/RuntimeSchedulerEventTimingDelegate.h +1 -2
- package/ReactCommon/react/renderer/runtimescheduler/RuntimeSchedulerIntersectionObserverDelegate.h +1 -2
- package/ReactCommon/react/renderer/runtimescheduler/RuntimeScheduler_Legacy.h +23 -43
- package/ReactCommon/react/renderer/runtimescheduler/RuntimeScheduler_Modern.h +31 -56
- package/ReactCommon/react/renderer/runtimescheduler/SchedulerPriorityUtils.h +7 -7
- package/ReactCommon/react/renderer/runtimescheduler/Task.h +6 -13
- package/ReactCommon/react/renderer/runtimescheduler/primitives.h +4 -6
- package/ReactCommon/react/renderer/runtimescheduler/tests/StubClock.h +8 -4
- package/ReactCommon/react/renderer/runtimescheduler/tests/StubErrorUtils.h +9 -12
- package/ReactCommon/react/renderer/runtimescheduler/tests/StubQueue.h +16 -13
- package/ReactCommon/react/renderer/scheduler/Scheduler.cpp +12 -36
- package/ReactCommon/react/renderer/scheduler/Scheduler.h +26 -33
- package/ReactCommon/react/renderer/scheduler/SchedulerDelegate.h +11 -22
- package/ReactCommon/react/renderer/scheduler/SurfaceHandler.cpp +3 -3
- package/ReactCommon/react/renderer/scheduler/SurfaceHandler.h +15 -22
- package/ReactCommon/react/renderer/scheduler/SurfaceManager.cpp +5 -5
- package/ReactCommon/react/renderer/scheduler/SurfaceManager.h +13 -17
- package/ReactCommon/react/renderer/telemetry/SurfaceTelemetry.h +1 -3
- package/ReactCommon/react/renderer/telemetry/TransactionTelemetry.h +1 -1
- package/ReactCommon/react/renderer/textlayoutmanager/TextLayoutContext.h +1 -1
- package/ReactCommon/react/renderer/textlayoutmanager/TextLayoutManagerExtended.h +27 -34
- package/ReactCommon/react/renderer/textlayoutmanager/TextMeasureCache.h +68 -106
- package/ReactCommon/react/renderer/textlayoutmanager/platform/android/react/renderer/textlayoutmanager/JPreparedLayout.h +1 -2
- package/ReactCommon/react/renderer/textlayoutmanager/platform/android/react/renderer/textlayoutmanager/TextLayoutManager.cpp +9 -7
- package/ReactCommon/react/renderer/textlayoutmanager/platform/android/react/renderer/textlayoutmanager/TextLayoutManager.h +23 -28
- package/ReactCommon/react/renderer/textlayoutmanager/platform/cxx/react/renderer/textlayoutmanager/TextLayoutManager.cpp +9 -4
- package/ReactCommon/react/renderer/textlayoutmanager/platform/cxx/react/renderer/textlayoutmanager/TextLayoutManager.h +9 -10
- package/ReactCommon/react/renderer/textlayoutmanager/platform/ios/react/renderer/textlayoutmanager/RCTAttributedTextUtils.h +1 -1
- package/ReactCommon/react/renderer/textlayoutmanager/platform/ios/react/renderer/textlayoutmanager/RCTAttributedTextUtils.mm +10 -10
- package/ReactCommon/react/renderer/textlayoutmanager/platform/ios/react/renderer/textlayoutmanager/RCTFontUtils.h +10 -2
- package/ReactCommon/react/renderer/textlayoutmanager/platform/ios/react/renderer/textlayoutmanager/RCTFontUtils.mm +71 -40
- package/ReactCommon/react/renderer/textlayoutmanager/platform/ios/react/renderer/textlayoutmanager/RCTTextLayoutManager.mm +6 -7
- package/ReactCommon/react/renderer/textlayoutmanager/platform/ios/react/renderer/textlayoutmanager/TextLayoutManager.h +12 -13
- package/ReactCommon/react/renderer/textlayoutmanager/platform/ios/react/renderer/textlayoutmanager/TextLayoutManager.mm +2 -2
- package/ReactCommon/react/renderer/uimanager/AppRegistryBinding.h +7 -7
- package/ReactCommon/react/renderer/uimanager/PointerEventsProcessor.cpp +5 -3
- package/ReactCommon/react/renderer/uimanager/PointerEventsProcessor.h +28 -37
- package/ReactCommon/react/renderer/uimanager/PointerHoverTracker.h +7 -14
- package/ReactCommon/react/renderer/uimanager/SurfaceRegistryBinding.h +1 -2
- package/ReactCommon/react/renderer/uimanager/UIManager.cpp +17 -5
- package/ReactCommon/react/renderer/uimanager/UIManager.h +68 -77
- package/ReactCommon/react/renderer/uimanager/UIManagerAnimationBackend.h +24 -0
- package/ReactCommon/react/renderer/uimanager/UIManagerAnimationDelegate.h +5 -6
- package/ReactCommon/react/renderer/uimanager/UIManagerBinding.cpp +3 -3
- package/ReactCommon/react/renderer/uimanager/UIManagerBinding.h +13 -15
- package/ReactCommon/react/renderer/uimanager/UIManagerCommitHook.h +12 -23
- package/ReactCommon/react/renderer/uimanager/UIManagerDelegate.h +14 -21
- package/ReactCommon/react/renderer/uimanager/UIManagerMountHook.h +3 -4
- package/ReactCommon/react/renderer/uimanager/UIManagerUpdateShadowTree.cpp +1 -2
- package/ReactCommon/react/renderer/uimanager/consistency/LazyShadowTreeRevisionConsistencyManager.h +6 -11
- package/ReactCommon/react/renderer/uimanager/primitives.h +37 -51
- package/ReactCommon/react/renderer/uimanager/tests/PointerEventsProcessorTest.cpp +4 -2
- package/ReactCommon/react/runtime/BindingsInstaller.h +2 -1
- package/ReactCommon/react/runtime/BridgelessNativeMethodCallInvoker.h +3 -7
- package/ReactCommon/react/runtime/BufferedRuntimeExecutor.h +4 -3
- package/ReactCommon/react/runtime/ReactInstance.cpp +14 -1
- package/ReactCommon/react/runtime/ReactInstance.h +14 -20
- package/ReactCommon/react/runtime/TimerManager.h +17 -25
- package/ReactCommon/react/runtime/nativeviewconfig/LegacyUIManagerConstantsProviderBinding.h +4 -7
- package/ReactCommon/react/runtime/platform/ios/ReactCommon/RCTHermesInstance.h +14 -15
- package/ReactCommon/react/runtime/platform/ios/ReactCommon/RCTHermesInstance.mm +3 -15
- package/ReactCommon/react/runtime/platform/ios/ReactCommon/RCTHost.h +10 -1
- package/ReactCommon/react/runtime/platform/ios/ReactCommon/RCTHost.mm +22 -2
- package/ReactCommon/react/runtime/platform/ios/ReactCommon/RCTInstance.h +10 -0
- package/ReactCommon/react/runtime/platform/ios/ReactCommon/RCTInstance.mm +31 -1
- package/ReactCommon/react/runtime/platform/ios/ReactCommon/RCTJscInstance.h +2 -3
- package/ReactCommon/react/runtime/platform/ios/ReactCommon/RCTLegacyUIManagerConstantsProvider.h +1 -1
- package/ReactCommon/react/test_utils/Entropy.h +24 -18
- package/ReactCommon/react/test_utils/MockClock.h +5 -4
- package/ReactCommon/react/test_utils/MockSurfaceHandler.h +1 -1
- package/ReactCommon/react/test_utils/ios/RCTSwizzleHelpers.h +1 -4
- package/ReactCommon/react/test_utils/ios/Shims/ShimRCTInstance.mm +9 -6
- package/ReactCommon/react/test_utils/shadowTreeGeneration.h +70 -91
- package/ReactCommon/react/timing/primitives.h +127 -115
- package/ReactCommon/react/utils/CMakeLists.txt +1 -1
- package/ReactCommon/react/utils/ContextContainer.h +16 -13
- package/ReactCommon/react/utils/FloatComparison.h +3 -4
- package/ReactCommon/react/utils/OnScopeExit.h +7 -7
- package/ReactCommon/react/utils/PackTraits.h +5 -4
- package/ReactCommon/react/utils/React-utils.podspec +3 -1
- package/ReactCommon/react/utils/RunLoopObserver.h +4 -7
- package/ReactCommon/react/utils/SharedFunction.h +10 -9
- package/ReactCommon/react/utils/SimpleThreadSafeCache.h +10 -11
- package/ReactCommon/react/utils/Telemetry.h +19 -27
- package/ReactCommon/react/utils/TemplateStringLiteral.h +4 -2
- package/ReactCommon/react/utils/Uuid.cpp +69 -0
- package/ReactCommon/react/utils/Uuid.h +20 -0
- package/ReactCommon/react/utils/fnv1a.h +8 -6
- package/ReactCommon/react/utils/hash_combine.h +5 -3
- package/ReactCommon/react/utils/iequals.h +2 -1
- package/ReactCommon/react/utils/jsi-utils.h +1 -4
- package/ReactCommon/react/utils/platform/android/react/utils/LowPriorityExecutor.cpp +1 -1
- package/ReactCommon/react/utils/platform/android/react/utils/LowPriorityExecutor.h +1 -1
- package/ReactCommon/react/utils/platform/cxx/react/utils/LowPriorityExecutor.h +2 -1
- package/ReactCommon/react/utils/platform/ios/react/utils/FollyConvert.mm +2 -2
- package/ReactCommon/react/utils/platform/ios/react/utils/LowPriorityExecutor.h +1 -1
- package/ReactCommon/react/utils/tests/UuidTest.cpp +28 -0
- package/ReactCommon/react/utils/tests/hash_combineTests.cpp +2 -2
- package/ReactCommon/react/utils/toLower.h +2 -1
- package/ReactCommon/react/utils/to_underlying.h +2 -1
- package/ReactCommon/reactperflogger/fusebox/FuseboxTracer.cpp +24 -16
- package/ReactCommon/reactperflogger/fusebox/FuseboxTracer.h +7 -11
- package/ReactCommon/reactperflogger/reactperflogger/BridgeNativeModulePerfLogger.h +38 -67
- package/ReactCommon/reactperflogger/reactperflogger/FuseboxPerfettoDataSource.h +9 -11
- package/ReactCommon/reactperflogger/reactperflogger/HermesPerfettoDataSource.h +9 -11
- package/ReactCommon/reactperflogger/reactperflogger/NativeModulePerfLogger.h +38 -84
- package/ReactCommon/reactperflogger/reactperflogger/ReactPerfetto.h +2 -2
- package/ReactCommon/reactperflogger/reactperflogger/ReactPerfettoCategories.h +1 -2
- package/ReactCommon/reactperflogger/reactperflogger/ReactPerfettoLogger.h +6 -6
- package/ReactCommon/runtimeexecutor/ReactCommon/RuntimeExecutor.h +1 -2
- package/ReactCommon/runtimeexecutor/platform/cxx/ReactCommon/RuntimeExecutorSyncUIThreadUtils.h +6 -6
- package/ReactCommon/runtimeexecutor/platform/ios/ReactCommon/RuntimeExecutorSyncUIThreadUtils.h +6 -6
- package/ReactCommon/yoga/cmake/yoga-config.cmake.in +1 -1
- package/ReactCommon/yoga/yoga/algorithm/CalculateLayout.cpp +14 -11
- package/flow/bom.js.flow +1 -0
- package/index.js +6 -0
- package/index.js.flow +4 -0
- package/jest/mockComponent.js +6 -6
- package/jest/setup.js +15 -10
- package/package.json +15 -17
- package/scripts/cocoapods/rncore.rb +261 -36
- package/scripts/cocoapods/rndependencies.rb +56 -19
- package/scripts/cocoapods/utils.rb +5 -0
- package/scripts/codegen/codegen-utils.js +2 -2
- package/scripts/codegen/generate-artifacts-executor/generatePackageSwift.js +44 -0
- package/scripts/codegen/generate-artifacts-executor/generateReactCodegenPodspec.js +12 -3
- package/scripts/codegen/generate-artifacts-executor/index.js +75 -29
- package/scripts/codegen/generate-artifacts-executor/utils.js +44 -6
- package/scripts/codegen/templates/Package.swift.template +59 -0
- package/scripts/hermes/hermes-utils.js +52 -304
- package/scripts/react_native_pods.rb +13 -2
- package/scripts/react_native_pods_utils/script_phases.sh +1 -3
- package/sdks/.hermesv1version +1 -0
- package/sdks/.hermesversion +1 -1
- package/sdks/hermes-engine/hermes-engine.podspec +5 -9
- package/sdks/hermes-engine/hermes-utils.rb +24 -27
- package/sdks/hermes-engine/version.properties +2 -1
- package/src/private/components/virtualview/VirtualView.js +22 -27
- package/src/private/components/virtualview/VirtualViewExperimentalNativeComponent.js +6 -0
- package/src/private/featureflags/ReactNativeFeatureFlags.js +100 -19
- package/src/private/featureflags/specs/NativeReactNativeFeatureFlags.js +18 -3
- package/src/private/setup/setUpDefaultReactNativeEnvironment.js +6 -0
- package/src/private/specs_DEPRECATED/modules/NativeNetworkingIOS.js +1 -0
- package/src/private/webapis/dom/nodes/ReactNativeElement.js +12 -2
- package/src/private/webapis/intersectionobserver/IntersectionObserver.js +76 -15
- package/src/private/webapis/intersectionobserver/internals/IntersectionObserverManager.js +1 -0
- package/src/private/webapis/intersectionobserver/specs/NativeIntersectionObserver.js +1 -0
- package/src/private/webapis/performance/ResourceTiming.js +31 -4
- package/src/private/webapis/performance/internals/RawPerformanceEntry.js +4 -1
- package/src/private/webapis/performance/specs/NativePerformance.js +3 -0
- package/types/index.d.ts +1 -0
- package/types/public/ReactNativeTypes.d.ts +115 -2
- package/Libraries/ReactNative/ReactFabricPublicInstance/ReactFabricHostComponent.js +0 -152
- package/React/FBReactNativeSpec/FBReactNativeSpecJSI-generated.cpp +0 -3371
- package/ReactAndroid/src/main/java/com/facebook/react/CoreModulesPackage.kt +0 -207
- package/ReactAndroid/src/main/java/com/facebook/react/devsupport/PerfMonitorOverlayViewManager.kt +0 -278
- package/ReactAndroid/src/main/java/com/facebook/react/devsupport/interfaces/PerfMonitorOverlayManager.kt +0 -20
- package/ReactAndroid/src/main/java/com/facebook/react/uimanager/LayoutDirectionUtil.kt +0 -36
- package/ReactAndroid/src/main/java/com/facebook/react/uimanager/NoSuchNativeViewException.kt +0 -34
- package/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactRoot.java +0 -76
- package/ReactAndroid/src/main/java/com/facebook/react/uimanager/YogaNodePool.kt +0 -34
- package/ReactAndroid/src/main/java/com/facebook/react/uimanager/drawable/CSSBackgroundDrawable.java +0 -1474
- package/ReactAndroid/src/main/java/com/facebook/react/uimanager/layoutanimation/AbstractLayoutAnimation.kt +0 -137
- package/ReactAndroid/src/main/java/com/facebook/react/uimanager/layoutanimation/AnimatedPropertyType.kt +0 -42
- package/ReactAndroid/src/main/java/com/facebook/react/uimanager/layoutanimation/BaseLayoutAnimation.kt +0 -96
- package/ReactAndroid/src/main/java/com/facebook/react/uimanager/layoutanimation/InterpolatorType.kt +0 -43
- package/ReactAndroid/src/main/java/com/facebook/react/uimanager/layoutanimation/LayoutAnimationType.kt +0 -46
- package/ReactAndroid/src/main/java/com/facebook/react/uimanager/layoutanimation/LayoutCreateAnimation.kt +0 -33
- package/ReactAndroid/src/main/java/com/facebook/react/uimanager/layoutanimation/LayoutDeleteAnimation.kt +0 -37
- package/ReactAndroid/src/main/java/com/facebook/react/uimanager/layoutanimation/LayoutHandlingAnimation.kt +0 -42
- package/ReactAndroid/src/main/java/com/facebook/react/uimanager/layoutanimation/LayoutUpdateAnimation.kt +0 -66
- package/ReactAndroid/src/main/java/com/facebook/react/uimanager/layoutanimation/OpacityAnimation.kt +0 -77
- package/ReactAndroid/src/main/java/com/facebook/react/uimanager/layoutanimation/PositionAndSizeAnimation.kt +0 -98
- package/ReactAndroid/src/main/java/com/facebook/react/uimanager/layoutanimation/SimpleSpringInterpolator.kt +0 -62
- package/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactRawTextManager.kt +0 -54
- package/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactRawTextShadowNode.kt +0 -38
- package/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactVirtualTextShadowNode.kt +0 -34
- package/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactVirtualTextViewManager.kt +0 -54
- package/ReactCommon/jsinspector-modern/network/NetworkReporter.cpp +0 -316
- package/ReactCommon/jsinspector-modern/network/NetworkReporter.h +0 -211
- package/ReactCommon/jsinspector-modern/tests/RuntimeTargetDebuggerSessionObserverTest.cpp +0 -214
- package/scripts/hermes/prepare-hermes-for-build.js +0 -49
- package/sdks/hermesc/linux64-bin/hermesc +0 -0
- package/sdks/hermesc/osx-bin/hermes +0 -0
- package/sdks/hermesc/osx-bin/hermes-lit +0 -15
- package/sdks/hermesc/osx-bin/hermesc +0 -0
- package/sdks/hermesc/win64-bin/hermesc.exe +0 -0
- package/sdks/hermesc/win64-bin/icudt64.dll +0 -0
- package/sdks/hermesc/win64-bin/icuin64.dll +0 -0
- package/sdks/hermesc/win64-bin/icuio64.dll +0 -0
- package/sdks/hermesc/win64-bin/icutest64.dll +0 -0
- package/sdks/hermesc/win64-bin/icutu64.dll +0 -0
- package/sdks/hermesc/win64-bin/icuuc64.dll +0 -0
- package/sdks/hermesc/win64-bin/msvcp140.dll +0 -0
- package/sdks/hermesc/win64-bin/vcruntime140.dll +0 -0
- package/sdks/hermesc/win64-bin/vcruntime140_1.dll +0 -0
package/ReactAndroid/src/main/java/com/facebook/react/uimanager/drawable/CSSBackgroundDrawable.java
DELETED
|
@@ -1,1474 +0,0 @@
|
|
|
1
|
-
/*
|
|
2
|
-
* Copyright (c) Meta Platforms, Inc. and affiliates.
|
|
3
|
-
*
|
|
4
|
-
* This source code is licensed under the MIT license found in the
|
|
5
|
-
* LICENSE file in the root directory of this source tree.
|
|
6
|
-
*/
|
|
7
|
-
|
|
8
|
-
package com.facebook.react.uimanager.drawable;
|
|
9
|
-
|
|
10
|
-
import android.annotation.SuppressLint;
|
|
11
|
-
import android.content.Context;
|
|
12
|
-
import android.graphics.Canvas;
|
|
13
|
-
import android.graphics.Color;
|
|
14
|
-
import android.graphics.ColorFilter;
|
|
15
|
-
import android.graphics.ComposeShader;
|
|
16
|
-
import android.graphics.DashPathEffect;
|
|
17
|
-
import android.graphics.Outline;
|
|
18
|
-
import android.graphics.Paint;
|
|
19
|
-
import android.graphics.Path;
|
|
20
|
-
import android.graphics.PathEffect;
|
|
21
|
-
import android.graphics.PixelFormat;
|
|
22
|
-
import android.graphics.PointF;
|
|
23
|
-
import android.graphics.PorterDuff;
|
|
24
|
-
import android.graphics.Rect;
|
|
25
|
-
import android.graphics.RectF;
|
|
26
|
-
import android.graphics.Region;
|
|
27
|
-
import android.graphics.Shader;
|
|
28
|
-
import android.graphics.drawable.Drawable;
|
|
29
|
-
import android.view.View;
|
|
30
|
-
import androidx.annotation.Nullable;
|
|
31
|
-
import androidx.core.graphics.ColorUtils;
|
|
32
|
-
import androidx.core.util.Preconditions;
|
|
33
|
-
import com.facebook.infer.annotation.Nullsafe;
|
|
34
|
-
import com.facebook.react.common.annotations.UnstableReactNativeAPI;
|
|
35
|
-
import com.facebook.react.modules.i18nmanager.I18nUtil;
|
|
36
|
-
import com.facebook.react.uimanager.FloatUtil;
|
|
37
|
-
import com.facebook.react.uimanager.LengthPercentage;
|
|
38
|
-
import com.facebook.react.uimanager.LengthPercentageType;
|
|
39
|
-
import com.facebook.react.uimanager.PixelUtil;
|
|
40
|
-
import com.facebook.react.uimanager.Spacing;
|
|
41
|
-
import com.facebook.react.uimanager.style.BackgroundImageLayer;
|
|
42
|
-
import com.facebook.react.uimanager.style.BorderRadiusProp;
|
|
43
|
-
import com.facebook.react.uimanager.style.BorderRadiusStyle;
|
|
44
|
-
import com.facebook.react.uimanager.style.BorderStyle;
|
|
45
|
-
import com.facebook.react.uimanager.style.ComputedBorderRadius;
|
|
46
|
-
import com.facebook.react.uimanager.style.CornerRadii;
|
|
47
|
-
import java.util.List;
|
|
48
|
-
import java.util.Locale;
|
|
49
|
-
import java.util.Objects;
|
|
50
|
-
|
|
51
|
-
/**
|
|
52
|
-
* A subclass of {@link Drawable} used for background of {@link
|
|
53
|
-
* com.facebook.react.views.view.ReactViewGroup}. It supports drawing background color and borders
|
|
54
|
-
* (including rounded borders) by providing a react friendly API (setter for each of those
|
|
55
|
-
* properties).
|
|
56
|
-
*
|
|
57
|
-
* <p>The implementation tries to allocate as few objects as possible depending on which properties
|
|
58
|
-
* are set. E.g. for views with rounded background/borders we allocate {@code
|
|
59
|
-
* mInnerClipPathForBorderRadius} and {@code mInnerClipTempRectForBorderRadius}. In case when view
|
|
60
|
-
* have a rectangular borders we allocate {@code mBorderWidthResult} and similar. When only
|
|
61
|
-
* background color is set we won't allocate any extra/unnecessary objects.
|
|
62
|
-
*/
|
|
63
|
-
@UnstableReactNativeAPI
|
|
64
|
-
@Nullsafe(Nullsafe.Mode.LOCAL)
|
|
65
|
-
public class CSSBackgroundDrawable extends Drawable {
|
|
66
|
-
|
|
67
|
-
private static final int DEFAULT_BORDER_COLOR = Color.BLACK;
|
|
68
|
-
private static final int DEFAULT_BORDER_RGB = 0x00FFFFFF & DEFAULT_BORDER_COLOR;
|
|
69
|
-
private static final int DEFAULT_BORDER_ALPHA = (0xFF000000 & DEFAULT_BORDER_COLOR) >>> 24;
|
|
70
|
-
// ~0 == 0xFFFFFFFF, all bits set to 1.
|
|
71
|
-
private static final int ALL_BITS_SET = ~0;
|
|
72
|
-
// 0 == 0x00000000, all bits set to 0.
|
|
73
|
-
private static final int ALL_BITS_UNSET = 0;
|
|
74
|
-
|
|
75
|
-
private static @Nullable PathEffect getPathEffect(BorderStyle style, float borderWidth) {
|
|
76
|
-
switch (style) {
|
|
77
|
-
case SOLID:
|
|
78
|
-
return null;
|
|
79
|
-
|
|
80
|
-
case DASHED:
|
|
81
|
-
return new DashPathEffect(
|
|
82
|
-
new float[] {borderWidth * 3, borderWidth * 3, borderWidth * 3, borderWidth * 3}, 0);
|
|
83
|
-
|
|
84
|
-
case DOTTED:
|
|
85
|
-
return new DashPathEffect(
|
|
86
|
-
new float[] {borderWidth, borderWidth, borderWidth, borderWidth}, 0);
|
|
87
|
-
|
|
88
|
-
default:
|
|
89
|
-
return null;
|
|
90
|
-
}
|
|
91
|
-
}
|
|
92
|
-
|
|
93
|
-
/* Value at Spacing.ALL index used for rounded borders, whole array used by rectangular borders */
|
|
94
|
-
private @Nullable Spacing mBorderWidth;
|
|
95
|
-
private @Nullable Spacing mBorderRGB;
|
|
96
|
-
private @Nullable Spacing mBorderAlpha;
|
|
97
|
-
private @Nullable BorderStyle mBorderStyle;
|
|
98
|
-
|
|
99
|
-
private @Nullable Path mInnerClipPathForBorderRadius;
|
|
100
|
-
private @Nullable Path mBackgroundColorRenderPath;
|
|
101
|
-
private @Nullable Path mOuterClipPathForBorderRadius;
|
|
102
|
-
private @Nullable Path mPathForBorderRadiusOutline;
|
|
103
|
-
private @Nullable Path mPathForBorder;
|
|
104
|
-
private final Path mPathForSingleBorder = new Path();
|
|
105
|
-
private @Nullable Path mCenterDrawPath;
|
|
106
|
-
private @Nullable RectF mInnerClipTempRectForBorderRadius;
|
|
107
|
-
private @Nullable RectF mOuterClipTempRectForBorderRadius;
|
|
108
|
-
private @Nullable RectF mTempRectForBorderRadiusOutline;
|
|
109
|
-
private @Nullable RectF mTempRectForCenterDrawPath;
|
|
110
|
-
private @Nullable PointF mInnerTopLeftCorner;
|
|
111
|
-
private @Nullable PointF mInnerTopRightCorner;
|
|
112
|
-
private @Nullable PointF mInnerBottomRightCorner;
|
|
113
|
-
private @Nullable PointF mInnerBottomLeftCorner;
|
|
114
|
-
private boolean mNeedUpdatePathForBorderRadius = false;
|
|
115
|
-
|
|
116
|
-
/* Used by all types of background and for drawing borders */
|
|
117
|
-
private final Paint mPaint = new Paint(Paint.ANTI_ALIAS_FLAG);
|
|
118
|
-
private int mColor = Color.TRANSPARENT;
|
|
119
|
-
private @Nullable List<BackgroundImageLayer> mBackgroundImageLayers = null;
|
|
120
|
-
private int mAlpha = 255;
|
|
121
|
-
|
|
122
|
-
// There is a small gap between the edges of adjacent paths
|
|
123
|
-
// such as between the mBackgroundColorRenderPath and its border.
|
|
124
|
-
// The smallest amount (found to be 0.8f) is used to extend
|
|
125
|
-
// the paths, overlapping them and closing the visible gap.
|
|
126
|
-
private final float mGapBetweenPaths = 0.8f;
|
|
127
|
-
|
|
128
|
-
private BorderRadiusStyle mBorderRadius = new BorderRadiusStyle();
|
|
129
|
-
private ComputedBorderRadius mComputedBorderRadius = new ComputedBorderRadius();
|
|
130
|
-
private final Context mContext;
|
|
131
|
-
|
|
132
|
-
// Should be removed after migrating to Android layout direction.
|
|
133
|
-
private int mLayoutDirectionOverride = -1;
|
|
134
|
-
|
|
135
|
-
public CSSBackgroundDrawable(Context context) {
|
|
136
|
-
mContext = context;
|
|
137
|
-
}
|
|
138
|
-
|
|
139
|
-
@Override
|
|
140
|
-
public void draw(Canvas canvas) {
|
|
141
|
-
updatePathEffect();
|
|
142
|
-
if (!hasRoundedBorders()) {
|
|
143
|
-
drawRectangularBackgroundWithBorders(canvas);
|
|
144
|
-
} else {
|
|
145
|
-
drawRoundedBackgroundWithBorders(canvas);
|
|
146
|
-
}
|
|
147
|
-
}
|
|
148
|
-
|
|
149
|
-
public boolean hasRoundedBorders() {
|
|
150
|
-
return mBorderRadius.hasRoundedBorders();
|
|
151
|
-
}
|
|
152
|
-
|
|
153
|
-
@Override
|
|
154
|
-
protected void onBoundsChange(Rect bounds) {
|
|
155
|
-
super.onBoundsChange(bounds);
|
|
156
|
-
mNeedUpdatePathForBorderRadius = true;
|
|
157
|
-
}
|
|
158
|
-
|
|
159
|
-
@Override
|
|
160
|
-
public void setAlpha(int alpha) {
|
|
161
|
-
if (alpha != mAlpha) {
|
|
162
|
-
mAlpha = alpha;
|
|
163
|
-
invalidateSelf();
|
|
164
|
-
}
|
|
165
|
-
}
|
|
166
|
-
|
|
167
|
-
@Override
|
|
168
|
-
public int getAlpha() {
|
|
169
|
-
return mAlpha;
|
|
170
|
-
}
|
|
171
|
-
|
|
172
|
-
@Override
|
|
173
|
-
public void setColorFilter(ColorFilter cf) {
|
|
174
|
-
// do nothing
|
|
175
|
-
}
|
|
176
|
-
|
|
177
|
-
@Deprecated
|
|
178
|
-
public void setLayoutDirectionOverride(int layoutDirection) {
|
|
179
|
-
if (mLayoutDirectionOverride != layoutDirection) {
|
|
180
|
-
mLayoutDirectionOverride = layoutDirection;
|
|
181
|
-
}
|
|
182
|
-
}
|
|
183
|
-
|
|
184
|
-
@Override
|
|
185
|
-
@SuppressLint("WrongConstant")
|
|
186
|
-
public int getLayoutDirection() {
|
|
187
|
-
return mLayoutDirectionOverride == -1 ? super.getLayoutDirection() : mLayoutDirectionOverride;
|
|
188
|
-
}
|
|
189
|
-
|
|
190
|
-
@Override
|
|
191
|
-
public int getOpacity() {
|
|
192
|
-
int alpha = (Color.alpha(mColor) * mAlpha) >> 8;
|
|
193
|
-
switch (alpha) {
|
|
194
|
-
case 255:
|
|
195
|
-
return PixelFormat.OPAQUE;
|
|
196
|
-
case 0:
|
|
197
|
-
return PixelFormat.TRANSPARENT;
|
|
198
|
-
default:
|
|
199
|
-
return PixelFormat.TRANSLUCENT;
|
|
200
|
-
}
|
|
201
|
-
}
|
|
202
|
-
|
|
203
|
-
/* Android's elevation implementation requires this to be implemented to know where to draw the shadow. */
|
|
204
|
-
@Override
|
|
205
|
-
public void getOutline(Outline outline) {
|
|
206
|
-
if (hasRoundedBorders()) {
|
|
207
|
-
updatePath();
|
|
208
|
-
|
|
209
|
-
outline.setConvexPath(Preconditions.checkNotNull(mPathForBorderRadiusOutline));
|
|
210
|
-
} else {
|
|
211
|
-
outline.setRect(getBounds());
|
|
212
|
-
}
|
|
213
|
-
}
|
|
214
|
-
|
|
215
|
-
public void setBorderWidth(int position, float width) {
|
|
216
|
-
if (mBorderWidth == null) {
|
|
217
|
-
mBorderWidth = new Spacing();
|
|
218
|
-
}
|
|
219
|
-
if (!FloatUtil.floatsEqual(mBorderWidth.getRaw(position), width)) {
|
|
220
|
-
mBorderWidth.set(position, width);
|
|
221
|
-
switch (position) {
|
|
222
|
-
case Spacing.ALL:
|
|
223
|
-
case Spacing.LEFT:
|
|
224
|
-
case Spacing.BOTTOM:
|
|
225
|
-
case Spacing.RIGHT:
|
|
226
|
-
case Spacing.TOP:
|
|
227
|
-
case Spacing.START:
|
|
228
|
-
case Spacing.END:
|
|
229
|
-
mNeedUpdatePathForBorderRadius = true;
|
|
230
|
-
}
|
|
231
|
-
invalidateSelf();
|
|
232
|
-
}
|
|
233
|
-
}
|
|
234
|
-
|
|
235
|
-
public void setBorderColor(int position, @Nullable Integer color) {
|
|
236
|
-
float rgbComponent = color == null ? Float.NaN : (float) ((int) color & 0x00FFFFFF);
|
|
237
|
-
float alphaComponent = color == null ? Float.NaN : (float) ((int) color >>> 24);
|
|
238
|
-
|
|
239
|
-
this.setBorderRGB(position, rgbComponent);
|
|
240
|
-
this.setBorderAlpha(position, alphaComponent);
|
|
241
|
-
mNeedUpdatePathForBorderRadius = true;
|
|
242
|
-
}
|
|
243
|
-
|
|
244
|
-
private void setBorderRGB(int position, float rgb) {
|
|
245
|
-
// set RGB component
|
|
246
|
-
if (mBorderRGB == null) {
|
|
247
|
-
mBorderRGB = new Spacing(DEFAULT_BORDER_RGB);
|
|
248
|
-
}
|
|
249
|
-
if (!FloatUtil.floatsEqual(mBorderRGB.getRaw(position), rgb)) {
|
|
250
|
-
mBorderRGB.set(position, rgb);
|
|
251
|
-
invalidateSelf();
|
|
252
|
-
}
|
|
253
|
-
}
|
|
254
|
-
|
|
255
|
-
private void setBorderAlpha(int position, float alpha) {
|
|
256
|
-
// set Alpha component
|
|
257
|
-
if (mBorderAlpha == null) {
|
|
258
|
-
mBorderAlpha = new Spacing(DEFAULT_BORDER_ALPHA);
|
|
259
|
-
}
|
|
260
|
-
if (!FloatUtil.floatsEqual(mBorderAlpha.getRaw(position), alpha)) {
|
|
261
|
-
mBorderAlpha.set(position, alpha);
|
|
262
|
-
invalidateSelf();
|
|
263
|
-
}
|
|
264
|
-
}
|
|
265
|
-
|
|
266
|
-
public void setBorderStyle(@Nullable String style) {
|
|
267
|
-
BorderStyle borderStyle =
|
|
268
|
-
style == null ? null : BorderStyle.valueOf(style.toUpperCase(Locale.US));
|
|
269
|
-
setBorderStyle(borderStyle);
|
|
270
|
-
}
|
|
271
|
-
|
|
272
|
-
public void setBorderStyle(@Nullable BorderStyle borderStyle) {
|
|
273
|
-
if (mBorderStyle != borderStyle) {
|
|
274
|
-
mBorderStyle = borderStyle;
|
|
275
|
-
mNeedUpdatePathForBorderRadius = true;
|
|
276
|
-
invalidateSelf();
|
|
277
|
-
}
|
|
278
|
-
}
|
|
279
|
-
|
|
280
|
-
public @Nullable BorderStyle getBorderStyle() {
|
|
281
|
-
return mBorderStyle;
|
|
282
|
-
}
|
|
283
|
-
|
|
284
|
-
/**
|
|
285
|
-
* @deprecated Use {@link #setBorderRadius(BorderRadiusProp, LengthPercentage)} instead.
|
|
286
|
-
*/
|
|
287
|
-
@Deprecated(since = "0.75.0", forRemoval = true)
|
|
288
|
-
public void setRadius(float radius) {
|
|
289
|
-
@Nullable Float boxedRadius = Float.isNaN(radius) ? null : Float.valueOf(radius);
|
|
290
|
-
if (boxedRadius == null) {
|
|
291
|
-
setBorderRadius(BorderRadiusProp.BORDER_RADIUS, null);
|
|
292
|
-
} else {
|
|
293
|
-
setBorderRadius(
|
|
294
|
-
BorderRadiusProp.BORDER_RADIUS,
|
|
295
|
-
new LengthPercentage(boxedRadius, LengthPercentageType.POINT));
|
|
296
|
-
}
|
|
297
|
-
}
|
|
298
|
-
|
|
299
|
-
/**
|
|
300
|
-
* @deprecated Use {@link #setBorderRadius(BorderRadiusProp, LengthPercentage)} instead.
|
|
301
|
-
*/
|
|
302
|
-
@Deprecated(since = "0.75.0", forRemoval = true)
|
|
303
|
-
public void setRadius(float radius, int position) {
|
|
304
|
-
@Nullable Float boxedRadius = Float.isNaN(radius) ? null : Float.valueOf(radius);
|
|
305
|
-
|
|
306
|
-
if (boxedRadius == null) {
|
|
307
|
-
mBorderRadius.set(BorderRadiusProp.values()[position], null);
|
|
308
|
-
invalidateSelf();
|
|
309
|
-
} else {
|
|
310
|
-
setBorderRadius(
|
|
311
|
-
BorderRadiusProp.values()[position],
|
|
312
|
-
new LengthPercentage(boxedRadius, LengthPercentageType.POINT));
|
|
313
|
-
}
|
|
314
|
-
}
|
|
315
|
-
|
|
316
|
-
public void setBorderRadius(BorderRadiusProp property, @Nullable LengthPercentage radius) {
|
|
317
|
-
if (!Objects.equals(radius, mBorderRadius.get(property))) {
|
|
318
|
-
mBorderRadius.set(property, radius);
|
|
319
|
-
mNeedUpdatePathForBorderRadius = true;
|
|
320
|
-
invalidateSelf();
|
|
321
|
-
}
|
|
322
|
-
}
|
|
323
|
-
|
|
324
|
-
public void setBorderRadius(BorderRadiusStyle radius) {
|
|
325
|
-
mBorderRadius = radius;
|
|
326
|
-
}
|
|
327
|
-
|
|
328
|
-
public BorderRadiusStyle getBorderRadius() {
|
|
329
|
-
return mBorderRadius;
|
|
330
|
-
}
|
|
331
|
-
|
|
332
|
-
// Here, "inner" refers to the border radius on the inside of the border. So
|
|
333
|
-
// it ends up being the "outer" border radius inset by the respective width.
|
|
334
|
-
public float getInnerBorderRadius(float computedRadius, float borderWidth) {
|
|
335
|
-
return Math.max(computedRadius - borderWidth, 0);
|
|
336
|
-
}
|
|
337
|
-
|
|
338
|
-
public void setColor(int color) {
|
|
339
|
-
mColor = color;
|
|
340
|
-
invalidateSelf();
|
|
341
|
-
}
|
|
342
|
-
|
|
343
|
-
public void setBackgroundImage(@Nullable List<BackgroundImageLayer> backgroundImageLayers) {
|
|
344
|
-
mBackgroundImageLayers = backgroundImageLayers;
|
|
345
|
-
invalidateSelf();
|
|
346
|
-
}
|
|
347
|
-
|
|
348
|
-
public int getColor() {
|
|
349
|
-
return mColor;
|
|
350
|
-
}
|
|
351
|
-
|
|
352
|
-
public @Nullable Path getBorderBoxPath() {
|
|
353
|
-
if (hasRoundedBorders()) {
|
|
354
|
-
updatePath();
|
|
355
|
-
return new Path(Preconditions.checkNotNull(mOuterClipPathForBorderRadius));
|
|
356
|
-
}
|
|
357
|
-
|
|
358
|
-
return null;
|
|
359
|
-
}
|
|
360
|
-
|
|
361
|
-
public RectF getBorderBoxRect() {
|
|
362
|
-
return new RectF(getBounds());
|
|
363
|
-
}
|
|
364
|
-
|
|
365
|
-
public @Nullable Path getPaddingBoxPath() {
|
|
366
|
-
if (hasRoundedBorders()) {
|
|
367
|
-
updatePath();
|
|
368
|
-
return new Path(Preconditions.checkNotNull(mInnerClipPathForBorderRadius));
|
|
369
|
-
}
|
|
370
|
-
|
|
371
|
-
return null;
|
|
372
|
-
}
|
|
373
|
-
|
|
374
|
-
public RectF getPaddingBoxRect() {
|
|
375
|
-
@Nullable RectF insets = getDirectionAwareBorderInsets();
|
|
376
|
-
if (insets == null) {
|
|
377
|
-
return new RectF(0, 0, getBounds().width(), getBounds().height());
|
|
378
|
-
}
|
|
379
|
-
|
|
380
|
-
return new RectF(
|
|
381
|
-
insets.left,
|
|
382
|
-
insets.top,
|
|
383
|
-
getBounds().width() - insets.right,
|
|
384
|
-
getBounds().height() - insets.bottom);
|
|
385
|
-
}
|
|
386
|
-
|
|
387
|
-
private void drawRoundedBackgroundWithBorders(Canvas canvas) {
|
|
388
|
-
updatePath();
|
|
389
|
-
canvas.save();
|
|
390
|
-
|
|
391
|
-
// Draws the View without its border first (with background color fill)
|
|
392
|
-
int useColor = ColorUtils.setAlphaComponent(mColor, (Color.alpha(mColor) * mAlpha) >> 8);
|
|
393
|
-
if (Color.alpha(useColor) != 0) {
|
|
394
|
-
mPaint.setColor(useColor);
|
|
395
|
-
mPaint.setStyle(Paint.Style.FILL);
|
|
396
|
-
canvas.drawPath(Preconditions.checkNotNull(mBackgroundColorRenderPath), mPaint);
|
|
397
|
-
}
|
|
398
|
-
|
|
399
|
-
if (mBackgroundImageLayers != null && !mBackgroundImageLayers.isEmpty()) {
|
|
400
|
-
mPaint.setShader(getBackgroundImageShader());
|
|
401
|
-
mPaint.setStyle(Paint.Style.FILL);
|
|
402
|
-
canvas.drawPath(Preconditions.checkNotNull(mBackgroundColorRenderPath), mPaint);
|
|
403
|
-
mPaint.setShader(null);
|
|
404
|
-
}
|
|
405
|
-
|
|
406
|
-
final RectF borderWidth = getDirectionAwareBorderInsets();
|
|
407
|
-
int colorLeft = getBorderColor(Spacing.LEFT);
|
|
408
|
-
int colorTop = getBorderColor(Spacing.TOP);
|
|
409
|
-
int colorRight = getBorderColor(Spacing.RIGHT);
|
|
410
|
-
int colorBottom = getBorderColor(Spacing.BOTTOM);
|
|
411
|
-
|
|
412
|
-
int colorBlock = getBorderColor(Spacing.BLOCK);
|
|
413
|
-
int colorBlockStart = getBorderColor(Spacing.BLOCK_START);
|
|
414
|
-
int colorBlockEnd = getBorderColor(Spacing.BLOCK_END);
|
|
415
|
-
|
|
416
|
-
if (isBorderColorDefined(Spacing.BLOCK)) {
|
|
417
|
-
colorBottom = colorBlock;
|
|
418
|
-
colorTop = colorBlock;
|
|
419
|
-
}
|
|
420
|
-
if (isBorderColorDefined(Spacing.BLOCK_END)) {
|
|
421
|
-
colorBottom = colorBlockEnd;
|
|
422
|
-
}
|
|
423
|
-
if (isBorderColorDefined(Spacing.BLOCK_START)) {
|
|
424
|
-
colorTop = colorBlockStart;
|
|
425
|
-
}
|
|
426
|
-
|
|
427
|
-
if (borderWidth.top > 0
|
|
428
|
-
|| borderWidth.bottom > 0
|
|
429
|
-
|| borderWidth.left > 0
|
|
430
|
-
|| borderWidth.right > 0) {
|
|
431
|
-
|
|
432
|
-
// Clip outer border
|
|
433
|
-
canvas.clipPath(
|
|
434
|
-
Preconditions.checkNotNull(mOuterClipPathForBorderRadius), Region.Op.INTERSECT);
|
|
435
|
-
|
|
436
|
-
// If it's a full and even border draw inner rect path with stroke
|
|
437
|
-
final float fullBorderWidth = getFullBorderWidth();
|
|
438
|
-
int borderColor = getBorderColor(Spacing.ALL);
|
|
439
|
-
if (borderWidth.top == fullBorderWidth
|
|
440
|
-
&& borderWidth.bottom == fullBorderWidth
|
|
441
|
-
&& borderWidth.left == fullBorderWidth
|
|
442
|
-
&& borderWidth.right == fullBorderWidth
|
|
443
|
-
&& colorLeft == borderColor
|
|
444
|
-
&& colorTop == borderColor
|
|
445
|
-
&& colorRight == borderColor
|
|
446
|
-
&& colorBottom == borderColor) {
|
|
447
|
-
if (fullBorderWidth > 0) {
|
|
448
|
-
mPaint.setColor(multiplyColorAlpha(borderColor, mAlpha));
|
|
449
|
-
mPaint.setStyle(Paint.Style.STROKE);
|
|
450
|
-
mPaint.setStrokeWidth(fullBorderWidth);
|
|
451
|
-
canvas.drawPath(Preconditions.checkNotNull(mCenterDrawPath), mPaint);
|
|
452
|
-
}
|
|
453
|
-
}
|
|
454
|
-
// In the case of uneven border widths/colors draw quadrilateral in each direction
|
|
455
|
-
else {
|
|
456
|
-
mPaint.setStyle(Paint.Style.FILL);
|
|
457
|
-
|
|
458
|
-
// Clip inner border
|
|
459
|
-
canvas.clipPath(
|
|
460
|
-
Preconditions.checkNotNull(mInnerClipPathForBorderRadius), Region.Op.DIFFERENCE);
|
|
461
|
-
|
|
462
|
-
final boolean isRTL = getLayoutDirection() == View.LAYOUT_DIRECTION_RTL;
|
|
463
|
-
int colorStart = getBorderColor(Spacing.START);
|
|
464
|
-
int colorEnd = getBorderColor(Spacing.END);
|
|
465
|
-
|
|
466
|
-
if (I18nUtil.getInstance().doLeftAndRightSwapInRTL(mContext)) {
|
|
467
|
-
if (!isBorderColorDefined(Spacing.START)) {
|
|
468
|
-
colorStart = colorLeft;
|
|
469
|
-
}
|
|
470
|
-
|
|
471
|
-
if (!isBorderColorDefined(Spacing.END)) {
|
|
472
|
-
colorEnd = colorRight;
|
|
473
|
-
}
|
|
474
|
-
|
|
475
|
-
final int directionAwareColorLeft = isRTL ? colorEnd : colorStart;
|
|
476
|
-
final int directionAwareColorRight = isRTL ? colorStart : colorEnd;
|
|
477
|
-
|
|
478
|
-
colorLeft = directionAwareColorLeft;
|
|
479
|
-
colorRight = directionAwareColorRight;
|
|
480
|
-
} else {
|
|
481
|
-
final int directionAwareColorLeft = isRTL ? colorEnd : colorStart;
|
|
482
|
-
final int directionAwareColorRight = isRTL ? colorStart : colorEnd;
|
|
483
|
-
|
|
484
|
-
final boolean isColorStartDefined = isBorderColorDefined(Spacing.START);
|
|
485
|
-
final boolean isColorEndDefined = isBorderColorDefined(Spacing.END);
|
|
486
|
-
final boolean isDirectionAwareColorLeftDefined =
|
|
487
|
-
isRTL ? isColorEndDefined : isColorStartDefined;
|
|
488
|
-
final boolean isDirectionAwareColorRightDefined =
|
|
489
|
-
isRTL ? isColorStartDefined : isColorEndDefined;
|
|
490
|
-
|
|
491
|
-
if (isDirectionAwareColorLeftDefined) {
|
|
492
|
-
colorLeft = directionAwareColorLeft;
|
|
493
|
-
}
|
|
494
|
-
|
|
495
|
-
if (isDirectionAwareColorRightDefined) {
|
|
496
|
-
colorRight = directionAwareColorRight;
|
|
497
|
-
}
|
|
498
|
-
}
|
|
499
|
-
|
|
500
|
-
final RectF outerClipTempRect =
|
|
501
|
-
Preconditions.checkNotNull(mOuterClipTempRectForBorderRadius);
|
|
502
|
-
final float left = outerClipTempRect.left;
|
|
503
|
-
final float right = outerClipTempRect.right;
|
|
504
|
-
final float top = outerClipTempRect.top;
|
|
505
|
-
final float bottom = outerClipTempRect.bottom;
|
|
506
|
-
|
|
507
|
-
final PointF innerTopLeftCorner = Preconditions.checkNotNull(mInnerTopLeftCorner);
|
|
508
|
-
final PointF innerTopRightCorner = Preconditions.checkNotNull(mInnerTopRightCorner);
|
|
509
|
-
final PointF innerBottomLeftCorner = Preconditions.checkNotNull(mInnerBottomLeftCorner);
|
|
510
|
-
final PointF innerBottomRightCorner = Preconditions.checkNotNull(mInnerBottomRightCorner);
|
|
511
|
-
|
|
512
|
-
// mGapBetweenPaths is used to close the gap between the diagonal
|
|
513
|
-
// edges of the quadrilaterals on adjacent sides of the rectangle
|
|
514
|
-
if (borderWidth.left > 0) {
|
|
515
|
-
final float x1 = left;
|
|
516
|
-
final float y1 = top - mGapBetweenPaths;
|
|
517
|
-
final float x2 = innerTopLeftCorner.x;
|
|
518
|
-
final float y2 = innerTopLeftCorner.y - mGapBetweenPaths;
|
|
519
|
-
final float x3 = innerBottomLeftCorner.x;
|
|
520
|
-
final float y3 = innerBottomLeftCorner.y + mGapBetweenPaths;
|
|
521
|
-
final float x4 = left;
|
|
522
|
-
final float y4 = bottom + mGapBetweenPaths;
|
|
523
|
-
|
|
524
|
-
drawQuadrilateral(canvas, colorLeft, x1, y1, x2, y2, x3, y3, x4, y4);
|
|
525
|
-
}
|
|
526
|
-
|
|
527
|
-
if (borderWidth.top > 0) {
|
|
528
|
-
final float x1 = left - mGapBetweenPaths;
|
|
529
|
-
final float y1 = top;
|
|
530
|
-
final float x2 = innerTopLeftCorner.x - mGapBetweenPaths;
|
|
531
|
-
final float y2 = innerTopLeftCorner.y;
|
|
532
|
-
final float x3 = innerTopRightCorner.x + mGapBetweenPaths;
|
|
533
|
-
final float y3 = innerTopRightCorner.y;
|
|
534
|
-
final float x4 = right + mGapBetweenPaths;
|
|
535
|
-
final float y4 = top;
|
|
536
|
-
|
|
537
|
-
drawQuadrilateral(canvas, colorTop, x1, y1, x2, y2, x3, y3, x4, y4);
|
|
538
|
-
}
|
|
539
|
-
|
|
540
|
-
if (borderWidth.right > 0) {
|
|
541
|
-
final float x1 = right;
|
|
542
|
-
final float y1 = top - mGapBetweenPaths;
|
|
543
|
-
final float x2 = innerTopRightCorner.x;
|
|
544
|
-
final float y2 = innerTopRightCorner.y - mGapBetweenPaths;
|
|
545
|
-
final float x3 = innerBottomRightCorner.x;
|
|
546
|
-
final float y3 = innerBottomRightCorner.y + mGapBetweenPaths;
|
|
547
|
-
final float x4 = right;
|
|
548
|
-
final float y4 = bottom + mGapBetweenPaths;
|
|
549
|
-
|
|
550
|
-
drawQuadrilateral(canvas, colorRight, x1, y1, x2, y2, x3, y3, x4, y4);
|
|
551
|
-
}
|
|
552
|
-
|
|
553
|
-
if (borderWidth.bottom > 0) {
|
|
554
|
-
final float x1 = left - mGapBetweenPaths;
|
|
555
|
-
final float y1 = bottom;
|
|
556
|
-
final float x2 = innerBottomLeftCorner.x - mGapBetweenPaths;
|
|
557
|
-
final float y2 = innerBottomLeftCorner.y;
|
|
558
|
-
final float x3 = innerBottomRightCorner.x + mGapBetweenPaths;
|
|
559
|
-
final float y3 = innerBottomRightCorner.y;
|
|
560
|
-
final float x4 = right + mGapBetweenPaths;
|
|
561
|
-
final float y4 = bottom;
|
|
562
|
-
|
|
563
|
-
drawQuadrilateral(canvas, colorBottom, x1, y1, x2, y2, x3, y3, x4, y4);
|
|
564
|
-
}
|
|
565
|
-
}
|
|
566
|
-
}
|
|
567
|
-
|
|
568
|
-
canvas.restore();
|
|
569
|
-
}
|
|
570
|
-
|
|
571
|
-
private void updatePath() {
|
|
572
|
-
if (!mNeedUpdatePathForBorderRadius) {
|
|
573
|
-
return;
|
|
574
|
-
}
|
|
575
|
-
|
|
576
|
-
mNeedUpdatePathForBorderRadius = false;
|
|
577
|
-
|
|
578
|
-
if (mInnerClipPathForBorderRadius == null) {
|
|
579
|
-
mInnerClipPathForBorderRadius = new Path();
|
|
580
|
-
}
|
|
581
|
-
|
|
582
|
-
if (mBackgroundColorRenderPath == null) {
|
|
583
|
-
mBackgroundColorRenderPath = new Path();
|
|
584
|
-
}
|
|
585
|
-
|
|
586
|
-
if (mOuterClipPathForBorderRadius == null) {
|
|
587
|
-
mOuterClipPathForBorderRadius = new Path();
|
|
588
|
-
}
|
|
589
|
-
|
|
590
|
-
if (mPathForBorderRadiusOutline == null) {
|
|
591
|
-
mPathForBorderRadiusOutline = new Path();
|
|
592
|
-
}
|
|
593
|
-
|
|
594
|
-
if (mCenterDrawPath == null) {
|
|
595
|
-
mCenterDrawPath = new Path();
|
|
596
|
-
}
|
|
597
|
-
|
|
598
|
-
if (mInnerClipTempRectForBorderRadius == null) {
|
|
599
|
-
mInnerClipTempRectForBorderRadius = new RectF();
|
|
600
|
-
}
|
|
601
|
-
|
|
602
|
-
if (mOuterClipTempRectForBorderRadius == null) {
|
|
603
|
-
mOuterClipTempRectForBorderRadius = new RectF();
|
|
604
|
-
}
|
|
605
|
-
|
|
606
|
-
if (mTempRectForBorderRadiusOutline == null) {
|
|
607
|
-
mTempRectForBorderRadiusOutline = new RectF();
|
|
608
|
-
}
|
|
609
|
-
|
|
610
|
-
if (mTempRectForCenterDrawPath == null) {
|
|
611
|
-
mTempRectForCenterDrawPath = new RectF();
|
|
612
|
-
}
|
|
613
|
-
|
|
614
|
-
mInnerClipPathForBorderRadius.reset();
|
|
615
|
-
mBackgroundColorRenderPath.reset();
|
|
616
|
-
mOuterClipPathForBorderRadius.reset();
|
|
617
|
-
mPathForBorderRadiusOutline.reset();
|
|
618
|
-
mCenterDrawPath.reset();
|
|
619
|
-
|
|
620
|
-
mInnerClipTempRectForBorderRadius.set(getBounds());
|
|
621
|
-
mOuterClipTempRectForBorderRadius.set(getBounds());
|
|
622
|
-
mTempRectForBorderRadiusOutline.set(getBounds());
|
|
623
|
-
mTempRectForCenterDrawPath.set(getBounds());
|
|
624
|
-
|
|
625
|
-
final RectF borderWidth = getDirectionAwareBorderInsets();
|
|
626
|
-
|
|
627
|
-
int colorLeft = getBorderColor(Spacing.LEFT);
|
|
628
|
-
int colorTop = getBorderColor(Spacing.TOP);
|
|
629
|
-
int colorRight = getBorderColor(Spacing.RIGHT);
|
|
630
|
-
int colorBottom = getBorderColor(Spacing.BOTTOM);
|
|
631
|
-
int borderColor = getBorderColor(Spacing.ALL);
|
|
632
|
-
|
|
633
|
-
int colorBlock = getBorderColor(Spacing.BLOCK);
|
|
634
|
-
int colorBlockStart = getBorderColor(Spacing.BLOCK_START);
|
|
635
|
-
int colorBlockEnd = getBorderColor(Spacing.BLOCK_END);
|
|
636
|
-
|
|
637
|
-
if (isBorderColorDefined(Spacing.BLOCK)) {
|
|
638
|
-
colorBottom = colorBlock;
|
|
639
|
-
colorTop = colorBlock;
|
|
640
|
-
}
|
|
641
|
-
if (isBorderColorDefined(Spacing.BLOCK_END)) {
|
|
642
|
-
colorBottom = colorBlockEnd;
|
|
643
|
-
}
|
|
644
|
-
if (isBorderColorDefined(Spacing.BLOCK_START)) {
|
|
645
|
-
colorTop = colorBlockStart;
|
|
646
|
-
}
|
|
647
|
-
|
|
648
|
-
// Clip border ONLY if at least one edge is non-transparent
|
|
649
|
-
if (Color.alpha(colorLeft) != 0
|
|
650
|
-
|| Color.alpha(colorTop) != 0
|
|
651
|
-
|| Color.alpha(colorRight) != 0
|
|
652
|
-
|| Color.alpha(colorBottom) != 0
|
|
653
|
-
|| Color.alpha(borderColor) != 0) {
|
|
654
|
-
|
|
655
|
-
mInnerClipTempRectForBorderRadius.top += borderWidth.top;
|
|
656
|
-
mInnerClipTempRectForBorderRadius.bottom -= borderWidth.bottom;
|
|
657
|
-
mInnerClipTempRectForBorderRadius.left += borderWidth.left;
|
|
658
|
-
mInnerClipTempRectForBorderRadius.right -= borderWidth.right;
|
|
659
|
-
}
|
|
660
|
-
|
|
661
|
-
mTempRectForCenterDrawPath.top += borderWidth.top * 0.5f;
|
|
662
|
-
mTempRectForCenterDrawPath.bottom -= borderWidth.bottom * 0.5f;
|
|
663
|
-
mTempRectForCenterDrawPath.left += borderWidth.left * 0.5f;
|
|
664
|
-
mTempRectForCenterDrawPath.right -= borderWidth.right * 0.5f;
|
|
665
|
-
|
|
666
|
-
mComputedBorderRadius =
|
|
667
|
-
mBorderRadius.resolve(
|
|
668
|
-
getLayoutDirection(),
|
|
669
|
-
mContext,
|
|
670
|
-
PixelUtil.toDIPFromPixel(mOuterClipTempRectForBorderRadius.width()),
|
|
671
|
-
PixelUtil.toDIPFromPixel(mOuterClipTempRectForBorderRadius.height()));
|
|
672
|
-
CornerRadii topLeftRadius = mComputedBorderRadius.getTopLeft().toPixelFromDIP();
|
|
673
|
-
CornerRadii topRightRadius = mComputedBorderRadius.getTopRight().toPixelFromDIP();
|
|
674
|
-
CornerRadii bottomLeftRadius = mComputedBorderRadius.getBottomLeft().toPixelFromDIP();
|
|
675
|
-
CornerRadii bottomRightRadius = mComputedBorderRadius.getBottomRight().toPixelFromDIP();
|
|
676
|
-
|
|
677
|
-
final float innerTopLeftRadiusX =
|
|
678
|
-
getInnerBorderRadius(topLeftRadius.getHorizontal(), borderWidth.left);
|
|
679
|
-
final float innerTopLeftRadiusY =
|
|
680
|
-
getInnerBorderRadius(topLeftRadius.getVertical(), borderWidth.top);
|
|
681
|
-
final float innerTopRightRadiusX =
|
|
682
|
-
getInnerBorderRadius(topRightRadius.getHorizontal(), borderWidth.right);
|
|
683
|
-
final float innerTopRightRadiusY =
|
|
684
|
-
getInnerBorderRadius(topRightRadius.getVertical(), borderWidth.top);
|
|
685
|
-
final float innerBottomRightRadiusX =
|
|
686
|
-
getInnerBorderRadius(bottomRightRadius.getHorizontal(), borderWidth.right);
|
|
687
|
-
final float innerBottomRightRadiusY =
|
|
688
|
-
getInnerBorderRadius(bottomRightRadius.getVertical(), borderWidth.bottom);
|
|
689
|
-
final float innerBottomLeftRadiusX =
|
|
690
|
-
getInnerBorderRadius(bottomLeftRadius.getHorizontal(), borderWidth.left);
|
|
691
|
-
final float innerBottomLeftRadiusY =
|
|
692
|
-
getInnerBorderRadius(bottomLeftRadius.getVertical(), borderWidth.bottom);
|
|
693
|
-
|
|
694
|
-
mInnerClipPathForBorderRadius.addRoundRect(
|
|
695
|
-
mInnerClipTempRectForBorderRadius,
|
|
696
|
-
new float[] {
|
|
697
|
-
innerTopLeftRadiusX,
|
|
698
|
-
innerTopLeftRadiusY,
|
|
699
|
-
innerTopRightRadiusX,
|
|
700
|
-
innerTopRightRadiusY,
|
|
701
|
-
innerBottomRightRadiusX,
|
|
702
|
-
innerBottomRightRadiusY,
|
|
703
|
-
innerBottomLeftRadiusX,
|
|
704
|
-
innerBottomLeftRadiusY,
|
|
705
|
-
},
|
|
706
|
-
Path.Direction.CW);
|
|
707
|
-
|
|
708
|
-
// There is a small gap between mBackgroundColorRenderPath and its
|
|
709
|
-
// border. mGapBetweenPaths is used to slightly enlarge the rectangle
|
|
710
|
-
// (mInnerClipTempRectForBorderRadius), ensuring the border can be
|
|
711
|
-
// drawn on top without the gap.
|
|
712
|
-
// only close gap between border and main path if we draw the border, otherwise
|
|
713
|
-
// we wind up pixelating small pixel-radius curves
|
|
714
|
-
mBackgroundColorRenderPath.addRoundRect(
|
|
715
|
-
(borderWidth.left > 0)
|
|
716
|
-
? mInnerClipTempRectForBorderRadius.left - mGapBetweenPaths
|
|
717
|
-
: mInnerClipTempRectForBorderRadius.left,
|
|
718
|
-
(borderWidth.top > 0)
|
|
719
|
-
? mInnerClipTempRectForBorderRadius.top - mGapBetweenPaths
|
|
720
|
-
: mInnerClipTempRectForBorderRadius.top,
|
|
721
|
-
(borderWidth.right > 0)
|
|
722
|
-
? mInnerClipTempRectForBorderRadius.right + mGapBetweenPaths
|
|
723
|
-
: mInnerClipTempRectForBorderRadius.right,
|
|
724
|
-
(borderWidth.bottom > 0)
|
|
725
|
-
? mInnerClipTempRectForBorderRadius.bottom + mGapBetweenPaths
|
|
726
|
-
: mInnerClipTempRectForBorderRadius.bottom,
|
|
727
|
-
new float[] {
|
|
728
|
-
innerTopLeftRadiusX,
|
|
729
|
-
innerTopLeftRadiusY,
|
|
730
|
-
innerTopRightRadiusX,
|
|
731
|
-
innerTopRightRadiusY,
|
|
732
|
-
innerBottomRightRadiusX,
|
|
733
|
-
innerBottomRightRadiusY,
|
|
734
|
-
innerBottomLeftRadiusX,
|
|
735
|
-
innerBottomLeftRadiusY,
|
|
736
|
-
},
|
|
737
|
-
Path.Direction.CW);
|
|
738
|
-
|
|
739
|
-
mOuterClipPathForBorderRadius.addRoundRect(
|
|
740
|
-
mOuterClipTempRectForBorderRadius,
|
|
741
|
-
new float[] {
|
|
742
|
-
topLeftRadius.getHorizontal(),
|
|
743
|
-
topLeftRadius.getVertical(),
|
|
744
|
-
topRightRadius.getHorizontal(),
|
|
745
|
-
topRightRadius.getVertical(),
|
|
746
|
-
bottomRightRadius.getHorizontal(),
|
|
747
|
-
bottomRightRadius.getVertical(),
|
|
748
|
-
bottomLeftRadius.getHorizontal(),
|
|
749
|
-
bottomLeftRadius.getVertical()
|
|
750
|
-
},
|
|
751
|
-
Path.Direction.CW);
|
|
752
|
-
|
|
753
|
-
float extraRadiusForOutline = 0;
|
|
754
|
-
|
|
755
|
-
if (mBorderWidth != null) {
|
|
756
|
-
extraRadiusForOutline = mBorderWidth.get(Spacing.ALL) / 2f;
|
|
757
|
-
}
|
|
758
|
-
|
|
759
|
-
mPathForBorderRadiusOutline.addRoundRect(
|
|
760
|
-
mTempRectForBorderRadiusOutline,
|
|
761
|
-
new float[] {
|
|
762
|
-
topLeftRadius.getHorizontal() + extraRadiusForOutline,
|
|
763
|
-
topLeftRadius.getVertical() + extraRadiusForOutline,
|
|
764
|
-
topRightRadius.getHorizontal() + extraRadiusForOutline,
|
|
765
|
-
topRightRadius.getVertical() + extraRadiusForOutline,
|
|
766
|
-
bottomRightRadius.getHorizontal() + extraRadiusForOutline,
|
|
767
|
-
bottomRightRadius.getVertical() + extraRadiusForOutline,
|
|
768
|
-
bottomLeftRadius.getHorizontal() + extraRadiusForOutline,
|
|
769
|
-
bottomLeftRadius.getVertical() + extraRadiusForOutline
|
|
770
|
-
},
|
|
771
|
-
Path.Direction.CW);
|
|
772
|
-
|
|
773
|
-
mCenterDrawPath.addRoundRect(
|
|
774
|
-
mTempRectForCenterDrawPath,
|
|
775
|
-
new float[] {
|
|
776
|
-
topLeftRadius.getHorizontal() - borderWidth.left * 0.5f,
|
|
777
|
-
topLeftRadius.getVertical() - borderWidth.top * 0.5f,
|
|
778
|
-
topRightRadius.getHorizontal() - borderWidth.right * 0.5f,
|
|
779
|
-
topRightRadius.getVertical() - borderWidth.top * 0.5f,
|
|
780
|
-
bottomRightRadius.getHorizontal() - borderWidth.right * 0.5f,
|
|
781
|
-
bottomRightRadius.getVertical() - borderWidth.bottom * 0.5f,
|
|
782
|
-
bottomLeftRadius.getHorizontal() - borderWidth.left * 0.5f,
|
|
783
|
-
bottomLeftRadius.getVertical() - borderWidth.bottom * 0.5f,
|
|
784
|
-
},
|
|
785
|
-
Path.Direction.CW);
|
|
786
|
-
|
|
787
|
-
/**
|
|
788
|
-
* Rounded Multi-Colored Border Algorithm:
|
|
789
|
-
*
|
|
790
|
-
* <p>Let O (for outer) = (top, left, bottom, right) be the rectangle that represents the size
|
|
791
|
-
* and position of a view V. Since the box-sizing of all React Native views is border-box, any
|
|
792
|
-
* border of V will render inside O.
|
|
793
|
-
*
|
|
794
|
-
* <p>Let BorderWidth = (borderTop, borderLeft, borderBottom, borderRight).
|
|
795
|
-
*
|
|
796
|
-
* <p>Let I (for inner) = O - BorderWidth.
|
|
797
|
-
*
|
|
798
|
-
* <p>Then, remembering that O and I are rectangles and that I is inside O, O - I gives us the
|
|
799
|
-
* border of V. Therefore, we can use canvas.clipPath to draw V's border.
|
|
800
|
-
*
|
|
801
|
-
* <p>canvas.clipPath(O, Region.OP.INTERSECT);
|
|
802
|
-
*
|
|
803
|
-
* <p>canvas.clipPath(I, Region.OP.DIFFERENCE);
|
|
804
|
-
*
|
|
805
|
-
* <p>canvas.drawRect(O, paint);
|
|
806
|
-
*
|
|
807
|
-
* <p>This lets us draw non-rounded single-color borders.
|
|
808
|
-
*
|
|
809
|
-
* <p>To extend this algorithm to rounded single-color borders, we:
|
|
810
|
-
*
|
|
811
|
-
* <p>1. Curve the corners of O by the (border radii of V) using Path#addRoundRect.
|
|
812
|
-
*
|
|
813
|
-
* <p>2. Curve the corners of I by (border radii of V - border widths of V) using
|
|
814
|
-
* Path#addRoundRect.
|
|
815
|
-
*
|
|
816
|
-
* <p>Let O' = curve(O, border radii of V).
|
|
817
|
-
*
|
|
818
|
-
* <p>Let I' = curve(I, border radii of V - border widths of V)
|
|
819
|
-
*
|
|
820
|
-
* <p>The rationale behind this decision is the (first sentence of the) following section in the
|
|
821
|
-
* CSS Backgrounds and Borders Module Level 3:
|
|
822
|
-
* https://www.w3.org/TR/css3-background/#the-border-radius.
|
|
823
|
-
*
|
|
824
|
-
* <p>After both O and I have been curved, we can execute the following lines once again to
|
|
825
|
-
* render curved single-color borders:
|
|
826
|
-
*
|
|
827
|
-
* <p>canvas.clipPath(O, Region.OP.INTERSECT);
|
|
828
|
-
*
|
|
829
|
-
* <p>canvas.clipPath(I, Region.OP.DIFFERENCE);
|
|
830
|
-
*
|
|
831
|
-
* <p>canvas.drawRect(O, paint);
|
|
832
|
-
*
|
|
833
|
-
* <p>To extend this algorithm to rendering multi-colored rounded borders, we render each side
|
|
834
|
-
* of the border as its own quadrilateral. Suppose that we were handling the case where all the
|
|
835
|
-
* border radii are 0. Then, the four quadrilaterals would be:
|
|
836
|
-
*
|
|
837
|
-
* <p>Left: (O.left, O.top), (I.left, I.top), (I.left, I.bottom), (O.left, O.bottom)
|
|
838
|
-
*
|
|
839
|
-
* <p>Top: (O.left, O.top), (I.left, I.top), (I.right, I.top), (O.right, O.top)
|
|
840
|
-
*
|
|
841
|
-
* <p>Right: (O.right, O.top), (I.right, I.top), (I.right, I.bottom), (O.right, O.bottom)
|
|
842
|
-
*
|
|
843
|
-
* <p>Bottom: (O.right, O.bottom), (I.right, I.bottom), (I.left, I.bottom), (O.left, O.bottom)
|
|
844
|
-
*
|
|
845
|
-
* <p>Now, lets consider what happens when we render a rounded border (radii != 0). For the sake
|
|
846
|
-
* of simplicity, let's focus on the top edge of the Left border:
|
|
847
|
-
*
|
|
848
|
-
* <p>Let borderTopLeftRadius = 5. Let borderLeftWidth = 1. Let borderTopWidth = 2.
|
|
849
|
-
*
|
|
850
|
-
* <p>We know that O is curved by the ellipse E_O (a = 5, b = 5). We know that I is curved by
|
|
851
|
-
* the ellipse E_I (a = 5 - 1, b = 5 - 2).
|
|
852
|
-
*
|
|
853
|
-
* <p>Since we have clipping, it should be safe to set the top-left point of the Left
|
|
854
|
-
* quadrilateral's top edge to (O.left, O.top).
|
|
855
|
-
*
|
|
856
|
-
* <p>But, what should the top-right point be?
|
|
857
|
-
*
|
|
858
|
-
* <p>The fact that the border is curved shouldn't change the slope (nor the position) of the
|
|
859
|
-
* line connecting the top-left and top-right points of the Left quadrilateral's top edge.
|
|
860
|
-
* Therefore, The top-right point should lie somewhere on the line L = (1 - a) * (O.left, O.top)
|
|
861
|
-
* + a * (I.left, I.top).
|
|
862
|
-
*
|
|
863
|
-
* <p>a != 0, because then the top-left and top-right points would be the same and
|
|
864
|
-
* borderLeftWidth = 1. a != 1, because then the top-right point would not touch an edge of the
|
|
865
|
-
* ellipse E_I. We want the top-right point to touch an edge of the inner ellipse because the
|
|
866
|
-
* border curves with E_I on the top-left corner of V.
|
|
867
|
-
*
|
|
868
|
-
* <p>Therefore, it must be the case that a > 1. Two natural locations of the top-right point
|
|
869
|
-
* exist: 1. The first intersection of L with E_I. 2. The second intersection of L with E_I.
|
|
870
|
-
*
|
|
871
|
-
* <p>We choose the top-right point of the top edge of the Left quadrilateral to be an arbitrary
|
|
872
|
-
* intersection of L with E_I.
|
|
873
|
-
*/
|
|
874
|
-
if (mInnerTopLeftCorner == null) {
|
|
875
|
-
mInnerTopLeftCorner = new PointF();
|
|
876
|
-
}
|
|
877
|
-
|
|
878
|
-
/** Compute mInnerTopLeftCorner */
|
|
879
|
-
mInnerTopLeftCorner.x = mInnerClipTempRectForBorderRadius.left;
|
|
880
|
-
mInnerTopLeftCorner.y = mInnerClipTempRectForBorderRadius.top;
|
|
881
|
-
|
|
882
|
-
getEllipseIntersectionWithLine(
|
|
883
|
-
// Ellipse Bounds
|
|
884
|
-
mInnerClipTempRectForBorderRadius.left,
|
|
885
|
-
mInnerClipTempRectForBorderRadius.top,
|
|
886
|
-
mInnerClipTempRectForBorderRadius.left + 2 * innerTopLeftRadiusX,
|
|
887
|
-
mInnerClipTempRectForBorderRadius.top + 2 * innerTopLeftRadiusY,
|
|
888
|
-
|
|
889
|
-
// Line Start
|
|
890
|
-
mOuterClipTempRectForBorderRadius.left,
|
|
891
|
-
mOuterClipTempRectForBorderRadius.top,
|
|
892
|
-
|
|
893
|
-
// Line End
|
|
894
|
-
mInnerClipTempRectForBorderRadius.left,
|
|
895
|
-
mInnerClipTempRectForBorderRadius.top,
|
|
896
|
-
|
|
897
|
-
// Result
|
|
898
|
-
mInnerTopLeftCorner);
|
|
899
|
-
|
|
900
|
-
/** Compute mInnerBottomLeftCorner */
|
|
901
|
-
if (mInnerBottomLeftCorner == null) {
|
|
902
|
-
mInnerBottomLeftCorner = new PointF();
|
|
903
|
-
}
|
|
904
|
-
|
|
905
|
-
mInnerBottomLeftCorner.x = mInnerClipTempRectForBorderRadius.left;
|
|
906
|
-
mInnerBottomLeftCorner.y = mInnerClipTempRectForBorderRadius.bottom;
|
|
907
|
-
|
|
908
|
-
getEllipseIntersectionWithLine(
|
|
909
|
-
// Ellipse Bounds
|
|
910
|
-
mInnerClipTempRectForBorderRadius.left,
|
|
911
|
-
mInnerClipTempRectForBorderRadius.bottom - 2 * innerBottomLeftRadiusY,
|
|
912
|
-
mInnerClipTempRectForBorderRadius.left + 2 * innerBottomLeftRadiusX,
|
|
913
|
-
mInnerClipTempRectForBorderRadius.bottom,
|
|
914
|
-
|
|
915
|
-
// Line Start
|
|
916
|
-
mOuterClipTempRectForBorderRadius.left,
|
|
917
|
-
mOuterClipTempRectForBorderRadius.bottom,
|
|
918
|
-
|
|
919
|
-
// Line End
|
|
920
|
-
mInnerClipTempRectForBorderRadius.left,
|
|
921
|
-
mInnerClipTempRectForBorderRadius.bottom,
|
|
922
|
-
|
|
923
|
-
// Result
|
|
924
|
-
mInnerBottomLeftCorner);
|
|
925
|
-
|
|
926
|
-
/** Compute mInnerTopRightCorner */
|
|
927
|
-
if (mInnerTopRightCorner == null) {
|
|
928
|
-
mInnerTopRightCorner = new PointF();
|
|
929
|
-
}
|
|
930
|
-
|
|
931
|
-
mInnerTopRightCorner.x = mInnerClipTempRectForBorderRadius.right;
|
|
932
|
-
mInnerTopRightCorner.y = mInnerClipTempRectForBorderRadius.top;
|
|
933
|
-
|
|
934
|
-
getEllipseIntersectionWithLine(
|
|
935
|
-
// Ellipse Bounds
|
|
936
|
-
mInnerClipTempRectForBorderRadius.right - 2 * innerTopRightRadiusX,
|
|
937
|
-
mInnerClipTempRectForBorderRadius.top,
|
|
938
|
-
mInnerClipTempRectForBorderRadius.right,
|
|
939
|
-
mInnerClipTempRectForBorderRadius.top + 2 * innerTopRightRadiusY,
|
|
940
|
-
|
|
941
|
-
// Line Start
|
|
942
|
-
mOuterClipTempRectForBorderRadius.right,
|
|
943
|
-
mOuterClipTempRectForBorderRadius.top,
|
|
944
|
-
|
|
945
|
-
// Line End
|
|
946
|
-
mInnerClipTempRectForBorderRadius.right,
|
|
947
|
-
mInnerClipTempRectForBorderRadius.top,
|
|
948
|
-
|
|
949
|
-
// Result
|
|
950
|
-
mInnerTopRightCorner);
|
|
951
|
-
|
|
952
|
-
/** Compute mInnerBottomRightCorner */
|
|
953
|
-
if (mInnerBottomRightCorner == null) {
|
|
954
|
-
mInnerBottomRightCorner = new PointF();
|
|
955
|
-
}
|
|
956
|
-
|
|
957
|
-
mInnerBottomRightCorner.x = mInnerClipTempRectForBorderRadius.right;
|
|
958
|
-
mInnerBottomRightCorner.y = mInnerClipTempRectForBorderRadius.bottom;
|
|
959
|
-
|
|
960
|
-
getEllipseIntersectionWithLine(
|
|
961
|
-
// Ellipse Bounds
|
|
962
|
-
mInnerClipTempRectForBorderRadius.right - 2 * innerBottomRightRadiusX,
|
|
963
|
-
mInnerClipTempRectForBorderRadius.bottom - 2 * innerBottomRightRadiusY,
|
|
964
|
-
mInnerClipTempRectForBorderRadius.right,
|
|
965
|
-
mInnerClipTempRectForBorderRadius.bottom,
|
|
966
|
-
|
|
967
|
-
// Line Start
|
|
968
|
-
mOuterClipTempRectForBorderRadius.right,
|
|
969
|
-
mOuterClipTempRectForBorderRadius.bottom,
|
|
970
|
-
|
|
971
|
-
// Line End
|
|
972
|
-
mInnerClipTempRectForBorderRadius.right,
|
|
973
|
-
mInnerClipTempRectForBorderRadius.bottom,
|
|
974
|
-
|
|
975
|
-
// Result
|
|
976
|
-
mInnerBottomRightCorner);
|
|
977
|
-
}
|
|
978
|
-
|
|
979
|
-
private static void getEllipseIntersectionWithLine(
|
|
980
|
-
double ellipseBoundsLeft,
|
|
981
|
-
double ellipseBoundsTop,
|
|
982
|
-
double ellipseBoundsRight,
|
|
983
|
-
double ellipseBoundsBottom,
|
|
984
|
-
double lineStartX,
|
|
985
|
-
double lineStartY,
|
|
986
|
-
double lineEndX,
|
|
987
|
-
double lineEndY,
|
|
988
|
-
PointF result) {
|
|
989
|
-
final double ellipseCenterX = (ellipseBoundsLeft + ellipseBoundsRight) / 2;
|
|
990
|
-
final double ellipseCenterY = (ellipseBoundsTop + ellipseBoundsBottom) / 2;
|
|
991
|
-
|
|
992
|
-
/**
|
|
993
|
-
* Step 1:
|
|
994
|
-
*
|
|
995
|
-
* <p>Translate the line so that the ellipse is at the origin.
|
|
996
|
-
*
|
|
997
|
-
* <p>Why? It makes the math easier by changing the ellipse equation from ((x -
|
|
998
|
-
* ellipseCenterX)/a)^2 + ((y - ellipseCenterY)/b)^2 = 1 to (x/a)^2 + (y/b)^2 = 1.
|
|
999
|
-
*/
|
|
1000
|
-
lineStartX -= ellipseCenterX;
|
|
1001
|
-
lineStartY -= ellipseCenterY;
|
|
1002
|
-
lineEndX -= ellipseCenterX;
|
|
1003
|
-
lineEndY -= ellipseCenterY;
|
|
1004
|
-
|
|
1005
|
-
/**
|
|
1006
|
-
* Step 2:
|
|
1007
|
-
*
|
|
1008
|
-
* <p>Ellipse equation: (x/a)^2 + (y/b)^2 = 1 Line equation: y = mx + c
|
|
1009
|
-
*/
|
|
1010
|
-
final double a = Math.abs(ellipseBoundsRight - ellipseBoundsLeft) / 2;
|
|
1011
|
-
final double b = Math.abs(ellipseBoundsBottom - ellipseBoundsTop) / 2;
|
|
1012
|
-
final double m = (lineEndY - lineStartY) / (lineEndX - lineStartX);
|
|
1013
|
-
final double c = lineStartY - m * lineStartX; // Just a point on the line
|
|
1014
|
-
|
|
1015
|
-
/**
|
|
1016
|
-
* Step 3:
|
|
1017
|
-
*
|
|
1018
|
-
* <p>Substitute the Line equation into the Ellipse equation. Solve for x. Eventually, you'll
|
|
1019
|
-
* have to use the quadratic formula.
|
|
1020
|
-
*
|
|
1021
|
-
* <p>Quadratic formula: Ax^2 + Bx + C = 0
|
|
1022
|
-
*/
|
|
1023
|
-
final double A = (b * b + a * a * m * m);
|
|
1024
|
-
final double B = 2 * a * a * c * m;
|
|
1025
|
-
final double C = (a * a * (c * c - b * b));
|
|
1026
|
-
|
|
1027
|
-
/**
|
|
1028
|
-
* Step 4:
|
|
1029
|
-
*
|
|
1030
|
-
* <p>Apply Quadratic formula. D = determinant / 2A
|
|
1031
|
-
*/
|
|
1032
|
-
final double D = Math.sqrt(-C / A + Math.pow(B / (2 * A), 2));
|
|
1033
|
-
final double x2 = -B / (2 * A) - D;
|
|
1034
|
-
final double y2 = m * x2 + c;
|
|
1035
|
-
|
|
1036
|
-
/**
|
|
1037
|
-
* Step 5:
|
|
1038
|
-
*
|
|
1039
|
-
* <p>Undo the space transformation in Step 5.
|
|
1040
|
-
*/
|
|
1041
|
-
final double x = x2 + ellipseCenterX;
|
|
1042
|
-
final double y = y2 + ellipseCenterY;
|
|
1043
|
-
|
|
1044
|
-
if (!Double.isNaN(x) && !Double.isNaN(y)) {
|
|
1045
|
-
result.x = (float) x;
|
|
1046
|
-
result.y = (float) y;
|
|
1047
|
-
}
|
|
1048
|
-
}
|
|
1049
|
-
|
|
1050
|
-
public float getBorderWidthOrDefaultTo(final float defaultValue, final int spacingType) {
|
|
1051
|
-
@Nullable Float width = getBorderWidth(spacingType);
|
|
1052
|
-
if (width == null) {
|
|
1053
|
-
return defaultValue;
|
|
1054
|
-
}
|
|
1055
|
-
|
|
1056
|
-
return width;
|
|
1057
|
-
}
|
|
1058
|
-
|
|
1059
|
-
public @Nullable Float getBorderWidth(int spacingType) {
|
|
1060
|
-
if (mBorderWidth == null) {
|
|
1061
|
-
return null;
|
|
1062
|
-
}
|
|
1063
|
-
|
|
1064
|
-
final float width = mBorderWidth.getRaw(spacingType);
|
|
1065
|
-
|
|
1066
|
-
if (Float.isNaN(width)) {
|
|
1067
|
-
return null;
|
|
1068
|
-
}
|
|
1069
|
-
|
|
1070
|
-
return width;
|
|
1071
|
-
}
|
|
1072
|
-
|
|
1073
|
-
/** Set type of border */
|
|
1074
|
-
private void updatePathEffect() {
|
|
1075
|
-
// Used for rounded border and rounded background
|
|
1076
|
-
PathEffect mPathEffectForBorderStyle =
|
|
1077
|
-
mBorderStyle != null ? getPathEffect(mBorderStyle, getFullBorderWidth()) : null;
|
|
1078
|
-
|
|
1079
|
-
mPaint.setPathEffect(mPathEffectForBorderStyle);
|
|
1080
|
-
}
|
|
1081
|
-
|
|
1082
|
-
private void updatePathEffect(int borderWidth) {
|
|
1083
|
-
PathEffect pathEffectForBorderStyle = null;
|
|
1084
|
-
if (mBorderStyle != null) {
|
|
1085
|
-
pathEffectForBorderStyle = getPathEffect(mBorderStyle, borderWidth);
|
|
1086
|
-
}
|
|
1087
|
-
mPaint.setPathEffect(pathEffectForBorderStyle);
|
|
1088
|
-
}
|
|
1089
|
-
|
|
1090
|
-
/** For rounded borders we use default "borderWidth" property. */
|
|
1091
|
-
public float getFullBorderWidth() {
|
|
1092
|
-
return (mBorderWidth != null && !Float.isNaN(mBorderWidth.getRaw(Spacing.ALL)))
|
|
1093
|
-
? mBorderWidth.getRaw(Spacing.ALL)
|
|
1094
|
-
: 0f;
|
|
1095
|
-
}
|
|
1096
|
-
|
|
1097
|
-
/**
|
|
1098
|
-
* Quickly determine if all the set border colors are equal. Bitwise AND all the set colors
|
|
1099
|
-
* together, then OR them all together. If the AND and the OR are the same, then the colors are
|
|
1100
|
-
* compatible, so return this color.
|
|
1101
|
-
*
|
|
1102
|
-
* <p>Used to avoid expensive path creation and expensive calls to canvas.drawPath
|
|
1103
|
-
*
|
|
1104
|
-
* @return A compatible border color, or zero if the border colors are not compatible.
|
|
1105
|
-
*/
|
|
1106
|
-
private static int fastBorderCompatibleColorOrZero(
|
|
1107
|
-
int borderLeft,
|
|
1108
|
-
int borderTop,
|
|
1109
|
-
int borderRight,
|
|
1110
|
-
int borderBottom,
|
|
1111
|
-
int colorLeft,
|
|
1112
|
-
int colorTop,
|
|
1113
|
-
int colorRight,
|
|
1114
|
-
int colorBottom) {
|
|
1115
|
-
int andSmear =
|
|
1116
|
-
(borderLeft > 0 ? colorLeft : ALL_BITS_SET)
|
|
1117
|
-
& (borderTop > 0 ? colorTop : ALL_BITS_SET)
|
|
1118
|
-
& (borderRight > 0 ? colorRight : ALL_BITS_SET)
|
|
1119
|
-
& (borderBottom > 0 ? colorBottom : ALL_BITS_SET);
|
|
1120
|
-
int orSmear =
|
|
1121
|
-
(borderLeft > 0 ? colorLeft : ALL_BITS_UNSET)
|
|
1122
|
-
| (borderTop > 0 ? colorTop : ALL_BITS_UNSET)
|
|
1123
|
-
| (borderRight > 0 ? colorRight : ALL_BITS_UNSET)
|
|
1124
|
-
| (borderBottom > 0 ? colorBottom : ALL_BITS_UNSET);
|
|
1125
|
-
return andSmear == orSmear ? andSmear : 0;
|
|
1126
|
-
}
|
|
1127
|
-
|
|
1128
|
-
private void drawRectangularBackgroundWithBorders(Canvas canvas) {
|
|
1129
|
-
mPaint.setStyle(Paint.Style.FILL);
|
|
1130
|
-
|
|
1131
|
-
int useColor = multiplyColorAlpha(mColor, mAlpha);
|
|
1132
|
-
if (Color.alpha(useColor) != 0) {
|
|
1133
|
-
mPaint.setColor(useColor);
|
|
1134
|
-
canvas.drawRect(getBounds(), mPaint);
|
|
1135
|
-
}
|
|
1136
|
-
|
|
1137
|
-
if (mBackgroundImageLayers != null && !mBackgroundImageLayers.isEmpty()) {
|
|
1138
|
-
mPaint.setShader(getBackgroundImageShader());
|
|
1139
|
-
canvas.drawRect(getBounds(), mPaint);
|
|
1140
|
-
mPaint.setShader(null);
|
|
1141
|
-
}
|
|
1142
|
-
|
|
1143
|
-
final RectF borderWidth = getDirectionAwareBorderInsets();
|
|
1144
|
-
|
|
1145
|
-
final int borderLeft = Math.round(borderWidth.left);
|
|
1146
|
-
final int borderTop = Math.round(borderWidth.top);
|
|
1147
|
-
final int borderRight = Math.round(borderWidth.right);
|
|
1148
|
-
final int borderBottom = Math.round(borderWidth.bottom);
|
|
1149
|
-
|
|
1150
|
-
// maybe draw borders?
|
|
1151
|
-
if (borderLeft > 0 || borderRight > 0 || borderTop > 0 || borderBottom > 0) {
|
|
1152
|
-
Rect bounds = getBounds();
|
|
1153
|
-
|
|
1154
|
-
int colorLeft = getBorderColor(Spacing.LEFT);
|
|
1155
|
-
int colorTop = getBorderColor(Spacing.TOP);
|
|
1156
|
-
int colorRight = getBorderColor(Spacing.RIGHT);
|
|
1157
|
-
int colorBottom = getBorderColor(Spacing.BOTTOM);
|
|
1158
|
-
|
|
1159
|
-
int colorBlock = getBorderColor(Spacing.BLOCK);
|
|
1160
|
-
int colorBlockStart = getBorderColor(Spacing.BLOCK_START);
|
|
1161
|
-
int colorBlockEnd = getBorderColor(Spacing.BLOCK_END);
|
|
1162
|
-
|
|
1163
|
-
if (isBorderColorDefined(Spacing.BLOCK)) {
|
|
1164
|
-
colorBottom = colorBlock;
|
|
1165
|
-
colorTop = colorBlock;
|
|
1166
|
-
}
|
|
1167
|
-
if (isBorderColorDefined(Spacing.BLOCK_END)) {
|
|
1168
|
-
colorBottom = colorBlockEnd;
|
|
1169
|
-
}
|
|
1170
|
-
if (isBorderColorDefined(Spacing.BLOCK_START)) {
|
|
1171
|
-
colorTop = colorBlockStart;
|
|
1172
|
-
}
|
|
1173
|
-
|
|
1174
|
-
final boolean isRTL = getLayoutDirection() == View.LAYOUT_DIRECTION_RTL;
|
|
1175
|
-
int colorStart = getBorderColor(Spacing.START);
|
|
1176
|
-
int colorEnd = getBorderColor(Spacing.END);
|
|
1177
|
-
|
|
1178
|
-
if (I18nUtil.getInstance().doLeftAndRightSwapInRTL(mContext)) {
|
|
1179
|
-
if (!isBorderColorDefined(Spacing.START)) {
|
|
1180
|
-
colorStart = colorLeft;
|
|
1181
|
-
}
|
|
1182
|
-
|
|
1183
|
-
if (!isBorderColorDefined(Spacing.END)) {
|
|
1184
|
-
colorEnd = colorRight;
|
|
1185
|
-
}
|
|
1186
|
-
|
|
1187
|
-
final int directionAwareColorLeft = isRTL ? colorEnd : colorStart;
|
|
1188
|
-
final int directionAwareColorRight = isRTL ? colorStart : colorEnd;
|
|
1189
|
-
|
|
1190
|
-
colorLeft = directionAwareColorLeft;
|
|
1191
|
-
colorRight = directionAwareColorRight;
|
|
1192
|
-
} else {
|
|
1193
|
-
final int directionAwareColorLeft = isRTL ? colorEnd : colorStart;
|
|
1194
|
-
final int directionAwareColorRight = isRTL ? colorStart : colorEnd;
|
|
1195
|
-
|
|
1196
|
-
final boolean isColorStartDefined = isBorderColorDefined(Spacing.START);
|
|
1197
|
-
final boolean isColorEndDefined = isBorderColorDefined(Spacing.END);
|
|
1198
|
-
final boolean isDirectionAwareColorLeftDefined =
|
|
1199
|
-
isRTL ? isColorEndDefined : isColorStartDefined;
|
|
1200
|
-
final boolean isDirectionAwareColorRightDefined =
|
|
1201
|
-
isRTL ? isColorStartDefined : isColorEndDefined;
|
|
1202
|
-
|
|
1203
|
-
if (isDirectionAwareColorLeftDefined) {
|
|
1204
|
-
colorLeft = directionAwareColorLeft;
|
|
1205
|
-
}
|
|
1206
|
-
|
|
1207
|
-
if (isDirectionAwareColorRightDefined) {
|
|
1208
|
-
colorRight = directionAwareColorRight;
|
|
1209
|
-
}
|
|
1210
|
-
}
|
|
1211
|
-
|
|
1212
|
-
int left = bounds.left;
|
|
1213
|
-
int top = bounds.top;
|
|
1214
|
-
|
|
1215
|
-
// Check for fast path to border drawing.
|
|
1216
|
-
int fastBorderColor =
|
|
1217
|
-
fastBorderCompatibleColorOrZero(
|
|
1218
|
-
borderLeft,
|
|
1219
|
-
borderTop,
|
|
1220
|
-
borderRight,
|
|
1221
|
-
borderBottom,
|
|
1222
|
-
colorLeft,
|
|
1223
|
-
colorTop,
|
|
1224
|
-
colorRight,
|
|
1225
|
-
colorBottom);
|
|
1226
|
-
|
|
1227
|
-
if (fastBorderColor != 0) {
|
|
1228
|
-
if (Color.alpha(fastBorderColor) != 0) {
|
|
1229
|
-
// Border color is not transparent.
|
|
1230
|
-
int right = bounds.right;
|
|
1231
|
-
int bottom = bounds.bottom;
|
|
1232
|
-
|
|
1233
|
-
mPaint.setColor(fastBorderColor);
|
|
1234
|
-
mPaint.setStyle(Paint.Style.STROKE);
|
|
1235
|
-
if (borderLeft > 0) {
|
|
1236
|
-
mPathForSingleBorder.reset();
|
|
1237
|
-
int width = Math.round(borderWidth.left);
|
|
1238
|
-
updatePathEffect(width);
|
|
1239
|
-
mPaint.setStrokeWidth(width);
|
|
1240
|
-
mPathForSingleBorder.moveTo(left + width / 2, top);
|
|
1241
|
-
mPathForSingleBorder.lineTo(left + width / 2, bottom);
|
|
1242
|
-
canvas.drawPath(mPathForSingleBorder, mPaint);
|
|
1243
|
-
}
|
|
1244
|
-
if (borderTop > 0) {
|
|
1245
|
-
mPathForSingleBorder.reset();
|
|
1246
|
-
int width = Math.round(borderWidth.top);
|
|
1247
|
-
updatePathEffect(width);
|
|
1248
|
-
mPaint.setStrokeWidth(width);
|
|
1249
|
-
mPathForSingleBorder.moveTo(left, top + width / 2);
|
|
1250
|
-
mPathForSingleBorder.lineTo(right, top + width / 2);
|
|
1251
|
-
canvas.drawPath(mPathForSingleBorder, mPaint);
|
|
1252
|
-
}
|
|
1253
|
-
if (borderRight > 0) {
|
|
1254
|
-
mPathForSingleBorder.reset();
|
|
1255
|
-
int width = Math.round(borderWidth.right);
|
|
1256
|
-
updatePathEffect(width);
|
|
1257
|
-
mPaint.setStrokeWidth(width);
|
|
1258
|
-
mPathForSingleBorder.moveTo(right - width / 2, top);
|
|
1259
|
-
mPathForSingleBorder.lineTo(right - width / 2, bottom);
|
|
1260
|
-
canvas.drawPath(mPathForSingleBorder, mPaint);
|
|
1261
|
-
}
|
|
1262
|
-
if (borderBottom > 0) {
|
|
1263
|
-
mPathForSingleBorder.reset();
|
|
1264
|
-
int width = Math.round(borderWidth.bottom);
|
|
1265
|
-
updatePathEffect(width);
|
|
1266
|
-
mPaint.setStrokeWidth(width);
|
|
1267
|
-
mPathForSingleBorder.moveTo(left, bottom - width / 2);
|
|
1268
|
-
mPathForSingleBorder.lineTo(right, bottom - width / 2);
|
|
1269
|
-
canvas.drawPath(mPathForSingleBorder, mPaint);
|
|
1270
|
-
}
|
|
1271
|
-
}
|
|
1272
|
-
} else {
|
|
1273
|
-
// If the path drawn previously is of the same color,
|
|
1274
|
-
// there would be a slight white space between borders
|
|
1275
|
-
// with anti-alias set to true.
|
|
1276
|
-
// Therefore we need to disable anti-alias, and
|
|
1277
|
-
// after drawing is done, we will re-enable it.
|
|
1278
|
-
|
|
1279
|
-
mPaint.setAntiAlias(false);
|
|
1280
|
-
|
|
1281
|
-
int width = bounds.width();
|
|
1282
|
-
int height = bounds.height();
|
|
1283
|
-
|
|
1284
|
-
if (borderLeft > 0) {
|
|
1285
|
-
final float x1 = left;
|
|
1286
|
-
final float y1 = top;
|
|
1287
|
-
final float x2 = left + borderLeft;
|
|
1288
|
-
final float y2 = top + borderTop;
|
|
1289
|
-
final float x3 = left + borderLeft;
|
|
1290
|
-
final float y3 = top + height - borderBottom;
|
|
1291
|
-
final float x4 = left;
|
|
1292
|
-
final float y4 = top + height;
|
|
1293
|
-
|
|
1294
|
-
drawQuadrilateral(canvas, colorLeft, x1, y1, x2, y2, x3, y3, x4, y4);
|
|
1295
|
-
}
|
|
1296
|
-
|
|
1297
|
-
if (borderTop > 0) {
|
|
1298
|
-
final float x1 = left;
|
|
1299
|
-
final float y1 = top;
|
|
1300
|
-
final float x2 = left + borderLeft;
|
|
1301
|
-
final float y2 = top + borderTop;
|
|
1302
|
-
final float x3 = left + width - borderRight;
|
|
1303
|
-
final float y3 = top + borderTop;
|
|
1304
|
-
final float x4 = left + width;
|
|
1305
|
-
final float y4 = top;
|
|
1306
|
-
|
|
1307
|
-
drawQuadrilateral(canvas, colorTop, x1, y1, x2, y2, x3, y3, x4, y4);
|
|
1308
|
-
}
|
|
1309
|
-
|
|
1310
|
-
if (borderRight > 0) {
|
|
1311
|
-
final float x1 = left + width;
|
|
1312
|
-
final float y1 = top;
|
|
1313
|
-
final float x2 = left + width;
|
|
1314
|
-
final float y2 = top + height;
|
|
1315
|
-
final float x3 = left + width - borderRight;
|
|
1316
|
-
final float y3 = top + height - borderBottom;
|
|
1317
|
-
final float x4 = left + width - borderRight;
|
|
1318
|
-
final float y4 = top + borderTop;
|
|
1319
|
-
|
|
1320
|
-
drawQuadrilateral(canvas, colorRight, x1, y1, x2, y2, x3, y3, x4, y4);
|
|
1321
|
-
}
|
|
1322
|
-
|
|
1323
|
-
if (borderBottom > 0) {
|
|
1324
|
-
final float x1 = left;
|
|
1325
|
-
final float y1 = top + height;
|
|
1326
|
-
final float x2 = left + width;
|
|
1327
|
-
final float y2 = top + height;
|
|
1328
|
-
final float x3 = left + width - borderRight;
|
|
1329
|
-
final float y3 = top + height - borderBottom;
|
|
1330
|
-
final float x4 = left + borderLeft;
|
|
1331
|
-
final float y4 = top + height - borderBottom;
|
|
1332
|
-
|
|
1333
|
-
drawQuadrilateral(canvas, colorBottom, x1, y1, x2, y2, x3, y3, x4, y4);
|
|
1334
|
-
}
|
|
1335
|
-
|
|
1336
|
-
// re-enable anti alias
|
|
1337
|
-
mPaint.setAntiAlias(true);
|
|
1338
|
-
}
|
|
1339
|
-
}
|
|
1340
|
-
}
|
|
1341
|
-
|
|
1342
|
-
private void drawQuadrilateral(
|
|
1343
|
-
Canvas canvas,
|
|
1344
|
-
int fillColor,
|
|
1345
|
-
float x1,
|
|
1346
|
-
float y1,
|
|
1347
|
-
float x2,
|
|
1348
|
-
float y2,
|
|
1349
|
-
float x3,
|
|
1350
|
-
float y3,
|
|
1351
|
-
float x4,
|
|
1352
|
-
float y4) {
|
|
1353
|
-
if (fillColor == Color.TRANSPARENT) {
|
|
1354
|
-
return;
|
|
1355
|
-
}
|
|
1356
|
-
|
|
1357
|
-
if (mPathForBorder == null) {
|
|
1358
|
-
mPathForBorder = new Path();
|
|
1359
|
-
}
|
|
1360
|
-
|
|
1361
|
-
mPaint.setColor(fillColor);
|
|
1362
|
-
mPathForBorder.reset();
|
|
1363
|
-
mPathForBorder.moveTo(x1, y1);
|
|
1364
|
-
mPathForBorder.lineTo(x2, y2);
|
|
1365
|
-
mPathForBorder.lineTo(x3, y3);
|
|
1366
|
-
mPathForBorder.lineTo(x4, y4);
|
|
1367
|
-
mPathForBorder.lineTo(x1, y1);
|
|
1368
|
-
canvas.drawPath(mPathForBorder, mPaint);
|
|
1369
|
-
}
|
|
1370
|
-
|
|
1371
|
-
private static int colorFromAlphaAndRGBComponents(float alpha, float rgb) {
|
|
1372
|
-
int rgbComponent = 0x00FFFFFF & (int) rgb;
|
|
1373
|
-
int alphaComponent = 0xFF000000 & ((int) alpha) << 24;
|
|
1374
|
-
|
|
1375
|
-
return rgbComponent | alphaComponent;
|
|
1376
|
-
}
|
|
1377
|
-
|
|
1378
|
-
private boolean isBorderColorDefined(int position) {
|
|
1379
|
-
final float rgb = mBorderRGB != null ? mBorderRGB.get(position) : Float.NaN;
|
|
1380
|
-
final float alpha = mBorderAlpha != null ? mBorderAlpha.get(position) : Float.NaN;
|
|
1381
|
-
return !Float.isNaN(rgb) && !Float.isNaN(alpha);
|
|
1382
|
-
}
|
|
1383
|
-
|
|
1384
|
-
public int getBorderColor(int position) {
|
|
1385
|
-
float rgb = mBorderRGB != null ? mBorderRGB.get(position) : DEFAULT_BORDER_RGB;
|
|
1386
|
-
float alpha = mBorderAlpha != null ? mBorderAlpha.get(position) : DEFAULT_BORDER_ALPHA;
|
|
1387
|
-
|
|
1388
|
-
return CSSBackgroundDrawable.colorFromAlphaAndRGBComponents(alpha, rgb);
|
|
1389
|
-
}
|
|
1390
|
-
|
|
1391
|
-
public RectF getDirectionAwareBorderInsets() {
|
|
1392
|
-
final float borderWidth = getBorderWidthOrDefaultTo(0, Spacing.ALL);
|
|
1393
|
-
final float borderTopWidth = getBorderWidthOrDefaultTo(borderWidth, Spacing.TOP);
|
|
1394
|
-
final float borderBottomWidth = getBorderWidthOrDefaultTo(borderWidth, Spacing.BOTTOM);
|
|
1395
|
-
float borderLeftWidth = getBorderWidthOrDefaultTo(borderWidth, Spacing.LEFT);
|
|
1396
|
-
float borderRightWidth = getBorderWidthOrDefaultTo(borderWidth, Spacing.RIGHT);
|
|
1397
|
-
|
|
1398
|
-
if (mBorderWidth != null) {
|
|
1399
|
-
final boolean isRTL = getLayoutDirection() == View.LAYOUT_DIRECTION_RTL;
|
|
1400
|
-
float borderStartWidth = mBorderWidth.getRaw(Spacing.START);
|
|
1401
|
-
float borderEndWidth = mBorderWidth.getRaw(Spacing.END);
|
|
1402
|
-
|
|
1403
|
-
if (I18nUtil.getInstance().doLeftAndRightSwapInRTL(mContext)) {
|
|
1404
|
-
if (Float.isNaN(borderStartWidth)) {
|
|
1405
|
-
borderStartWidth = borderLeftWidth;
|
|
1406
|
-
}
|
|
1407
|
-
|
|
1408
|
-
if (Float.isNaN(borderEndWidth)) {
|
|
1409
|
-
borderEndWidth = borderRightWidth;
|
|
1410
|
-
}
|
|
1411
|
-
|
|
1412
|
-
final float directionAwareBorderLeftWidth = isRTL ? borderEndWidth : borderStartWidth;
|
|
1413
|
-
final float directionAwareBorderRightWidth = isRTL ? borderStartWidth : borderEndWidth;
|
|
1414
|
-
|
|
1415
|
-
borderLeftWidth = directionAwareBorderLeftWidth;
|
|
1416
|
-
borderRightWidth = directionAwareBorderRightWidth;
|
|
1417
|
-
} else {
|
|
1418
|
-
final float directionAwareBorderLeftWidth = isRTL ? borderEndWidth : borderStartWidth;
|
|
1419
|
-
final float directionAwareBorderRightWidth = isRTL ? borderStartWidth : borderEndWidth;
|
|
1420
|
-
|
|
1421
|
-
if (!Float.isNaN(directionAwareBorderLeftWidth)) {
|
|
1422
|
-
borderLeftWidth = directionAwareBorderLeftWidth;
|
|
1423
|
-
}
|
|
1424
|
-
|
|
1425
|
-
if (!Float.isNaN(directionAwareBorderRightWidth)) {
|
|
1426
|
-
borderRightWidth = directionAwareBorderRightWidth;
|
|
1427
|
-
}
|
|
1428
|
-
}
|
|
1429
|
-
}
|
|
1430
|
-
|
|
1431
|
-
return new RectF(borderLeftWidth, borderTopWidth, borderRightWidth, borderBottomWidth);
|
|
1432
|
-
}
|
|
1433
|
-
|
|
1434
|
-
private @Nullable Shader getBackgroundImageShader() {
|
|
1435
|
-
if (mBackgroundImageLayers == null) {
|
|
1436
|
-
return null;
|
|
1437
|
-
}
|
|
1438
|
-
|
|
1439
|
-
Shader compositeShader = null;
|
|
1440
|
-
for (BackgroundImageLayer backgroundImageLayer : mBackgroundImageLayers) {
|
|
1441
|
-
Shader currentShader = backgroundImageLayer.getShader(getBounds());
|
|
1442
|
-
if (currentShader == null) {
|
|
1443
|
-
continue;
|
|
1444
|
-
}
|
|
1445
|
-
if (compositeShader == null) {
|
|
1446
|
-
compositeShader = currentShader;
|
|
1447
|
-
} else {
|
|
1448
|
-
compositeShader =
|
|
1449
|
-
new ComposeShader(currentShader, compositeShader, PorterDuff.Mode.SRC_OVER);
|
|
1450
|
-
}
|
|
1451
|
-
}
|
|
1452
|
-
return compositeShader;
|
|
1453
|
-
}
|
|
1454
|
-
|
|
1455
|
-
/**
|
|
1456
|
-
* Multiplies the color with the given alpha.
|
|
1457
|
-
*
|
|
1458
|
-
* @param color color to be multiplied
|
|
1459
|
-
* @param alpha value between 0 and 255
|
|
1460
|
-
* @return multiplied color
|
|
1461
|
-
*/
|
|
1462
|
-
private static int multiplyColorAlpha(int color, int alpha) {
|
|
1463
|
-
if (alpha == 255) {
|
|
1464
|
-
return color;
|
|
1465
|
-
}
|
|
1466
|
-
if (alpha == 0) {
|
|
1467
|
-
return color & 0x00FFFFFF;
|
|
1468
|
-
}
|
|
1469
|
-
alpha = alpha + (alpha >> 7); // make it 0..256
|
|
1470
|
-
int colorAlpha = color >>> 24;
|
|
1471
|
-
int multipliedAlpha = colorAlpha * alpha >> 8;
|
|
1472
|
-
return (multipliedAlpha << 24) | (color & 0x00FFFFFF);
|
|
1473
|
-
}
|
|
1474
|
-
}
|