From 01d49122dc8cc9481484a0c36677e48ae1331f53 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nivaldo=20Bondan=C3=A7a?= Date: Wed, 13 Aug 2025 19:14:21 -0700 Subject: [PATCH] Codemod format for trailing commas incoming change [5/n] Summary: X-link: https://github.com/facebook/yoga/pull/1847 Adding trailing commas. Differential Revision: D80174965 --- .../kotlin/com/facebook/react/ReactPlugin.kt | 157 ++++++------ .../facebook/react/tasks/BundleHermesCTask.kt | 16 +- .../tasks/GenerateCodegenArtifactsTask.kt | 3 +- .../react/tasks/GeneratePackageListTask.kt | 4 +- .../react/tasks/internal/PrepareBoostTask.kt | 3 +- .../react/tasks/internal/PrepareGflagsTask.kt | 6 +- .../react/tasks/internal/PrepareGlogTask.kt | 9 +- .../utils/PrefabPreprocessingEntry.kt | 2 +- .../react/utils/AgpConfiguratorUtils.kt | 15 +- .../facebook/react/utils/DependencyUtils.kt | 20 +- .../react/utils/NdkConfiguratorUtils.kt | 7 +- .../com/facebook/react/utils/PathUtils.kt | 13 +- .../com/facebook/react/ReactExtensionTest.kt | 6 +- .../ModelAutolinkingDependenciesJsonTest.kt | 5 +- .../react/tasks/BundleHermesCTaskTest.kt | 27 ++- ...AutolinkingNewArchitecturesFileTaskTest.kt | 15 +- .../tasks/GeneratePackageListTaskTest.kt | 24 +- .../tasks/internal/PrepareGflagsTaskTest.kt | 3 +- .../internal/PreparePrefabHeadersTaskTest.kt | 14 +- .../utils/PrefabPreprocessingEntryTest.kt | 4 +- .../com/facebook/react/tests/TaskTestUtils.kt | 2 +- .../react/utils/DependencyUtilsTest.kt | 12 +- .../com/facebook/react/utils/PathUtilsTest.kt | 6 +- .../facebook/react/utils/ProjectUtilsTest.kt | 4 +- .../facebook/react/ReactSettingsExtension.kt | 2 +- .../kotlin/com/facebook/react/tests/WithOs.kt | 2 +- .../ModelAutolinkingAndroidProjectJson.kt | 2 +- .../model/ModelAutolinkingDependenciesJson.kt | 2 +- ...olinkingDependenciesPlatformAndroidJson.kt | 2 +- .../com/facebook/react/utils/TaskUtils.kt | 2 +- .../react/popupmenu/PopupMenuPackage.kt | 2 +- .../react/popupmenu/ReactPopupMenuManager.kt | 3 +- .../debug/tags/ReactDebugOverlayTags.kt | 3 +- .../hermes/reactexecutor/HermesExecutor.kt | 4 +- .../com/facebook/react/BaseReactPackage.kt | 4 +- .../com/facebook/react/CoreModulesPackage.kt | 31 ++- .../com/facebook/react/DebugCorePackage.kt | 4 +- .../facebook/react/HeadlessJsTaskService.kt | 4 +- .../facebook/react/MemoryPressureRouter.kt | 4 +- .../react/NativeModuleRegistryBuilder.kt | 12 +- .../com/facebook/react/ReactApplication.kt | 3 +- .../java/com/facebook/react/ReactDelegate.kt | 16 +- .../java/com/facebook/react/ReactFragment.kt | 18 +- .../main/java/com/facebook/react/ReactHost.kt | 6 +- .../react/ReactInstanceManagerBuilder.kt | 17 +- .../com/facebook/react/ReactPackageHelper.kt | 5 +- .../ReactPackageTurboModuleManagerDelegate.kt | 14 +- .../com/facebook/react/TurboReactPackage.kt | 3 +- .../react/ViewManagerOnDemandReactPackage.kt | 2 +- .../react/animated/AdditionAnimatedNode.kt | 5 +- .../react/animated/ColorAnimatedNode.kt | 2 +- .../react/animated/DiffClampAnimatedNode.kt | 2 +- .../react/animated/DivisionAnimatedNode.kt | 2 +- .../react/animated/EventAnimationDriver.kt | 12 +- .../animated/InterpolationAnimatedNode.kt | 20 +- .../react/animated/ModulusAnimatedNode.kt | 2 +- .../animated/MultiplicationAnimatedNode.kt | 2 +- .../react/animated/NativeAnimatedModule.kt | 95 +++++--- .../animated/NativeAnimatedNodesManager.kt | 9 +- .../react/animated/ObjectAnimatedNode.kt | 2 +- .../react/animated/PropsAnimatedNode.kt | 2 +- .../react/animated/StyleAnimatedNode.kt | 2 +- .../react/animated/SubtractionAnimatedNode.kt | 2 +- .../react/animated/TrackingAnimatedNode.kt | 2 +- .../react/animated/TransformAnimatedNode.kt | 2 +- .../react/bridge/BaseActivityEventListener.kt | 5 +- .../com/facebook/react/bridge/CallbackImpl.kt | 7 +- .../react/bridge/CxxModuleWrapperBase.kt | 4 +- .../facebook/react/bridge/JSBundleLoader.kt | 8 +- .../react/bridge/JSBundleLoaderDelegate.kt | 2 +- .../react/bridge/JavaMethodWrapper.kt | 52 ++-- .../react/bridge/JavaModuleWrapper.kt | 2 +- .../react/bridge/JavaScriptModuleRegistry.kt | 7 +- .../com/facebook/react/bridge/ModuleHolder.kt | 13 +- .../com/facebook/react/bridge/ModuleSpec.kt | 9 +- .../bridge/NativeArgumentsParseException.kt | 7 +- .../react/bridge/NativeModuleRegistry.kt | 13 +- .../react/bridge/OnBatchCompleteListener.kt | 3 +- .../java/com/facebook/react/bridge/Promise.kt | 3 +- .../com/facebook/react/bridge/PromiseImpl.kt | 2 +- .../bridge/ReactContextBaseJavaModule.kt | 3 +- .../react/bridge/ReactCxxErrorHandler.kt | 7 +- .../ReactInstanceManagerInspectorTarget.kt | 10 +- .../com/facebook/react/bridge/ReactMarker.kt | 8 +- .../react/bridge/ReactMarkerConstants.kt | 2 +- .../react/bridge/ReactSoftExceptionLogger.kt | 3 +- .../facebook/react/bridge/SoftAssertions.kt | 4 +- .../com/facebook/react/bridge/UIManager.kt | 4 +- .../react/bridge/UIManagerProvider.kt | 3 +- .../react/bridge/WritableNativeMap.kt | 4 +- .../bridge/interop/InteropModuleRegistry.kt | 2 +- .../bridge/queue/MessageQueueThreadHandler.kt | 2 +- .../bridge/queue/MessageQueueThreadImpl.kt | 15 +- .../bridge/queue/MessageQueueThreadSpec.kt | 2 +- .../queue/ReactQueueConfigurationImpl.kt | 4 +- .../queue/ReactQueueConfigurationSpec.kt | 6 +- .../com/facebook/react/common/MapBuilder.kt | 6 +- .../com/facebook/react/common/ReleaseLevel.kt | 2 +- .../react/common/annotations/FrameworkAPI.kt | 3 +- .../annotations/UnstableReactNativeAPI.kt | 3 +- .../internal/LegacyArchitectureLogLevel.kt | 2 +- .../internal/LegacyArchitectureLogger.kt | 7 +- .../react/common/mapbuffer/MapBuffer.kt | 2 +- .../common/mapbuffer/ReadableMapBuffer.kt | 2 +- .../DefaultNewArchitectureEntryPoint.kt | 18 +- .../defaults/DefaultReactActivityDelegate.kt | 3 +- .../react/defaults/DefaultReactHost.kt | 17 +- .../defaults/DefaultReactHostDelegate.kt | 2 +- .../react/defaults/DefaultReactNativeHost.kt | 5 +- .../DefaultTurboModuleManagerDelegate.kt | 7 +- .../devsupport/BridgeDevSupportManager.kt | 12 +- .../devsupport/BridgelessDevSupportManager.kt | 10 +- .../react/devsupport/BundleDownloader.kt | 27 ++- .../devsupport/ChangeBundleLocationDialog.kt | 18 +- .../CxxInspectorPackagerConnection.kt | 13 +- .../devsupport/DebugOverlayController.kt | 9 +- .../DefaultDevLoadingViewImplementation.kt | 11 +- .../DefaultDevSupportManagerFactory.kt | 16 +- .../react/devsupport/DevServerHelper.kt | 44 +++- .../react/devsupport/DevSupportManagerBase.kt | 56 +++-- .../devsupport/DevSupportManagerFactory.kt | 7 +- .../com/facebook/react/devsupport/FpsView.kt | 8 +- .../facebook/react/devsupport/HMRClient.kt | 2 +- .../devsupport/LogBoxDialogSurfaceDelegate.kt | 4 +- .../facebook/react/devsupport/LogBoxModule.kt | 2 +- .../react/devsupport/MultipartStreamReader.kt | 4 +- .../react/devsupport/PackagerStatusCheck.kt | 12 +- .../PausedInDebuggerOverlayDialogManager.kt | 2 +- .../devsupport/PerftestDevSupportManager.kt | 3 +- .../react/devsupport/RedBoxContentView.kt | 11 +- .../devsupport/RedBoxDialogSurfaceDelegate.kt | 6 +- .../devsupport/ReleaseDevSupportManager.kt | 8 +- .../react/devsupport/StackTraceHelper.kt | 23 +- .../PausedInDebuggerOverlayManager.kt | 2 +- .../devsupport/interfaces/RedBoxHandler.kt | 2 +- .../react/fabric/DevToolsReactPerfLogger.kt | 4 +- .../react/fabric/FabricUIManagerBinding.kt | 13 +- .../fabric/FabricUIManagerProviderImpl.kt | 12 +- .../react/fabric/SurfaceHandlerBinding.kt | 7 +- .../fabric/events/EventEmitterWrapper.kt | 2 +- .../react/fabric/events/FabricEventEmitter.kt | 9 +- .../fabric/mounting/MountItemDispatcher.kt | 31 ++- .../react/fabric/mounting/MountingManager.kt | 30 ++- .../DestroyUnmountedViewMountItem.kt | 2 +- .../mountitems/DispatchIntCommandMountItem.kt | 2 +- .../DispatchStringCommandMountItem.kt | 2 +- .../mountitems/IntBufferBatchMountItem.kt | 61 +++-- .../mounting/mountitems/MountItemFactory.kt | 10 +- .../mountitems/PreAllocateViewMountItem.kt | 12 +- .../SendAccessibilityEventMountItem.kt | 2 +- ...tureFlagsOverrides_RNOSS_Stable_Android.kt | 2 +- .../ReactNativeNewArchitectureFeatureFlags.kt | 15 +- .../react/internal/interop/InteropEvent.kt | 2 +- .../internal/interop/InteropEventEmitter.kt | 2 +- .../core/TurboModuleInteropUtils.kt | 40 +-- .../turbomodule/core/TurboModuleManager.kt | 15 +- .../react/jstasks/HeadlessJsTaskConfig.kt | 5 +- .../react/jstasks/HeadlessJsTaskContext.kt | 9 +- .../jstasks/LinearCountingRetryPolicy.kt | 2 +- .../react/module/annotations/ReactModule.kt | 2 +- .../react/module/model/ReactModuleInfo.kt | 7 +- .../AccessibilityInfoModule.kt | 4 +- .../modules/appearance/AppearanceModule.kt | 2 +- .../react/modules/blob/BlobProvider.kt | 4 +- .../modules/core/DeviceEventManagerModule.kt | 2 +- .../core/HeadlessJsTaskSupportModule.kt | 6 +- .../react/modules/core/JavaTimerManager.kt | 22 +- .../modules/core/PermissionAwareActivity.kt | 2 +- .../react/modules/core/PermissionListener.kt | 2 +- .../react/modules/core/ReactChoreographer.kt | 2 +- .../react/modules/core/TimingModule.kt | 4 +- .../react/modules/debug/DevMenuModule.kt | 2 +- .../react/modules/debug/DevSettingsModule.kt | 2 +- .../debug/DidJSUpdateUiDuringFrameDetector.kt | 14 +- .../react/modules/debug/SourceCodeModule.kt | 3 +- .../modules/deviceinfo/DeviceInfoModule.kt | 3 +- .../react/modules/dialog/AlertFragment.kt | 11 +- .../react/modules/fresco/FrescoModule.kt | 7 +- .../modules/fresco/SystraceRequestListener.kt | 15 +- .../modules/i18nmanager/I18nManagerModule.kt | 3 +- .../react/modules/i18nmanager/I18nUtil.kt | 4 +- .../react/modules/image/ImageLoaderModule.kt | 2 +- .../network/InspectorNetworkReporter.kt | 4 +- .../react/modules/network/NetworkEventUtil.kt | 53 ++-- .../react/modules/network/NetworkingModule.kt | 189 +++++++++++---- .../modules/network/ProgressRequestBody.kt | 2 +- .../modules/network/ProgressResponseBody.kt | 7 +- .../react/modules/network/RequestBodyUtil.kt | 5 +- .../modules/permissions/PermissionsModule.kt | 11 +- .../modules/statusbar/StatusBarModule.kt | 25 +- .../modules/systeminfo/AndroidInfoHelpers.kt | 3 +- .../modules/systeminfo/ReactNativeVersion.kt | 13 +- .../react/modules/toast/ToastModule.kt | 2 +- .../modules/websocket/WebSocketModule.kt | 5 +- .../packagerconnection/JSPackagerClient.kt | 2 +- .../PackagerConnectionSettings.kt | 3 +- .../ReconnectingWebSocket.kt | 2 +- .../react/runtime/BridgelessAtomicRef.kt | 2 +- .../runtime/BridgelessCatalystInstance.kt | 6 +- .../react/runtime/BridgelessReactContext.kt | 18 +- .../react/runtime/CoreReactPackage.kt | 11 +- .../facebook/react/runtime/ReactHostImpl.kt | 184 +++++++++----- .../facebook/react/runtime/ReactInstance.kt | 63 +++-- .../react/runtime/ReactSurfaceImpl.kt | 12 +- .../react/runtime/ReactSurfaceView.kt | 29 ++- .../react/runtime/internal/bolts/Task.kt | 14 +- .../facebook/react/shell/MainReactPackage.kt | 22 +- .../uimanager/BackgroundStyleApplicator.kt | 44 ++-- .../uimanager/BaseViewManagerDelegate.kt | 36 ++- .../react/uimanager/DisplayMetricsHolder.kt | 11 +- .../facebook/react/uimanager/FilterHelper.kt | 25 +- .../react/uimanager/JSTouchDispatcher.kt | 47 ++-- .../react/uimanager/LayoutDirectionUtil.kt | 7 +- .../react/uimanager/MatrixMathHelper.kt | 18 +- .../facebook/react/uimanager/NativeKind.kt | 3 +- .../uimanager/NoSuchNativeViewException.kt | 7 +- .../facebook/react/uimanager/OnLayoutEvent.kt | 12 +- .../com/facebook/react/uimanager/PixelUtil.kt | 5 +- .../uimanager/ReactAccessibilityDelegate.kt | 33 ++- .../uimanager/ReactClippingViewGroupHelper.kt | 3 +- .../facebook/react/uimanager/ReactStage.kt | 3 +- .../com/facebook/react/uimanager/RootView.kt | 3 +- .../react/uimanager/ShadowNodeRegistry.kt | 7 +- .../com/facebook/react/uimanager/Spacing.kt | 6 +- .../react/uimanager/ThemedReactContext.kt | 15 +- .../react/uimanager/TouchTargetHelper.kt | 27 ++- .../react/uimanager/TransformHelper.kt | 32 ++- .../uimanager/UIConstantsProviderBinding.kt | 2 +- .../react/uimanager/UIManagerHelper.kt | 35 ++- .../uimanager/UIManagerModuleConstants.kt | 16 +- .../UIManagerModuleConstantsHelper.kt | 22 +- .../facebook/react/uimanager/ViewAtIndex.kt | 9 +- .../uimanager/ViewGroupDrawingOrderHelper.kt | 3 +- .../react/uimanager/ViewManagerDelegate.kt | 9 +- .../uimanager/ViewManagerPropertyUpdater.kt | 8 +- .../com/facebook/react/uimanager/ViewProps.kt | 9 +- .../facebook/react/uimanager/YogaNodePool.kt | 7 +- .../react/uimanager/annotations/ReactProp.kt | 7 +- .../uimanager/annotations/ReactPropGroup.kt | 7 +- .../react/uimanager/common/ViewUtil.kt | 3 +- .../uimanager/drawable/BackgroundDrawable.kt | 18 +- .../uimanager/drawable/BorderDrawable.kt | 58 +++-- .../drawable/CompositeBackgroundDrawable.kt | 19 +- .../drawable/InsetBoxShadowDrawable.kt | 21 +- .../uimanager/drawable/OutlineDrawable.kt | 12 +- .../drawable/OutsetBoxShadowDrawable.kt | 17 +- .../events/BlackHoleEventDispatcher.kt | 3 +- .../events/ContentSizeChangeEvent.kt | 5 +- .../facebook/react/uimanager/events/Event.kt | 11 +- .../uimanager/events/EventCategoryDef.kt | 3 +- .../uimanager/events/EventDispatcherImpl.kt | 6 +- .../uimanager/events/EventEmitterImpl.kt | 24 +- .../uimanager/events/FabricEventDispatcher.kt | 11 +- .../react/uimanager/events/PointerEvent.kt | 27 ++- .../react/uimanager/events/RCTEventEmitter.kt | 2 +- .../uimanager/events/RCTModernEventEmitter.kt | 2 +- .../events/SynchronousEventReceiver.kt | 2 +- .../react/uimanager/events/TouchEvent.kt | 22 +- .../react/uimanager/events/TouchesHelper.kt | 6 +- .../LegacyArchitectureShadowNodeLogger.kt | 6 +- .../AbstractLayoutAnimation.kt | 12 +- .../layoutanimation/AnimatedPropertyType.kt | 3 +- .../layoutanimation/BaseLayoutAnimation.kt | 16 +- .../layoutanimation/InterpolatorType.kt | 3 +- .../LayoutAnimationController.kt | 15 +- .../LayoutAnimationListener.kt | 3 +- .../layoutanimation/LayoutAnimationType.kt | 7 +- .../layoutanimation/LayoutCreateAnimation.kt | 4 +- .../layoutanimation/LayoutDeleteAnimation.kt | 7 +- .../LayoutHandlingAnimation.kt | 3 +- .../layoutanimation/LayoutUpdateAnimation.kt | 9 +- .../layoutanimation/OpacityAnimation.kt | 7 +- .../PositionAndSizeAnimation.kt | 10 +- .../SimpleSpringInterpolator.kt | 7 +- .../react/uimanager/style/BorderColors.kt | 9 +- .../react/uimanager/style/BorderInsets.kt | 9 +- .../uimanager/style/BorderRadiusStyle.kt | 17 +- .../react/uimanager/style/ColorStop.kt | 8 +- .../react/uimanager/style/CornerRadii.kt | 2 +- .../react/uimanager/style/LinearGradient.kt | 7 +- .../react/uimanager/style/RadialGradient.kt | 26 +- .../DebuggingOverlayManager.kt | 9 +- .../react/views/drawer/ReactDrawerLayout.kt | 5 +- .../views/drawer/ReactDrawerLayoutManager.kt | 13 +- .../views/drawer/events/DrawerSlideEvent.kt | 4 +- .../drawer/events/DrawerStateChangedEvent.kt | 3 +- .../react/views/image/ImageLoadEvent.kt | 25 +- .../react/views/image/MultiPostprocessor.kt | 2 +- .../react/views/image/ReactImageManager.kt | 28 ++- .../react/views/image/ReactImageView.kt | 26 +- .../react/views/image/ScaleTypeStartInside.kt | 2 +- .../views/imagehelper/MultiSourceHelper.kt | 7 +- .../views/modal/ReactModalHostManager.kt | 2 +- .../react/views/modal/ReactModalHostView.kt | 11 +- .../react/views/modal/RequestCloseEvent.kt | 3 +- .../facebook/react/views/modal/ShowEvent.kt | 3 +- .../progressbar/ProgressBarContainerView.kt | 5 +- .../progressbar/ProgressBarShadowNode.kt | 13 +- .../ReactProgressBarViewManager.kt | 6 +- .../safeareaview/ReactSafeAreaViewManager.kt | 2 +- .../MaintainVisibleScrollPositionHelper.kt | 5 +- ...actHorizontalScrollContainerViewManager.kt | 2 +- .../ReactHorizontalScrollViewManager.kt | 37 +-- .../ReactScrollViewAccessibilityDelegate.kt | 13 +- .../scroll/ReactScrollViewCommandHelper.kt | 13 +- .../views/scroll/ReactScrollViewHelper.kt | 55 +++-- .../views/scroll/ReactScrollViewManager.kt | 28 ++- .../react/views/scroll/ScrollEvent.kt | 8 +- .../views/scroll/VirtualViewContainer.kt | 6 +- .../swiperefresh/SwipeRefreshLayoutManager.kt | 4 +- .../views/switchview/ReactSwitchEvent.kt | 3 +- .../views/switchview/ReactSwitchManager.kt | 5 +- .../views/switchview/ReactSwitchShadowNode.kt | 9 +- .../react/views/text/FontMetricsUtil.kt | 12 +- .../views/text/PreparedLayoutTextView.kt | 11 +- .../text/PreparedLayoutTextViewManager.kt | 34 ++- .../views/text/ReactBaseTextShadowNode.kt | 27 ++- .../react/views/text/ReactFontManager.kt | 4 +- .../react/views/text/ReactRawTextManager.kt | 3 +- .../views/text/ReactRawTextShadowNode.kt | 3 +- .../views/text/ReactTextAnchorViewManager.kt | 18 +- .../react/views/text/ReactTextShadowNode.kt | 20 +- .../react/views/text/ReactTextUpdate.kt | 25 +- .../ReactTextViewAccessibilityDelegate.kt | 16 +- .../react/views/text/ReactTextViewManager.kt | 28 ++- .../react/views/text/ReactTypefaceUtils.kt | 2 +- .../views/text/ReactVirtualTextShadowNode.kt | 7 +- .../views/text/ReactVirtualTextViewManager.kt | 7 +- .../react/views/text/TextAttributeProps.kt | 2 +- .../react/views/text/TextLayoutManager.kt | 157 ++++++++---- ...escoBasedReactTextInlineImageShadowNode.kt | 12 +- .../FrescoBasedReactTextInlineImageSpan.kt | 6 +- ...scoBasedReactTextInlineImageViewManager.kt | 6 +- .../text/internal/span/CustomStyleSpan.kt | 4 +- .../text/internal/span/SetSpanOperation.kt | 2 +- .../text/internal/span/ShadowStyleSpan.kt | 2 +- .../span/TextInlineViewPlaceholderSpan.kt | 4 +- .../textinput/ReactContentSizeChangedEvent.kt | 2 +- .../react/views/textinput/ReactEditText.kt | 46 +++- .../ReactEditTextInputConnectionWrapper.kt | 2 +- .../views/textinput/ReactTextChangedEvent.kt | 2 +- .../textinput/ReactTextContentSizeWatcher.kt | 3 +- .../ReactTextInputEndEditingEvent.kt | 2 +- .../views/textinput/ReactTextInputManager.kt | 91 +++++-- .../textinput/ReactTextInputSelectionEvent.kt | 2 +- .../textinput/ReactTextInputShadowNode.kt | 20 +- .../ReactTextInputSubmitEditingEvent.kt | 2 +- .../textinput/ReactTextInputTextWatcher.kt | 8 +- .../views/textinput/ReactTextScrollWatcher.kt | 3 +- .../facebook/react/views/view/CanvasUtil.kt | 15 +- .../react/views/view/ReactDrawableHelper.kt | 9 +- .../react/views/view/ReactViewGroup.kt | 32 ++- .../react/views/view/ReactViewManager.kt | 23 +- .../facebook/react/views/view/WindowUtil.kt | 3 +- .../views/virtual/view/ReactVirtualView.kt | 10 +- .../virtual/view/ReactVirtualViewManager.kt | 2 +- .../ReactVirtualViewExperimental.kt | 26 +- .../ReactVirtualViewExperimentalManager.kt | 4 +- .../java/com/facebook/systrace/Systrace.kt | 2 +- .../com/facebook/systrace/SystraceMessage.kt | 3 +- .../com/facebook/yoga/YogaMeasureFunction.kt | 2 +- .../facebook/yoga/annotations/DoNotStrip.kt | 3 +- .../java/com/facebook/react/RootViewTest.kt | 6 +- .../NativeAnimatedInterpolationTest.kt | 24 +- .../NativeAnimatedNodeTraversalTest.kt | 228 +++++++++++++----- .../facebook/react/bridge/JavaOnlyMapTest.kt | 3 +- .../bridge/interop/FakeRCTEventEmitter.kt | 2 +- .../DefaultNewArchitectureEntryPointTest.kt | 35 ++- .../react/devsupport/StackTraceHelperTest.kt | 2 +- .../fabric/events/TouchEventDispatchTest.kt | 156 ++++++++---- .../deviceinfo/DeviceInfoModuleTest.kt | 5 +- .../modules/model/ReactModuleInfoTest.kt | 3 +- .../modules/network/NetworkingModuleTest.kt | 72 ++++-- .../network/ProgressResponseBodyTest.kt | 2 +- .../react/modules/share/ShareModuleTest.kt | 2 +- .../react/modules/timing/TimingModuleTest.kt | 8 +- .../JSPackagerClientTest.kt | 4 +- .../runtime/BridgelessReactContextTest.kt | 3 +- .../react/runtime/ReactHostDelegateTest.kt | 3 +- .../facebook/react/runtime/ReactHostTest.kt | 3 +- .../react/uimanager/BorderRadiusStyleTest.kt | 40 ++- .../uimanager/JSPointerDispatcherTest.kt | 5 +- .../react/uimanager/MatrixMathHelperTest.kt | 224 +++++++++++++++-- .../ReactPropAnnotationSetterTest.kt | 7 +- .../react/uimanager/ReactPropConstantsTest.kt | 3 +- .../uimanager/UIManagerModuleConstantsTest.kt | 6 +- .../AbstractLayoutAnimationTest.kt | 6 +- .../react/uimanager/style/ColorStopTest.kt | 18 +- .../facebook/react/util/JSStackTraceTest.kt | 22 +- .../textinput/ReactTextInputPropertyTest.kt | 16 +- .../virtual/view/ReactVirtualViewTest.kt | 6 +- .../facebook/testutils/fakes/FakeUIManager.kt | 4 +- .../testutils/shadows/ShadowNativeMap.kt | 10 +- .../platform/android/SampleLegacyModule.kt | 8 +- .../platform/android/SampleTurboModule.kt | 8 +- .../benchmark/RNTesterStartupBenchmark.kt | 13 +- .../facebook/react/uiapp/RNTesterActivity.kt | 2 +- .../react/uiapp/RNTesterApplication.kt | 22 +- .../react/uiapp/component/MyNativeView.kt | 2 +- 399 files changed, 3686 insertions(+), 1740 deletions(-) diff --git a/packages/gradle-plugin/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/ReactPlugin.kt b/packages/gradle-plugin/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/ReactPlugin.kt index fd7f6266dfc..e749135deb1 100644 --- a/packages/gradle-plugin/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/ReactPlugin.kt +++ b/packages/gradle-plugin/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/ReactPlugin.kt @@ -49,7 +49,10 @@ class ReactPlugin : Plugin { val rootExtension = project.rootProject.extensions.findByType(PrivateReactExtension::class.java) ?: project.rootProject.extensions.create( - "privateReact", PrivateReactExtension::class.java, project) + "privateReact", + PrivateReactExtension::class.java, + project, + ) // App Only Configuration project.pluginManager.withPlugin("com.android.application") { @@ -131,7 +134,7 @@ class ReactPlugin : Plugin { project: Project, localExtension: ReactExtension, rootExtension: PrivateReactExtension, - isLibrary: Boolean + isLibrary: Boolean, ) { // First, we set up the output dir for the codegen. val generatedSrcDir: Provider = @@ -149,70 +152,71 @@ class ReactPlugin : Plugin { // We create the task to produce schema from JS files. val generateCodegenSchemaTask = project.tasks.register( - "generateCodegenSchemaFromJavaScript", GenerateCodegenSchemaTask::class.java) { it -> - it.nodeExecutableAndArgs.set(rootExtension.nodeExecutableAndArgs) - it.codegenDir.set(rootExtension.codegenDir) - it.generatedSrcDir.set(generatedSrcDir) - it.nodeWorkingDir.set(project.layout.projectDirectory.asFile.absolutePath) - - // We're reading the package.json at configuration time to properly feed - // the `jsRootDir` @Input property of this task & the onlyIf. Therefore, the - // parsePackageJson should be invoked inside this lambda. - val packageJson = findPackageJsonFile(project, rootExtension.root) - val parsedPackageJson = packageJson?.let { JsonUtils.fromPackageJson(it) } - - val jsSrcsDirInPackageJson = parsedPackageJson?.codegenConfig?.jsSrcsDir - val includesGeneratedCode = - parsedPackageJson?.codegenConfig?.includesGeneratedCode ?: false - if (jsSrcsDirInPackageJson != null) { - it.jsRootDir.set(File(packageJson.parentFile, jsSrcsDirInPackageJson)) - } else { - it.jsRootDir.set(localExtension.jsRootDir) - } - it.jsInputFiles.set( - project.fileTree(it.jsRootDir) { tree -> - tree.include("**/*.js") - tree.include("**/*.jsx") - tree.include("**/*.ts") - tree.include("**/*.tsx") - - tree.exclude("node_modules/**/*") - tree.exclude("**/*.d.ts") - // We want to exclude the build directory, to don't pick them up for execution - // avoidance. - tree.exclude("**/build/**/*") - }) - - val needsCodegenFromPackageJson = - project.needsCodegenFromPackageJson(rootExtension.root) - it.onlyIf { (isLibrary || needsCodegenFromPackageJson) && !includesGeneratedCode } - } + "generateCodegenSchemaFromJavaScript", + GenerateCodegenSchemaTask::class.java, + ) { it -> + it.nodeExecutableAndArgs.set(rootExtension.nodeExecutableAndArgs) + it.codegenDir.set(rootExtension.codegenDir) + it.generatedSrcDir.set(generatedSrcDir) + it.nodeWorkingDir.set(project.layout.projectDirectory.asFile.absolutePath) + + // We're reading the package.json at configuration time to properly feed + // the `jsRootDir` @Input property of this task & the onlyIf. Therefore, the + // parsePackageJson should be invoked inside this lambda. + val packageJson = findPackageJsonFile(project, rootExtension.root) + val parsedPackageJson = packageJson?.let { JsonUtils.fromPackageJson(it) } + + val jsSrcsDirInPackageJson = parsedPackageJson?.codegenConfig?.jsSrcsDir + val includesGeneratedCode = + parsedPackageJson?.codegenConfig?.includesGeneratedCode ?: false + if (jsSrcsDirInPackageJson != null) { + it.jsRootDir.set(File(packageJson.parentFile, jsSrcsDirInPackageJson)) + } else { + it.jsRootDir.set(localExtension.jsRootDir) + } + it.jsInputFiles.set( + project.fileTree(it.jsRootDir) { tree -> + tree.include("**/*.js") + tree.include("**/*.jsx") + tree.include("**/*.ts") + tree.include("**/*.tsx") + + tree.exclude("node_modules/**/*") + tree.exclude("**/*.d.ts") + // We want to exclude the build directory, to don't pick them up for execution + // avoidance. + tree.exclude("**/build/**/*") + }) + + val needsCodegenFromPackageJson = project.needsCodegenFromPackageJson(rootExtension.root) + it.onlyIf { (isLibrary || needsCodegenFromPackageJson) && !includesGeneratedCode } + } // We create the task to generate Java code from schema. val generateCodegenArtifactsTask = project.tasks.register( - "generateCodegenArtifactsFromSchema", GenerateCodegenArtifactsTask::class.java) { task - -> - task.dependsOn(generateCodegenSchemaTask) - task.reactNativeDir.set(rootExtension.reactNativeDir) - task.nodeExecutableAndArgs.set(rootExtension.nodeExecutableAndArgs) - task.generatedSrcDir.set(generatedSrcDir) - task.packageJsonFile.set(findPackageJsonFile(project, rootExtension.root)) - task.codegenJavaPackageName.set(localExtension.codegenJavaPackageName) - task.libraryName.set(localExtension.libraryName) - task.nodeWorkingDir.set(project.layout.projectDirectory.asFile.absolutePath) - - // Please note that appNeedsCodegen is triggering a read of the package.json at - // configuration time as we need to feed the onlyIf condition of this task. - // Therefore, the appNeedsCodegen needs to be invoked inside this lambda. - val needsCodegenFromPackageJson = - project.needsCodegenFromPackageJson(rootExtension.root) - val packageJson = findPackageJsonFile(project, rootExtension.root) - val parsedPackageJson = packageJson?.let { JsonUtils.fromPackageJson(it) } - val includesGeneratedCode = - parsedPackageJson?.codegenConfig?.includesGeneratedCode ?: false - task.onlyIf { (isLibrary || needsCodegenFromPackageJson) && !includesGeneratedCode } - } + "generateCodegenArtifactsFromSchema", + GenerateCodegenArtifactsTask::class.java, + ) { task -> + task.dependsOn(generateCodegenSchemaTask) + task.reactNativeDir.set(rootExtension.reactNativeDir) + task.nodeExecutableAndArgs.set(rootExtension.nodeExecutableAndArgs) + task.generatedSrcDir.set(generatedSrcDir) + task.packageJsonFile.set(findPackageJsonFile(project, rootExtension.root)) + task.codegenJavaPackageName.set(localExtension.codegenJavaPackageName) + task.libraryName.set(localExtension.libraryName) + task.nodeWorkingDir.set(project.layout.projectDirectory.asFile.absolutePath) + + // Please note that appNeedsCodegen is triggering a read of the package.json at + // configuration time as we need to feed the onlyIf condition of this task. + // Therefore, the appNeedsCodegen needs to be invoked inside this lambda. + val needsCodegenFromPackageJson = project.needsCodegenFromPackageJson(rootExtension.root) + val packageJson = findPackageJsonFile(project, rootExtension.root) + val parsedPackageJson = packageJson?.let { JsonUtils.fromPackageJson(it) } + val includesGeneratedCode = + parsedPackageJson?.codegenConfig?.includesGeneratedCode ?: false + task.onlyIf { (isLibrary || needsCodegenFromPackageJson) && !includesGeneratedCode } + } // We update the android configuration to include the generated sources. // This equivalent to this DSL: @@ -255,29 +259,34 @@ class ReactPlugin : Plugin { // dependency. val generatePackageListTask = project.tasks.register( - "generateAutolinkingPackageList", GeneratePackageListTask::class.java) { task -> - task.autolinkInputFile.set(rootGeneratedAutolinkingFile) - task.generatedOutputDirectory.set(generatedAutolinkingJavaDir) - } + "generateAutolinkingPackageList", + GeneratePackageListTask::class.java, + ) { task -> + task.autolinkInputFile.set(rootGeneratedAutolinkingFile) + task.generatedOutputDirectory.set(generatedAutolinkingJavaDir) + } // We add a task called generateAutolinkingPackageList to do not clash with the existing task // called generatePackageList. This can to be renamed once we unlink the rn <-> cli // dependency. val generateEntryPointTask = project.tasks.register( - "generateReactNativeEntryPoint", GenerateEntryPointTask::class.java) { task -> - task.autolinkInputFile.set(rootGeneratedAutolinkingFile) - task.generatedOutputDirectory.set(generatedAutolinkingJavaDir) - } + "generateReactNativeEntryPoint", + GenerateEntryPointTask::class.java, + ) { task -> + task.autolinkInputFile.set(rootGeneratedAutolinkingFile) + task.generatedOutputDirectory.set(generatedAutolinkingJavaDir) + } // We also need to generate code for C++ Autolinking val generateAutolinkingNewArchitectureFilesTask = project.tasks.register( "generateAutolinkingNewArchitectureFiles", - GenerateAutolinkingNewArchitecturesFileTask::class.java) { task -> - task.autolinkInputFile.set(rootGeneratedAutolinkingFile) - task.generatedOutputDirectory.set(generatedAutolinkingJniDir) - } + GenerateAutolinkingNewArchitecturesFileTask::class.java, + ) { task -> + task.autolinkInputFile.set(rootGeneratedAutolinkingFile) + task.generatedOutputDirectory.set(generatedAutolinkingJniDir) + } project.tasks .named("preBuild", Task::class.java) .dependsOn(generateAutolinkingNewArchitectureFilesTask) diff --git a/packages/gradle-plugin/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/tasks/BundleHermesCTask.kt b/packages/gradle-plugin/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/tasks/BundleHermesCTask.kt index 67db9dc5417..bce6e6a82f0 100644 --- a/packages/gradle-plugin/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/tasks/BundleHermesCTask.kt +++ b/packages/gradle-plugin/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/tasks/BundleHermesCTask.kt @@ -111,7 +111,11 @@ abstract class BundleHermesCTask : DefaultTask() { val composeScriptFile = File(reactNativeDir, "scripts/compose-source-maps.js") val composeSourceMapsCommand = getComposeSourceMapsCommand( - composeScriptFile, packagerSourceMap, compilerSourceMap, outputSourceMap) + composeScriptFile, + packagerSourceMap, + compilerSourceMap, + outputSourceMap, + ) runCommand(composeSourceMapsCommand) } } @@ -172,7 +176,7 @@ abstract class BundleHermesCTask : DefaultTask() { internal fun getHermescCommand( hermesCommand: String, bytecodeFile: File, - bundleFile: File + bundleFile: File, ): List { val rootFile = root.get().asFile return windowsAwareCommandLine( @@ -183,14 +187,15 @@ abstract class BundleHermesCTask : DefaultTask() { "-out", bytecodeFile.cliPath(rootFile), bundleFile.cliPath(rootFile), - *hermesFlags.get().toTypedArray()) + *hermesFlags.get().toTypedArray(), + ) } internal fun getComposeSourceMapsCommand( composeScript: File, packagerSourceMap: File, compilerSourceMap: File, - outputSourceMap: File + outputSourceMap: File, ): List { val rootFile = root.get().asFile return windowsAwareCommandLine( @@ -199,6 +204,7 @@ abstract class BundleHermesCTask : DefaultTask() { packagerSourceMap.cliPath(rootFile), compilerSourceMap.cliPath(rootFile), "-o", - outputSourceMap.cliPath(rootFile)) + outputSourceMap.cliPath(rootFile), + ) } } diff --git a/packages/gradle-plugin/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/tasks/GenerateCodegenArtifactsTask.kt b/packages/gradle-plugin/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/tasks/GenerateCodegenArtifactsTask.kt index c2a72c14882..f6f2e99e5a8 100644 --- a/packages/gradle-plugin/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/tasks/GenerateCodegenArtifactsTask.kt +++ b/packages/gradle-plugin/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/tasks/GenerateCodegenArtifactsTask.kt @@ -81,6 +81,7 @@ abstract class GenerateCodegenArtifactsTask : Exec() { "--libraryName", libraryName, "--javaPackageName", - codegenJavaPackageName)) + codegenJavaPackageName, + )) } } diff --git a/packages/gradle-plugin/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/tasks/GeneratePackageListTask.kt b/packages/gradle-plugin/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/tasks/GeneratePackageListTask.kt index 100db628824..e9716424b0e 100644 --- a/packages/gradle-plugin/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/tasks/GeneratePackageListTask.kt +++ b/packages/gradle-plugin/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/tasks/GeneratePackageListTask.kt @@ -61,7 +61,7 @@ abstract class GeneratePackageListTask : DefaultTask() { internal fun composePackageImports( packageName: String, - packages: Map + packages: Map, ) = packages.entries.joinToString("\n") { (name, dep) -> val packageImportPath = @@ -73,7 +73,7 @@ abstract class GeneratePackageListTask : DefaultTask() { internal fun composePackageInstance( packageName: String, - packages: Map + packages: Map, ) = if (packages.isEmpty()) { "" diff --git a/packages/gradle-plugin/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/tasks/internal/PrepareBoostTask.kt b/packages/gradle-plugin/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/tasks/internal/PrepareBoostTask.kt index c13a0d90ea2..7665e82c6d9 100644 --- a/packages/gradle-plugin/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/tasks/internal/PrepareBoostTask.kt +++ b/packages/gradle-plugin/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/tasks/internal/PrepareBoostTask.kt @@ -40,7 +40,8 @@ abstract class PrepareBoostTask : DefaultTask() { "CMakeLists.txt", "boost_${boostVersion.get()}/boost/**/*.hpp", "boost/boost/**/*.hpp", - "asm/**/*.S") + "asm/**/*.S", + ) it.includeEmptyDirs = false it.into(outputDir) } diff --git a/packages/gradle-plugin/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/tasks/internal/PrepareGflagsTask.kt b/packages/gradle-plugin/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/tasks/internal/PrepareGflagsTask.kt index 7fca69edd17..1b1bcc0817f 100644 --- a/packages/gradle-plugin/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/tasks/internal/PrepareGflagsTask.kt +++ b/packages/gradle-plugin/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/tasks/internal/PrepareGflagsTask.kt @@ -46,7 +46,8 @@ abstract class PrepareGflagsTask : DefaultTask() { action.include( "gflags-${gflagsVersion.get()}/src/*.h", "gflags-${gflagsVersion.get()}/src/*.cc", - "CMakeLists.txt") + "CMakeLists.txt", + ) action.filesMatching("*/src/*") { matchedFile -> matchedFile.path = "gflags/${matchedFile.name}" } @@ -64,7 +65,8 @@ abstract class PrepareGflagsTask : DefaultTask() { .replace( Regex( "@(HAVE_STDINT_H|HAVE_SYS_TYPES_H|HAVE_INTTYPES_H|GFLAGS_INTTYPES_FORMAT_C99)@"), - "1") + "1", + ) .replace(Regex("@([A-Z0-9_]+)@"), "1") } matchedFile.path = "gflags/${matchedFile.name.removeSuffix(".in")}" diff --git a/packages/gradle-plugin/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/tasks/internal/PrepareGlogTask.kt b/packages/gradle-plugin/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/tasks/internal/PrepareGlogTask.kt index b20a54d58f1..0c4611a70e4 100644 --- a/packages/gradle-plugin/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/tasks/internal/PrepareGlogTask.kt +++ b/packages/gradle-plugin/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/tasks/internal/PrepareGlogTask.kt @@ -60,8 +60,10 @@ abstract class PrepareGlogTask : DefaultTask() { "ac_cv___attribute___noinline" to "__attribute__ ((noinline))", "ac_cv___attribute___noreturn" to "__attribute__ ((noreturn))", "ac_cv___attribute___printf_4_5" to - "__attribute__((__format__ (__printf__, 4, 5)))")), - ReplaceTokens::class.java) + "__attribute__((__format__ (__printf__, 4, 5)))", + )), + ReplaceTokens::class.java, + ) matchedFile.path = (matchedFile.name.removeSuffix(".in")) } action.into(outputDir) @@ -74,7 +76,8 @@ abstract class PrepareGlogTask : DefaultTask() { "logging.h", "raw_logging.h", "vlog_is_on.h", - "**/src/glog/log_severity.h") + "**/src/glog/log_severity.h", + ) action.eachFile { file -> file.path = file.name } action.includeEmptyDirs = false action.into(exportedDir) diff --git a/packages/gradle-plugin/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/tasks/internal/utils/PrefabPreprocessingEntry.kt b/packages/gradle-plugin/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/tasks/internal/utils/PrefabPreprocessingEntry.kt index 522100150c4..1786c5bc646 100644 --- a/packages/gradle-plugin/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/tasks/internal/utils/PrefabPreprocessingEntry.kt +++ b/packages/gradle-plugin/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/tasks/internal/utils/PrefabPreprocessingEntry.kt @@ -23,6 +23,6 @@ data class PrefabPreprocessingEntry( ) : Serializable { constructor( libraryName: String, - pathToPrefixCouple: Pair + pathToPrefixCouple: Pair, ) : this(libraryName, listOf(pathToPrefixCouple)) } diff --git a/packages/gradle-plugin/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/utils/AgpConfiguratorUtils.kt b/packages/gradle-plugin/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/utils/AgpConfiguratorUtils.kt index dc6919f50a8..ab011c2d41f 100644 --- a/packages/gradle-plugin/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/utils/AgpConfiguratorUtils.kt +++ b/packages/gradle-plugin/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/utils/AgpConfiguratorUtils.kt @@ -66,9 +66,15 @@ internal object AgpConfiguratorUtils { ext.buildFeatures.buildConfig = true ext.defaultConfig.buildConfigField("boolean", "IS_NEW_ARCHITECTURE_ENABLED", "true") ext.defaultConfig.buildConfigField( - "boolean", "IS_HERMES_ENABLED", project.isHermesEnabled.toString()) + "boolean", + "IS_HERMES_ENABLED", + project.isHermesEnabled.toString(), + ) ext.defaultConfig.buildConfigField( - "boolean", "IS_EDGE_TO_EDGE_ENABLED", project.isEdgeToEdgeEnabled.toString()) + "boolean", + "IS_EDGE_TO_EDGE_ENABLED", + project.isEdgeToEdgeEnabled.toString(), + ) } } project.pluginManager.withPlugin("com.android.application", action) @@ -95,7 +101,10 @@ internal object AgpConfiguratorUtils { .getByType(ApplicationAndroidComponentsExtension::class.java) .finalizeDsl { ext -> ext.defaultConfig.resValue( - "string", "react_native_dev_server_ip", getHostIpAddress()) + "string", + "react_native_dev_server_ip", + getHostIpAddress(), + ) ext.defaultConfig.resValue("integer", "react_native_dev_server_port", devServerPort) } } diff --git a/packages/gradle-plugin/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/utils/DependencyUtils.kt b/packages/gradle-plugin/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/utils/DependencyUtils.kt index bbaef974695..0f0574265c3 100644 --- a/packages/gradle-plugin/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/utils/DependencyUtils.kt +++ b/packages/gradle-plugin/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/utils/DependencyUtils.kt @@ -99,7 +99,7 @@ internal object DependencyUtils { fun configureDependencies( project: Project, versionString: String, - groupString: String = DEFAULT_INTERNAL_PUBLISHING_GROUP + groupString: String = DEFAULT_INTERNAL_PUBLISHING_GROUP, ) { if (versionString.isBlank()) return project.rootProject.allprojects { eachProject -> @@ -127,30 +127,34 @@ internal object DependencyUtils { internal fun getDependencySubstitutions( versionString: String, - groupString: String = DEFAULT_INTERNAL_PUBLISHING_GROUP + groupString: String = DEFAULT_INTERNAL_PUBLISHING_GROUP, ): List> { val dependencySubstitution = mutableListOf>() dependencySubstitution.add( Triple( "com.facebook.react:react-native", "${groupString}:react-android:${versionString}", - "The react-native artifact was deprecated in favor of react-android due to https://github.com/facebook/react-native/issues/35210.")) + "The react-native artifact was deprecated in favor of react-android due to https://github.com/facebook/react-native/issues/35210.", + )) dependencySubstitution.add( Triple( "com.facebook.react:hermes-engine", "${groupString}:hermes-android:${versionString}", - "The hermes-engine artifact was deprecated in favor of hermes-android due to https://github.com/facebook/react-native/issues/35210.")) + "The hermes-engine artifact was deprecated in favor of hermes-android due to https://github.com/facebook/react-native/issues/35210.", + )) if (groupString != DEFAULT_INTERNAL_PUBLISHING_GROUP) { dependencySubstitution.add( Triple( "com.facebook.react:react-android", "${groupString}:react-android:${versionString}", - "The react-android dependency was modified to use the correct Maven group.")) + "The react-android dependency was modified to use the correct Maven group.", + )) dependencySubstitution.add( Triple( "com.facebook.react:hermes-android", "${groupString}:hermes-android:${versionString}", - "The hermes-android dependency was modified to use the correct Maven group.")) + "The hermes-android dependency was modified to use the correct Maven group.", + )) } return dependencySubstitution } @@ -175,7 +179,7 @@ internal object DependencyUtils { fun Project.mavenRepoFromUrl( url: String, - action: (MavenArtifactRepository) -> Unit = {} + action: (MavenArtifactRepository) -> Unit = {}, ): MavenArtifactRepository = project.repositories.maven { it.url = URI.create(url) @@ -184,7 +188,7 @@ internal object DependencyUtils { fun Project.mavenRepoFromURI( uri: URI, - action: (MavenArtifactRepository) -> Unit = {} + action: (MavenArtifactRepository) -> Unit = {}, ): MavenArtifactRepository = project.repositories.maven { it.url = uri diff --git a/packages/gradle-plugin/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/utils/NdkConfiguratorUtils.kt b/packages/gradle-plugin/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/utils/NdkConfiguratorUtils.kt index f651d62199b..7209ba71b34 100644 --- a/packages/gradle-plugin/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/utils/NdkConfiguratorUtils.kt +++ b/packages/gradle-plugin/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/utils/NdkConfiguratorUtils.kt @@ -30,7 +30,8 @@ internal object NdkConfiguratorUtils { ext.externalNativeBuild.cmake.path = File( extension.reactNativeDir.get().asFile, - "ReactAndroid/cmake-utils/default-app-setup/CMakeLists.txt") + "ReactAndroid/cmake-utils/default-app-setup/CMakeLists.txt", + ) } // Parameters should be provided in an additive manner (do not override what @@ -71,7 +72,7 @@ internal object NdkConfiguratorUtils { fun configureNewArchPackagingOptions( project: Project, extension: ReactExtension, - variant: Variant + variant: Variant, ) { // We set some packagingOptions { pickFirst ... } for our users for libraries we own. variant.packaging.jniLibs.pickFirsts.addAll( @@ -107,7 +108,7 @@ internal object NdkConfiguratorUtils { fun getPackagingOptionsForVariant( hermesEnabled: Boolean, - useThirdPartyJSC: Boolean + useThirdPartyJSC: Boolean, ): Pair, List> { val excludes = mutableListOf() val includes = mutableListOf() diff --git a/packages/gradle-plugin/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/utils/PathUtils.kt b/packages/gradle-plugin/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/utils/PathUtils.kt index 0081b31296d..f15111c17d4 100644 --- a/packages/gradle-plugin/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/utils/PathUtils.kt +++ b/packages/gradle-plugin/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/utils/PathUtils.kt @@ -30,7 +30,8 @@ internal fun detectedEntryFile(config: ReactExtension, envVariableOverride: Stri detectEntryFile( entryFile = config.entryFile.orNull?.asFile, reactRoot = config.root.get().asFile, - envVariableOverride = envVariableOverride) + envVariableOverride = envVariableOverride, + ) /** * Computes the CLI file for React Native. The Algo follows this order: @@ -42,7 +43,8 @@ internal fun detectedEntryFile(config: ReactExtension, envVariableOverride: Stri internal fun detectedCliFile(config: ReactExtension): File = detectCliFile( reactNativeRoot = config.root.get().asFile, - preconfiguredCliFile = config.cliFile.asFile.orNull) + preconfiguredCliFile = config.cliFile.asFile.orNull, + ) /** * Computes the `hermesc` command location. The Algo follows this order: @@ -60,7 +62,7 @@ internal fun detectedHermesCommand(config: ReactExtension): String = private fun detectEntryFile( entryFile: File?, reactRoot: File, - envVariableOverride: String? = null + envVariableOverride: String? = null, ): File = when { envVariableOverride != null -> File(reactRoot, envVariableOverride) @@ -83,7 +85,8 @@ private fun detectCliFile(reactNativeRoot: File, preconfiguredCliFile: File?): F .exec( arrayOf("node", "--print", "require.resolve('react-native/cli');"), emptyArray(), - reactNativeRoot) + reactNativeRoot, + ) val nodeProcessOutput = nodeProcess.inputStream.use { it.bufferedReader().readText().trim() } @@ -221,7 +224,7 @@ internal fun findPackageJsonFile(project: Project, rootProperty: DirectoryProper */ internal fun readPackageJsonFile( project: Project, - rootProperty: DirectoryProperty + rootProperty: DirectoryProperty, ): ModelPackageJson? { val packageJson = findPackageJsonFile(project, rootProperty) return packageJson?.let { JsonUtils.fromPackageJson(it) } diff --git a/packages/gradle-plugin/react-native-gradle-plugin/src/test/kotlin/com/facebook/react/ReactExtensionTest.kt b/packages/gradle-plugin/react-native-gradle-plugin/src/test/kotlin/com/facebook/react/ReactExtensionTest.kt index c2db6e1bf87..a3eda2ecf47 100644 --- a/packages/gradle-plugin/react-native-gradle-plugin/src/test/kotlin/com/facebook/react/ReactExtensionTest.kt +++ b/packages/gradle-plugin/react-native-gradle-plugin/src/test/kotlin/com/facebook/react/ReactExtensionTest.kt @@ -116,7 +116,8 @@ class ReactExtensionTest { assertThat(deps) .containsExactly( "debugImplementation" to ":react-native_oss-library-example", - "releaseImplementation" to ":react-native_oss-library-example") + "releaseImplementation" to ":react-native_oss-library-example", + ) } @Test @@ -156,7 +157,8 @@ class ReactExtensionTest { assertThat(deps) .containsExactly( "implementation" to ":react-native_oss-library-example", - "implementation" to ":react-native_another-library-for-testing") + "implementation" to ":react-native_another-library-for-testing", + ) } @Test diff --git a/packages/gradle-plugin/react-native-gradle-plugin/src/test/kotlin/com/facebook/react/model/ModelAutolinkingDependenciesJsonTest.kt b/packages/gradle-plugin/react-native-gradle-plugin/src/test/kotlin/com/facebook/react/model/ModelAutolinkingDependenciesJsonTest.kt index 4ade0299cd0..3cd7213e59b 100644 --- a/packages/gradle-plugin/react-native-gradle-plugin/src/test/kotlin/com/facebook/react/model/ModelAutolinkingDependenciesJsonTest.kt +++ b/packages/gradle-plugin/react-native-gradle-plugin/src/test/kotlin/com/facebook/react/model/ModelAutolinkingDependenciesJsonTest.kt @@ -37,7 +37,10 @@ class ModelAutolinkingDependenciesJsonTest { .isEqualTo("react-native_package") assertThat( ModelAutolinkingDependenciesJson( - "", "@this*is~a(more)complicated/example!of~weird)packages", null) + "", + "@this*is~a(more)complicated/example!of~weird)packages", + null, + ) .nameCleansed) .isEqualTo("this_is_a_more_complicated_example_of_weird_packages") } diff --git a/packages/gradle-plugin/react-native-gradle-plugin/src/test/kotlin/com/facebook/react/tasks/BundleHermesCTaskTest.kt b/packages/gradle-plugin/react-native-gradle-plugin/src/test/kotlin/com/facebook/react/tasks/BundleHermesCTaskTest.kt index 898e8c41226..a9fb597f501 100644 --- a/packages/gradle-plugin/react-native-gradle-plugin/src/test/kotlin/com/facebook/react/tasks/BundleHermesCTaskTest.kt +++ b/packages/gradle-plugin/react-native-gradle-plugin/src/test/kotlin/com/facebook/react/tasks/BundleHermesCTaskTest.kt @@ -47,7 +47,8 @@ class BundleHermesCTaskTest { File(rootDir, "file.js"), File(rootDir, "file.jsx"), File(rootDir, "file.ts"), - File(rootDir, "file.tsx")) + File(rootDir, "file.tsx"), + ) } @Test @@ -71,7 +72,11 @@ class BundleHermesCTaskTest { assertThat(task.sources.excludes) .containsExactlyInAnyOrder( - "**/android/**/*", "**/ios/**/*", "**/build/**/*", "**/node_modules/**/*") + "**/android/**/*", + "**/ios/**/*", + "**/build/**/*", + "**/node_modules/**/*", + ) assertThat(task.sources.files.size).isEqualTo(1) assertThat(task.sources.files).containsExactly(File(rootDir, "afolder/includedfile.js")) } @@ -236,7 +241,8 @@ class BundleHermesCTaskTest { "--minify", "true", "--read-global-cache", - "--verbose") + "--verbose", + ) } @Test @@ -291,7 +297,8 @@ class BundleHermesCTaskTest { "--minify", "true", "--read-global-cache", - "--verbose") + "--verbose", + ) } @Test @@ -341,7 +348,8 @@ class BundleHermesCTaskTest { "-out", bytecodeFile.absolutePath, bundleFile.absolutePath, - "my-custom-hermes-flag") + "my-custom-hermes-flag", + ) } @Test @@ -369,7 +377,8 @@ class BundleHermesCTaskTest { "-out", bytecodeFile.relativeTo(tempFolder.root).path, bundleFile.relativeTo(tempFolder.root).path, - "my-custom-hermes-flag") + "my-custom-hermes-flag", + ) } @Test @@ -397,7 +406,8 @@ class BundleHermesCTaskTest { packagerMap.absolutePath, compilerMap.absolutePath, "-o", - outputMap.absolutePath) + outputMap.absolutePath, + ) } @Test @@ -428,6 +438,7 @@ class BundleHermesCTaskTest { packagerMap.relativeTo(tempFolder.root).path, compilerMap.relativeTo(tempFolder.root).path, "-o", - outputMap.relativeTo(tempFolder.root).path) + outputMap.relativeTo(tempFolder.root).path, + ) } } diff --git a/packages/gradle-plugin/react-native-gradle-plugin/src/test/kotlin/com/facebook/react/tasks/GenerateAutolinkingNewArchitecturesFileTaskTest.kt b/packages/gradle-plugin/react-native-gradle-plugin/src/test/kotlin/com/facebook/react/tasks/GenerateAutolinkingNewArchitecturesFileTaskTest.kt index b8d14bf7bfa..621fe697ab4 100644 --- a/packages/gradle-plugin/react-native-gradle-plugin/src/test/kotlin/com/facebook/react/tasks/GenerateAutolinkingNewArchitecturesFileTaskTest.kt +++ b/packages/gradle-plugin/react-native-gradle-plugin/src/test/kotlin/com/facebook/react/tasks/GenerateAutolinkingNewArchitecturesFileTaskTest.kt @@ -71,8 +71,10 @@ class GenerateAutolinkingNewArchitecturesFileTaskTest { root = "./a/directory", name = "a-dependency", platforms = - ModelAutolinkingDependenciesPlatformJson(android = null))), - project = null)) + ModelAutolinkingDependenciesPlatformJson(android = null), + )), + project = null, + )) assertThat(result).isEmpty() } @@ -98,8 +100,10 @@ class GenerateAutolinkingNewArchitecturesFileTaskTest { root = "./a/directory", name = "a-dependency", platforms = - ModelAutolinkingDependenciesPlatformJson(android = android))), - project = null)) + ModelAutolinkingDependenciesPlatformJson(android = android), + )), + project = null, + )) assertThat(result).containsExactly(android) } @@ -299,5 +303,6 @@ class GenerateAutolinkingNewArchitecturesFileTaskTest { cxxModuleCMakeListsPath = "./another/directory/cxx/CMakeLists.txt", cxxModuleHeaderName = "AnotherCxxModule", cxxModuleCMakeListsModuleName = "another_cxxModule", - )) + ), + ) } diff --git a/packages/gradle-plugin/react-native-gradle-plugin/src/test/kotlin/com/facebook/react/tasks/GeneratePackageListTaskTest.kt b/packages/gradle-plugin/react-native-gradle-plugin/src/test/kotlin/com/facebook/react/tasks/GeneratePackageListTaskTest.kt index fc85587d15e..831179b2308 100644 --- a/packages/gradle-plugin/react-native-gradle-plugin/src/test/kotlin/com/facebook/react/tasks/GeneratePackageListTaskTest.kt +++ b/packages/gradle-plugin/react-native-gradle-plugin/src/test/kotlin/com/facebook/react/tasks/GeneratePackageListTaskTest.kt @@ -146,8 +146,10 @@ class GeneratePackageListTaskTest { root = "./a/directory", name = "a-dependency", platforms = - ModelAutolinkingDependenciesPlatformJson(android = null))), - project = null)) + ModelAutolinkingDependenciesPlatformJson(android = null), + )), + project = null, + )) assertThat(result) .isEqualTo(emptyMap()) } @@ -174,8 +176,10 @@ class GeneratePackageListTaskTest { root = "./a/directory", name = "a-dependency", platforms = - ModelAutolinkingDependenciesPlatformJson(android = android))), - project = null)) + ModelAutolinkingDependenciesPlatformJson(android = android), + )), + project = null, + )) assertThat(result.entries.size).isEqualTo(1) assertThat(result["a-dependency"]).isEqualTo(android) } @@ -189,7 +193,8 @@ class GeneratePackageListTaskTest { packageImportPath = "import com.facebook.react.aPackage;", packageInstance = "new APackage()", buildTypes = emptyList(), - isPureCxxDependency = true) + isPureCxxDependency = true, + ) val result = task.filterAndroidPackages( @@ -202,8 +207,10 @@ class GeneratePackageListTaskTest { root = "./a/directory", name = "a-pure-cxx-dependency", platforms = - ModelAutolinkingDependenciesPlatformJson(android = android))), - project = null)) + ModelAutolinkingDependenciesPlatformJson(android = android), + )), + project = null, + )) assertThat(result) .isEqualTo(emptyMap()) } @@ -388,5 +395,6 @@ class GeneratePackageListTaskTest { libraryName = "anotherPackage", componentDescriptors = emptyList(), cmakeListsPath = "./another/directory/CMakeLists.txt", - )) + ), + ) } diff --git a/packages/gradle-plugin/react-native-gradle-plugin/src/test/kotlin/com/facebook/react/tasks/internal/PrepareGflagsTaskTest.kt b/packages/gradle-plugin/react-native-gradle-plugin/src/test/kotlin/com/facebook/react/tasks/internal/PrepareGflagsTaskTest.kt index a8194320b16..3ff5c84668a 100644 --- a/packages/gradle-plugin/react-native-gradle-plugin/src/test/kotlin/com/facebook/react/tasks/internal/PrepareGflagsTaskTest.kt +++ b/packages/gradle-plugin/react-native-gradle-plugin/src/test/kotlin/com/facebook/react/tasks/internal/PrepareGflagsTaskTest.kt @@ -188,7 +188,8 @@ typedef unsigned __int64 uint64; #endif } // namespace GFLAGS_NAMESPACE -""") +""", + ) val configFile = File(output, "gflags/config.h") assertThat(configFile.exists()).isTrue() diff --git a/packages/gradle-plugin/react-native-gradle-plugin/src/test/kotlin/com/facebook/react/tasks/internal/PreparePrefabHeadersTaskTest.kt b/packages/gradle-plugin/react-native-gradle-plugin/src/test/kotlin/com/facebook/react/tasks/internal/PreparePrefabHeadersTaskTest.kt index bf974bbe4ba..e34e497ae02 100644 --- a/packages/gradle-plugin/react-native-gradle-plugin/src/test/kotlin/com/facebook/react/tasks/internal/PreparePrefabHeadersTaskTest.kt +++ b/packages/gradle-plugin/react-native-gradle-plugin/src/test/kotlin/com/facebook/react/tasks/internal/PreparePrefabHeadersTaskTest.kt @@ -100,7 +100,8 @@ class PreparePrefabHeadersTaskTest { listOf( PrefabPreprocessingEntry( "sample_library", - listOf("input/component1/" to "", "input/component2/" to "")), + listOf("input/component1/" to "", "input/component2/" to ""), + ), )) } @@ -123,7 +124,8 @@ class PreparePrefabHeadersTaskTest { it.input.set( listOf( PrefabPreprocessingEntry("libraryone", "input/lib1/" to ""), - PrefabPreprocessingEntry("librarytwo", "input/lib2/" to ""))) + PrefabPreprocessingEntry("librarytwo", "input/lib2/" to ""), + )) } task.taskAction() @@ -146,9 +148,13 @@ class PreparePrefabHeadersTaskTest { it.input.set( listOf( PrefabPreprocessingEntry( - "libraryone", listOf("input/lib1/" to "", "input/shared/" to "shared/")), + "libraryone", + listOf("input/lib1/" to "", "input/shared/" to "shared/"), + ), PrefabPreprocessingEntry( - "librarytwo", listOf("input/lib2/" to "", "input/shared/" to "shared/")), + "librarytwo", + listOf("input/lib2/" to "", "input/shared/" to "shared/"), + ), )) } diff --git a/packages/gradle-plugin/react-native-gradle-plugin/src/test/kotlin/com/facebook/react/tasks/internal/utils/PrefabPreprocessingEntryTest.kt b/packages/gradle-plugin/react-native-gradle-plugin/src/test/kotlin/com/facebook/react/tasks/internal/utils/PrefabPreprocessingEntryTest.kt index a8ab05065b0..54ace590341 100644 --- a/packages/gradle-plugin/react-native-gradle-plugin/src/test/kotlin/com/facebook/react/tasks/internal/utils/PrefabPreprocessingEntryTest.kt +++ b/packages/gradle-plugin/react-native-gradle-plugin/src/test/kotlin/com/facebook/react/tasks/internal/utils/PrefabPreprocessingEntryTest.kt @@ -16,7 +16,9 @@ class PrefabPreprocessingEntryTest { fun secondaryConstructor_createsAList() { val sampleEntry = PrefabPreprocessingEntry( - libraryName = "justALibrary", pathToPrefixCouple = "aPath" to "andAPrefix") + libraryName = "justALibrary", + pathToPrefixCouple = "aPath" to "andAPrefix", + ) assertEquals(1, sampleEntry.pathToPrefixCouples.size) assertEquals("aPath", sampleEntry.pathToPrefixCouples[0].first) diff --git a/packages/gradle-plugin/react-native-gradle-plugin/src/test/kotlin/com/facebook/react/tests/TaskTestUtils.kt b/packages/gradle-plugin/react-native-gradle-plugin/src/test/kotlin/com/facebook/react/tests/TaskTestUtils.kt index b677cca6670..9c86c746f14 100644 --- a/packages/gradle-plugin/react-native-gradle-plugin/src/test/kotlin/com/facebook/react/tests/TaskTestUtils.kt +++ b/packages/gradle-plugin/react-native-gradle-plugin/src/test/kotlin/com/facebook/react/tests/TaskTestUtils.kt @@ -35,7 +35,7 @@ internal fun createProject(projectDir: File? = null): Project { internal inline fun createTestTask( project: Project = createProject(), taskName: String = T::class.java.simpleName, - crossinline block: (T) -> Unit = {} + crossinline block: (T) -> Unit = {}, ): T = project.tasks.register(taskName, T::class.java) { block(it) }.get() /** A util function to zip a list of files from [contents] inside the zipfile at [destination]. */ diff --git a/packages/gradle-plugin/react-native-gradle-plugin/src/test/kotlin/com/facebook/react/utils/DependencyUtilsTest.kt b/packages/gradle-plugin/react-native-gradle-plugin/src/test/kotlin/com/facebook/react/utils/DependencyUtilsTest.kt index cbead288fab..c634bc0943c 100644 --- a/packages/gradle-plugin/react-native-gradle-plugin/src/test/kotlin/com/facebook/react/utils/DependencyUtilsTest.kt +++ b/packages/gradle-plugin/react-native-gradle-plugin/src/test/kotlin/com/facebook/react/utils/DependencyUtilsTest.kt @@ -106,7 +106,9 @@ class DependencyUtilsTest { val project = createProject() project.rootProject.extensions.extraProperties.set( - "exclusiveEnterpriseRepository", repositoryURI.toString()) + "exclusiveEnterpriseRepository", + repositoryURI.toString(), + ) configureRepositories(project) @@ -503,7 +505,9 @@ class DependencyUtilsTest { fun exclusiveEnterpriseRepository_withScopedProperty() { val project = createProject(tempFolder.root) project.extensions.extraProperties.set( - "react.exclusiveEnterpriseRepository", "https://maven.myfabolousorganization.it") + "react.exclusiveEnterpriseRepository", + "https://maven.myfabolousorganization.it", + ) assertThat(project.exclusiveEnterpriseRepository()) .isEqualTo("https://maven.myfabolousorganization.it") } @@ -512,7 +516,9 @@ class DependencyUtilsTest { fun exclusiveEnterpriseRepository_withUnscopedProperty() { val project = createProject(tempFolder.root) project.extensions.extraProperties.set( - "exclusiveEnterpriseRepository", "https://maven.myfabolousorganization.it") + "exclusiveEnterpriseRepository", + "https://maven.myfabolousorganization.it", + ) assertThat(project.exclusiveEnterpriseRepository()) .isEqualTo("https://maven.myfabolousorganization.it") } diff --git a/packages/gradle-plugin/react-native-gradle-plugin/src/test/kotlin/com/facebook/react/utils/PathUtilsTest.kt b/packages/gradle-plugin/react-native-gradle-plugin/src/test/kotlin/com/facebook/react/utils/PathUtilsTest.kt index 0b4cfc8ad56..ac20331d262 100644 --- a/packages/gradle-plugin/react-native-gradle-plugin/src/test/kotlin/com/facebook/react/utils/PathUtilsTest.kt +++ b/packages/gradle-plugin/react-native-gradle-plugin/src/test/kotlin/com/facebook/react/utils/PathUtilsTest.kt @@ -202,7 +202,8 @@ class PathUtilsTest { .isEqualTo( File( tempFolder.root, - "node_modules/react-native/ReactAndroid/hermes-engine/build/hermes/bin/hermesc")) + "node_modules/react-native/ReactAndroid/hermes-engine/build/hermes/bin/hermesc", + )) } @Test @@ -212,7 +213,8 @@ class PathUtilsTest { .isEqualTo( File( tempFolder.root, - "node_modules/react-native/ReactAndroid/hermes-engine/build/hermes/bin/hermesc.exe")) + "node_modules/react-native/ReactAndroid/hermes-engine/build/hermes/bin/hermesc.exe", + )) } @Test diff --git a/packages/gradle-plugin/react-native-gradle-plugin/src/test/kotlin/com/facebook/react/utils/ProjectUtilsTest.kt b/packages/gradle-plugin/react-native-gradle-plugin/src/test/kotlin/com/facebook/react/utils/ProjectUtilsTest.kt index def93f7d613..6c56ca1edea 100644 --- a/packages/gradle-plugin/react-native-gradle-plugin/src/test/kotlin/com/facebook/react/utils/ProjectUtilsTest.kt +++ b/packages/gradle-plugin/react-native-gradle-plugin/src/test/kotlin/com/facebook/react/utils/ProjectUtilsTest.kt @@ -203,7 +203,9 @@ class ProjectUtilsTest { fun getReactNativeArchitectures_withMultipleArch_returnsList() { val project = createProject() project.extensions.extraProperties.set( - "reactNativeArchitectures", "armeabi-v7a,arm64-v8a,x86,x86_64") + "reactNativeArchitectures", + "armeabi-v7a,arm64-v8a,x86,x86_64", + ) val archs = project.getReactNativeArchitectures() assertThat(archs.size).isEqualTo(4) diff --git a/packages/gradle-plugin/settings-plugin/src/main/kotlin/com/facebook/react/ReactSettingsExtension.kt b/packages/gradle-plugin/settings-plugin/src/main/kotlin/com/facebook/react/ReactSettingsExtension.kt index 41ca6c597ad..b668cae0624 100644 --- a/packages/gradle-plugin/settings-plugin/src/main/kotlin/com/facebook/react/ReactSettingsExtension.kt +++ b/packages/gradle-plugin/settings-plugin/src/main/kotlin/com/facebook/react/ReactSettingsExtension.kt @@ -51,7 +51,7 @@ abstract class ReactSettingsExtension @Inject constructor(val settings: Settings lockFiles: FileCollection = settings.layout.rootDirectory .dir("../") - .files("yarn.lock", "package-lock.json", "package.json", "react-native.config.js") + .files("yarn.lock", "package-lock.json", "package.json", "react-native.config.js"), ) { outputFile.parentFile.mkdirs() diff --git a/packages/gradle-plugin/shared-testutil/src/main/kotlin/com/facebook/react/tests/WithOs.kt b/packages/gradle-plugin/shared-testutil/src/main/kotlin/com/facebook/react/tests/WithOs.kt index 45d0a0072af..644c3809f3a 100644 --- a/packages/gradle-plugin/shared-testutil/src/main/kotlin/com/facebook/react/tests/WithOs.kt +++ b/packages/gradle-plugin/shared-testutil/src/main/kotlin/com/facebook/react/tests/WithOs.kt @@ -13,5 +13,5 @@ package com.facebook.react.tests enum class OS(val propertyName: String) { WIN("Windows"), MAC("MacOs"), - LINUX("Linux") + LINUX("Linux"), } diff --git a/packages/gradle-plugin/shared/src/main/kotlin/com/facebook/react/model/ModelAutolinkingAndroidProjectJson.kt b/packages/gradle-plugin/shared/src/main/kotlin/com/facebook/react/model/ModelAutolinkingAndroidProjectJson.kt index 9a97eeab802..87a560d5fa9 100644 --- a/packages/gradle-plugin/shared/src/main/kotlin/com/facebook/react/model/ModelAutolinkingAndroidProjectJson.kt +++ b/packages/gradle-plugin/shared/src/main/kotlin/com/facebook/react/model/ModelAutolinkingAndroidProjectJson.kt @@ -14,5 +14,5 @@ data class ModelAutolinkingAndroidProjectJson( val applicationId: String, val mainActivity: String, val watchModeCommandParams: List?, - val dependencyConfiguration: String? + val dependencyConfiguration: String?, ) diff --git a/packages/gradle-plugin/shared/src/main/kotlin/com/facebook/react/model/ModelAutolinkingDependenciesJson.kt b/packages/gradle-plugin/shared/src/main/kotlin/com/facebook/react/model/ModelAutolinkingDependenciesJson.kt index 2373a83d856..bb52d467508 100644 --- a/packages/gradle-plugin/shared/src/main/kotlin/com/facebook/react/model/ModelAutolinkingDependenciesJson.kt +++ b/packages/gradle-plugin/shared/src/main/kotlin/com/facebook/react/model/ModelAutolinkingDependenciesJson.kt @@ -10,7 +10,7 @@ package com.facebook.react.model data class ModelAutolinkingDependenciesJson( val root: String, val name: String, - val platforms: ModelAutolinkingDependenciesPlatformJson? + val platforms: ModelAutolinkingDependenciesPlatformJson?, ) { val nameCleansed: String diff --git a/packages/gradle-plugin/shared/src/main/kotlin/com/facebook/react/model/ModelAutolinkingDependenciesPlatformAndroidJson.kt b/packages/gradle-plugin/shared/src/main/kotlin/com/facebook/react/model/ModelAutolinkingDependenciesPlatformAndroidJson.kt index 5285d763174..947f0f3f229 100644 --- a/packages/gradle-plugin/shared/src/main/kotlin/com/facebook/react/model/ModelAutolinkingDependenciesPlatformAndroidJson.kt +++ b/packages/gradle-plugin/shared/src/main/kotlin/com/facebook/react/model/ModelAutolinkingDependenciesPlatformAndroidJson.kt @@ -19,5 +19,5 @@ data class ModelAutolinkingDependenciesPlatformAndroidJson( val cxxModuleCMakeListsPath: String? = null, val cxxModuleHeaderName: String? = null, val dependencyConfiguration: String? = null, - val isPureCxxDependency: Boolean? = null + val isPureCxxDependency: Boolean? = null, ) diff --git a/packages/gradle-plugin/shared/src/main/kotlin/com/facebook/react/utils/TaskUtils.kt b/packages/gradle-plugin/shared/src/main/kotlin/com/facebook/react/utils/TaskUtils.kt index ebb3185648a..a4482aba158 100644 --- a/packages/gradle-plugin/shared/src/main/kotlin/com/facebook/react/utils/TaskUtils.kt +++ b/packages/gradle-plugin/shared/src/main/kotlin/com/facebook/react/utils/TaskUtils.kt @@ -18,7 +18,7 @@ fun windowsAwareCommandLine(args: List): List = fun windowsAwareBashCommandLine( vararg args: String, - bashWindowsHome: String? = null + bashWindowsHome: String? = null, ): List = if (Os.isWindows()) { listOf(bashWindowsHome ?: "bash", "-c") + args diff --git a/packages/react-native-popup-menu-android/android/src/main/java/com/facebook/react/popupmenu/PopupMenuPackage.kt b/packages/react-native-popup-menu-android/android/src/main/java/com/facebook/react/popupmenu/PopupMenuPackage.kt index f9f04fe3bfe..199713731ad 100644 --- a/packages/react-native-popup-menu-android/android/src/main/java/com/facebook/react/popupmenu/PopupMenuPackage.kt +++ b/packages/react-native-popup-menu-android/android/src/main/java/com/facebook/react/popupmenu/PopupMenuPackage.kt @@ -38,7 +38,7 @@ public class PopupMenuPackage() : BaseReactPackage(), ViewManagerOnDemandReactPa override fun createViewManager( reactContext: ReactApplicationContext, - viewManagerName: String + viewManagerName: String, ): ViewManager<*, *>? { val spec: ModuleSpec? = viewManagersMap.get(viewManagerName) return if (spec != null) (spec.getProvider().get() as ViewManager<*, *>) else null diff --git a/packages/react-native-popup-menu-android/android/src/main/java/com/facebook/react/popupmenu/ReactPopupMenuManager.kt b/packages/react-native-popup-menu-android/android/src/main/java/com/facebook/react/popupmenu/ReactPopupMenuManager.kt index 8ff1429c126..17b3376d558 100644 --- a/packages/react-native-popup-menu-android/android/src/main/java/com/facebook/react/popupmenu/ReactPopupMenuManager.kt +++ b/packages/react-native-popup-menu-android/android/src/main/java/com/facebook/react/popupmenu/ReactPopupMenuManager.kt @@ -57,6 +57,7 @@ public class ReactPopupMenuManager : mapOf( PopupMenuSelectionEvent.EVENT_NAME to mapOf(REGISTRATION_NAME to "onPopupMenuSelectionChange"), - PopupMenuDismissEvent.EVENT_NAME to mapOf(REGISTRATION_NAME to "onPopupMenuDismiss")) + PopupMenuDismissEvent.EVENT_NAME to mapOf(REGISTRATION_NAME to "onPopupMenuDismiss"), + ) } } diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/debug/tags/ReactDebugOverlayTags.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/debug/tags/ReactDebugOverlayTags.kt index 492965d1670..faf64f2a64f 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/debug/tags/ReactDebugOverlayTags.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/debug/tags/ReactDebugOverlayTags.kt @@ -32,5 +32,6 @@ internal object ReactDebugOverlayTags { DebugOverlayTag( "UI Manager", "UI Manager View Operations (requires restart\nwarning: this is spammy)", - Color.CYAN) + Color.CYAN, + ) } diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/hermes/reactexecutor/HermesExecutor.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/hermes/reactexecutor/HermesExecutor.kt index 0277e17dadd..d343739d304 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/hermes/reactexecutor/HermesExecutor.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/hermes/reactexecutor/HermesExecutor.kt @@ -41,7 +41,7 @@ public class HermesExecutor internal constructor(enableDebugger: Boolean, debugg @JvmStatic private external fun initHybridDefaultConfig( enableDebugger: Boolean, - debuggerName: String + debuggerName: String, ): HybridData @DoNotStrip @@ -49,7 +49,7 @@ public class HermesExecutor internal constructor(enableDebugger: Boolean, debugg private external fun initHybrid( enableDebugger: Boolean, debuggerName: String, - heapSizeMB: Long + heapSizeMB: Long, ): HybridData } } diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/BaseReactPackage.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/BaseReactPackage.kt index 9ad6912d215..097387ff737 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/BaseReactPackage.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/BaseReactPackage.kt @@ -37,7 +37,7 @@ public abstract class BaseReactPackage : ReactPackage { */ abstract override fun getModule( name: String, - reactContext: ReactApplicationContext + reactContext: ReactApplicationContext, ): NativeModule? /** @@ -126,7 +126,7 @@ public abstract class BaseReactPackage : ReactPackage { private inner class ModuleHolderProvider( private val name: String, - private val reactContext: ReactApplicationContext + private val reactContext: ReactApplicationContext, ) : Provider { override fun get(): NativeModule? = getModule(name, reactContext) } diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/CoreModulesPackage.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/CoreModulesPackage.kt index 29f02c66452..2e0f0b207eb 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/CoreModulesPackage.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/CoreModulesPackage.kt @@ -53,16 +53,18 @@ import com.facebook.systrace.Systrace HeadlessJsTaskSupportModule::class, SourceCodeModule::class, TimingModule::class, - com.facebook.react.uimanager.UIManagerModule::class]) + com.facebook.react.uimanager.UIManagerModule::class, + ]) @LegacyArchitecture(logLevel = LegacyArchitectureLogLevel.ERROR) @Deprecated( message = "This class is part of Legacy Architecture and will be removed in a future release", - level = DeprecationLevel.WARNING) + level = DeprecationLevel.WARNING, +) internal class CoreModulesPackage( private val reactInstanceManager: ReactInstanceManager, private val hardwareBackBtnHandler: DefaultHardwareBackBtnHandler, private val lazyViewManagersEnabled: Boolean, - private val minTimeLeftInFrameForNonBatchedOperationMs: Int + private val minTimeLeftInFrameForNonBatchedOperationMs: Int, ) : BaseReactPackage(), ReactPackageLogger { /** * This method is overridden, since OSS does not run the annotation processor to generate @@ -84,10 +86,14 @@ internal class CoreModulesPackage( return fallbackForMissingClass() } catch (e: InstantiationException) { throw RuntimeException( - "No ReactModuleInfoProvider for CoreModulesPackage$\$ReactModuleInfoProvider", e) + "No ReactModuleInfoProvider for CoreModulesPackage$\$ReactModuleInfoProvider", + e, + ) } catch (e: IllegalAccessException) { throw RuntimeException( - "No ReactModuleInfoProvider for CoreModulesPackage$\$ReactModuleInfoProvider", e) + "No ReactModuleInfoProvider for CoreModulesPackage$\$ReactModuleInfoProvider", + e, + ) } } @@ -121,7 +127,8 @@ internal class CoreModulesPackage( reactModule.canOverrideExistingModule, reactModule.needsEagerInit, reactModule.isCxxModule, - ReactModuleInfo.classIsTurboModule(moduleClass)) + ReactModuleInfo.classIsTurboModule(moduleClass), + ) } } @@ -170,12 +177,16 @@ internal class CoreModulesPackage( } return com.facebook.react.uimanager.UIManagerModule( - reactContext, resolver, minTimeLeftInFrameForNonBatchedOperationMs) + reactContext, + resolver, + minTimeLeftInFrameForNonBatchedOperationMs, + ) } else { return com.facebook.react.uimanager.UIManagerModule( reactContext, reactInstanceManager.getOrCreateViewManagers(reactContext), - minTimeLeftInFrameForNonBatchedOperationMs) + minTimeLeftInFrameForNonBatchedOperationMs, + ) } } finally { Systrace.endSection(Systrace.TRACE_TAG_REACT) @@ -194,7 +205,9 @@ internal class CoreModulesPackage( private companion object { init { LegacyArchitectureLogger.assertLegacyArchitecture( - "CoreModulesPackage", LegacyArchitectureLogLevel.ERROR) + "CoreModulesPackage", + LegacyArchitectureLogLevel.ERROR, + ) } } } diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/DebugCorePackage.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/DebugCorePackage.kt index 7d4aeac4ee7..64e044fe55d 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/DebugCorePackage.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/DebugCorePackage.kt @@ -35,7 +35,7 @@ public class DebugCorePackage public constructor() : public override fun getModule( name: String, - reactContext: ReactApplicationContext + reactContext: ReactApplicationContext, ): NativeModule? = null public override fun getViewManagers(reactContext: ReactApplicationContext): List = @@ -46,7 +46,7 @@ public class DebugCorePackage public constructor() : override fun createViewManager( reactContext: ReactApplicationContext, - viewManagerName: String + viewManagerName: String, ): ViewManager<*, *>? = viewManagersMap.getOrDefault(viewManagerName, null)?.provider?.get() as? ViewManager<*, *> } diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/HeadlessJsTaskService.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/HeadlessJsTaskService.kt index 09c33f45810..dd30369b7e6 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/HeadlessJsTaskService.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/HeadlessJsTaskService.kt @@ -175,7 +175,9 @@ public abstract class HeadlessJsTaskService : Service(), HeadlessJsTaskEventList wakeLock = powerManager .newWakeLock( - PowerManager.PARTIAL_WAKE_LOCK, HeadlessJsTaskService::class.java.canonicalName) + PowerManager.PARTIAL_WAKE_LOCK, + HeadlessJsTaskService::class.java.canonicalName, + ) .also { lock -> lock.setReferenceCounted(false) lock.acquire() diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/MemoryPressureRouter.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/MemoryPressureRouter.kt index b0d6ed7f24a..2394f10066d 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/MemoryPressureRouter.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/MemoryPressureRouter.kt @@ -44,7 +44,9 @@ public class MemoryPressureRouter(context: Context) : ComponentCallbacks2 { public override fun onConfigurationChanged(newConfig: Configuration): Unit = Unit @Deprecated( - "onLowMemory is deprecated, use onTrimMemory instead.", ReplaceWith("onTrimMemory(level)")) + "onLowMemory is deprecated, use onTrimMemory instead.", + ReplaceWith("onTrimMemory(level)"), + ) public override fun onLowMemory(): Unit = Unit private fun dispatchMemoryPressure(level: Int) { diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/NativeModuleRegistryBuilder.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/NativeModuleRegistryBuilder.kt index a3593875084..ffec73631b7 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/NativeModuleRegistryBuilder.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/NativeModuleRegistryBuilder.kt @@ -20,7 +20,8 @@ import com.facebook.react.common.annotations.internal.LegacyArchitectureLogger @LegacyArchitecture(logLevel = LegacyArchitectureLogLevel.ERROR) @Deprecated( message = "This class is part of Legacy Architecture and will be removed in a future release", - level = DeprecationLevel.WARNING) + level = DeprecationLevel.WARNING, +) public class NativeModuleRegistryBuilder( private val reactApplicationContext: ReactApplicationContext, ) { @@ -29,10 +30,11 @@ public class NativeModuleRegistryBuilder( @Deprecated( "ReactInstanceManager is not used", - ReplaceWith("NativeModuleRegistryBuilder(reactApplicationContext)")) + ReplaceWith("NativeModuleRegistryBuilder(reactApplicationContext)"), + ) public constructor( reactApplicationContext: ReactApplicationContext, - @Suppress("UNUSED_PARAMETER") reactInstanceManager: ReactInstanceManager + @Suppress("UNUSED_PARAMETER") reactInstanceManager: ReactInstanceManager, ) : this(reactApplicationContext) public fun processPackage(reactPackage: ReactPackage) { @@ -71,7 +73,9 @@ by autolinking. Try removing the existing entry and rebuild. private companion object { init { LegacyArchitectureLogger.assertLegacyArchitecture( - "NativeModuleRegistryBuilder", LegacyArchitectureLogLevel.ERROR) + "NativeModuleRegistryBuilder", + LegacyArchitectureLogLevel.ERROR, + ) } } } diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/ReactApplication.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/ReactApplication.kt index a02ff8f5260..ef8b0ed3cdc 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/ReactApplication.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/ReactApplication.kt @@ -13,7 +13,8 @@ public interface ReactApplication { @Suppress("DEPRECATION") @Deprecated( "You should not use ReactNativeHost directly in the New Architecture. Use ReactHost instead.", - ReplaceWith("reactHost")) + ReplaceWith("reactHost"), + ) public val reactNativeHost: ReactNativeHost get() { throw RuntimeException("You should not use ReactNativeHost directly in the New Architecture") diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/ReactDelegate.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/ReactDelegate.kt index 4d81bc58c11..e2959bb24df 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/ReactDelegate.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/ReactDelegate.kt @@ -35,7 +35,8 @@ public open class ReactDelegate { @Deprecated( "You should not use ReactNativeHost directly in the New Architecture. Use ReactHost instead.", - ReplaceWith("reactHost")) + ReplaceWith("reactHost"), + ) private var reactNativeHost: ReactNativeHost? = null public var reactHost: ReactHost? = null private set @@ -63,7 +64,7 @@ public open class ReactDelegate { activity: Activity, reactNativeHost: ReactNativeHost?, appKey: String?, - launchOptions: Bundle? + launchOptions: Bundle?, ) { this.activity = activity mainComponentName = appKey @@ -76,7 +77,7 @@ public open class ReactDelegate { activity: Activity, reactHost: ReactHost?, appKey: String?, - launchOptions: Bundle? + launchOptions: Bundle?, ) { this.activity = activity mainComponentName = appKey @@ -91,7 +92,7 @@ public open class ReactDelegate { reactNativeHost: ReactNativeHost?, appKey: String?, launchOptions: Bundle?, - fabricEnabled: Boolean + fabricEnabled: Boolean, ) { isFabricEnabled = fabricEnabled this.activity = activity @@ -196,7 +197,7 @@ public open class ReactDelegate { requestCode: Int, resultCode: Int, data: Intent?, - shouldForwardToReactInstance: Boolean + shouldForwardToReactInstance: Boolean, ) { if (ReactNativeNewArchitectureFeatureFlags.enableBridgelessArchitecture() && reactHost != null && @@ -313,7 +314,10 @@ public open class ReactDelegate { internalReactRootView = createRootView() if (reactNativeHost != null) { internalReactRootView?.startReactApplication( - reactNativeHost?.reactInstanceManager, appKey, launchOptions) + reactNativeHost?.reactInstanceManager, + appKey, + launchOptions, + ) } } } diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/ReactFragment.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/ReactFragment.kt index f2b8face3ef..927c1fbc485 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/ReactFragment.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/ReactFragment.kt @@ -48,7 +48,12 @@ public open class ReactFragment : Fragment(), PermissionAwareActivity { } else { @Suppress("DEPRECATION") ReactDelegate( - requireActivity(), reactNativeHost, mainComponentName, launchOptions, fabricEnabled) + requireActivity(), + reactNativeHost, + mainComponentName, + launchOptions, + fabricEnabled, + ) } } @@ -61,7 +66,8 @@ public open class ReactFragment : Fragment(), PermissionAwareActivity { @Suppress("DEPRECATION") @Deprecated( "You should not use ReactNativeHost directly in the New Architecture. Use ReactHost instead.", - ReplaceWith("reactHost")) + ReplaceWith("reactHost"), + ) protected open val reactNativeHost: ReactNativeHost? get() = (activity?.application as ReactApplication?)?.reactNativeHost @@ -80,7 +86,7 @@ public open class ReactFragment : Fragment(), PermissionAwareActivity { public override fun onCreateView( inflater: LayoutInflater, container: ViewGroup?, - savedInstanceState: Bundle? + savedInstanceState: Bundle?, ): View? { reactDelegate.loadApp() return reactDelegate.reactRootView @@ -139,7 +145,7 @@ public open class ReactFragment : Fragment(), PermissionAwareActivity { public override fun onRequestPermissionsResult( requestCode: Int, permissions: Array, - grantResults: IntArray + grantResults: IntArray, ) { @Suppress("DEPRECATION") super.onRequestPermissionsResult(requestCode, permissions, grantResults) @@ -160,7 +166,7 @@ public open class ReactFragment : Fragment(), PermissionAwareActivity { override fun requestPermissions( permissions: Array, requestCode: Int, - listener: PermissionListener? + listener: PermissionListener?, ) { permissionListener = listener requestPermissions(permissions, requestCode) @@ -223,7 +229,7 @@ public open class ReactFragment : Fragment(), PermissionAwareActivity { private fun newInstance( componentName: String?, launchOptions: Bundle?, - fabricEnabled: Boolean + fabricEnabled: Boolean, ): ReactFragment { val args = Bundle().apply { diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/ReactHost.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/ReactHost.kt index 59fca92bccc..8119107cd82 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/ReactHost.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/ReactHost.kt @@ -55,7 +55,7 @@ public interface ReactHost { /** To be called when the host activity is resumed. */ public fun onHostResume( activity: Activity?, - defaultBackButtonImpl: DefaultHardwareBackBtnHandler? + defaultBackButtonImpl: DefaultHardwareBackBtnHandler?, ) /** To be called when the host activity is resumed. */ @@ -83,7 +83,7 @@ public interface ReactHost { public fun createSurface( context: Context, moduleName: String, - initialProps: Bundle? + initialProps: Bundle?, ): ReactSurface /** @@ -147,7 +147,7 @@ public interface ReactHost { public fun destroy( reason: String, ex: Exception?, - onDestroyFinished: (instanceDestroyedSuccessfully: Boolean) -> Unit = {} + onDestroyFinished: (instanceDestroyedSuccessfully: Boolean) -> Unit = {}, ): TaskInterface /** diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManagerBuilder.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManagerBuilder.kt index 14e4c078826..8c1634fc329 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManagerBuilder.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManagerBuilder.kt @@ -344,7 +344,10 @@ public class ReactInstanceManagerBuilder { ?: getDefaultJSExecutorFactory(appName, deviceName, application.applicationContext), if ((jsBundleLoader == null && safeJSBundleAssetUrl != null)) JSBundleLoader.createAssetLoader( - application, safeJSBundleAssetUrl, loadSynchronously = false) + application, + safeJSBundleAssetUrl, + loadSynchronously = false, + ) else jsBundleLoader, jsMainModulePath, packages, @@ -366,13 +369,14 @@ public class ReactInstanceManagerBuilder { surfaceDelegateFactory, devLoadingViewManager, choreographerProvider, - pausedInDebuggerOverlayManager) + pausedInDebuggerOverlayManager, + ) } private fun getDefaultJSExecutorFactory( appName: String, deviceName: String, - applicationContext: Context + applicationContext: Context, ): JavaScriptExecutorFactory? { ReactInstanceManager.initializeSoLoaderIfNecessary(applicationContext) // Hermes has been enabled by default in OSS since React Native 0.70. @@ -382,7 +386,8 @@ public class ReactInstanceManagerBuilder { } catch (error: UnsatisfiedLinkError) { FLog.e( TAG, - "Unable to load Hermes. Your application is not built correctly and will fail to execute") + "Unable to load Hermes. Your application is not built correctly and will fail to execute", + ) return null } } @@ -390,7 +395,9 @@ public class ReactInstanceManagerBuilder { private companion object { init { LegacyArchitectureLogger.assertLegacyArchitecture( - "ReactInstanceManagerBuilder", LegacyArchitectureLogLevel.ERROR) + "ReactInstanceManagerBuilder", + LegacyArchitectureLogLevel.ERROR, + ) } private val TAG: String = ReactInstanceManagerBuilder::class.java.simpleName diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/ReactPackageHelper.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/ReactPackageHelper.kt index 28a3c0acca3..4bb9b419988 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/ReactPackageHelper.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/ReactPackageHelper.kt @@ -23,11 +23,12 @@ internal object ReactPackageHelper { */ fun getNativeModuleIterator( reactPackage: ReactPackage, - reactApplicationContext: ReactApplicationContext + reactApplicationContext: ReactApplicationContext, ): Iterable { FLog.d( ReactConstants.TAG, - "${reactPackage.javaClass.simpleName} is not a LazyReactPackage, falling back to old version.") + "${reactPackage.javaClass.simpleName} is not a LazyReactPackage, falling back to old version.", + ) @Suppress("DEPRECATION") val nativeModules = reactPackage.createNativeModules(reactApplicationContext) return Iterable { diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/ReactPackageTurboModuleManagerDelegate.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/ReactPackageTurboModuleManagerDelegate.kt index d13a565d6e0..43c5e363b01 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/ReactPackageTurboModuleManagerDelegate.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/ReactPackageTurboModuleManagerDelegate.kt @@ -32,7 +32,7 @@ public abstract class ReactPackageTurboModuleManagerDelegate : TurboModuleManage protected constructor( reactApplicationContext: ReactApplicationContext, - packages: List + packages: List, ) : super() { initialize(reactApplicationContext, packages) } @@ -40,14 +40,14 @@ public abstract class ReactPackageTurboModuleManagerDelegate : TurboModuleManage protected constructor( reactApplicationContext: ReactApplicationContext, packages: List, - hybridData: HybridData + hybridData: HybridData, ) : super(hybridData) { initialize(reactApplicationContext, packages) } private fun initialize( reactApplicationContext: ReactApplicationContext, - packages: List + packages: List, ) { val applicationContext: ReactApplicationContext = reactApplicationContext for (reactPackage in packages) { @@ -104,7 +104,8 @@ public abstract class ReactPackageTurboModuleManagerDelegate : TurboModuleManage reactModule.canOverrideExistingModule, true, reactModule.isCxxModule, - ReactModuleInfo.classIsTurboModule(moduleClass)) + ReactModuleInfo.classIsTurboModule(moduleClass), + ) else ReactModuleInfo( moduleName, @@ -112,7 +113,8 @@ public abstract class ReactPackageTurboModuleManagerDelegate : TurboModuleManage module.canOverrideExistingModule(), true, CxxModuleWrapper::class.java.isAssignableFrom(moduleClass), - ReactModuleInfo.classIsTurboModule(moduleClass)) + ReactModuleInfo.classIsTurboModule(moduleClass), + ) reactModuleInfoMap[moduleName] = moduleInfo moduleMap[moduleName] = module @@ -226,7 +228,7 @@ public abstract class ReactPackageTurboModuleManagerDelegate : TurboModuleManage protected abstract fun build( context: ReactApplicationContext, - packages: List + packages: List, ): ReactPackageTurboModuleManagerDelegate public fun build(): ReactPackageTurboModuleManagerDelegate { diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/TurboReactPackage.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/TurboReactPackage.kt index 80bbf61cc34..3af1cb7bbc4 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/TurboReactPackage.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/TurboReactPackage.kt @@ -9,5 +9,6 @@ package com.facebook.react @Deprecated( message = "Use BaseReactPackage instead", - replaceWith = ReplaceWith(expression = "BaseReactPackage")) + replaceWith = ReplaceWith(expression = "BaseReactPackage"), +) public abstract class TurboReactPackage : BaseReactPackage() diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/ViewManagerOnDemandReactPackage.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/ViewManagerOnDemandReactPackage.kt index 1517689e89a..3b3f381c24f 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/ViewManagerOnDemandReactPackage.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/ViewManagerOnDemandReactPackage.kt @@ -23,6 +23,6 @@ public interface ViewManagerOnDemandReactPackage { */ public fun createViewManager( reactContext: ReactApplicationContext, - viewManagerName: String + viewManagerName: String, ): ViewManager? } diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/animated/AdditionAnimatedNode.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/animated/AdditionAnimatedNode.kt index fd93cee90ff..4cb74744844 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/animated/AdditionAnimatedNode.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/animated/AdditionAnimatedNode.kt @@ -16,7 +16,7 @@ import com.facebook.react.bridge.ReadableMap */ internal class AdditionAnimatedNode( config: ReadableMap, - private val nativeAnimatedNodesManager: NativeAnimatedNodesManager + private val nativeAnimatedNodesManager: NativeAnimatedNodesManager, ) : ValueAnimatedNode() { private val inputNodes: IntArray @@ -44,7 +44,8 @@ internal class AdditionAnimatedNode( throw JSApplicationCausedNativeException( "Illegal node ID set as an input for Animated.Add node") } - }) + }, + ) } override fun prettyPrint(): String = diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/animated/ColorAnimatedNode.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/animated/ColorAnimatedNode.kt index bf41ba7d3b9..d971d8fd2d3 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/animated/ColorAnimatedNode.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/animated/ColorAnimatedNode.kt @@ -18,7 +18,7 @@ import com.facebook.react.views.view.ColorUtil.normalize internal class ColorAnimatedNode( config: ReadableMap, private val nativeAnimatedNodesManager: NativeAnimatedNodesManager, - private val reactApplicationContext: ReactApplicationContext + private val reactApplicationContext: ReactApplicationContext, ) : AnimatedNode(), AnimatedNodeWithUpdateableConfig { private var rNodeId = 0 private var gNodeId = 0 diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/animated/DiffClampAnimatedNode.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/animated/DiffClampAnimatedNode.kt index fbe312e4859..99f2d2b60fa 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/animated/DiffClampAnimatedNode.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/animated/DiffClampAnimatedNode.kt @@ -14,7 +14,7 @@ import kotlin.math.min internal class DiffClampAnimatedNode( config: ReadableMap, - private val nativeAnimatedNodesManager: NativeAnimatedNodesManager + private val nativeAnimatedNodesManager: NativeAnimatedNodesManager, ) : ValueAnimatedNode() { private val inputNodeTag: Int private val minValue: Double diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/animated/DivisionAnimatedNode.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/animated/DivisionAnimatedNode.kt index b2625bf0f00..2fbf7ab1e16 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/animated/DivisionAnimatedNode.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/animated/DivisionAnimatedNode.kt @@ -16,7 +16,7 @@ import com.facebook.react.bridge.ReadableMap */ internal class DivisionAnimatedNode( config: ReadableMap, - private val nativeAnimatedNodesManager: NativeAnimatedNodesManager + private val nativeAnimatedNodesManager: NativeAnimatedNodesManager, ) : ValueAnimatedNode() { private val inputNodes: IntArray diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/animated/EventAnimationDriver.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/animated/EventAnimationDriver.kt index f273d7b69c1..87b74d0502c 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/animated/EventAnimationDriver.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/animated/EventAnimationDriver.kt @@ -21,10 +21,12 @@ internal class EventAnimationDriver( @JvmField var eventName: String, @JvmField internal var viewTag: Int, private val eventPath: List, - @JvmField internal var valueNode: ValueAnimatedNode + @JvmField internal var valueNode: ValueAnimatedNode, ) : RCTModernEventEmitter { @Deprecated( - "Deprecated in Java", ReplaceWith("receiveEvent(surfaceId, targetTag, eventName, params)")) + "Deprecated in Java", + ReplaceWith("receiveEvent(surfaceId, targetTag, eventName, params)"), + ) override fun receiveEvent(targetTag: Int, eventName: String, params: WritableMap?) = receiveEvent(-1, targetTag, eventName, params) @@ -32,7 +34,7 @@ internal class EventAnimationDriver( surfaceId: Int, targetTag: Int, eventName: String, - params: WritableMap? + params: WritableMap?, ) = // We assume this event can't be coalesced. `customCoalesceKey` has no meaning in Fabric. receiveEvent(surfaceId, targetTag, eventName, false, 0, params, EventCategoryDef.UNSPECIFIED) @@ -41,7 +43,7 @@ internal class EventAnimationDriver( override fun receiveTouches( eventName: String, touches: WritableArray, - changedIndices: WritableArray + changedIndices: WritableArray, ) { throw UnsupportedOperationException("receiveTouches is not support by native animated events") } @@ -53,7 +55,7 @@ internal class EventAnimationDriver( canCoalesceEvent: Boolean, customCoalesceKey: Int, params: WritableMap?, - @EventCategoryDef category: Int + @EventCategoryDef category: Int, ) { requireNotNull(params) { "Native animated events must have event data." } diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/animated/InterpolationAnimatedNode.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/animated/InterpolationAnimatedNode.kt index 8d1e3c724ed..3971db7a502 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/animated/InterpolationAnimatedNode.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/animated/InterpolationAnimatedNode.kt @@ -23,7 +23,7 @@ internal class InterpolationAnimatedNode(config: ReadableMap) : ValueAnimatedNod private enum class OutputType { Number, Color, - String + String, } private val inputRange: DoubleArray = fromDoubleArray(config.getArray("inputRange")) @@ -72,7 +72,8 @@ internal class InterpolationAnimatedNode(config: ReadableMap) : ValueAnimatedNod inputRange, outputRange as DoubleArray, extrapolateLeft, - extrapolateRight) + extrapolateRight, + ) OutputType.Color -> objectValue = Integer.valueOf(interpolateColor(parentValue, inputRange, outputRange as IntArray)) @@ -86,7 +87,8 @@ internal class InterpolationAnimatedNode(config: ReadableMap) : ValueAnimatedNod inputRange, outputRange as Array, extrapolateLeft, - extrapolateRight) + extrapolateRight, + ) } else -> {} @@ -159,7 +161,7 @@ internal class InterpolationAnimatedNode(config: ReadableMap) : ValueAnimatedNod outputMin: Double, outputMax: Double, extrapolateLeft: String?, - extrapolateRight: String? + extrapolateRight: String?, ): Double { var result = value @@ -199,7 +201,7 @@ internal class InterpolationAnimatedNode(config: ReadableMap) : ValueAnimatedNod inputRange: DoubleArray, outputRange: DoubleArray, extrapolateLeft: String?, - extrapolateRight: String? + extrapolateRight: String?, ): Double { val rangeIndex = findRangeIndex(value, inputRange) return interpolate( @@ -209,7 +211,8 @@ internal class InterpolationAnimatedNode(config: ReadableMap) : ValueAnimatedNod outputRange[rangeIndex], outputRange[rangeIndex + 1], extrapolateLeft, - extrapolateRight) + extrapolateRight, + ) } fun interpolateColor(value: Double, inputRange: DoubleArray, outputRange: IntArray): Int { @@ -236,7 +239,7 @@ internal class InterpolationAnimatedNode(config: ReadableMap) : ValueAnimatedNod inputRange: DoubleArray, outputRange: Array, extrapolateLeft: String?, - extrapolateRight: String? + extrapolateRight: String?, ): String { val rangeIndex = findRangeIndex(value, inputRange) val sb = StringBuffer(pattern.length) @@ -251,7 +254,8 @@ internal class InterpolationAnimatedNode(config: ReadableMap) : ValueAnimatedNod outputRange[rangeIndex][i], outputRange[rangeIndex + 1][i], extrapolateLeft, - extrapolateRight) + extrapolateRight, + ) val intVal = v.toInt() m.appendReplacement(sb, if (intVal.toDouble() != v) v.toString() else intVal.toString()) i++ diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/animated/ModulusAnimatedNode.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/animated/ModulusAnimatedNode.kt index 8da36dd4840..c5a0ed3b39b 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/animated/ModulusAnimatedNode.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/animated/ModulusAnimatedNode.kt @@ -12,7 +12,7 @@ import com.facebook.react.bridge.ReadableMap internal class ModulusAnimatedNode( config: ReadableMap, - private val nativeAnimatedNodesManager: NativeAnimatedNodesManager + private val nativeAnimatedNodesManager: NativeAnimatedNodesManager, ) : ValueAnimatedNode() { private val inputNode: Int = config.getInt("input") diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/animated/MultiplicationAnimatedNode.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/animated/MultiplicationAnimatedNode.kt index fa1f7d4a8e1..9d9694329ca 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/animated/MultiplicationAnimatedNode.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/animated/MultiplicationAnimatedNode.kt @@ -16,7 +16,7 @@ import com.facebook.react.bridge.ReadableMap */ internal class MultiplicationAnimatedNode( config: ReadableMap, - private val nativeAnimatedNodesManager: NativeAnimatedNodesManager + private val nativeAnimatedNodesManager: NativeAnimatedNodesManager, ) : ValueAnimatedNode() { private var inputNodes: IntArray diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/animated/NativeAnimatedModule.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/animated/NativeAnimatedModule.kt index e7b216f30a0..5f0e8ade2a4 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/animated/NativeAnimatedModule.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/animated/NativeAnimatedModule.kt @@ -383,14 +383,18 @@ public class NativeAnimatedModule(reactContext: ReactApplicationContext) : private fun clearFrameCallback() { reactChoreographer.removeFrameCallback( - ReactChoreographer.CallbackType.NATIVE_ANIMATED_MODULE, animatedFrameCallback) + ReactChoreographer.CallbackType.NATIVE_ANIMATED_MODULE, + animatedFrameCallback, + ) enqueuedAnimationOnFrame = false } private fun enqueueFrameCallback() { if (!enqueuedAnimationOnFrame) { reactChoreographer.postFrameCallback( - ReactChoreographer.CallbackType.NATIVE_ANIMATED_MODULE, animatedFrameCallback) + ReactChoreographer.CallbackType.NATIVE_ANIMATED_MODULE, + animatedFrameCallback, + ) enqueuedAnimationOnFrame = true } } @@ -417,7 +421,8 @@ public class NativeAnimatedModule(reactContext: ReactApplicationContext) : ReactSoftExceptionLogger.logSoftException( NAME, RuntimeException( - "initializeLifecycleEventListenersForViewTag could not get NativeAnimatedNodesManager")) + "initializeLifecycleEventListenersForViewTag could not get NativeAnimatedNodesManager"), + ) } // Subscribe to UIManager (Fabric or non-Fabric) lifecycle events if we haven't yet @@ -650,7 +655,7 @@ public class NativeAnimatedModule(reactContext: ReactApplicationContext) : animationIdDouble: Double, animatedNodeTagDouble: Double, animationConfig: ReadableMap, - endCallback: Callback + endCallback: Callback, ) { val animationId = animationIdDouble.toInt() val animatedNodeTag = animatedNodeTagDouble.toInt() @@ -665,7 +670,11 @@ public class NativeAnimatedModule(reactContext: ReactApplicationContext) : FLog.d(NAME, "execute startAnimatingNode: ID: $animationId tag: $animatedNodeTag") } animatedNodesManager.startAnimatingNode( - animationId, animatedNodeTag, animationConfig, endCallback) + animationId, + animatedNodeTag, + animationConfig, + endCallback, + ) } }) } @@ -700,7 +709,8 @@ public class NativeAnimatedModule(reactContext: ReactApplicationContext) : if (ANIMATED_MODULE_DEBUG) { FLog.d( NAME, - ("execute connectAnimatedNodes: parent: $parentNodeTag child: $childNodeTag")) + ("execute connectAnimatedNodes: parent: $parentNodeTag child: $childNodeTag"), + ) } animatedNodesManager.connectAnimatedNodes(parentNodeTag, childNodeTag) } @@ -720,7 +730,8 @@ public class NativeAnimatedModule(reactContext: ReactApplicationContext) : if (ANIMATED_MODULE_DEBUG) { FLog.d( NAME, - ("execute disconnectAnimatedNodes: parent: $parentNodeTag child: $childNodeTag")) + ("execute disconnectAnimatedNodes: parent: $parentNodeTag child: $childNodeTag"), + ) } animatedNodesManager.disconnectAnimatedNodes(parentNodeTag, childNodeTag) } @@ -733,7 +744,8 @@ public class NativeAnimatedModule(reactContext: ReactApplicationContext) : if (ANIMATED_MODULE_DEBUG) { FLog.d( NAME, - ("queue connectAnimatedNodeToView: animatedNodeTag: $animatedNodeTag viewTag: $viewTag")) + ("queue connectAnimatedNodeToView: animatedNodeTag: $animatedNodeTag viewTag: $viewTag"), + ) } initializeLifecycleEventListenersForViewTag(viewTag) @@ -744,7 +756,8 @@ public class NativeAnimatedModule(reactContext: ReactApplicationContext) : if (ANIMATED_MODULE_DEBUG) { FLog.d( NAME, - ("execute connectAnimatedNodeToView: animatedNodeTag: $animatedNodeTag viewTag: $viewTag")) + ("execute connectAnimatedNodeToView: animatedNodeTag: $animatedNodeTag viewTag: $viewTag"), + ) } animatedNodesManager.connectAnimatedNodeToView(animatedNodeTag, viewTag) } @@ -753,7 +766,7 @@ public class NativeAnimatedModule(reactContext: ReactApplicationContext) : override fun disconnectAnimatedNodeFromView( animatedNodeTagDouble: Double, - viewTagDouble: Double + viewTagDouble: Double, ) { val animatedNodeTag = animatedNodeTagDouble.toInt() val viewTag = viewTagDouble.toInt() @@ -769,7 +782,8 @@ public class NativeAnimatedModule(reactContext: ReactApplicationContext) : if (ANIMATED_MODULE_DEBUG) { FLog.d( NAME, - ("execute disconnectAnimatedNodeFromView: $animatedNodeTag viewTag: $viewTag")) + ("execute disconnectAnimatedNodeFromView: $animatedNodeTag viewTag: $viewTag"), + ) } animatedNodesManager.disconnectAnimatedNodeFromView(animatedNodeTag, viewTag) } @@ -796,13 +810,14 @@ public class NativeAnimatedModule(reactContext: ReactApplicationContext) : override fun addAnimatedEventToView( viewTagDouble: Double, eventName: String, - eventMapping: ReadableMap + eventMapping: ReadableMap, ) { val viewTag = viewTagDouble.toInt() if (ANIMATED_MODULE_DEBUG) { FLog.d( NAME, - ("queue addAnimatedEventToView: $viewTag eventName: $eventName eventMapping: ${eventMapping.toHashMap()}")) + ("queue addAnimatedEventToView: $viewTag eventName: $eventName eventMapping: ${eventMapping.toHashMap()}"), + ) } initializeLifecycleEventListenersForViewTag(viewTag) @@ -813,7 +828,8 @@ public class NativeAnimatedModule(reactContext: ReactApplicationContext) : if (ANIMATED_MODULE_DEBUG) { FLog.d( NAME, - ("execute addAnimatedEventToView: $viewTag eventName: $eventName eventMapping: ${eventMapping.toHashMap()}")) + ("execute addAnimatedEventToView: $viewTag eventName: $eventName eventMapping: ${eventMapping.toHashMap()}"), + ) } animatedNodesManager.addAnimatedEventToView(viewTag, eventName, eventMapping) } @@ -823,14 +839,15 @@ public class NativeAnimatedModule(reactContext: ReactApplicationContext) : override fun removeAnimatedEventFromView( viewTagDouble: Double, eventName: String, - animatedValueTagDouble: Double + animatedValueTagDouble: Double, ) { val viewTag = viewTagDouble.toInt() val animatedValueTag = animatedValueTagDouble.toInt() if (ANIMATED_MODULE_DEBUG) { FLog.d( NAME, - ("queue removeAnimatedEventFromView: viewTag: $viewTag eventName: $eventName animatedValueTag: $animatedValueTag")) + ("queue removeAnimatedEventFromView: viewTag: $viewTag eventName: $eventName animatedValueTag: $animatedValueTag"), + ) } decrementInFlightAnimationsForViewTag(viewTag) @@ -841,7 +858,8 @@ public class NativeAnimatedModule(reactContext: ReactApplicationContext) : if (ANIMATED_MODULE_DEBUG) { FLog.d( NAME, - ("execute removeAnimatedEventFromView: viewTag: $viewTag eventName: $eventName animatedValueTag: $animatedValueTag")) + ("execute removeAnimatedEventFromView: viewTag: $viewTag eventName: $eventName animatedValueTag: $animatedValueTag"), + ) } animatedNodesManager.removeAnimatedEventFromView(viewTag, eventName, animatedValueTag) } @@ -947,11 +965,15 @@ public class NativeAnimatedModule(reactContext: ReactApplicationContext) : when (command) { BatchExecutionOpCodes.OP_CODE_CREATE_ANIMATED_NODE -> animatedNodesManager.createAnimatedNode( - opsAndArgs.getInt(i++), checkNotNull(opsAndArgs.getMap(i++))) + opsAndArgs.getInt(i++), + checkNotNull(opsAndArgs.getMap(i++)), + ) BatchExecutionOpCodes.OP_CODE_UPDATE_ANIMATED_NODE_CONFIG -> animatedNodesManager.updateAnimatedNodeConfig( - opsAndArgs.getInt(i++), checkNotNull(opsAndArgs.getMap(i++))) + opsAndArgs.getInt(i++), + checkNotNull(opsAndArgs.getMap(i++)), + ) BatchExecutionOpCodes.OP_CODE_GET_VALUE -> animatedNodesManager.getValue(opsAndArgs.getInt(i++), null) @@ -967,7 +989,9 @@ public class NativeAnimatedModule(reactContext: ReactApplicationContext) : val reactApplicationContext = reactApplicationContextIfActiveOrWarn reactApplicationContext?.emitDeviceEvent( - "onAnimatedValueUpdate", onAnimatedValueData) + "onAnimatedValueUpdate", + onAnimatedValueData, + ) } animatedNodesManager.startListeningToAnimatedNodeValue(tag, listener) } @@ -977,29 +1001,38 @@ public class NativeAnimatedModule(reactContext: ReactApplicationContext) : BatchExecutionOpCodes.OP_CODE_CONNECT_ANIMATED_NODES -> animatedNodesManager.connectAnimatedNodes( - opsAndArgs.getInt(i++), opsAndArgs.getInt(i++)) + opsAndArgs.getInt(i++), + opsAndArgs.getInt(i++), + ) BatchExecutionOpCodes.OP_CODE_DISCONNECT_ANIMATED_NODES -> animatedNodesManager.disconnectAnimatedNodes( - opsAndArgs.getInt(i++), opsAndArgs.getInt(i++)) + opsAndArgs.getInt(i++), + opsAndArgs.getInt(i++), + ) BatchExecutionOpCodes.OP_CODE_START_ANIMATING_NODE -> animatedNodesManager.startAnimatingNode( opsAndArgs.getInt(i++), opsAndArgs.getInt(i++), checkNotNull(opsAndArgs.getMap(i++)), - null) + null, + ) BatchExecutionOpCodes.OP_CODE_STOP_ANIMATION -> animatedNodesManager.stopAnimation(opsAndArgs.getInt(i++)) BatchExecutionOpCodes.OP_CODE_SET_ANIMATED_NODE_VALUE -> animatedNodesManager.setAnimatedNodeValue( - opsAndArgs.getInt(i++), opsAndArgs.getDouble(i++)) + opsAndArgs.getInt(i++), + opsAndArgs.getDouble(i++), + ) BatchExecutionOpCodes.OP_CODE_SET_ANIMATED_NODE_OFFSET -> animatedNodesManager.setAnimatedNodeOffset( - opsAndArgs.getInt(i++), opsAndArgs.getDouble(i++)) + opsAndArgs.getInt(i++), + opsAndArgs.getDouble(i++), + ) BatchExecutionOpCodes.OP_CODE_FLATTEN_ANIMATED_NODE_OFFSET -> animatedNodesManager.flattenAnimatedNodeOffset(opsAndArgs.getInt(i++)) @@ -1009,7 +1042,9 @@ public class NativeAnimatedModule(reactContext: ReactApplicationContext) : BatchExecutionOpCodes.OP_CODE_CONNECT_ANIMATED_NODE_TO_VIEW -> animatedNodesManager.connectAnimatedNodeToView( - opsAndArgs.getInt(i++), opsAndArgs.getInt(i++)) + opsAndArgs.getInt(i++), + opsAndArgs.getInt(i++), + ) BatchExecutionOpCodes.OP_CODE_DISCONNECT_ANIMATED_NODE_FROM_VIEW -> { val animatedNodeTag = opsAndArgs.getInt(i++) @@ -1028,13 +1063,17 @@ public class NativeAnimatedModule(reactContext: ReactApplicationContext) : animatedNodesManager.addAnimatedEventToView( opsAndArgs.getInt(i++), checkNotNull(opsAndArgs.getString(i++)), - checkNotNull(opsAndArgs.getMap(i++))) + checkNotNull(opsAndArgs.getMap(i++)), + ) BatchExecutionOpCodes.OP_CODE_REMOVE_ANIMATED_EVENT_FROM_VIEW -> { viewTag = opsAndArgs.getInt(i++) decrementInFlightAnimationsForViewTag(viewTag) animatedNodesManager.removeAnimatedEventFromView( - viewTag, checkNotNull(opsAndArgs.getString(i++)), opsAndArgs.getInt(i++)) + viewTag, + checkNotNull(opsAndArgs.getString(i++)), + opsAndArgs.getInt(i++), + ) } BatchExecutionOpCodes.OP_CODE_ADD_LISTENER, diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/animated/NativeAnimatedNodesManager.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/animated/NativeAnimatedNodesManager.kt index 35918e30302..638f58c1211 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/animated/NativeAnimatedNodesManager.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/animated/NativeAnimatedNodesManager.kt @@ -216,7 +216,7 @@ public class NativeAnimatedNodesManager( animationId: Int, animatedNodeTag: Int, animationConfig: ReadableMap, - endCallback: Callback? + endCallback: Callback?, ) { val node = animatedNodes.get(animatedNodeTag) @@ -384,7 +384,8 @@ public class NativeAnimatedNodesManager( ReactSoftExceptionLogger.logSoftException( TAG, ReactNoCrashSoftException( - ("connectAnimatedNodeToView: Animated node could not be connected to UIManager - uiManager disappeared for tag: $viewTag"))) + ("connectAnimatedNodeToView: Animated node could not be connected to UIManager - uiManager disappeared for tag: $viewTag")), + ) return } @@ -450,7 +451,7 @@ public class NativeAnimatedNodesManager( public fun addAnimatedEventToView( viewTag: Int, eventHandlerName: String, - eventMapping: ReadableMap + eventMapping: ReadableMap, ) { val nodeTag = eventMapping.getInt("animatedValueTag") val node = @@ -483,7 +484,7 @@ public class NativeAnimatedNodesManager( public fun removeAnimatedEventFromView( viewTag: Int, eventHandlerName: String, - animatedValueTag: Int + animatedValueTag: Int, ) { val eventName = normalizeEventName(eventHandlerName) diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/animated/ObjectAnimatedNode.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/animated/ObjectAnimatedNode.kt index 14b1a33be8f..5eb7f2e4006 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/animated/ObjectAnimatedNode.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/animated/ObjectAnimatedNode.kt @@ -19,7 +19,7 @@ import com.facebook.react.bridge.ReadableType */ internal class ObjectAnimatedNode( config: ReadableMap, - private val nativeAnimatedNodesManager: NativeAnimatedNodesManager + private val nativeAnimatedNodesManager: NativeAnimatedNodesManager, ) : AnimatedNode() { private val configClone: JavaOnlyMap = JavaOnlyMap.deepClone(config) diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/animated/PropsAnimatedNode.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/animated/PropsAnimatedNode.kt index c2e812c6ecd..ab21eb434a9 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/animated/PropsAnimatedNode.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/animated/PropsAnimatedNode.kt @@ -22,7 +22,7 @@ import com.facebook.react.uimanager.common.ViewUtil.getUIManagerType */ internal class PropsAnimatedNode( config: ReadableMap, - private val nativeAnimatedNodesManager: NativeAnimatedNodesManager + private val nativeAnimatedNodesManager: NativeAnimatedNodesManager, ) : AnimatedNode() { private var connectedViewTag = -1 private val propNodeMapping: MutableMap diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/animated/StyleAnimatedNode.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/animated/StyleAnimatedNode.kt index 31c8c194187..2ffacb50b6c 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/animated/StyleAnimatedNode.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/animated/StyleAnimatedNode.kt @@ -15,7 +15,7 @@ import com.facebook.react.bridge.ReadableMap */ internal class StyleAnimatedNode( config: ReadableMap, - private val nativeAnimatedNodesManager: NativeAnimatedNodesManager + private val nativeAnimatedNodesManager: NativeAnimatedNodesManager, ) : AnimatedNode() { private val propMapping: Map diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/animated/SubtractionAnimatedNode.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/animated/SubtractionAnimatedNode.kt index a87eaacc193..c56ba98e06b 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/animated/SubtractionAnimatedNode.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/animated/SubtractionAnimatedNode.kt @@ -16,7 +16,7 @@ import com.facebook.react.bridge.ReadableMap */ internal class SubtractionAnimatedNode( config: ReadableMap, - private val nativeAnimatedNodesManager: NativeAnimatedNodesManager + private val nativeAnimatedNodesManager: NativeAnimatedNodesManager, ) : ValueAnimatedNode() { private val inputNodes: IntArray diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/animated/TrackingAnimatedNode.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/animated/TrackingAnimatedNode.kt index df8f96f62a8..1a355743fda 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/animated/TrackingAnimatedNode.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/animated/TrackingAnimatedNode.kt @@ -12,7 +12,7 @@ import com.facebook.react.bridge.ReadableMap internal class TrackingAnimatedNode( config: ReadableMap, - private val nativeAnimatedNodesManager: NativeAnimatedNodesManager + private val nativeAnimatedNodesManager: NativeAnimatedNodesManager, ) : AnimatedNode() { private val animationConfig: JavaOnlyMap = JavaOnlyMap.deepClone(config.getMap("animationConfig")) private val animationId: Int = config.getInt("animationId") diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/animated/TransformAnimatedNode.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/animated/TransformAnimatedNode.kt index 8b79c609c13..7943d26b365 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/animated/TransformAnimatedNode.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/animated/TransformAnimatedNode.kt @@ -17,7 +17,7 @@ import com.facebook.react.bridge.ReadableMap */ internal class TransformAnimatedNode( config: ReadableMap, - private val nativeAnimatedNodesManager: NativeAnimatedNodesManager + private val nativeAnimatedNodesManager: NativeAnimatedNodesManager, ) : AnimatedNode() { private val transformConfigs: List diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/BaseActivityEventListener.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/BaseActivityEventListener.kt index d583548c5a6..7cbf682dc78 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/BaseActivityEventListener.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/BaseActivityEventListener.kt @@ -15,14 +15,15 @@ public open class BaseActivityEventListener : ActivityEventListener { @Suppress("UNUSED_PARAMETER") @Deprecated( "Use onActivityResult(Activity, Int, Int, Intent) instead.", - ReplaceWith("onActivityResult(activity, requestCode, resultCode, data)")) + ReplaceWith("onActivityResult(activity, requestCode, resultCode, data)"), + ) public open fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent): Unit = Unit public override fun onActivityResult( activity: Activity, requestCode: Int, resultCode: Int, - data: Intent? + data: Intent?, ): Unit = Unit public override fun onNewIntent(intent: Intent): Unit = Unit diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/CallbackImpl.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/CallbackImpl.kt index 178366437fa..ca493739578 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/CallbackImpl.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/CallbackImpl.kt @@ -17,7 +17,8 @@ import com.facebook.react.common.annotations.internal.LegacyArchitectureLogger @LegacyArchitecture(logLevel = LegacyArchitectureLogLevel.ERROR) @Deprecated( message = "This class is part of Legacy Architecture and will be removed in a future release", - level = DeprecationLevel.WARNING) + level = DeprecationLevel.WARNING, +) internal class CallbackImpl(private val jsInstance: JSInstance, private val callbackId: Int) : Callback { private var invoked = false @@ -35,7 +36,9 @@ internal class CallbackImpl(private val jsInstance: JSInstance, private val call private companion object { init { LegacyArchitectureLogger.assertLegacyArchitecture( - "CallbackImpl", LegacyArchitectureLogLevel.ERROR) + "CallbackImpl", + LegacyArchitectureLogLevel.ERROR, + ) } } } diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/CxxModuleWrapperBase.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/CxxModuleWrapperBase.kt index 1323349edfa..69118b7dd68 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/CxxModuleWrapperBase.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/CxxModuleWrapperBase.kt @@ -52,7 +52,9 @@ protected constructor( init { ReactNativeJNISoLoader.staticInit() LegacyArchitectureLogger.assertLegacyArchitecture( - "CxxModuleWrapperBase", LegacyArchitectureLogLevel.WARNING) + "CxxModuleWrapperBase", + LegacyArchitectureLogLevel.WARNING, + ) } } } diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/JSBundleLoader.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/JSBundleLoader.kt index 52c69a3d39a..7662a2aa60d 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/JSBundleLoader.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/JSBundleLoader.kt @@ -26,7 +26,7 @@ public abstract class JSBundleLoader { public fun createAssetLoader( context: Context, assetUrl: String, - loadSynchronously: Boolean + loadSynchronously: Boolean, ): JSBundleLoader = object : JSBundleLoader() { override fun loadScript(delegate: JSBundleLoaderDelegate): String { @@ -47,7 +47,7 @@ public abstract class JSBundleLoader { public fun createFileLoader( fileName: String, assetUrl: String, - loadSynchronously: Boolean + loadSynchronously: Boolean, ): JSBundleLoader = object : JSBundleLoader() { override fun loadScript(delegate: JSBundleLoaderDelegate): String { @@ -66,7 +66,7 @@ public abstract class JSBundleLoader { @JvmStatic public fun createCachedBundleFromNetworkLoader( sourceURL: String, - cachedFileLocation: String + cachedFileLocation: String, ): JSBundleLoader = object : JSBundleLoader() { override fun loadScript(delegate: JSBundleLoaderDelegate): String { @@ -83,7 +83,7 @@ public abstract class JSBundleLoader { @JvmStatic public fun createCachedSplitBundleFromNetworkLoader( sourceURL: String, - cachedFileLocation: String + cachedFileLocation: String, ): JSBundleLoader = object : JSBundleLoader() { override fun loadScript(delegate: JSBundleLoaderDelegate): String { diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/JSBundleLoaderDelegate.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/JSBundleLoaderDelegate.kt index 2376bc04754..3daa4c1ed33 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/JSBundleLoaderDelegate.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/JSBundleLoaderDelegate.kt @@ -21,7 +21,7 @@ public interface JSBundleLoaderDelegate { public fun loadScriptFromAssets( assetManager: AssetManager, assetURL: String, - loadSynchronously: Boolean + loadSynchronously: Boolean, ) /** diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/JavaMethodWrapper.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/JavaMethodWrapper.kt index cc529743e66..887fd3bee34 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/JavaMethodWrapper.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/JavaMethodWrapper.kt @@ -19,12 +19,13 @@ import java.lang.reflect.Method @Deprecated( message = "This class is part of Legacy Architecture and will be removed in a future release", - level = DeprecationLevel.WARNING) + level = DeprecationLevel.WARNING, +) @LegacyArchitecture(logLevel = LegacyArchitectureLogLevel.ERROR) internal class JavaMethodWrapper( private val moduleWrapper: JavaModuleWrapper, val method: Method, - isSync: Boolean + isSync: Boolean, ) : JavaModuleWrapper.NativeMethod { private abstract class ArgumentExtractor { open fun getJSArgumentsNeeded(): Int = 1 @@ -33,7 +34,7 @@ internal class JavaMethodWrapper( abstract fun extractArgument( jsInstance: JSInstance, jsArguments: ReadableArray, - atIndex: Int + atIndex: Int, ): T? } @@ -169,7 +170,11 @@ internal class JavaMethodWrapper( .flush() if (DEBUG) { PrinterHolder.printer.logMessage( - ReactDebugOverlayTags.BRIDGE_CALLS, "JS->Java: %s.%s()", moduleWrapper.name, method.name) + ReactDebugOverlayTags.BRIDGE_CALLS, + "JS->Java: %s.%s()", + moduleWrapper.name, + method.name, + ) } try { if (!argumentsProcessed) { @@ -194,7 +199,10 @@ internal class JavaMethodWrapper( while (i < validatedArgumentExtractors.size) { validatedArguments[i] = validatedArgumentExtractors[i].extractArgument( - jsInstance, parameters, jsArgumentsConsumed) + jsInstance, + parameters, + jsArgumentsConsumed, + ) jsArgumentsConsumed += validatedArgumentExtractors[i].getJSArgumentsNeeded() i++ } @@ -203,19 +211,21 @@ internal class JavaMethodWrapper( "${e.message} (constructing arguments for $traceName at argument index ${ getAffectedRange( jsArgumentsConsumed, - validatedArgumentExtractors[i].getJSArgumentsNeeded() + validatedArgumentExtractors[i].getJSArgumentsNeeded(), ) })", - e) + e, + ) } catch (e: NullPointerException) { throw NativeArgumentsParseException( "${e.message} (constructing arguments for $traceName at argument index ${ getAffectedRange( jsArgumentsConsumed, - validatedArgumentExtractors[i].getJSArgumentsNeeded() + validatedArgumentExtractors[i].getJSArgumentsNeeded(), ) })", - e) + e, + ) } try { @@ -240,7 +250,9 @@ internal class JavaMethodWrapper( companion object { init { LegacyArchitectureLogger.assertLegacyArchitecture( - "JavaMethodWrapper", LegacyArchitectureLogLevel.ERROR) + "JavaMethodWrapper", + LegacyArchitectureLogLevel.ERROR, + ) } private val ARGUMENT_EXTRACTOR_BOOLEAN: ArgumentExtractor = @@ -249,7 +261,7 @@ internal class JavaMethodWrapper( override fun extractArgument( jsInstance: JSInstance, jsArguments: ReadableArray, - atIndex: Int + atIndex: Int, ): Boolean = jsArguments.getBoolean(atIndex) } @@ -259,7 +271,7 @@ internal class JavaMethodWrapper( override fun extractArgument( jsInstance: JSInstance, jsArguments: ReadableArray, - atIndex: Int + atIndex: Int, ): Double = jsArguments.getDouble(atIndex) } @@ -269,7 +281,7 @@ internal class JavaMethodWrapper( override fun extractArgument( jsInstance: JSInstance, jsArguments: ReadableArray, - atIndex: Int + atIndex: Int, ): Float = jsArguments.getDouble(atIndex).toFloat() } @@ -279,7 +291,7 @@ internal class JavaMethodWrapper( override fun extractArgument( jsInstance: JSInstance, jsArguments: ReadableArray, - atIndex: Int + atIndex: Int, ): Int = jsArguments.getDouble(atIndex).toInt() } @@ -289,7 +301,7 @@ internal class JavaMethodWrapper( override fun extractArgument( jsInstance: JSInstance, jsArguments: ReadableArray, - atIndex: Int + atIndex: Int, ): String? = jsArguments.getString(atIndex) } @@ -299,7 +311,7 @@ internal class JavaMethodWrapper( override fun extractArgument( jsInstance: JSInstance, jsArguments: ReadableArray, - atIndex: Int + atIndex: Int, ): ReadableArray? = jsArguments.getArray(atIndex) } @@ -309,7 +321,7 @@ internal class JavaMethodWrapper( override fun extractArgument( jsInstance: JSInstance, jsArguments: ReadableArray, - atIndex: Int + atIndex: Int, ): Dynamic = DynamicFromArray.create(jsArguments, atIndex) } @@ -319,7 +331,7 @@ internal class JavaMethodWrapper( override fun extractArgument( jsInstance: JSInstance, jsArguments: ReadableArray, - atIndex: Int + atIndex: Int, ): ReadableMap? = jsArguments.getMap(atIndex) } @@ -329,7 +341,7 @@ internal class JavaMethodWrapper( override fun extractArgument( jsInstance: JSInstance, jsArguments: ReadableArray, - atIndex: Int + atIndex: Int, ): Callback? = if (jsArguments.isNull(atIndex)) { null @@ -347,7 +359,7 @@ internal class JavaMethodWrapper( override fun extractArgument( jsInstance: JSInstance, jsArguments: ReadableArray, - atIndex: Int + atIndex: Int, ): Promise { val resolve = ARGUMENT_EXTRACTOR_CALLBACK.extractArgument(jsInstance, jsArguments, atIndex) diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/JavaModuleWrapper.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/JavaModuleWrapper.kt index 49ead52b423..d24e6e9a4ef 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/JavaModuleWrapper.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/JavaModuleWrapper.kt @@ -26,7 +26,7 @@ import java.lang.reflect.Method @InteropLegacyArchitecture internal class JavaModuleWrapper( @Suppress("DEPRECATION") private val jsInstance: JSInstance, - private val moduleHolder: ModuleHolder + private val moduleHolder: ModuleHolder, ) { interface NativeMethod { @Suppress("DEPRECATION") fun invoke(jsInstance: JSInstance, parameters: ReadableArray) diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/JavaScriptModuleRegistry.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/JavaScriptModuleRegistry.kt index 78ad7bc446f..4c552e97300 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/JavaScriptModuleRegistry.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/JavaScriptModuleRegistry.kt @@ -24,7 +24,7 @@ public class JavaScriptModuleRegistry { @Synchronized public fun getJavaScriptModule( @Suppress("DEPRECATION") instance: CatalystInstance, - moduleInterface: Class + moduleInterface: Class, ): T { val module = moduleInstances[moduleInterface] if (module != null) { @@ -36,7 +36,8 @@ public class JavaScriptModuleRegistry { Proxy.newProxyInstance( moduleInterface.classLoader, arrayOf>(moduleInterface), - JavaScriptModuleInvocationHandler(instance, moduleInterface)) as JavaScriptModule + JavaScriptModuleInvocationHandler(instance, moduleInterface), + ) as JavaScriptModule moduleInstances[moduleInterface] = proxy @Suppress("UNCHECKED_CAST") @@ -45,7 +46,7 @@ public class JavaScriptModuleRegistry { private class JavaScriptModuleInvocationHandler( @Suppress("DEPRECATION") private val catalystInstance: CatalystInstance, - private val moduleInterface: Class + private val moduleInterface: Class, ) : InvocationHandler { private var name: String? = null diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/ModuleHolder.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/ModuleHolder.kt index 0e35427ebcf..d4315652ebe 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/ModuleHolder.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/ModuleHolder.kt @@ -61,11 +61,15 @@ public class ModuleHolder { nativeModule.canOverrideExistingModule(), true, CxxModuleWrapper::class.java.isAssignableFrom(nativeModule.javaClass), - ReactModuleInfo.classIsTurboModule(nativeModule.javaClass)) + ReactModuleInfo.classIsTurboModule(nativeModule.javaClass), + ) internalModule = nativeModule PrinterHolder.printer.logMessage( - ReactDebugOverlayTags.NATIVE_MODULE, "NativeModule init: %s", name) + ReactDebugOverlayTags.NATIVE_MODULE, + "NativeModule init: %s", + name, + ) } /* @@ -162,7 +166,10 @@ public class ModuleHolder { .arg("name", name) .flush() PrinterHolder.printer.logMessage( - ReactDebugOverlayTags.NATIVE_MODULE, "NativeModule init: %s", name) + ReactDebugOverlayTags.NATIVE_MODULE, + "NativeModule init: %s", + name, + ) val module: NativeModule try { module = checkNotNull(provider).get() diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/ModuleSpec.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/ModuleSpec.kt index 24f679a1ddd..cb334e46c4c 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/ModuleSpec.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/ModuleSpec.kt @@ -18,7 +18,7 @@ import javax.inject.Provider public class ModuleSpec private constructor( @get:JvmName("provider") public val provider: Provider, - @get:JvmName("moduleName") public val name: String? = null + @get:JvmName("moduleName") public val name: String? = null, ) { public fun getProvider(): Provider = provider @@ -34,7 +34,7 @@ private constructor( @JvmStatic public fun nativeModuleSpec( type: Class, - provider: Provider + provider: Provider, ): ModuleSpec { val annotation: ReactModule? = type.getAnnotation(ReactModule::class.java) @@ -42,7 +42,8 @@ private constructor( FLog.w( TAG, "Could not find @ReactModule annotation on ${type.name}. " + - "Creating the module eagerly to get the name. Consider adding the annotation.") + "Creating the module eagerly to get the name. Consider adding the annotation.", + ) val nativeModule: NativeModule = provider.get() ModuleSpec(provider, nativeModule.name) } else { @@ -53,7 +54,7 @@ private constructor( @JvmStatic public fun nativeModuleSpec( className: String, - provider: Provider + provider: Provider, ): ModuleSpec = ModuleSpec(provider, className) } } diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/NativeArgumentsParseException.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/NativeArgumentsParseException.kt index df5886898d2..c095010bef2 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/NativeArgumentsParseException.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/NativeArgumentsParseException.kt @@ -15,7 +15,8 @@ import com.facebook.react.common.annotations.internal.LegacyArchitectureLogger @LegacyArchitecture(logLevel = LegacyArchitectureLogLevel.ERROR) @Deprecated( message = "This class is part of Legacy Architecture and will be removed in a future release", - level = DeprecationLevel.WARNING) + level = DeprecationLevel.WARNING, +) internal class NativeArgumentsParseException : JSApplicationCausedNativeException { constructor(detailMessage: String) : super(detailMessage) @@ -25,7 +26,9 @@ internal class NativeArgumentsParseException : JSApplicationCausedNativeExceptio private companion object { init { LegacyArchitectureLogger.assertLegacyArchitecture( - "NativeArgumentsParseException", logLevel = LegacyArchitectureLogLevel.ERROR) + "NativeArgumentsParseException", + logLevel = LegacyArchitectureLogLevel.ERROR, + ) } } } diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/NativeModuleRegistry.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/NativeModuleRegistry.kt index 047c083dc7a..7e0013477c9 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/NativeModuleRegistry.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/NativeModuleRegistry.kt @@ -23,10 +23,11 @@ import com.facebook.systrace.Systrace.endSection @LegacyArchitecture(logLevel = LegacyArchitectureLogLevel.ERROR) @Deprecated( message = "This class is part of Legacy Architecture and will be removed in a future release", - level = DeprecationLevel.WARNING) + level = DeprecationLevel.WARNING, +) public class NativeModuleRegistry( private val reactApplicationContext: ReactApplicationContext, - private val modules: MutableMap + private val modules: MutableMap, ) { /** Private getters for combining NativeModuleRegistry's */ private val moduleMap: Map @@ -111,7 +112,9 @@ public class NativeModuleRegistry( // the search, and simply call OnBatchComplete on the UI Manager. // With Fabric, UIManager would no longer be a NativeModule, so this call would simply go away assertLegacyArchitecture( - "NativeModuleRegistry.onBatchComplete()", LegacyArchitectureLogLevel.WARNING) + "NativeModuleRegistry.onBatchComplete()", + LegacyArchitectureLogLevel.WARNING, + ) modules["UIManager"]?.let { if (it.hasInstance()) { (it.module as OnBatchCompleteListener).onBatchComplete() @@ -155,7 +158,9 @@ public class NativeModuleRegistry( private companion object { init { LegacyArchitectureLogger.assertLegacyArchitecture( - "NativeModuleRegistry", logLevel = LegacyArchitectureLogLevel.ERROR) + "NativeModuleRegistry", + logLevel = LegacyArchitectureLogLevel.ERROR, + ) } } } diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/OnBatchCompleteListener.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/OnBatchCompleteListener.kt index 3ea39269c88..b02ba5cace1 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/OnBatchCompleteListener.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/OnBatchCompleteListener.kt @@ -14,7 +14,8 @@ import com.facebook.react.common.annotations.internal.LegacyArchitectureLogLevel @LegacyArchitecture(logLevel = LegacyArchitectureLogLevel.ERROR) @Deprecated( message = "This class is part of Legacy Architecture and will be removed in a future release", - level = DeprecationLevel.WARNING) + level = DeprecationLevel.WARNING, +) public fun interface OnBatchCompleteListener { public fun onBatchComplete() } diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/Promise.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/Promise.kt index 0998968fbef..d34b72052f3 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/Promise.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/Promise.kt @@ -109,6 +109,7 @@ public interface Promise { message = """Prefer passing a module-specific error code to JS. Using this method will pass the error code EUNSPECIFIED""", - replaceWith = ReplaceWith("reject(code, message)")) + replaceWith = ReplaceWith("reject(code, message)"), + ) public fun reject(message: String) } diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/PromiseImpl.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/PromiseImpl.kt index 516c8dd5c89..8ec3b21fac2 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/PromiseImpl.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/PromiseImpl.kt @@ -133,7 +133,7 @@ constructor(private var resolve: Callback?, private var reject: Callback?) : Pro code: String?, message: String?, throwable: Throwable?, - userInfo: WritableMap? + userInfo: WritableMap?, ) { if (reject == null) { resolve = null diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactContextBaseJavaModule.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactContextBaseJavaModule.kt index 8e338d27b35..8959846f453 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactContextBaseJavaModule.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactContextBaseJavaModule.kt @@ -26,7 +26,8 @@ public abstract class ReactContextBaseJavaModule : BaseJavaModule { */ @Deprecated( "Deprecated in 0.80.0. Use getReactApplicationContext.getCurrentActivity() instead.", - ReplaceWith("reactApplicationContext.currentActivity")) + ReplaceWith("reactApplicationContext.currentActivity"), + ) protected fun getCurrentActivity(): Activity? { return reactApplicationContext.currentActivity } diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactCxxErrorHandler.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactCxxErrorHandler.kt index 37a1ce3cd89..7e817e70ed7 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactCxxErrorHandler.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactCxxErrorHandler.kt @@ -18,11 +18,14 @@ import java.lang.reflect.Method @LegacyArchitecture @Deprecated( message = "This class is part of Legacy Architecture and will be removed in a future release", - level = DeprecationLevel.WARNING) + level = DeprecationLevel.WARNING, +) internal object ReactCxxErrorHandler { init { LegacyArchitectureLogger.assertLegacyArchitecture( - "ReactCxxErrorHandler", LegacyArchitectureLogLevel.WARNING) + "ReactCxxErrorHandler", + LegacyArchitectureLogLevel.WARNING, + ) } private var handleErrorFunc: Method? = null diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactInstanceManagerInspectorTarget.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactInstanceManagerInspectorTarget.kt index 8de9b9d4b80..b49d72680bc 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactInstanceManagerInspectorTarget.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactInstanceManagerInspectorTarget.kt @@ -21,7 +21,8 @@ import java.util.concurrent.Executor @LegacyArchitecture @Deprecated( message = "This class is part of Legacy Architecture and will be removed in a future release", - level = DeprecationLevel.WARNING) + level = DeprecationLevel.WARNING, +) internal class ReactInstanceManagerInspectorTarget(delegate: TargetDelegate) : AutoCloseable { @DoNotStripAny @@ -49,7 +50,8 @@ internal class ReactInstanceManagerInspectorTarget(delegate: TargetDelegate) : A UiThreadUtil.runOnUiThread(command) } }, - delegate) + delegate, + ) private external fun initHybrid(executor: Executor, delegate: TargetDelegate): HybridData @@ -67,7 +69,9 @@ internal class ReactInstanceManagerInspectorTarget(delegate: TargetDelegate) : A private companion object { init { LegacyArchitectureLogger.assertLegacyArchitecture( - "ReactInstanceManagerInspectorTarget", LegacyArchitectureLogLevel.WARNING) + "ReactInstanceManagerInspectorTarget", + LegacyArchitectureLogLevel.WARNING, + ) ReactNativeJNISoLoader.staticInit() } } diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactMarker.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactMarker.kt index da3d83d28c3..9e41ba323af 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactMarker.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactMarker.kt @@ -77,7 +77,7 @@ public object ReactMarker { tag: String?, instanceKey: Int, timestamp: Long, - counter: Int + counter: Int, ) { for (listener in fabricMarkerListeners) { listener.logFabricMarker(name, tag, instanceKey, timestamp, counter) @@ -90,7 +90,7 @@ public object ReactMarker { name: ReactMarkerConstants, tag: String?, instanceKey: Int, - timestamp: Long + timestamp: Long, ) { for (listener in fabricMarkerListeners) { listener.logFabricMarker(name, tag, instanceKey, timestamp, 0) @@ -193,7 +193,7 @@ public object ReactMarker { name: ReactMarkerConstants, tag: String?, instanceKey: Int, - timestamp: Long + timestamp: Long, ) public fun logFabricMarker( @@ -201,7 +201,7 @@ public object ReactMarker { tag: String?, instanceKey: Int, timestamp: Long, - counter: Int + counter: Int, ): Unit = logFabricMarker(name, tag, instanceKey, timestamp) } } diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactMarkerConstants.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactMarkerConstants.kt index bde624e151e..66815c3e0e1 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactMarkerConstants.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactMarkerConstants.kt @@ -126,5 +126,5 @@ public enum class ReactMarkerConstants( REACT_BRIDGE_LOADING_START, REACT_BRIDGE_LOADING_END, REACT_BRIDGELESS_LOADING_START, - REACT_BRIDGELESS_LOADING_END + REACT_BRIDGELESS_LOADING_END, } diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactSoftExceptionLogger.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactSoftExceptionLogger.kt index 8948d7e8548..51ff4d0224b 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactSoftExceptionLogger.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactSoftExceptionLogger.kt @@ -25,7 +25,8 @@ internal object ReactSoftExceptionLogger { RVG_ON_VIEW_REMOVED, CLIPPING_PROHIBITED_VIEW, SOFT_ASSERTIONS, - SURFACE_MOUNTING_MANAGER_MISSING_VIEWSTATE) + SURFACE_MOUNTING_MANAGER_MISSING_VIEWSTATE, + ) annotation class CategoryMode /** Constants that listeners can utilize for custom category-based behavior. */ diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/SoftAssertions.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/SoftAssertions.kt index 9127825103a..d1709a7f47a 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/SoftAssertions.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/SoftAssertions.kt @@ -48,7 +48,9 @@ internal object SoftAssertions { fun assertNotNull(instance: T?): T? { if (instance == null) { ReactSoftExceptionLogger.logSoftException( - SOFT_ASSERTIONS, AssertionException("Expected object to not be null!")) + SOFT_ASSERTIONS, + AssertionException("Expected object to not be null!"), + ) } return instance } diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/UIManager.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/UIManager.kt index 21cf94272ec..cdc8be7862d 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/UIManager.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/UIManager.kt @@ -29,7 +29,7 @@ public interface UIManager : PerformanceCounter { moduleName: String, initialProps: WritableMap?, widthMeasureSpec: Int, - heightMeasureSpec: Int + heightMeasureSpec: Int, ): Int /** @@ -49,7 +49,7 @@ public interface UIManager : PerformanceCounter { widthMeasureSpec: Int, heightMeasureSpec: Int, offsetX: Int, - offsetY: Int + offsetY: Int, ) /** diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/UIManagerProvider.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/UIManagerProvider.kt index 8abd0b99be0..7a7882e73a4 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/UIManagerProvider.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/UIManagerProvider.kt @@ -17,7 +17,8 @@ import com.facebook.react.common.annotations.internal.LegacyArchitectureLogLevel @LegacyArchitecture(logLevel = LegacyArchitectureLogLevel.ERROR) @Deprecated( message = "This class is part of Legacy Architecture and will be removed in a future release", - level = DeprecationLevel.WARNING) + level = DeprecationLevel.WARNING, +) public fun interface UIManagerProvider { /* Provides a [com.facebook.react.bridge.UIManager] for the context received as a parameter. */ diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/WritableNativeMap.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/WritableNativeMap.kt index e2b1f04d5de..bc30404a4c7 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/WritableNativeMap.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/WritableNativeMap.kt @@ -40,7 +40,9 @@ public class WritableNativeMap : ReadableNativeMap(), WritableMap { // Note: this consumes the map so do not reuse it. override fun putArray(key: String, value: ReadableArray?) { Assertions.assertCondition( - value == null || value is ReadableNativeArray, "Illegal type provided") + value == null || value is ReadableNativeArray, + "Illegal type provided", + ) putNativeArray(key, value as ReadableNativeArray?) } diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/interop/InteropModuleRegistry.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/interop/InteropModuleRegistry.kt index 8b80477478d..6dfe871c06a 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/interop/InteropModuleRegistry.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/interop/InteropModuleRegistry.kt @@ -37,7 +37,7 @@ internal class InteropModuleRegistry { fun registerInteropModule( interopModuleInterface: Class, - interopModule: Any + interopModule: Any, ) { if (checkReactFeatureFlagsConditions()) { supportedModules[interopModuleInterface] = interopModule diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/queue/MessageQueueThreadHandler.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/queue/MessageQueueThreadHandler.kt index 95e843a34dc..2e8f370e0f1 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/queue/MessageQueueThreadHandler.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/queue/MessageQueueThreadHandler.kt @@ -14,7 +14,7 @@ import android.os.Message /** Handler that can catch and dispatch Exceptions to an Exception handler. */ internal class MessageQueueThreadHandler( looper: Looper, - private val exceptionHandler: QueueThreadExceptionHandler + private val exceptionHandler: QueueThreadExceptionHandler, ) : Handler(looper) { override fun dispatchMessage(msg: Message) { try { diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/queue/MessageQueueThreadImpl.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/queue/MessageQueueThreadImpl.kt index ab0a0edc01f..dbc15af9927 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/queue/MessageQueueThreadImpl.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/queue/MessageQueueThreadImpl.kt @@ -41,7 +41,8 @@ private constructor( if (isFinished) { FLog.w( ReactConstants.TAG, - "Tried to enqueue runnable on already finished thread: '$name... dropping Runnable.") + "Tried to enqueue runnable on already finished thread: '$name... dropping Runnable.", + ) return false } handler.post(runnable) @@ -82,7 +83,8 @@ private constructor( public override fun assertIsOnThread(message: String) { SoftAssertions.assertCondition( isOnThread(), - StringBuilder().append(assertionErrorMessage).append(" ").append(message).toString()) + StringBuilder().append(assertionErrorMessage).append(" ").append(message).toString(), + ) } /** @@ -109,7 +111,7 @@ private constructor( @Throws(RuntimeException::class) public fun create( spec: MessageQueueThreadSpec, - exceptionHandler: QueueThreadExceptionHandler + exceptionHandler: QueueThreadExceptionHandler, ): MessageQueueThreadImpl { return when (spec.threadType) { ThreadType.MAIN_UI -> createForMainThread(spec.name, exceptionHandler) @@ -122,7 +124,7 @@ private constructor( /** Returns a MessageQueueThreadImpl corresponding to Android's main UI thread. */ private fun createForMainThread( name: String, - exceptionHandler: QueueThreadExceptionHandler + exceptionHandler: QueueThreadExceptionHandler, ): MessageQueueThreadImpl = MessageQueueThreadImpl(name, Looper.getMainLooper(), exceptionHandler) @@ -137,7 +139,7 @@ private constructor( private fun startNewBackgroundThread( name: String, stackSize: Long, - exceptionHandler: QueueThreadExceptionHandler + exceptionHandler: QueueThreadExceptionHandler, ): MessageQueueThreadImpl { val looperFuture = SimpleSettableFuture() val bgThread = @@ -150,7 +152,8 @@ private constructor( Looper.loop() }, "mqt_$name", - stackSize) + stackSize, + ) bgThread.start() val looper = diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/queue/MessageQueueThreadSpec.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/queue/MessageQueueThreadSpec.kt index 1bf72565d36..7eb8bb95241 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/queue/MessageQueueThreadSpec.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/queue/MessageQueueThreadSpec.kt @@ -12,7 +12,7 @@ public class MessageQueueThreadSpec private constructor( public val threadType: ThreadType, public val name: String, - public val stackSize: Long = DEFAULT_STACK_SIZE_BYTES + public val stackSize: Long = DEFAULT_STACK_SIZE_BYTES, ) { public enum class ThreadType { MAIN_UI, diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/queue/ReactQueueConfigurationImpl.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/queue/ReactQueueConfigurationImpl.kt index b09d30f2f2d..91f2971bcef 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/queue/ReactQueueConfigurationImpl.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/queue/ReactQueueConfigurationImpl.kt @@ -15,7 +15,7 @@ internal class ReactQueueConfigurationImpl private constructor( private val uiQueueThread: MessageQueueThreadImpl, private val nativeModulesQueueThread: MessageQueueThreadImpl, - private val jsQueueThread: MessageQueueThreadImpl + private val jsQueueThread: MessageQueueThreadImpl, ) : ReactQueueConfiguration { override fun getUIQueueThread(): MessageQueueThread = uiQueueThread @@ -40,7 +40,7 @@ private constructor( @JvmStatic fun create( spec: ReactQueueConfigurationSpec, - exceptionHandler: QueueThreadExceptionHandler + exceptionHandler: QueueThreadExceptionHandler, ): ReactQueueConfigurationImpl { val uiThread = create(mainThreadSpec(), exceptionHandler) val jsThread = create(spec.jSQueueThreadSpec, exceptionHandler) diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/queue/ReactQueueConfigurationSpec.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/queue/ReactQueueConfigurationSpec.kt index c09038786eb..310ec3249ef 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/queue/ReactQueueConfigurationSpec.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/queue/ReactQueueConfigurationSpec.kt @@ -18,7 +18,7 @@ import com.facebook.react.bridge.queue.MessageQueueThreadSpec.Companion.newBackg public class ReactQueueConfigurationSpec public constructor( public val nativeModulesQueueThreadSpec: MessageQueueThreadSpec, - public val jSQueueThreadSpec: MessageQueueThreadSpec + public val jSQueueThreadSpec: MessageQueueThreadSpec, ) { public class Builder public constructor() { private var nativeModulesQueueSpec: MessageQueueThreadSpec? = null @@ -46,6 +46,8 @@ public constructor( @JvmStatic public fun createDefault(): ReactQueueConfigurationSpec = ReactQueueConfigurationSpec( - newBackgroundThreadSpec("native_modules"), newBackgroundThreadSpec("js")) + newBackgroundThreadSpec("native_modules"), + newBackgroundThreadSpec("js"), + ) } } diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/common/MapBuilder.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/common/MapBuilder.kt index e7a022fc265..1adc976f218 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/common/MapBuilder.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/common/MapBuilder.kt @@ -45,7 +45,7 @@ public object MapBuilder { k4: K, v4: V, k5: K, - v5: V + v5: V, ): MutableMap = hashMapOf(k1 to v1, k2 to v2, k3 to v3, k4 to v4, k5 to v5) /** Returns map containing the given entries. */ @@ -62,7 +62,7 @@ public object MapBuilder { k5: K, v5: V, k6: K, - v6: V + v6: V, ): MutableMap = hashMapOf(k1 to v1, k2 to v2, k3 to v3, k4 to v4, k5 to v5, k6 to v6) /** Returns map containing the given entries. */ @@ -81,7 +81,7 @@ public object MapBuilder { k6: K, v6: V, k7: K, - v7: V + v7: V, ): MutableMap = hashMapOf(k1 to v1, k2 to v2, k3 to v3, k4 to v4, k5 to v5, k6 to v6, k7 to v7) diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/common/ReleaseLevel.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/common/ReleaseLevel.kt index 6612802f50e..7b8e3181e28 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/common/ReleaseLevel.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/common/ReleaseLevel.kt @@ -14,5 +14,5 @@ package com.facebook.react.common public enum class ReleaseLevel { EXPERIMENTAL, CANARY, - STABLE + STABLE, } diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/common/annotations/FrameworkAPI.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/common/annotations/FrameworkAPI.kt index 37e28633560..eae96bfe440 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/common/annotations/FrameworkAPI.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/common/annotations/FrameworkAPI.kt @@ -14,5 +14,6 @@ package com.facebook.react.common.annotations message = "This API is provided only for React Native frameworks and not intended for general users. " + "This API can change between minor versions in alignment with React Native frameworks " + - "and won't be considered a breaking change.") + "and won't be considered a breaking change.", +) public annotation class FrameworkAPI diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/common/annotations/UnstableReactNativeAPI.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/common/annotations/UnstableReactNativeAPI.kt index bd728efc578..4b8c3149bd8 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/common/annotations/UnstableReactNativeAPI.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/common/annotations/UnstableReactNativeAPI.kt @@ -11,5 +11,6 @@ package com.facebook.react.common.annotations @Target(AnnotationTarget.CLASS, AnnotationTarget.FUNCTION, AnnotationTarget.PROPERTY) @RequiresOptIn( level = RequiresOptIn.Level.ERROR, - message = "This API is experimental and is likely to change or to be removed in the future") + message = "This API is experimental and is likely to change or to be removed in the future", +) public annotation class UnstableReactNativeAPI diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/common/annotations/internal/LegacyArchitectureLogLevel.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/common/annotations/internal/LegacyArchitectureLogLevel.kt index a28508b0f35..d911d60b370 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/common/annotations/internal/LegacyArchitectureLogLevel.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/common/annotations/internal/LegacyArchitectureLogLevel.kt @@ -18,5 +18,5 @@ package com.facebook.react.common.annotations.internal */ public enum class LegacyArchitectureLogLevel { WARNING, - ERROR + ERROR, } diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/common/annotations/internal/LegacyArchitectureLogger.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/common/annotations/internal/LegacyArchitectureLogger.kt index 34b9543aea3..7cd14d602b0 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/common/annotations/internal/LegacyArchitectureLogger.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/common/annotations/internal/LegacyArchitectureLogger.kt @@ -34,7 +34,7 @@ public object LegacyArchitectureLogger { @JvmStatic public fun assertLegacyArchitecture( name: String, - logLevel: LegacyArchitectureLogLevel = LegacyArchitectureLogLevel.WARNING + logLevel: LegacyArchitectureLogLevel = LegacyArchitectureLogLevel.WARNING, ) { if (ReactBuildConfig.UNSTABLE_ENABLE_MINIFY_LEGACY_ARCHITECTURE) { executeAssert(name, logLevel) @@ -43,7 +43,7 @@ public object LegacyArchitectureLogger { private fun executeAssert( name: String, - logLevel: LegacyArchitectureLogLevel = LegacyArchitectureLogLevel.WARNING + logLevel: LegacyArchitectureLogLevel = LegacyArchitectureLogLevel.WARNING, ) { // Assert is being reported only in DEBUG mode to prevent over logging in production while we // we are working on decoupling legacy / new architecture. @@ -58,7 +58,8 @@ public object LegacyArchitectureLogger { LegacyArchitectureLogLevel.WARNING -> { ReactSoftExceptionLogger.logSoftException( ReactSoftExceptionLogger.Categories.SOFT_ASSERTIONS, - ReactNoCrashSoftException("$name $exceptionMessage")) + ReactNoCrashSoftException("$name $exceptionMessage"), + ) } } } diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/common/mapbuffer/MapBuffer.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/common/mapbuffer/MapBuffer.kt index 53bb6b85543..44af587bd9f 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/common/mapbuffer/MapBuffer.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/common/mapbuffer/MapBuffer.kt @@ -45,7 +45,7 @@ public interface MapBuffer : Iterable { DOUBLE, STRING, MAP, - LONG + LONG, } /** diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/common/mapbuffer/ReadableMapBuffer.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/common/mapbuffer/ReadableMapBuffer.kt index 0984d77764c..b64b68a5edc 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/common/mapbuffer/ReadableMapBuffer.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/common/mapbuffer/ReadableMapBuffer.kt @@ -32,7 +32,7 @@ private constructor( // Byte data of the mapBuffer private val buffer: ByteBuffer, // Offset to the start of the MapBuffer - private val offsetToMapBuffer: Int + private val offsetToMapBuffer: Int, ) : HybridClassBase(), MapBuffer { // Amount of items serialized on the ByteBuffer diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/defaults/DefaultNewArchitectureEntryPoint.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/defaults/DefaultNewArchitectureEntryPoint.kt index 8070e2d885d..f3b8b34dd84 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/defaults/DefaultNewArchitectureEntryPoint.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/defaults/DefaultNewArchitectureEntryPoint.kt @@ -48,7 +48,8 @@ public object DefaultNewArchitectureEntryPoint { message = "Loading the entry point with different flags for Fabric, TurboModule and Bridgeless is deprecated." + "Please use load() instead when loading the New Architecture.", - replaceWith = ReplaceWith("load()")) + replaceWith = ReplaceWith("load()"), + ) public fun load( turboModulesEnabled: Boolean = true, ) { @@ -60,7 +61,8 @@ public object DefaultNewArchitectureEntryPoint { message = "Loading the entry point with different flags for Fabric, TurboModule and Bridgeless is deprecated." + "Please use load() instead when loading the New Architecture.", - replaceWith = ReplaceWith("load()")) + replaceWith = ReplaceWith("load()"), + ) public fun load( turboModulesEnabled: Boolean = true, fabricEnabled: Boolean = true, @@ -73,11 +75,12 @@ public object DefaultNewArchitectureEntryPoint { message = "Loading the entry point with different flags for Fabric, TurboModule and Bridgeless is deprecated." + "Please use load() instead when loading the New Architecture.", - replaceWith = ReplaceWith("load()")) + replaceWith = ReplaceWith("load()"), + ) public fun load( turboModulesEnabled: Boolean = true, fabricEnabled: Boolean = true, - bridgelessEnabled: Boolean = true + bridgelessEnabled: Boolean = true, ) { val (isValid, errorMessage) = isConfigurationValid(turboModulesEnabled, fabricEnabled, bridgelessEnabled) @@ -96,7 +99,10 @@ public object DefaultNewArchitectureEntryPoint { ReleaseLevel.STABLE -> { ReactNativeFeatureFlags.override( ReactNativeFeatureFlagsOverrides_RNOSS_Stable_Android( - fabricEnabled, bridgelessEnabled, turboModulesEnabled)) + fabricEnabled, + bridgelessEnabled, + turboModulesEnabled, + )) } } @@ -148,7 +154,7 @@ public object DefaultNewArchitectureEntryPoint { public fun isConfigurationValid( turboModulesEnabled: Boolean, fabricEnabled: Boolean, - bridgelessEnabled: Boolean + bridgelessEnabled: Boolean, ): Pair = when { fabricEnabled && !turboModulesEnabled -> diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/defaults/DefaultReactActivityDelegate.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/defaults/DefaultReactActivityDelegate.kt index 4cb4263c41c..64a2f484ccc 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/defaults/DefaultReactActivityDelegate.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/defaults/DefaultReactActivityDelegate.kt @@ -32,7 +32,8 @@ public open class DefaultReactActivityDelegate( " be used for both flags", level = DeprecationLevel.WARNING, replaceWith = - ReplaceWith("DefaultReactActivityDelegate(activity, mainComponentName, fabricEnabled)")) + ReplaceWith("DefaultReactActivityDelegate(activity, mainComponentName, fabricEnabled)"), + ) public constructor( activity: ReactActivity, mainComponentName: String, diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/defaults/DefaultReactHost.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/defaults/DefaultReactHost.kt index 66b1519c165..9b0082f6b01 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/defaults/DefaultReactHost.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/defaults/DefaultReactHost.kt @@ -76,7 +76,8 @@ public object DefaultReactHost { useDevSupport, cxxReactPackageProviders, { throw it }, - null) + null, + ) /** * Util function to create a default [ReactHost] to be used in your application. This method is @@ -136,7 +137,8 @@ public object DefaultReactHost { jsRuntimeFactory = jsRuntimeFactory ?: HermesInstance(), bindingsInstaller = bindingsInstaller, turboModuleManagerDelegateBuilder = defaultTmmDelegateBuilder, - exceptionHandler = exceptionHandler) + exceptionHandler = exceptionHandler, + ) val componentFactory = ComponentFactory() DefaultComponentsRegistry.register(componentFactory) // TODO: T164788699 find alternative of accessing ReactHostImpl for initialising reactHost @@ -189,7 +191,8 @@ public object DefaultReactHost { exceptionHandler: (Exception) -> Unit, bindingsInstaller: BindingsInstaller?, ): ReactHost - """)) + """), + ) @JvmStatic public fun getDefaultReactHost( context: Context, @@ -213,7 +216,8 @@ public object DefaultReactHost { useDevSupport, cxxReactPackageProviders, exceptionHandler, - bindingsInstaller) + bindingsInstaller, + ) /** * Util function to create a default [ReactHost] to be used in your application. This method is @@ -247,7 +251,8 @@ public object DefaultReactHost { useDevSupport: Boolean, cxxReactPackageProviders: List<(ReactContext) -> CxxReactPackage>, ): ReactHost - """)) + """), + ) @JvmStatic public fun getDefaultReactHost( context: Context, @@ -288,7 +293,7 @@ public object DefaultReactHost { public fun getDefaultReactHost( context: Context, reactNativeHost: ReactNativeHost, - jsRuntimeFactory: JSRuntimeFactory? = null + jsRuntimeFactory: JSRuntimeFactory? = null, ): ReactHost { require(reactNativeHost is DefaultReactNativeHost) { "You can call getDefaultReactHost only with instances of DefaultReactNativeHost" diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/defaults/DefaultReactHostDelegate.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/defaults/DefaultReactHostDelegate.kt index 6f37120a46a..8a096d6886e 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/defaults/DefaultReactHostDelegate.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/defaults/DefaultReactHostDelegate.kt @@ -42,7 +42,7 @@ public class DefaultReactHostDelegate( override val jsRuntimeFactory: JSRuntimeFactory = HermesInstance(), override val bindingsInstaller: BindingsInstaller? = null, private val exceptionHandler: (Exception) -> Unit = { throw it }, - override val turboModuleManagerDelegateBuilder: ReactPackageTurboModuleManagerDelegate.Builder + override val turboModuleManagerDelegateBuilder: ReactPackageTurboModuleManagerDelegate.Builder, ) : ReactHostDelegate { override fun handleInstanceException(error: Exception): Unit = exceptionHandler(error) } diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/defaults/DefaultReactNativeHost.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/defaults/DefaultReactNativeHost.kt index 294632494e8..72bacc0c1b1 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/defaults/DefaultReactNativeHost.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/defaults/DefaultReactNativeHost.kt @@ -98,7 +98,8 @@ protected constructor( */ @Deprecated( "Setting isHermesEnabled inside `ReactNativeHost` is deprecated and this field will be ignored. If this field is set to true, you can safely remove it. If this field is set to false, please follow the setup on https://github.com/react-native-community/javascriptcore to continue using JSC", - ReplaceWith("")) + ReplaceWith(""), + ) protected open val isHermesEnabled: Boolean get() = true @@ -110,7 +111,7 @@ protected constructor( @UnstableReactNativeAPI internal fun toReactHost( context: Context, - jsRuntimeFactory: JSRuntimeFactory? = null + jsRuntimeFactory: JSRuntimeFactory? = null, ): ReactHost { val concreteJSRuntimeFactory = jsRuntimeFactory ?: HermesInstance() return DefaultReactHost.getDefaultReactHost( diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/defaults/DefaultTurboModuleManagerDelegate.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/defaults/DefaultTurboModuleManagerDelegate.kt index 61d4d0968a9..0b6e09597d6 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/defaults/DefaultTurboModuleManagerDelegate.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/defaults/DefaultTurboModuleManagerDelegate.kt @@ -57,10 +57,13 @@ private constructor( override fun build( context: ReactApplicationContext, - packages: List + packages: List, ): DefaultTurboModuleManagerDelegate = DefaultTurboModuleManagerDelegate( - context, packages, cxxReactPackageProviders.flatMap { provider -> provider(context) }) + context, + packages, + cxxReactPackageProviders.flatMap { provider -> provider(context) }, + ) } private companion object { diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/BridgeDevSupportManager.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/BridgeDevSupportManager.kt index da2e2124b71..e63ec897678 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/BridgeDevSupportManager.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/BridgeDevSupportManager.kt @@ -48,7 +48,8 @@ import com.facebook.react.packagerconnection.RequestHandler @LegacyArchitecture(logLevel = LegacyArchitectureLogLevel.ERROR) @Deprecated( message = "This class is part of Legacy Architecture and will be removed in a future release", - level = DeprecationLevel.WARNING) + level = DeprecationLevel.WARNING, +) public class BridgeDevSupportManager( applicationContext: Context, reactInstanceManagerHelper: ReactInstanceDevHelper, @@ -60,7 +61,7 @@ public class BridgeDevSupportManager( customPackagerCommandHandlers: Map?, surfaceDelegateFactory: SurfaceDelegateFactory?, devLoadingViewManager: DevLoadingViewManager?, - pausedInDebuggerOverlayManager: PausedInDebuggerOverlayManager? + pausedInDebuggerOverlayManager: PausedInDebuggerOverlayManager?, ) : DevSupportManagerBase( applicationContext, @@ -73,7 +74,8 @@ public class BridgeDevSupportManager( customPackagerCommandHandlers, surfaceDelegateFactory, devLoadingViewManager, - pausedInDebuggerOverlayManager) { + pausedInDebuggerOverlayManager, + ) { override val uniqueTag: String get() = "Bridge" @@ -81,7 +83,9 @@ public class BridgeDevSupportManager( override fun handleReloadJS() { UiThreadUtil.assertOnUiThread() ReactMarker.logMarker( - ReactMarkerConstants.RELOAD, devSettings.packagerConnectionSettings.debugServerHost) + ReactMarkerConstants.RELOAD, + devSettings.packagerConnectionSettings.debugServerHost, + ) // dismiss redbox if exists hideRedboxDialog() diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/BridgelessDevSupportManager.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/BridgelessDevSupportManager.kt index 6415e1f27df..5a828b4e492 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/BridgelessDevSupportManager.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/BridgelessDevSupportManager.kt @@ -37,7 +37,7 @@ internal class BridgelessDevSupportManager( customPackagerCommandHandlers: Map?, surfaceDelegateFactory: SurfaceDelegateFactory?, devLoadingViewManager: DevLoadingViewManager?, - pausedInDebuggerOverlayManager: PausedInDebuggerOverlayManager? + pausedInDebuggerOverlayManager: PausedInDebuggerOverlayManager?, ) : DevSupportManagerBase( applicationContext, @@ -50,12 +50,13 @@ internal class BridgelessDevSupportManager( customPackagerCommandHandlers, surfaceDelegateFactory, devLoadingViewManager, - pausedInDebuggerOverlayManager) { + pausedInDebuggerOverlayManager, + ) { constructor( context: Context, reactInstanceManagerHelper: ReactInstanceDevHelper, - packagerPathForJSBundleName: String? + packagerPathForJSBundleName: String?, ) : this( applicationContext = context.applicationContext, reactInstanceManagerHelper = reactInstanceManagerHelper, @@ -67,7 +68,8 @@ internal class BridgelessDevSupportManager( customPackagerCommandHandlers = null, surfaceDelegateFactory = null, devLoadingViewManager = null, - pausedInDebuggerOverlayManager = null) + pausedInDebuggerOverlayManager = null, + ) override val uniqueTag: String get() = "Bridgeless" diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/BundleDownloader.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/BundleDownloader.kt index f006bea7d8b..1d4a942fa6a 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/BundleDownloader.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/BundleDownloader.kt @@ -82,7 +82,7 @@ public class BundleDownloader public constructor(private val client: OkHttpClien outputFile: File, bundleURL: String?, bundleInfo: BundleInfo?, - requestBuilder: Request.Builder = Request.Builder() + requestBuilder: Request.Builder = Request.Builder(), ) { checkNotNull(bundleURL) val request = requestBuilder.url(bundleURL).addHeader("Accept", "multipart/mixed").build() @@ -139,7 +139,8 @@ public class BundleDownloader public constructor(private val client: OkHttpClien body.source(), outputFile, bundleInfo, - callback) + callback, + ) } } } @@ -155,7 +156,7 @@ public class BundleDownloader public constructor(private val client: OkHttpClien boundary: String, outputFile: File, bundleInfo: BundleInfo?, - callback: DevBundleDownloadListener + callback: DevBundleDownloadListener, ) { if (response.body() == null) { callback.onFailure( @@ -181,7 +182,7 @@ public class BundleDownloader public constructor(private val client: OkHttpClien override fun onChunkComplete( headers: Map, body: Buffer, - isLastChunk: Boolean + isLastChunk: Boolean, ) { // This will get executed for every chunk of the multipart response. The last chunk // (isLastChunk = true) will be the JS bundle, the other ones will be progress @@ -194,7 +195,14 @@ public class BundleDownloader public constructor(private val client: OkHttpClien status = headers.getOrDefault("X-Http-Status", "0").toInt() } processBundleResult( - url, status, Headers.of(headers), body, outputFile, bundleInfo, callback) + url, + status, + Headers.of(headers), + body, + outputFile, + bundleInfo, + callback, + ) } else { if (!headers.containsKey("Content-Type") || headers["Content-Type"] != "application/json") { @@ -223,11 +231,14 @@ public class BundleDownloader public constructor(private val client: OkHttpClien override fun onChunkProgress( headers: Map, loaded: Long, - total: Long + total: Long, ) { if ("application/javascript" == headers["Content-Type"]) { callback.onProgress( - "Downloading", (loaded / 1024).toInt(), (total / 1024).toInt()) + "Downloading", + (loaded / 1024).toInt(), + (total / 1024).toInt(), + ) } } }) @@ -255,7 +266,7 @@ public class BundleDownloader public constructor(private val client: OkHttpClien body: BufferedSource, outputFile: File, bundleInfo: BundleInfo?, - callback: DevBundleDownloadListener + callback: DevBundleDownloadListener, ) { // Check for server errors. If the server error has the expected form, fail with more info. if (statusCode != 200) { diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/ChangeBundleLocationDialog.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/ChangeBundleLocationDialog.kt index 2d235e57b07..206a663b3ca 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/ChangeBundleLocationDialog.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/ChangeBundleLocationDialog.kt @@ -29,7 +29,7 @@ internal object ChangeBundleLocationDialog { fun show( context: Context, devSettings: DeveloperSettings, - onClickListener: ChangeBundleLocationDialogListener + onClickListener: ChangeBundleLocationDialogListener, ) { val settings = devSettings.packagerConnectionSettings val currentHost = settings.debugServerHost @@ -47,7 +47,9 @@ internal object ChangeBundleLocationDialog { label.text = context.getString(R.string.catalyst_change_bundle_location_input_label) label.layoutParams = LinearLayout.LayoutParams( - LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.WRAP_CONTENT) + LinearLayout.LayoutParams.MATCH_PARENT, + LinearLayout.LayoutParams.WRAP_CONTENT, + ) val input = EditText(context) // This makes it impossible to enter a newline in the input field @@ -75,17 +77,23 @@ internal object ChangeBundleLocationDialog { suggestionRow.orientation = LinearLayout.HORIZONTAL suggestionRow.layoutParams = LinearLayout.LayoutParams( - LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.WRAP_CONTENT) + LinearLayout.LayoutParams.MATCH_PARENT, + LinearLayout.LayoutParams.WRAP_CONTENT, + ) suggestionRow.addView(defaultHostSuggestion) suggestionRow.addView(networkHostSuggestion) val instructions = TextView(context) instructions.text = context.getString( - R.string.catalyst_change_bundle_location_instructions, getAdbReverseTcpCommand(context)) + R.string.catalyst_change_bundle_location_instructions, + getAdbReverseTcpCommand(context), + ) val instructionsParams = LinearLayout.LayoutParams( - LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.WRAP_CONTENT) + LinearLayout.LayoutParams.MATCH_PARENT, + LinearLayout.LayoutParams.WRAP_CONTENT, + ) instructionsParams.setMargins(0, paddingSmall, 0, paddingLarge) instructions.layoutParams = instructionsParams diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/CxxInspectorPackagerConnection.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/CxxInspectorPackagerConnection.kt index fbaa7604123..b4c2cc22fd3 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/CxxInspectorPackagerConnection.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/CxxInspectorPackagerConnection.kt @@ -25,7 +25,7 @@ import okhttp3.WebSocketListener internal class CxxInspectorPackagerConnection( url: String, deviceName: String, - packageName: String + packageName: String, ) : IInspectorPackagerConnection { @DoNotStrip private val mHybridData: HybridData @@ -104,7 +104,8 @@ internal class CxxInspectorPackagerConnection( // WebSocketListener.onFailure delegate.close() }, - delayMs = 0) + delayMs = 0, + ) } override fun onMessage(webSocket: WebSocket, text: String) { @@ -123,9 +124,11 @@ internal class CxxInspectorPackagerConnection( // WebSocketListener.onClosed delegate.close() }, - delayMs = 0) + delayMs = 0, + ) } - }) + }, + ) return object : IWebSocket { override fun send(message: String) { webSocket.send(message) @@ -153,7 +156,7 @@ internal class CxxInspectorPackagerConnection( url: String, deviceName: String, packageName: String, - delegate: DelegateImpl + delegate: DelegateImpl, ): HybridData } } diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/DebugOverlayController.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/DebugOverlayController.kt index 3467d9af749..07656a00def 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/DebugOverlayController.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/DebugOverlayController.kt @@ -44,7 +44,8 @@ internal class DebugOverlayController(private val reactContext: ReactContext) { WindowOverlayCompat.TYPE_SYSTEM_OVERLAY, WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE or WindowManager.LayoutParams.FLAG_NOT_TOUCHABLE, - PixelFormat.TRANSLUCENT) + PixelFormat.TRANSLUCENT, + ) windowManager.addView(fpsDebugViewContainer, params) } else if (!fpsDebugViewVisible && fpsDebugViewContainer != null) { fpsDebugViewContainer?.removeAllViews() @@ -62,11 +63,13 @@ internal class DebugOverlayController(private val reactContext: ReactContext) { val intent = Intent( Settings.ACTION_MANAGE_OVERLAY_PERMISSION, - Uri.parse("package:" + context.packageName)) + Uri.parse("package:" + context.packageName), + ) intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK) FLog.w( ReactConstants.TAG, - "Overlay permissions needs to be granted in order for react native apps to run in dev mode") + "Overlay permissions needs to be granted in order for react native apps to run in dev mode", + ) if (canHandleIntent(context, intent)) { context.startActivity(intent) } diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/DefaultDevLoadingViewImplementation.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/DefaultDevLoadingViewImplementation.kt index 9fbf1f8a778..7e06ff82c4c 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/DefaultDevLoadingViewImplementation.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/DefaultDevLoadingViewImplementation.kt @@ -68,7 +68,8 @@ public class DefaultDevLoadingViewImplementation( if (currentActivity == null) { FLog.e( ReactConstants.TAG, - "Unable to display loading message because react " + "activity isn't available") + "Unable to display loading message because react " + "activity isn't available", + ) return } @@ -85,7 +86,10 @@ public class DefaultDevLoadingViewImplementation( view.text = message val popup = PopupWindow( - view, ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT) + view, + ViewGroup.LayoutParams.MATCH_PARENT, + ViewGroup.LayoutParams.WRAP_CONTENT, + ) popup.isTouchable = false popup.showAtLocation(currentActivity.window.decorView, Gravity.NO_GRAVITY, 0, topOffset) devLoadingView = view @@ -94,7 +98,8 @@ public class DefaultDevLoadingViewImplementation( } catch (e: WindowManager.BadTokenException) { FLog.e( ReactConstants.TAG, - "Unable to display loading message because react activity isn't active, message: $message") + "Unable to display loading message because react activity isn't active, message: $message", + ) } } diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/DefaultDevSupportManagerFactory.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/DefaultDevSupportManagerFactory.kt index 7cb88df90d2..d99e7830c06 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/DefaultDevSupportManagerFactory.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/DefaultDevSupportManagerFactory.kt @@ -29,7 +29,8 @@ internal class DefaultDevSupportManagerFactory : DevSupportManagerFactory { "Use the other create() method with useDevSupport parameter for New Architecture. This method will be removed in a future release.", replaceWith = ReplaceWith( - "create(applicationContext, reactInstanceManagerHelper, packagerPathForJSBundleName, enableOnCreate, redBoxHandler, devBundleDownloadListener, minNumShakes, customPackagerCommandHandlers, surfaceDelegateFactory, devLoadingViewManager, pausedInDebuggerOverlayManager)")) + "create(applicationContext, reactInstanceManagerHelper, packagerPathForJSBundleName, enableOnCreate, redBoxHandler, devBundleDownloadListener, minNumShakes, customPackagerCommandHandlers, surfaceDelegateFactory, devLoadingViewManager, pausedInDebuggerOverlayManager)"), + ) override fun create( applicationContext: Context, reactInstanceManagerHelper: ReactInstanceDevHelper, @@ -41,7 +42,7 @@ internal class DefaultDevSupportManagerFactory : DevSupportManagerFactory { customPackagerCommandHandlers: Map?, surfaceDelegateFactory: SurfaceDelegateFactory?, devLoadingViewManager: DevLoadingViewManager?, - pausedInDebuggerOverlayManager: PausedInDebuggerOverlayManager? + pausedInDebuggerOverlayManager: PausedInDebuggerOverlayManager?, ): DevSupportManager { return if (!enableOnCreate) { ReleaseDevSupportManager() @@ -74,7 +75,8 @@ internal class DefaultDevSupportManagerFactory : DevSupportManagerFactory { MutableMap::class.java, SurfaceDelegateFactory::class.java, DevLoadingViewManager::class.java, - PausedInDebuggerOverlayManager::class.java) + PausedInDebuggerOverlayManager::class.java, + ) constructor.newInstance( applicationContext, reactInstanceManagerHelper, @@ -86,7 +88,8 @@ internal class DefaultDevSupportManagerFactory : DevSupportManagerFactory { customPackagerCommandHandlers, surfaceDelegateFactory, devLoadingViewManager, - pausedInDebuggerOverlayManager) as DevSupportManager + pausedInDebuggerOverlayManager, + ) as DevSupportManager } catch (e: Exception) { PerftestDevSupportManager(applicationContext) } @@ -104,7 +107,7 @@ internal class DefaultDevSupportManagerFactory : DevSupportManagerFactory { surfaceDelegateFactory: SurfaceDelegateFactory?, devLoadingViewManager: DevLoadingViewManager?, pausedInDebuggerOverlayManager: PausedInDebuggerOverlayManager?, - useDevSupport: Boolean + useDevSupport: Boolean, ): DevSupportManager = if (ReactBuildConfig.UNSTABLE_ENABLE_FUSEBOX_RELEASE) { PerftestDevSupportManager(applicationContext) @@ -120,7 +123,8 @@ internal class DefaultDevSupportManagerFactory : DevSupportManagerFactory { customPackagerCommandHandlers, surfaceDelegateFactory, devLoadingViewManager, - pausedInDebuggerOverlayManager) + pausedInDebuggerOverlayManager, + ) } else { ReleaseDevSupportManager() } diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevServerHelper.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevServerHelper.kt index 1e5084ef2a8..14fa892e82f 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevServerHelper.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevServerHelper.kt @@ -62,7 +62,7 @@ import okio.Okio public open class DevServerHelper( private val settings: DeveloperSettings, private val applicationContext: Context, - private val packagerConnectionSettings: PackagerConnectionSettings + private val packagerConnectionSettings: PackagerConnectionSettings, ) { public interface PackagerCommandListener { public fun onPackagerConnected() @@ -82,7 +82,7 @@ public open class DevServerHelper( private enum class BundleType(val typeID: String) { BUNDLE("bundle"), - MAP("map") + MAP("map"), } private val client: OkHttpClient = @@ -119,7 +119,8 @@ public open class DevServerHelper( "android-%s-%s-%s", packageName, androidId, - if (getFuseboxEnabled()) "fusebox" else "legacy") + if (getFuseboxEnabled()) "fusebox" else "legacy", + ) return getSHA256(rawDeviceId) } @@ -132,7 +133,8 @@ public open class DevServerHelper( Uri.encode(getFriendlyDeviceName()), Uri.encode(packageName), Uri.encode(inspectorDeviceId), - getIsProfilingBuild()) + getIsProfilingBuild(), + ) /** Whether we should enable dev mode when requesting JS bundles. */ private val devMode: Boolean @@ -180,7 +182,11 @@ public open class DevServerHelper( checkNotNull(clientId) packagerClient = JSPackagerClient( - clientId, packagerConnectionSettings, handlers, onPackagerConnectedCallback) + clientId, + packagerConnectionSettings, + handlers, + onPackagerConnectedCallback, + ) .apply { init() } return null @@ -217,7 +223,10 @@ public open class DevServerHelper( } inspectorPackagerConnection = CxxInspectorPackagerConnection( - this@DevServerHelper.inspectorDeviceUrl, deviceName, packageName) + this@DevServerHelper.inspectorDeviceUrl, + deviceName, + packageName, + ) .apply { connect() } return null } @@ -247,10 +256,15 @@ public open class DevServerHelper( outputFile: File, bundleURL: String?, bundleInfo: BundleDownloader.BundleInfo?, - requestBuilder: Request.Builder = Request.Builder() + requestBuilder: Request.Builder = Request.Builder(), ) { bundleDownloader.downloadBundleFromURL( - callback, outputFile, bundleURL, bundleInfo, requestBuilder) + callback, + outputFile, + bundleURL, + bundleInfo, + requestBuilder, + ) } private fun createSplitBundleURL(mainModuleID: String, host: String): String = @@ -261,7 +275,7 @@ public open class DevServerHelper( type: BundleType, host: String = packagerConnectionSettings.debugServerHost, modulesOnly: Boolean = false, - runModule: Boolean = true + runModule: Boolean = true, ): String { val dev = devMode val additionalOptionsBuilder = StringBuilder() @@ -282,7 +296,8 @@ public open class DevServerHelper( jSMinifyMode, packageName, if (modulesOnly) "true" else "false", - if (runModule) "true" else "false") + + if (runModule) "true" else "false", + ) + (if (getFuseboxEnabled()) "&excludeSource=true&sourcePaths=url-server" else "") + additionalOptionsBuilder.toString()) } @@ -329,7 +344,8 @@ public open class DevServerHelper( "Failed to fetch resource synchronously - resourcePath: \"%s\", outputFile: \"%s\"", resourcePath, outputFile.absolutePath, - e) + e, + ) return null } } @@ -342,7 +358,8 @@ public open class DevServerHelper( Locale.US, "http://%s/open-debugger?device=%s", packagerConnectionSettings.debugServerHost, - Uri.encode(inspectorDeviceId)) + Uri.encode(inspectorDeviceId), + ) val request = Request.Builder().url(requestUrl).method("POST", RequestBody.create(null, "")).build() @@ -397,7 +414,8 @@ public open class DevServerHelper( result[16], result[17], result[18], - result[19]) + result[19], + ) } private fun createResourceURL(host: String, resourcePathParam: String): String { diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevSupportManagerBase.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevSupportManagerBase.kt index b30b646b5df..3a10396ef59 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevSupportManagerBase.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevSupportManagerBase.kt @@ -83,7 +83,7 @@ public abstract class DevSupportManagerBase( private val customPackagerCommandHandlers: Map?, private val surfaceDelegateFactory: SurfaceDelegateFactory?, public var devLoadingViewManager: DevLoadingViewManager?, - private var pausedInDebuggerOverlayManager: PausedInDebuggerOverlayManager? + private var pausedInDebuggerOverlayManager: PausedInDebuggerOverlayManager?, ) : DevSupportManager { public interface CallbackWithBundleLoader { @@ -104,7 +104,8 @@ public abstract class DevSupportManagerBase( override fun onInternalSettingsChanged() { this@DevSupportManagerBase.reloadSettings() } - }) + }, + ) override val currentActivity: Activity? get() = reactInstanceDevHelper.currentActivity @@ -277,7 +278,7 @@ public abstract class DevSupportManagerBase( message: String?, stack: Array, errorCookie: Int, - errorType: ErrorType + errorType: ErrorType, ) { UiThreadUtil.runOnUiThread { // Keep a copy of the latest error to be shown by the RedBoxSurface @@ -311,7 +312,8 @@ public abstract class DevSupportManagerBase( Toast.makeText( applicationContext, applicationContext.getString(R.string.catalyst_hot_reloading_auto_disable), - Toast.LENGTH_LONG) + Toast.LENGTH_LONG, + ) .show() devSettings.isHotModuleReplacementEnabled = false } @@ -337,7 +339,8 @@ public abstract class DevSupportManagerBase( if (context == null || context.isFinishing) { FLog.e( ReactConstants.TAG, - "Unable to launch change bundle location because react activity is not available") + "Unable to launch change bundle location because react activity is not available", + ) return@DevOptionHandler } @@ -373,7 +376,8 @@ public abstract class DevSupportManagerBase( Toast.makeText( applicationContext, applicationContext.getString(R.string.catalyst_hot_reloading_auto_enable), - Toast.LENGTH_LONG) + Toast.LENGTH_LONG, + ) .show() devSettings.isJSDevModeEnabled = true handleReloadJS() @@ -411,7 +415,8 @@ public abstract class DevSupportManagerBase( if (context == null || context.isFinishing) { FLog.e( ReactConstants.TAG, - "Unable to launch dev options menu because react activity " + "isn't available") + "Unable to launch dev options menu because react activity " + "isn't available", + ) return } @@ -442,7 +447,10 @@ public abstract class DevSupportManagerBase( val adapter: ListAdapter = object : ArrayAdapter( - context, android.R.layout.simple_list_item_1, options.keys.toTypedArray()) { + context, + android.R.layout.simple_list_item_1, + options.keys.toTypedArray(), + ) { override fun areAllItemsEnabled(): Boolean = false override fun isEnabled(position: Int): Boolean = @@ -574,7 +582,9 @@ public abstract class DevSupportManagerBase( val port = if (parsedURL.port != -1) parsedURL.port else parsedURL.defaultPort devLoadingViewManager?.showMessage( applicationContext.getString( - R.string.catalyst_loading_from_url, parsedURL.host + ":" + port)) + R.string.catalyst_loading_from_url, + parsedURL.host + ":" + port, + )) devLoadingViewVisible = true } @@ -593,7 +603,7 @@ public abstract class DevSupportManagerBase( public fun fetchSplitBundleAndCreateBundleLoader( bundlePath: String, - callback: CallbackWithBundleLoader + callback: CallbackWithBundleLoader, ) { val bundleUrl = devServerHelper.getDevServerSplitBundleURL(bundlePath) // The bundle path may contain the '/' character, which is not allowed in file names. @@ -612,7 +622,9 @@ public abstract class DevSupportManagerBase( val bundleLoader = JSBundleLoader.createCachedSplitBundleFromNetworkLoader( - bundleUrl, bundleFile.absolutePath) + bundleUrl, + bundleFile.absolutePath, + ) callback.onSuccess(bundleLoader) } @@ -629,7 +641,8 @@ public abstract class DevSupportManagerBase( }, bundleFile, bundleUrl, - null) + null, + ) } } @@ -658,7 +671,7 @@ public abstract class DevSupportManagerBase( message: String?, stack: Array, errorCookie: Int, - errorType: ErrorType + errorType: ErrorType, ) { lastErrorTitle = message lastErrorStack = stack @@ -697,7 +710,8 @@ public abstract class DevSupportManagerBase( }, jsBundleDownloadedFile, bundleURL, - bundleInfo) + bundleInfo, + ) } private fun reportBundleLoadingFailure(cause: Exception) { @@ -805,7 +819,8 @@ public abstract class DevSupportManagerBase( override fun customCommandHandlers(): Map? { return customPackagerCommandHandlers } - }) + }, + ) } else { // hide FPS debug overlay debugOverlayController?.setFpsDebugViewVisible(false) @@ -854,7 +869,7 @@ public abstract class DevSupportManagerBase( context: Context, receiver: BroadcastReceiver, filter: IntentFilter, - exported: Boolean + exported: Boolean, ) { @SuppressLint("UnspecifiedRegisterReceiverFlag") if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE && @@ -862,7 +877,8 @@ public abstract class DevSupportManagerBase( context.registerReceiver( receiver, filter, - if (exported) Context.RECEIVER_EXPORTED else Context.RECEIVER_NOT_EXPORTED) + if (exported) Context.RECEIVER_EXPORTED else Context.RECEIVER_NOT_EXPORTED, + ) } else { context.registerReceiver(receiver, filter) } @@ -870,12 +886,14 @@ public abstract class DevSupportManagerBase( override fun openDebugger() { devServerHelper.openDebugger( - currentReactContext, applicationContext.getString(R.string.catalyst_open_debugger_error)) + currentReactContext, + applicationContext.getString(R.string.catalyst_open_debugger_error), + ) } override fun showPausedInDebuggerOverlay( message: String, - listener: PausedInDebuggerOverlayCommandListener + listener: PausedInDebuggerOverlayCommandListener, ) { pausedInDebuggerOverlayManager?.showPausedInDebuggerOverlay(message, listener) } diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevSupportManagerFactory.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevSupportManagerFactory.kt index e002388a429..37c435129c9 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevSupportManagerFactory.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevSupportManagerFactory.kt @@ -27,7 +27,8 @@ public interface DevSupportManagerFactory { "Use the other create() method with useDevSupport parameter for New Architecture. This method will be removed in a future release.", replaceWith = ReplaceWith( - "create(applicationContext, reactInstanceManagerHelper, packagerPathForJSBundleName, enableOnCreate, redBoxHandler, devBundleDownloadListener, minNumShakes, customPackagerCommandHandlers, surfaceDelegateFactory, devLoadingViewManager, pausedInDebuggerOverlayManager)")) + "create(applicationContext, reactInstanceManagerHelper, packagerPathForJSBundleName, enableOnCreate, redBoxHandler, devBundleDownloadListener, minNumShakes, customPackagerCommandHandlers, surfaceDelegateFactory, devLoadingViewManager, pausedInDebuggerOverlayManager)"), + ) public fun create( applicationContext: Context, reactInstanceManagerHelper: ReactInstanceDevHelper, @@ -39,7 +40,7 @@ public interface DevSupportManagerFactory { customPackagerCommandHandlers: Map?, surfaceDelegateFactory: SurfaceDelegateFactory?, devLoadingViewManager: DevLoadingViewManager?, - pausedInDebuggerOverlayManager: PausedInDebuggerOverlayManager? + pausedInDebuggerOverlayManager: PausedInDebuggerOverlayManager?, ): DevSupportManager /** @@ -58,6 +59,6 @@ public interface DevSupportManagerFactory { surfaceDelegateFactory: SurfaceDelegateFactory?, devLoadingViewManager: DevLoadingViewManager?, pausedInDebuggerOverlayManager: PausedInDebuggerOverlayManager?, - useDevSupport: Boolean + useDevSupport: Boolean, ): DevSupportManager } diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/FpsView.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/FpsView.kt index 88ef08dbc1d..3905aa5a618 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/FpsView.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/FpsView.kt @@ -54,7 +54,7 @@ internal class FpsView(reactContext: ReactContext?) : FrameLayout(reactContext!! currentJSFPS: Double, droppedUIFrames: Int, total4PlusFrameStutters: Int, - runningOnFabric: Boolean + runningOnFabric: Boolean, ) { var fpsString = String.format( @@ -62,7 +62,8 @@ internal class FpsView(reactContext: ReactContext?) : FrameLayout(reactContext!! "UI: %.1f fps\n%d dropped so far\n%d stutters (4+) so far", currentFPS, droppedUIFrames, - total4PlusFrameStutters) + total4PlusFrameStutters, + ) if (!runningOnFabric) { // The JS FPS is only relevant for the legacy architecture, as Fabric we don't use // BridgeIdleDebugListener to track JS frame drops. @@ -89,7 +90,8 @@ internal class FpsView(reactContext: ReactContext?) : FrameLayout(reactContext!! frameCallback.jsFPS, totalFramesDropped, total4PlusFrameStutters, - frameCallback.isRunningOnFabric) + frameCallback.isRunningOnFabric, + ) frameCallback.reset() postDelayed(this, UPDATE_INTERVAL_MS.toLong()) } diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/HMRClient.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/HMRClient.kt index 08b182ad02f..286dcb67244 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/HMRClient.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/HMRClient.kt @@ -35,7 +35,7 @@ public interface HMRClient : JavaScriptModule { host: String?, port: Int, isEnabled: Boolean, - scheme: String? + scheme: String?, ) /** Registers an additional JS bundle with HMRClient. */ diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/LogBoxDialogSurfaceDelegate.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/LogBoxDialogSurfaceDelegate.kt index a7cdf00f2a9..a600c875fe6 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/LogBoxDialogSurfaceDelegate.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/LogBoxDialogSurfaceDelegate.kt @@ -26,7 +26,9 @@ internal class LogBoxDialogSurfaceDelegate(private val devSupportManager: DevSup override fun createContentView(appKey: String) { Assertions.assertCondition( - appKey == "LogBox", "This surface manager can only create LogBox React application") + appKey == "LogBox", + "This surface manager can only create LogBox React application", + ) reactRootView = devSupportManager.createRootView("LogBox") if (reactRootView == null) { e("Unable to launch logbox because react was unable to create the root view") diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/LogBoxModule.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/LogBoxModule.kt index f9330f2a9d0..0ab30c9f9e6 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/LogBoxModule.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/LogBoxModule.kt @@ -17,7 +17,7 @@ import com.facebook.react.module.annotations.ReactModule @ReactModule(name = NativeLogBoxSpec.NAME) internal class LogBoxModule( reactContext: ReactApplicationContext?, - devSupportManager: DevSupportManager + devSupportManager: DevSupportManager, ) : NativeLogBoxSpec(reactContext) { private val surfaceDelegate: SurfaceDelegate = devSupportManager.createSurfaceDelegate(NAME) diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/MultipartStreamReader.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/MultipartStreamReader.kt index 0b4129cfb31..5ff3dc94532 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/MultipartStreamReader.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/MultipartStreamReader.kt @@ -18,7 +18,7 @@ import okio.ByteString /** Utility class to parse the body of a response of type multipart/mixed. */ internal class MultipartStreamReader( private val source: BufferedSource, - private val boundary: String + private val boundary: String, ) { private var lastProgressEvent: Long = 0 @@ -147,7 +147,7 @@ internal class MultipartStreamReader( headers: Map?, contentLength: Long, isFinal: Boolean, - listener: ChunkListener? + listener: ChunkListener?, ) { if (listener == null || headers == null) { return diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/PackagerStatusCheck.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/PackagerStatusCheck.kt index 2afcf09294c..f7fdd18ff85 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/PackagerStatusCheck.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/PackagerStatusCheck.kt @@ -50,7 +50,8 @@ internal class PackagerStatusCheck { override fun onFailure(call: Call, e: IOException) { FLog.w( ReactConstants.TAG, - "The packager does not seem to be running as we got an IOException requesting its status: ${e.message}") + "The packager does not seem to be running as we got an IOException requesting its status: ${e.message}", + ) callback.onPackagerStatusFetched(false) } @@ -58,7 +59,8 @@ internal class PackagerStatusCheck { if (!response.isSuccessful) { FLog.e( ReactConstants.TAG, - "Got non-success http code from packager when requesting status: ${response.code()}") + "Got non-success http code from packager when requesting status: ${response.code()}", + ) callback.onPackagerStatusFetched(false) return } @@ -66,7 +68,8 @@ internal class PackagerStatusCheck { if (body == null) { FLog.e( ReactConstants.TAG, - "Got null body response from packager when requesting status") + "Got null body response from packager when requesting status", + ) callback.onPackagerStatusFetched(false) return } @@ -76,7 +79,8 @@ internal class PackagerStatusCheck { if (PACKAGER_OK_STATUS != bodyString) { FLog.e( ReactConstants.TAG, - "Got unexpected response from packager when requesting status: $bodyString") + "Got unexpected response from packager when requesting status: $bodyString", + ) callback.onPackagerStatusFetched(false) return } diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/PausedInDebuggerOverlayDialogManager.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/PausedInDebuggerOverlayDialogManager.kt index 5228a0d08cd..eb9060e0da3 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/PausedInDebuggerOverlayDialogManager.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/PausedInDebuggerOverlayDialogManager.kt @@ -29,7 +29,7 @@ internal class PausedInDebuggerOverlayDialogManager( override fun showPausedInDebuggerOverlay( message: String, - listener: DevSupportManager.PausedInDebuggerOverlayCommandListener + listener: DevSupportManager.PausedInDebuggerOverlayCommandListener, ) { UiThreadUtil.runOnUiThread { pausedInDebuggerDialog?.dismiss() diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/PerftestDevSupportManager.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/PerftestDevSupportManager.kt index eab4acd6c69..f0cd50b3cda 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/PerftestDevSupportManager.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/PerftestDevSupportManager.kt @@ -23,7 +23,8 @@ internal class PerftestDevSupportManager( applicationContext, object : DevInternalSettings.Listener { override fun onInternalSettingsChanged() = Unit - }) + }, + ) private val devServerHelper: DevServerHelper = DevServerHelper(devSettings, applicationContext, devSettings.packagerConnectionSettings) diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/RedBoxContentView.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/RedBoxContentView.kt index 150c903d489..dbbc58453b4 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/RedBoxContentView.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/RedBoxContentView.kt @@ -7,8 +7,8 @@ @file:Suppress( "DEPRECATION_ERROR", // Conflicting okhttp versions - "DEPRECATION" // Need to migrate away from AsyncTasks - ) + "DEPRECATION", // Need to migrate away from AsyncTasks +) package com.facebook.react.devsupport @@ -186,7 +186,8 @@ internal class RedBoxContentView( "file" to frame.file, "methodName" to frame.method, "lineNumber" to frame.line, - "column" to frame.column)) + "column" to frame.column, + )) } } @@ -240,7 +241,9 @@ internal class RedBoxContentView( override fun onItemClick(parent: AdapterView<*>?, view: View, position: Int, id: Long) { OpenStackFrameTask(devSupportManager) .executeOnExecutor( - AsyncTask.THREAD_POOL_EXECUTOR, stackView.adapter.getItem(position) as StackFrame) + AsyncTask.THREAD_POOL_EXECUTOR, + stackView.adapter.getItem(position) as StackFrame, + ) } /** Refresh the content view with latest errors from dev support manager */ diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/RedBoxDialogSurfaceDelegate.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/RedBoxDialogSurfaceDelegate.kt index 2850375582f..14c85460308 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/RedBoxDialogSurfaceDelegate.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/RedBoxDialogSurfaceDelegate.kt @@ -47,7 +47,8 @@ internal class RedBoxDialogSurfaceDelegate(private val devSupportManager: DevSup val message = devSupportManager.lastErrorTitle FLog.e( ReactConstants.TAG, - "Unable to launch redbox because react activity is not available, here is the error that redbox would've displayed: ${(message ?: "N/A")}") + "Unable to launch redbox because react activity is not available, here is the error that redbox would've displayed: ${(message ?: "N/A")}", + ) return } @@ -76,7 +77,8 @@ internal class RedBoxDialogSurfaceDelegate(private val devSupportManager: DevSup } FLog.e( ReactConstants.TAG, - "Unable to launch redbox because react activity and react context is not available, here is the error that redbox would've displayed: ${message ?: "N/A"}") + "Unable to launch redbox because react activity and react context is not available, here is the error that redbox would've displayed: ${message ?: "N/A"}", + ) return } diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/ReleaseDevSupportManager.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/ReleaseDevSupportManager.kt index 721441402b1..91d8f370a12 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/ReleaseDevSupportManager.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/ReleaseDevSupportManager.kt @@ -40,13 +40,13 @@ public open class ReleaseDevSupportManager : DevSupportManager { public override fun addCustomDevOption( optionName: String, - optionHandler: DevOptionHandler + optionHandler: DevOptionHandler, ): Unit = Unit public override fun showNewJSError( message: String?, details: ReadableArray?, - errorCookie: Int + errorCookie: Int, ): Unit = Unit public override fun createRootView(appKey: String): View? = null @@ -106,7 +106,7 @@ public open class ReleaseDevSupportManager : DevSupportManager { public override fun downloadBundleResourceFromUrlSync( resourceURL: String, - outputFile: File + outputFile: File, ): File? = null public override val lastErrorTitle: String? @@ -146,7 +146,7 @@ public open class ReleaseDevSupportManager : DevSupportManager { public override fun showPausedInDebuggerOverlay( message: String, - listener: PausedInDebuggerOverlayCommandListener + listener: PausedInDebuggerOverlayCommandListener, ): Unit = Unit public override fun hidePausedInDebuggerOverlay(): Unit = Unit diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/StackTraceHelper.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/StackTraceHelper.kt index 670757285ec..556115e2e3c 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/StackTraceHelper.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/StackTraceHelper.kt @@ -74,10 +74,15 @@ public object StackTraceHelper { method = method, line = lineNumber, column = columnNumber, - isCollapsed = collapse) + isCollapsed = collapse, + ) } else if (type == ReadableType.String) { StackFrameImpl( - file = null, method = checkNotNull(stack.getString(i)), line = -1, column = -1) + file = null, + method = checkNotNull(stack.getString(i)), + line = -1, + column = -1, + ) } else { error("Cannot parse the stackframe for $stack") } @@ -112,7 +117,8 @@ public object StackTraceHelper { method = method, line = lineNumber, column = columnNumber, - isCollapsed = collapse) + isCollapsed = collapse, + ) } } catch (exception: JSONException) { throw RuntimeException(exception) @@ -140,7 +146,8 @@ public object StackTraceHelper { file = file, method = method, line = checkNotNull(lineString).toInt(), - column = checkNotNull(columnString).toInt()) + column = checkNotNull(columnString).toInt(), + ) } else { StackFrameImpl(file = null, method = stackTrace[i], line = -1, column = -1) } @@ -157,7 +164,8 @@ public object StackTraceHelper { fileName = stackTrace[i].fileName, method = stackTrace[i].methodName, line = stackTrace[i].lineNumber, - column = -1) + column = -1, + ) } } @@ -235,7 +243,7 @@ public object StackTraceHelper { public override val method: String, public override val line: Int, public override val column: Int, - public override val isCollapsed: Boolean = false + public override val isCollapsed: Boolean = false, ) : StackFrame { /** Convert the stack frame to a JSON representation. */ @@ -246,6 +254,7 @@ public object StackTraceHelper { METHOD_NAME_KEY to method, LINE_NUMBER_KEY to line, COLUMN_KEY to column, - COLLAPSE_KEY to isCollapsed)) + COLLAPSE_KEY to isCollapsed, + )) } } diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/interfaces/PausedInDebuggerOverlayManager.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/interfaces/PausedInDebuggerOverlayManager.kt index 36f39e09ef4..a38a02e84ca 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/interfaces/PausedInDebuggerOverlayManager.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/interfaces/PausedInDebuggerOverlayManager.kt @@ -11,7 +11,7 @@ public interface PausedInDebuggerOverlayManager { /** Shows the "paused in debugger" overlay with the given message. */ public fun showPausedInDebuggerOverlay( message: String, - listener: DevSupportManager.PausedInDebuggerOverlayCommandListener + listener: DevSupportManager.PausedInDebuggerOverlayCommandListener, ) /** Hides the "paused in debugger" overlay, if currently shown. */ diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/interfaces/RedBoxHandler.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/interfaces/RedBoxHandler.kt index 73124fbd6f3..50f707fb833 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/interfaces/RedBoxHandler.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/interfaces/RedBoxHandler.kt @@ -35,6 +35,6 @@ public interface RedBoxHandler { title: String, stack: Array, sourceUrl: String, - reportCompletedListener: ReportCompletedListener + reportCompletedListener: ReportCompletedListener, ) } diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/DevToolsReactPerfLogger.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/DevToolsReactPerfLogger.kt index d19987090db..e845718dce5 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/DevToolsReactPerfLogger.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/DevToolsReactPerfLogger.kt @@ -114,7 +114,7 @@ public class DevToolsReactPerfLogger : FabricMarkerListener { name: ReactMarkerConstants, tag: String?, instanceKey: Int, - timestamp: Long + timestamp: Long, ) { logFabricMarker(name, tag, instanceKey, timestamp, 0) } @@ -124,7 +124,7 @@ public class DevToolsReactPerfLogger : FabricMarkerListener { tag: String?, instanceKey: Int, timestamp: Long, - counter: Int + counter: Int, ) { if (isFabricCommitMarker(name)) { var commitPoint = fabricCommitMarkers[instanceKey] diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricUIManagerBinding.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricUIManagerBinding.kt index f22661f1d7e..55818f21103 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricUIManagerBinding.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricUIManagerBinding.kt @@ -46,13 +46,13 @@ internal class FabricUIManagerBinding : HybridClassBase() { offsetX: Float, offsetY: Float, isRTL: Boolean, - doLeftAndRightSwapInRTL: Boolean + doLeftAndRightSwapInRTL: Boolean, ) external fun startSurfaceWithSurfaceHandler( surfaceId: Int, surfaceHandler: SurfaceHandlerBinding, - isMountable: Boolean + isMountable: Boolean, ) external fun findNextFocusableElement(parentTag: Int, focusedTag: Int, direction: Int): Int @@ -74,7 +74,7 @@ internal class FabricUIManagerBinding : HybridClassBase() { offsetX: Float, offsetY: Float, isRTL: Boolean, - doLeftAndRightSwapInRTL: Boolean + doLeftAndRightSwapInRTL: Boolean, ) external fun driveCxxAnimations() @@ -92,7 +92,12 @@ internal class FabricUIManagerBinding : HybridClassBase() { ) { fabricUIManager.setBinding(this) installFabricUIManager( - runtimeExecutor, runtimeScheduler, fabricUIManager, eventBeatManager, componentFactory) + runtimeExecutor, + runtimeScheduler, + fabricUIManager, + eventBeatManager, + componentFactory, + ) setPixelDensity(getDisplayMetricDensity()) } diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricUIManagerProviderImpl.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricUIManagerProviderImpl.kt index 4a71fa8af21..d5c96183872 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricUIManagerProviderImpl.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricUIManagerProviderImpl.kt @@ -24,10 +24,11 @@ import com.facebook.systrace.Systrace */ @Deprecated( message = "This class is part of Legacy Architecture and will be removed in a future release", - level = DeprecationLevel.WARNING) + level = DeprecationLevel.WARNING, +) public class FabricUIManagerProviderImpl( private val componentFactory: ComponentFactory, - private val viewManagerRegistry: ViewManagerRegistry + private val viewManagerRegistry: ViewManagerRegistry, ) : UIManagerProvider { /** @@ -59,7 +60,12 @@ public class FabricUIManagerProviderImpl( if (runtimeExecutor != null && runtimeScheduler != null) { binding.register( - runtimeExecutor, runtimeScheduler, fabricUIManager, eventBeatManager, componentFactory) + runtimeExecutor, + runtimeScheduler, + fabricUIManager, + eventBeatManager, + componentFactory, + ) } else { throw IllegalStateException( "Unable to register FabricUIManager with CatalystInstance, runtimeExecutor and" + diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/SurfaceHandlerBinding.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/SurfaceHandlerBinding.kt index 9e7f7e42274..f7af235b649 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/SurfaceHandlerBinding.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/SurfaceHandlerBinding.kt @@ -42,7 +42,7 @@ internal open class SurfaceHandlerBinding(moduleName: String) : HybridClassBase( doLeftAndRightSwapInRTL: Boolean, isRTL: Boolean, pixelDensity: Float, - fontScale: Float + fontScale: Float, ) { setLayoutConstraintsNative( LayoutMetricsConversions.getMinSize(widthMeasureSpec) / pixelDensity, @@ -54,7 +54,8 @@ internal open class SurfaceHandlerBinding(moduleName: String) : HybridClassBase( doLeftAndRightSwapInRTL, isRTL, pixelDensity, - fontScale) + fontScale, + ) } private external fun setLayoutConstraintsNative( @@ -67,7 +68,7 @@ internal open class SurfaceHandlerBinding(moduleName: String) : HybridClassBase( doLeftAndRightSwapInRTL: Boolean, isRTL: Boolean, pixelDensity: Float, - fontScale: Float + fontScale: Float, ) external fun setProps(props: NativeMap?) diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/events/EventEmitterWrapper.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/events/EventEmitterWrapper.kt index bb7e73594a8..1d1a3bcd860 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/events/EventEmitterWrapper.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/events/EventEmitterWrapper.kt @@ -26,7 +26,7 @@ internal class EventEmitterWrapper private constructor() : HybridClassBase() { private external fun dispatchEvent( eventName: String, params: NativeMap?, - @EventCategoryDef category: Int + @EventCategoryDef category: Int, ) private external fun dispatchEventSynchronously(eventName: String, params: NativeMap?) diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/events/FabricEventEmitter.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/events/FabricEventEmitter.kt index 3cc70e220c5..10242eaef97 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/events/FabricEventEmitter.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/events/FabricEventEmitter.kt @@ -18,7 +18,8 @@ import com.facebook.systrace.Systrace internal class FabricEventEmitter(private val uiManager: FabricUIManager) : RCTModernEventEmitter { @Deprecated( "Use receiveEvent with surfaceId instead.", - ReplaceWith("receiveEvent(surfaceId, targetTag, eventName, params)")) + ReplaceWith("receiveEvent(surfaceId, targetTag, eventName, params)"), + ) override fun receiveEvent(targetTag: Int, eventName: String, params: WritableMap?): Unit { receiveEvent(ViewUtil.NO_SURFACE_ID, targetTag, eventName, params) } @@ -27,7 +28,7 @@ internal class FabricEventEmitter(private val uiManager: FabricUIManager) : RCTM surfaceId: Int, targetTag: Int, eventName: String, - params: WritableMap? + params: WritableMap?, ) { receiveEvent(surfaceId, targetTag, eventName, false, 0, params, EventCategoryDef.UNSPECIFIED) } @@ -39,7 +40,7 @@ internal class FabricEventEmitter(private val uiManager: FabricUIManager) : RCTM canCoalesceEvent: Boolean, customCoalesceKey: Int, params: WritableMap?, - @EventCategoryDef category: Int + @EventCategoryDef category: Int, ) { Systrace.beginSection(Systrace.TRACE_TAG_REACT, "FabricEventEmitter.receiveEvent('$eventName')") try { @@ -54,7 +55,7 @@ internal class FabricEventEmitter(private val uiManager: FabricUIManager) : RCTM override fun receiveTouches( eventName: String, touches: WritableArray, - changedIndices: WritableArray + changedIndices: WritableArray, ): Unit { throw UnsupportedOperationException("EventEmitter#receiveTouches is not supported by Fabric") } diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/MountItemDispatcher.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/MountItemDispatcher.kt index cb5ef2f9e67..27646482b3a 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/MountItemDispatcher.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/MountItemDispatcher.kt @@ -27,7 +27,7 @@ import java.util.concurrent.ConcurrentLinkedQueue internal class MountItemDispatcher( private val mountingManager: MountingManager, - private val itemDispatchListener: ItemDispatchListener + private val itemDispatchListener: ItemDispatchListener, ) { private val viewCommandMountItems: Queue = ConcurrentLinkedQueue() private val mountItems: Queue = ConcurrentLinkedQueue() @@ -62,7 +62,8 @@ internal class MountItemDispatcher( TAG, "Not queueing PreAllocateMountItem: surfaceId stopped: [%d] - %s", mountItem.getSurfaceId(), - mountItem.toString()) + mountItem.toString(), + ) } } @@ -158,7 +159,9 @@ internal class MountItemDispatcher( // errors/glitches. viewCommandMountItemsToDispatch?.let { commands -> Systrace.beginSection( - Systrace.TRACE_TAG_REACT, "MountItemDispatcher::mountViews viewCommandMountItems") + Systrace.TRACE_TAG_REACT, + "MountItemDispatcher::mountViews viewCommandMountItems", + ) for (command in commands) { if (ReactNativeFeatureFlags.enableFabricLogs()) { @@ -181,12 +184,15 @@ internal class MountItemDispatcher( // common, mundane, and there's not much we can do about them currently. ReactSoftExceptionLogger.logSoftException( TAG, - ReactNoCrashSoftException("Caught exception executing ViewCommand: $command", e)) + ReactNoCrashSoftException("Caught exception executing ViewCommand: $command", e), + ) } } catch (e: Throwable) { // Non-retryable exceptions are logged as soft exceptions in prod, but crash in Debug. ReactSoftExceptionLogger.logSoftException( - TAG, RuntimeException("Caught exception executing ViewCommand: $command", e)) + TAG, + RuntimeException("Caught exception executing ViewCommand: $command", e), + ) } } @@ -197,7 +203,9 @@ internal class MountItemDispatcher( // first getAndResetPreMountItems()?.let { preMountItems -> Systrace.beginSection( - Systrace.TRACE_TAG_REACT, "MountItemDispatcher::mountViews preMountItems") + Systrace.TRACE_TAG_REACT, + "MountItemDispatcher::mountViews preMountItems", + ) for (preMountItem in preMountItems) { if (ReactNativeFeatureFlags.enableFabricLogs()) { printMountItem(preMountItem, "dispatchMountItems: Executing preMountItem") @@ -209,7 +217,9 @@ internal class MountItemDispatcher( mountItemsToDispatch?.let { items -> Systrace.beginSection( - Systrace.TRACE_TAG_REACT, "MountItemDispatcher::mountViews mountItems to execute") + Systrace.TRACE_TAG_REACT, + "MountItemDispatcher::mountViews mountItems to execute", + ) val batchedExecutionStartTime = SystemClock.uptimeMillis() for (mountItem in items) { @@ -302,11 +312,14 @@ internal class MountItemDispatcher( FLog.e( TAG, "executeOrEnqueue: Item execution delayed, surface %s is not ready yet", - item.getSurfaceId()) + item.getSurfaceId(), + ) } val surfaceMountingManager: SurfaceMountingManager = mountingManager.getSurfaceManagerEnforced( - item.getSurfaceId(), "MountItemDispatcher::executeOrEnqueue") + item.getSurfaceId(), + "MountItemDispatcher::executeOrEnqueue", + ) surfaceMountingManager.scheduleMountItemOnViewAttach(item) } else { item.execute(mountingManager) diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/MountingManager.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/MountingManager.kt index 4b52ade0b58..d812b4fe59b 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/MountingManager.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/MountingManager.kt @@ -40,7 +40,7 @@ import java.util.concurrent.CopyOnWriteArrayList */ internal class MountingManager( private val viewManagerRegistry: ViewManagerRegistry, - private val mountItemExecutor: MountItemExecutor + private val mountItemExecutor: MountItemExecutor, ) { private val surfaceIdToManager = ConcurrentHashMap() // any thread @@ -64,7 +64,7 @@ internal class MountingManager( fun startSurface( surfaceId: Int, reactContext: ThemedReactContext?, - rootView: View? + rootView: View?, ): SurfaceMountingManager { val surfaceMountingManager = SurfaceMountingManager( @@ -73,7 +73,8 @@ internal class MountingManager( viewManagerRegistry, rootViewManager, mountItemExecutor, - checkNotNull(reactContext)) + checkNotNull(reactContext), + ) // There could technically be a race condition here if addRootView is called twice from // different threads, though this is (probably) extremely unlikely, and likely an error. @@ -85,7 +86,8 @@ internal class MountingManager( logSoftException( TAG, IllegalStateException( - "Called startSurface more than once for the SurfaceId [$surfaceId]")) + "Called startSurface more than once for the SurfaceId [$surfaceId]"), + ) } mostRecentSurfaceMountingManager = surfaceIdToManager[surfaceId] @@ -134,7 +136,8 @@ internal class MountingManager( } else { logSoftException( TAG, - IllegalStateException("Cannot call stopSurface on non-existent surface: [$surfaceId]")) + IllegalStateException("Cannot call stopSurface on non-existent surface: [$surfaceId]"), + ) } } @@ -217,7 +220,8 @@ internal class MountingManager( @Deprecated( "receiveCommand with Int is deprecated, you should use receiveCommand with commandId:String", - ReplaceWith("receiveCommand(Int,Int,String,ReadableArray)")) + ReplaceWith("receiveCommand(Int,Int,String,ReadableArray)"), + ) fun receiveCommand(surfaceId: Int, reactTag: Int, commandId: Int, commandArgs: ReadableArray) { assertOnUiThread() @Suppress("DEPRECATION") @@ -229,7 +233,7 @@ internal class MountingManager( surfaceId: Int, reactTag: Int, commandId: String?, - commandArgs: ReadableArray + commandArgs: ReadableArray, ) { assertOnUiThread() getSurfaceManagerEnforced(surfaceId, "receiveCommand:string") @@ -302,7 +306,7 @@ internal class MountingManager( widthMode: YogaMeasureMode?, height: Float, heightMode: YogaMeasureMode?, - attachmentsPositions: FloatArray? + attachmentsPositions: FloatArray?, ): Long = viewManagerRegistry .get(checkNotNull(componentName)) @@ -315,7 +319,8 @@ internal class MountingManager( widthMode, height, heightMode, - attachmentsPositions) + attachmentsPositions, + ) /** * This prefetch method is experimental, do not use it for production code. it will most likely @@ -335,7 +340,7 @@ internal class MountingManager( componentName: String?, surfaceId: Int, reactTag: Int, - params: MapBuffer? + params: MapBuffer?, ) { viewManagerRegistry .get(checkNotNull(componentName)) @@ -348,7 +353,7 @@ internal class MountingManager( eventName: String?, canCoalesceEvent: Boolean, params: WritableMap?, - @EventCategoryDef eventCategory: Int + @EventCategoryDef eventCategory: Int, ) { val smm = getSurfaceMountingManager(surfaceId, reactTag) if (smm == null) { @@ -356,7 +361,8 @@ internal class MountingManager( TAG, "Cannot queue event without valid surface mounting manager for tag: %d, surfaceId: %d", reactTag, - surfaceId) + surfaceId, + ) return } smm.enqueuePendingEvent(reactTag, eventName, canCoalesceEvent, params, eventCategory) diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/mountitems/DestroyUnmountedViewMountItem.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/mountitems/DestroyUnmountedViewMountItem.kt index 8bf5c5109cc..eba0bebf249 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/mountitems/DestroyUnmountedViewMountItem.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/mountitems/DestroyUnmountedViewMountItem.kt @@ -15,7 +15,7 @@ import com.facebook.react.fabric.mounting.MountingManager */ internal class DestroyUnmountedViewMountItem( private val _surfaceId: Int, - private val reactTag: Int + private val reactTag: Int, ) : MountItem { override fun execute(mountingManager: MountingManager) { diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/mountitems/DispatchIntCommandMountItem.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/mountitems/DispatchIntCommandMountItem.kt index 986561974fd..12a0a36f37b 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/mountitems/DispatchIntCommandMountItem.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/mountitems/DispatchIntCommandMountItem.kt @@ -14,7 +14,7 @@ internal class DispatchIntCommandMountItem( private val surfaceId: Int, private val reactTag: Int, private val commandId: Int, - private val commandArgs: ReadableArray + private val commandArgs: ReadableArray, ) : DispatchCommandMountItem() { override fun getSurfaceId(): Int = surfaceId diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/mountitems/DispatchStringCommandMountItem.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/mountitems/DispatchStringCommandMountItem.kt index 3ae4f2705e6..6331f800a7e 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/mountitems/DispatchStringCommandMountItem.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/mountitems/DispatchStringCommandMountItem.kt @@ -14,7 +14,7 @@ internal class DispatchStringCommandMountItem( private val surfaceId: Int, private val reactTag: Int, private val commandId: String, - private val commandArgs: ReadableArray + private val commandArgs: ReadableArray, ) : DispatchCommandMountItem() { override fun getSurfaceId(): Int = surfaceId diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/mountitems/IntBufferBatchMountItem.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/mountitems/IntBufferBatchMountItem.kt index 7249be8a0c2..6daff1088d8 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/mountitems/IntBufferBatchMountItem.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/mountitems/IntBufferBatchMountItem.kt @@ -36,7 +36,7 @@ internal class IntBufferBatchMountItem( private val surfaceId: Int, private val intBuffer: IntArray, private val objBuffer: Array, - private val commitNumber: Int + private val commitNumber: Int, ) : BatchMountItem { private val intBufferLen = intBuffer.size private val objBufferLen = objBuffer.size @@ -46,14 +46,20 @@ internal class IntBufferBatchMountItem( if (commitNumber > 0) { ReactMarker.logFabricMarker( - ReactMarkerConstants.FABRIC_BATCH_EXECUTION_START, null, commitNumber) + ReactMarkerConstants.FABRIC_BATCH_EXECUTION_START, + null, + commitNumber, + ) } } private fun endMarkers() { if (commitNumber > 0) { ReactMarker.logFabricMarker( - ReactMarkerConstants.FABRIC_BATCH_EXECUTION_END, null, commitNumber) + ReactMarkerConstants.FABRIC_BATCH_EXECUTION_END, + null, + commitNumber, + ) } Systrace.endSection(Systrace.TRACE_TAG_REACT) @@ -63,7 +69,10 @@ internal class IntBufferBatchMountItem( val surfaceMountingManager = mountingManager.getSurfaceManager(surfaceId) if (surfaceMountingManager == null) { FLog.e( - TAG, "Skipping batch of MountItems; no SurfaceMountingManager found for [%d].", surfaceId) + TAG, + "Skipping batch of MountItems; no SurfaceMountingManager found for [%d].", + surfaceId, + ) return } if (surfaceMountingManager.isStopped) { @@ -89,7 +98,8 @@ internal class IntBufferBatchMountItem( Systrace.TRACE_TAG_REACT, "IntBufferBatchMountItem::mountInstructions::" + nameForInstructionString(type), args, - args.size) + args.size, + ) for (k in 0 until numInstructions) { when (type) { INSTRUCTION_CREATE -> { @@ -102,7 +112,8 @@ internal class IntBufferBatchMountItem( objBuffer[j++] as ReadableMap?, objBuffer[j++] as StateWrapper?, objBuffer[j++] as EventEmitterWrapper?, - intBuffer[i++] == 1) + intBuffer[i++] == 1, + ) } INSTRUCTION_DELETE -> surfaceMountingManager.deleteView(intBuffer[i++]) INSTRUCTION_INSERT -> { @@ -126,11 +137,24 @@ internal class IntBufferBatchMountItem( val displayType = intBuffer[i++] val layoutDirection = intBuffer[i++] surfaceMountingManager.updateLayout( - reactTag, parentTag, x, y, width, height, displayType, layoutDirection) + reactTag, + parentTag, + x, + y, + width, + height, + displayType, + layoutDirection, + ) } INSTRUCTION_UPDATE_PADDING -> surfaceMountingManager.updatePadding( - intBuffer[i++], intBuffer[i++], intBuffer[i++], intBuffer[i++], intBuffer[i++]) + intBuffer[i++], + intBuffer[i++], + intBuffer[i++], + intBuffer[i++], + intBuffer[i++], + ) INSTRUCTION_UPDATE_OVERFLOW_INSET -> { val reactTag = intBuffer[i++] val overflowInsetLeft = intBuffer[i++] @@ -143,7 +167,8 @@ internal class IntBufferBatchMountItem( overflowInsetLeft, overflowInsetTop, overflowInsetRight, - overflowInsetBottom) + overflowInsetBottom, + ) } INSTRUCTION_UPDATE_EVENT_EMITTER -> { val eventEmitterWrapper = objBuffer[j++] as EventEmitterWrapper? @@ -191,7 +216,8 @@ internal class IntBufferBatchMountItem( "CREATE [%d] - layoutable:%d - %s\n", intBuffer[i++], intBuffer[i++], - fabricComponentName)) + fabricComponentName, + )) } INSTRUCTION_DELETE -> s.append(String.format(Locale.ROOT, "DELETE [%d]\n", intBuffer[i++])) @@ -202,7 +228,8 @@ internal class IntBufferBatchMountItem( "INSERT [%d]->[%d] @%d\n", intBuffer[i++], intBuffer[i++], - intBuffer[i++])) + intBuffer[i++], + )) INSTRUCTION_REMOVE -> s.append( String.format( @@ -210,7 +237,8 @@ internal class IntBufferBatchMountItem( "REMOVE [%d]->[%d] @%d\n", intBuffer[i++], intBuffer[i++], - intBuffer[i++])) + intBuffer[i++], + )) INSTRUCTION_UPDATE_PROPS -> { val props = objBuffer[j++] val propsString = @@ -242,7 +270,8 @@ internal class IntBufferBatchMountItem( intBuffer[i++], intBuffer[i++], intBuffer[i++], - intBuffer[i++])) + intBuffer[i++], + )) INSTRUCTION_UPDATE_PADDING -> s.append( String.format( @@ -252,7 +281,8 @@ internal class IntBufferBatchMountItem( intBuffer[i++], intBuffer[i++], intBuffer[i++], - intBuffer[i++])) + intBuffer[i++], + )) INSTRUCTION_UPDATE_OVERFLOW_INSET -> s.append( String.format( @@ -262,7 +292,8 @@ internal class IntBufferBatchMountItem( intBuffer[i++], intBuffer[i++], intBuffer[i++], - intBuffer[i++])) + intBuffer[i++], + )) INSTRUCTION_UPDATE_EVENT_EMITTER -> { j += 1 s.append(String.format(Locale.ROOT, "UPDATE EVENTEMITTER [%d]\n", intBuffer[i++])) diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/mountitems/MountItemFactory.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/mountitems/MountItemFactory.kt index 1825683babb..677a5696e0a 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/mountitems/MountItemFactory.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/mountitems/MountItemFactory.kt @@ -19,7 +19,7 @@ internal object MountItemFactory { surfaceId: Int, reactTag: Int, commandId: Int, - commandArgs: ReadableArray + commandArgs: ReadableArray, ): DispatchCommandMountItem = DispatchIntCommandMountItem(surfaceId, reactTag, commandId, commandArgs) @@ -29,7 +29,7 @@ internal object MountItemFactory { surfaceId: Int, reactTag: Int, commandId: String, - commandArgs: ReadableArray + commandArgs: ReadableArray, ): DispatchCommandMountItem = DispatchStringCommandMountItem(surfaceId, reactTag, commandId, commandArgs) @@ -38,7 +38,7 @@ internal object MountItemFactory { fun createSendAccessibilityEventMountItem( surfaceId: Int, reactTag: Int, - eventType: Int + eventType: Int, ): MountItem = SendAccessibilityEventMountItem(surfaceId, reactTag, eventType) /** @return a [MountItem] that will be used to preallocate views */ @@ -49,7 +49,7 @@ internal object MountItemFactory { component: String, props: ReadableMap?, stateWrapper: StateWrapper?, - isLayoutable: Boolean + isLayoutable: Boolean, ): MountItem = PreAllocateViewMountItem(surfaceId, reactTag, component, props, stateWrapper, isLayoutable) @@ -67,6 +67,6 @@ internal object MountItemFactory { surfaceId: Int, intBuf: IntArray, objBuf: Array, - commitNumber: Int + commitNumber: Int, ): MountItem = IntBufferBatchMountItem(surfaceId, intBuf, objBuf, commitNumber) } diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/mountitems/PreAllocateViewMountItem.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/mountitems/PreAllocateViewMountItem.kt index 27a03062ce6..b20662fe585 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/mountitems/PreAllocateViewMountItem.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/mountitems/PreAllocateViewMountItem.kt @@ -21,7 +21,7 @@ internal class PreAllocateViewMountItem( component: String, private val props: ReadableMap?, private val stateWrapper: StateWrapper?, - private val isLayoutable: Boolean + private val isLayoutable: Boolean, ) : MountItem { private val fabricComponentName = getFabricComponentName(component) @@ -32,11 +32,17 @@ internal class PreAllocateViewMountItem( if (surfaceMountingManager == null) { FLog.e( FabricUIManager.TAG, - "Skipping View PreAllocation; no SurfaceMountingManager found for [$surfaceId]") + "Skipping View PreAllocation; no SurfaceMountingManager found for [$surfaceId]", + ) return } surfaceMountingManager.preallocateView( - fabricComponentName, reactTag, props, stateWrapper, isLayoutable) + fabricComponentName, + reactTag, + props, + stateWrapper, + isLayoutable, + ) } override fun toString(): String { diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/mountitems/SendAccessibilityEventMountItem.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/mountitems/SendAccessibilityEventMountItem.kt index d2e5cfecba0..6478199bb0f 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/mountitems/SendAccessibilityEventMountItem.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/mountitems/SendAccessibilityEventMountItem.kt @@ -15,7 +15,7 @@ import com.facebook.react.fabric.mounting.MountingManager internal class SendAccessibilityEventMountItem( private val _surfaceId: Int, private val reactTag: Int, - private val eventType: Int + private val eventType: Int, ) : MountItem { private val TAG = "Fabric.SendAccessibilityEvent" diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/internal/featureflags/ReactNativeFeatureFlagsOverrides_RNOSS_Stable_Android.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/internal/featureflags/ReactNativeFeatureFlagsOverrides_RNOSS_Stable_Android.kt index f47d8198fbd..1894072c434 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/internal/featureflags/ReactNativeFeatureFlagsOverrides_RNOSS_Stable_Android.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/internal/featureflags/ReactNativeFeatureFlagsOverrides_RNOSS_Stable_Android.kt @@ -10,7 +10,7 @@ package com.facebook.react.internal.featureflags public class ReactNativeFeatureFlagsOverrides_RNOSS_Stable_Android( private val fabricEnabled: Boolean, private val bridgelessEnabled: Boolean, - private val turboModulesEnabled: Boolean + private val turboModulesEnabled: Boolean, ) : ReactNativeNewArchitectureFeatureFlagsDefaults(bridgelessEnabled) { override fun useFabricInterop(): Boolean = bridgelessEnabled || fabricEnabled diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/internal/featureflags/ReactNativeNewArchitectureFeatureFlags.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/internal/featureflags/ReactNativeNewArchitectureFeatureFlags.kt index 8386b591787..e816005bbbb 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/internal/featureflags/ReactNativeNewArchitectureFeatureFlags.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/internal/featureflags/ReactNativeNewArchitectureFeatureFlags.kt @@ -28,7 +28,8 @@ public object ReactNativeNewArchitectureFeatureFlags { if (ReactBuildConfig.UNSTABLE_ENABLE_MINIFY_LEGACY_ARCHITECTURE) { Assertions.assertCondition( ReactNativeFeatureFlags.enableBridgelessArchitecture(), - "ReactNativeFeatureFlags.enableBridgelessArchitecture() should be set to TRUE when Strict Mode is enabled") + "ReactNativeFeatureFlags.enableBridgelessArchitecture() should be set to TRUE when Strict Mode is enabled", + ) return true } return ReactNativeFeatureFlags.enableBridgelessArchitecture() @@ -39,7 +40,8 @@ public object ReactNativeNewArchitectureFeatureFlags { if (ReactBuildConfig.UNSTABLE_ENABLE_MINIFY_LEGACY_ARCHITECTURE) { Assertions.assertCondition( ReactNativeFeatureFlags.enableFabricRenderer(), - "ReactNativeFeatureFlags.enableFabricRenderer() should be set to TRUE when Strict Mode is enabled") + "ReactNativeFeatureFlags.enableFabricRenderer() should be set to TRUE when Strict Mode is enabled", + ) return true } return ReactNativeFeatureFlags.enableFabricRenderer() @@ -50,7 +52,8 @@ public object ReactNativeNewArchitectureFeatureFlags { if (ReactBuildConfig.UNSTABLE_ENABLE_MINIFY_LEGACY_ARCHITECTURE) { Assertions.assertCondition( !ReactNativeFeatureFlags.useFabricInterop(), - "ReactNativeFeatureFlags.useFabricInterop() should be set to FALSE when Strict Mode is enabled") + "ReactNativeFeatureFlags.useFabricInterop() should be set to FALSE when Strict Mode is enabled", + ) return false } return ReactNativeFeatureFlags.useFabricInterop() @@ -61,7 +64,8 @@ public object ReactNativeNewArchitectureFeatureFlags { if (ReactBuildConfig.UNSTABLE_ENABLE_MINIFY_LEGACY_ARCHITECTURE) { Assertions.assertCondition( !ReactNativeFeatureFlags.useTurboModuleInterop(), - "ReactNativeFeatureFlags.useTurboModuleInterop() should be set to FALSE when Strict Mode is enabled") + "ReactNativeFeatureFlags.useTurboModuleInterop() should be set to FALSE when Strict Mode is enabled", + ) return false } return ReactNativeFeatureFlags.useTurboModuleInterop() @@ -72,7 +76,8 @@ public object ReactNativeNewArchitectureFeatureFlags { if (ReactBuildConfig.UNSTABLE_ENABLE_MINIFY_LEGACY_ARCHITECTURE) { Assertions.assertCondition( ReactNativeFeatureFlags.useTurboModules(), - "ReactNativeFeatureFlags.useTurboModules() should be set to TRUE when Strict Mode is enabled") + "ReactNativeFeatureFlags.useTurboModules() should be set to TRUE when Strict Mode is enabled", + ) return true } return ReactNativeFeatureFlags.useTurboModules() diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/internal/interop/InteropEvent.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/internal/interop/InteropEvent.kt index 1e26457a5a3..b4008e1fe06 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/internal/interop/InteropEvent.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/internal/interop/InteropEvent.kt @@ -22,7 +22,7 @@ internal class InteropEvent( @get:JvmName("eventName") val interopEventName: String, @get:JvmName("eventData") val eventData: WritableMap?, surfaceId: Int, - viewTag: Int + viewTag: Int, ) : Event(surfaceId, viewTag) { override fun getEventName(): String = interopEventName diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/internal/interop/InteropEventEmitter.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/internal/interop/InteropEventEmitter.kt index 8407904046c..98d1b15099f 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/internal/interop/InteropEventEmitter.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/internal/interop/InteropEventEmitter.kt @@ -47,7 +47,7 @@ internal class InteropEventEmitter(private val reactContext: ReactContext) : RCT override fun receiveTouches( eventName: String, touches: WritableArray, - changedIndices: WritableArray + changedIndices: WritableArray, ) { throw UnsupportedOperationException( "EventEmitter#receiveTouches is not supported by the Fabric Interop Layer") diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/internal/turbomodule/core/TurboModuleInteropUtils.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/internal/turbomodule/core/TurboModuleInteropUtils.kt index afde188b358..c2139e58e75 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/internal/turbomodule/core/TurboModuleInteropUtils.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/internal/turbomodule/core/TurboModuleInteropUtils.kt @@ -43,7 +43,8 @@ internal object TurboModuleInteropUtils { if (methodNames.contains(methodName)) { throw ParsingException( moduleName, - "Module exports two methods to JavaScript with the same name: \"$methodName") + "Module exports two methods to JavaScript with the same name: \"$methodName", + ) } methodNames.add(methodName) @@ -60,7 +61,8 @@ internal object TurboModuleInteropUtils { (!annotation.isBlockingSynchronousMethod && returnType != Void.TYPE))) { throw ParsingException( moduleName, - "TurboModule system assumes returnType == void iff the method is synchronous.") + "TurboModule system assumes returnType == void iff the method is synchronous.", + ) } methodDescriptors.add( @@ -68,7 +70,8 @@ internal object TurboModuleInteropUtils { methodName, createJniSignature(moduleName, methodName, paramClasses, returnType), createJSIReturnKind(moduleName, methodName, paramClasses, returnType), - getJsArgCount(moduleName, methodName, paramClasses))) + getJsArgCount(moduleName, methodName, paramClasses), + )) } return methodDescriptors @@ -90,7 +93,7 @@ internal object TurboModuleInteropUtils { moduleName: String, methodName: String, paramClasses: Array>, - returnClass: Class<*> + returnClass: Class<*>, ): String { val jniSignature = StringBuilder("(") for (paramClass in paramClasses) { @@ -104,7 +107,7 @@ internal object TurboModuleInteropUtils { private fun convertParamClassToJniType( moduleName: String, methodName: String, - paramClass: Class<*> + paramClass: Class<*>, ): String { if (paramClass == Boolean::class.javaPrimitiveType) { return "Z" @@ -138,13 +141,14 @@ internal object TurboModuleInteropUtils { throw ParsingException( moduleName, methodName, - "Unable to parse JNI signature. Detected unsupported parameter class: ${paramClass.canonicalName}") + "Unable to parse JNI signature. Detected unsupported parameter class: ${paramClass.canonicalName}", + ) } private fun convertReturnClassToJniType( moduleName: String, methodName: String, - returnClass: Class<*> + returnClass: Class<*>, ): String { if (returnClass == Boolean::class.javaPrimitiveType) { return "Z" @@ -180,7 +184,8 @@ internal object TurboModuleInteropUtils { throw ParsingException( moduleName, methodName, - "Unable to parse JNI signature. Detected unsupported return class: ${returnClass.canonicalName}") + "Unable to parse JNI signature. Detected unsupported return class: ${returnClass.canonicalName}", + ) } private fun convertClassToJniType(cls: Class<*>): String { @@ -192,7 +197,7 @@ internal object TurboModuleInteropUtils { private fun getJsArgCount( moduleName: String, methodName: String, - paramClasses: Array> + paramClasses: Array>, ): Int { var i = 0 while (i < paramClasses.size) { @@ -201,7 +206,8 @@ internal object TurboModuleInteropUtils { throw ParsingException( moduleName, methodName, - "Unable to parse JavaScript arg count. Promises must be used as last parameter only.") + "Unable to parse JavaScript arg count. Promises must be used as last parameter only.", + ) } return paramClasses.size - 1 @@ -216,7 +222,7 @@ internal object TurboModuleInteropUtils { moduleName: String, methodName: String, paramClasses: Array>, - returnClass: Class<*> + returnClass: Class<*>, ): String { var i = 0 while (i < paramClasses.size) { @@ -225,7 +231,8 @@ internal object TurboModuleInteropUtils { throw ParsingException( moduleName, methodName, - "Unable to parse JSI return kind. Promises must be used as last parameter only.") + "Unable to parse JSI return kind. Promises must be used as last parameter only.", + ) } return "PromiseKind" @@ -266,27 +273,28 @@ internal object TurboModuleInteropUtils { throw ParsingException( moduleName, methodName, - "Unable to parse JSI return kind. Detected unsupported return class: ${returnClass.canonicalName}") + "Unable to parse JSI return kind. Detected unsupported return class: ${returnClass.canonicalName}", + ) } internal class MethodDescriptor( @field:DoNotStrip @JvmField val methodName: String, @field:DoNotStrip @JvmField val jniSignature: String, @field:DoNotStrip @JvmField val jsiReturnKind: String, - @field:DoNotStrip @JvmField val jsArgCount: Int + @field:DoNotStrip @JvmField val jsArgCount: Int, ) private class ParsingException : RuntimeException { constructor( moduleName: String, - message: String + message: String, ) : super( ("Unable to parse @ReactMethod annotations from native module: ${moduleName}. Details: ${message}")) constructor( moduleName: String, methodName: String, - message: String + message: String, ) : super( ("Unable to parse @ReactMethod annotation from native module method: ${moduleName}.${methodName}(). Details: ${message}")) } diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/internal/turbomodule/core/TurboModuleManager.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/internal/turbomodule/core/TurboModuleManager.kt index 99e3bcdd2d9..dc018457ba7 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/internal/turbomodule/core/TurboModuleManager.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/internal/turbomodule/core/TurboModuleManager.kt @@ -34,7 +34,7 @@ public class TurboModuleManager( runtimeExecutor: RuntimeExecutor, private val delegate: TurboModuleManagerDelegate?, jsCallInvokerHolder: CallInvokerHolder, - nativeMethodCallInvokerHolder: NativeMethodCallInvokerHolder + nativeMethodCallInvokerHolder: NativeMethodCallInvokerHolder, ) : TurboModuleRegistry { public override val eagerInitModuleNames: List @@ -56,7 +56,8 @@ public class TurboModuleManager( runtimeExecutor, jsCallInvokerHolder as CallInvokerHolderImpl, nativeMethodCallInvokerHolder as NativeMethodCallInvokerHolderImpl, - delegate) + delegate, + ) init { @@ -179,7 +180,8 @@ public class TurboModuleManager( "getModule(): Tried to get module \"%s\", but TurboModuleManager was tearing down (legacy: %b, turbo: %b)", moduleName, isLegacyModule(moduleName), - isTurboModule(moduleName)) + isTurboModule(moduleName), + ) return null } /* @@ -218,7 +220,7 @@ public class TurboModuleManager( private fun getOrCreateModule( moduleName: String, moduleHolder: ModuleHolder, - shouldPerfLog: Boolean + shouldPerfLog: Boolean, ): NativeModule? { var shouldCreateModule = false @@ -263,7 +265,8 @@ public class TurboModuleManager( "getOrCreateModule(): Unable to create module \"%s\" (legacy: %b, turbo: %b)", moduleName, isLegacyModule(moduleName), - isTurboModule(moduleName)) + isTurboModule(moduleName), + ) } TurboModulePerfLogger.moduleCreateSetUpEnd(moduleName, moduleHolder.moduleId) @@ -314,7 +317,7 @@ public class TurboModuleManager( runtimeExecutor: RuntimeExecutor, jsCallInvokerHolder: CallInvokerHolderImpl, nativeMethodCallInvoker: NativeMethodCallInvokerHolderImpl, - tmmDelegate: TurboModuleManagerDelegate? + tmmDelegate: TurboModuleManagerDelegate?, ): HybridData private external fun installJSIBindings(shouldCreateLegacyModules: Boolean) diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/jstasks/HeadlessJsTaskConfig.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/jstasks/HeadlessJsTaskConfig.kt index f1cfbd9dd21..4ded55f522d 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/jstasks/HeadlessJsTaskConfig.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/jstasks/HeadlessJsTaskConfig.kt @@ -33,7 +33,7 @@ constructor( public val data: WritableMap, public val timeout: Long = 0, public val isAllowedInForeground: Boolean = false, - public val retryPolicy: HeadlessJsTaskRetryPolicy? = NoRetryPolicy.INSTANCE + public val retryPolicy: HeadlessJsTaskRetryPolicy? = NoRetryPolicy.INSTANCE, ) { /** @@ -47,5 +47,6 @@ constructor( source.data.copy(), source.timeout, source.isAllowedInForeground, - source.retryPolicy?.copy()) + source.retryPolicy?.copy(), + ) } diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/jstasks/HeadlessJsTaskContext.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/jstasks/HeadlessJsTaskContext.kt index 46f5298081a..d45ab53ee37 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/jstasks/HeadlessJsTaskContext.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/jstasks/HeadlessJsTaskContext.kt @@ -72,7 +72,8 @@ public class HeadlessJsTaskContext private constructor(reactContext: ReactContex val reactContext = Assertions.assertNotNull( reactContext.get(), - "Tried to start a task on a react context that has already been destroyed") + "Tried to start a task on a react context that has already been destroyed", + ) check( !(reactContext.lifecycleState == LifecycleState.RESUMED && !taskConfig.isAllowedInForeground)) { @@ -87,7 +88,8 @@ public class HeadlessJsTaskContext private constructor(reactContext: ReactContex } else { logSoftException( "HeadlessJsTaskContext", - RuntimeException("Cannot start headless task, CatalystInstance not available")) + RuntimeException("Cannot start headless task, CatalystInstance not available"), + ) } if (taskConfig.timeout > 0) { scheduleTaskTimeout(taskId, taskConfig.timeout) @@ -120,7 +122,8 @@ public class HeadlessJsTaskContext private constructor(reactContext: ReactContex sourceTaskConfig.data, sourceTaskConfig.timeout, sourceTaskConfig.isAllowedInForeground, - retryPolicy.update()) + retryPolicy.update(), + ) val retryAttempt = Runnable { startTask(taskConfig, taskId) } diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/jstasks/LinearCountingRetryPolicy.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/jstasks/LinearCountingRetryPolicy.kt index b312b5bbe2c..54500601027 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/jstasks/LinearCountingRetryPolicy.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/jstasks/LinearCountingRetryPolicy.kt @@ -9,7 +9,7 @@ package com.facebook.react.jstasks public class LinearCountingRetryPolicy( private val retryAttempts: Int, - private val delayBetweenAttemptsInMs: Int + private val delayBetweenAttemptsInMs: Int, ) : HeadlessJsTaskRetryPolicy { public override fun canRetry(): Boolean = retryAttempts > 0 diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/module/annotations/ReactModule.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/module/annotations/ReactModule.kt index 0e021920059..615d6226c65 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/module/annotations/ReactModule.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/module/annotations/ReactModule.kt @@ -38,5 +38,5 @@ public annotation class ReactModule( * * @return */ - public val isCxxModule: Boolean = false + public val isCxxModule: Boolean = false, ) diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/module/model/ReactModuleInfo.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/module/model/ReactModuleInfo.kt index b6cc0d0905e..2394271a4a0 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/module/model/ReactModuleInfo.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/module/model/ReactModuleInfo.kt @@ -19,7 +19,7 @@ public class ReactModuleInfo( @get:JvmName("canOverrideExistingModule") public val canOverrideExistingModule: Boolean, @get:JvmName("needsEagerInit") public val needsEagerInit: Boolean, public val isCxxModule: Boolean, - public val isTurboModule: Boolean + public val isTurboModule: Boolean, ) { @Deprecated( @@ -28,7 +28,8 @@ public class ReactModuleInfo( ReplaceWith( expression = "ReactModuleInfo(name, className, canOverrideExistingModule, needsEagerInit, isCxxModule, isTurboModule)"), - level = DeprecationLevel.WARNING) + level = DeprecationLevel.WARNING, + ) public constructor( name: String, className: String, @@ -36,7 +37,7 @@ public class ReactModuleInfo( needsEagerInit: Boolean, @Suppress("UNUSED_PARAMETER") hasConstants: Boolean, isCxxModule: Boolean, - isTurboModule: Boolean + isTurboModule: Boolean, ) : this(name, className, canOverrideExistingModule, needsEagerInit, isCxxModule, isTurboModule) public companion object { diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/modules/accessibilityinfo/AccessibilityInfoModule.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/modules/accessibilityinfo/AccessibilityInfoModule.kt index d68ba7ad9c6..04d095c2b55 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/modules/accessibilityinfo/AccessibilityInfoModule.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/modules/accessibilityinfo/AccessibilityInfoModule.kt @@ -124,7 +124,9 @@ internal class AccessibilityInfoModule(context: ReactApplicationContext) : get() = try { Settings.Secure.getInt( - contentResolver, Settings.Secure.ACCESSIBILITY_DISPLAY_INVERSION_ENABLED) == 1 + contentResolver, + Settings.Secure.ACCESSIBILITY_DISPLAY_INVERSION_ENABLED, + ) == 1 } catch (e: Settings.SettingNotFoundException) { false } diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/modules/appearance/AppearanceModule.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/modules/appearance/AppearanceModule.kt index 488d557fc6d..82afc0a284b 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/modules/appearance/AppearanceModule.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/modules/appearance/AppearanceModule.kt @@ -22,7 +22,7 @@ public class AppearanceModule @JvmOverloads constructor( reactContext: ReactApplicationContext, - private val overrideColorScheme: OverrideColorScheme? = null + private val overrideColorScheme: OverrideColorScheme? = null, ) : NativeAppearanceSpec(reactContext) { private var lastEmittedColorScheme: String? = null diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/modules/blob/BlobProvider.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/modules/blob/BlobProvider.kt index 0d94958392d..c7cd3a976f4 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/modules/blob/BlobProvider.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/modules/blob/BlobProvider.kt @@ -28,7 +28,7 @@ public class BlobProvider : ContentProvider() { projection: Array?, selection: String?, selectionArgs: Array?, - sortOrder: String? + sortOrder: String?, ): Cursor? = null override fun getType(uri: Uri): String? = null @@ -41,7 +41,7 @@ public class BlobProvider : ContentProvider() { uri: Uri, values: ContentValues?, selection: String?, - selectionArgs: Array? + selectionArgs: Array?, ): Int = 0 @Throws(FileNotFoundException::class) diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/modules/core/DeviceEventManagerModule.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/modules/core/DeviceEventManagerModule.kt index 0f2eb060f05..a139ffe3424 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/modules/core/DeviceEventManagerModule.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/modules/core/DeviceEventManagerModule.kt @@ -20,7 +20,7 @@ import com.facebook.react.module.annotations.ReactModule @ReactModule(name = NativeDeviceEventManagerSpec.NAME) public open class DeviceEventManagerModule( reactContext: ReactApplicationContext?, - backBtnHandler: DefaultHardwareBackBtnHandler? + backBtnHandler: DefaultHardwareBackBtnHandler?, ) : NativeDeviceEventManagerSpec(reactContext) { @DoNotStripAny public fun interface RCTDeviceEventEmitter : JavaScriptModule { diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/modules/core/HeadlessJsTaskSupportModule.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/modules/core/HeadlessJsTaskSupportModule.kt index 191c0f4b522..91aa3fdf592 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/modules/core/HeadlessJsTaskSupportModule.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/modules/core/HeadlessJsTaskSupportModule.kt @@ -31,7 +31,8 @@ internal open class HeadlessJsTaskSupportModule(reactContext: ReactApplicationCo FLog.w( HeadlessJsTaskSupportModule::class.java, "Tried to retry non-active task with id %d. Did it time out?", - taskId) + taskId, + ) promise.resolve(false) } } @@ -45,7 +46,8 @@ internal open class HeadlessJsTaskSupportModule(reactContext: ReactApplicationCo FLog.w( HeadlessJsTaskSupportModule::class.java, "Tried to finish non-active task with id %d. Did it time out?", - taskId) + taskId, + ) } } diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/modules/core/JavaTimerManager.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/modules/core/JavaTimerManager.kt index 8b6571698fc..3d171a28213 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/modules/core/JavaTimerManager.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/modules/core/JavaTimerManager.kt @@ -38,13 +38,13 @@ public open class JavaTimerManager( private val reactApplicationContext: ReactApplicationContext, private val javaScriptTimerExecutor: JavaScriptTimerExecutor, private val reactChoreographer: ReactChoreographer, - private val devSupportManager: DevSupportManager + private val devSupportManager: DevSupportManager, ) : LifecycleEventListener, HeadlessJsTaskEventListener { private class Timer( val timerId: Int, var targetTime: Long, val interval: Int, - val repeat: Boolean + val repeat: Boolean, ) private val timerGuard = Any() @@ -127,7 +127,9 @@ public open class JavaTimerManager( private fun setChoreographerCallback() { if (!frameCallbackPosted) { reactChoreographer.postFrameCallback( - ReactChoreographer.CallbackType.TIMERS_EVENTS, timerFrameCallback) + ReactChoreographer.CallbackType.TIMERS_EVENTS, + timerFrameCallback, + ) frameCallbackPosted = true } } @@ -136,7 +138,9 @@ public open class JavaTimerManager( val headlessJsTaskContext = HeadlessJsTaskContext.getInstance(reactApplicationContext) if (frameCallbackPosted && isPaused.get() && !headlessJsTaskContext.hasActiveTasks()) { reactChoreographer.removeFrameCallback( - ReactChoreographer.CallbackType.TIMERS_EVENTS, timerFrameCallback) + ReactChoreographer.CallbackType.TIMERS_EVENTS, + timerFrameCallback, + ) frameCallbackPosted = false } } @@ -144,7 +148,9 @@ public open class JavaTimerManager( private fun setChoreographerIdleCallback() { if (!frameIdleCallbackPosted) { reactChoreographer.postFrameCallback( - ReactChoreographer.CallbackType.IDLE_EVENT, idleFrameCallback) + ReactChoreographer.CallbackType.IDLE_EVENT, + idleFrameCallback, + ) frameIdleCallbackPosted = true } } @@ -152,7 +158,9 @@ public open class JavaTimerManager( private fun clearChoreographerIdleCallback() { if (frameIdleCallbackPosted) { reactChoreographer.removeFrameCallback( - ReactChoreographer.CallbackType.IDLE_EVENT, idleFrameCallback) + ReactChoreographer.CallbackType.IDLE_EVENT, + idleFrameCallback, + ) frameIdleCallbackPosted = false } } @@ -188,7 +196,7 @@ public open class JavaTimerManager( timerId: Int, duration: Int, jsSchedulingTime: Double, - repeat: Boolean + repeat: Boolean, ) { val deviceTime = currentTimeMillis() val remoteTime = jsSchedulingTime.toLong() diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/modules/core/PermissionAwareActivity.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/modules/core/PermissionAwareActivity.kt index 608084b8681..511eeb0d32a 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/modules/core/PermissionAwareActivity.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/modules/core/PermissionAwareActivity.kt @@ -27,6 +27,6 @@ public interface PermissionAwareActivity { public fun requestPermissions( permissions: Array, requestCode: Int, - listener: PermissionListener? + listener: PermissionListener?, ) } diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/modules/core/PermissionListener.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/modules/core/PermissionListener.kt index 8522c9913d2..bac2ab59324 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/modules/core/PermissionListener.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/modules/core/PermissionListener.kt @@ -20,6 +20,6 @@ public fun interface PermissionListener { public fun onRequestPermissionsResult( requestCode: Int, permissions: Array, - grantResults: IntArray + grantResults: IntArray, ): Boolean } diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/modules/core/ReactChoreographer.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/modules/core/ReactChoreographer.kt index 4ab9524557b..85bcbcdd437 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/modules/core/ReactChoreographer.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/modules/core/ReactChoreographer.kt @@ -35,7 +35,7 @@ public class ReactChoreographer private constructor(choreographerProvider: Chore /** * Event used to trigger the idle callback. Called after all UI work has been dispatched to JS. */ - IDLE_EVENT(4) + IDLE_EVENT(4), } private var choreographer: ChoreographerProvider.Choreographer? = null diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/modules/core/TimingModule.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/modules/core/TimingModule.kt index caf7846a322..67761e2bdf1 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/modules/core/TimingModule.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/modules/core/TimingModule.kt @@ -18,7 +18,7 @@ import com.facebook.react.module.annotations.ReactModule @ReactModule(name = NativeTimingSpec.NAME) public class TimingModule( reactContext: ReactApplicationContext, - devSupportManager: DevSupportManager + devSupportManager: DevSupportManager, ) : com.facebook.fbreact.specs.NativeTimingSpec(reactContext), JavaScriptTimerExecutor { private val javaTimerManager: JavaTimerManager = JavaTimerManager(reactContext, this, ReactChoreographer.getInstance(), devSupportManager) @@ -27,7 +27,7 @@ public class TimingModule( callbackIDDouble: Double, durationDouble: Double, jsSchedulingTime: Double, - repeat: Boolean + repeat: Boolean, ) { val callbackID = callbackIDDouble.toInt() val duration = durationDouble.toInt() diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/modules/debug/DevMenuModule.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/modules/debug/DevMenuModule.kt index 69915f8862d..53186eb0808 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/modules/debug/DevMenuModule.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/modules/debug/DevMenuModule.kt @@ -17,7 +17,7 @@ import com.facebook.react.module.annotations.ReactModule @ReactModule(name = NativeDevMenuSpec.NAME) internal class DevMenuModule( reactContext: ReactApplicationContext?, - private val devSupportManager: DevSupportManager + private val devSupportManager: DevSupportManager, ) : NativeDevMenuSpec(reactContext) { override fun show() { diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/modules/debug/DevSettingsModule.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/modules/debug/DevSettingsModule.kt index 26e8e904f4a..9c04b07d082 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/modules/debug/DevSettingsModule.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/modules/debug/DevSettingsModule.kt @@ -20,7 +20,7 @@ import com.facebook.react.module.annotations.ReactModule @ReactModule(name = NativeDevSettingsSpec.NAME) public class DevSettingsModule( reactContext: ReactApplicationContext?, - private val devSupportManager: DevSupportManager + private val devSupportManager: DevSupportManager, ) : NativeDevSettingsSpec(reactContext) { override fun reload() { if (devSupportManager.devSupportEnabled) { diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/modules/debug/DidJSUpdateUiDuringFrameDetector.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/modules/debug/DidJSUpdateUiDuringFrameDetector.kt index c33b85f5375..a680a588cc9 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/modules/debug/DidJSUpdateUiDuringFrameDetector.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/modules/debug/DidJSUpdateUiDuringFrameDetector.kt @@ -81,7 +81,10 @@ internal class DidJSUpdateUiDuringFrameDetector : // Case 1: We dispatched a UI update val finishedUiUpdate = hasEventBetweenTimestamps( - viewHierarchyUpdateFinishedEvents, frameStartTimeNanos, frameEndTimeNanos) + viewHierarchyUpdateFinishedEvents, + frameStartTimeNanos, + frameEndTimeNanos, + ) val didEndFrameIdle = didEndFrameIdle(frameStartTimeNanos, frameEndTimeNanos) val hitFrame = if (finishedUiUpdate) { @@ -90,7 +93,10 @@ internal class DidJSUpdateUiDuringFrameDetector : // Case 2: Ended idle but no UI was enqueued during that frame (didEndFrameIdle && !hasEventBetweenTimestamps( - viewHierarchyUpdateEnqueuedEvents, frameStartTimeNanos, frameEndTimeNanos)) + viewHierarchyUpdateEnqueuedEvents, + frameStartTimeNanos, + frameEndTimeNanos, + )) } cleanUp(transitionToIdleEvents, frameEndTimeNanos) cleanUp(transitionToBusyEvents, frameEndTimeNanos) @@ -114,13 +120,13 @@ internal class DidJSUpdateUiDuringFrameDetector : private fun hasEventBetweenTimestamps( eventArray: ArrayList, startTime: Long, - endTime: Long + endTime: Long, ): Boolean = eventArray.any { time -> time in startTime until endTime } private fun getLastEventBetweenTimestamps( eventArray: ArrayList, startTime: Long, - endTime: Long + endTime: Long, ): Long { var lastEvent: Long = -1 for (time in eventArray) { diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/modules/debug/SourceCodeModule.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/modules/debug/SourceCodeModule.kt index 0c695f53f40..e1fcd77539c 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/modules/debug/SourceCodeModule.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/modules/debug/SourceCodeModule.kt @@ -23,7 +23,8 @@ public class SourceCodeModule(reactContext: ReactApplicationContext) : "scriptURL" to Assertions.assertNotNull( reactApplicationContext.getSourceURL(), - "No source URL loaded, have you initialised the instance?")) + "No source URL loaded, have you initialised the instance?", + )) public companion object { public const val NAME: String = NativeSourceCodeSpec.NAME diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/modules/deviceinfo/DeviceInfoModule.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/modules/deviceinfo/DeviceInfoModule.kt index 6d570f224ca..214e479fc2d 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/modules/deviceinfo/DeviceInfoModule.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/modules/deviceinfo/DeviceInfoModule.kt @@ -69,7 +69,8 @@ internal class DeviceInfoModule(reactContext: ReactApplicationContext) : ReactSoftExceptionLogger.logSoftException( NativeDeviceInfoSpec.NAME, ReactNoCrashSoftException( - "No active CatalystInstance, cannot emitUpdateDimensionsEvent")) + "No active CatalystInstance, cannot emitUpdateDimensionsEvent"), + ) } } } diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/modules/dialog/AlertFragment.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/modules/dialog/AlertFragment.kt index 2f1b12b5bc2..65c5791cf9a 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/modules/dialog/AlertFragment.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/modules/dialog/AlertFragment.kt @@ -66,7 +66,7 @@ public class AlertFragment : DialogFragment, DialogInterface.OnClickListener { public fun createDialog( activityContext: Context, arguments: Bundle, - fragment: DialogInterface.OnClickListener + fragment: DialogInterface.OnClickListener, ): Dialog = if (isAppCompatTheme(activityContext)) { createAppCompatDialog(activityContext, arguments, fragment) @@ -117,12 +117,13 @@ public class AlertFragment : DialogFragment, DialogInterface.OnClickListener { object : AccessibilityDelegateCompat() { override fun onInitializeAccessibilityNodeInfo( view: View, - info: AccessibilityNodeInfoCompat + info: AccessibilityNodeInfoCompat, ) { super.onInitializeAccessibilityNodeInfo(accessibleTitle, info) info.isHeading = true } - }) + }, + ) } return titleContainer @@ -135,7 +136,7 @@ public class AlertFragment : DialogFragment, DialogInterface.OnClickListener { private fun createAppCompatDialog( activityContext: Context, arguments: Bundle, - fragment: DialogInterface.OnClickListener + fragment: DialogInterface.OnClickListener, ): Dialog { val builder = AlertDialog.Builder(activityContext) @@ -176,7 +177,7 @@ public class AlertFragment : DialogFragment, DialogInterface.OnClickListener { private fun createAppDialog( activityContext: Context, arguments: Bundle, - fragment: DialogInterface.OnClickListener + fragment: DialogInterface.OnClickListener, ): Dialog { val builder = android.app.AlertDialog.Builder(activityContext) diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/modules/fresco/FrescoModule.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/modules/fresco/FrescoModule.kt index 536912d2f53..9817839d836 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/modules/fresco/FrescoModule.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/modules/fresco/FrescoModule.kt @@ -39,7 +39,7 @@ public open class FrescoModule constructor( reactContext: ReactApplicationContext?, private val clearOnDestroy: Boolean = true, - imagePipelineConfig: ImagePipelineConfig? = null + imagePipelineConfig: ImagePipelineConfig? = null, ) : ReactContextBaseJavaModule(reactContext), ModuleDataCleaner.Cleanable, @@ -63,7 +63,7 @@ constructor( reactContext: ReactApplicationContext?, imagePipeline: ImagePipeline?, clearOnDestroy: Boolean = true, - hasBeenInitializedExternally: Boolean = false + hasBeenInitializedExternally: Boolean = false, ) : this(reactContext, clearOnDestroy) { pipeline = imagePipeline if (hasBeenInitializedExternally) { @@ -88,7 +88,8 @@ constructor( FLog.w( ReactConstants.TAG, "Fresco has already been initialized with a different config. " + - "The new Fresco configuration will be ignored!") + "The new Fresco configuration will be ignored!", + ) } config = null } diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/modules/fresco/SystraceRequestListener.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/modules/fresco/SystraceRequestListener.kt index a740f2f1168..c79afdd9a1f 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/modules/fresco/SystraceRequestListener.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/modules/fresco/SystraceRequestListener.kt @@ -34,7 +34,7 @@ internal class SystraceRequestListener : BaseRequestListener() { override fun onProducerFinishWithSuccess( requestId: String, producerName: String, - extraMap: Map? + extraMap: Map?, ) { if (!Systrace.isTracing(Systrace.TRACE_TAG_REACT)) { return @@ -51,7 +51,7 @@ internal class SystraceRequestListener : BaseRequestListener() { requestId: String, producerName: String, t: Throwable, - extraMap: Map? + extraMap: Map?, ) { if (!Systrace.isTracing(Systrace.TRACE_TAG_REACT)) { return @@ -67,7 +67,7 @@ internal class SystraceRequestListener : BaseRequestListener() { override fun onProducerFinishWithCancellation( requestId: String, producerName: String, - extraMap: Map? + extraMap: Map?, ) { if (!Systrace.isTracing(Systrace.TRACE_TAG_REACT)) { return @@ -92,14 +92,17 @@ internal class SystraceRequestListener : BaseRequestListener() { entryName.append("_") entryName.append(eventName.replace(':', '_')) Systrace.traceInstant( - Systrace.TRACE_TAG_REACT, entryName.toString(), Systrace.EventScope.THREAD) + Systrace.TRACE_TAG_REACT, + entryName.toString(), + Systrace.EventScope.THREAD, + ) } override fun onRequestStart( request: ImageRequest, callerContext: Any, requestId: String, - isPrefetch: Boolean + isPrefetch: Boolean, ) { if (!Systrace.isTracing(Systrace.TRACE_TAG_REACT)) { return @@ -130,7 +133,7 @@ internal class SystraceRequestListener : BaseRequestListener() { request: ImageRequest, requestId: String, throwable: Throwable, - isPrefetch: Boolean + isPrefetch: Boolean, ) { if (!Systrace.isTracing(Systrace.TRACE_TAG_REACT)) { return diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/modules/i18nmanager/I18nManagerModule.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/modules/i18nmanager/I18nManagerModule.kt index 5b79e3f0200..461d2d30ab9 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/modules/i18nmanager/I18nManagerModule.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/modules/i18nmanager/I18nManagerModule.kt @@ -22,7 +22,8 @@ internal class I18nManagerModule(context: ReactApplicationContext?) : return mapOf( "isRTL" to I18nUtil.instance.isRTL(context), "doLeftAndRightSwapInRTL" to I18nUtil.instance.doLeftAndRightSwapInRTL(context), - "localeIdentifier" to locale.toString()) + "localeIdentifier" to locale.toString(), + ) } override fun allowRTL(value: Boolean) { diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/modules/i18nmanager/I18nUtil.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/modules/i18nmanager/I18nUtil.kt index 0b0b04b0cb5..f98f4b2d5b2 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/modules/i18nmanager/I18nUtil.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/modules/i18nmanager/I18nUtil.kt @@ -94,7 +94,9 @@ public class I18nUtil private constructor() { * @deprecated Use instance instead */ @Deprecated( - "Use .instance instead, this API is only for backward compat", ReplaceWith("instance")) + "Use .instance instead, this API is only for backward compat", + ReplaceWith("instance"), + ) @JvmName( "DEPRECATED\$getInstance") // We intentionally don't want to expose this accessor to Java. public fun getInstance(): I18nUtil = instance diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/modules/image/ImageLoaderModule.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/modules/image/ImageLoaderModule.kt index ae26dfd4882..adcf2192b50 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/modules/image/ImageLoaderModule.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/modules/image/ImageLoaderModule.kt @@ -61,7 +61,7 @@ internal class ImageLoaderModule : NativeImageLoaderAndroidSpec, LifecycleEventL constructor( reactContext: ReactApplicationContext, imagePipeline: ImagePipeline, - callerContextFactory: ReactCallerContextFactory + callerContextFactory: ReactCallerContextFactory, ) : super(reactContext) { this.callerContextFactory = callerContextFactory this.imagePipeline = imagePipeline diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/modules/network/InspectorNetworkReporter.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/modules/network/InspectorNetworkReporter.kt index cb5b4bd675f..f2c6ec9db97 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/modules/network/InspectorNetworkReporter.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/modules/network/InspectorNetworkReporter.kt @@ -39,7 +39,7 @@ internal object InspectorNetworkReporter { requestMethod: String, requestHeaders: Map, requestBody: String, - encodedDataLength: Long + encodedDataLength: Long, ) /** @@ -62,7 +62,7 @@ internal object InspectorNetworkReporter { requestUrl: String, responseStatus: Int, responseHeaders: Map, - expectedDataLength: Long + expectedDataLength: Long, ) /** diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/modules/network/NetworkEventUtil.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/modules/network/NetworkEventUtil.kt index 4516b16c535..41f6c59ee07 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/modules/network/NetworkEventUtil.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/modules/network/NetworkEventUtil.kt @@ -47,7 +47,7 @@ internal object NetworkEventUtil { reactContext: ReactApplicationContext?, requestId: Int, progress: Long, - total: Long + total: Long, ) { reactContext?.emitDeviceEvent( "didSendNetworkData", @@ -55,7 +55,8 @@ internal object NetworkEventUtil { add(requestId) add(progress.toInt()) add(total.toInt()) - }) + }, + ) } @JvmStatic @@ -64,7 +65,7 @@ internal object NetworkEventUtil { requestId: Int, data: String?, progress: Long, - total: Long + total: Long, ) { if (ReactNativeFeatureFlags.enableNetworkEventReporting() && data != null) { InspectorNetworkReporter.reportDataReceived(requestId, data) @@ -77,7 +78,8 @@ internal object NetworkEventUtil { add(data) add(progress.toInt()) add(total.toInt()) - }) + }, + ) } @JvmStatic @@ -85,7 +87,7 @@ internal object NetworkEventUtil { reactContext: ReactApplicationContext?, requestId: Int, progress: Long, - total: Long + total: Long, ) { reactContext?.emitDeviceEvent( "didReceiveNetworkDataProgress", @@ -93,7 +95,8 @@ internal object NetworkEventUtil { add(requestId) add(progress.toInt()) add(total.toInt()) - }) + }, + ) } @JvmStatic @@ -101,18 +104,22 @@ internal object NetworkEventUtil { reactContext: ReactApplicationContext?, requestId: Int, data: String?, - responseType: String + responseType: String, ) { if (ReactNativeFeatureFlags.enableNetworkEventReporting()) { InspectorNetworkReporter.maybeStoreResponseBody( - requestId, data.orEmpty(), responseType == "base64") + requestId, + data.orEmpty(), + responseType == "base64", + ) } reactContext?.emitDeviceEvent( "didReceiveNetworkData", buildReadableArray { add(requestId) add(data) - }) + }, + ) } @JvmStatic @@ -120,18 +127,22 @@ internal object NetworkEventUtil { reactContext: ReactApplicationContext?, requestId: Int, data: WritableMap, - rawData: ByteArray + rawData: ByteArray, ) { if (ReactNativeFeatureFlags.enableNetworkEventReporting()) { InspectorNetworkReporter.maybeStoreResponseBody( - requestId, Base64.encodeToString(rawData, Base64.NO_WRAP), true) + requestId, + Base64.encodeToString(rawData, Base64.NO_WRAP), + true, + ) } reactContext?.emitDeviceEvent( "didReceiveNetworkData", Arguments.createArray().apply { pushInt(requestId) pushMap(data) - }) + }, + ) } @JvmStatic @@ -139,7 +150,7 @@ internal object NetworkEventUtil { reactContext: ReactApplicationContext?, requestId: Int, error: String?, - e: Throwable? + e: Throwable?, ) { if (ReactNativeFeatureFlags.enableNetworkEventReporting()) { InspectorNetworkReporter.reportRequestFailed(requestId, false) @@ -152,14 +163,15 @@ internal object NetworkEventUtil { if (e?.javaClass == SocketTimeoutException::class.java) { add(true) // last argument is a time out boolean } - }) + }, + ) } @JvmStatic fun onRequestSuccess( reactContext: ReactApplicationContext?, requestId: Int, - encodedDataLength: Long + encodedDataLength: Long, ) { if (ReactNativeFeatureFlags.enableNetworkEventReporting()) { InspectorNetworkReporter.reportResponseEnd(requestId, encodedDataLength) @@ -169,7 +181,8 @@ internal object NetworkEventUtil { buildReadableArray { add(requestId) addNull() - }) + }, + ) } @JvmStatic @@ -201,7 +214,8 @@ internal object NetworkEventUtil { pushInt(response.code()) pushMap(Arguments.fromBundle(headersBundle)) pushString(requestUrl) - }) + }, + ) } @Deprecated("Compatibility overload") @@ -211,7 +225,7 @@ internal object NetworkEventUtil { requestId: Int, statusCode: Int, headers: WritableMap?, - url: String? + url: String?, ) { val headersBuilder = Headers.Builder() headers?.let { map -> @@ -234,7 +248,8 @@ internal object NetworkEventUtil { .headers(headersBuilder.build()) .code(statusCode) .message("") - .build()) + .build(), + ) } private fun okHttpHeadersToMap(headers: Headers): Map { diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/modules/network/NetworkingModule.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/modules/network/NetworkingModule.kt index 6ffe0fb5c8e..9b6c20069d9 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/modules/network/NetworkingModule.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/modules/network/NetworkingModule.kt @@ -49,7 +49,7 @@ public class NetworkingModule( reactContext: ReactApplicationContext, defaultUserAgent: String?, client: OkHttpClient, - networkInterceptorCreators: List? + networkInterceptorCreators: List?, ) : NativeNetworkingAndroidSpec(reactContext) { /** @@ -124,7 +124,7 @@ public class NetworkingModule( internal constructor( context: ReactApplicationContext, defaultUserAgent: String?, - client: OkHttpClient + client: OkHttpClient, ) : this(context, defaultUserAgent, client, null) /** @param context the ReactContext of the application */ @@ -139,12 +139,13 @@ public class NetworkingModule( */ public constructor( context: ReactApplicationContext, - networkInterceptorCreators: List? + networkInterceptorCreators: List?, ) : this( context, null, OkHttpClientProvider.createClient(context.applicationContext), - networkInterceptorCreators) + networkInterceptorCreators, + ) /** * @param context the ReactContext of the application @@ -153,12 +154,13 @@ public class NetworkingModule( */ public constructor( context: ReactApplicationContext, - defaultUserAgent: String? + defaultUserAgent: String?, ) : this( context, defaultUserAgent, OkHttpClientProvider.createClient(context.applicationContext), - null) + null, + ) @Deprecated( """To be removed in a future release. See @@ -214,7 +216,7 @@ public class NetworkingModule( responseType: String, useIncrementalUpdates: Boolean, timeoutAsDouble: Double, - withCredentials: Boolean + withCredentials: Boolean, ) { val requestId = requestIdAsDouble.toInt() val timeout = timeoutAsDouble.toInt() @@ -228,12 +230,17 @@ public class NetworkingModule( responseType, useIncrementalUpdates, timeout, - withCredentials) + withCredentials, + ) } catch (th: Throwable) { FLog.e(TAG, "Failed to send url request: $url", th) NetworkEventUtil.onRequestError( - getReactApplicationContextIfActiveOrWarn(), requestId, th.message, th) + getReactApplicationContextIfActiveOrWarn(), + requestId, + th.message, + th, + ) } } @@ -247,7 +254,7 @@ public class NetworkingModule( responseType: String, useIncrementalUpdates: Boolean, timeout: Int, - withCredentials: Boolean + withCredentials: Boolean, ) { val reactApplicationContext = getReactApplicationContextIfActiveOrWarn() try { @@ -270,7 +277,10 @@ public class NetworkingModule( NetworkEventUtil.onResponseReceived(reactApplicationContext, requestId, url, response) NetworkEventUtil.onDataReceived(reactApplicationContext, requestId, res, rawBody) NetworkEventUtil.onRequestSuccess( - reactApplicationContext, requestId, encodedDataLength.toLong()) + reactApplicationContext, + requestId, + encodedDataLength.toLong(), + ) return } } @@ -323,10 +333,15 @@ public class NetworkingModule( return } NetworkEventUtil.onDataReceivedProgress( - reactApplicationContext, requestId, bytesWritten, contentLength) + reactApplicationContext, + requestId, + bytesWritten, + contentLength, + ) last = now } - }) + }, + ) originalResponse.newBuilder().body(responseBody).build() } } @@ -343,7 +358,11 @@ public class NetworkingModule( val requestHeaders = extractHeaders(headers, data) if (requestHeaders == null) { NetworkEventUtil.onRequestError( - reactApplicationContext, requestId, "Unrecognized headers format", null) + reactApplicationContext, + requestId, + "Unrecognized headers format", + null, + ) return } var contentType = requestHeaders[CONTENT_TYPE_HEADER_NAME] @@ -372,7 +391,8 @@ public class NetworkingModule( reactApplicationContext, requestId, "Payload is set but no content-type header specified", - null) + null, + ) return } val body = data.getString(REQUEST_BODY_KEY_STRING) @@ -384,7 +404,11 @@ public class NetworkingModule( } if (requestBody == null) { NetworkEventUtil.onRequestError( - reactApplicationContext, requestId, "Failed to gzip request body", null) + reactApplicationContext, + requestId, + "Failed to gzip request body", + null, + ) return } } else { @@ -399,7 +423,11 @@ public class NetworkingModule( } if (body == null) { NetworkEventUtil.onRequestError( - reactApplicationContext, requestId, "Received request but body was empty", null) + reactApplicationContext, + requestId, + "Received request but body was empty", + null, + ) return } @Suppress("DEPRECATION") @@ -412,7 +440,8 @@ public class NetworkingModule( reactApplicationContext, requestId, "Payload is set but no content-type header specified", - null) + null, + ) return } val base64String = data.getString(REQUEST_BODY_KEY_BASE64) @@ -424,13 +453,18 @@ public class NetworkingModule( reactApplicationContext, requestId, "Invalid content type specified: $contentType", - null) + null, + ) return } val base64DecodedString = ByteString.decodeBase64(base64String) if (base64DecodedString == null) { NetworkEventUtil.onRequestError( - reactApplicationContext, requestId, "Request body base64 string was invalid", null) + reactApplicationContext, + requestId, + "Request body base64 string was invalid", + null, + ) return } @Suppress("DEPRECATION") @@ -442,19 +476,28 @@ public class NetworkingModule( reactApplicationContext, requestId, "Payload is set but no content-type header specified", - null) + null, + ) return } val uri = data.getString(REQUEST_BODY_KEY_URI) if (uri == null) { NetworkEventUtil.onRequestError( - reactApplicationContext, requestId, "Request body URI field was set but null", null) + reactApplicationContext, + requestId, + "Request body URI field was set but null", + null, + ) return } val fileInputStream = RequestBodyUtil.getFileInputStream(getReactApplicationContext(), uri) if (fileInputStream == null) { NetworkEventUtil.onRequestError( - reactApplicationContext, requestId, "Could not retrieve file for uri $uri", null) + reactApplicationContext, + requestId, + "Could not retrieve file for uri $uri", + null, + ) return } requestBody = RequestBodyUtil.create(MediaType.parse(contentType), fileInputStream) @@ -466,7 +509,11 @@ public class NetworkingModule( val parts = data.getArray(REQUEST_BODY_KEY_FORMDATA) if (parts == null) { NetworkEventUtil.onRequestError( - reactApplicationContext, requestId, "Received request but form data was empty", null) + reactApplicationContext, + requestId, + "Received request but form data was empty", + null, + ) return } val multipartBuilder = constructMultipartBody(parts, contentType, requestId) ?: return @@ -506,7 +553,11 @@ public class NetworkingModule( removeRequest(requestId) // Before we touch the body send headers to JS NetworkEventUtil.onResponseReceived( - reactApplicationContext, requestId, url, response) + reactApplicationContext, + requestId, + url, + response, + ) try { // OkHttp implements something called transparent gzip, which mean that it will @@ -526,7 +577,11 @@ public class NetworkingModule( var responseBody: ResponseBody? = response.body() if (responseBody == null) { NetworkEventUtil.onRequestError( - reactApplicationContext, requestId, "Response body is null", null) + reactApplicationContext, + requestId, + "Response body is null", + null, + ) return } if ("gzip".equals(response.header("Content-Encoding"), ignoreCase = true)) { @@ -548,9 +603,16 @@ public class NetworkingModule( val responseData = responseBody.bytes() val res = responseHandler.toResponseData(responseData) NetworkEventUtil.onDataReceived( - reactApplicationContext, requestId, res, responseData) + reactApplicationContext, + requestId, + res, + responseData, + ) NetworkEventUtil.onRequestSuccess( - reactApplicationContext, requestId, responseBody.contentLength()) + reactApplicationContext, + requestId, + responseBody.contentLength(), + ) return } } @@ -561,7 +623,10 @@ public class NetworkingModule( if (useIncrementalUpdates && responseType == "text") { readWithProgress(requestId, responseBody) NetworkEventUtil.onRequestSuccess( - reactApplicationContext, requestId, responseBody.contentLength()) + reactApplicationContext, + requestId, + responseBody.contentLength(), + ) return } @@ -579,16 +644,27 @@ public class NetworkingModule( // Introduced to fix issue #7463. } else { NetworkEventUtil.onRequestError( - reactApplicationContext, requestId, e.message, e) + reactApplicationContext, + requestId, + e.message, + e, + ) } } } else if (responseType == "base64") { responseString = Base64.encodeToString(responseBody.bytes(), Base64.NO_WRAP) } NetworkEventUtil.onDataReceived( - reactApplicationContext, requestId, responseString, responseType) + reactApplicationContext, + requestId, + responseString, + responseType, + ) NetworkEventUtil.onRequestSuccess( - reactApplicationContext, requestId, responseBody.contentLength()) + reactApplicationContext, + requestId, + responseBody.contentLength(), + ) } catch (e: IOException) { NetworkEventUtil.onRequestError(reactApplicationContext, requestId, e.message, e) } @@ -598,7 +674,7 @@ public class NetworkingModule( private fun wrapRequestBodyWithProgressEmitter( requestBody: RequestBody?, - requestId: Int + requestId: Int, ): RequestBody? { if (requestBody == null) { return null @@ -613,11 +689,16 @@ public class NetworkingModule( val now = System.nanoTime() if (done || shouldDispatch(now, last)) { NetworkEventUtil.onDataSend( - reactApplicationContext, requestId, bytesWritten, contentLength) + reactApplicationContext, + requestId, + bytesWritten, + contentLength, + ) last = now } } - }) + }, + ) } @Throws(IOException::class) @@ -652,7 +733,8 @@ public class NetworkingModule( requestId, streamDecoder.decodeNext(buffer, read), totalBytesRead, - contentLength) + contentLength, + ) } } finally { inputStream.close() @@ -699,14 +781,18 @@ public class NetworkingModule( private fun constructMultipartBody( body: ReadableArray, contentType: String, - requestId: Int + requestId: Int, ): MultipartBody.Builder? { val reactApplicationContext = getReactApplicationContextIfActiveOrWarn() val multipartBuilder = MultipartBody.Builder() val mediaType = MediaType.parse(contentType) if (mediaType == null) { NetworkEventUtil.onRequestError( - reactApplicationContext, requestId, "Invalid media type.", null) + reactApplicationContext, + requestId, + "Invalid media type.", + null, + ) return null } multipartBuilder.setType(mediaType) @@ -715,7 +801,11 @@ public class NetworkingModule( val bodyPart = body.getMap(i) if (bodyPart == null) { NetworkEventUtil.onRequestError( - reactApplicationContext, requestId, "Unrecognized FormData part.", null) + reactApplicationContext, + requestId, + "Unrecognized FormData part.", + null, + ) return null } @@ -727,7 +817,8 @@ public class NetworkingModule( reactApplicationContext, requestId, "Missing or invalid header format for FormData part.", - null) + null, + ) return null } var partContentType: MediaType? = null @@ -751,13 +842,18 @@ public class NetworkingModule( reactApplicationContext, requestId, "Binary FormData part needs a content-type header.", - null) + null, + ) return null } val fileContentUriStr = bodyPart.getString(REQUEST_BODY_KEY_URI) if (fileContentUriStr == null) { NetworkEventUtil.onRequestError( - reactApplicationContext, requestId, "Body must have a valid file uri", null) + reactApplicationContext, + requestId, + "Body must have a valid file uri", + null, + ) return null } val fileInputStream = @@ -767,13 +863,18 @@ public class NetworkingModule( reactApplicationContext, requestId, "Could not retrieve file for uri $fileContentUriStr", - null) + null, + ) return null } multipartBuilder.addPart(headers, RequestBodyUtil.create(partContentType, fileInputStream)) } else { NetworkEventUtil.onRequestError( - reactApplicationContext, requestId, "Unrecognized FormData part.", null) + reactApplicationContext, + requestId, + "Unrecognized FormData part.", + null, + ) } } return multipartBuilder diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/modules/network/ProgressRequestBody.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/modules/network/ProgressRequestBody.kt index 4c919f5c658..2ff81dc3a76 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/modules/network/ProgressRequestBody.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/modules/network/ProgressRequestBody.kt @@ -19,7 +19,7 @@ import okio.Sink internal class ProgressRequestBody( private val requestBody: RequestBody, - private val progressListener: ProgressListener + private val progressListener: ProgressListener, ) : RequestBody() { private var contentLength = 0L diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/modules/network/ProgressResponseBody.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/modules/network/ProgressResponseBody.kt index 8cf03e8db13..6d628ab4d05 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/modules/network/ProgressResponseBody.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/modules/network/ProgressResponseBody.kt @@ -21,7 +21,7 @@ import okio.Source public class ProgressResponseBody public constructor( private val responseBody: ResponseBody, - private val progressListener: ProgressListener + private val progressListener: ProgressListener, ) : ResponseBody() { private lateinit var bufferedSource: BufferedSource private var totalBytesRead = 0L @@ -49,7 +49,10 @@ public constructor( totalBytesRead += bytesRead } progressListener.onProgress( - totalBytesRead, responseBody.contentLength(), bytesRead == -1L) + totalBytesRead, + responseBody.contentLength(), + bytesRead == -1L, + ) } } } diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/modules/network/RequestBodyUtil.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/modules/network/RequestBodyUtil.kt index 26b05bc4dca..3fa7e6aa51e 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/modules/network/RequestBodyUtil.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/modules/network/RequestBodyUtil.kt @@ -67,7 +67,8 @@ internal object RequestBodyUtil { .split(",".toRegex()) .dropLastWhile { it.isEmpty() } .toTypedArray()[1], - Base64.DEFAULT) + Base64.DEFAULT, + ) return ByteArrayInputStream(decodedDataUrString) } @@ -162,7 +163,7 @@ internal object RequestBodyUtil { @JvmStatic fun createProgressRequest( requestBody: RequestBody, - listener: ProgressListener + listener: ProgressListener, ): ProgressRequestBody { return ProgressRequestBody(requestBody, listener) } diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/modules/permissions/PermissionsModule.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/modules/permissions/PermissionsModule.kt index b27f043550f..0e49213f523 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/modules/permissions/PermissionsModule.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/modules/permissions/PermissionsModule.kt @@ -88,7 +88,8 @@ public class PermissionsModule(reactContext: ReactApplicationContext?) : } } } - }) + }, + ) activity.requestPermissions(arrayOf(permission), requestCode, this) requestCode++ } catch (e: IllegalStateException) { @@ -136,7 +137,8 @@ public class PermissionsModule(reactContext: ReactApplicationContext?) : } promise.resolve(grantedPermissions) } - }) + }, + ) activity.requestPermissions(permissionsToCheck.toTypedArray(), requestCode, this) requestCode++ } catch (e: IllegalStateException) { @@ -148,7 +150,7 @@ public class PermissionsModule(reactContext: ReactApplicationContext?) : override fun onRequestPermissionsResult( requestCode: Int, permissions: Array, - grantResults: IntArray + grantResults: IntArray, ): Boolean = try { val callback = callbacks[requestCode] @@ -163,7 +165,8 @@ public class PermissionsModule(reactContext: ReactApplicationContext?) : FLog.e( "PermissionsModule", e, - "Unexpected invocation of `onRequestPermissionsResult` with invalid current activity") + "Unexpected invocation of `onRequestPermissionsResult` with invalid current activity", + ) false } diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/modules/statusbar/StatusBarModule.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/modules/statusbar/StatusBarModule.kt index dbae14cc823..6c0c986e0aa 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/modules/statusbar/StatusBarModule.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/modules/statusbar/StatusBarModule.kt @@ -52,13 +52,15 @@ internal class StatusBarModule(reactContext: ReactApplicationContext?) : if (activity == null) { FLog.w( ReactConstants.TAG, - "StatusBarModule: Ignored status bar change, current activity is null.") + "StatusBarModule: Ignored status bar change, current activity is null.", + ) return } if (isEdgeToEdgeFeatureFlagOn) { FLog.w( ReactConstants.TAG, - "StatusBarModule: Ignored status bar change, current activity is edge-to-edge.") + "StatusBarModule: Ignored status bar change, current activity is edge-to-edge.", + ) return } UiThreadUtil.runOnUiThread( @@ -86,13 +88,15 @@ internal class StatusBarModule(reactContext: ReactApplicationContext?) : if (activity == null) { FLog.w( ReactConstants.TAG, - "StatusBarModule: Ignored status bar change, current activity is null.") + "StatusBarModule: Ignored status bar change, current activity is null.", + ) return } if (isEdgeToEdgeFeatureFlagOn) { FLog.w( ReactConstants.TAG, - "StatusBarModule: Ignored status bar change, current activity is edge-to-edge.") + "StatusBarModule: Ignored status bar change, current activity is edge-to-edge.", + ) return } UiThreadUtil.runOnUiThread( @@ -108,7 +112,8 @@ internal class StatusBarModule(reactContext: ReactApplicationContext?) : if (activity == null) { FLog.w( ReactConstants.TAG, - "StatusBarModule: Ignored status bar change, current activity is null.") + "StatusBarModule: Ignored status bar change, current activity is null.", + ) return } UiThreadUtil.runOnUiThread { activity.window?.setStatusBarVisibility(hidden) } @@ -120,7 +125,8 @@ internal class StatusBarModule(reactContext: ReactApplicationContext?) : if (activity == null) { FLog.w( ReactConstants.TAG, - "StatusBarModule: Ignored status bar change, current activity is null.") + "StatusBarModule: Ignored status bar change, current activity is null.", + ) return } UiThreadUtil.runOnUiThread( @@ -132,10 +138,13 @@ internal class StatusBarModule(reactContext: ReactApplicationContext?) : // dark-content means dark icons on a light status bar insetsController.setSystemBarsAppearance( WindowInsetsController.APPEARANCE_LIGHT_STATUS_BARS, - WindowInsetsController.APPEARANCE_LIGHT_STATUS_BARS) + WindowInsetsController.APPEARANCE_LIGHT_STATUS_BARS, + ) } else { insetsController.setSystemBarsAppearance( - 0, WindowInsetsController.APPEARANCE_LIGHT_STATUS_BARS) + 0, + WindowInsetsController.APPEARANCE_LIGHT_STATUS_BARS, + ) } } else { val decorView = window.decorView diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/modules/systeminfo/AndroidInfoHelpers.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/modules/systeminfo/AndroidInfoHelpers.kt index fb8f2cbd121..0a7edd371e4 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/modules/systeminfo/AndroidInfoHelpers.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/modules/systeminfo/AndroidInfoHelpers.kt @@ -78,7 +78,8 @@ public object AndroidInfoHelpers { "appIdentifier" to appIdentifier, "platform" to "android", "deviceName" to Build.MODEL, - "reactNativeVersion" to getReactNativeVersionString()) + "reactNativeVersion" to getReactNativeVersionString(), + ) } private fun getReactNativeVersionString(): String { diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/modules/systeminfo/ReactNativeVersion.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/modules/systeminfo/ReactNativeVersion.kt index 2405d32ce68..889fa4d728c 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/modules/systeminfo/ReactNativeVersion.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/modules/systeminfo/ReactNativeVersion.kt @@ -1,20 +1,15 @@ /** * Copyright (c) Meta Platforms, Inc. and affiliates. * - * This source code is licensed under the MIT license found in the - * LICENSE file in the root directory of this source tree. + * This source code is licensed under the MIT license found in the LICENSE file in the root + * directory of this source tree. * * @generated by scripts/releases/set-version.js */ - package com.facebook.react.modules.systeminfo public object ReactNativeVersion { @JvmField - public val VERSION: Map = mapOf( - "major" to 1000, - "minor" to 0, - "patch" to 0, - "prerelease" to null - ) + public val VERSION: Map = + mapOf("major" to 1000, "minor" to 0, "patch" to 0, "prerelease" to null) } diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/modules/toast/ToastModule.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/modules/toast/ToastModule.kt index d0e03091a85..eeffccfab38 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/modules/toast/ToastModule.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/modules/toast/ToastModule.kt @@ -49,7 +49,7 @@ internal class ToastModule(reactContext: ReactApplicationContext) : durationDouble: Double, gravityDouble: Double, xOffsetDouble: Double, - yOffsetDouble: Double + yOffsetDouble: Double, ) { val duration = durationDouble.toInt() val gravity = gravityDouble.toInt() diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/modules/websocket/WebSocketModule.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/modules/websocket/WebSocketModule.kt index 2d246d9cbe4..9c8d9cf1240 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/modules/websocket/WebSocketModule.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/modules/websocket/WebSocketModule.kt @@ -76,7 +76,7 @@ public class WebSocketModule(context: ReactApplicationContext) : url: String, protocols: ReadableArray?, options: ReadableMap?, - socketID: Double + socketID: Double, ) { val id = socketID.toInt() val okHttpBuilder = @@ -196,7 +196,8 @@ public class WebSocketModule(context: ReactApplicationContext) : sendEvent("websocketMessage", params) } - }) + }, + ) // Trigger shutdown of the dispatcher's executor so this process can exit cleanly client.dispatcher().executorService().shutdown() diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/packagerconnection/JSPackagerClient.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/packagerconnection/JSPackagerClient.kt index dc23a11cbb7..b3296be5542 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/packagerconnection/JSPackagerClient.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/packagerconnection/JSPackagerClient.kt @@ -21,7 +21,7 @@ public constructor( clientId: String, settings: PackagerConnectionSettings, private val requestHandlers: Map, - connectionCallback: ReconnectingWebSocket.ConnectionCallback? = null + connectionCallback: ReconnectingWebSocket.ConnectionCallback? = null, ) : MessageCallback { private val webSocket: ReconnectingWebSocket diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/packagerconnection/PackagerConnectionSettings.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/packagerconnection/PackagerConnectionSettings.kt index a9fa6794773..6ac6731e073 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/packagerconnection/PackagerConnectionSettings.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/packagerconnection/PackagerConnectionSettings.kt @@ -33,7 +33,8 @@ public open class PackagerConnectionSettings(private val appContext: Context) { if (host == AndroidInfoHelpers.DEVICE_LOCALHOST) { FLog.w( TAG, - "You seem to be running on device. Run '${AndroidInfoHelpers.getAdbReverseTcpCommand(appContext)}' to forward the debug server's port to the device.") + "You seem to be running on device. Run '${AndroidInfoHelpers.getAdbReverseTcpCommand(appContext)}' to forward the debug server's port to the device.", + ) } return host } diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/packagerconnection/ReconnectingWebSocket.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/packagerconnection/ReconnectingWebSocket.kt index 061f98eb78e..d122467eca7 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/packagerconnection/ReconnectingWebSocket.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/packagerconnection/ReconnectingWebSocket.kt @@ -24,7 +24,7 @@ import okio.ByteString public class ReconnectingWebSocket( private val url: String, private var messageCallback: MessageCallback?, - private val connectionCallback: ConnectionCallback? + private val connectionCallback: ConnectionCallback?, ) : WebSocketListener() { public interface MessageCallback { diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/runtime/BridgelessAtomicRef.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/runtime/BridgelessAtomicRef.kt index 64d7e2dc0ac..5e0c35404b1 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/runtime/BridgelessAtomicRef.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/runtime/BridgelessAtomicRef.kt @@ -22,7 +22,7 @@ internal class BridgelessAtomicRef( Init, Creating, Success, - Failure + Failure, } var initialValue: T? = value diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/runtime/BridgelessCatalystInstance.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/runtime/BridgelessCatalystInstance.kt index 1d720688118..e36f0cf9b34 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/runtime/BridgelessCatalystInstance.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/runtime/BridgelessCatalystInstance.kt @@ -47,7 +47,7 @@ internal class BridgelessCatalystInstance(private val reactHost: ReactHostImpl) override fun loadScriptFromAssets( assetManager: AssetManager, assetURL: String, - loadSynchronously: Boolean + loadSynchronously: Boolean, ) { throw UnsupportedOperationException("Unimplemented method 'loadScriptFromAssets'") } @@ -179,7 +179,9 @@ internal class BridgelessCatalystInstance(private val reactHost: ReactHostImpl) private companion object { init { LegacyArchitectureLogger.assertLegacyArchitecture( - "BridgelessCatalystInstance", LegacyArchitectureLogLevel.ERROR) + "BridgelessCatalystInstance", + LegacyArchitectureLogLevel.ERROR, + ) } } } diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/runtime/BridgelessReactContext.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/runtime/BridgelessReactContext.kt index ad2caa13642..c0eb0cd6d7e 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/runtime/BridgelessReactContext.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/runtime/BridgelessReactContext.kt @@ -72,7 +72,8 @@ internal class BridgelessReactContext(context: Context, private val reactHost: R Log.w( TAG, "[WARNING] Bridgeless doesn't support CatalystInstance. Accessing an API that's not part of" + - " the new architecture is not encouraged usage.") + " the new architecture is not encouraged usage.", + ) return BridgelessCatalystInstance(reactHost) } @@ -102,12 +103,15 @@ internal class BridgelessReactContext(context: Context, private val reactHost: R private class BridgelessJSModuleInvocationHandler( private val reactHost: ReactHostImpl, - private val jsModuleInterface: Class + private val jsModuleInterface: Class, ) : InvocationHandler { override fun invoke(proxy: Any, method: Method, args: Array): Any? { val jsArgs: NativeArray = Arguments.fromJavaArgs(args) reactHost.callFunctionOnModule( - JavaScriptModuleRegistry.getJSModuleName(jsModuleInterface), method.name, jsArgs) + JavaScriptModuleRegistry.getJSModuleName(jsModuleInterface), + method.name, + jsArgs, + ) return null } } @@ -122,7 +126,8 @@ internal class BridgelessReactContext(context: Context, private val reactHost: R Proxy.newProxyInstance( jsInterface.classLoader, arrayOf>(jsInterface), - BridgelessJSModuleInvocationHandler(reactHost, jsInterface)) as JavaScriptModule + BridgelessJSModuleInvocationHandler(reactHost, jsInterface), + ) as JavaScriptModule @Suppress("UNCHECKED_CAST") return interfaceProxy as? T } @@ -130,7 +135,10 @@ internal class BridgelessReactContext(context: Context, private val reactHost: R /** Shortcut RCTDeviceEventEmitter.emit since it's frequently used */ override fun emitDeviceEvent(eventName: String, args: Any?) { reactHost.callFunctionOnModule( - "RCTDeviceEventEmitter", "emit", Arguments.fromJavaArgs(arrayOf(eventName, args))) + "RCTDeviceEventEmitter", + "emit", + Arguments.fromJavaArgs(arrayOf(eventName, args)), + ) } override fun hasNativeModule(nativeModuleInterface: Class): Boolean = diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/runtime/CoreReactPackage.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/runtime/CoreReactPackage.kt index 5a06c82b4ee..d2b992d649a 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/runtime/CoreReactPackage.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/runtime/CoreReactPackage.kt @@ -37,10 +37,11 @@ import java.util.HashMap SourceCodeModule::class, LogBoxModule::class, DeviceEventManagerModule::class, - ExceptionsManagerModule::class]) + ExceptionsManagerModule::class, + ]) internal class CoreReactPackage( private val devSupportManager: DevSupportManager, - private val hardwareBackBtnHandler: DefaultHardwareBackBtnHandler + private val hardwareBackBtnHandler: DefaultHardwareBackBtnHandler, ) : BaseReactPackage() { override fun getModule(name: String, reactContext: ReactApplicationContext): NativeModule? = @@ -75,7 +76,8 @@ internal class CoreReactPackage( is IllegalAccessException -> throw RuntimeException( "No ReactModuleInfoProvider for ${CoreReactPackage::class.java.name}$\$ReactModuleInfoProvider", - e) + e, + ) else -> throw e } } @@ -105,7 +107,8 @@ internal class CoreReactPackage( reactModule.canOverrideExistingModule, reactModule.needsEagerInit, reactModule.isCxxModule, - ReactModuleInfo.classIsTurboModule(moduleClass)) + ReactModuleInfo.classIsTurboModule(moduleClass), + ) } } return ReactModuleInfoProvider { reactModuleInfoMap } diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/runtime/ReactHostImpl.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/runtime/ReactHostImpl.kt index 40466e460d8..d82ff0d6b9f 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/runtime/ReactHostImpl.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/runtime/ReactHostImpl.kt @@ -108,7 +108,8 @@ public class ReactHostImpl( surfaceDelegateFactory = null, devLoadingViewManager = null, pausedInDebuggerOverlayManager = null, - useDevSupport = useDevSupport) + useDevSupport = useDevSupport, + ) public override val memoryPressureRouter: MemoryPressureRouter = MemoryPressureRouter(context) private val attachedSurfaces: MutableSet = HashSet() @@ -140,7 +141,7 @@ public class ReactHostImpl( delegate: ReactHostDelegate, componentFactory: ComponentFactory, allowPackagerServerAccess: Boolean, - useDevSupport: Boolean + useDevSupport: Boolean, ) : this( context, delegate, @@ -148,7 +149,8 @@ public class ReactHostImpl( Executors.newSingleThreadExecutor(), Task.UI_THREAD_EXECUTOR, allowPackagerServerAccess, - useDevSupport) + useDevSupport, + ) public override val lifecycleState: LifecycleState get() = reactLifecycleStateManager.lifecycleState @@ -219,7 +221,7 @@ public class ReactHostImpl( @ThreadConfined(ThreadConfined.UI) override fun onHostResume( activity: Activity?, - defaultBackButtonImpl: DefaultHardwareBackBtnHandler? + defaultBackButtonImpl: DefaultHardwareBackBtnHandler?, ) { defaultHardwareBackBtnHandler = defaultBackButtonImpl onHostResume(activity) @@ -321,7 +323,7 @@ public class ReactHostImpl( override fun createSurface( context: Context, moduleName: String, - initialProps: Bundle? + initialProps: Bundle?, ): ReactSurface { val surface = ReactSurfaceImpl(context, moduleName, initialProps) val surfaceView = ReactSurfaceView(context, surface) @@ -374,7 +376,8 @@ public class ReactHostImpl( (destroyTask?.let { destroyTask -> log( "reload()", - "Waiting for destroy to finish, before reloading React Native.") + "Waiting for destroy to finish, before reloading React Native.", + ) destroyTask.continueWithTask({ getOrCreateReloadTask(reason) }, bgExecutor) } ?: getOrCreateReloadTask(reason)) .makeVoid() @@ -392,9 +395,11 @@ public class ReactHostImpl( task } }, - bgExecutor) + bgExecutor, + ) }, - bgExecutor) + bgExecutor, + ) @DoNotStrip private fun setPausedInDebuggerMessage(message: String?) { @@ -408,7 +413,8 @@ public class ReactHostImpl( UiThreadUtil.assertOnUiThread() reactHostInspectorTarget?.sendDebuggerResumeCommand() } - }) + }, + ) } } @@ -441,7 +447,7 @@ public class ReactHostImpl( override fun destroy( reason: String, ex: Exception?, - onDestroyFinished: (instanceDestroyedSuccessfully: Boolean) -> Unit + onDestroyFinished: (instanceDestroyedSuccessfully: Boolean) -> Unit, ): TaskInterface { val destroyTask = destroy(reason, ex) as Task return destroyTask.continueWith({ task: Task -> @@ -472,13 +478,15 @@ public class ReactHostImpl( if (reloadTask != null) { log( "destroy()", - "Reloading React Native. Waiting for reload to finish before destroying React Native.") + "Reloading React Native. Waiting for reload to finish before destroying React Native.", + ) reloadTask.continueWithTask({ getOrCreateDestroyTask(reason, ex) }, bgExecutor) } else { getOrCreateDestroyTask(reason, ex) } }, - bgExecutor) + bgExecutor, + ) private fun createMemoryPressureListener(reactInstance: ReactInstance): MemoryPressureListener { val weakReactInstance = WeakReference(reactInstance) @@ -529,7 +537,8 @@ public class ReactHostImpl( ReactSoftExceptionLogger.logSoftExceptionVerbose( TAG, ReactNoCrashSoftException( - "getNativeModule(UIManagerModule.class) cannot be called when the bridge is disabled")) + "getNativeModule(UIManagerModule.class) cannot be called when the bridge is disabled"), + ) } return reactInstance?.getNativeModule(nativeModuleInterface) @@ -545,7 +554,9 @@ public class ReactHostImpl( } raiseSoftException( - "getRuntimeExecutor()", "Tried to get runtime executor while instance is not ready") + "getRuntimeExecutor()", + "Tried to get runtime executor while instance is not ready", + ) return null } @@ -557,7 +568,8 @@ public class ReactHostImpl( raiseSoftException( "getJSCallInvokerHolder()", - "Tried to get JSCallInvokerHolder while instance is not ready") + "Tried to get JSCallInvokerHolder while instance is not ready", + ) return null } @@ -571,7 +583,7 @@ public class ReactHostImpl( activity: Activity, requestCode: Int, resultCode: Int, - data: Intent? + data: Intent?, ) { val method = "onActivityResult(activity = \"$activity\", requestCode = \"$requestCode\", resultCode = \"$resultCode\", data = \"$data\")" @@ -687,7 +699,7 @@ public class ReactHostImpl( internal fun callFunctionOnModule( moduleName: String, methodName: String, - args: NativeArray + args: NativeArray, ): Task { val method = "callFunctionOnModule(\"$moduleName\", \"$methodName\")" return callWithExistingReactInstance(method) { reactInstance: ReactInstance -> @@ -736,23 +748,28 @@ public class ReactHostImpl( if (ReactBuildConfig.DEBUG) { Assertions.assertCondition( ReactNativeNewArchitectureFeatureFlags.enableBridgelessArchitecture(), - "enableBridgelessArchitecture FeatureFlag must be set to start ReactNative.") + "enableBridgelessArchitecture FeatureFlag must be set to start ReactNative.", + ) Assertions.assertCondition( ReactNativeNewArchitectureFeatureFlags.enableFabricRenderer(), - "enableFabricRenderer FeatureFlag must be set to start ReactNative.") + "enableFabricRenderer FeatureFlag must be set to start ReactNative.", + ) Assertions.assertCondition( ReactNativeNewArchitectureFeatureFlags.useTurboModules(), - "useTurboModules FeatureFlag must be set to start ReactNative.") + "useTurboModules FeatureFlag must be set to start ReactNative.", + ) } if (ReactBuildConfig.UNSTABLE_ENABLE_MINIFY_LEGACY_ARCHITECTURE) { Assertions.assertCondition( !ReactNativeNewArchitectureFeatureFlags.useFabricInterop(), - "useFabricInterop FeatureFlag must be false when UNSTABLE_ENABLE_MINIFY_LEGACY_ARCHITECTURE == true.") + "useFabricInterop FeatureFlag must be false when UNSTABLE_ENABLE_MINIFY_LEGACY_ARCHITECTURE == true.", + ) Assertions.assertCondition( !ReactNativeNewArchitectureFeatureFlags.useTurboModuleInterop(), - "useTurboModuleInterop FeatureFlag must be false when UNSTABLE_ENABLE_MINIFY_LEGACY_ARCHITECTURE == true.") + "useTurboModuleInterop FeatureFlag must be false when UNSTABLE_ENABLE_MINIFY_LEGACY_ARCHITECTURE == true.", + ) } return waitThenCallGetOrCreateReactInstanceTask() @@ -772,7 +789,8 @@ public class ReactHostImpl( task.makeVoid() } }, - bgExecutor) + bgExecutor, + ) .also { startTask = it } } @@ -785,12 +803,14 @@ public class ReactHostImpl( private fun raiseSoftException( callingMethod: String, message: String, - throwable: Throwable? = null + throwable: Throwable? = null, ) { val method = "raiseSoftException($callingMethod)" log(method, message) ReactSoftExceptionLogger.logSoftException( - TAG, ReactNoCrashSoftException("$method: $message", throwable)) + TAG, + ReactNoCrashSoftException("$method: $message", throwable), + ) } /** Schedule work on a ReactInstance that is already created. */ @@ -807,14 +827,16 @@ public class ReactHostImpl( if (reactInstance == null) { raiseSoftException( "callWithExistingReactInstance($callingMethod)", - "Execute: reactInstance is null. Dropping work.") + "Execute: reactInstance is null. Dropping work.", + ) false } else { runnable(reactInstance) true } }, - executor) + executor, + ) /** Create a ReactInstance if it doesn't exist already, and schedule work on it. */ private fun callAfterGetOrCreateReactInstance( @@ -829,13 +851,15 @@ public class ReactHostImpl( if (reactInstance == null) { raiseSoftException( "callAfterGetOrCreateReactInstance($callingMethod)", - "Execute: reactInstance is null. Dropping work.") + "Execute: reactInstance is null. Dropping work.", + ) } else { runnable(reactInstance) } null }, - executor) + executor, + ) private fun getOrCreateReactContext(): BridgelessReactContext { val method = "getOrCreateReactContext()" @@ -861,7 +885,7 @@ public class ReactHostImpl( @ThreadConfined("ReactHost") private fun waitThenCallGetOrCreateReactInstanceTaskWithRetries( tryNum: Int, - maxTries: Int + maxTries: Int, ): Task { val method = "waitThenCallGetOrCreateReactInstanceTaskWithRetries" reloadTask?.let { task -> @@ -874,15 +898,18 @@ public class ReactHostImpl( if (shouldTryAgain) { log( method, - "React Native is tearing down.Wait for teardown to finish, before trying again (try count = $tryNum).") + "React Native is tearing down.Wait for teardown to finish, before trying again (try count = $tryNum).", + ) return task.onSuccessTask( { waitThenCallGetOrCreateReactInstanceTaskWithRetries(tryNum + 1, maxTries) }, - bgExecutor) + bgExecutor, + ) } raiseSoftException( method, - "React Native is tearing down. Not wait for teardown to finish: reached max retries.") + "React Native is tearing down. Not wait for teardown to finish: reached max retries.", + ) } return getOrCreateReactInstanceTask() @@ -891,7 +918,7 @@ public class ReactHostImpl( private class CreationResult( val instance: ReactInstance, val context: ReactContext, - val isReloading: Boolean + val isReloading: Boolean, ) @ThreadConfined("ReactHost") @@ -902,10 +929,14 @@ public class ReactHostImpl( return createReactInstanceTaskRef.getOrCreate { log(method, "Start") Assertions.assertCondition( - !hostInvalidated, "Cannot start a new ReactInstance on an invalidated ReactHost") + !hostInvalidated, + "Cannot start a new ReactInstance on an invalidated ReactHost", + ) ReactMarker.logMarker( - ReactMarkerConstants.REACT_BRIDGELESS_LOADING_START, BRIDGELESS_MARKER_INSTANCE_KEY) + ReactMarkerConstants.REACT_BRIDGELESS_LOADING_START, + BRIDGELESS_MARKER_INSTANCE_KEY, + ) val creationTask = jsBundleLoader.onSuccess( @@ -923,7 +954,8 @@ public class ReactHostImpl( devSupportManager, { e: Exception -> this.handleHostException(e) }, useDevSupport, - getOrCreateReactHostInspectorTarget()) + getOrCreateReactHostInspectorTarget(), + ) reactInstance = instance val memoryPressureListener = createMemoryPressureListener(instance) @@ -946,11 +978,13 @@ public class ReactHostImpl( // TODO T76081936 Move this if we switch to a sync RTE ReactMarker.logMarker( ReactMarkerConstants.REACT_BRIDGELESS_LOADING_END, - BRIDGELESS_MARKER_INSTANCE_KEY) + BRIDGELESS_MARKER_INSTANCE_KEY, + ) } CreationResult(instance, reactContext, reloadTask != null) }, - bgExecutor) + bgExecutor, + ) val lifecycleUpdateTask = task@{ task: Task -> if (task.isFaulted()) { @@ -1020,7 +1054,8 @@ public class ReactHostImpl( Task.forResult(reactHostDelegate.jsBundleLoader) } }, - bgExecutor) + bgExecutor, + ) } else { if (ReactBuildConfig.DEBUG) { FLog.d(TAG, "Packager server access is disabled in this environment") @@ -1074,14 +1109,17 @@ public class ReactHostImpl( log(method, "Creating BundleLoader") val bundleLoader = JSBundleLoader.createCachedBundleFromNetworkLoader( - bundleURL, asyncDevSupportManager.downloadedJSBundleFile) + bundleURL, + asyncDevSupportManager.downloadedJSBundleFile, + ) taskCompletionSource.setResult(bundleLoader) } override fun onError(cause: Exception) { taskCompletionSource.setError(cause) } - }) + }, + ) return taskCompletionSource.task } @@ -1118,7 +1156,7 @@ public class ReactHostImpl( private fun createReactInstanceUnwrapper( tag: String, method: String, - reason: String + reason: String, ): (task: Task, stage: String) -> ReactInstance? = unwrap@{ task: Task, stage: String -> val reactInstance = task.getResult() @@ -1130,26 +1168,33 @@ public class ReactHostImpl( val ex = checkNotNull(task.getError()) val faultLabel = "Fault reason: ${ex.message}" raiseSoftException( - method, "$tag: ReactInstance task faulted. $stageLabel. $faultLabel. $reasonLabel") + method, + "$tag: ReactInstance task faulted. $stageLabel. $faultLabel. $reasonLabel", + ) return@unwrap currentReactInstance } if (task.isCancelled()) { raiseSoftException( - method, "$tag: ReactInstance task cancelled. $stageLabel. $reasonLabel") + method, + "$tag: ReactInstance task cancelled. $stageLabel. $reasonLabel", + ) return@unwrap currentReactInstance } if (reactInstance == null) { raiseSoftException( - method, "$tag: ReactInstance task returned null. $stageLabel. $reasonLabel") + method, + "$tag: ReactInstance task returned null. $stageLabel. $reasonLabel", + ) return@unwrap currentReactInstance } if (currentReactInstance != null && reactInstance != currentReactInstance) { raiseSoftException( method, - ("$tag: Detected two different ReactInstances. Returning old. $stageLabel. $reasonLabel")) + ("$tag: Detected two different ReactInstances. Returning old. $stageLabel. $reasonLabel"), + ) } reactInstance } @@ -1200,7 +1245,8 @@ public class ReactHostImpl( } Task.forResult(reactInstance) }, - uiExecutor) + uiExecutor, + ) .continueWithTask( { task: Task -> val reactInstance = taskUnwrapper(task, "2: Surface shutdown") @@ -1211,7 +1257,8 @@ public class ReactHostImpl( } task }, - bgExecutor) + bgExecutor, + ) .continueWithTask( { task: Task -> taskUnwrapper(task, "3: Destroying ReactContext") @@ -1239,7 +1286,8 @@ public class ReactHostImpl( } task }, - uiExecutor) + uiExecutor, + ) .continueWithTask( { task: Task -> val reactInstance = taskUnwrapper(task, "4: Destroying ReactInstance") @@ -1259,7 +1307,8 @@ public class ReactHostImpl( // Kickstart a new ReactInstance create getOrCreateReactInstanceTask() }, - bgExecutor) + bgExecutor, + ) .continueWithTask( { task: Task -> val reactInstance = taskUnwrapper(task, "5: Restarting surfaces") @@ -1270,7 +1319,8 @@ public class ReactHostImpl( } task }, - bgExecutor) + bgExecutor, + ) .continueWithTask( { task: Task -> if (task.isFaulted()) { @@ -1278,19 +1328,22 @@ public class ReactHostImpl( raiseSoftException( method, ("Error during reload. ReactInstance task faulted. Fault reason: ${fault.message}. Reload reason: $reason"), - task.getError()) + task.getError(), + ) } if (task.isCancelled()) { raiseSoftException( method, - "Error during reload. ReactInstance task cancelled. Reload reason: $reason") + "Error during reload. ReactInstance task cancelled. Reload reason: $reason", + ) } log(method, "Resetting reload task ref") reloadTask = null task }, - bgExecutor) + bgExecutor, + ) .also { reloadTask = it } } @@ -1355,7 +1408,8 @@ public class ReactHostImpl( reactLifecycleStateManager.moveToOnHostDestroy(reactContext) Task.forResult(reactInstance) }, - uiExecutor) + uiExecutor, + ) .continueWithTask( { task: Task -> val reactInstance = taskUnwrapper(task, "2: Stopping surfaces") @@ -1368,7 +1422,8 @@ public class ReactHostImpl( } task }, - bgExecutor) + bgExecutor, + ) .continueWithTask( { task: Task -> taskUnwrapper(task, "3: Destroying ReactContext") @@ -1400,7 +1455,8 @@ public class ReactHostImpl( ResourceDrawableIdHelper.clear() task }, - uiExecutor) + uiExecutor, + ) .continueWithTask( { task: Task -> val reactInstance = taskUnwrapper(task, "4: Destroying ReactInstance") @@ -1421,19 +1477,22 @@ public class ReactHostImpl( destroyTask = null task }, - bgExecutor) + bgExecutor, + ) .continueWith({ task: Task -> if (task.isFaulted()) { val fault = checkNotNull(task.getError()) raiseSoftException( method, ("React destruction failed. ReactInstance task faulted. Fault reason: ${fault.message}. Destroy reason: $reason"), - task.getError()) + task.getError(), + ) } if (task.isCancelled()) { raiseSoftException( method, - "React destruction failed. ReactInstance task cancelled. Destroy reason: $reason") + "React destruction failed. ReactInstance task cancelled. Destroy reason: $reason", + ) } null }) @@ -1455,7 +1514,8 @@ public class ReactHostImpl( if (InspectorFlags.getFuseboxEnabled()) { Assertions.assertCondition( reactHostInspectorTarget?.isValid() == true, - "Host inspector target destroyed before instance was unregistered") + "Host inspector target destroyed before instance was unregistered", + ) } reactInstance.unregisterFromInspector() } diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/runtime/ReactInstance.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/runtime/ReactInstance.kt index c7546e718e5..ea054163bf1 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/runtime/ReactInstance.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/runtime/ReactInstance.kt @@ -93,7 +93,7 @@ internal class ReactInstance( devSupportManager: DevSupportManager, exceptionHandler: QueueThreadExceptionHandler, useDevSupport: Boolean, - reactHostInspectorTarget: ReactHostInspectorTarget? + reactHostInspectorTarget: ReactHostInspectorTarget?, ) { @Suppress("NoHungarianNotation") @DoNotStrip private val mHybridData: HybridData @@ -115,7 +115,8 @@ internal class ReactInstance( val spec = ReactQueueConfigurationSpec( MessageQueueThreadSpec.newBackgroundThreadSpec("v_native"), - MessageQueueThreadSpec.newBackgroundThreadSpec("v_js")) + MessageQueueThreadSpec.newBackgroundThreadSpec("v_js"), + ) reactQueueConfiguration = ReactQueueConfigurationImpl.create(spec, exceptionHandler) FLog.d(TAG, "Calling initializeMessageQueueThreads()") context.initializeMessageQueueThreads(reactQueueConfiguration) @@ -128,7 +129,11 @@ internal class ReactInstance( val jsTimerExecutor = createJSTimerExecutor() javaTimerManager = JavaTimerManager( - context, jsTimerExecutor, ReactChoreographer.getInstance(), devSupportManager) + context, + jsTimerExecutor, + ReactChoreographer.getInstance(), + devSupportManager, + ) // Notify JS if profiling is enabled val isProfiling = @@ -146,7 +151,8 @@ internal class ReactInstance( ReactJsExceptionHandlerImpl(exceptionHandler), delegate.bindingsInstaller, isProfiling, - reactHostInspectorTarget) + reactHostInspectorTarget, + ) javaScriptContextHolder = JavaScriptContextHolder(getJavaScriptContext()) @@ -173,7 +179,8 @@ internal class ReactInstance( unbufferedRuntimeExecutor, turboModuleManagerDelegate, getJSCallInvokerHolder(), - getNativeMethodCallInvokerHolder()) + getNativeMethodCallInvokerHolder(), + ) Systrace.endSection(Systrace.TRACE_TAG_REACT) @@ -196,7 +203,8 @@ internal class ReactInstance( } return viewManagerNames.toTypedArray() } - }) + }, + ) // Initialize function for JS's UIManager.getViewManagerConfig() // It should come after getTurboModuleManagerDelegate as it relies on react packages being @@ -232,7 +240,8 @@ internal class ReactInstance( constants["LazyViewManagersEnabled"] = true } Arguments.makeNativeMap(constants) - }) + }, + ) } val eventBeatManager = EventBeatManager() @@ -248,7 +257,8 @@ internal class ReactInstance( getRuntimeScheduler(), fabricUIManager, eventBeatManager, - componentFactory) + componentFactory, + ) // Initialize the FabricUIManager fabricUIManager.initialize() @@ -295,7 +305,7 @@ internal class ReactInstance( override fun loadScriptFromFile( fileName: String, sourceURL: String, - loadSynchronously: Boolean + loadSynchronously: Boolean, ) { context.sourceURL = sourceURL loadJSBundleFromFile(fileName, sourceURL) @@ -308,7 +318,7 @@ internal class ReactInstance( override fun loadScriptFromAssets( assetManager: AssetManager, assetURL: String, - loadSynchronously: Boolean + loadSynchronously: Boolean, ) { context.sourceURL = assetURL loadJSBundleFromAssets(assetManager, assetURL) @@ -379,7 +389,8 @@ internal class ReactInstance( ReactSoftExceptionLogger.logSoftException( TAG, IllegalViewOperationException( - "surfaceView's is NOT equal to View.NO_ID before calling startSurface.")) + "surfaceView's is NOT equal to View.NO_ID before calling startSurface."), + ) view.id = View.NO_ID } if (surface.isRunning) { @@ -420,7 +431,7 @@ internal class ReactInstance( jReactExceptionsManager: ReactJsExceptionHandler, jBindingsInstaller: BindingsInstaller?, isProfiling: Boolean, - reactHostInspectorTarget: ReactHostInspectorTarget? + reactHostInspectorTarget: ReactHostInspectorTarget?, ): HybridData private external fun loadJSBundleFromFile(fileName: String, sourceURL: String) @@ -454,7 +465,8 @@ internal class ReactInstance( ReactSoftExceptionLogger.logSoftException( TAG, ReactNoCrashSoftException( - "Native method handleMemoryPressureJs is called earlier than librninstance.so got ready.")) + "Native method handleMemoryPressureJs is called earlier than librninstance.so got ready."), + ) } } @@ -468,7 +480,7 @@ internal class ReactInstance( private class BridgelessViewManagerResolver( private val reactPackages: List, - private val context: BridgelessReactContext + private val context: BridgelessReactContext, ) : ViewManagerResolver { private val lazyViewManagerMap: MutableMap> = HashMap() @@ -553,7 +565,8 @@ internal class ReactInstance( if (names == null) { RNLog.w( context, - "The ReactPackage called: `${reactPackage.javaClass.simpleName}` is returning null for getViewManagerNames(). This is violating the signature of the method. That method should be updated to return an empty collection.") + "The ReactPackage called: `${reactPackage.javaClass.simpleName}` is returning null for getViewManagerNames(). This is violating the signature of the method. That method should be updated to return an empty collection.", + ) } else { uniqueNames.addAll(names) } @@ -572,7 +585,7 @@ internal class ReactInstance( private fun createConstants( viewManagers: List>, - customDirectEvents: MutableMap? + customDirectEvents: MutableMap?, ): MutableMap { ReactMarker.logMarker(ReactMarkerConstants.CREATE_UI_MANAGER_MODULE_CONSTANTS_START) SystraceMessage.beginSection(Systrace.TRACE_TAG_REACT, "CreateUIManagerConstants") @@ -580,7 +593,10 @@ internal class ReactInstance( .flush() try { return UIManagerModuleConstantsHelper.createConstants( - viewManagers, null, customDirectEvents) + viewManagers, + null, + customDirectEvents, + ) } finally { Systrace.endSection(Systrace.TRACE_TAG_REACT) ReactMarker.logMarker(ReactMarkerConstants.CREATE_UI_MANAGER_MODULE_CONSTANTS_END) @@ -589,17 +605,24 @@ internal class ReactInstance( private fun getConstantsForViewManager( viewManager: ViewManager<*, *>, - customDirectEvents: MutableMap + customDirectEvents: MutableMap, ): NativeMap { SystraceMessage.beginSection( - Systrace.TRACE_TAG_REACT, "ReactInstance.getConstantsForViewManager") + Systrace.TRACE_TAG_REACT, + "ReactInstance.getConstantsForViewManager", + ) .arg("ViewManager", viewManager.name) .arg("Lazy", true) .flush() try { val viewManagerConstants: Map = UIManagerModuleConstantsHelper.createConstantsForViewManager( - viewManager, null, null, null, customDirectEvents) + viewManager, + null, + null, + null, + customDirectEvents, + ) return Arguments.makeNativeMap(viewManagerConstants) } finally { SystraceMessage.endSection(Systrace.TRACE_TAG_REACT).flush() diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/runtime/ReactSurfaceImpl.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/runtime/ReactSurfaceImpl.kt index 6d4772cb34e..29285e9ad92 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/runtime/ReactSurfaceImpl.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/runtime/ReactSurfaceImpl.kt @@ -66,7 +66,7 @@ internal constructor( public constructor( context: Context, moduleName: String, - initialProps: Bundle? + initialProps: Bundle?, ) : this(SurfaceHandlerBinding(moduleName), context) { val nativeProps = initialProps?.let { Arguments.fromBundle(it) as NativeMap } surfaceHandler.setProps(nativeProps) @@ -80,7 +80,8 @@ internal constructor( doRTLSwap(context), isRTL(context), displayMetrics.density, - getFontScale(context)) + getFontScale(context), + ) } /** @@ -172,7 +173,7 @@ internal constructor( widthMeasureSpec: Int, heightMeasureSpec: Int, offsetX: Int, - offsetY: Int + offsetY: Int, ) { surfaceHandler.setLayoutConstraints( widthMeasureSpec, @@ -182,7 +183,8 @@ internal constructor( doRTLSwap(context), isRTL(context), context.resources.displayMetrics.density, - getFontScale(context)) + getFontScale(context), + ) } internal val eventDispatcher: EventDispatcher? @@ -199,7 +201,7 @@ internal constructor( public fun createWithView( context: Context, moduleName: String, - initialProps: Bundle? + initialProps: Bundle?, ): ReactSurfaceImpl { val surface = ReactSurfaceImpl(context, moduleName, initialProps) surface.attachView(ReactSurfaceView(context, surface)) diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/runtime/ReactSurfaceView.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/runtime/ReactSurfaceView.kt index a4e0807fbea..c68ee283291 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/runtime/ReactSurfaceView.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/runtime/ReactSurfaceView.kt @@ -77,7 +77,11 @@ public class ReactSurfaceView(context: Context?, private val surface: ReactSurfa this.heightMeasureSpec = heightMeasureSpec val viewportOffset = viewportOffset surface.updateLayoutSpecs( - widthMeasureSpec, heightMeasureSpec, viewportOffset.x, viewportOffset.y) + widthMeasureSpec, + heightMeasureSpec, + viewportOffset.x, + viewportOffset.y, + ) Systrace.endSection(Systrace.TRACE_TAG_REACT) } @@ -86,7 +90,11 @@ public class ReactSurfaceView(context: Context?, private val surface: ReactSurfa if (wasMeasured && changed) { val viewportOffset = viewportOffset surface.updateLayoutSpecs( - widthMeasureSpec, heightMeasureSpec, viewportOffset.x, viewportOffset.y) + widthMeasureSpec, + heightMeasureSpec, + viewportOffset.x, + viewportOffset.y, + ) } } @@ -117,7 +125,10 @@ public class ReactSurfaceView(context: Context?, private val surface: ReactSurfa override fun onChildStartedNativeGesture(childView: View?, ev: MotionEvent) { val eventDispatcher = surface.eventDispatcher ?: return jsTouchDispatcher.onChildStartedNativeGesture( - ev, eventDispatcher, surface.reactHost?.currentReactContext) + ev, + eventDispatcher, + surface.reactHost?.currentReactContext, + ) childView?.let { jsPointerDispatcher?.onChildStartedNativeGesture(it, ev, eventDispatcher) } } @@ -146,10 +157,15 @@ public class ReactSurfaceView(context: Context?, private val surface: ReactSurfa val eventDispatcher = surface.eventDispatcher if (eventDispatcher != null) { jsTouchDispatcher.handleTouchEvent( - event, eventDispatcher, surface.reactHost?.currentReactContext) + event, + eventDispatcher, + surface.reactHost?.currentReactContext, + ) } else { FLog.w( - TAG, "Unable to dispatch touch events to JS as the React instance has not been attached") + TAG, + "Unable to dispatch touch events to JS as the React instance has not been attached", + ) } } @@ -167,7 +183,8 @@ public class ReactSurfaceView(context: Context?, private val surface: ReactSurfa } else { FLog.w( TAG, - "Unable to dispatch pointer events to JS as the React instance has not been attached") + "Unable to dispatch pointer events to JS as the React instance has not been attached", + ) } } diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/runtime/internal/bolts/Task.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/runtime/internal/bolts/Task.kt index 0fd72fdda59..f3e6d944a76 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/runtime/internal/bolts/Task.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/runtime/internal/bolts/Task.kt @@ -117,7 +117,7 @@ public class Task : TaskInterface { @JvmOverloads public fun continueWith( continuation: Continuation, - executor: Executor = IMMEDIATE_EXECUTOR + executor: Executor = IMMEDIATE_EXECUTOR, ): Task { val completed: Boolean val tcs = TaskCompletionSource() @@ -174,7 +174,8 @@ public class Task : TaskInterface { else -> task.continueWith(continuation) } }, - executor) + executor, + ) /** * Runs a continuation when a task completes successfully, forwarding along [java.lang.Exception]s @@ -192,7 +193,8 @@ public class Task : TaskInterface { else -> task.continueWithTask(continuation) } }, - executor) + executor, + ) private fun runContinuations() = synchronized(lock) { @@ -299,7 +301,7 @@ public class Task : TaskInterface { @JvmStatic public fun call( callable: Callable>, - executor: Executor + executor: Executor, ): Task { val tcs = TaskCompletionSource() try { @@ -348,7 +350,7 @@ public class Task : TaskInterface { tcs: TaskCompletionSource, continuation: Continuation, task: Task, - executor: Executor + executor: Executor, ) { try { executor.execute { @@ -382,7 +384,7 @@ public class Task : TaskInterface { tcs: TaskCompletionSource, continuation: Continuation>, task: Task, - executor: Executor + executor: Executor, ) { try { executor.execute { diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/shell/MainReactPackage.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/shell/MainReactPackage.kt index 9b6734c7d30..7c115f18a9f 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/shell/MainReactPackage.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/shell/MainReactPackage.kt @@ -152,7 +152,8 @@ constructor(private val config: MainPackageConfig? = null) : else ReactTextViewManager(), ReactViewManager(), com.facebook.react.views.text.ReactVirtualTextViewManager(), - ReactUnimplementedViewManager()) + ReactUnimplementedViewManager(), + ) /** * A map of view managers that should be registered with @@ -198,7 +199,8 @@ constructor(private val config: MainPackageConfig? = null) : com.facebook.react.views.text.ReactVirtualTextViewManager() }, ReactUnimplementedViewManager.REACT_CLASS to - ModuleSpec.viewManagerSpec { ReactUnimplementedViewManager() }) + ModuleSpec.viewManagerSpec { ReactUnimplementedViewManager() }, + ) public override fun getViewManagers(reactContext: ReactApplicationContext): List = viewManagersMap.values.toList() @@ -208,7 +210,7 @@ constructor(private val config: MainPackageConfig? = null) : override fun createViewManager( reactContext: ReactApplicationContext, - viewManagerName: String + viewManagerName: String, ): ViewManager<*, *>? { val spec = viewManagersMap[viewManagerName] return spec?.provider?.get() as? ViewManager<*, *> @@ -229,10 +231,14 @@ constructor(private val config: MainPackageConfig? = null) : return fallbackForMissingClass() } catch (e: InstantiationException) { throw RuntimeException( - "No ReactModuleInfoProvider for MainReactPackage$\$ReactModuleInfoProvider", e) + "No ReactModuleInfoProvider for MainReactPackage$\$ReactModuleInfoProvider", + e, + ) } catch (e: IllegalAccessException) { throw RuntimeException( - "No ReactModuleInfoProvider for MainReactPackage$\$ReactModuleInfoProvider", e) + "No ReactModuleInfoProvider for MainReactPackage$\$ReactModuleInfoProvider", + e, + ) } } @@ -265,7 +271,8 @@ constructor(private val config: MainPackageConfig? = null) : SoundManagerModule::class.java, ToastModule::class.java, VibrationModule::class.java, - WebSocketModule::class.java) + WebSocketModule::class.java, + ) .filterNotNull() .toTypedArray() @@ -281,7 +288,8 @@ constructor(private val config: MainPackageConfig? = null) : reactModule.canOverrideExistingModule, reactModule.needsEagerInit, reactModule.isCxxModule, - classIsTurboModule(moduleClass)) + classIsTurboModule(moduleClass), + ) } return ReactModuleInfoProvider { moduleMap } } diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/BackgroundStyleApplicator.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/BackgroundStyleApplicator.kt index 3a860f9008f..91a53ac8759 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/BackgroundStyleApplicator.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/BackgroundStyleApplicator.kt @@ -67,7 +67,7 @@ public object BackgroundStyleApplicator { @JvmStatic public fun setBackgroundImage( view: View, - backgroundImageLayers: List? + backgroundImageLayers: List?, ): Unit { if (ReactNativeFeatureFlags.enableNewBackgroundAndBorderDrawables()) { ensureBackgroundDrawable(view).backgroundImageLayers = backgroundImageLayers @@ -147,7 +147,7 @@ public object BackgroundStyleApplicator { public fun setBorderRadius( view: View, corner: BorderRadiusProp, - radius: LengthPercentage? + radius: LengthPercentage?, ): Unit { val compositeBackgroundDrawable = ensureCompositeBackgroundDrawable(view) compositeBackgroundDrawable.borderRadius = @@ -301,7 +301,8 @@ public object BackgroundStyleApplicator { offsetX = offsetX, offsetY = offsetY, blurRadius = blurRadius, - spread = spreadDistance)) + spread = spreadDistance, + )) } else if (!inset && Build.VERSION.SDK_INT >= MIN_OUTSET_BOX_SHADOW_SDK_VERSION) { outerShadows.add( OutsetBoxShadowDrawable( @@ -311,7 +312,8 @@ public object BackgroundStyleApplicator { offsetX = offsetX, offsetY = offsetY, blurRadius = blurRadius, - spread = spreadDistance)) + spread = spreadDistance, + )) } } @@ -449,7 +451,8 @@ public object BackgroundStyleApplicator { BackgroundDrawable( view.context, compositeBackgroundDrawable.borderRadius, - compositeBackgroundDrawable.borderInsets) + compositeBackgroundDrawable.borderInsets, + ) view.background = compositeBackgroundDrawable.withNewBackground(background) background } @@ -523,7 +526,7 @@ public object BackgroundStyleApplicator { view: View, composite: CompositeBackgroundDrawable, paddingBoxRect: RectF, - computedBorderInsets: RectF? + computedBorderInsets: RectF?, ): Path { val computedBorderRadius = composite.borderRadius?.resolve( @@ -538,33 +541,43 @@ public object BackgroundStyleApplicator { val innerTopLeftRadiusX = getInnerBorderRadius( computedBorderRadius?.topLeft?.horizontal?.dpToPx(), - computedBorderInsets?.left?.dpToPx()) + computedBorderInsets?.left?.dpToPx(), + ) val innerTopLeftRadiusY = getInnerBorderRadius( - computedBorderRadius?.topLeft?.vertical?.dpToPx(), computedBorderInsets?.top?.dpToPx()) + computedBorderRadius?.topLeft?.vertical?.dpToPx(), + computedBorderInsets?.top?.dpToPx(), + ) val innerTopRightRadiusX = getInnerBorderRadius( computedBorderRadius?.topRight?.horizontal?.dpToPx(), - computedBorderInsets?.right?.dpToPx()) + computedBorderInsets?.right?.dpToPx(), + ) val innerTopRightRadiusY = getInnerBorderRadius( - computedBorderRadius?.topRight?.vertical?.dpToPx(), computedBorderInsets?.top?.dpToPx()) + computedBorderRadius?.topRight?.vertical?.dpToPx(), + computedBorderInsets?.top?.dpToPx(), + ) val innerBottomRightRadiusX = getInnerBorderRadius( computedBorderRadius?.bottomRight?.horizontal?.dpToPx(), - computedBorderInsets?.right?.dpToPx()) + computedBorderInsets?.right?.dpToPx(), + ) val innerBottomRightRadiusY = getInnerBorderRadius( computedBorderRadius?.bottomRight?.vertical?.dpToPx(), - computedBorderInsets?.bottom?.dpToPx()) + computedBorderInsets?.bottom?.dpToPx(), + ) val innerBottomLeftRadiusX = getInnerBorderRadius( computedBorderRadius?.bottomLeft?.horizontal?.dpToPx(), - computedBorderInsets?.left?.dpToPx()) + computedBorderInsets?.left?.dpToPx(), + ) val innerBottomLeftRadiusY = getInnerBorderRadius( computedBorderRadius?.bottomLeft?.vertical?.dpToPx(), - computedBorderInsets?.bottom?.dpToPx()) + computedBorderInsets?.bottom?.dpToPx(), + ) paddingBoxPath.addRoundRect( paddingBoxRect, @@ -578,7 +591,8 @@ public object BackgroundStyleApplicator { innerBottomLeftRadiusX, innerBottomLeftRadiusY, ), - Path.Direction.CW) + Path.Direction.CW, + ) return paddingBoxPath } } diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/BaseViewManagerDelegate.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/BaseViewManagerDelegate.kt index 3575036b7f7..9fca177f3b1 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/BaseViewManagerDelegate.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/BaseViewManagerDelegate.kt @@ -20,9 +20,11 @@ import com.facebook.yoga.YogaConstants * every view should support, such as rotation, background color, etc. */ public abstract class BaseViewManagerDelegate< - T : View, @Suppress("DEPRECATION") U : BaseViewManager>( - @Suppress("NoHungarianNotation") @JvmField protected val mViewManager: U -) : ViewManagerDelegate { + T : View, + @Suppress("DEPRECATION") + U : BaseViewManager, +>(@Suppress("NoHungarianNotation") @JvmField protected val mViewManager: U) : + ViewManagerDelegate { @Suppress("ACCIDENTAL_OVERRIDE", "DEPRECATION") public override fun setProperty(view: T, propName: String, value: Any?) { when (propName) { @@ -50,23 +52,33 @@ public abstract class BaseViewManagerDelegate< ViewProps.BORDER_RADIUS -> mViewManager.setBorderRadius( - view, (value as Double?)?.toFloat() ?: YogaConstants.UNDEFINED) + view, + (value as Double?)?.toFloat() ?: YogaConstants.UNDEFINED, + ) ViewProps.BORDER_BOTTOM_LEFT_RADIUS -> mViewManager.setBorderBottomLeftRadius( - view, (value as Double?)?.toFloat() ?: YogaConstants.UNDEFINED) + view, + (value as Double?)?.toFloat() ?: YogaConstants.UNDEFINED, + ) ViewProps.BORDER_BOTTOM_RIGHT_RADIUS -> mViewManager.setBorderBottomRightRadius( - view, (value as Double?)?.toFloat() ?: YogaConstants.UNDEFINED) + view, + (value as Double?)?.toFloat() ?: YogaConstants.UNDEFINED, + ) ViewProps.BORDER_TOP_LEFT_RADIUS -> mViewManager.setBorderTopLeftRadius( - view, (value as Double?)?.toFloat() ?: YogaConstants.UNDEFINED) + view, + (value as Double?)?.toFloat() ?: YogaConstants.UNDEFINED, + ) ViewProps.BORDER_TOP_RIGHT_RADIUS -> mViewManager.setBorderTopRightRadius( - view, (value as Double?)?.toFloat() ?: YogaConstants.UNDEFINED) + view, + (value as Double?)?.toFloat() ?: YogaConstants.UNDEFINED, + ) ViewProps.BOX_SHADOW -> mViewManager.setBoxShadow(view, value as ReadableArray?) @@ -96,13 +108,17 @@ public abstract class BaseViewManagerDelegate< ViewProps.OUTLINE_OFFSET -> mViewManager.setOutlineOffset( - view, (value as Double?)?.toFloat() ?: YogaConstants.UNDEFINED) + view, + (value as Double?)?.toFloat() ?: YogaConstants.UNDEFINED, + ) ViewProps.OUTLINE_STYLE -> mViewManager.setOutlineStyle(view, value as String?) ViewProps.OUTLINE_WIDTH -> mViewManager.setOutlineWidth( - view, (value as Double?)?.toFloat() ?: YogaConstants.UNDEFINED) + view, + (value as Double?)?.toFloat() ?: YogaConstants.UNDEFINED, + ) ViewProps.RENDER_TO_HARDWARE_TEXTURE -> mViewManager.setRenderToHardwareTexture(view, value as Boolean? ?: false) diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/DisplayMetricsHolder.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/DisplayMetricsHolder.kt index a66129c8b98..0fb1c2c5a80 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/DisplayMetricsHolder.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/DisplayMetricsHolder.kt @@ -84,16 +84,18 @@ public object DisplayMetricsHolder { return WritableNativeMap().apply { putMap( "windowPhysicalPixels", - getPhysicalPixelsWritableMap(windowDisplayMetrics as DisplayMetrics, fontScale)) + getPhysicalPixelsWritableMap(windowDisplayMetrics as DisplayMetrics, fontScale), + ) putMap( "screenPhysicalPixels", - getPhysicalPixelsWritableMap(screenDisplayMetrics as DisplayMetrics, fontScale)) + getPhysicalPixelsWritableMap(screenDisplayMetrics as DisplayMetrics, fontScale), + ) } } private fun getPhysicalPixelsWritableMap( displayMetrics: DisplayMetrics, - fontScale: Double + fontScale: Double, ): WritableMap = WritableNativeMap().apply { putInt("width", displayMetrics.widthPixels) @@ -136,7 +138,8 @@ public object DisplayMetricsHolder { val verticalInsets = insets.top + insets.bottom return encodeFloatsToLong( (checkNotNull(screenDisplayMetrics).widthPixels).toFloat().pxToDp(), - (checkNotNull(screenDisplayMetrics).heightPixels - verticalInsets).toFloat().pxToDp()) + (checkNotNull(screenDisplayMetrics).heightPixels - verticalInsets).toFloat().pxToDp(), + ) } internal fun encodeFloatsToLong(width: Float, height: Float): Long = diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/FilterHelper.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/FilterHelper.kt index 1b51c22793c..ca77b2dce3e 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/FilterHelper.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/FilterHelper.kt @@ -133,7 +133,7 @@ internal object FilterHelper { offsetY: Float, blurRadius: Float, color: Int, - chainedEffects: RenderEffect? = null + chainedEffects: RenderEffect? = null, ): RenderEffect { val identity: RenderEffect val offsetEffect: RenderEffect @@ -157,7 +157,9 @@ internal object FilterHelper { */ val colorEffect: RenderEffect = RenderEffect.createColorFilterEffect( - BlendModeColorFilter(color, BlendMode.SRC_IN), offsetEffect) + BlendModeColorFilter(color, BlendMode.SRC_IN), + offsetEffect, + ) val blurEffect: RenderEffect = RenderEffect.createBlurEffect(blurRadius, blurRadius, colorEffect, Shader.TileMode.DECAL) @@ -172,7 +174,7 @@ internal object FilterHelper { fun parseAndCreateDropShadowEffect( filterValues: ReadableMap, - chainedEffects: RenderEffect? = null + chainedEffects: RenderEffect? = null, ): RenderEffect { val offsetX: Float = filterValues.getDouble("offsetX").dpToPx() val offsetY: Float = filterValues.getDouble("offsetY").dpToPx() @@ -221,7 +223,8 @@ internal object FilterHelper { 0f, 0f, 1f, - 0f)) + 0f, + )) } // https://www.w3.org/TR/filter-effects-1/#grayscaleEquivalent @@ -252,7 +255,8 @@ internal object FilterHelper { 0f, 0f, 1f, - 0f)) + 0f, + )) } // https://www.w3.org/TR/filter-effects-1/#sepiaEquivalent @@ -283,7 +287,8 @@ internal object FilterHelper { 0f, 0f, 1f, - 0f)) + 0f, + )) } // https://www.w3.org/TR/filter-effects-1/#saturateEquivalent @@ -327,7 +332,8 @@ internal object FilterHelper { 0f, 0f, 1f, - 0f)) + 0f, + )) } // https://www.w3.org/TR/filter-effects-1/#invertEquivalent @@ -359,12 +365,13 @@ internal object FilterHelper { 0f, 0f, 1f, - 0f)) + 0f, + )) } private fun createColorMatrixEffect( colorMatrix: ColorMatrix, - chainedEffects: RenderEffect? = null + chainedEffects: RenderEffect? = null, ): RenderEffect { return if (chainedEffects == null) { RenderEffect.createColorFilterEffect(ColorMatrixColorFilter(colorMatrix)) diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/JSTouchDispatcher.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/JSTouchDispatcher.kt index b28b674581a..e1d140a204c 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/JSTouchDispatcher.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/JSTouchDispatcher.kt @@ -38,7 +38,7 @@ public class JSTouchDispatcher(private val viewGroup: ViewGroup) { @OptIn(UnstableReactNativeAPI::class) public fun onChildStartedNativeGesture( androidEvent: MotionEvent, - eventDispatcher: EventDispatcher + eventDispatcher: EventDispatcher, ) { onChildStartedNativeGesture(androidEvent, eventDispatcher, null) } @@ -70,7 +70,7 @@ public class JSTouchDispatcher(private val viewGroup: ViewGroup) { @Suppress("UNUSED_PARAMETER") public fun onChildEndedNativeGesture( androidEvent: MotionEvent, - eventDispatcher: EventDispatcher + eventDispatcher: EventDispatcher, ) { // There should be only one child gesture at any given time. We can safely turn off the flag. childIsHandlingNativeGesture = false @@ -91,7 +91,7 @@ public class JSTouchDispatcher(private val viewGroup: ViewGroup) { public fun handleTouchEvent( ev: MotionEvent, eventDispatcher: EventDispatcher, - reactContext: ReactContext? + reactContext: ReactContext?, ) { val action = ev.action and MotionEvent.ACTION_MASK if (action == MotionEvent.ACTION_DOWN) { @@ -118,7 +118,8 @@ public class JSTouchDispatcher(private val viewGroup: ViewGroup) { gestureStartTime, targetCoordinates[0], targetCoordinates[1], - touchEventCoalescingKeyHelper)) + touchEventCoalescingKeyHelper, + )) } else if (childIsHandlingNativeGesture) { // If the touch was intercepted by a child, we've already sent a cancel event to JS for this // gesture, so we shouldn't send any more touches related to it. @@ -129,7 +130,8 @@ public class JSTouchDispatcher(private val viewGroup: ViewGroup) { FLog.e( ReactConstants.TAG, "Unexpected state: received touch event but didn't get starting ACTION_DOWN for this " + - "gesture before") + "gesture before", + ) } else if (action == MotionEvent.ACTION_UP) { // End of the gesture. We reset target tag to -1 and expect no further event associated with // this gesture. @@ -144,7 +146,8 @@ public class JSTouchDispatcher(private val viewGroup: ViewGroup) { gestureStartTime, targetCoordinates[0], targetCoordinates[1], - touchEventCoalescingKeyHelper)) + touchEventCoalescingKeyHelper, + )) sweepActiveTouchForTag(surfaceId, targetTag, reactContext) targetTag = -1 gestureStartTime = TouchEvent.UNSET @@ -160,7 +163,8 @@ public class JSTouchDispatcher(private val viewGroup: ViewGroup) { gestureStartTime, targetCoordinates[0], targetCoordinates[1], - touchEventCoalescingKeyHelper)) + touchEventCoalescingKeyHelper, + )) } else if (action == MotionEvent.ACTION_POINTER_DOWN) { // New pointer goes down, this can only happen after ACTION_DOWN is sent for the first pointer eventDispatcher.dispatchEvent( @@ -172,7 +176,8 @@ public class JSTouchDispatcher(private val viewGroup: ViewGroup) { gestureStartTime, targetCoordinates[0], targetCoordinates[1], - touchEventCoalescingKeyHelper)) + touchEventCoalescingKeyHelper, + )) } else if (action == MotionEvent.ACTION_POINTER_UP) { // Exactly one of the pointers goes up eventDispatcher.dispatchEvent( @@ -184,14 +189,16 @@ public class JSTouchDispatcher(private val viewGroup: ViewGroup) { gestureStartTime, targetCoordinates[0], targetCoordinates[1], - touchEventCoalescingKeyHelper)) + touchEventCoalescingKeyHelper, + )) } else if (action == MotionEvent.ACTION_CANCEL) { if (touchEventCoalescingKeyHelper.hasCoalescingKey(ev.downTime)) { dispatchCancelEvent(ev, eventDispatcher) } else { FLog.e( ReactConstants.TAG, - "Received an ACTION_CANCEL touch event for which we have no corresponding ACTION_DOWN") + "Received an ACTION_CANCEL touch event for which we have no corresponding ACTION_DOWN", + ) } val surfaceId = UIManagerHelper.getSurfaceId(viewGroup) sweepActiveTouchForTag(surfaceId, targetTag, reactContext) @@ -200,7 +207,9 @@ public class JSTouchDispatcher(private val viewGroup: ViewGroup) { gestureStartTime = TouchEvent.UNSET } else { FLog.w( - ReactConstants.TAG, "Warning : touch event was ignored. Action=$action Target=$targetTag") + ReactConstants.TAG, + "Warning : touch event was ignored. Action=$action Target=$targetTag", + ) } } @@ -223,7 +232,12 @@ public class JSTouchDispatcher(private val viewGroup: ViewGroup) { private fun findTargetTagAndSetCoordinates(ev: MotionEvent): Int { // This method updates `targetCoordinates` with coordinates for the motion event. return TouchTargetHelper.findTargetTagAndCoordinatesForTouch( - ev.x, ev.y, viewGroup, targetCoordinates, null) + ev.x, + ev.y, + viewGroup, + targetCoordinates, + null, + ) } private fun dispatchCancelEvent(androidEvent: MotionEvent, eventDispatcher: EventDispatcher) { @@ -234,13 +248,15 @@ public class JSTouchDispatcher(private val viewGroup: ViewGroup) { FLog.w( ReactConstants.TAG, "Can't cancel already finished gesture. Is a child View trying to start a gesture from " + - "an UP/CANCEL event?") + "an UP/CANCEL event?", + ) return } Assertions.assertCondition( !childIsHandlingNativeGesture, - "Expected to not have already sent a cancel for this gesture") + "Expected to not have already sent a cancel for this gesture", + ) Assertions.assertNotNull(eventDispatcher) .dispatchEvent( TouchEvent.obtain( @@ -251,6 +267,7 @@ public class JSTouchDispatcher(private val viewGroup: ViewGroup) { gestureStartTime, targetCoordinates[0], targetCoordinates[1], - touchEventCoalescingKeyHelper)) + touchEventCoalescingKeyHelper, + )) } } diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/LayoutDirectionUtil.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/LayoutDirectionUtil.kt index 8f166d00247..0f8c0ff3861 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/LayoutDirectionUtil.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/LayoutDirectionUtil.kt @@ -16,11 +16,14 @@ import com.facebook.yoga.YogaDirection @LegacyArchitecture(logLevel = LegacyArchitectureLogLevel.ERROR) @Deprecated( message = "This class is part of Legacy Architecture and will be removed in a future release", - level = DeprecationLevel.WARNING) + level = DeprecationLevel.WARNING, +) internal object LayoutDirectionUtil { init { LegacyArchitectureLogger.assertLegacyArchitecture( - "LayoutDirectionUtil", LegacyArchitectureLogLevel.ERROR) + "LayoutDirectionUtil", + LegacyArchitectureLogLevel.ERROR, + ) } @JvmStatic diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/MatrixMathHelper.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/MatrixMathHelper.kt index c10743cd287..9657a21a70b 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/MatrixMathHelper.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/MatrixMathHelper.kt @@ -286,7 +286,8 @@ public object MatrixMathHelper { (m02 * m11 * m30 - m01 * m12 * m30 - m02 * m10 * m31 + m00 * m12 * m31 + m01 * m10 * m32 - m00 * m11 * m32) / det, ((m01 * m12 * m20 - m02 * m11 * m20 + m02 * m10 * m21) - m00 * m12 * m21 - m01 * m10 * m22 + - m00 * m11 * m22) / det) + m00 * m11 * m22) / det, + ) } /** Turns columns into rows and rows into columns. */ @@ -308,7 +309,8 @@ public object MatrixMathHelper { m[3], m[7], m[11], - m[15]) + m[15], + ) } /** Based on: http://tog.acm.org/resources/GraphicsGems/gemsii/unmatrix.c */ @@ -355,10 +357,13 @@ public object MatrixMathHelper { a: DoubleArray, b: DoubleArray, aScale: Double, - bScale: Double + bScale: Double, ): DoubleArray { return doubleArrayOf( - aScale * a[0] + bScale * b[0], aScale * a[1] + bScale * b[1], aScale * a[2] + bScale * b[2]) + aScale * a[0] + bScale * b[0], + aScale * a[1] + bScale * b[1], + aScale * a[2] + bScale * b[2], + ) } /** @@ -368,7 +373,10 @@ public object MatrixMathHelper { @JvmStatic public fun v3Cross(a: DoubleArray, b: DoubleArray): DoubleArray { return doubleArrayOf( - a[1] * b[2] - a[2] * b[1], a[2] * b[0] - a[0] * b[2], a[0] * b[1] - a[1] * b[0]) + a[1] * b[2] - a[2] * b[1], + a[2] * b[0] - a[0] * b[2], + a[0] * b[1] - a[1] * b[0], + ) } @JvmStatic diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/NativeKind.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/NativeKind.kt index 6239afe99df..326923fd035 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/NativeKind.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/NativeKind.kt @@ -16,7 +16,8 @@ import com.facebook.react.common.annotations.internal.LegacyArchitectureLogLevel @LegacyArchitecture(logLevel = LegacyArchitectureLogLevel.ERROR) @Deprecated( message = "This class is part of Legacy Architecture and will be removed in a future release", - level = DeprecationLevel.WARNING) + level = DeprecationLevel.WARNING, +) internal enum class NativeKind { // Node is in the native hierarchy and the HierarchyOptimizer should assume it can host children // (e.g. because it's a ViewGroup). Note that it's okay if the node doesn't support children. When diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/NoSuchNativeViewException.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/NoSuchNativeViewException.kt index 998d488c60e..0d128e43976 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/NoSuchNativeViewException.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/NoSuchNativeViewException.kt @@ -18,14 +18,17 @@ import com.facebook.react.common.annotations.internal.LegacyArchitectureLogger @LegacyArchitecture(logLevel = LegacyArchitectureLogLevel.ERROR) @Deprecated( message = "This class is part of Legacy Architecture and will be removed in a future release", - level = DeprecationLevel.WARNING) + level = DeprecationLevel.WARNING, +) internal class NoSuchNativeViewException(detailMessage: String) : IllegalViewOperationException(detailMessage) { private companion object { init { LegacyArchitectureLogger.assertLegacyArchitecture( - "NoSuchNativeViewException", LegacyArchitectureLogLevel.ERROR) + "NoSuchNativeViewException", + LegacyArchitectureLogLevel.ERROR, + ) } } } diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/OnLayoutEvent.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/OnLayoutEvent.kt index 00a77c8d893..2a03904aa3a 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/OnLayoutEvent.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/OnLayoutEvent.kt @@ -24,7 +24,8 @@ import com.facebook.react.uimanager.events.Event @LegacyArchitecture(logLevel = LegacyArchitectureLogLevel.WARNING) @Deprecated( message = "This class is part of Legacy Architecture and will be removed in a future release", - level = DeprecationLevel.WARNING) + level = DeprecationLevel.WARNING, +) public class OnLayoutEvent private constructor() : Event() { @VisibleForTesting internal var x: Int = 0 @VisibleForTesting internal var y: Int = 0 @@ -65,14 +66,17 @@ public class OnLayoutEvent private constructor() : Event() { public companion object { init { LegacyArchitectureLogger.assertLegacyArchitecture( - "OnLayoutEvent", LegacyArchitectureLogLevel.WARNING) + "OnLayoutEvent", + LegacyArchitectureLogLevel.WARNING, + ) } private val EVENTS_POOL: SynchronizedPool = SynchronizedPool(20) @Deprecated( "Use `obtain(surfaceId, viewTag, x, y, width, height)` instead.", - ReplaceWith("obtain(surfaceId, viewTag, x, y, width, height)")) + ReplaceWith("obtain(surfaceId, viewTag, x, y, width, height)"), + ) @JvmStatic public fun obtain(viewTag: Int, x: Int, y: Int, width: Int, height: Int): OnLayoutEvent { return obtain(-1, viewTag, x, y, width, height) @@ -85,7 +89,7 @@ public class OnLayoutEvent private constructor() : Event() { x: Int, y: Int, width: Int, - height: Int + height: Int, ): OnLayoutEvent { var event: OnLayoutEvent? = EVENTS_POOL.acquire() if (event == null) { diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/PixelUtil.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/PixelUtil.kt index f7ad6ca5b35..facc32f99c6 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/PixelUtil.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/PixelUtil.kt @@ -20,7 +20,10 @@ public object PixelUtil { } return TypedValue.applyDimension( - TypedValue.COMPLEX_UNIT_DIP, value, DisplayMetricsHolder.getWindowDisplayMetrics()) + TypedValue.COMPLEX_UNIT_DIP, + value, + DisplayMetricsHolder.getWindowDisplayMetrics(), + ) } /** Convert from DIP to PX */ diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactAccessibilityDelegate.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactAccessibilityDelegate.kt index 037214c1c27..35461509c31 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactAccessibilityDelegate.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactAccessibilityDelegate.kt @@ -46,7 +46,7 @@ import com.facebook.react.uimanager.util.ReactFindViewUtil.findView public open class ReactAccessibilityDelegate( // The View this delegate is attached to protected val hostView: View, originalFocus: Boolean, - originalImportantForAccessibility: Int + originalImportantForAccessibility: Int, ) : ExploreByTouchHelper(hostView) { @Suppress("DEPRECATION") // TODO: Replace with handler tied to host view's context private val accessibilityEventHandler: Handler = @@ -152,7 +152,11 @@ public open class ReactAccessibilityDelegate( // The View this delegate is attac if (max > min && now >= min && max >= now) { info.rangeInfo = RangeInfoCompat.obtain( - RangeInfoCompat.RANGE_TYPE_INT, min.toFloat(), max.toFloat(), now.toFloat()) + RangeInfoCompat.RANGE_TYPE_INT, + min.toFloat(), + max.toFloat(), + now.toFloat(), + ) } } } @@ -225,7 +229,9 @@ public open class ReactAccessibilityDelegate( // The View this delegate is attac } } else { logSoftException( - TAG, ReactNoCrashSoftException("Cannot get RCTEventEmitter, no CatalystInstance")) + TAG, + ReactNoCrashSoftException("Cannot get RCTEventEmitter, no CatalystInstance"), + ) } // In order to make Talkback announce the change of the adjustable's value, @@ -273,7 +279,7 @@ public open class ReactAccessibilityDelegate( // The View this delegate is attac override fun onPerformActionForVirtualView( virtualViewId: Int, action: Int, - arguments: Bundle? + arguments: Bundle?, ): Boolean { return false } @@ -375,7 +381,7 @@ public open class ReactAccessibilityDelegate( // The View this delegate is attac private class AccessibilityActionEvent( private val accessibilityEventData: WritableMap, surfaceId: Int, - viewId: Int + viewId: Int, ) : Event(surfaceId, viewId) { override fun getEventName(): String { return TOP_ACCESSIBILITY_ACTION_EVENT @@ -569,7 +575,7 @@ public open class ReactAccessibilityDelegate( // The View this delegate is attac public fun setDelegate( view: View, originalFocus: Boolean, - originalImportantForAccessibility: Int + originalImportantForAccessibility: Int, ) { // if a view already has an accessibility delegate, replacing it could cause // problems, so leave it alone. @@ -583,7 +589,8 @@ public open class ReactAccessibilityDelegate( // The View this delegate is attac view.getTag(R.id.role) != null)) { ViewCompat.setAccessibilityDelegate( view, - ReactAccessibilityDelegate(view, originalFocus, originalImportantForAccessibility)) + ReactAccessibilityDelegate(view, originalFocus, originalImportantForAccessibility), + ) } } @@ -592,10 +599,12 @@ public open class ReactAccessibilityDelegate( // The View this delegate is attac public fun resetDelegate( view: View, originalFocus: Boolean, - originalImportantForAccessibility: Int + originalImportantForAccessibility: Int, ) { ViewCompat.setAccessibilityDelegate( - view, ReactAccessibilityDelegate(view, originalFocus, originalImportantForAccessibility)) + view, + ReactAccessibilityDelegate(view, originalFocus, originalImportantForAccessibility), + ) } private fun setState( @@ -623,7 +632,7 @@ public open class ReactAccessibilityDelegate( // The View this delegate is attac public fun setRole( nodeInfo: AccessibilityNodeInfoCompat, role: AccessibilityRole?, - context: Context + context: Context, ) { val resolvedRole = role ?: AccessibilityRole.NONE nodeInfo.className = AccessibilityRole.getValue(resolvedRole) @@ -710,7 +719,7 @@ public open class ReactAccessibilityDelegate( // The View this delegate is attac @JvmStatic public fun hasNonActionableSpeakingDescendants( node: AccessibilityNodeInfoCompat?, - view: View? + view: View?, ): Boolean { if (node == null || view == null || (view !is ViewGroup)) { return false @@ -918,7 +927,7 @@ public open class ReactAccessibilityDelegate( // The View this delegate is attac @JvmStatic public fun getTalkbackDescription( view: View, - info: AccessibilityNodeInfoCompat? + info: AccessibilityNodeInfoCompat?, ): CharSequence? { val node = if (info == null) createNodeInfoFromView(view) diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactClippingViewGroupHelper.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactClippingViewGroupHelper.kt index 5c3715eb3a1..e002301fb37 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactClippingViewGroupHelper.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactClippingViewGroupHelper.kt @@ -46,7 +46,8 @@ public object ReactClippingViewGroupHelper { view.left, view.top + view.translationY.toInt(), view.right, - view.bottom + view.translationY.toInt())) { + view.bottom + view.translationY.toInt(), + )) { outputRect.setEmpty() return } diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactStage.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactStage.kt index 883d874eaed..6746f74d7dd 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactStage.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactStage.kt @@ -20,7 +20,8 @@ import androidx.annotation.IntDef ReactStage.SURFACE_DID_INITIAL_RENDERING, ReactStage.SURFACE_DID_INITIAL_LAYOUT, ReactStage.SURFACE_DID_INITIAL_MOUNTING, - ReactStage.SURFACE_DID_STOP]) + ReactStage.SURFACE_DID_STOP, + ]) public annotation class ReactStage { public companion object { public const val SURFACE_DID_INITIALIZE: Int = 0 diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/RootView.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/RootView.kt index bfc719015c3..3712aa9631f 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/RootView.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/RootView.kt @@ -21,7 +21,8 @@ public interface RootView { @Deprecated( message = "Use onChildStartedNativeGesture with a childView parameter.", - replaceWith = ReplaceWith("onChildStartedNativeGesture")) + replaceWith = ReplaceWith("onChildStartedNativeGesture"), + ) public fun onChildStartedNativeGesture(ev: MotionEvent) { onChildStartedNativeGesture(null, ev) } diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/ShadowNodeRegistry.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/ShadowNodeRegistry.kt index 04b813574fa..1d3ba863b91 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/ShadowNodeRegistry.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/ShadowNodeRegistry.kt @@ -24,7 +24,8 @@ import com.facebook.react.common.annotations.internal.LegacyArchitectureLogger @LegacyArchitecture(logLevel = LegacyArchitectureLogLevel.ERROR) @Deprecated( message = "This class is part of Legacy Architecture and will be removed in a future release", - level = DeprecationLevel.WARNING) + level = DeprecationLevel.WARNING, +) internal class ShadowNodeRegistry { private val tagsToCSSNodes = SparseArray>() private val rootTags = SparseBooleanArray() @@ -90,7 +91,9 @@ internal class ShadowNodeRegistry { private companion object { init { LegacyArchitectureLogger.assertLegacyArchitecture( - "ShadowNodeRegistry", LegacyArchitectureLogLevel.ERROR) + "ShadowNodeRegistry", + LegacyArchitectureLogLevel.ERROR, + ) } } diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/Spacing.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/Spacing.kt index 6c8e01bb8d6..9c9f63c4c7a 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/Spacing.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/Spacing.kt @@ -180,7 +180,8 @@ public class Spacing(private val defaultValue: Float, private val spacing: Float 256, /*ALL*/ 512, /*BLOCK*/ 1024, /*BLOCK_END*/ - 2048) + 2048, + ) private fun newFullSpacingArray(): FloatArray { return floatArrayOf( @@ -195,7 +196,8 @@ public class Spacing(private val defaultValue: Float, private val spacing: Float YogaConstants.UNDEFINED, YogaConstants.UNDEFINED, YogaConstants.UNDEFINED, - YogaConstants.UNDEFINED) + YogaConstants.UNDEFINED, + ) } } } diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/ThemedReactContext.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/ThemedReactContext.kt index 7fe8202af1b..038eb13882a 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/ThemedReactContext.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/ThemedReactContext.kt @@ -38,20 +38,20 @@ public class ThemedReactContext( public val reactApplicationContext: ReactApplicationContext, base: Context, public val moduleName: String?, - public val surfaceId: Int + public val surfaceId: Int, ) : ReactContext(base) { @Deprecated("This constructor is deprecated and you should not be using it.") public constructor( reactApplicationContext: ReactApplicationContext, base: Context, - moduleName: String? = null + moduleName: String? = null, ) : this(reactApplicationContext, base, moduleName, -1) @Deprecated("This constructor is deprecated and you should not be using it.") public constructor( reactApplicationContext: ReactApplicationContext, - base: Context + base: Context, ) : this(reactApplicationContext, base, null, -1) init { @@ -93,7 +93,8 @@ public class ThemedReactContext( @Deprecated( "This API has been deprecated due to naming consideration, please use hasActiveReactInstance() instead", - ReplaceWith("hasActiveReactInstance()")) + ReplaceWith("hasActiveReactInstance()"), + ) @LegacyArchitecture override fun hasActiveCatalystInstance(): Boolean = reactApplicationContext.hasActiveCatalystInstance() @@ -103,7 +104,8 @@ public class ThemedReactContext( @Deprecated( "This API has been deprecated due to naming consideration, please use hasReactInstance() instead", - ReplaceWith("hasReactInstance()")) + ReplaceWith("hasReactInstance()"), + ) @LegacyArchitecture override fun hasCatalystInstance(): Boolean = reactApplicationContext.hasCatalystInstance() @@ -140,7 +142,8 @@ public class ThemedReactContext( @Deprecated( "This method is deprecated, please use UIManagerHelper.getUIManager() instead.", - ReplaceWith("UIManagerHelper.getUIManager()")) + ReplaceWith("UIManagerHelper.getUIManager()"), + ) override fun getFabricUIManager(): UIManager? = reactApplicationContext.getFabricUIManager() override fun getSourceURL(): String? = reactApplicationContext.getSourceURL() diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/TouchTargetHelper.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/TouchTargetHelper.kt index 80fdb1fc8e9..edea84f62d5 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/TouchTargetHelper.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/TouchTargetHelper.kt @@ -59,7 +59,7 @@ public object TouchTargetHelper { eventX: Float, eventY: Float, viewGroup: ViewGroup, - nativeViewId: IntArray? + nativeViewId: IntArray?, ): Int = findTargetTagAndCoordinatesForTouch(eventX, eventY, viewGroup, eventCoords, nativeViewId) /** @@ -79,7 +79,7 @@ public object TouchTargetHelper { eventY: Float, viewGroup: ViewGroup, viewCoords: FloatArray, - nativeViewTag: IntArray? + nativeViewTag: IntArray?, ): Int { UiThreadUtil.assertOnUiThread() var targetTag = viewGroup.id @@ -115,7 +115,7 @@ public object TouchTargetHelper { eventX: Float, eventY: Float, viewGroup: ViewGroup, - viewCoords: FloatArray + viewCoords: FloatArray, ): List { UiThreadUtil.assertOnUiThread() @@ -182,7 +182,7 @@ public object TouchTargetHelper { eventCoords: FloatArray, view: View, allowReturnTouchTargetTypes: EnumSet, - pathAccumulator: MutableList? + pathAccumulator: MutableList?, ): View? { // We prefer returning a child, so we check for a child that can handle the touch first if (allowReturnTouchTargetTypes.contains(TouchTargetReturnType.CHILD) && view is ViewGroup) { @@ -286,7 +286,7 @@ public object TouchTargetHelper { y: Float, parent: ViewGroup, child: View, - outLocalPoint: PointF + outLocalPoint: PointF, ) { var localX = x + parent.scrollX - child.left var localY = y + parent.scrollY - child.top @@ -311,7 +311,7 @@ public object TouchTargetHelper { private fun findTouchTargetViewWithPointerEvents( eventCoords: FloatArray, view: View, - pathAccumulator: MutableList? = null + pathAccumulator: MutableList? = null, ): View? { var pointerEvents = if (view is ReactPointerEventsView) { @@ -341,7 +341,11 @@ public object TouchTargetHelper { // This view may be the target, its children don't matter val targetView = findTouchTargetView( - eventCoords, view, EnumSet.of(TouchTargetReturnType.SELF), pathAccumulator) + eventCoords, + view, + EnumSet.of(TouchTargetReturnType.SELF), + pathAccumulator, + ) targetView?.let { pathAccumulator?.add(ViewTarget(view.id, view)) } targetView } @@ -349,7 +353,11 @@ public object TouchTargetHelper { // This view can't be the target, but its children might. val targetView = findTouchTargetView( - eventCoords, view, EnumSet.of(TouchTargetReturnType.CHILD), pathAccumulator) + eventCoords, + view, + EnumSet.of(TouchTargetReturnType.CHILD), + pathAccumulator, + ) if (targetView != null) { pathAccumulator?.add(ViewTarget(view.id, view)) @@ -391,7 +399,8 @@ public object TouchTargetHelper { eventCoords, view, EnumSet.of(TouchTargetReturnType.SELF, TouchTargetReturnType.CHILD), - pathAccumulator) + pathAccumulator, + ) result?.let { pathAccumulator?.add(ViewTarget(view.id, view)) } result } diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/TransformHelper.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/TransformHelper.kt index f72ab667427..ea8ea9c7e3b 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/TransformHelper.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/TransformHelper.kt @@ -42,7 +42,8 @@ public object TransformHelper { @Deprecated( "Use processTransform(ReadableArray, DoubleArray, Float, Float, ReadableArray, Boolean) instead", - ReplaceWith("processTransform(...)")) + ReplaceWith("processTransform(...)"), + ) @JvmStatic public fun processTransform(transforms: ReadableArray, result: DoubleArray) { processTransform(transforms, result, 0f, 0f, null, false) @@ -50,14 +51,15 @@ public object TransformHelper { @Deprecated( "Use processTransform(ReadableArray, DoubleArray, Float, Float, ReadableArray, Boolean) instead", - ReplaceWith("processTransform(...)")) + ReplaceWith("processTransform(...)"), + ) @JvmStatic public fun processTransform( transforms: ReadableArray, result: DoubleArray, viewWidth: Float, viewHeight: Float, - transformOrigin: ReadableArray? + transformOrigin: ReadableArray?, ) { processTransform(transforms, result, viewWidth, viewHeight, transformOrigin, false) } @@ -69,7 +71,7 @@ public object TransformHelper { viewWidth: Float, viewHeight: Float, transformOrigin: ReadableArray?, - allowPercentageResolution: Boolean + allowPercentageResolution: Boolean, ) { if (allowPercentageResolution && ReactNativeFeatureFlags.useNativeTransformHelperAndroid() && @@ -83,7 +85,11 @@ public object TransformHelper { MatrixMathHelper.resetIdentityMatrix(result) val offsets = getTranslateForTransformOrigin( - viewWidth, viewHeight, transformOrigin, allowPercentageResolution) + viewWidth, + viewHeight, + transformOrigin, + allowPercentageResolution, + ) if (offsets != null) { MatrixMathHelper.resetIdentityMatrix(helperMatrix) @@ -118,14 +124,20 @@ public object TransformHelper { MatrixMathHelper.applyPerspective(helperMatrix, transform.getDouble(transformType)) "rotateX" -> MatrixMathHelper.applyRotateX( - helperMatrix, convertToRadians(transform, transformType)) + helperMatrix, + convertToRadians(transform, transformType), + ) "rotateY" -> MatrixMathHelper.applyRotateY( - helperMatrix, convertToRadians(transform, transformType)) + helperMatrix, + convertToRadians(transform, transformType), + ) "rotate", "rotateZ" -> MatrixMathHelper.applyRotateZ( - helperMatrix, convertToRadians(transform, transformType)) + helperMatrix, + convertToRadians(transform, transformType), + ) "scale" -> { val scale = transform.getDouble(transformType) MatrixMathHelper.applyScaleX(helperMatrix, scale) @@ -198,7 +210,7 @@ public object TransformHelper { viewWidth: Float, viewHeight: Float, transformOrigin: ReadableArray?, - allowPercentageResolution: Boolean + allowPercentageResolution: Boolean, ): DoubleArray? { if (transformOrigin == null || (viewHeight == 0f && viewWidth == 0f)) { return null @@ -237,6 +249,6 @@ public object TransformHelper { result: DoubleArray, viewWidth: Float, viewHeight: Float, - transformOrigin: NativeArray? + transformOrigin: NativeArray?, ) } diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/UIConstantsProviderBinding.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/UIConstantsProviderBinding.kt index f0934976d3f..d159a686654 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/UIConstantsProviderBinding.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/UIConstantsProviderBinding.kt @@ -24,7 +24,7 @@ internal object UIConstantsProviderBinding { runtimeExecutor: RuntimeExecutor, defaultEventTypesProvider: DefaultEventTypesProvider, viewManagerConstantsProvider: ConstantsForViewManagerProvider, - constantsProvider: ConstantsProvider + constantsProvider: ConstantsProvider, ) @DoNotStripAny diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/UIManagerHelper.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/UIManagerHelper.kt index 940801651dd..cb1a973e2a6 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/UIManagerHelper.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/UIManagerHelper.kt @@ -49,7 +49,7 @@ public object UIManagerHelper { private fun getUIManager( context: ReactContext, @UIManagerType uiManagerType: Int, - returnNullIfCatalystIsInactive: Boolean + returnNullIfCatalystIsInactive: Boolean, ): UIManager? { if (ReactBuildConfig.UNSTABLE_ENABLE_MINIFY_LEGACY_ARCHITECTURE || context.isBridgeless()) { val uiManager = context.getFabricUIManager() @@ -57,7 +57,8 @@ public object UIManagerHelper { ReactSoftExceptionLogger.logSoftException( TAG, ReactNoCrashSoftException( - "Cannot get UIManager because the instance hasn't been initialized yet.")) + "Cannot get UIManager because the instance hasn't been initialized yet."), + ) return null } return uiManager @@ -70,12 +71,15 @@ public object UIManagerHelper { // // To detect a potential regression we add the following assertion ERROR LegacyArchitectureLogger.assertLegacyArchitecture( - "UIManagerHelper.getUIManager(context, uiManagerType)", LegacyArchitectureLogLevel.ERROR) + "UIManagerHelper.getUIManager(context, uiManagerType)", + LegacyArchitectureLogLevel.ERROR, + ) if (!context.hasCatalystInstance()) { ReactSoftExceptionLogger.logSoftException( TAG, ReactNoCrashSoftException( - "Cannot get UIManager because the context doesn't contain a CatalystInstance.")) + "Cannot get UIManager because the context doesn't contain a CatalystInstance."), + ) return null } // TODO T60461551: add tests to verify emission of events when the ReactContext is being turn @@ -85,7 +89,8 @@ public object UIManagerHelper { TAG, ReactNoCrashSoftException( "Cannot get UIManager because the context doesn't contain an active" + - " CatalystInstance.")) + " CatalystInstance."), + ) if (returnNullIfCatalystIsInactive) { return null } @@ -97,7 +102,9 @@ public object UIManagerHelper { } catch (_: IllegalArgumentException) { // TODO T67518514 Clean this up once we migrate everything over to bridgeless mode ReactSoftExceptionLogger.logSoftException( - TAG, ReactNoCrashSoftException("Cannot get UIManager for UIManagerType: $uiManagerType")) + TAG, + ReactNoCrashSoftException("Cannot get UIManager for UIManagerType: $uiManagerType"), + ) return catalystInstance.getNativeModule(UIManagerModule::class.java) } } @@ -108,7 +115,9 @@ public object UIManagerHelper { val eventDispatcher = getEventDispatcher(context, getUIManagerType(reactTag)) if (eventDispatcher == null) { ReactSoftExceptionLogger.logSoftException( - TAG, IllegalStateException("Cannot get EventDispatcher for reactTag $reactTag")) + TAG, + IllegalStateException("Cannot get EventDispatcher for reactTag $reactTag"), + ) } return eventDispatcher } @@ -120,7 +129,7 @@ public object UIManagerHelper { @JvmStatic public fun getEventDispatcher( context: ReactContext, - @UIManagerType uiManagerType: Int + @UIManagerType uiManagerType: Int, ): EventDispatcher? { // TODO T67518514 Clean this up once we migrate everything over to bridgeless mode var localContext = context @@ -134,7 +143,8 @@ public object UIManagerHelper { if (uiManager == null) { ReactSoftExceptionLogger.logSoftException( TAG, - ReactNoCrashSoftException("Unable to find UIManager for UIManagerType $uiManagerType")) + ReactNoCrashSoftException("Unable to find UIManager for UIManagerType $uiManagerType"), + ) return null } val eventDispatcher = uiManager.eventDispatcher @@ -143,7 +153,9 @@ public object UIManagerHelper { @Suppress("SENSELESS_COMPARISON") if (eventDispatcher == null) { ReactSoftExceptionLogger.logSoftException( - TAG, IllegalStateException("Cannot get EventDispatcher for UIManagerType $uiManagerType")) + TAG, + IllegalStateException("Cannot get EventDispatcher for UIManagerType $uiManagerType"), + ) } return eventDispatcher } @@ -200,7 +212,8 @@ public object UIManagerHelper { ReactSoftExceptionLogger.logSoftException( TAG, IllegalStateException( - "Fabric View [$reactTag] does not have SurfaceId associated with it")) + "Fabric View [$reactTag] does not have SurfaceId associated with it"), + ) } return surfaceId } diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/UIManagerModuleConstants.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/UIManagerModuleConstants.kt index 370c9f7c395..881610c9c81 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/UIManagerModuleConstants.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/UIManagerModuleConstants.kt @@ -39,7 +39,8 @@ internal object UIManagerModuleConstants { TouchEventType.getJSEventName(TouchEventType.CANCEL) to mapOf( "phasedRegistrationNames" to - mapOf("bubbled" to "onTouchCancel", "captured" to "onTouchCancelCapture"))) + mapOf("bubbled" to "onTouchCancel", "captured" to "onTouchCancelCapture")), + ) @JvmField val directEventTypeConstants: Map = run { @@ -59,7 +60,8 @@ internal object UIManagerModuleConstants { "topScrollEndDrag" to mapOf(rn to "onScrollEndDrag"), "topScroll" to mapOf(rn to "onScroll"), "topMomentumScrollBegin" to mapOf(rn to "onMomentumScrollBegin"), - "topMomentumScrollEnd" to mapOf(rn to "onMomentumScrollEnd")) + "topMomentumScrollEnd" to mapOf(rn to "onMomentumScrollEnd"), + ) } @JvmField @@ -71,7 +73,8 @@ internal object UIManagerModuleConstants { mapOf( "ScaleAspectFit" to ImageView.ScaleType.FIT_CENTER.ordinal, "ScaleAspectFill" to ImageView.ScaleType.CENTER_CROP.ordinal, - "ScaleAspectCenter" to ImageView.ScaleType.CENTER_INSIDE.ordinal)), + "ScaleAspectCenter" to ImageView.ScaleType.CENTER_INSIDE.ordinal, + )), "StyleConstants" to mapOf( "PointerEventsValues" to @@ -79,10 +82,13 @@ internal object UIManagerModuleConstants { "none" to PointerEvents.NONE.ordinal, "boxNone" to PointerEvents.BOX_NONE.ordinal, "boxOnly" to PointerEvents.BOX_ONLY.ordinal, - "unspecified" to PointerEvents.AUTO.ordinal)), + "unspecified" to PointerEvents.AUTO.ordinal, + )), "AccessibilityEventTypes" to mapOf( "typeWindowStateChanged" to AccessibilityEvent.TYPE_WINDOW_STATE_CHANGED, "typeViewFocused" to AccessibilityEvent.TYPE_VIEW_FOCUSED, - "typeViewClicked" to AccessibilityEvent.TYPE_VIEW_CLICKED)) + "typeViewClicked" to AccessibilityEvent.TYPE_VIEW_CLICKED, + ), + ) } diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/UIManagerModuleConstantsHelper.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/UIManagerModuleConstantsHelper.kt index 59eb6a51b3f..8ba30c004ca 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/UIManagerModuleConstantsHelper.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/UIManagerModuleConstantsHelper.kt @@ -36,18 +36,20 @@ internal object UIManagerModuleConstantsHelper { UIManagerModuleConstants.constants.plus( mapOf( "ViewManagerNames" to ArrayList(resolver.getViewManagerNames()), - "LazyViewManagersEnabled" to true)) + "LazyViewManagersEnabled" to true, + )) @JvmStatic val defaultExportableEventTypes: Map get() = mapOf( BUBBLING_EVENTS_KEY to UIManagerModuleConstants.bubblingEventTypeConstants, - DIRECT_EVENTS_KEY to UIManagerModuleConstants.directEventTypeConstants) + DIRECT_EVENTS_KEY to UIManagerModuleConstants.directEventTypeConstants, + ) private fun validateDirectEventNames( viewManagerName: String, - directEvents: MutableMap? + directEvents: MutableMap?, ) { if (!ReactBuildConfig.DEBUG || directEvents == null) { return @@ -63,7 +65,8 @@ internal object UIManagerModuleConstantsHelper { FLog.e( TAG, "Direct event name for '$viewManagerName' doesn't correspond to the naming convention," + - " expected 'topEventName'->'onEventName', got '$key'->'$regName'") + " expected 'topEventName'->'onEventName', got '$key'->'$regName'", + ) } } } @@ -85,7 +88,7 @@ internal object UIManagerModuleConstantsHelper { internal fun createConstants( viewManagers: List>, allBubblingEventTypes: MutableMap?, - allDirectEventTypes: MutableMap? + allDirectEventTypes: MutableMap?, ): MutableMap { val constants: MutableMap = UIManagerModuleConstants.constants.toMutableMap() @@ -108,7 +111,12 @@ internal object UIManagerModuleConstantsHelper { val viewManagerConstants: MutableMap<*, *> = createConstantsForViewManager( - viewManager, null, null, allBubblingEventTypes, allDirectEventTypes) + viewManager, + null, + null, + allBubblingEventTypes, + allDirectEventTypes, + ) if (!viewManagerConstants.isEmpty()) { constants[viewManagerName] = viewManagerConstants } @@ -126,7 +134,7 @@ internal object UIManagerModuleConstantsHelper { defaultBubblingEvents: MutableMap?, defaultDirectEvents: MutableMap?, cumulativeBubblingEventTypes: MutableMap?, - cumulativeDirectEventTypes: MutableMap? + cumulativeDirectEventTypes: MutableMap?, ): MutableMap { val viewManagerConstants: MutableMap = mutableMapOf() diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewAtIndex.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewAtIndex.kt index 64955b56fc0..1677d5deac3 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewAtIndex.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewAtIndex.kt @@ -21,10 +21,11 @@ import java.util.Objects @LegacyArchitecture(logLevel = LegacyArchitectureLogLevel.ERROR) @Deprecated( message = "This class is part of Legacy Architecture and will be removed in a future release", - level = DeprecationLevel.WARNING) + level = DeprecationLevel.WARNING, +) internal class ViewAtIndex( @Suppress("NoHungarianNotation") @JvmField public val mTag: Int, - @Suppress("NoHungarianNotation") @JvmField public val mIndex: Int + @Suppress("NoHungarianNotation") @JvmField public val mIndex: Int, ) { override fun equals(other: Any?): Boolean { @@ -45,7 +46,9 @@ internal class ViewAtIndex( init { LegacyArchitectureLogger.assertLegacyArchitecture( - "ViewAtIndex", LegacyArchitectureLogLevel.ERROR) + "ViewAtIndex", + LegacyArchitectureLogLevel.ERROR, + ) } } } diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewGroupDrawingOrderHelper.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewGroupDrawingOrderHelper.kt index f8dd8339ee5..a7d33ea0216 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewGroupDrawingOrderHelper.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewGroupDrawingOrderHelper.kt @@ -65,7 +65,8 @@ public class ViewGroupDrawingOrderHelper(private val viewGroup: ViewGroup) { "getChildDrawingOrder index out of bounds! Please check any custom view manipulations you" + " may have done. childCount = %d, index = %d", childCount, - index) + index, + ) update() } diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewManagerDelegate.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewManagerDelegate.kt index f380867cdb4..20a71d83260 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewManagerDelegate.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewManagerDelegate.kt @@ -37,7 +37,8 @@ public interface ViewManagerDelegate { @Suppress("INAPPLICABLE_JVM_NAME") @Deprecated( message = "propName is not nullable, please update your method signature", - replaceWith = ReplaceWith("setProperty(view, propName, value)")) + replaceWith = ReplaceWith("setProperty(view, propName, value)"), + ) @JvmName("setProperty") public fun javaCompat_setProperty(view: T, propName: String?, value: Any?): Unit = setProperty(view, checkNotNull(propName), value) @@ -61,7 +62,8 @@ public interface ViewManagerDelegate { @Deprecated( message = "args is not nullable, please update your method signature", replaceWith = - ReplaceWith("receiveCommand(view: T, commandName: String, args: ReadableArray)")) + ReplaceWith("receiveCommand(view: T, commandName: String, args: ReadableArray)"), + ) @JvmName("kotlinCompat\$receiveCommandNullableArgs") @JvmSynthetic public fun receiveCommand(view: T, commandName: String, args: ReadableArray?): Unit = @@ -70,7 +72,8 @@ public interface ViewManagerDelegate { @Suppress("INAPPLICABLE_JVM_NAME") @Deprecated( message = "commandName is not nullable, please update your method signature", - replaceWith = ReplaceWith("receiveCommand(view, commandName, args)")) + replaceWith = ReplaceWith("receiveCommand(view, commandName, args)"), + ) @JvmName("receiveCommand") public fun javaCompat_receiveCommand(view: T, commandName: String?, args: ReadableArray?): Unit = receiveCommand(view, checkNotNull(commandName), checkNotNull(args)) diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewManagerPropertyUpdater.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewManagerPropertyUpdater.kt index 757ab2d6da7..6150d12c64d 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewManagerPropertyUpdater.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewManagerPropertyUpdater.kt @@ -46,7 +46,7 @@ public object ViewManagerPropertyUpdater { public fun , V : View> updateProps( delegate: T, view: V, - props: ReactStylesDiffMap + props: ReactStylesDiffMap, ) { val iterator = props.backingMap.entryIterator while (iterator.hasNext()) { @@ -60,7 +60,7 @@ public object ViewManagerPropertyUpdater { public fun updateProps( manager: ViewManager, view: V, - props: ReactStylesDiffMap + props: ReactStylesDiffMap, ) { val setter = findManagerSetter(manager.javaClass) val iterator = props.backingMap.entryIterator @@ -74,7 +74,7 @@ public object ViewManagerPropertyUpdater { @Deprecated("Use ViewManager#updateProperties to update a view's properties") public fun <@Suppress("DEPRECATION") T : ReactShadowNode> updateProps( node: T, - props: ReactStylesDiffMap + props: ReactStylesDiffMap, ) { val setter = findNodeSetter(node.javaClass) val iterator = props.backingMap.entryIterator @@ -87,7 +87,7 @@ public object ViewManagerPropertyUpdater { @JvmStatic public fun getNativeProps( viewManagerTopClass: Class>, - shadowNodeTopClass: Class? + shadowNodeTopClass: Class?, ): Map { val props: MutableMap = HashMap() findManagerSetter(viewManagerTopClass).getProperties(props) diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewProps.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewProps.kt index 9093732609f..925e031fb94 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewProps.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewProps.kt @@ -190,7 +190,8 @@ public object ViewProps { Spacing.TOP, Spacing.BOTTOM, Spacing.LEFT, - Spacing.RIGHT) + Spacing.RIGHT, + ) @JvmField public val PADDING_MARGIN_SPACING_TYPES: IntArray = intArrayOf( @@ -202,7 +203,8 @@ public object ViewProps { Spacing.TOP, Spacing.BOTTOM, Spacing.LEFT, - Spacing.RIGHT) + Spacing.RIGHT, + ) private val LAYOUT_ONLY_PROPS: HashSet = HashSet( listOf( @@ -251,7 +253,8 @@ public object ViewProps { PADDING_TOP, PADDING_BOTTOM, PADDING_START, - PADDING_END)) + PADDING_END, + )) @JvmStatic public fun isLayoutOnly(map: ReadableMap, prop: String): Boolean { diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/YogaNodePool.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/YogaNodePool.kt index 42711b1330f..2ef263e8c30 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/YogaNodePool.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/YogaNodePool.kt @@ -17,11 +17,14 @@ import com.facebook.yoga.YogaNode @LegacyArchitecture(logLevel = LegacyArchitectureLogLevel.ERROR) @Deprecated( message = "This class is part of Legacy Architecture and will be removed in a future release", - level = DeprecationLevel.WARNING) + level = DeprecationLevel.WARNING, +) internal object YogaNodePool { init { LegacyArchitectureLogger.assertLegacyArchitecture( - "YogaNodePool", LegacyArchitectureLogLevel.ERROR) + "YogaNodePool", + LegacyArchitectureLogLevel.ERROR, + ) } private val pool: ClearableSynchronizedPool by diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/annotations/ReactProp.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/annotations/ReactProp.kt index b618267bf29..ecd3c373138 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/annotations/ReactProp.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/annotations/ReactProp.kt @@ -36,7 +36,10 @@ package com.facebook.react.uimanager.annotations */ @Retention(AnnotationRetention.RUNTIME) @Target( - AnnotationTarget.FUNCTION, AnnotationTarget.PROPERTY_GETTER, AnnotationTarget.PROPERTY_SETTER) + AnnotationTarget.FUNCTION, + AnnotationTarget.PROPERTY_GETTER, + AnnotationTarget.PROPERTY_SETTER, +) public annotation class ReactProp( /** * Name of the property exposed to JS that will be updated using setter method annotated with @@ -83,7 +86,7 @@ public annotation class ReactProp( * method annotated with [ReactProp] if property with a given name gets removed from the * component description in JS */ - public val defaultBoolean: Boolean = false + public val defaultBoolean: Boolean = false, ) { public companion object { // Used as a default value for "customType" property as "null" is not allowed. Moreover, when diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/annotations/ReactPropGroup.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/annotations/ReactPropGroup.kt index 52b07c2e991..6057786e49a 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/annotations/ReactPropGroup.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/annotations/ReactPropGroup.kt @@ -31,7 +31,10 @@ package com.facebook.react.uimanager.annotations */ @Retention(AnnotationRetention.RUNTIME) @Target( - AnnotationTarget.FUNCTION, AnnotationTarget.PROPERTY_GETTER, AnnotationTarget.PROPERTY_SETTER) + AnnotationTarget.FUNCTION, + AnnotationTarget.PROPERTY_GETTER, + AnnotationTarget.PROPERTY_SETTER, +) public annotation class ReactPropGroup( /** @@ -72,7 +75,7 @@ public annotation class ReactPropGroup( * method annotated with [ReactProp] if property with a given name gets removed from the * component description in JS */ - public val defaultLong: Long = 0L + public val defaultLong: Long = 0L, ) { public companion object { // Used as a default value for "customType" property as "null" is not allowed. Moreover, when diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/common/ViewUtil.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/common/ViewUtil.kt index 16952d8c7b5..22bcb86a2ad 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/common/ViewUtil.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/common/ViewUtil.kt @@ -73,7 +73,8 @@ public object ViewUtil { @Deprecated( "You should not check the tag of the view to inspect if it's the rootTag. " + "Relying on this logic could make your app/library break in the future.", - ReplaceWith("")) + ReplaceWith(""), + ) @JvmStatic public fun isRootTag(viewTag: Int): Boolean = viewTag % 10 == 1 } diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/drawable/BackgroundDrawable.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/drawable/BackgroundDrawable.kt index 1ca242a391c..3373bd6fe65 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/drawable/BackgroundDrawable.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/drawable/BackgroundDrawable.kt @@ -114,7 +114,8 @@ internal class BackgroundDrawable( backgroundRect, computedBorderRadius?.topLeft?.horizontal?.dpToPx() ?: 0f, computedBorderRadius?.topLeft?.vertical?.dpToPx() ?: 0f, - backgroundPaint) + backgroundPaint, + ) } else if (borderRadius?.hasRoundedBorders() != true) { canvas.drawRect(backgroundRect, backgroundPaint) } else { @@ -130,7 +131,8 @@ internal class BackgroundDrawable( backgroundRect, computedBorderRadius?.topLeft?.horizontal?.dpToPx() ?: 0f, computedBorderRadius?.topLeft?.vertical?.dpToPx() ?: 0f, - backgroundPaint) + backgroundPaint, + ) } else if (borderRadius?.hasRoundedBorders() != true) { canvas.drawRect(backgroundRect, backgroundPaint) } else { @@ -148,7 +150,8 @@ internal class BackgroundDrawable( it?.left?.dpToPx() ?: 0f, it?.top?.dpToPx() ?: 0f, it?.right?.dpToPx() ?: 0f, - it?.bottom?.dpToPx() ?: 0f) + it?.bottom?.dpToPx() ?: 0f, + ) } private fun getBackgroundImageShader(): Shader? { @@ -180,7 +183,11 @@ internal class BackgroundDrawable( computedBorderInsets = computeBorderInsets() computedBorderRadius = borderRadius?.resolve( - layoutDirection, context, bounds.width().pxToDp(), bounds.height().pxToDp()) + layoutDirection, + context, + bounds.width().pxToDp(), + bounds.height().pxToDp(), + ) val hasBorder = (computedBorderInsets?.left != 0f || computedBorderInsets?.top != 0f || @@ -219,7 +226,8 @@ internal class BackgroundDrawable( computedBorderRadius?.bottomLeft?.horizontal?.dpToPx() ?: 0f, computedBorderRadius?.bottomLeft?.vertical?.dpToPx() ?: 0f, ), - Path.Direction.CW) + Path.Direction.CW, + ) } } } diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/drawable/BorderDrawable.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/drawable/BorderDrawable.kt index 5eca728cddc..4491dcd0dfc 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/drawable/BorderDrawable.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/drawable/BorderDrawable.kt @@ -142,7 +142,8 @@ internal class BorderDrawable( (Color.alpha(multiplyColorAlpha(computedBorderColors.left, borderAlpha))), (Color.alpha(multiplyColorAlpha(computedBorderColors.top, borderAlpha))), (Color.alpha(multiplyColorAlpha(computedBorderColors.right, borderAlpha))), - (Color.alpha(multiplyColorAlpha(computedBorderColors.bottom, borderAlpha)))) + (Color.alpha(multiplyColorAlpha(computedBorderColors.bottom, borderAlpha))), + ) // If the highest alpha value of all border edges is 0, then the drawable is TRANSPARENT. if (maxBorderAlpha == 0) { @@ -154,7 +155,8 @@ internal class BorderDrawable( (Color.alpha(multiplyColorAlpha(computedBorderColors.left, borderAlpha))), (Color.alpha(multiplyColorAlpha(computedBorderColors.top, borderAlpha))), (Color.alpha(multiplyColorAlpha(computedBorderColors.right, borderAlpha))), - (Color.alpha(multiplyColorAlpha(computedBorderColors.bottom, borderAlpha)))) + (Color.alpha(multiplyColorAlpha(computedBorderColors.bottom, borderAlpha))), + ) /* * If the lowest alpha value of all border edges is 255, then the drawable is OPAQUE. @@ -250,7 +252,8 @@ internal class BorderDrawable( computedBorderColors.left, computedBorderColors.top, computedBorderColors.right, - computedBorderColors.bottom) + computedBorderColors.bottom, + ) if (fastBorderColor != 0) { if (Color.alpha(fastBorderColor) != 0) { // Border color is not transparent. @@ -393,7 +396,8 @@ internal class BorderDrawable( borderWidth.left * 0.5f), ((computedBorderRadius?.topLeft?.toPixelFromDIP()?.vertical ?: 0f) - borderWidth.top * 0.5f), - borderPaint) + borderPaint, + ) } } else { canvas.drawPath(checkNotNull(centerDrawPath), borderPaint) @@ -483,7 +487,7 @@ internal class BorderDrawable( colorLeft: Int, colorTop: Int, colorRight: Int, - colorBottom: Int + colorBottom: Int, ): Int { // If any of the border colors are translucent then we can't use the fast path. if (Color.alpha(colorLeft) < 255 || @@ -516,7 +520,7 @@ internal class BorderDrawable( x3: Float, y3: Float, x4: Float, - y4: Float + y4: Float, ) { if (fillColor == Color.TRANSPARENT) { return @@ -576,7 +580,9 @@ internal class BorderDrawable( BorderStyle.SOLID -> null BorderStyle.DASHED -> DashPathEffect( - floatArrayOf(borderWidth * 3, borderWidth * 3, borderWidth * 3, borderWidth * 3), 0f) + floatArrayOf(borderWidth * 3, borderWidth * 3, borderWidth * 3, borderWidth * 3), + 0f, + ) BorderStyle.DOTTED -> DashPathEffect(floatArrayOf(borderWidth, borderWidth, borderWidth, borderWidth), 0f) } @@ -591,7 +597,7 @@ internal class BorderDrawable( lineStartY: Double, lineEndX: Double, lineEndY: Double, - result: PointF + result: PointF, ) { var _lineStartX = lineStartX var _lineStartY = lineStartY @@ -742,8 +748,10 @@ internal class BorderDrawable( innerBottomRightRadiusX, innerBottomRightRadiusY, innerBottomLeftRadiusX, - innerBottomLeftRadiusY), - Path.Direction.CW) + innerBottomLeftRadiusY, + ), + Path.Direction.CW, + ) } outerClipTempRectForBorderRadius?.let { @@ -757,8 +765,10 @@ internal class BorderDrawable( bottomRightRadius.horizontal, bottomRightRadius.vertical, bottomLeftRadius.horizontal, - bottomLeftRadius.vertical), - Path.Direction.CW) + bottomLeftRadius.vertical, + ), + Path.Direction.CW, + ) } var extraRadiusForOutline = 0f @@ -777,8 +787,10 @@ internal class BorderDrawable( bottomRightRadius.horizontal + extraRadiusForOutline, bottomRightRadius.vertical + extraRadiusForOutline, bottomLeftRadius.horizontal + extraRadiusForOutline, - bottomLeftRadius.vertical + extraRadiusForOutline), - Path.Direction.CW) + bottomLeftRadius.vertical + extraRadiusForOutline, + ), + Path.Direction.CW, + ) if (computedBorderRadius?.isUniform() != true) { centerDrawPath = centerDrawPath ?: Path() @@ -794,8 +806,10 @@ internal class BorderDrawable( bottomRightRadius.horizontal - borderWidth.right * 0.5f, bottomRightRadius.vertical - borderWidth.bottom * 0.5f, bottomLeftRadius.horizontal - borderWidth.left * 0.5f, - bottomLeftRadius.vertical - borderWidth.bottom * 0.5f), - Path.Direction.CW) + bottomLeftRadius.vertical - borderWidth.bottom * 0.5f, + ), + Path.Direction.CW, + ) } } @@ -991,7 +1005,8 @@ internal class BorderDrawable( outerRect.top.toDouble(), // Line End innerRect.left.toDouble(), innerRect.top.toDouble(), // Result - it) + it, + ) } /** Compute innerBottomLeftCorner */ @@ -1009,7 +1024,8 @@ internal class BorderDrawable( outerRect.bottom.toDouble(), // Line End innerRect.left.toDouble(), innerRect.bottom.toDouble(), // Result - it) + it, + ) } /** Compute innerTopRightCorner */ @@ -1028,7 +1044,8 @@ internal class BorderDrawable( outerRect.top.toDouble(), // Line End innerRect.right.toDouble(), innerRect.top.toDouble(), // Result - it) + it, + ) } /** Compute innerBottomRightCorner */ @@ -1047,7 +1064,8 @@ internal class BorderDrawable( outerRect.bottom.toDouble(), // Line End innerRect.right.toDouble(), innerRect.bottom.toDouble(), // Result - it) + it, + ) } } } diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/drawable/CompositeBackgroundDrawable.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/drawable/CompositeBackgroundDrawable.kt index 2b50d5f528b..0c6ca358587 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/drawable/CompositeBackgroundDrawable.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/drawable/CompositeBackgroundDrawable.kt @@ -73,7 +73,8 @@ internal class CompositeBackgroundDrawable( border, feedbackUnderlay, innerShadows, - outline)) { + outline, + )) { init { // We want to overlay drawables, instead of placing future drawables within the content area of @@ -116,7 +117,7 @@ internal class CompositeBackgroundDrawable( fun withNewShadows( outerShadows: List, - innerShadows: List + innerShadows: List, ): CompositeBackgroundDrawable { return CompositeBackgroundDrawable( context, @@ -189,7 +190,11 @@ internal class CompositeBackgroundDrawable( val computedBorderRadius = borderRadius?.resolve( - layoutDirection, context, bounds.width().toFloat(), bounds.height().toFloat()) + layoutDirection, + context, + bounds.width().toFloat(), + bounds.height().toFloat(), + ) val computedBorderInsets = borderInsets?.resolve(layoutDirection, context) @@ -204,8 +209,10 @@ internal class CompositeBackgroundDrawable( (it.bottomRight.horizontal + (computedBorderInsets?.right ?: 0f)).dpToPx(), (it.bottomRight.vertical + (computedBorderInsets?.bottom ?: 0f)).dpToPx(), (it.bottomLeft.horizontal + (computedBorderInsets?.left ?: 0f)).dpToPx(), - (it.bottomLeft.vertical + (computedBorderInsets?.bottom ?: 0f)).dpToPx()), - Path.Direction.CW) + (it.bottomLeft.vertical + (computedBorderInsets?.bottom ?: 0f)).dpToPx(), + ), + Path.Direction.CW, + ) } if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) { @@ -227,7 +234,7 @@ internal class CompositeBackgroundDrawable( border: BorderDrawable?, feedbackUnderlay: Drawable?, innerShadows: List, - outline: OutlineDrawable? + outline: OutlineDrawable?, ): Array { val layers = mutableListOf() originalBackground?.let { layers.add(it) } diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/drawable/InsetBoxShadowDrawable.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/drawable/InsetBoxShadowDrawable.kt index 38fc219b85a..8d74db906c1 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/drawable/InsetBoxShadowDrawable.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/drawable/InsetBoxShadowDrawable.kt @@ -90,7 +90,8 @@ internal class InsetBoxShadowDrawable( bounds.left + (computedBorderInsets?.left ?: 0f), bounds.top + (computedBorderInsets?.top ?: 0f), bounds.right - (computedBorderInsets?.right ?: 0f), - bounds.bottom - (computedBorderInsets?.bottom ?: 0f)) + bounds.bottom - (computedBorderInsets?.bottom ?: 0f), + ) val paddingBoxRadii = computedBorderRadii?.let { floatArrayOf( @@ -101,7 +102,8 @@ internal class InsetBoxShadowDrawable( innerRadius(it.bottomRight.horizontal, computedBorderInsets?.right), innerRadius(it.bottomRight.vertical, computedBorderInsets?.bottom), innerRadius(it.bottomLeft.horizontal, computedBorderInsets?.left), - innerRadius(it.bottomLeft.vertical, computedBorderInsets?.bottom)) + innerRadius(it.bottomLeft.vertical, computedBorderInsets?.bottom), + ) } val x = offsetX.dpToPx() @@ -151,26 +153,31 @@ internal class InsetBoxShadowDrawable( layoutDirection, context, bounds.width().toFloat().pxToDp(), - bounds.height().toFloat().pxToDp()) + bounds.height().toFloat().pxToDp(), + ) return if (resolvedBorderRadii?.hasRoundedBorders() == true) { ComputedBorderRadius( topLeft = CornerRadii( resolvedBorderRadii.topLeft.horizontal.dpToPx(), - resolvedBorderRadii.topLeft.vertical.dpToPx()), + resolvedBorderRadii.topLeft.vertical.dpToPx(), + ), topRight = CornerRadii( resolvedBorderRadii.topRight.horizontal.dpToPx(), - resolvedBorderRadii.topRight.vertical.dpToPx()), + resolvedBorderRadii.topRight.vertical.dpToPx(), + ), bottomLeft = CornerRadii( resolvedBorderRadii.bottomLeft.horizontal.dpToPx(), - resolvedBorderRadii.bottomLeft.vertical.dpToPx()), + resolvedBorderRadii.bottomLeft.vertical.dpToPx(), + ), bottomRight = CornerRadii( resolvedBorderRadii.bottomRight.horizontal.dpToPx(), - resolvedBorderRadii.bottomRight.vertical.dpToPx()), + resolvedBorderRadii.bottomRight.vertical.dpToPx(), + ), ) } else { null diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/drawable/OutlineDrawable.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/drawable/OutlineDrawable.kt index 48d8befc7c9..3cca64a098a 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/drawable/OutlineDrawable.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/drawable/OutlineDrawable.kt @@ -123,7 +123,11 @@ internal class OutlineDrawable( computedBorderRadius = borderRadius?.resolve( - layoutDirection, context, bounds.width().pxToDp(), bounds.height().pxToDp()) + layoutDirection, + context, + bounds.width().pxToDp(), + bounds.height().pxToDp(), + ) updateOutlineRect() if (computedBorderRadius != null && computedBorderRadius?.hasRoundedBorders() == true) { @@ -148,7 +152,8 @@ internal class OutlineDrawable( OutlineStyle.DASHED -> DashPathEffect( floatArrayOf(outlineWidth * 3, outlineWidth * 3, outlineWidth * 3, outlineWidth * 3), - 0f) + 0f, + ) OutlineStyle.DOTTED -> DashPathEffect(floatArrayOf(outlineWidth, outlineWidth, outlineWidth, outlineWidth), 0f) } @@ -182,7 +187,8 @@ internal class OutlineDrawable( calculateRadius(bottomLeftRadius.horizontal, outlineWidth, outlineOffset), calculateRadius(bottomLeftRadius.vertical, outlineWidth, outlineOffset), ), - Path.Direction.CW) + Path.Direction.CW, + ) canvas.drawPath(pathForOutline, outlinePaint) } diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/drawable/OutsetBoxShadowDrawable.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/drawable/OutsetBoxShadowDrawable.kt index 3678592d70b..6d4fb8e02db 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/drawable/OutsetBoxShadowDrawable.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/drawable/OutsetBoxShadowDrawable.kt @@ -114,7 +114,7 @@ internal class OutsetBoxShadowDrawable( canvas: Canvas, shadowRect: RectF, spreadExtent: Float, - computedBorderRadii: ComputedBorderRadius + computedBorderRadii: ComputedBorderRadius, ) { // We inset the clip slightly, to avoid Skia artifacts with antialiased // clipping. This inset is only visible when no background is present. @@ -132,8 +132,10 @@ internal class OutsetBoxShadowDrawable( computedBorderRadii.bottomRight.horizontal, computedBorderRadii.bottomRight.vertical, computedBorderRadii.bottomLeft.horizontal, - computedBorderRadii.bottomLeft.vertical), - Path.Direction.CW) + computedBorderRadii.bottomLeft.vertical, + ), + Path.Direction.CW, + ) }) canvas.drawPath( @@ -148,10 +150,13 @@ internal class OutsetBoxShadowDrawable( adjustRadiusForSpread(computedBorderRadii.bottomRight.horizontal, spreadExtent), adjustRadiusForSpread(computedBorderRadii.bottomRight.vertical, spreadExtent), adjustRadiusForSpread(computedBorderRadii.bottomLeft.horizontal, spreadExtent), - adjustRadiusForSpread(computedBorderRadii.bottomLeft.vertical, spreadExtent)), - Path.Direction.CW) + adjustRadiusForSpread(computedBorderRadii.bottomLeft.vertical, spreadExtent), + ), + Path.Direction.CW, + ) }, - shadowPaint) + shadowPaint, + ) } private fun drawShadowRect(canvas: Canvas, shadowRect: RectF) { diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/BlackHoleEventDispatcher.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/BlackHoleEventDispatcher.kt index 7ad6473f759..d03e3e11a87 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/BlackHoleEventDispatcher.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/BlackHoleEventDispatcher.kt @@ -17,7 +17,8 @@ internal object BlackHoleEventDispatcher : EventDispatcher { override fun dispatchEvent(event: Event<*>) { FLog.d( "BlackHoleEventDispatcher", - "Trying to emit event to JS, but the React instance isn't ready. Event: ${event.getEventName()}") + "Trying to emit event to JS, but the React instance isn't ready. Event: ${event.getEventName()}", + ) } override fun dispatchAllEvents(): Unit = Unit diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/ContentSizeChangeEvent.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/ContentSizeChangeEvent.kt index 91ec7d2bc6e..c77a81bb569 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/ContentSizeChangeEvent.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/ContentSizeChangeEvent.kt @@ -19,11 +19,12 @@ public class ContentSizeChangeEvent( surfaceId: Int, viewTag: Int, private val width: Int, - private val height: Int + private val height: Int, ) : Event(surfaceId, viewTag) { @Deprecated( "Please specify surfaceId explicitly in the constructor.", - ReplaceWith("constructor(surfaceId, viewTag, width, height)")) + ReplaceWith("constructor(surfaceId, viewTag, width, height)"), + ) public constructor(viewTag: Int, width: Int, height: Int) : this(-1, viewTag, width, height) public override fun getEventName(): String = "topContentSizeChange" diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/Event.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/Event.kt index d90bcdc98af..0b351afa723 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/Event.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/Event.kt @@ -53,7 +53,9 @@ public abstract class Event> { protected constructor() @Deprecated( - "Use constructor with explicit surfaceId instead", ReplaceWith("Event(surfaceId, viewTag)")) + "Use constructor with explicit surfaceId instead", + ReplaceWith("Event(surfaceId, viewTag)"), + ) protected constructor(viewTag: Int) { init(viewTag) } @@ -63,7 +65,9 @@ public abstract class Event> { } @Deprecated( - "Use version with explicit surfaceId instead", ReplaceWith("init(surfaceId, viewTag)")) + "Use version with explicit surfaceId instead", + ReplaceWith("init(surfaceId, viewTag)"), + ) protected fun init(viewTag: Int) { init(-1, viewTag) } @@ -192,7 +196,8 @@ public abstract class Event> { canCoalesce(), getCoalescingKey().toInt(), getEventData(), - getEventCategory()) + getEventCategory(), + ) } else { dispatch(rctEventEmitter) } diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/EventCategoryDef.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/EventCategoryDef.kt index a57785a29b3..0d8bd48979e 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/EventCategoryDef.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/EventCategoryDef.kt @@ -20,7 +20,8 @@ import androidx.annotation.IntDef EventCategoryDef.CONTINUOUS_END, EventCategoryDef.UNSPECIFIED, EventCategoryDef.DISCRETE, - EventCategoryDef.CONTINUOUS]) + EventCategoryDef.CONTINUOUS, + ]) @Retention(AnnotationRetention.SOURCE) internal annotation class EventCategoryDef { companion object { diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/EventDispatcherImpl.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/EventDispatcherImpl.kt index bd033022f77..9d3c007334f 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/EventDispatcherImpl.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/EventDispatcherImpl.kt @@ -221,7 +221,8 @@ internal class EventDispatcherImpl(private val reactContext: ReactApplicationCon Systrace.startAsyncFlow( Systrace.TRACE_TAG_REACT, "ScheduleDispatchFrameCallback", - hasDispatchScheduledCount.get()) + hasDispatchScheduledCount.get(), + ) reactContext.runOnJSQueueThread(dispatchEventsRunnable) } } finally { @@ -266,7 +267,8 @@ internal class EventDispatcherImpl(private val reactContext: ReactApplicationCon Systrace.endAsyncFlow( Systrace.TRACE_TAG_REACT, "ScheduleDispatchFrameCallback", - hasDispatchScheduledCount.getAndIncrement()) + hasDispatchScheduledCount.getAndIncrement(), + ) hasDispatchScheduled = false synchronized(eventsToDispatchLock) { if (eventsToDispatchSize > 0) { diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/EventEmitterImpl.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/EventEmitterImpl.kt index 657646f71ae..268213ab74a 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/EventEmitterImpl.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/EventEmitterImpl.kt @@ -42,7 +42,8 @@ internal class EventEmitterImpl( @Deprecated( "Please use RCTModernEventEmitter instead", - ReplaceWith("RCTModernEventEmitter.receiveEvent(surfaceId, targetTag, eventName, params)")) + ReplaceWith("RCTModernEventEmitter.receiveEvent(surfaceId, targetTag, eventName, params)"), + ) override fun receiveEvent(targetTag: Int, eventName: String, params: WritableMap?) { receiveEvent(-1, targetTag, eventName, params) } @@ -51,7 +52,7 @@ internal class EventEmitterImpl( surfaceId: Int, targetTag: Int, eventName: String, - params: WritableMap? + params: WritableMap?, ) { // We assume this event can't be coalesced. `customCoalesceKey` has no meaning in Fabric. receiveEvent(surfaceId, targetTag, eventName, false, 0, params, EventCategoryDef.UNSPECIFIED) @@ -65,7 +66,7 @@ internal class EventEmitterImpl( override fun receiveTouches( eventName: String, touches: WritableArray, - changedIndices: WritableArray + changedIndices: WritableArray, ) { check(touches.size() > 0) val reactTag = touches.getMap(0)?.getInt(TouchesHelper.TARGET_KEY) ?: 0 @@ -87,7 +88,8 @@ internal class EventEmitterImpl( logSoftException( TAG, ReactNoCrashSoftException( - "Cannot get RCTEventEmitter without active Catalyst instance!")) + "Cannot get RCTEventEmitter without active Catalyst instance!"), + ) } } return legacyEventEmitter @@ -100,7 +102,7 @@ internal class EventEmitterImpl( canCoalesceEvent: Boolean, customCoalesceKey: Int, params: WritableMap?, - @EventCategoryDef category: Int + @EventCategoryDef category: Int, ) { @UIManagerType val uiManagerType = getUIManagerType(targetTag, surfaceId) if (uiManagerType == UIManagerType.FABRIC) { @@ -108,10 +110,18 @@ internal class EventEmitterImpl( if (fabricEventEmitter == null) { logSoftException( TAG, - ReactNoCrashSoftException("No fabricEventEmitter registered, cannot dispatch event")) + ReactNoCrashSoftException("No fabricEventEmitter registered, cannot dispatch event"), + ) } else { fabricEventEmitter.receiveEvent( - surfaceId, targetTag, eventName, canCoalesceEvent, customCoalesceKey, params, category) + surfaceId, + targetTag, + eventName, + canCoalesceEvent, + customCoalesceKey, + params, + category, + ) } } else if (uiManagerType == UIManagerType.LEGACY) { ensureLegacyEventEmitter()?.receiveEvent(targetTag, eventName, params) diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/FabricEventDispatcher.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/FabricEventDispatcher.kt index 885b6187f0d..9bd21a04692 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/FabricEventDispatcher.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/FabricEventDispatcher.kt @@ -33,7 +33,7 @@ private const val TAG = "FabricEventDispatcher" */ internal class FabricEventDispatcher( private val reactContext: ReactApplicationContext, - fabricEventEmitter: RCTModernEventEmitter + fabricEventEmitter: RCTModernEventEmitter, ) : EventDispatcher, LifecycleEventListener { // TODO: Remove EventEmitterImpl indirection when new Fabric is fully rolled out private val eventEmitter = EventEmitterImpl(reactContext) @@ -76,7 +76,8 @@ internal class FabricEventDispatcher( private fun dispatchSynchronous(event: Event<*>) { Systrace.beginSection( Systrace.TRACE_TAG_REACT, - "FabricEventDispatcher.dispatchSynchronous('" + event.getEventName() + "')") + "FabricEventDispatcher.dispatchSynchronous('" + event.getEventName() + "')", + ) try { val fabricUIManager = UIManagerHelper.getUIManager(reactContext, UIManagerType.FABRIC) @OptIn(UnstableReactNativeAPI::class) @@ -88,12 +89,14 @@ internal class FabricEventDispatcher( event.canCoalesce(), event.internal_getEventData(), event.internal_getEventCategory(), - true) + true, + ) } else { ReactSoftExceptionLogger.logSoftException( TAG, IllegalStateException( - "Fabric UIManager expected to implement SynchronousEventReceiver.")) + "Fabric UIManager expected to implement SynchronousEventReceiver."), + ) } } finally { Systrace.endSection(Systrace.TRACE_TAG_REACT) diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/PointerEvent.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/PointerEvent.kt index df97a306d12..ca18044dfa6 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/PointerEvent.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/PointerEvent.kt @@ -36,7 +36,7 @@ internal class PointerEvent private constructor() : Event() { targetTag: Int, eventState: PointerEventState, motionEventToCopy: MotionEvent, - coalescingKey: Short + coalescingKey: Short, ) { super.init(eventState.getSurfaceId(), targetTag, motionEventToCopy.eventTime) this._eventName = eventName @@ -58,7 +58,8 @@ internal class PointerEvent private constructor() : Event() { TAG, IllegalStateException( "Cannot dispatch a Pointer that has no MotionEvent; the PointerEvent has been" + - " recycled")) + " recycled"), + ) return } if (pointersEventData == null) { @@ -195,7 +196,9 @@ internal class PointerEvent private constructor() : Event() { val buttonState = motionEvent.buttonState pointerEvent.putInt( - "button", getButtonChange(pointerType, eventState.lastButtonState, buttonState)) + "button", + getButtonChange(pointerType, eventState.lastButtonState, buttonState), + ) pointerEvent.putInt("buttons", getButtons(_eventName, pointerType, buttonState)) val pressure = @@ -241,7 +244,8 @@ internal class PointerEvent private constructor() : Event() { logSoftException( TAG, IllegalStateException( - "Cannot dispatch a Pointer that has no MotionEvent; the PointerEvent has been recycled")) + "Cannot dispatch a Pointer that has no MotionEvent; the PointerEvent has been recycled"), + ) return } @@ -265,7 +269,8 @@ internal class PointerEvent private constructor() : Event() { coalescingKey != UNSET_COALESCING_KEY, coalescingKey.toInt(), eventData, - getEventCategory(_eventName)) + getEventCategory(_eventName), + ) } } @@ -278,7 +283,7 @@ internal class PointerEvent private constructor() : Event() { val hitPathByPointerId: Map>, val eventCoordinatesByPointerId: Map, val screenCoordinatesByPointerId: Map, - hoveringPointerIds: Set + hoveringPointerIds: Set, ) { val hoveringPointerIds: Set = HashSet(hoveringPointerIds) @@ -301,7 +306,7 @@ internal class PointerEvent private constructor() : Event() { eventName: String, targetTag: Int, eventState: PointerEventState, - motionEventToCopy: MotionEvent? + motionEventToCopy: MotionEvent?, ): PointerEvent { var event = EVENTS_POOL.acquire() if (event == null) { @@ -312,7 +317,8 @@ internal class PointerEvent private constructor() : Event() { targetTag, eventState, Assertions.assertNotNull(motionEventToCopy), - 0.toShort()) + 0.toShort(), + ) return event } @@ -322,7 +328,7 @@ internal class PointerEvent private constructor() : Event() { targetTag: Int, eventState: PointerEventState, motionEventToCopy: MotionEvent?, - coalescingKey: Short + coalescingKey: Short, ): PointerEvent { var event = EVENTS_POOL.acquire() if (event == null) { @@ -333,7 +339,8 @@ internal class PointerEvent private constructor() : Event() { targetTag, eventState, Assertions.assertNotNull(motionEventToCopy), - coalescingKey) + coalescingKey, + ) return event } } diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/RCTEventEmitter.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/RCTEventEmitter.kt index 53f660abf18..d25afbfcd87 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/RCTEventEmitter.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/RCTEventEmitter.kt @@ -41,6 +41,6 @@ public interface RCTEventEmitter : JavaScriptModule { public fun receiveTouches( eventName: String, touches: WritableArray, - changedIndices: WritableArray + changedIndices: WritableArray, ) } diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/RCTModernEventEmitter.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/RCTModernEventEmitter.kt index d7cde690a09..709a113fd96 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/RCTModernEventEmitter.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/RCTModernEventEmitter.kt @@ -29,6 +29,6 @@ public interface RCTModernEventEmitter : RCTEventEmitter { canCoalesceEvent: Boolean, customCoalesceKey: Int, params: WritableMap?, - @EventCategoryDef category: Int + @EventCategoryDef category: Int, ) } diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/SynchronousEventReceiver.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/SynchronousEventReceiver.kt index a981ffcc95c..a5d35ff4668 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/SynchronousEventReceiver.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/SynchronousEventReceiver.kt @@ -19,6 +19,6 @@ internal interface SynchronousEventReceiver { canCoalesceEvent: Boolean, params: WritableMap?, @EventCategoryDef eventCategory: Int, - experimentalIsSynchronous: Boolean + experimentalIsSynchronous: Boolean, ) } diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/TouchEvent.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/TouchEvent.kt index 0e47a5508f6..c0675328ae5 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/TouchEvent.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/TouchEvent.kt @@ -49,11 +49,13 @@ public class TouchEvent private constructor() : Event() { gestureStartTime: Long, viewX: Float, viewY: Float, - touchEventCoalescingKeyHelper: TouchEventCoalescingKeyHelper + touchEventCoalescingKeyHelper: TouchEventCoalescingKeyHelper, ) { super.init(surfaceId, viewTag, motionEventToCopy.eventTime) SoftAssertions.assertCondition( - gestureStartTime != UNSET, "Gesture start time must be initialized") + gestureStartTime != UNSET, + "Gesture start time must be initialized", + ) var coalescingKey: Short = 0 val action = motionEventToCopy.action and MotionEvent.ACTION_MASK when (action) { @@ -150,7 +152,8 @@ public class TouchEvent private constructor() : Event() { TAG, IllegalStateException( "Cannot dispatch a TouchEvent that has no MotionEvent; the TouchEvent has been" + - " recycled")) + " recycled"), + ) return false } return true @@ -164,7 +167,8 @@ public class TouchEvent private constructor() : Event() { @Deprecated( "Please use the other overload of the obtain method, which explicitly provides surfaceId", - ReplaceWith("obtain(surfaceId, ...)")) + ReplaceWith("obtain(surfaceId, ...)"), + ) @JvmStatic public fun obtain( viewTag: Int, @@ -173,7 +177,7 @@ public class TouchEvent private constructor() : Event() { gestureStartTime: Long, viewX: Float, viewY: Float, - touchEventCoalescingKeyHelper: TouchEventCoalescingKeyHelper + touchEventCoalescingKeyHelper: TouchEventCoalescingKeyHelper, ): TouchEvent { return obtain( -1, @@ -183,7 +187,8 @@ public class TouchEvent private constructor() : Event() { gestureStartTime, viewX, viewY, - touchEventCoalescingKeyHelper) + touchEventCoalescingKeyHelper, + ) } @JvmStatic @@ -195,7 +200,7 @@ public class TouchEvent private constructor() : Event() { gestureStartTime: Long, viewX: Float, viewY: Float, - touchEventCoalescingKeyHelper: TouchEventCoalescingKeyHelper + touchEventCoalescingKeyHelper: TouchEventCoalescingKeyHelper, ): TouchEvent { var event = EVENTS_POOL.acquire() if (event == null) { @@ -209,7 +214,8 @@ public class TouchEvent private constructor() : Event() { gestureStartTime, viewX, viewY, - touchEventCoalescingKeyHelper) + touchEventCoalescingKeyHelper, + ) return event } } diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/TouchesHelper.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/TouchesHelper.kt index 0703959e082..55c01f4f694 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/TouchesHelper.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/TouchesHelper.kt @@ -125,7 +125,8 @@ internal object TouchesHelper { fun sendTouchEvent(eventEmitter: RCTModernEventEmitter, event: TouchEvent) { Systrace.beginSection( Systrace.TRACE_TAG_REACT, - "TouchesHelper.sentTouchEventModern(" + event.getEventName() + ")") + "TouchesHelper.sentTouchEventModern(" + event.getEventName() + ")", + ) try { val type = event.getTouchEventType() val motionEvent = event.getMotionEvent() @@ -181,7 +182,8 @@ internal object TouchesHelper { event.canCoalesce(), 0, eventData, - event.getEventCategory()) + event.getEventCategory(), + ) } } finally { Systrace.endSection(Systrace.TRACE_TAG_REACT) diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/internal/LegacyArchitectureShadowNodeLogger.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/internal/LegacyArchitectureShadowNodeLogger.kt index 7bd2b4196ae..d36043e4952 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/internal/LegacyArchitectureShadowNodeLogger.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/internal/LegacyArchitectureShadowNodeLogger.kt @@ -28,7 +28,7 @@ public object LegacyArchitectureShadowNodeLogger { public fun assertUnsupportedViewManager( reactContext: ReactApplicationContext, shadowNodeClass: Class<*>, - viewManagerName: String + viewManagerName: String, ) { val implementsYogaMeasureFunction = YogaMeasureFunction::class.java in shadowNodeClass.interfaces @@ -46,7 +46,9 @@ public object LegacyArchitectureShadowNodeLogger { if (ReactBuildConfig.DEBUG) { RNLog.w(reactContext, message) ReactSoftExceptionLogger.logSoftException( - ReactSoftExceptionLogger.Categories.SOFT_ASSERTIONS, ReactNoCrashSoftException(message)) + ReactSoftExceptionLogger.Categories.SOFT_ASSERTIONS, + ReactNoCrashSoftException(message), + ) } } } diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/layoutanimation/AbstractLayoutAnimation.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/layoutanimation/AbstractLayoutAnimation.kt index bd546ad8947..aad30fc6519 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/layoutanimation/AbstractLayoutAnimation.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/layoutanimation/AbstractLayoutAnimation.kt @@ -31,7 +31,8 @@ import com.facebook.react.uimanager.IllegalViewOperationException @LegacyArchitecture(logLevel = LegacyArchitectureLogLevel.ERROR) @Deprecated( message = "This class is part of Legacy Architecture and will be removed in a future release", - level = DeprecationLevel.WARNING) + level = DeprecationLevel.WARNING, +) internal abstract class AbstractLayoutAnimation { var interpolator: Interpolator? = null var delayMs: Int = 0 @@ -50,7 +51,7 @@ internal abstract class AbstractLayoutAnimation { x: Int, y: Int, width: Int, - height: Int + height: Int, ): Animation? fun reset() { @@ -105,7 +106,9 @@ internal abstract class AbstractLayoutAnimation { companion object { init { LegacyArchitectureLogger.assertLegacyArchitecture( - "AbstractLayoutAnimation", LegacyArchitectureLogLevel.ERROR) + "AbstractLayoutAnimation", + LegacyArchitectureLogLevel.ERROR, + ) } // Forces animation to be playing 10x slower, used for debug purposes. @@ -116,7 +119,8 @@ internal abstract class AbstractLayoutAnimation { InterpolatorType.LINEAR to LinearInterpolator(), InterpolatorType.EASE_IN to AccelerateInterpolator(), InterpolatorType.EASE_OUT to DecelerateInterpolator(), - InterpolatorType.EASE_IN_EASE_OUT to AccelerateDecelerateInterpolator()) + InterpolatorType.EASE_IN_EASE_OUT to AccelerateDecelerateInterpolator(), + ) @VisibleForTesting fun getInterpolator(type: InterpolatorType, params: ReadableMap): Interpolator { diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/layoutanimation/AnimatedPropertyType.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/layoutanimation/AnimatedPropertyType.kt index dfc89311074..ce6fe1309b2 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/layoutanimation/AnimatedPropertyType.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/layoutanimation/AnimatedPropertyType.kt @@ -19,7 +19,8 @@ import com.facebook.react.common.annotations.internal.LegacyArchitectureLogLevel @LegacyArchitecture(logLevel = LegacyArchitectureLogLevel.ERROR) @Deprecated( message = "This class is part of Legacy Architecture and will be removed in a future release", - level = DeprecationLevel.WARNING) + level = DeprecationLevel.WARNING, +) internal enum class AnimatedPropertyType { OPACITY, SCALE_X, diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/layoutanimation/BaseLayoutAnimation.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/layoutanimation/BaseLayoutAnimation.kt index d525d9e906b..cc3e27ab087 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/layoutanimation/BaseLayoutAnimation.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/layoutanimation/BaseLayoutAnimation.kt @@ -21,7 +21,8 @@ import com.facebook.react.uimanager.IllegalViewOperationException @LegacyArchitecture(logLevel = LegacyArchitectureLogLevel.ERROR) @Deprecated( message = "This class is part of Legacy Architecture and will be removed in a future release", - level = DeprecationLevel.WARNING) + level = DeprecationLevel.WARNING, +) internal abstract class BaseLayoutAnimation : AbstractLayoutAnimation() { abstract fun isReverse(): Boolean @@ -47,7 +48,8 @@ internal abstract class BaseLayoutAnimation : AbstractLayoutAnimation() { Animation.RELATIVE_TO_SELF, .5f, Animation.RELATIVE_TO_SELF, - .5f) + .5f, + ) } AnimatedPropertyType.SCALE_X -> { @@ -61,7 +63,8 @@ internal abstract class BaseLayoutAnimation : AbstractLayoutAnimation() { Animation.RELATIVE_TO_SELF, .5f, Animation.RELATIVE_TO_SELF, - 0f) + 0f, + ) } AnimatedPropertyType.SCALE_Y -> { @@ -75,7 +78,8 @@ internal abstract class BaseLayoutAnimation : AbstractLayoutAnimation() { Animation.RELATIVE_TO_SELF, 0f, Animation.RELATIVE_TO_SELF, - .5f) + .5f, + ) } } } ?: throw IllegalViewOperationException("Missing animated property from animation config") @@ -84,7 +88,9 @@ internal abstract class BaseLayoutAnimation : AbstractLayoutAnimation() { private companion object { init { LegacyArchitectureLogger.assertLegacyArchitecture( - "BaseLayoutAnimation", LegacyArchitectureLogLevel.ERROR) + "BaseLayoutAnimation", + LegacyArchitectureLogLevel.ERROR, + ) } } } diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/layoutanimation/InterpolatorType.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/layoutanimation/InterpolatorType.kt index 8ffc0889147..ef4f89ad644 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/layoutanimation/InterpolatorType.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/layoutanimation/InterpolatorType.kt @@ -18,7 +18,8 @@ import com.facebook.react.common.annotations.internal.LegacyArchitectureLogLevel @LegacyArchitecture(logLevel = LegacyArchitectureLogLevel.ERROR) @Deprecated( message = "This class is part of Legacy Architecture and will be removed in a future release", - level = DeprecationLevel.WARNING) + level = DeprecationLevel.WARNING, +) internal enum class InterpolatorType { LINEAR, EASE_IN, diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/layoutanimation/LayoutAnimationController.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/layoutanimation/LayoutAnimationController.kt index 8c7d1fde6a6..7c12af79422 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/layoutanimation/LayoutAnimationController.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/layoutanimation/LayoutAnimationController.kt @@ -33,7 +33,8 @@ import javax.annotation.concurrent.NotThreadSafe @LegacyArchitecture(logLevel = LegacyArchitectureLogLevel.ERROR) @Deprecated( message = "This class is part of Legacy Architecture and will be removed in a future release", - level = DeprecationLevel.WARNING) + level = DeprecationLevel.WARNING, +) public open class LayoutAnimationController { private val layoutCreateAnimation: AbstractLayoutAnimation = LayoutCreateAnimation() private val layoutUpdateAnimation: AbstractLayoutAnimation = LayoutUpdateAnimation() @@ -54,17 +55,23 @@ public open class LayoutAnimationController { val globalDuration = if (config.hasKey("duration")) config.getInt("duration") else 0 if (config.hasKey(toString(LayoutAnimationType.CREATE))) { layoutCreateAnimation.initializeFromConfig( - config.getMap(toString(LayoutAnimationType.CREATE))!!, globalDuration) + config.getMap(toString(LayoutAnimationType.CREATE))!!, + globalDuration, + ) shouldAnimateLayout = true } if (config.hasKey(toString(LayoutAnimationType.UPDATE))) { layoutUpdateAnimation.initializeFromConfig( - config.getMap(toString(LayoutAnimationType.UPDATE))!!, globalDuration) + config.getMap(toString(LayoutAnimationType.UPDATE))!!, + globalDuration, + ) shouldAnimateLayout = true } if (config.hasKey(toString(LayoutAnimationType.DELETE))) { layoutDeleteAnimation.initializeFromConfig( - config.getMap(toString(LayoutAnimationType.DELETE))!!, globalDuration) + config.getMap(toString(LayoutAnimationType.DELETE))!!, + globalDuration, + ) shouldAnimateLayout = true } diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/layoutanimation/LayoutAnimationListener.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/layoutanimation/LayoutAnimationListener.kt index daa1662d1c5..39ff9dab0a2 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/layoutanimation/LayoutAnimationListener.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/layoutanimation/LayoutAnimationListener.kt @@ -16,7 +16,8 @@ import com.facebook.react.common.annotations.internal.LegacyArchitectureLogLevel @LegacyArchitecture(logLevel = LegacyArchitectureLogLevel.ERROR) @Deprecated( message = "This class is part of Legacy Architecture and will be removed in a future release", - level = DeprecationLevel.WARNING) + level = DeprecationLevel.WARNING, +) public fun interface LayoutAnimationListener { public fun onAnimationEnd() } diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/layoutanimation/LayoutAnimationType.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/layoutanimation/LayoutAnimationType.kt index 344e97c8780..f30f4151c5a 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/layoutanimation/LayoutAnimationType.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/layoutanimation/LayoutAnimationType.kt @@ -19,7 +19,8 @@ import com.facebook.react.common.annotations.internal.LegacyArchitectureLogger @LegacyArchitecture(logLevel = LegacyArchitectureLogLevel.ERROR) @Deprecated( message = "This class is part of Legacy Architecture and will be removed in a future release", - level = DeprecationLevel.WARNING) + level = DeprecationLevel.WARNING, +) internal enum class LayoutAnimationType { CREATE, UPDATE, @@ -28,7 +29,9 @@ internal enum class LayoutAnimationType { companion object { init { LegacyArchitectureLogger.assertLegacyArchitecture( - "LayoutAnimationType", LegacyArchitectureLogLevel.ERROR) + "LayoutAnimationType", + LegacyArchitectureLogLevel.ERROR, + ) } @JvmStatic diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/layoutanimation/LayoutCreateAnimation.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/layoutanimation/LayoutCreateAnimation.kt index fe15acd5c22..a3d73fb3b38 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/layoutanimation/LayoutCreateAnimation.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/layoutanimation/LayoutCreateAnimation.kt @@ -25,7 +25,9 @@ internal class LayoutCreateAnimation : BaseLayoutAnimation() { private companion object { init { LegacyArchitectureLogger.assertLegacyArchitecture( - "LayoutCreateAnimation", LegacyArchitectureLogLevel.ERROR) + "LayoutCreateAnimation", + LegacyArchitectureLogLevel.ERROR, + ) } } } diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/layoutanimation/LayoutDeleteAnimation.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/layoutanimation/LayoutDeleteAnimation.kt index 95852b0cf8e..a5b1ad1e0ec 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/layoutanimation/LayoutDeleteAnimation.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/layoutanimation/LayoutDeleteAnimation.kt @@ -20,7 +20,8 @@ import com.facebook.react.common.annotations.internal.LegacyArchitectureLogger @LegacyArchitecture(logLevel = LegacyArchitectureLogLevel.ERROR) @Deprecated( message = "This class is part of Legacy Architecture and will be removed in a future release", - level = DeprecationLevel.WARNING) + level = DeprecationLevel.WARNING, +) internal class LayoutDeleteAnimation : BaseLayoutAnimation() { override fun isReverse(): Boolean = true @@ -28,7 +29,9 @@ internal class LayoutDeleteAnimation : BaseLayoutAnimation() { private companion object { init { LegacyArchitectureLogger.assertLegacyArchitecture( - "LayoutDeleteAnimation", LegacyArchitectureLogLevel.ERROR) + "LayoutDeleteAnimation", + LegacyArchitectureLogLevel.ERROR, + ) } } } diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/layoutanimation/LayoutHandlingAnimation.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/layoutanimation/LayoutHandlingAnimation.kt index fb0e7ad3a1c..b4608114a4e 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/layoutanimation/LayoutHandlingAnimation.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/layoutanimation/LayoutHandlingAnimation.kt @@ -16,7 +16,8 @@ import com.facebook.react.common.annotations.internal.LegacyArchitectureLogLevel @LegacyArchitecture(logLevel = LegacyArchitectureLogLevel.ERROR) @Deprecated( message = "This class is part of Legacy Architecture and will be removed in a future release", - level = DeprecationLevel.WARNING) + level = DeprecationLevel.WARNING, +) internal interface LayoutHandlingAnimation { /** * Notifies the animation of a layout update in case one occurs during the animation. This avoids diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/layoutanimation/LayoutUpdateAnimation.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/layoutanimation/LayoutUpdateAnimation.kt index 5d238015a4d..4444a9c8b6b 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/layoutanimation/LayoutUpdateAnimation.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/layoutanimation/LayoutUpdateAnimation.kt @@ -23,7 +23,8 @@ import com.facebook.react.common.annotations.internal.LegacyArchitectureLogger @LegacyArchitecture(logLevel = LegacyArchitectureLogLevel.ERROR) @Deprecated( message = "This class is part of Legacy Architecture and will be removed in a future release", - level = DeprecationLevel.WARNING) + level = DeprecationLevel.WARNING, +) internal class LayoutUpdateAnimation : AbstractLayoutAnimation() { override fun isValid(): Boolean = durationMs > 0 @@ -33,7 +34,7 @@ internal class LayoutUpdateAnimation : AbstractLayoutAnimation() { x: Int, y: Int, width: Int, - height: Int + height: Int, ): Animation? { val animateLocation = view.x.toInt() != x || view.y.toInt() != y val animateSize = view.width != width || view.height != height @@ -57,7 +58,9 @@ internal class LayoutUpdateAnimation : AbstractLayoutAnimation() { init { LegacyArchitectureLogger.assertLegacyArchitecture( - "LayoutUpdateAnimation", LegacyArchitectureLogLevel.ERROR) + "LayoutUpdateAnimation", + LegacyArchitectureLogLevel.ERROR, + ) } } } diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/layoutanimation/OpacityAnimation.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/layoutanimation/OpacityAnimation.kt index 4b15217b815..c52f9263985 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/layoutanimation/OpacityAnimation.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/layoutanimation/OpacityAnimation.kt @@ -25,7 +25,8 @@ import java.lang.ref.WeakReference @LegacyArchitecture(logLevel = LegacyArchitectureLogLevel.ERROR) @Deprecated( message = "This class is part of Legacy Architecture and will be removed in a future release", - level = DeprecationLevel.WARNING) + level = DeprecationLevel.WARNING, +) internal class OpacityAnimation(view: View, private val startOpacity: Float, endOpacity: Float) : Animation() { private val viewRef = WeakReference(view) @@ -34,7 +35,9 @@ internal class OpacityAnimation(view: View, private val startOpacity: Float, end init { setAnimationListener(OpacityAnimationListener(view)) LegacyArchitectureLogger.assertLegacyArchitecture( - "OpacityAnimation", LegacyArchitectureLogLevel.ERROR) + "OpacityAnimation", + LegacyArchitectureLogLevel.ERROR, + ) } class OpacityAnimationListener(view: View) : Animation.AnimationListener { diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/layoutanimation/PositionAndSizeAnimation.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/layoutanimation/PositionAndSizeAnimation.kt index ee8efb8531e..aa62b0b4137 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/layoutanimation/PositionAndSizeAnimation.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/layoutanimation/PositionAndSizeAnimation.kt @@ -26,7 +26,8 @@ import java.lang.ref.WeakReference @LegacyArchitecture(logLevel = LegacyArchitectureLogLevel.ERROR) @Deprecated( message = "This class is part of Legacy Architecture and will be removed in a future release", - level = DeprecationLevel.WARNING) + level = DeprecationLevel.WARNING, +) internal class PositionAndSizeAnimation(view: View, x: Int, y: Int, width: Int, height: Int) : Animation(), LayoutHandlingAnimation { private val viewRef = WeakReference(view) @@ -53,7 +54,8 @@ internal class PositionAndSizeAnimation(view: View, x: Int, y: Int, width: Int, Math.round(newX), Math.round(newY), Math.round(newX + newWidth), - Math.round(newY + newHeight)) + Math.round(newY + newHeight), + ) } } @@ -88,7 +90,9 @@ internal class PositionAndSizeAnimation(view: View, x: Int, y: Int, width: Int, private companion object { init { LegacyArchitectureLogger.assertLegacyArchitecture( - "PositionAndSizeAnimation", LegacyArchitectureLogLevel.ERROR) + "PositionAndSizeAnimation", + LegacyArchitectureLogLevel.ERROR, + ) } } } diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/layoutanimation/SimpleSpringInterpolator.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/layoutanimation/SimpleSpringInterpolator.kt index 92ca8e73920..fd608ea7bc4 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/layoutanimation/SimpleSpringInterpolator.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/layoutanimation/SimpleSpringInterpolator.kt @@ -23,7 +23,8 @@ import kotlin.math.sin @LegacyArchitecture(logLevel = LegacyArchitectureLogLevel.ERROR) @Deprecated( message = "This class is part of Legacy Architecture and will be removed in a future release", - level = DeprecationLevel.WARNING) + level = DeprecationLevel.WARNING, +) internal class SimpleSpringInterpolator @JvmOverloads constructor(springDamping: Float = FACTOR) : Interpolator { private val _springDamping: Float = springDamping @@ -42,7 +43,9 @@ internal class SimpleSpringInterpolator @JvmOverloads constructor(springDamping: init { LegacyArchitectureLogger.assertLegacyArchitecture( - "SimpleSpringInterpolator", LegacyArchitectureLogLevel.ERROR) + "SimpleSpringInterpolator", + LegacyArchitectureLogLevel.ERROR, + ) } private const val FACTOR = 0.5f diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/style/BorderColors.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/style/BorderColors.kt index cd5e47f968c..70b1004c6e3 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/style/BorderColors.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/style/BorderColors.kt @@ -50,7 +50,8 @@ internal value class BorderColors( ?: edgeColors[LogicalEdge.BLOCK.ordinal] ?: edgeColors[LogicalEdge.VERTICAL.ordinal] ?: edgeColors[LogicalEdge.ALL.ordinal] - ?: Color.BLACK) + ?: Color.BLACK, + ) LayoutDirection.RTL -> if (I18nUtil.instance.doLeftAndRightSwapInRTL(context)) { ColorEdges( @@ -75,7 +76,8 @@ internal value class BorderColors( ?: edgeColors[LogicalEdge.BLOCK.ordinal] ?: edgeColors[LogicalEdge.VERTICAL.ordinal] ?: edgeColors[LogicalEdge.ALL.ordinal] - ?: Color.BLACK) + ?: Color.BLACK, + ) } else { ColorEdges( edgeColors[LogicalEdge.END.ordinal] @@ -99,7 +101,8 @@ internal value class BorderColors( ?: edgeColors[LogicalEdge.BLOCK.ordinal] ?: edgeColors[LogicalEdge.VERTICAL.ordinal] ?: edgeColors[LogicalEdge.ALL.ordinal] - ?: Color.BLACK) + ?: Color.BLACK, + ) } else -> throw IllegalArgumentException("Expected resolved layout direction") } diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/style/BorderInsets.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/style/BorderInsets.kt index 5ccb8969279..1b06c3ca112 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/style/BorderInsets.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/style/BorderInsets.kt @@ -48,7 +48,8 @@ internal class BorderInsets { ?: edgeInsets[LogicalEdge.BLOCK.ordinal] ?: edgeInsets[LogicalEdge.VERTICAL.ordinal] ?: edgeInsets[LogicalEdge.ALL.ordinal] - ?: 0f) + ?: 0f, + ) LayoutDirection.RTL -> if (I18nUtil.instance.doLeftAndRightSwapInRTL(context)) { RectF( @@ -73,7 +74,8 @@ internal class BorderInsets { ?: edgeInsets[LogicalEdge.BLOCK.ordinal] ?: edgeInsets[LogicalEdge.VERTICAL.ordinal] ?: edgeInsets[LogicalEdge.ALL.ordinal] - ?: 0f) + ?: 0f, + ) } else { RectF( edgeInsets[LogicalEdge.END.ordinal] @@ -97,7 +99,8 @@ internal class BorderInsets { ?: edgeInsets[LogicalEdge.BLOCK.ordinal] ?: edgeInsets[LogicalEdge.VERTICAL.ordinal] ?: edgeInsets[LogicalEdge.ALL.ordinal] - ?: 0f) + ?: 0f, + ) } else -> throw IllegalArgumentException("Expected resolved layout direction") } diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/style/BorderRadiusStyle.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/style/BorderRadiusStyle.kt index e7fb361dc88..f7b46e1395c 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/style/BorderRadiusStyle.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/style/BorderRadiusStyle.kt @@ -43,7 +43,7 @@ internal data class BorderRadiusStyle( var startStart: LengthPercentage? = null, var startEnd: LengthPercentage? = null, var endStart: LengthPercentage? = null, - var endEnd: LengthPercentage? = null + var endEnd: LengthPercentage? = null, ) { constructor(properties: List>) : this() { properties.forEach { (k, v) -> set(k, v) } @@ -190,7 +190,7 @@ internal data class BorderRadiusStyle( bottomLeft: CornerRadii, bottomRight: CornerRadii, width: Float, - height: Float + height: Float, ): ComputedBorderRadius { val leftEdgeRadii = topLeft.vertical + bottomLeft.vertical val topEdgeRadii = topLeft.horizontal + topRight.horizontal @@ -206,18 +206,23 @@ internal data class BorderRadiusStyle( topLeft = CornerRadii( topLeft.horizontal * minOf(topEdgeRadiiScale, leftEdgeRadiiScale), - topLeft.vertical * minOf(topEdgeRadiiScale, leftEdgeRadiiScale)), + topLeft.vertical * minOf(topEdgeRadiiScale, leftEdgeRadiiScale), + ), topRight = CornerRadii( topRight.horizontal * minOf(rightEdgeRadiiScale, topEdgeRadiiScale), - topRight.vertical * minOf(rightEdgeRadiiScale, topEdgeRadiiScale)), + topRight.vertical * minOf(rightEdgeRadiiScale, topEdgeRadiiScale), + ), bottomLeft = CornerRadii( bottomLeft.horizontal * minOf(bottomEdgeRadiiScale, leftEdgeRadiiScale), - bottomLeft.vertical * minOf(bottomEdgeRadiiScale, leftEdgeRadiiScale)), + bottomLeft.vertical * minOf(bottomEdgeRadiiScale, leftEdgeRadiiScale), + ), bottomRight = CornerRadii( bottomRight.horizontal * minOf(bottomEdgeRadiiScale, rightEdgeRadiiScale), - bottomRight.vertical * minOf(bottomEdgeRadiiScale, rightEdgeRadiiScale))) + bottomRight.vertical * minOf(bottomEdgeRadiiScale, rightEdgeRadiiScale), + ), + ) } } diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/style/ColorStop.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/style/ColorStop.kt index a16fe248037..811ebda4b6d 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/style/ColorStop.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/style/ColorStop.kt @@ -28,7 +28,7 @@ internal class ProcessedColorStop(var color: Int? = null, val position: Float? = internal object ColorStopUtils { fun getFixedColorStops( colorStops: List, - gradientLineLength: Float + gradientLineLength: Float, ): List { val fixedColorStops = Array(colorStops.size) { ProcessedColorStop() } var hasNullPositions = false @@ -81,7 +81,9 @@ internal object ColorStopUtils { for (j in 1..unpositionedStops) { fixedColorStops[lastDefinedIndex + j] = ProcessedColorStop( - colorStops[lastDefinedIndex + j].color, startPosition + increment * j) + colorStops[lastDefinedIndex + j].color, + startPosition + increment * j, + ) } lastDefinedIndex = i } @@ -190,7 +192,7 @@ internal object ColorStopUtils { private fun resolveColorStopPosition( position: LengthPercentage?, - gradientLineLength: Float + gradientLineLength: Float, ): Float? { if (position == null) { return null diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/style/CornerRadii.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/style/CornerRadii.kt index f24e4e10c98..3135ff32236 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/style/CornerRadii.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/style/CornerRadii.kt @@ -18,7 +18,7 @@ public data class CornerRadii( public constructor( length: LengthPercentage, referenceWidth: Float, - referenceHeight: Float + referenceHeight: Float, ) : this(horizontal = length.resolve(referenceWidth), vertical = length.resolve(referenceHeight)) public fun toPixelFromDIP(): CornerRadii { diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/style/LinearGradient.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/style/LinearGradient.kt index 9d1cb0c1caa..969724d0ee1 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/style/LinearGradient.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/style/LinearGradient.kt @@ -122,7 +122,8 @@ internal class LinearGradient(val direction: Direction, val colorStops: List { @@ -149,7 +150,7 @@ internal class LinearGradient(val direction: Direction, val colorStops: List { var adjustedAngle = angle % 360 if (adjustedAngle < 0) { diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/style/RadialGradient.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/style/RadialGradient.kt index 6d93a1a6e8a..c49b6f25a99 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/style/RadialGradient.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/style/RadialGradient.kt @@ -27,7 +27,7 @@ internal class RadialGradient( val shape: Shape, val size: GradientSize, val position: Position, - val colorStops: List + val colorStops: List, ) : Gradient { companion object { fun parse(gradientMap: ReadableMap, context: Context): Gradient? { @@ -165,7 +165,7 @@ internal class RadialGradient( val top: LengthPercentage? = null, val left: LengthPercentage? = null, val right: LengthPercentage? = null, - val bottom: LengthPercentage? = null + val bottom: LengthPercentage? = null, ) override fun getShader(width: Float, height: Float): Shader { @@ -230,7 +230,7 @@ internal class RadialGradient( centerY: Float, width: Float, height: Float, - sizeKeyword: GradientSize.KeywordType + sizeKeyword: GradientSize.KeywordType, ): Pair { val radiusXFromLeftSide = centerX val radiusYFromTopSide = centerY @@ -263,7 +263,7 @@ internal class RadialGradient( private fun calculateEllipseRadius( offsetX: Float, offsetY: Float, - aspectRatio: Float + aspectRatio: Float, ): Pair { if (aspectRatio == 0f || !aspectRatio.isFinite()) { return Pair(0f, 0f) @@ -283,15 +283,15 @@ internal class RadialGradient( centerY: Float, width: Float, height: Float, - sizeKeyword: GradientSize.KeywordType + sizeKeyword: GradientSize.KeywordType, ): Pair { val corners = arrayOf( Pair(0f, 0f), // top-left Pair(width, 0f), // top-right Pair(width, height), // bottom-right - Pair(0f, height) // bottom-left - ) + Pair(0f, height), // bottom-left + ) var cornerIndex = 0 var distance = @@ -332,14 +332,15 @@ internal class RadialGradient( return calculateEllipseRadius( corners[cornerIndex].first - centerX, corners[cornerIndex].second - centerY, - sideRadius.first / sideRadius.second) + sideRadius.first / sideRadius.second, + ) } private fun calculateRadius( centerX: Float, centerY: Float, width: Float, - height: Float + height: Float, ): Pair { if (size is GradientSize.Keyword) { return when (val keyword = size.keyword) { @@ -369,7 +370,12 @@ internal class RadialGradient( } } else { return radiusToCorner( - centerX, centerY, width, height, GradientSize.KeywordType.FARTHEST_CORNER) + centerX, + centerY, + width, + height, + GradientSize.KeywordType.FARTHEST_CORNER, + ) } } } diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/debuggingoverlay/DebuggingOverlayManager.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/debuggingoverlay/DebuggingOverlayManager.kt index 1375d4fd44d..44b948ebd99 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/debuggingoverlay/DebuggingOverlayManager.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/debuggingoverlay/DebuggingOverlayManager.kt @@ -41,7 +41,8 @@ internal class DebuggingOverlayManager : ReactSoftExceptionLogger.logSoftException( REACT_CLASS, ReactNoCrashSoftException( - "Unexpected payload for highlighting trace updates: rectangle field is null")) + "Unexpected payload for highlighting trace updates: rectangle field is null"), + ) successfullyParsedPayload = false break } @@ -66,7 +67,8 @@ internal class DebuggingOverlayManager : REACT_CLASS, ReactNoCrashSoftException( "Unexpected payload for highlighting trace updates: rectangle field should" + - " have x, y, width, height fields")) + " have x, y, width, height fields"), + ) successfullyParsedPayload = false } else -> throw ex @@ -101,7 +103,8 @@ internal class DebuggingOverlayManager : REACT_CLASS, ReactNoCrashSoftException( "Unexpected payload for highlighting elements: every element should have x," + - " y, width, height fields")) + " y, width, height fields"), + ) successfullyParsedPayload = false } else -> throw ex diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/drawer/ReactDrawerLayout.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/drawer/ReactDrawerLayout.kt index 10235238b41..2c87d640550 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/drawer/ReactDrawerLayout.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/drawer/ReactDrawerLayout.kt @@ -39,7 +39,7 @@ public class ReactDrawerLayout(reactContext: ReactContext) : DrawerLayout(reactC object : AccessibilityDelegateCompat() { override fun onInitializeAccessibilityNodeInfo( host: View, - info: AccessibilityNodeInfoCompat + info: AccessibilityNodeInfoCompat, ) { super.onInitializeAccessibilityNodeInfo(host, info) @@ -56,7 +56,8 @@ public class ReactDrawerLayout(reactContext: ReactContext) : DrawerLayout(reactC event.className = AccessibilityRole.getValue(accessibilityRole) } } - }) + }, + ) } override fun onInterceptTouchEvent(ev: MotionEvent): Boolean { diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/drawer/ReactDrawerLayoutManager.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/drawer/ReactDrawerLayoutManager.kt index 1c8c3e5e7ab..a09a6c17378 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/drawer/ReactDrawerLayoutManager.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/drawer/ReactDrawerLayoutManager.kt @@ -44,7 +44,7 @@ public class ReactDrawerLayoutManager : protected override fun addEventEmitters( reactContext: ThemedReactContext, - view: ReactDrawerLayout + view: ReactDrawerLayout, ) { val eventDispatcher = UIManagerHelper.getEventDispatcherForReactTag(reactContext, view.id) ?: return @@ -91,7 +91,9 @@ public class ReactDrawerLayoutManager : "right" -> view.setDrawerPosition(Gravity.END) else -> { FLog.w( - ReactConstants.TAG, "drawerPosition must be 'left' or 'right', received$drawerPosition") + ReactConstants.TAG, + "drawerPosition must be 'left' or 'right', received$drawerPosition", + ) view.setDrawerPosition(Gravity.START) } } @@ -158,11 +160,12 @@ public class ReactDrawerLayoutManager : @Deprecated( message = "This method is deprecated. Use receiveCommand(ReactDrawerLayout, String, ReadableArray) instead", - replaceWith = ReplaceWith("receiveCommand(ReactDrawerLayout, String, ReadableArray)")) + replaceWith = ReplaceWith("receiveCommand(ReactDrawerLayout, String, ReadableArray)"), + ) public override fun receiveCommand( view: ReactDrawerLayout, commandId: Int, - args: ReadableArray? + args: ReadableArray?, ): Unit { when (commandId) { OPEN_DRAWER -> view.openDrawer() @@ -209,7 +212,7 @@ public class ReactDrawerLayoutManager : internal class DrawerEventEmitter( private val drawerLayout: DrawerLayout, - private val eventDispatcher: EventDispatcher + private val eventDispatcher: EventDispatcher, ) : DrawerListener { override fun onDrawerSlide(view: View, v: Float) { eventDispatcher.dispatchEvent( diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/drawer/events/DrawerSlideEvent.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/drawer/events/DrawerSlideEvent.kt index a40f01edae3..3cecdf839db 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/drawer/events/DrawerSlideEvent.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/drawer/events/DrawerSlideEvent.kt @@ -18,7 +18,9 @@ internal class DrawerSlideEvent : Event { private val offset: Float @Deprecated( - "Use constructor with surfaceId", ReplaceWith("DrawerSlideEvent(surfaceId, viewId, offset)")) + "Use constructor with surfaceId", + ReplaceWith("DrawerSlideEvent(surfaceId, viewId, offset)"), + ) constructor(viewId: Int, offset: Float) : this(ViewUtil.NO_SURFACE_ID, viewId, offset) constructor(surfaceId: Int, viewId: Int, offset: Float) : super(surfaceId, viewId) { diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/drawer/events/DrawerStateChangedEvent.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/drawer/events/DrawerStateChangedEvent.kt index a7e57c18aec..705c1ef17bf 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/drawer/events/DrawerStateChangedEvent.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/drawer/events/DrawerStateChangedEvent.kt @@ -18,7 +18,8 @@ internal class DrawerStateChangedEvent : Event { @Deprecated( "Use constructor with surfaceId", - ReplaceWith("DrawerStateChangedEvent(surfaceId, viewId, drawerState)")) + ReplaceWith("DrawerStateChangedEvent(surfaceId, viewId, drawerState)"), + ) constructor(viewId: Int, drawerState: Int) : this(ViewUtil.NO_SURFACE_ID, viewId, drawerState) constructor(surfaceId: Int, viewId: Int, drawerState: Int) : super(surfaceId, viewId) { diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/image/ImageLoadEvent.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/image/ImageLoadEvent.kt index e2ecde2f9fa..bf4e4381fd4 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/image/ImageLoadEvent.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/image/ImageLoadEvent.kt @@ -23,7 +23,7 @@ private constructor( private val width: Int = 0, private val height: Int = 0, private val loaded: Int = 0, - private val total: Int = 0 + private val total: Int = 0, ) : Event(surfaceId, viewId) { @IntDef(ON_ERROR, ON_LOAD, ON_LOAD_END, ON_LOAD_START, ON_PROGRESS) @Retention(AnnotationRetention.SOURCE) @@ -64,43 +64,48 @@ private constructor( @Deprecated( "Use the createLoadStartEvent version that explicitly takes surfaceId as an argument", - ReplaceWith("createLoadStartEvent(surfaceId, viewId)")) + ReplaceWith("createLoadStartEvent(surfaceId, viewId)"), + ) @JvmStatic public fun createLoadStartEvent(viewId: Int): ImageLoadEvent = createLoadStartEvent(ViewUtil.NO_SURFACE_ID, viewId) @Deprecated( "Use the createProgressEvent version that explicitly takes surfaceId as an argument", - ReplaceWith("createProgressEvent(surfaceId, viewId, imageUri, loaded, total)")) + ReplaceWith("createProgressEvent(surfaceId, viewId, imageUri, loaded, total)"), + ) @JvmStatic public fun createProgressEvent( viewId: Int, imageUri: String?, loaded: Int, - total: Int + total: Int, ): ImageLoadEvent = createProgressEvent(ViewUtil.NO_SURFACE_ID, viewId, imageUri, loaded, total) @Deprecated( "Use the createLoadEvent version that explicitly takes surfaceId as an argument", - ReplaceWith("createLoadEvent(surfaceId, viewId, imageUri, width, height)")) + ReplaceWith("createLoadEvent(surfaceId, viewId, imageUri, width, height)"), + ) @JvmStatic public fun createLoadEvent( viewId: Int, imageUri: String?, width: Int, - height: Int + height: Int, ): ImageLoadEvent = createLoadEvent(ViewUtil.NO_SURFACE_ID, viewId, imageUri, width, height) @Deprecated( "Use the createErrorEvent version that explicitly takes surfaceId as an argument", - ReplaceWith("createErrorEvent(surfaceId, viewId, throwable)")) + ReplaceWith("createErrorEvent(surfaceId, viewId, throwable)"), + ) @JvmStatic public fun createErrorEvent(viewId: Int, throwable: Throwable): ImageLoadEvent = createErrorEvent(ViewUtil.NO_SURFACE_ID, viewId, throwable) @Deprecated( "Use the createLoadEndEvent version that explicitly takes surfaceId as an argument", - ReplaceWith("createLoadEndEvent(surfaceId, viewId)")) + ReplaceWith("createLoadEndEvent(surfaceId, viewId)"), + ) @JvmStatic public fun createLoadEndEvent(viewId: Int): ImageLoadEvent = createLoadEndEvent(ViewUtil.NO_SURFACE_ID, viewId) @@ -120,7 +125,7 @@ private constructor( viewId: Int, imageUri: String?, loaded: Int, - total: Int + total: Int, ): ImageLoadEvent = ImageLoadEvent(surfaceId, viewId, ON_PROGRESS, null, imageUri, 0, 0, loaded, total) @@ -130,7 +135,7 @@ private constructor( viewId: Int, imageUri: String?, width: Int, - height: Int + height: Int, ): ImageLoadEvent = ImageLoadEvent(surfaceId, viewId, ON_LOAD, null, imageUri, width, height, 0, 0) diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/image/MultiPostprocessor.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/image/MultiPostprocessor.kt index 4e80b0a4c77..11f32d708e2 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/image/MultiPostprocessor.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/image/MultiPostprocessor.kt @@ -27,7 +27,7 @@ internal class MultiPostprocessor private constructor(postprocessors: List { var prevBitmap: CloseableReference? = null var nextBitmap: CloseableReference? = null diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/image/ReactImageManager.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/image/ReactImageManager.kt index 63942f03f6e..ebbd7f7b3f1 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/image/ReactImageManager.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/image/ReactImageManager.kt @@ -36,7 +36,7 @@ public class ReactImageManager public constructor( private val draweeControllerBuilder: AbstractDraweeControllerBuilder<*, *, *, *>? = null, private val globalImageLoadListener: GlobalImageLoadListener? = null, - private val callerContextFactory: ReactCallerContextFactory? = null + private val callerContextFactory: ReactCallerContextFactory? = null, ) : SimpleViewManager() { // This is kept for backward compatibility but should eventually be removed together with @@ -53,10 +53,11 @@ public constructor( replaceWith = ReplaceWith( expression = - "ReactImageManager(draweeControllerBuilder, globalImageLoadListener, callerContextFactory)")) + "ReactImageManager(draweeControllerBuilder, globalImageLoadListener, callerContextFactory)"), + ) public constructor( draweeControllerBuilder: AbstractDraweeControllerBuilder<*, *, *, *>?, - callerContext: Any? + callerContext: Any?, ) : this(draweeControllerBuilder, null, null) { this.callerContext = callerContext } @@ -71,11 +72,12 @@ public constructor( replaceWith = ReplaceWith( expression = - "ReactImageManager(draweeControllerBuilder, globalImageLoadListener, callerContextFactory)")) + "ReactImageManager(draweeControllerBuilder, globalImageLoadListener, callerContextFactory)"), + ) public constructor( draweeControllerBuilder: AbstractDraweeControllerBuilder<*, *, *, *>?, globalImageLoadListener: GlobalImageLoadListener?, - callerContext: Any? + callerContext: Any?, ) : this(draweeControllerBuilder, globalImageLoadListener, null) { this.callerContext = callerContext } @@ -88,7 +90,8 @@ public constructor( context, draweeControllerBuilder ?: Fresco.newDraweeControllerBuilder(), globalImageLoadListener, - callerContext) + callerContext, + ) } public override fun getName(): String = REACT_CLASS @@ -120,7 +123,9 @@ public constructor( if (callerContextFactory != null) { view.updateCallerContext( callerContextFactory.getOrCreateCallerContext( - (view.context as ThemedReactContext).moduleName, analyticTag)) + (view.context as ThemedReactContext).moduleName, + analyticTag, + )) } } @@ -161,8 +166,10 @@ public constructor( ViewProps.BORDER_TOP_LEFT_RADIUS, ViewProps.BORDER_TOP_RIGHT_RADIUS, ViewProps.BORDER_BOTTOM_RIGHT_RADIUS, - ViewProps.BORDER_BOTTOM_LEFT_RADIUS], - defaultFloat = Float.NaN) + ViewProps.BORDER_BOTTOM_LEFT_RADIUS, + ], + defaultFloat = Float.NaN, + ) public fun setBorderRadius(view: ReactImageView, index: Int, borderRadius: Float) { val radius = if (borderRadius.isNaN()) null @@ -234,7 +241,8 @@ public constructor( (super.getExportedCustomDirectEventTypeConstants() ?: mutableMapOf()).apply { put( eventNameForType(ImageLoadEvent.ON_LOAD_START), - mapOf(REGISTRATION_NAME to ON_LOAD_START)) + mapOf(REGISTRATION_NAME to ON_LOAD_START), + ) put(eventNameForType(ImageLoadEvent.ON_PROGRESS), mapOf(REGISTRATION_NAME to ON_PROGRESS)) put(eventNameForType(ImageLoadEvent.ON_LOAD), mapOf(REGISTRATION_NAME to ON_LOAD)) put(eventNameForType(ImageLoadEvent.ON_ERROR), mapOf(REGISTRATION_NAME to ON_ERROR)) diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/image/ReactImageView.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/image/ReactImageView.kt index ad634f0b90f..af3f718e3fc 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/image/ReactImageView.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/image/ReactImageView.kt @@ -85,7 +85,7 @@ public class ReactImageView( context: Context, private val draweeControllerBuilder: AbstractDraweeControllerBuilder<*, *, *, *>, private val globalImageLoadListener: GlobalImageLoadListener?, - private var callerContext: Any? + private var callerContext: Any?, ) : GenericDraweeView(context, buildHierarchy(context)) { private val sources: MutableList = mutableListOf() @@ -146,7 +146,8 @@ public class ReactImageView( id, imageSource?.source, loaded, - total)) + total, + )) } override fun onSubmit(id: String, callerContext: Any?) { @@ -160,7 +161,7 @@ public class ReactImageView( override fun onFinalImageSet( id: String, imageInfo: ImageInfo?, - animatable: Animatable? + animatable: Animatable?, ) { if (imageInfo != null && imageSource != null && eventDispatcher != null) { eventDispatcher.dispatchEvent( @@ -169,7 +170,8 @@ public class ReactImageView( getId(), imageSource?.source, imageInfo.width, - imageInfo.height)) + imageInfo.height, + )) eventDispatcher.dispatchEvent( createLoadEndEvent(UIManagerHelper.getSurfaceId(this@ReactImageView), getId())) } @@ -181,7 +183,10 @@ public class ReactImageView( } eventDispatcher.dispatchEvent( createErrorEvent( - UIManagerHelper.getSurfaceId(this@ReactImageView), getId(), throwable)) + UIManagerHelper.getSurfaceId(this@ReactImageView), + getId(), + throwable, + )) } } } @@ -288,7 +293,8 @@ public class ReactImageView( source.getString("uri"), source.getDouble("width"), source.getDouble("height"), - cacheControl) + cacheControl, + ) if (Uri.EMPTY == imageSource.uri) { warnImageSource(source.getString("uri")) imageSource = getTransparentBitmapImageSource(context) @@ -472,7 +478,11 @@ public class ReactImageView( draweeControllerBuilder as AbstractDraweeControllerBuilder< - *, ImageRequest, CloseableReference, ImageInfo> + *, + ImageRequest, + CloseableReference, + ImageInfo, + > // This builder is reused builder.reset() @@ -590,7 +600,7 @@ public class ReactImageView( private inner class TilePostprocessor : BasePostprocessor() { override fun process( source: Bitmap, - bitmapFactory: PlatformBitmapFactory + bitmapFactory: PlatformBitmapFactory, ): CloseableReference { val destRect = Rect(0, 0, width, height) scaleType.getTransform(tileMatrix, destRect, source.width, source.height, 0.0f, 0.0f) diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/image/ScaleTypeStartInside.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/image/ScaleTypeStartInside.kt index d6656140f70..237ce005b2a 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/image/ScaleTypeStartInside.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/image/ScaleTypeStartInside.kt @@ -22,7 +22,7 @@ internal class ScaleTypeStartInside : AbstractScaleType() { focusX: Float, focusY: Float, scaleX: Float, - scaleY: Float + scaleY: Float, ) { val scale = min(scaleX, scaleY).coerceAtMost(1.0f) val dx = parentRect.left.toFloat() diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/imagehelper/MultiSourceHelper.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/imagehelper/MultiSourceHelper.kt index 566c0fc35d3..31a144ddb74 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/imagehelper/MultiSourceHelper.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/imagehelper/MultiSourceHelper.kt @@ -31,7 +31,7 @@ internal object MultiSourceHelper { width: Int, height: Int, sources: List, - multiplier: Double + multiplier: Double, ): MultiSourceResult { // no sources if (sources.isEmpty()) { @@ -63,7 +63,8 @@ internal object MultiSourceHelper { if (precision < bestCachePrecision && source.cacheControl != ImageCacheControl.RELOAD && (imagePipeline.isInBitmapMemoryCache(source.uri) || - // TODO: T206445115 isInDiskCacheSync is a blocking operation, we should move this to + // TODO: T206445115 isInDiskCacheSync is a blocking operation, we should move this + // to // a separate thread imagePipeline.isInDiskCacheSync(source.uri))) { bestCachePrecision = precision @@ -86,6 +87,6 @@ internal object MultiSourceHelper { * Get the best result (closest in size to the view's size) that is also in cache. If this * would be the same as the source from [getBestResult], this will return `null` instead. */ - @JvmField val bestResultInCache: ImageSource? + @JvmField val bestResultInCache: ImageSource?, ) } diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/modal/ReactModalHostManager.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/modal/ReactModalHostManager.kt index 4ff5c42eae3..ecdae30ae19 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/modal/ReactModalHostManager.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/modal/ReactModalHostManager.kt @@ -120,7 +120,7 @@ internal class ReactModalHostManager : override fun updateState( view: ReactModalHostView, props: ReactStylesDiffMap, - stateWrapper: StateWrapper + stateWrapper: StateWrapper, ): Any? { view.stateWrapper = stateWrapper return null diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/modal/ReactModalHostView.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/modal/ReactModalHostView.kt index ddc116a6595..48efe1652cf 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/modal/ReactModalHostView.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/modal/ReactModalHostView.kt @@ -275,7 +275,8 @@ public class ReactModalHostView(context: ThemedReactContext) : val window = requireNotNull(newDialog.window) window.setFlags( WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE, - WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE) + WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE, + ) newDialog.setContentView(contentView) updateProperties() @@ -331,7 +332,9 @@ public class ReactModalHostView(context: ThemedReactContext) : val flagSecureSet = isFlagSecureSet(currentActivity) if (flagSecureSet) { window.setFlags( - WindowManager.LayoutParams.FLAG_SECURE, WindowManager.LayoutParams.FLAG_SECURE) + WindowManager.LayoutParams.FLAG_SECURE, + WindowManager.LayoutParams.FLAG_SECURE, + ) } if (currentActivity?.isFinishing == false) { newDialog.show() @@ -395,7 +398,9 @@ public class ReactModalHostView(context: ThemedReactContext) : } else { dialogWindow.setDimAmount(0.5f) dialogWindow.setFlags( - WindowManager.LayoutParams.FLAG_DIM_BEHIND, WindowManager.LayoutParams.FLAG_DIM_BEHIND) + WindowManager.LayoutParams.FLAG_DIM_BEHIND, + WindowManager.LayoutParams.FLAG_DIM_BEHIND, + ) } } catch (e: IllegalArgumentException) { // This is to prevent a crash from the following error, without a clear repro steps: diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/modal/RequestCloseEvent.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/modal/RequestCloseEvent.kt index a3fb17f478c..f6daa596635 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/modal/RequestCloseEvent.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/modal/RequestCloseEvent.kt @@ -18,7 +18,8 @@ internal class RequestCloseEvent(surfaceId: Int, viewTag: Int) : @Deprecated( "Do not use this constructor, use the one with explicit surfaceId", - ReplaceWith("RequestCloseEvent(surfaceId, viewTag)")) + ReplaceWith("RequestCloseEvent(surfaceId, viewTag)"), + ) constructor(viewTag: Int) : this(ViewUtil.NO_SURFACE_ID, viewTag) override fun getEventName(): String = EVENT_NAME diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/modal/ShowEvent.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/modal/ShowEvent.kt index e9ccc2c2fba..fb06cc94237 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/modal/ShowEvent.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/modal/ShowEvent.kt @@ -17,7 +17,8 @@ internal class ShowEvent(surfaceId: Int, viewTag: Int) : Event(surfac @Deprecated( "Do not use this constructor, use the one with explicit surfaceId", - ReplaceWith("ShowEvent(surfaceId, viewTag)")) + ReplaceWith("ShowEvent(surfaceId, viewTag)"), + ) constructor(viewTag: Int) : this(ViewUtil.NO_SURFACE_ID, viewTag) override fun getEventName(): String = EVENT_NAME diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/progressbar/ProgressBarContainerView.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/progressbar/ProgressBarContainerView.kt index ef9d89f1eae..ed07fe1960f 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/progressbar/ProgressBarContainerView.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/progressbar/ProgressBarContainerView.kt @@ -55,7 +55,10 @@ internal class ProgressBarContainerView(context: Context) : FrameLayout(context) addView( progressBar, ViewGroup.LayoutParams( - ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT)) + ViewGroup.LayoutParams.MATCH_PARENT, + ViewGroup.LayoutParams.MATCH_PARENT, + ), + ) } private fun setColor(progressBar: ProgressBar) { diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/progressbar/ProgressBarShadowNode.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/progressbar/ProgressBarShadowNode.kt index 62eed73c6cf..fc8c0e2e214 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/progressbar/ProgressBarShadowNode.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/progressbar/ProgressBarShadowNode.kt @@ -29,7 +29,8 @@ import com.facebook.yoga.YogaNode @LegacyArchitectureShadowNodeWithCxxImpl @Deprecated( message = "This class is part of Legacy Architecture and will be removed in a future release", - level = DeprecationLevel.WARNING) + level = DeprecationLevel.WARNING, +) internal class ProgressBarShadowNode : com.facebook.react.uimanager.LayoutShadowNode(), YogaMeasureFunction { private val height: SparseIntArray = SparseIntArray() @@ -51,14 +52,16 @@ internal class ProgressBarShadowNode : width: Float, widthMode: YogaMeasureMode, height: Float, - heightMode: YogaMeasureMode + heightMode: YogaMeasureMode, ): Long { val style = ReactProgressBarViewManager.getStyleFromString(style) if (!measured.contains(style)) { val progressBar = ReactProgressBarViewManager.createProgressBar(themedContext, style) val spec = View.MeasureSpec.makeMeasureSpec( - ViewGroup.LayoutParams.WRAP_CONTENT, View.MeasureSpec.UNSPECIFIED) + ViewGroup.LayoutParams.WRAP_CONTENT, + View.MeasureSpec.UNSPECIFIED, + ) progressBar.measure(spec, spec) this.height.put(style, progressBar.measuredHeight) this.width.put(style, progressBar.measuredWidth) @@ -70,7 +73,9 @@ internal class ProgressBarShadowNode : companion object { init { LegacyArchitectureLogger.assertLegacyArchitecture( - "ProgressBarShadowNode", LegacyArchitectureLogLevel.ERROR) + "ProgressBarShadowNode", + LegacyArchitectureLogLevel.ERROR, + ) } } } diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/progressbar/ReactProgressBarViewManager.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/progressbar/ReactProgressBarViewManager.kt index a0fa7efe828..9cf048d1040 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/progressbar/ReactProgressBarViewManager.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/progressbar/ReactProgressBarViewManager.kt @@ -105,7 +105,7 @@ internal class ReactProgressBarViewManager : widthMode: YogaMeasureMode, height: Float, heightMode: YogaMeasureMode, - attachmentsPositions: FloatArray? + attachmentsPositions: FloatArray?, ): Long { val style = getStyleFromString(props.getString(PROP_STYLE)) val value = @@ -117,7 +117,9 @@ internal class ReactProgressBarViewManager : } return YogaMeasureOutput.make( - toDIPFromPixel(value.first.toFloat()), toDIPFromPixel(value.second.toFloat())) + toDIPFromPixel(value.first.toFloat()), + toDIPFromPixel(value.second.toFloat()), + ) } companion object { diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/safeareaview/ReactSafeAreaViewManager.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/safeareaview/ReactSafeAreaViewManager.kt index fa0d4f2e663..4e0c7154b88 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/safeareaview/ReactSafeAreaViewManager.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/safeareaview/ReactSafeAreaViewManager.kt @@ -41,7 +41,7 @@ internal class ReactSafeAreaViewManager : override fun updateState( view: ReactSafeAreaView, props: ReactStylesDiffMap, - stateWrapper: StateWrapper + stateWrapper: StateWrapper, ): Any? { view.stateWrapper = stateWrapper return null diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/scroll/MaintainVisibleScrollPositionHelper.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/scroll/MaintainVisibleScrollPositionHelper.kt index 6813434418c..0b445644af6 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/scroll/MaintainVisibleScrollPositionHelper.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/scroll/MaintainVisibleScrollPositionHelper.kt @@ -31,7 +31,7 @@ import java.lang.ref.WeakReference @OptIn(UnstableReactNativeAPI::class) internal class MaintainVisibleScrollPositionHelper( private val scrollView: ScrollViewT, - private val horizontal: Boolean + private val horizontal: Boolean, ) : UIManagerListener where ScrollViewT : HasSmoothScroll?, ScrollViewT : ViewGroup? { var config: Config? = null @@ -47,7 +47,8 @@ internal class MaintainVisibleScrollPositionHelper( checkNotNull( UIManagerHelper.getUIManager( checkNotNull(scrollView?.context as ReactContext?), - getUIManagerType(scrollView?.id ?: 0))) + getUIManagerType(scrollView?.id ?: 0), + )) class Config internal constructor(val minIndexForVisible: Int, val autoScrollToTopThreshold: Int?) { diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactHorizontalScrollContainerViewManager.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactHorizontalScrollContainerViewManager.kt index d19c2110d42..bdb980ed831 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactHorizontalScrollContainerViewManager.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactHorizontalScrollContainerViewManager.kt @@ -25,7 +25,7 @@ public class ReactHorizontalScrollContainerViewManager : ReactViewManager() { reactTag: Int, context: ThemedReactContext, initialProps: ReactStylesDiffMap?, - stateWrapper: StateWrapper? + stateWrapper: StateWrapper?, ): ReactViewGroup { check(uiManagerType == null) uiManagerType = ViewUtil.getUIManagerType(reactTag) diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactHorizontalScrollViewManager.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactHorizontalScrollViewManager.kt index 40a439d0a3d..b40442cacd8 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactHorizontalScrollViewManager.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactHorizontalScrollViewManager.kt @@ -64,7 +64,7 @@ constructor(private val fpsListener: FpsListener? = null) : override fun updateState( view: ReactHorizontalScrollView, props: ReactStylesDiffMap, - stateWrapper: StateWrapper + stateWrapper: StateWrapper, ): Any? { view.setStateWrapper(stateWrapper) return null @@ -88,7 +88,7 @@ constructor(private val fpsListener: FpsListener? = null) : @ReactProp(name = "disableIntervalMomentum") public fun setDisableIntervalMomentum( view: ReactHorizontalScrollView, - disableIntervalMomentum: Boolean + disableIntervalMomentum: Boolean, ) { view.setDisableIntervalMomentum(disableIntervalMomentum) } @@ -133,7 +133,7 @@ constructor(private val fpsListener: FpsListener? = null) : @ReactProp(name = ReactClippingViewGroupHelper.PROP_REMOVE_CLIPPED_SUBVIEWS) public fun setRemoveClippedSubviews( view: ReactHorizontalScrollView, - removeClippedSubviews: Boolean + removeClippedSubviews: Boolean, ) { view.removeClippedSubviews = removeClippedSubviews } @@ -183,11 +183,12 @@ constructor(private val fpsListener: FpsListener? = null) : @Deprecated( "Use receiveCommand with String commandId instead", - ReplaceWith("receiveCommand(scrollView, commandId, args)")) + ReplaceWith("receiveCommand(scrollView, commandId, args)"), + ) override fun receiveCommand( scrollView: ReactHorizontalScrollView, commandId: Int, - args: ReadableArray? + args: ReadableArray?, ) { receiveCommand(this, scrollView, commandId, args) } @@ -195,7 +196,7 @@ constructor(private val fpsListener: FpsListener? = null) : override fun receiveCommand( scrollView: ReactHorizontalScrollView, commandId: String, - args: ReadableArray? + args: ReadableArray?, ) { receiveCommand(this, scrollView, commandId, args) } @@ -249,8 +250,10 @@ constructor(private val fpsListener: FpsListener? = null) : ViewProps.BORDER_TOP_LEFT_RADIUS, ViewProps.BORDER_TOP_RIGHT_RADIUS, ViewProps.BORDER_BOTTOM_RIGHT_RADIUS, - ViewProps.BORDER_BOTTOM_LEFT_RADIUS], - defaultFloat = Float.NaN) + ViewProps.BORDER_BOTTOM_LEFT_RADIUS, + ], + defaultFloat = Float.NaN, + ) public fun setBorderRadius(view: ReactHorizontalScrollView?, index: Int, borderRadius: Float) { if (view != null) { val radius = @@ -275,8 +278,10 @@ constructor(private val fpsListener: FpsListener? = null) : ViewProps.BORDER_LEFT_WIDTH, ViewProps.BORDER_RIGHT_WIDTH, ViewProps.BORDER_TOP_WIDTH, - ViewProps.BORDER_BOTTOM_WIDTH], - defaultFloat = Float.NaN) + ViewProps.BORDER_BOTTOM_WIDTH, + ], + defaultFloat = Float.NaN, + ) public fun setBorderWidth(view: ReactHorizontalScrollView?, index: Int, width: Float) { if (view != null) { setBorderWidth(view, LogicalEdge.entries[index], width) @@ -290,12 +295,14 @@ constructor(private val fpsListener: FpsListener? = null) : "borderLeftColor", "borderRightColor", "borderTopColor", - "borderBottomColor"], - customType = "Color") + "borderBottomColor", + ], + customType = "Color", + ) public fun setBorderColor( view: ReactHorizontalScrollView, @Suppress("UNUSED_PARAMETER") index: Int, - color: Int? + color: Int?, ) { setBorderColor(view, LogicalEdge.ALL, color) } @@ -359,7 +366,7 @@ constructor(private val fpsListener: FpsListener? = null) : @ReactProp(name = "maintainVisibleContentPosition") public fun setMaintainVisibleContentPosition( view: ReactHorizontalScrollView, - value: ReadableMap? + value: ReadableMap?, ) { if (value != null) { view.setMaintainVisibleContentPosition(fromReadableMap(value)) @@ -381,7 +388,7 @@ constructor(private val fpsListener: FpsListener? = null) : @ReactProp(name = "horizontal") public fun setHorizontal( @Suppress("UNUSED_PARAMETER") view: ReactHorizontalScrollView?, - @Suppress("UNUSED_PARAMETER") horizontal: Boolean + @Suppress("UNUSED_PARAMETER") horizontal: Boolean, ) { // Do Nothing: Align with static ViewConfigs } diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactScrollViewAccessibilityDelegate.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactScrollViewAccessibilityDelegate.kt index 1dc032aa1f7..eb65ba3a8f5 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactScrollViewAccessibilityDelegate.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactScrollViewAccessibilityDelegate.kt @@ -31,7 +31,8 @@ internal class ReactScrollViewAccessibilityDelegate : AccessibilityDelegateCompa ReactSoftExceptionLogger.logSoftException( TAG, AssertionException( - "ReactScrollViewAccessibilityDelegate should only be used with ReactAccessibleScrollView, not with class: ${host.javaClass.simpleName}")) + "ReactScrollViewAccessibilityDelegate should only be used with ReactAccessibleScrollView, not with class: ${host.javaClass.simpleName}"), + ) } } @@ -43,7 +44,8 @@ internal class ReactScrollViewAccessibilityDelegate : AccessibilityDelegateCompa ReactSoftExceptionLogger.logSoftException( TAG, AssertionException( - "ReactScrollViewAccessibilityDelegate should only be used with ReactAccessibleScrollView, not with class: ${host.javaClass.simpleName}")) + "ReactScrollViewAccessibilityDelegate should only be used with ReactAccessibleScrollView, not with class: ${host.javaClass.simpleName}"), + ) } } @@ -104,7 +106,7 @@ internal class ReactScrollViewAccessibilityDelegate : AccessibilityDelegateCompa private fun onInitializeAccessibilityNodeInfoInternal( view: View, - info: AccessibilityNodeInfoCompat + info: AccessibilityNodeInfoCompat, ) { val accessibilityRole = AccessibilityRole.fromViewTag(view) @@ -121,7 +123,10 @@ internal class ReactScrollViewAccessibilityDelegate : AccessibilityDelegateCompa val collectionInfoCompat = AccessibilityNodeInfoCompat.CollectionInfoCompat.obtain( - rowCount, columnCount, hierarchical) + rowCount, + columnCount, + hierarchical, + ) info.setCollectionInfo(collectionInfoCompat) } diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactScrollViewCommandHelper.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactScrollViewCommandHelper.kt index 313b74beba2..f9b1d52c35a 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactScrollViewCommandHelper.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactScrollViewCommandHelper.kt @@ -22,14 +22,15 @@ public class ReactScrollViewCommandHelper { hashMapOf( "scrollTo" to COMMAND_SCROLL_TO, "scrollToEnd" to COMMAND_SCROLL_TO_END, - "flashScrollIndicators" to COMMAND_FLASH_SCROLL_INDICATORS) + "flashScrollIndicators" to COMMAND_FLASH_SCROLL_INDICATORS, + ) @JvmStatic public fun receiveCommand( viewManager: ScrollCommandHandler, scrollView: T, commandType: Int, - args: ReadableArray? + args: ReadableArray?, ) { checkNotNull(viewManager) checkNotNull(scrollView) @@ -48,7 +49,7 @@ public class ReactScrollViewCommandHelper { viewManager: ScrollCommandHandler, scrollView: T, commandType: String, - args: ReadableArray? + args: ReadableArray?, ) { checkNotNull(viewManager) checkNotNull(scrollView) @@ -65,7 +66,7 @@ public class ReactScrollViewCommandHelper { private fun scrollTo( viewManager: ScrollCommandHandler, scrollView: T, - args: ReadableArray + args: ReadableArray, ) { val destX = Math.round(PixelUtil.toPixelFromDIP(args.getDouble(0))) val destY = Math.round(PixelUtil.toPixelFromDIP(args.getDouble(1))) @@ -76,7 +77,7 @@ public class ReactScrollViewCommandHelper { private fun scrollToEnd( viewManager: ScrollCommandHandler, scrollView: T, - args: ReadableArray + args: ReadableArray, ) { val animated = args.getBoolean(0) viewManager.scrollToEnd(scrollView, ScrollToEndCommandData(animated)) @@ -94,7 +95,7 @@ public class ReactScrollViewCommandHelper { public class ScrollToCommandData( @JvmField public val mDestX: Int, @JvmField public val mDestY: Int, - @JvmField public val mAnimated: Boolean + @JvmField public val mAnimated: Boolean, ) public class ScrollToEndCommandData(@JvmField public val mAnimated: Boolean) diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactScrollViewHelper.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactScrollViewHelper.kt index 14f6e0e477a..53daa64348d 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactScrollViewHelper.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactScrollViewHelper.kt @@ -91,7 +91,11 @@ public object ReactScrollViewHelper { T : HasScrollEventThrottle?, T : ViewGroup { emitScrollEvent( - scrollView, ScrollEventType.MOMENTUM_BEGIN, xVelocity.toFloat(), yVelocity.toFloat()) + scrollView, + ScrollEventType.MOMENTUM_BEGIN, + xVelocity.toFloat(), + yVelocity.toFloat(), + ) } @JvmStatic @@ -147,7 +151,8 @@ public object ReactScrollViewHelper { contentView.width, contentView.height, scrollView.width, - scrollView.height)) + scrollView.height, + )) if (scrollEventType == ScrollEventType.SCROLL) { scrollView.lastScrollDispatchTime = now } @@ -297,7 +302,7 @@ public object ReactScrollViewHelper { scrollView: T, currentValue: Int, postAnimationValue: Int, - velocity: Int + velocity: Int, ): Int where T : HasFlingAnimator?, T : HasScrollState?, T : ViewGroup { val scrollState = scrollView.reactScrollViewScrollState val velocityDirectionMask = if (velocity != 0) velocity / abs(velocity) else 0 @@ -334,7 +339,12 @@ public object ReactScrollViewHelper { T : ViewGroup { if (DEBUG_MODE) { FLog.i( - TAG, "updateFabricScrollState[%d] scrollX %d scrollY %d", scrollView.id, scrollX, scrollY) + TAG, + "updateFabricScrollState[%d] scrollX %d scrollY %d", + scrollView.id, + scrollX, + scrollY, + ) } if (ViewUtil.getUIManagerType(scrollView.id) == UIManagerType.LEGACY) { return @@ -365,7 +375,12 @@ public object ReactScrollViewHelper { val scrollY = scrollPos.y if (DEBUG_MODE) { FLog.i( - TAG, "updateFabricScrollState[%d] scrollX %d scrollY %d", scrollView.id, scrollX, scrollY) + TAG, + "updateFabricScrollState[%d] scrollX %d scrollY %d", + scrollView.id, + scrollX, + scrollY, + ) } val stateWrapper = scrollView.stateWrapper if (stateWrapper != null) { @@ -373,7 +388,9 @@ public object ReactScrollViewHelper { newStateData.putDouble(CONTENT_OFFSET_LEFT, toDIPFromPixel(scrollX.toFloat()).toDouble()) newStateData.putDouble(CONTENT_OFFSET_TOP, toDIPFromPixel(scrollY.toFloat()).toDouble()) newStateData.putDouble( - SCROLL_AWAY_PADDING_TOP, toDIPFromPixel(scrollAwayPaddingTop.toFloat()).toDouble()) + SCROLL_AWAY_PADDING_TOP, + toDIPFromPixel(scrollAwayPaddingTop.toFloat()).toDouble(), + ) stateWrapper.updateState(newStateData) } } @@ -458,7 +475,7 @@ public object ReactScrollViewHelper { velocityX: Int, velocityY: Int, maximumOffsetX: Int, - maximumOffsetY: Int + maximumOffsetY: Int, ): Point where T : HasFlingAnimator?, T : HasScrollState?, T : ViewGroup { val scrollState = scrollView.reactScrollViewScrollState // ScrollView can *only* scroll for 250ms when using smoothScrollTo and there's @@ -473,9 +490,17 @@ public object ReactScrollViewHelper { val finalAnimatedPositionScroll = scrollState.finalAnimatedPositionScroll scroller.fling( getNextFlingStartValue( - scrollView, scrollView.scrollX, finalAnimatedPositionScroll.x, velocityX), // startX + scrollView, + scrollView.scrollX, + finalAnimatedPositionScroll.x, + velocityX, + ), // startX getNextFlingStartValue( - scrollView, scrollView.scrollY, finalAnimatedPositionScroll.y, velocityY), // startY + scrollView, + scrollView.scrollY, + finalAnimatedPositionScroll.y, + velocityY, + ), // startY velocityX, // velocityX velocityY, // velocityY 0, // minX @@ -483,8 +508,8 @@ public object ReactScrollViewHelper { 0, // minY maximumOffsetY, // maxY width / 2, // overX - height / 2 // overY - ) + height / 2, // overY + ) return Point(scroller.finalX, scroller.finalY) } @@ -522,7 +547,7 @@ public object ReactScrollViewHelper { public fun resolveAbsoluteDirection( @FocusRealDirection direction: Int, horizontal: Boolean, - layoutDirection: Int + layoutDirection: Int, ): Int { val rtl: Boolean = layoutDirection == View.LAYOUT_DIRECTION_RTL @@ -542,7 +567,7 @@ public object ReactScrollViewHelper { scrollView: ViewGroup?, scrollEventType: ScrollEventType?, xVelocity: Float, - yVelocity: Float + yVelocity: Float, ) public fun onLayout(scrollView: ViewGroup?) @@ -591,7 +616,7 @@ public object ReactScrollViewHelper { /** Set the final scroll position after scrolling animation is finished */ public fun setFinalAnimatedPositionScroll( finalAnimatedPositionScrollX: Int, - finalAnimatedPositionScrollY: Int + finalAnimatedPositionScrollY: Int, ): ReactScrollViewScrollState { finalAnimatedPositionScroll.set(finalAnimatedPositionScrollX, finalAnimatedPositionScrollY) return this @@ -600,7 +625,7 @@ public object ReactScrollViewHelper { /** Set the Fabric state of last scroll position */ public fun setLastStateUpdateScroll( lastStateUpdateScrollX: Int, - lastStateUpdateScrollY: Int + lastStateUpdateScrollY: Int, ): ReactScrollViewScrollState { lastStateUpdateScroll.set(lastStateUpdateScrollX, lastStateUpdateScrollY) return this diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactScrollViewManager.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactScrollViewManager.kt index c2ed02b8aeb..9d087fc1069 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactScrollViewManager.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactScrollViewManager.kt @@ -187,7 +187,8 @@ constructor(private val fpsListener: FpsListener? = null) : @Deprecated( message = "ReceiveCommand with an int commandId param is deprecated. Use the overload where commandId is a string.", - ReplaceWith("receiveCommand(scrollView, commandId, args)")) + ReplaceWith("receiveCommand(scrollView, commandId, args)"), + ) override fun receiveCommand(scrollView: ReactScrollView, commandId: Int, args: ReadableArray?) { receiveCommand(this, scrollView, commandId, args) } @@ -195,7 +196,7 @@ constructor(private val fpsListener: FpsListener? = null) : override fun receiveCommand( scrollView: ReactScrollView, commandId: String, - args: ReadableArray? + args: ReadableArray?, ) { receiveCommand(this, scrollView, commandId, args) } @@ -220,8 +221,10 @@ constructor(private val fpsListener: FpsListener? = null) : ViewProps.BORDER_TOP_LEFT_RADIUS, ViewProps.BORDER_TOP_RIGHT_RADIUS, ViewProps.BORDER_BOTTOM_RIGHT_RADIUS, - ViewProps.BORDER_BOTTOM_LEFT_RADIUS], - defaultFloat = Float.NaN) + ViewProps.BORDER_BOTTOM_LEFT_RADIUS, + ], + defaultFloat = Float.NaN, + ) public fun setBorderRadius(view: ReactScrollView?, index: Int, borderRadius: Float) { if (view != null) { val radius = @@ -246,8 +249,10 @@ constructor(private val fpsListener: FpsListener? = null) : ViewProps.BORDER_LEFT_WIDTH, ViewProps.BORDER_RIGHT_WIDTH, ViewProps.BORDER_TOP_WIDTH, - ViewProps.BORDER_BOTTOM_WIDTH], - defaultFloat = Float.NaN) + ViewProps.BORDER_BOTTOM_WIDTH, + ], + defaultFloat = Float.NaN, + ) public fun setBorderWidth(view: ReactScrollView?, index: Int, width: Float) { if (view != null) { setBorderWidth(view, LogicalEdge.entries[index], width) @@ -261,8 +266,10 @@ constructor(private val fpsListener: FpsListener? = null) : "borderLeftColor", "borderRightColor", "borderTopColor", - "borderBottomColor"], - customType = "Color") + "borderBottomColor", + ], + customType = "Color", + ) @Suppress("UNUSED_PARAMETER") public fun setBorderColor(view: ReactScrollView?, index: Int, color: Int?) { if (view != null) { @@ -352,7 +359,7 @@ constructor(private val fpsListener: FpsListener? = null) : override fun updateState( view: ReactScrollView, props: ReactStylesDiffMap, - stateWrapper: StateWrapper + stateWrapper: StateWrapper, ): Any? { view.setStateWrapper(stateWrapper) return null @@ -412,6 +419,7 @@ constructor(private val fpsListener: FpsListener? = null) : getJSEventName(ScrollEventType.MOMENTUM_BEGIN) to mapOf("registrationName" to "onMomentumScrollBegin"), getJSEventName(ScrollEventType.MOMENTUM_END) to - mapOf("registrationName" to "onMomentumScrollEnd")) + mapOf("registrationName" to "onMomentumScrollEnd"), + ) } } diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ScrollEvent.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ScrollEvent.kt index d3099575d10..2e612c9ae1a 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ScrollEvent.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ScrollEvent.kt @@ -144,13 +144,15 @@ public class ScrollEvent private constructor() : Event() { contentWidth, contentHeight, scrollViewWidth, - scrollViewHeight) + scrollViewHeight, + ) } @Deprecated( "Use the obtain version that explicitly takes surfaceId as an argument", ReplaceWith( - "obtain(surfaceId, viewTag, scrollEventType, scrollX, scrollY, xVelocity, yVelocity, contentWidth, contentHeight, scrollViewWidth, scrollViewHeight)")) + "obtain(surfaceId, viewTag, scrollEventType, scrollX, scrollY, xVelocity, yVelocity, contentWidth, contentHeight, scrollViewWidth, scrollViewHeight)"), + ) @JvmStatic public fun obtain( viewTag: Int, @@ -162,7 +164,7 @@ public class ScrollEvent private constructor() : Event() { contentWidth: Int, contentHeight: Int, scrollViewWidth: Int, - scrollViewHeight: Int + scrollViewHeight: Int, ): ScrollEvent = obtain( ViewUtil.NO_SURFACE_ID, diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/scroll/VirtualViewContainer.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/scroll/VirtualViewContainer.kt index 259542ccaa3..6dae518ee94 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/scroll/VirtualViewContainer.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/scroll/VirtualViewContainer.kt @@ -107,7 +107,8 @@ internal class VirtualViewContainerState { prerenderRect.set(visibleRect) prerenderRect.inset( (-prerenderRect.width() * prerenderRatio).toInt(), - (-prerenderRect.height() * prerenderRatio).toInt()) + (-prerenderRect.height() * prerenderRatio).toInt(), + ) val virtualViewsIt = if (virtualView != null) listOf(virtualView) else virtualViews virtualViewsIt.forEach { vv -> @@ -138,7 +139,8 @@ internal class VirtualViewContainerState { debugLog( "updateModes", - { "virtualView=${vv.virtualViewID} mode=$mode rect=$rect thresholdRect=$thresholdRect" }) + { "virtualView=${vv.virtualViewID} mode=$mode rect=$rect thresholdRect=$thresholdRect" }, + ) vv.onModeChange(mode, thresholdRect) } } diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/swiperefresh/SwipeRefreshLayoutManager.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/swiperefresh/SwipeRefreshLayoutManager.kt index 9ed4eb3b18c..e0638e03829 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/swiperefresh/SwipeRefreshLayoutManager.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/swiperefresh/SwipeRefreshLayoutManager.kt @@ -121,7 +121,9 @@ internal open class SwipeRefreshLayoutManager : mutableMapOf( "SIZE" to mutableMapOf( - "DEFAULT" to SwipeRefreshLayout.DEFAULT, "LARGE" to SwipeRefreshLayout.LARGE)) + "DEFAULT" to SwipeRefreshLayout.DEFAULT, + "LARGE" to SwipeRefreshLayout.LARGE, + )) override fun getExportedCustomDirectEventTypeConstants(): MutableMap { val baseEventTypeConstants = super.getExportedCustomDirectEventTypeConstants() diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/switchview/ReactSwitchEvent.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/switchview/ReactSwitchEvent.kt index 111b79b84bc..b203ab4d4ce 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/switchview/ReactSwitchEvent.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/switchview/ReactSwitchEvent.kt @@ -18,7 +18,8 @@ internal class ReactSwitchEvent(surfaceId: Int, viewId: Int, private val isCheck @Deprecated( "Use the constructor with surfaceId, viewId and isChecked parameters.", - replaceWith = ReplaceWith("ReactSwitchEvent(surfaceId, viewId, isChecked)")) + replaceWith = ReplaceWith("ReactSwitchEvent(surfaceId, viewId, isChecked)"), + ) constructor(viewId: Int, isChecked: Boolean) : this(ViewUtil.NO_SURFACE_ID, viewId, isChecked) override fun getEventName(): String = EVENT_NAME diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/switchview/ReactSwitchManager.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/switchview/ReactSwitchManager.kt index 8165ec4b0ea..2337f11ceb9 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/switchview/ReactSwitchManager.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/switchview/ReactSwitchManager.kt @@ -114,14 +114,15 @@ internal class ReactSwitchManager : widthMode: YogaMeasureMode, height: Float, heightMode: YogaMeasureMode, - attachmentsPositions: FloatArray? + attachmentsPositions: FloatArray?, ): Long { val view = ReactSwitch(context).apply { showText = false } val measureSpec = View.MeasureSpec.makeMeasureSpec(0, View.MeasureSpec.UNSPECIFIED) view.measure(measureSpec, measureSpec) return YogaMeasureOutput.make( PixelUtil.toDIPFromPixel(view.measuredWidth.toFloat()), - PixelUtil.toDIPFromPixel(view.measuredHeight.toFloat())) + PixelUtil.toDIPFromPixel(view.measuredHeight.toFloat()), + ) } private fun setValueInternal(view: ReactSwitch, value: Boolean) { diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/switchview/ReactSwitchShadowNode.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/switchview/ReactSwitchShadowNode.kt index edfafb620ba..c63f86b252a 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/switchview/ReactSwitchShadowNode.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/switchview/ReactSwitchShadowNode.kt @@ -21,7 +21,8 @@ import com.facebook.yoga.YogaNode @LegacyArchitecture(logLevel = LegacyArchitectureLogLevel.ERROR) @Deprecated( message = "This class is part of Legacy Architecture and will be removed in a future release", - level = DeprecationLevel.WARNING) + level = DeprecationLevel.WARNING, +) @LegacyArchitectureShadowNodeWithCxxImpl internal class ReactSwitchShadowNode : com.facebook.react.uimanager.LayoutShadowNode(), YogaMeasureFunction { @@ -42,7 +43,7 @@ internal class ReactSwitchShadowNode : width: Float, widthMode: YogaMeasureMode, height: Float, - heightMode: YogaMeasureMode + heightMode: YogaMeasureMode, ): Long { if (!measured) { // Create a switch with the default config and measure it; since we don't (currently) @@ -63,7 +64,9 @@ internal class ReactSwitchShadowNode : companion object { init { LegacyArchitectureLogger.assertLegacyArchitecture( - "ReactSwitchShadowNode", LegacyArchitectureLogLevel.ERROR) + "ReactSwitchShadowNode", + LegacyArchitectureLogLevel.ERROR, + ) } } } diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/FontMetricsUtil.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/FontMetricsUtil.kt index 4cd34cb32fa..d4e353dffe8 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/FontMetricsUtil.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/FontMetricsUtil.kt @@ -34,12 +34,20 @@ internal object FontMetricsUtil { val capHeightBounds = Rect() paintCopy.getTextBounds( - CAP_HEIGHT_MEASUREMENT_TEXT, 0, CAP_HEIGHT_MEASUREMENT_TEXT.length, capHeightBounds) + CAP_HEIGHT_MEASUREMENT_TEXT, + 0, + CAP_HEIGHT_MEASUREMENT_TEXT.length, + capHeightBounds, + ) val capHeight = capHeightBounds.height() / AMPLIFICATION_FACTOR / dm.density val xHeightBounds = Rect() paintCopy.getTextBounds( - X_HEIGHT_MEASUREMENT_TEXT, 0, X_HEIGHT_MEASUREMENT_TEXT.length, xHeightBounds) + X_HEIGHT_MEASUREMENT_TEXT, + 0, + X_HEIGHT_MEASUREMENT_TEXT.length, + xHeightBounds, + ) val xHeight = xHeightBounds.height() / AMPLIFICATION_FACTOR / dm.density for (i in 0 until layout.lineCount) { diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/PreparedLayoutTextView.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/PreparedLayoutTextView.kt index 2a4c70a594e..93e93451a4d 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/PreparedLayoutTextView.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/PreparedLayoutTextView.kt @@ -50,7 +50,10 @@ internal class PreparedLayoutTextView(context: Context) : ViewGroup(context), Re if (lastSelection != null) { if (value != null && field?.layout?.text.toString() == value.layout.text.toString()) { value.layout.getSelectionPath( - lastSelection.start, lastSelection.end, lastSelection.path) + lastSelection.start, + lastSelection.end, + lastSelection.path, + ) } else { clearSelection() } @@ -105,7 +108,9 @@ internal class PreparedLayoutTextView(context: Context) : ViewGroup(context), Re super.onDraw(canvas) canvas.translate( - paddingLeft.toFloat(), paddingTop.toFloat() + (preparedLayout?.verticalOffset ?: 0f)) + paddingLeft.toFloat(), + paddingTop.toFloat() + (preparedLayout?.verticalOffset ?: 0f), + ) val layout = preparedLayout?.layout if (layout != null) { @@ -282,7 +287,7 @@ internal class PreparedLayoutTextView(context: Context) : ViewGroup(context), Re public override fun onFocusChanged( gainFocus: Boolean, direction: Int, - previouslyFocusedRect: Rect? + previouslyFocusedRect: Rect?, ) { if (clickableSpans.isNotEmpty() && !gainFocus) { clearSelection() diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/PreparedLayoutTextViewManager.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/PreparedLayoutTextViewManager.kt index 644c52b4e0e..ede2a678a1f 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/PreparedLayoutTextViewManager.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/PreparedLayoutTextViewManager.kt @@ -50,7 +50,7 @@ internal class PreparedLayoutTextViewManager : override fun prepareToRecycleView( reactContext: ThemedReactContext, - view: PreparedLayoutTextView + view: PreparedLayoutTextView, ): PreparedLayoutTextView? { val preparedView = super.prepareToRecycleView(reactContext, view) preparedView?.recycleView() @@ -61,7 +61,10 @@ internal class PreparedLayoutTextViewManager : override fun updateViewAccessibility(view: PreparedLayoutTextView) { ReactTextViewAccessibilityDelegate.setDelegate( - view, view.isFocusable, view.importantForAccessibility) + view, + view.isFocusable, + view.importantForAccessibility, + ) } public override fun createViewInstance(context: ThemedReactContext): PreparedLayoutTextView = @@ -79,9 +82,13 @@ internal class PreparedLayoutTextViewManager : val accessibilityLinks = AccessibilityLinks(spannedText) view.setTag( R.id.accessibility_links, - if (accessibilityLinks.size() > 0) accessibilityLinks else null) + if (accessibilityLinks.size() > 0) accessibilityLinks else null, + ) ReactTextViewAccessibilityDelegate.resetDelegate( - view, view.isFocusable, view.importantForAccessibility) + view, + view.isFocusable, + view.importantForAccessibility, + ) } } } @@ -89,7 +96,7 @@ internal class PreparedLayoutTextViewManager : override fun updateState( view: PreparedLayoutTextView, props: ReactStylesDiffMap, - stateWrapper: StateWrapper + stateWrapper: StateWrapper, ): Any? = (stateWrapper as? ReferenceStateWrapper)?.stateDataReference override fun getExportedCustomDirectEventTypeConstants(): MutableMap { @@ -131,8 +138,10 @@ internal class PreparedLayoutTextViewManager : ViewProps.BORDER_TOP_LEFT_RADIUS, ViewProps.BORDER_TOP_RIGHT_RADIUS, ViewProps.BORDER_BOTTOM_RIGHT_RADIUS, - ViewProps.BORDER_BOTTOM_LEFT_RADIUS], - defaultFloat = Float.NaN) + ViewProps.BORDER_BOTTOM_LEFT_RADIUS, + ], + defaultFloat = Float.NaN, + ) fun setBorderRadius(view: PreparedLayoutTextView, index: Int, borderRadius: Float): Unit { val radius = if (borderRadius.isNaN()) null @@ -155,8 +164,10 @@ internal class PreparedLayoutTextViewManager : ViewProps.BORDER_TOP_WIDTH, ViewProps.BORDER_BOTTOM_WIDTH, ViewProps.BORDER_START_WIDTH, - ViewProps.BORDER_END_WIDTH], - defaultFloat = Float.NaN) + ViewProps.BORDER_END_WIDTH, + ], + defaultFloat = Float.NaN, + ) fun setBorderWidth(view: PreparedLayoutTextView, index: Int, width: Float): Unit { BackgroundStyleApplicator.setBorderWidth(view, LogicalEdge.values()[index], width) } @@ -175,7 +186,8 @@ internal class PreparedLayoutTextViewManager : ViewProps.BORDER_BLOCK_END_COLOR, ViewProps.BORDER_BLOCK_START_COLOR, ], - customType = "Color") + customType = "Color", + ) fun setBorderColor(view: PreparedLayoutTextView, index: Int, color: Int?): Unit { BackgroundStyleApplicator.setBorderColor(view, LogicalEdge.values()[index], color) } @@ -190,7 +202,7 @@ internal class PreparedLayoutTextViewManager : left: Int, top: Int, right: Int, - bottom: Int + bottom: Int, ): Unit { view.setPadding(left, top, right, bottom) } diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactBaseTextShadowNode.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactBaseTextShadowNode.kt index 0a58fa1c175..bb7477ac585 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactBaseTextShadowNode.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactBaseTextShadowNode.kt @@ -167,7 +167,7 @@ public constructor( textShadowNode: ReactBaseTextShadowNode, text: String?, supportsInlineViews: Boolean, - nativeViewHierarchyOptimizer: com.facebook.react.uimanager.NativeViewHierarchyOptimizer? + nativeViewHierarchyOptimizer: com.facebook.react.uimanager.NativeViewHierarchyOptimizer?, ): Spannable { check(!supportsInlineViews || nativeViewHierarchyOptimizer != null) { "nativeViewHierarchyOptimizer is required when inline views are supported" @@ -511,7 +511,7 @@ public constructor( parentTextAttributes: TextAttributes?, supportsInlineViews: Boolean, inlineViews: MutableMap>?, - start: Int + start: Int, ) { val textAttributes = parentTextAttributes?.applyChild(textShadowNode.textAttributes) @@ -526,7 +526,14 @@ public constructor( child.text?.let { sb.append(apply(it, textAttributes.textTransform)) } } else if (child is ReactBaseTextShadowNode) { buildSpannedFromShadowNode( - child, sb, ops, textAttributes, supportsInlineViews, inlineViews, sb.length) + child, + sb, + ops, + textAttributes, + supportsInlineViews, + inlineViews, + sb.length, + ) } else if (child is ReactTextInlineImageShadowNode) { // We make the image take up 1 character in the span and put a corresponding character // into the text so that the image doesn't run over any following text. @@ -535,7 +542,8 @@ public constructor( SetSpanOperation( sb.length - INLINE_VIEW_PLACEHOLDER.length, sb.length, - child.buildInlineImageSpan())) + child.buildInlineImageSpan(), + )) } else if (supportsInlineViews) { val reactTag = child.reactTag val widthValue = child.styleWidth @@ -563,7 +571,8 @@ public constructor( SetSpanOperation( sb.length - INLINE_VIEW_PLACEHOLDER.length, sb.length, - TextInlineViewPlaceholderSpan(reactTag, width.toInt(), height.toInt()))) + TextInlineViewPlaceholderSpan(reactTag, width.toInt(), height.toInt()), + )) // supportsInlineViews is true, so we can assume that inlineViews is not null checkNotNull(inlineViews)[reactTag] = child @@ -616,7 +625,9 @@ public constructor( textShadowNode.fontWeight, textShadowNode.fontFeatureSettings, textShadowNode.fontFamily, - textShadowNode.themedContext.assets))) + textShadowNode.themedContext.assets, + ), + )) } if (textShadowNode.isUnderlineTextDecorationSet) { ops.add(SetSpanOperation(start, end, ReactUnderlineSpan())) @@ -636,7 +647,9 @@ public constructor( textShadowNode.textShadowOffsetDx, textShadowNode.textShadowOffsetDy, textShadowNode.textShadowRadius, - textShadowNode.textShadowColor))) + textShadowNode.textShadowColor, + ), + )) } val effectiveLineHeight = textAttributes.effectiveLineHeight if (!java.lang.Float.isNaN(effectiveLineHeight) && diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactFontManager.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactFontManager.kt index 5b4cee489b4..425f015af63 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactFontManager.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactFontManager.kt @@ -26,14 +26,14 @@ public class ReactFontManager private constructor(private val delegate: ReactFon fontFamilyName: String, weight: Int, italic: Boolean, - assetManager: AssetManager + assetManager: AssetManager, ): Typeface = delegate.getTypeface(fontFamilyName, weight, italic, assetManager) public fun getTypeface( fontFamilyName: String, style: Int, weight: Int, - assetManager: AssetManager + assetManager: AssetManager, ): Typeface = delegate.getTypeface(fontFamilyName, style, weight, assetManager) public fun addCustomFont(context: Context, fontFamily: String, fontId: Int) { diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactRawTextManager.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactRawTextManager.kt index e0f517c211c..c5c8e4bf5c5 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactRawTextManager.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactRawTextManager.kt @@ -24,7 +24,8 @@ import com.facebook.react.uimanager.ViewManager @LegacyArchitecture(logLevel = LegacyArchitectureLogLevel.ERROR) @Deprecated( message = "This class is part of Legacy Architecture and will be removed in a future release", - level = DeprecationLevel.WARNING) + level = DeprecationLevel.WARNING, +) internal class ReactRawTextManager : ViewManager() { override fun getName(): String { diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactRawTextShadowNode.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactRawTextShadowNode.kt index f749e5ada00..d72ef95afc1 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactRawTextShadowNode.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactRawTextShadowNode.kt @@ -21,7 +21,8 @@ import com.facebook.react.uimanager.annotations.ReactProp */ @Deprecated( message = "This class is part of Legacy Architecture and will be removed in a future release", - level = DeprecationLevel.WARNING) + level = DeprecationLevel.WARNING, +) @LegacyArchitecture(logLevel = LegacyArchitectureLogLevel.ERROR) internal class ReactRawTextShadowNode : ReactShadowNodeImpl() { @set:ReactProp(name = "text") diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextAnchorViewManager.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextAnchorViewManager.kt index 762749e2115..2ce7dda4d0a 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextAnchorViewManager.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextAnchorViewManager.kt @@ -127,8 +127,10 @@ public abstract class ReactTextAnchorViewManager< ViewProps.BORDER_TOP_LEFT_RADIUS, ViewProps.BORDER_TOP_RIGHT_RADIUS, ViewProps.BORDER_BOTTOM_RIGHT_RADIUS, - ViewProps.BORDER_BOTTOM_LEFT_RADIUS], - defaultFloat = Float.NaN) + ViewProps.BORDER_BOTTOM_LEFT_RADIUS, + ], + defaultFloat = Float.NaN, + ) internal fun setBorderRadius(view: ReactTextView, index: Int, borderRadius: Float) { val radius = if (borderRadius.isNaN()) { @@ -154,8 +156,10 @@ public abstract class ReactTextAnchorViewManager< ViewProps.BORDER_TOP_WIDTH, ViewProps.BORDER_BOTTOM_WIDTH, ViewProps.BORDER_START_WIDTH, - ViewProps.BORDER_END_WIDTH], - defaultFloat = Float.NaN) + ViewProps.BORDER_END_WIDTH, + ], + defaultFloat = Float.NaN, + ) internal fun setBorderWidth(view: ReactTextView, index: Int, width: Float) { BackgroundStyleApplicator.setBorderWidth(view, LogicalEdge.values()[index], width) } @@ -167,8 +171,10 @@ public abstract class ReactTextAnchorViewManager< "borderLeftColor", "borderRightColor", "borderTopColor", - "borderBottomColor"], - customType = "Color") + "borderBottomColor", + ], + customType = "Color", + ) internal fun setBorderColor(view: ReactTextView, index: Int, color: Int?) { BackgroundStyleApplicator.setBorderColor(view, LogicalEdge.values()[index], color) } diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextShadowNode.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextShadowNode.kt index 7af3a9b55b6..592ac2652f4 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextShadowNode.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextShadowNode.kt @@ -53,7 +53,8 @@ import kotlin.math.min @LegacyArchitecture(logLevel = LegacyArchitectureLogLevel.ERROR) @Deprecated( message = "This class is part of Legacy Architecture and will be removed in a future release", - level = DeprecationLevel.WARNING) + level = DeprecationLevel.WARNING, +) public class ReactTextShadowNode @JvmOverloads public constructor(reactTextViewManagerCallback: ReactTextViewManagerCallback? = null) : @@ -91,7 +92,8 @@ public constructor(reactTextViewManagerCallback: ReactTextViewManagerCallback? = max((span.size * ratio).toDouble(), minimumFontSize.toDouble()).toInt()), text.getSpanStart(span), text.getSpanEnd(span), - text.getSpanFlags(span)) + text.getSpanFlags(span), + ) text.removeSpan(span) } layout = measureSpannedText(text, width, widthMode) @@ -109,7 +111,8 @@ public constructor(reactTextViewManagerCallback: ReactTextViewManagerCallback? = } else { logSoftException( "ReactTextShadowNode", - ReactNoCrashSoftException("Cannot get RCTEventEmitter, no CatalystInstance")) + ReactNoCrashSoftException("Cannot get RCTEventEmitter, no CatalystInstance"), + ) } } @@ -176,7 +179,7 @@ public constructor(reactTextViewManagerCallback: ReactTextViewManagerCallback? = private fun measureSpannedText( text: Spannable, width: Float, - widthMode: YogaMeasureMode + widthMode: YogaMeasureMode, ): Layout { // TODO(5578671): Handle text direction (see View#getTextDirectionHeuristic) var width = width @@ -230,7 +233,8 @@ public constructor(reactTextViewManagerCallback: ReactTextViewManagerCallback? = 1f, 0f, boring, - includeFontPadding) + includeFontPadding, + ) } else { // Is used for multiline, boring text and the width is known. // Android 11+ introduces changes in text width calculation which leads to cases @@ -280,7 +284,8 @@ public constructor(reactTextViewManagerCallback: ReactTextViewManagerCallback? = this, /* text (e.g. from `value` prop): */ null, /* supportsInlineViews: */ true, - nativeViewHierarchyOptimizer) + nativeViewHierarchyOptimizer, + ) markUpdated() } @@ -313,7 +318,8 @@ public constructor(reactTextViewManagerCallback: ReactTextViewManagerCallback? = getPadding(Spacing.BOTTOM), _textAlign, textBreakStrategy, - justificationMode) + justificationMode, + ) uiViewOperationQueue.enqueueUpdateExtraData(reactTag, reactTextUpdate) } diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextUpdate.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextUpdate.kt index 08e46397c64..e882fb22e22 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextUpdate.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextUpdate.kt @@ -22,7 +22,7 @@ public class ReactTextUpdate( public val paddingBottom: Float, public val textAlign: Int, public val textBreakStrategy: Int, - public val justificationMode: Int + public val justificationMode: Int, ) { /** @@ -37,7 +37,7 @@ public class ReactTextUpdate( paddingTop: Float, paddingEnd: Float, paddingBottom: Float, - textAlign: Int + textAlign: Int, ) : this( text, jsEventCounter, @@ -48,7 +48,8 @@ public class ReactTextUpdate( paddingBottom, textAlign, Layout.BREAK_STRATEGY_HIGH_QUALITY, - Layout.JUSTIFICATION_MODE_NONE) + Layout.JUSTIFICATION_MODE_NONE, + ) public constructor( text: Spannable, @@ -56,7 +57,7 @@ public class ReactTextUpdate( containsImages: Boolean, textAlign: Int, textBreakStrategy: Int, - justificationMode: Int + justificationMode: Int, ) : this( text, jsEventCounter, @@ -67,11 +68,13 @@ public class ReactTextUpdate( ReactConstants.UNSET.toFloat(), textAlign, textBreakStrategy, - justificationMode) + justificationMode, + ) @Deprecated( "This is just for backwards compatibility and will be removed some time in the future", - ReplaceWith("containsImages")) + ReplaceWith("containsImages"), + ) public fun containsImages(): Boolean = containsImages public companion object { @@ -81,9 +84,15 @@ public class ReactTextUpdate( jsEventCounter: Int, textAlign: Int, textBreakStrategy: Int, - justificationMode: Int + justificationMode: Int, ): ReactTextUpdate = ReactTextUpdate( - text, jsEventCounter, false, textAlign, textBreakStrategy, justificationMode) + text, + jsEventCounter, + false, + textAlign, + textBreakStrategy, + justificationMode, + ) } } diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextViewAccessibilityDelegate.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextViewAccessibilityDelegate.kt index d02560a93a3..104de65f5b7 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextViewAccessibilityDelegate.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextViewAccessibilityDelegate.kt @@ -24,7 +24,7 @@ import com.facebook.react.views.text.internal.span.ReactClickableSpan internal class ReactTextViewAccessibilityDelegate( view: View, originalFocus: Boolean, - originalImportantForAccessibility: Int + originalImportantForAccessibility: Int, ) : ReactAccessibilityDelegate(view, originalFocus, originalImportantForAccessibility) { private var accessibilityLinks: AccessibilityLinks? = null @@ -47,7 +47,11 @@ internal class ReactTextViewAccessibilityDelegate( ViewCompat.setAccessibilityDelegate( view, ReactTextViewAccessibilityDelegate( - view, originalFocus, originalImportantForAccessibility)) + view, + originalFocus, + originalImportantForAccessibility, + ), + ) } } @@ -55,7 +59,11 @@ internal class ReactTextViewAccessibilityDelegate( ViewCompat.setAccessibilityDelegate( view, ReactTextViewAccessibilityDelegate( - view, originalFocus, originalImportantForAccessibility)) + view, + originalFocus, + originalImportantForAccessibility, + ), + ) } } @@ -84,7 +92,7 @@ internal class ReactTextViewAccessibilityDelegate( override fun onPerformActionForVirtualView( virtualViewId: Int, action: Int, - arguments: Bundle? + arguments: Bundle?, ): Boolean { if (accessibilityLinks == null) { return false diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextViewManager.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextViewManager.kt index cc8ec7df26e..46aeb11fa20 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextViewManager.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextViewManager.kt @@ -46,7 +46,7 @@ public constructor( override fun prepareToRecycleView( reactContext: ThemedReactContext, - view: ReactTextView + view: ReactTextView, ): ReactTextView? { // BaseViewManager val preparedView = super.prepareToRecycleView(reactContext, view) @@ -63,7 +63,10 @@ public constructor( override fun updateViewAccessibility(view: ReactTextView) { ReactTextViewAccessibilityDelegate.setDelegate( - view, view.isFocusable, view.importantForAccessibility) + view, + view.isFocusable, + view.importantForAccessibility, + ) } public override fun createViewInstance(context: ThemedReactContext): ReactTextView = @@ -84,9 +87,14 @@ public constructor( val accessibilityLinks: ReactTextViewAccessibilityDelegate.AccessibilityLinks = ReactTextViewAccessibilityDelegate.AccessibilityLinks(spannable) view.setTag( - R.id.accessibility_links, if (accessibilityLinks.size() > 0) accessibilityLinks else null) + R.id.accessibility_links, + if (accessibilityLinks.size() > 0) accessibilityLinks else null, + ) ReactTextViewAccessibilityDelegate.resetDelegate( - view, view.isFocusable, view.importantForAccessibility) + view, + view.isFocusable, + view.importantForAccessibility, + ) } } @@ -109,7 +117,7 @@ public constructor( override fun updateState( view: ReactTextView, props: ReactStylesDiffMap, - stateWrapper: StateWrapper + stateWrapper: StateWrapper, ): Any? { SystraceSection("ReactTextViewManager.updateState").use { s -> val stateMapBuffer = stateWrapper.stateDataMapBuffer @@ -124,14 +132,17 @@ public constructor( private fun getReactTextUpdate( view: ReactTextView, props: ReactStylesDiffMap, - state: MapBuffer + state: MapBuffer, ): Any { val attributedString: MapBuffer = state.getMapBuffer(TX_STATE_KEY_ATTRIBUTED_STRING.toInt()) val paragraphAttributes: MapBuffer = state.getMapBuffer(TX_STATE_KEY_PARAGRAPH_ATTRIBUTES.toInt()) val spanned: Spannable = TextLayoutManager.getOrCreateSpannableForText( - view.context, attributedString, reactTextViewManagerCallback) + view.context, + attributedString, + reactTextViewManagerCallback, + ) view.setSpanned(spanned) val minimumFontSize: Float = @@ -150,7 +161,8 @@ public constructor( false, // TODO add this into local Data TextLayoutManager.getTextGravity(attributedString, spanned), textBreakStrategy, - TextAttributeProps.getJustificationMode(props, currentJustificationMode)) + TextAttributeProps.getJustificationMode(props, currentJustificationMode), + ) } override fun getExportedCustomDirectEventTypeConstants(): MutableMap? { diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTypefaceUtils.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTypefaceUtils.kt index 517466055c7..85043dfcb66 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTypefaceUtils.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTypefaceUtils.kt @@ -102,7 +102,7 @@ public object ReactTypefaceUtils { style: Int, weight: Int, fontFamilyName: String?, - assetManager: AssetManager + assetManager: AssetManager, ): Typeface { val typefaceStyle = ReactFontManager.TypefaceStyle(style, weight) return if (fontFamilyName == null) { diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactVirtualTextShadowNode.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactVirtualTextShadowNode.kt index 7f4eab4f4c8..3d3108bfddc 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactVirtualTextShadowNode.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactVirtualTextShadowNode.kt @@ -17,7 +17,8 @@ import com.facebook.react.common.annotations.internal.LegacyArchitectureLogger @LegacyArchitecture(logLevel = LegacyArchitectureLogLevel.ERROR) @Deprecated( message = "This class is part of Legacy Architecture and will be removed in a future release", - level = DeprecationLevel.WARNING) + level = DeprecationLevel.WARNING, +) internal class ReactVirtualTextShadowNode : ReactBaseTextShadowNode() { override fun isVirtual(): Boolean = true @@ -25,7 +26,9 @@ internal class ReactVirtualTextShadowNode : ReactBaseTextShadowNode() { internal companion object { init { LegacyArchitectureLogger.assertLegacyArchitecture( - "ReactVirtualTextShadowNode", LegacyArchitectureLogLevel.ERROR) + "ReactVirtualTextShadowNode", + LegacyArchitectureLogLevel.ERROR, + ) } } } diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactVirtualTextViewManager.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactVirtualTextViewManager.kt index 947869fa115..225d12a6576 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactVirtualTextViewManager.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactVirtualTextViewManager.kt @@ -24,7 +24,8 @@ import com.facebook.react.uimanager.ThemedReactContext @LegacyArchitecture(logLevel = LegacyArchitectureLogLevel.ERROR) @Deprecated( message = "This class is part of Legacy Architecture and will be removed in a future release", - level = DeprecationLevel.WARNING) + level = DeprecationLevel.WARNING, +) internal class ReactVirtualTextViewManager : BaseViewManager() { override fun getName(): String = REACT_CLASS @@ -45,7 +46,9 @@ internal class ReactVirtualTextViewManager : BaseViewManager, - outputReactTags: IntArray? + outputReactTags: IntArray?, ) { for (i in 0 until fragments.count) { val fragment = fragments.getMapBuffer(i) @@ -243,7 +243,8 @@ internal object TextLayoutManager { SetSpanOperation( sb.length - 1, sb.length, - TextInlineViewPlaceholderSpan(reactTag, width.toInt(), height.toInt()))) + TextInlineViewPlaceholderSpan(reactTag, width.toInt(), height.toInt()), + )) } else if (end >= start) { val roleIsLink = if (textAttributes.role != null) @@ -290,7 +291,9 @@ internal object TextLayoutManager { textAttributes.fontWeight, textAttributes.fontFeatureSettings, textAttributes.fontFamily, - context.assets))) + context.assets, + ), + )) } if (textAttributes.isUnderlineTextDecorationSet) { ops.add(SetSpanOperation(start, end, ReactUnderlineSpan())) @@ -310,7 +313,9 @@ internal object TextLayoutManager { textAttributes.textShadowOffsetDx, textAttributes.textShadowOffsetDy, textAttributes.textShadowRadius, - textAttributes.textShadowColor))) + textAttributes.textShadowColor, + ), + )) } if (!textAttributes.lineHeight.isNaN()) { ops.add(SetSpanOperation(start, end, CustomLineHeightSpan(textAttributes.lineHeight))) @@ -334,13 +339,13 @@ internal object TextLayoutManager { val reactTag: Int, val isAttachment: Boolean, val width: Double, - val height: Double + val height: Double, ) private fun buildSpannableFromFragmentsOptimized( context: Context, fragments: MapBuffer, - outputReactTags: IntArray? + outputReactTags: IntArray?, ): Spannable { val text = StringBuilder() val parsedFragments = ArrayList(fragments.count) @@ -374,7 +379,8 @@ internal object TextLayoutManager { fragment.getDouble(FR_KEY_HEIGHT) } else { Double.NaN - })) + }, + )) } val spannable = SpannableString(text) @@ -390,10 +396,12 @@ internal object TextLayoutManager { TextInlineViewPlaceholderSpan( fragment.reactTag, PixelUtil.toPixelFromSP(fragment.width).toInt(), - PixelUtil.toPixelFromSP(fragment.height).toInt()), + PixelUtil.toPixelFromSP(fragment.height).toInt(), + ), start, end, - spanFlags) + spanFlags, + ) } else { val roleIsLink = if (fragment.props.role != null) @@ -412,7 +420,11 @@ internal object TextLayoutManager { if (fragment.props.isColorSet) { spannable.setSpan( - fragment.props.color?.let { ReactForegroundColorSpan(it) }, start, end, spanFlags) + fragment.props.color?.let { ReactForegroundColorSpan(it) }, + start, + end, + spanFlags, + ) } if (fragment.props.isBackgroundColorSet) { @@ -420,7 +432,8 @@ internal object TextLayoutManager { fragment.props.backgroundColor?.let { ReactBackgroundColorSpan(it) }, start, end, - spanFlags) + spanFlags, + ) } if (!fragment.props.opacity.isNaN()) { @@ -429,7 +442,11 @@ internal object TextLayoutManager { if (!fragment.props.letterSpacing.isNaN()) { spannable.setSpan( - CustomLetterSpacingSpan(fragment.props.letterSpacing), start, end, spanFlags) + CustomLetterSpacingSpan(fragment.props.letterSpacing), + start, + end, + spanFlags, + ) } spannable.setSpan(ReactAbsoluteSizeSpan(fragment.props.fontSize), start, end, spanFlags) @@ -443,10 +460,12 @@ internal object TextLayoutManager { fragment.props.fontWeight, fragment.props.fontFeatureSettings, fragment.props.fontFamily, - context.assets), + context.assets, + ), start, end, - spanFlags) + spanFlags, + ) } if (fragment.props.isUnderlineTextDecorationSet) { @@ -466,10 +485,12 @@ internal object TextLayoutManager { fragment.props.textShadowOffsetDx, fragment.props.textShadowOffsetDy, fragment.props.textShadowRadius, - fragment.props.textShadowColor), + fragment.props.textShadowColor, + ), start, end, - spanFlags) + spanFlags, + ) } if (!fragment.props.lineHeight.isNaN()) { @@ -495,7 +516,7 @@ internal object TextLayoutManager { fun getOrCreateSpannableForText( context: Context, attributedString: MapBuffer, - reactTextViewManagerCallback: ReactTextViewManagerCallback? + reactTextViewManagerCallback: ReactTextViewManagerCallback?, ): Spannable { var text: Spannable? if (attributedString.contains(AS_KEY_CACHE_ID)) { @@ -507,7 +528,8 @@ internal object TextLayoutManager { context, attributedString.getMapBuffer(AS_KEY_FRAGMENTS), reactTextViewManagerCallback, - null) + null, + ) } return text @@ -517,7 +539,7 @@ internal object TextLayoutManager { context: Context, fragments: MapBuffer, reactTextViewManagerCallback: ReactTextViewManagerCallback?, - outputReactTags: IntArray? + outputReactTags: IntArray?, ): Spannable { if (ReactNativeFeatureFlags.enableAndroidTextMeasurementOptimizations()) { val spannable = buildSpannableFromFragmentsOptimized(context, fragments, outputReactTags) @@ -561,7 +583,7 @@ internal object TextLayoutManager { justificationMode: Int, ellipsizeMode: TextUtils.TruncateAt?, maxNumberOfLines: Int, - paint: TextPaint + paint: TextPaint, ): Layout { // If our text is boring, and fully fits in the available space, we can represent the text // layout as a BoringLayout @@ -571,7 +593,15 @@ internal object TextLayoutManager { if (widthYogaMeasureMode == YogaMeasureMode.EXACTLY) floor(width).toInt() else boring.width return BoringLayout.make( - text, paint, layoutWidth, alignment, 1f, 0f, boring, includeFontPadding) + text, + paint, + layoutWidth, + alignment, + 1f, + 0f, + boring, + includeFontPadding, + ) } val desiredWidth = ceil(Layout.getDesiredWidth(text, paint)).toInt() @@ -613,7 +643,7 @@ internal object TextLayoutManager { private fun updateTextPaint( paint: TextPaint, baseTextAttributes: TextAttributeProps, - context: Context + context: Context, ) { if (baseTextAttributes.fontSize != ReactConstants.UNSET) { paint.textSize = baseTextAttributes.fontSize.toFloat() @@ -628,7 +658,8 @@ internal object TextLayoutManager { baseTextAttributes.fontStyle, baseTextAttributes.fontWeight, baseTextAttributes.fontFamily, - context.assets) + context.assets, + ) paint.setTypeface(typeface) if (baseTextAttributes.fontStyle != ReactConstants.UNSET && @@ -647,7 +678,7 @@ internal object TextLayoutManager { */ private fun scratchPaintWithAttributes( baseTextAttributes: TextAttributeProps, - context: Context + context: Context, ): TextPaint { val paint = checkNotNull(textPaintInstance.get()) paint.setTypeface(null) @@ -660,7 +691,7 @@ internal object TextLayoutManager { private fun newPaintWithAttributes( baseTextAttributes: TextAttributeProps, - context: Context + context: Context, ): TextPaint { val paint = TextPaint(TextPaint.ANTI_ALIAS_FLAG) updateTextPaint(paint, baseTextAttributes, context) @@ -675,7 +706,7 @@ internal object TextLayoutManager { widthYogaMeasureMode: YogaMeasureMode, height: Float, heightYogaMeasureMode: YogaMeasureMode, - reactTextViewManagerCallback: ReactTextViewManagerCallback? + reactTextViewManagerCallback: ReactTextViewManagerCallback?, ): Layout { val text = getOrCreateSpannableForText(context, attributedString, reactTextViewManagerCallback) @@ -696,7 +727,8 @@ internal object TextLayoutManager { width, widthYogaMeasureMode, height, - heightYogaMeasureMode) + heightYogaMeasureMode, + ) } private fun createLayout( @@ -707,7 +739,7 @@ internal object TextLayoutManager { width: Float, widthYogaMeasureMode: YogaMeasureMode, height: Float, - heightYogaMeasureMode: YogaMeasureMode + heightYogaMeasureMode: YogaMeasureMode, ): Layout { val boring = isBoring(text, paint) @@ -759,7 +791,8 @@ internal object TextLayoutManager { hyphenationFrequency, alignment, justificationMode, - paint) + paint, + ) } return createLayout( @@ -774,7 +807,8 @@ internal object TextLayoutManager { justificationMode, ellipsizeMode, maximumNumberOfLines, - paint) + paint, + ) } @JvmStatic @@ -786,13 +820,17 @@ internal object TextLayoutManager { widthYogaMeasureMode: YogaMeasureMode, height: Float, heightYogaMeasureMode: YogaMeasureMode, - reactTextViewManagerCallback: ReactTextViewManagerCallback? + reactTextViewManagerCallback: ReactTextViewManagerCallback?, ): PreparedLayout { val fragments = attributedString.getMapBuffer(AS_KEY_FRAGMENTS) val reactTags = IntArray(fragments.count) val text = createSpannableFromAttributedString( - context, fragments, reactTextViewManagerCallback, reactTags) + context, + fragments, + reactTextViewManagerCallback, + reactTags, + ) val baseTextAttributes = TextAttributeProps.fromMapBuffer(attributedString.getMapBuffer(AS_KEY_BASE_ATTRIBUTES)) val layout = @@ -804,7 +842,8 @@ internal object TextLayoutManager { width, widthYogaMeasureMode, height, - heightYogaMeasureMode) + heightYogaMeasureMode, + ) val maximumNumberOfLines = if (paragraphAttributes.contains(PA_KEY_MAX_NUMBER_OF_LINES)) @@ -813,7 +852,12 @@ internal object TextLayoutManager { val verticalOffset = getVerticalOffset( - layout, paragraphAttributes, height, heightYogaMeasureMode, maximumNumberOfLines) + layout, + paragraphAttributes, + height, + heightYogaMeasureMode, + maximumNumberOfLines, + ) return PreparedLayout(layout, maximumNumberOfLines, verticalOffset, reactTags) } @@ -832,7 +876,7 @@ internal object TextLayoutManager { hyphenationFrequency: Int, alignment: Layout.Alignment, justificationMode: Int, - paint: TextPaint + paint: TextPaint, ): Unit { var boring = isBoring(text, paint) var layout = @@ -848,7 +892,8 @@ internal object TextLayoutManager { justificationMode, null, ReactConstants.UNSET, - paint) + paint, + ) // Minimum font size is 4pts to match the iOS implementation. val minimumFontSize = @@ -881,7 +926,8 @@ internal object TextLayoutManager { ReactAbsoluteSizeSpan(max((span.size * ratio).toInt(), minimumFontSize)), text.getSpanStart(span), text.getSpanEnd(span), - text.getSpanFlags(span)) + text.getSpanFlags(span), + ) text.removeSpan(span) } if (boring != null) { @@ -900,7 +946,8 @@ internal object TextLayoutManager { justificationMode, null, ReactConstants.UNSET, - paint) + paint, + ) } } @@ -914,7 +961,7 @@ internal object TextLayoutManager { height: Float, heightYogaMeasureMode: YogaMeasureMode, reactTextViewManagerCallback: ReactTextViewManagerCallback?, - attachmentsPositions: FloatArray? + attachmentsPositions: FloatArray?, ): Long { // TODO(5578671): Handle text direction (see View#getTextDirectionHeuristic) val layout = @@ -926,7 +973,8 @@ internal object TextLayoutManager { widthYogaMeasureMode, height, heightYogaMeasureMode, - reactTextViewManagerCallback) + reactTextViewManagerCallback, + ) val maximumNumberOfLines = if (paragraphAttributes.contains(PA_KEY_MAX_NUMBER_OF_LINES)) @@ -950,7 +998,14 @@ internal object TextLayoutManager { while (i < text.length) { lastAttachmentFoundInSpan = nextAttachmentMetrics( - layout, text, calculatedWidth, calculatedLineCount, i, 0f, metrics) + layout, + text, + calculatedWidth, + calculatedLineCount, + i, + 0f, + metrics, + ) if (metrics.wasFound) { attachmentsPositions[attachmentIndex] = metrics.top.pxToDp() attachmentsPositions[attachmentIndex + 1] = metrics.left.pxToDp() @@ -972,7 +1027,7 @@ internal object TextLayoutManager { width: Float, widthYogaMeasureMode: YogaMeasureMode, height: Float, - heightYogaMeasureMode: YogaMeasureMode + heightYogaMeasureMode: YogaMeasureMode, ): FloatArray { val layout = preparedLayout.layout val text = layout.text as Spanned @@ -1001,7 +1056,8 @@ internal object TextLayoutManager { calculatedLineCount, i, preparedLayout.verticalOffset, - metrics) + metrics, + ) if (metrics.wasFound) { retList.add(metrics.top.pxToDp()) retList.add(metrics.left.pxToDp()) @@ -1024,7 +1080,7 @@ internal object TextLayoutManager { paragraphAttributes: ReadableMapBuffer, height: Float, heightMeasureMode: YogaMeasureMode, - maximumNumberOfLines: Int + maximumNumberOfLines: Int, ): Float { val textAlignVertical = if (paragraphAttributes.contains(PA_KEY_TEXT_ALIGN_VERTICAL)) @@ -1065,7 +1121,7 @@ internal object TextLayoutManager { text: Spanned, width: Float, widthYogaMeasureMode: YogaMeasureMode, - calculatedLineCount: Int + calculatedLineCount: Int, ): Float { // Our layout must be created at a physical pixel boundary, so may be sized smaller by a // subpixel compared to the assigned layout width. @@ -1080,7 +1136,7 @@ internal object TextLayoutManager { layout: Layout, height: Float, heightYogaMeasureMode: YogaMeasureMode, - calculatedLineCount: Int + calculatedLineCount: Int, ): Float { var calculatedHeight = height if (heightYogaMeasureMode != YogaMeasureMode.EXACTLY) { @@ -1101,7 +1157,7 @@ internal object TextLayoutManager { calculatedLineCount: Int, i: Int, verticalOffset: Float, - metrics: AttachmentMetrics + metrics: AttachmentMetrics, ): Int { // Calculate the positions of the attachments (views) that will be rendered inside the // Spanned Text. The following logic is only executed when a text contains views inside. @@ -1208,7 +1264,7 @@ internal object TextLayoutManager { paragraphAttributes: MapBuffer, width: Float, height: Float, - reactTextViewManagerCallback: ReactTextViewManagerCallback? + reactTextViewManagerCallback: ReactTextViewManagerCallback?, ): WritableArray { val layout = createLayoutForMeasurement( @@ -1219,7 +1275,8 @@ internal object TextLayoutManager { YogaMeasureMode.EXACTLY, height, YogaMeasureMode.EXACTLY, - reactTextViewManagerCallback) + reactTextViewManagerCallback, + ) return FontMetricsUtil.getFontMetrics(layout.text, layout, context) } diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/frescosupport/FrescoBasedReactTextInlineImageShadowNode.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/frescosupport/FrescoBasedReactTextInlineImageShadowNode.kt index 75662e753c9..81b728f6d2a 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/frescosupport/FrescoBasedReactTextInlineImageShadowNode.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/frescosupport/FrescoBasedReactTextInlineImageShadowNode.kt @@ -32,10 +32,11 @@ import java.util.Locale @LegacyArchitecture(logLevel = LegacyArchitectureLogLevel.ERROR) @Deprecated( message = "This class is part of Legacy Architecture and will be removed in a future release", - level = DeprecationLevel.WARNING) + level = DeprecationLevel.WARNING, +) internal class FrescoBasedReactTextInlineImageShadowNode( private val draweeControllerBuilder: AbstractDraweeControllerBuilder<*, ImageRequest, *, *>, - private val callerContext: Any? + private val callerContext: Any?, ) : ReactTextInlineImageShadowNode() { private var uri: Uri? = null @@ -124,7 +125,8 @@ internal class FrescoBasedReactTextInlineImageShadowNode( getHeaders(), getDraweeControllerBuilder(), getCallerContext(), - resizeMode) + resizeMode, + ) } fun getDraweeControllerBuilder() = draweeControllerBuilder @@ -144,7 +146,9 @@ internal class FrescoBasedReactTextInlineImageShadowNode( init { LegacyArchitectureLogger.assertLegacyArchitecture( - "FrescoBasedReactTextInlineImageShadowNode", LegacyArchitectureLogLevel.ERROR) + "FrescoBasedReactTextInlineImageShadowNode", + LegacyArchitectureLogLevel.ERROR, + ) } } } diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/frescosupport/FrescoBasedReactTextInlineImageSpan.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/frescosupport/FrescoBasedReactTextInlineImageSpan.kt index a45129c72e3..117a7020322 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/frescosupport/FrescoBasedReactTextInlineImageSpan.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/frescosupport/FrescoBasedReactTextInlineImageSpan.kt @@ -50,7 +50,7 @@ internal class FrescoBasedReactTextInlineImageSpan( private val headers: ReadableMap?, private val draweeControllerBuilder: AbstractDraweeControllerBuilder<*, ImageRequest, *, *>, private val callerContext: Any?, - private val resizeMode: String? + private val resizeMode: String?, ) : TextInlineImageSpan() { private var textView: TextView? = null @@ -94,7 +94,7 @@ internal class FrescoBasedReactTextInlineImageSpan( text: CharSequence, start: Int, end: Int, - fm: Paint.FontMetricsInt? + fm: Paint.FontMetricsInt?, ): Int { // NOTE: This getSize code is copied from DynamicDrawableSpan and modified // to not use a Drawable @@ -123,7 +123,7 @@ internal class FrescoBasedReactTextInlineImageSpan( top: Int, y: Int, bottom: Int, - paint: Paint + paint: Paint, ) { if (drawable == null) { val imageRequestBuilder = ImageRequestBuilder.newBuilderWithSource(_uri) diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/frescosupport/FrescoBasedReactTextInlineImageViewManager.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/frescosupport/FrescoBasedReactTextInlineImageViewManager.kt index 5b30688bfc9..e1ee66a6b1a 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/frescosupport/FrescoBasedReactTextInlineImageViewManager.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/frescosupport/FrescoBasedReactTextInlineImageViewManager.kt @@ -28,7 +28,7 @@ constructor( @JvmSuppressWildcards AbstractDraweeControllerBuilder<*, ImageRequest, *, *>? = null, - private val callerContext: Any? = null + private val callerContext: Any? = null, ) : BaseViewManager() { override fun getName(): String = REACT_CLASS @@ -39,7 +39,9 @@ constructor( override fun createShadowNodeInstance(): FrescoBasedReactTextInlineImageShadowNode = FrescoBasedReactTextInlineImageShadowNode( - draweeControllerBuilder ?: Fresco.newDraweeControllerBuilder(), callerContext) + draweeControllerBuilder ?: Fresco.newDraweeControllerBuilder(), + callerContext, + ) override fun getShadowNodeClass(): Class = FrescoBasedReactTextInlineImageShadowNode::class.java diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/internal/span/CustomStyleSpan.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/internal/span/CustomStyleSpan.kt index 7be93b440eb..bb03a409f48 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/internal/span/CustomStyleSpan.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/internal/span/CustomStyleSpan.kt @@ -32,7 +32,7 @@ internal class CustomStyleSpan( private val privateWeight: Int, val fontFeatureSettings: String?, val fontFamily: String?, - private val assetManager: AssetManager + private val assetManager: AssetManager, ) : MetricAffectingSpan(), ReactSpan { override fun updateDrawState(ds: TextPaint) { apply(ds, privateStyle, privateWeight, fontFeatureSettings, fontFamily, assetManager) @@ -65,7 +65,7 @@ internal class CustomStyleSpan( weight: Int, fontFeatureSettingsParam: String?, family: String?, - assetManager: AssetManager + assetManager: AssetManager, ) { val typeface = ReactTypefaceUtils.applyStyles(paint.typeface, style, weight, family, assetManager) diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/internal/span/SetSpanOperation.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/internal/span/SetSpanOperation.kt index a25cceeb936..72cd31b140b 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/internal/span/SetSpanOperation.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/internal/span/SetSpanOperation.kt @@ -16,7 +16,7 @@ import kotlin.math.max internal class SetSpanOperation( private val start: Int, private val end: Int, - @JvmField val what: ReactSpan + @JvmField val what: ReactSpan, ) { /** * @param builder Spannable string builder diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/internal/span/ShadowStyleSpan.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/internal/span/ShadowStyleSpan.kt index 638f2bb89e3..3f9db17fb8a 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/internal/span/ShadowStyleSpan.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/internal/span/ShadowStyleSpan.kt @@ -14,7 +14,7 @@ internal class ShadowStyleSpan( private val dx: Float, private val dy: Float, private val radius: Float, - val color: Int + val color: Int, ) : CharacterStyle(), ReactSpan { override fun updateDrawState(textPaint: TextPaint) { textPaint.setShadowLayer(radius, dx, dy, color) diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/internal/span/TextInlineViewPlaceholderSpan.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/internal/span/TextInlineViewPlaceholderSpan.kt index 153ea2ef6f1..f2efb3c5136 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/internal/span/TextInlineViewPlaceholderSpan.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/internal/span/TextInlineViewPlaceholderSpan.kt @@ -23,7 +23,7 @@ internal class TextInlineViewPlaceholderSpan(val reactTag: Int, val width: Int, text: CharSequence?, start: Int, end: Int, - fm: FontMetricsInt? + fm: FontMetricsInt?, ): Int { // NOTE: This getSize code is copied from DynamicDrawableSpan and modified to not use a Drawable if (fm != null) { @@ -44,6 +44,6 @@ internal class TextInlineViewPlaceholderSpan(val reactTag: Int, val width: Int, top: Int, y: Int, bottom: Int, - paint: Paint + paint: Paint, ): Unit = Unit } diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactContentSizeChangedEvent.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactContentSizeChangedEvent.kt index f88ebbd92da..32f54c9eabc 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactContentSizeChangedEvent.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactContentSizeChangedEvent.kt @@ -17,7 +17,7 @@ internal class ReactContentSizeChangedEvent( surfaceId: Int, viewId: Int, private val contentWidth: Float, - private val contentHeight: Float + private val contentHeight: Float, ) : Event(surfaceId, viewId) { override fun getEventName(): String = EVENT_NAME diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactEditText.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactEditText.kt index 7f7c5e124dd..7dc7582d2ab 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactEditText.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactEditText.kt @@ -227,7 +227,8 @@ public open class ReactEditText public constructor(context: Context) : AppCompat ReactAccessibilityDelegate( this@ReactEditText, this@ReactEditText.isFocusable, - this@ReactEditText.importantForAccessibility) { + this@ReactEditText.importantForAccessibility, + ) { override fun performAccessibilityAction(host: View, action: Int, args: Bundle?): Boolean { if (action == AccessibilityNodeInfo.ACTION_CLICK) { val length = checkNotNull(text).length @@ -344,7 +345,11 @@ public open class ReactEditText public constructor(context: Context) : AppCompat if (inputConnection != null && onKeyPress) { inputConnection = ReactEditTextInputConnectionWrapper( - inputConnection, reactContext, this, checkNotNull(eventDispatcher)) + inputConnection, + reactContext, + this, + checkNotNull(eventDispatcher), + ) } if (isMultiline && (shouldBlurOnReturn() || shouldSubmitOnReturn())) { @@ -645,7 +650,8 @@ public open class ReactEditText public constructor(context: Context) : AppCompat if (DEBUG_MODE) { FLog.e( TAG, - ("maybeSetText[" + id + "]: current text: " + text + " update: " + reactTextUpdate.text)) + ("maybeSetText[" + id + "]: current text: " + text + " update: " + reactTextUpdate.text), + ) } // The current text gets replaced with the text received from JS. However, the spans on the @@ -762,7 +768,7 @@ public open class ReactEditText public constructor(context: Context) : AppCompat private fun stripSpansOfKind( sb: SpannableStringBuilder, clazz: Class, - shouldStrip: Predicate + shouldStrip: Predicate, ) { val spans = sb.getSpans(0, sb.length, clazz) @@ -785,15 +791,27 @@ public open class ReactEditText public constructor(context: Context) : AppCompat spanFlags = spanFlags or Spannable.SPAN_PRIORITY workingText.setSpan( - ReactAbsoluteSizeSpan(textAttributes.effectiveFontSize), 0, workingText.length, spanFlags) + ReactAbsoluteSizeSpan(textAttributes.effectiveFontSize), + 0, + workingText.length, + spanFlags, + ) workingText.setSpan( - ReactForegroundColorSpan(currentTextColor), 0, workingText.length, spanFlags) + ReactForegroundColorSpan(currentTextColor), + 0, + workingText.length, + spanFlags, + ) val backgroundColor = getBackgroundColor(this) if (backgroundColor != null && backgroundColor != Color.TRANSPARENT) { workingText.setSpan( - ReactBackgroundColorSpan(backgroundColor), 0, workingText.length, spanFlags) + ReactBackgroundColorSpan(backgroundColor), + 0, + workingText.length, + spanFlags, + ) } if ((paintFlags and Paint.STRIKE_THRU_TEXT_FLAG) != 0) { @@ -807,7 +825,11 @@ public open class ReactEditText public constructor(context: Context) : AppCompat val effectiveLetterSpacing = textAttributes.effectiveLetterSpacing if (!effectiveLetterSpacing.isNaN()) { workingText.setSpan( - CustomLetterSpacingSpan(effectiveLetterSpacing), 0, workingText.length, spanFlags) + CustomLetterSpacingSpan(effectiveLetterSpacing), + 0, + workingText.length, + spanFlags, + ) } if (fontStyle != ReactConstants.UNSET || @@ -818,7 +840,8 @@ public open class ReactEditText public constructor(context: Context) : AppCompat CustomStyleSpan(fontStyle, fontWeight, fontFeatureSettings, fontFamily, context.assets), 0, workingText.length, - spanFlags) + spanFlags, + ) } val lineHeight = textAttributes.effectiveLineHeight @@ -1140,7 +1163,8 @@ public open class ReactEditText public constructor(context: Context) : AppCompat ReactTextPaintHolderSpan(TextPaint(paint)), 0, sb.length, - Spannable.SPAN_INCLUSIVE_INCLUSIVE) + Spannable.SPAN_INCLUSIVE_INCLUSIVE, + ) TextLayoutManager.setCachedSpannableForTag(id, sb) } @@ -1258,7 +1282,7 @@ public open class ReactEditText public constructor(context: Context) : AppCompat oldText: Editable, newText: SpannableStringBuilder, start: Int, - end: Int + end: Int, ): Boolean { if (start > newText.length || end > newText.length) { return false diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactEditTextInputConnectionWrapper.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactEditTextInputConnectionWrapper.kt index b868c0e5ffe..54b06a86cc0 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactEditTextInputConnectionWrapper.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactEditTextInputConnectionWrapper.kt @@ -49,7 +49,7 @@ internal class ReactEditTextInputConnectionWrapper( target: InputConnection, reactContext: ReactContext, private val editText: ReactEditText, - private val eventDispatcher: EventDispatcher + private val eventDispatcher: EventDispatcher, ) : InputConnectionWrapper(target, false) { private var isBatchEdit = false diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextChangedEvent.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextChangedEvent.kt index 7b877d3fbde..b4e4a7caad8 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextChangedEvent.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextChangedEvent.kt @@ -16,7 +16,7 @@ internal class ReactTextChangedEvent( surfaceId: Int, viewId: Int, private val text: String, - private val eventCount: Int + private val eventCount: Int, ) : Event(surfaceId, viewId) { override fun getEventName(): String = EVENT_NAME diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextContentSizeWatcher.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextContentSizeWatcher.kt index 509287ac750..bc4764e26d1 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextContentSizeWatcher.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextContentSizeWatcher.kt @@ -45,7 +45,8 @@ internal class ReactTextContentSizeWatcher(private val editText: ReactEditText) surfaceId, editText.id, toDIPFromPixel(contentWidth.toFloat()), - toDIPFromPixel(contentHeight.toFloat()))) + toDIPFromPixel(contentHeight.toFloat()), + )) } } } diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputEndEditingEvent.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputEndEditingEvent.kt index ae334381d2d..1ab646334e6 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputEndEditingEvent.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputEndEditingEvent.kt @@ -18,7 +18,7 @@ import com.facebook.react.uimanager.events.Event internal class ReactTextInputEndEditingEvent( surfaceId: Int, viewId: Int, - private val text: String + private val text: String, ) : Event(surfaceId, viewId) { override fun getEventName(): String = EVENT_NAME diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputManager.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputManager.kt index 4df9e71a37b..d025919f349 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputManager.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputManager.kt @@ -95,7 +95,9 @@ public open class ReactTextInputManager public constructor() : // overridden on the first RN commit. editText.layoutParams = ViewGroup.LayoutParams( - ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT) + ViewGroup.LayoutParams.WRAP_CONTENT, + ViewGroup.LayoutParams.WRAP_CONTENT, + ) return editText } @@ -118,7 +120,8 @@ public open class ReactTextInputManager public constructor() : "phasedRegistrationNames" to mapOf( "bubbled" to "onSubmitEditing", - "captured" to "onSubmitEditingCapture")), + "captured" to "onSubmitEditingCapture", + )), "topEndEditing" to mapOf( "phasedRegistrationNames" to @@ -126,7 +129,8 @@ public open class ReactTextInputManager public constructor() : "topKeyPress" to mapOf( "phasedRegistrationNames" to - mapOf("bubbled" to "onKeyPress", "captured" to "onKeyPressCapture")))) + mapOf("bubbled" to "onKeyPress", "captured" to "onKeyPressCapture")), + )) return eventTypeConstants } @@ -154,7 +158,7 @@ public open class ReactTextInputManager public constructor() : override fun receiveCommand( reactEditText: ReactEditText, commandId: String, - args: ReadableArray? + args: ReadableArray?, ) { when (commandId) { "focus", @@ -184,7 +188,17 @@ public open class ReactTextInputManager public constructor() : val sb = SpannableStringBuilder() sb.append(text) return ReactTextUpdate( - sb, mostRecentEventCount, false, 0f, 0f, 0f, 0f, Gravity.NO_GRAVITY, 0, 0) + sb, + mostRecentEventCount, + false, + 0f, + 0f, + 0f, + 0f, + Gravity.NO_GRAVITY, + 0, + 0, + ) } override fun updateExtraData(view: ReactEditText, extraData: Any) { @@ -202,7 +216,8 @@ public open class ReactTextInputManager public constructor() : if (paddingLeft != UNSET) paddingLeft else view.paddingLeft, if (paddingTop != UNSET) paddingTop else view.paddingTop, if (paddingRight != UNSET) paddingRight else view.paddingRight, - if (paddingBottom != UNSET) paddingBottom else view.paddingBottom) + if (paddingBottom != UNSET) paddingBottom else view.paddingBottom, + ) } @Suppress("DEPRECATION") @@ -514,7 +529,8 @@ public open class ReactTextInputManager public constructor() : TAG, IllegalStateException( "Could not get default text color from View Context: " + - (if (c != null) c.javaClass.canonicalName else "null"))) + (if (c != null) c.javaClass.canonicalName else "null")), + ) } } else { view.setTextColor(color) @@ -678,7 +694,8 @@ public open class ReactTextInputManager public constructor() : true -> InputType.TYPE_TEXT_FLAG_AUTO_CORRECT false -> InputType.TYPE_TEXT_FLAG_NO_SUGGESTIONS else -> 0 - }) + }, + ) } @ReactProp(name = "multiline", defaultBoolean = false) @@ -686,7 +703,8 @@ public open class ReactTextInputManager public constructor() : updateStagedInputTypeFlag( view = view, flagsToUnset = if (multiline) 0 else InputType.TYPE_TEXT_FLAG_MULTI_LINE, - flagsToSet = if (multiline) InputType.TYPE_TEXT_FLAG_MULTI_LINE else 0) + flagsToSet = if (multiline) InputType.TYPE_TEXT_FLAG_MULTI_LINE else 0, + ) } @ReactProp(name = "secureTextEntry", defaultBoolean = false) @@ -699,7 +717,8 @@ public open class ReactTextInputManager public constructor() : } else { InputType.TYPE_NUMBER_VARIATION_PASSWORD or InputType.TYPE_TEXT_VARIATION_PASSWORD }, - flagsToSet = if (password) InputType.TYPE_TEXT_VARIATION_PASSWORD else 0) + flagsToSet = if (password) InputType.TYPE_TEXT_VARIATION_PASSWORD else 0, + ) checkPasswordType(view) } @@ -767,7 +786,7 @@ public open class ReactTextInputManager public constructor() : @ReactProp(name = "acceptDragAndDropTypes") public fun setAcceptDragAndDropTypes( view: ReactEditText, - acceptDragAndDropTypes: ReadableArray? + acceptDragAndDropTypes: ReadableArray?, ) { if (acceptDragAndDropTypes == null) { view.dragAndDropFilter = null @@ -797,8 +816,10 @@ public open class ReactTextInputManager public constructor() : ViewProps.BORDER_TOP_LEFT_RADIUS, ViewProps.BORDER_TOP_RIGHT_RADIUS, ViewProps.BORDER_BOTTOM_RIGHT_RADIUS, - ViewProps.BORDER_BOTTOM_LEFT_RADIUS], - defaultFloat = Float.NaN) + ViewProps.BORDER_BOTTOM_LEFT_RADIUS, + ], + defaultFloat = Float.NaN, + ) public fun setBorderRadius(view: ReactEditText, index: Int, borderRadius: Float) { val radius = if (borderRadius.isNaN()) { @@ -853,8 +874,10 @@ public open class ReactTextInputManager public constructor() : ViewProps.BORDER_LEFT_WIDTH, ViewProps.BORDER_RIGHT_WIDTH, ViewProps.BORDER_TOP_WIDTH, - ViewProps.BORDER_BOTTOM_WIDTH], - defaultFloat = Float.NaN) + ViewProps.BORDER_BOTTOM_WIDTH, + ], + defaultFloat = Float.NaN, + ) public fun setBorderWidth(view: ReactEditText, index: Int, width: Float) { setBorderWidth(view, LogicalEdge.entries[index], width) } @@ -866,8 +889,10 @@ public open class ReactTextInputManager public constructor() : "borderLeftColor", "borderRightColor", "borderTopColor", - "borderBottomColor"], - customType = "Color") + "borderBottomColor", + ], + customType = "Color", + ) public fun setBorderColor(view: ReactEditText, index: Int, color: Int?) { setBorderColor(view, LogicalEdge.ALL, color) } @@ -919,7 +944,10 @@ public open class ReactTextInputManager public constructor() : val eventDispatcher = getEventDispatcher(reactContext, editText) eventDispatcher?.dispatchEvent( ReactTextInputSubmitEditingEvent( - reactContext.surfaceId, editText.id, editText.text.toString())) + reactContext.surfaceId, + editText.id, + editText.text.toString(), + )) } if (shouldBlur) { @@ -953,7 +981,8 @@ public open class ReactTextInputManager public constructor() : "none" to 0, "characters" to InputType.TYPE_TEXT_FLAG_CAP_CHARACTERS, "words" to InputType.TYPE_TEXT_FLAG_CAP_WORDS, - "sentences" to InputType.TYPE_TEXT_FLAG_CAP_SENTENCES)) + "sentences" to InputType.TYPE_TEXT_FLAG_CAP_SENTENCES, + )) override fun setPadding(view: ReactEditText, left: Int, top: Int, right: Int, bottom: Int) { view.setPadding(left, top, right, bottom) @@ -962,7 +991,7 @@ public open class ReactTextInputManager public constructor() : override fun updateState( view: ReactEditText, props: ReactStylesDiffMap, - stateWrapper: StateWrapper + stateWrapper: StateWrapper, ): Any? { if (ReactEditText.DEBUG_MODE) { FLog.e(TAG, "updateState: [${view.id}]") @@ -990,7 +1019,7 @@ public open class ReactTextInputManager public constructor() : public fun getReactTextUpdate( view: ReactEditText, props: ReactStylesDiffMap, - state: MapBuffer + state: MapBuffer, ): Any? { // If native wants to update the state wrapper but the state data hasn't actually // changed, the MapBuffer may be empty @@ -1003,7 +1032,10 @@ public open class ReactTextInputManager public constructor() : val spanned = TextLayoutManager.getOrCreateSpannableForText( - view.context, attributedString, reactTextViewManagerCallback) + view.context, + attributedString, + reactTextViewManagerCallback, + ) val textBreakStrategy = TextAttributeProps.getTextBreakStrategy( @@ -1019,9 +1051,13 @@ public open class ReactTextInputManager public constructor() : spanned, state.getInt(TX_STATE_KEY_MOST_RECENT_EVENT_COUNT.toInt()), TextAttributeProps.getTextAlignment( - props, TextLayoutManager.isRTL(attributedString), view.gravityHorizontal), + props, + TextLayoutManager.isRTL(attributedString), + view.gravityHorizontal, + ), textBreakStrategy, - TextAttributeProps.getJustificationMode(props, currentJustificationMode)) + TextAttributeProps.getJustificationMode(props, currentJustificationMode), + ) } public companion object { @@ -1118,7 +1154,10 @@ public open class ReactTextInputManager public constructor() : (view.stagedInputType and InputType.TYPE_TEXT_VARIATION_PASSWORD) != 0) { // Text input type is numbered password, remove text password variation, add numeric one updateStagedInputTypeFlag( - view, InputType.TYPE_TEXT_VARIATION_PASSWORD, InputType.TYPE_NUMBER_VARIATION_PASSWORD) + view, + InputType.TYPE_TEXT_VARIATION_PASSWORD, + InputType.TYPE_NUMBER_VARIATION_PASSWORD, + ) } } @@ -1128,7 +1167,7 @@ public open class ReactTextInputManager public constructor() : private fun getEventDispatcher( reactContext: ReactContext, - editText: ReactEditText + editText: ReactEditText, ): EventDispatcher? = UIManagerHelper.getEventDispatcherForReactTag(reactContext, editText.id) } } diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputSelectionEvent.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputSelectionEvent.kt index 9c8bb63a40f..10734946cc9 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputSelectionEvent.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputSelectionEvent.kt @@ -17,7 +17,7 @@ internal class ReactTextInputSelectionEvent( surfaceId: Int, viewId: Int, private val selectionStart: Int, - private val selectionEnd: Int + private val selectionEnd: Int, ) : Event(surfaceId, viewId) { override fun getEventName(): String = EVENT_NAME diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputShadowNode.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputShadowNode.kt index 8f2f6659748..5c51e4cd6c5 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputShadowNode.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputShadowNode.kt @@ -41,7 +41,8 @@ import com.facebook.yoga.YogaNode @LegacyArchitectureShadowNodeWithCxxImpl @Deprecated( message = "This class is part of Legacy Architecture and will be removed in a future release", - level = DeprecationLevel.WARNING) + level = DeprecationLevel.WARNING, +) internal class ReactTextInputShadowNode @JvmOverloads constructor(reactTextViewManagerCallback: ReactTextViewManagerCallback? = null) : @@ -97,7 +98,9 @@ constructor(reactTextViewManagerCallback: ReactTextViewManagerCallback? = null) // setting the layoutParams fixes it: https://code.google.com/p/android/issues/detail?id=75877 internalEditText?.layoutParams = ViewGroup.LayoutParams( - ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT) + ViewGroup.LayoutParams.WRAP_CONTENT, + ViewGroup.LayoutParams.WRAP_CONTENT, + ) } override fun measure( @@ -105,7 +108,7 @@ constructor(reactTextViewManagerCallback: ReactTextViewManagerCallback? = null) width: Float, widthMode: YogaMeasureMode, height: Float, - heightMode: YogaMeasureMode + heightMode: YogaMeasureMode, ): Long { // measure() should never be called before setThemedContext() val editText = checkNotNull(internalEditText) @@ -175,8 +178,8 @@ constructor(reactTextViewManagerCallback: ReactTextViewManagerCallback? = null) this, text, /* supportsInlineViews: */ false, /* nativeViewHierarchyOptimizer: */ - null // only needed to support inline views - ), + null, // only needed to support inline views + ), mostRecentEventCount, containsImages, getPadding(Spacing.LEFT), @@ -185,7 +188,8 @@ constructor(reactTextViewManagerCallback: ReactTextViewManagerCallback? = null) getPadding(Spacing.BOTTOM), textAlign, textBreakStrategy, - justificationMode) + justificationMode, + ) uiViewOperationQueue.enqueueUpdateExtraData(reactTag, reactTextUpdate) } } @@ -216,7 +220,9 @@ constructor(reactTextViewManagerCallback: ReactTextViewManagerCallback? = null) init { LegacyArchitectureLogger.assertLegacyArchitecture( - "ReactTextInputShadowNode", LegacyArchitectureLogLevel.ERROR) + "ReactTextInputShadowNode", + LegacyArchitectureLogLevel.ERROR, + ) } } } diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputSubmitEditingEvent.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputSubmitEditingEvent.kt index 169cc0fec25..bedb6ebf097 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputSubmitEditingEvent.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputSubmitEditingEvent.kt @@ -15,7 +15,7 @@ import com.facebook.react.uimanager.events.Event internal class ReactTextInputSubmitEditingEvent( surfaceId: Int, viewId: Int, - private val text: String + private val text: String, ) : Event(surfaceId, viewId) { override fun getEventName(): String = EVENT_NAME diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputTextWatcher.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputTextWatcher.kt index bb3650ed5bf..c55bfea9e54 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputTextWatcher.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputTextWatcher.kt @@ -17,7 +17,7 @@ import com.facebook.react.uimanager.events.EventDispatcher internal class ReactTextInputTextWatcher( reactContext: ReactContext, - private val editText: ReactEditText + private val editText: ReactEditText, ) : TextWatcher { private val eventDispatcher: EventDispatcher? = UIManagerHelper.getEventDispatcherForReactTag(reactContext, editText.id) @@ -59,7 +59,11 @@ internal class ReactTextInputTextWatcher( // The event that contains the event counter and updates it must be sent first. eventDispatcher?.dispatchEvent( ReactTextChangedEvent( - surfaceId, editText.id, s.toString(), editText.incrementAndGetEventCounter())) + surfaceId, + editText.id, + s.toString(), + editText.incrementAndGetEventCounter(), + )) } override fun afterTextChanged(s: Editable) = Unit diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextScrollWatcher.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextScrollWatcher.kt index 51470850b71..be45eb8528e 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextScrollWatcher.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextScrollWatcher.kt @@ -38,7 +38,8 @@ internal class ReactTextScrollWatcher(private val editText: ReactEditText) : Scr 0, // can't get content width 0, // can't get content height editText.width, - editText.height) + editText.height, + ) eventDispatcher?.dispatchEvent(event) diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/view/CanvasUtil.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/view/CanvasUtil.kt index cca90cc2e9d..a0fd7b7da9c 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/view/CanvasUtil.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/view/CanvasUtil.kt @@ -61,13 +61,22 @@ internal object CanvasUtil { Class::class .java .getDeclaredMethod( - "getDeclaredMethod", String::class.java, Array::class.java) + "getDeclaredMethod", + String::class.java, + Array::class.java, + ) reorderBarrierMethod = getDeclaredMethod.invoke( - Canvas::class.java, "insertReorderBarrier", arrayOfNulls>(0)) as Method + Canvas::class.java, + "insertReorderBarrier", + arrayOfNulls>(0), + ) as Method inorderBarrierMethod = getDeclaredMethod.invoke( - Canvas::class.java, "insertInorderBarrier", arrayOfNulls>(0)) as Method + Canvas::class.java, + "insertInorderBarrier", + arrayOfNulls>(0), + ) as Method } else { reorderBarrierMethod = Canvas::class.java.getDeclaredMethod("insertReorderBarrier") inorderBarrierMethod = Canvas::class.java.getDeclaredMethod("insertInorderBarrier") diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/view/ReactDrawableHelper.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/view/ReactDrawableHelper.kt index 735d69bd290..d6a3d52d825 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/view/ReactDrawableHelper.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/view/ReactDrawableHelper.kt @@ -31,7 +31,7 @@ public object ReactDrawableHelper { @JvmStatic public fun createDrawableFromJSDescription( context: Context, - drawableDescriptionDict: ReadableMap + drawableDescriptionDict: ReadableMap, ): Drawable? { val type = drawableDescriptionDict.getString("type") if ("ThemeAttrAndroid" == type) { @@ -69,7 +69,7 @@ public object ReactDrawableHelper { private fun getRippleDrawable( context: Context, - drawableDescriptionDict: ReadableMap + drawableDescriptionDict: ReadableMap, ): RippleDrawable { val color = getColor(context, drawableDescriptionDict) val mask = getMask(drawableDescriptionDict) @@ -92,7 +92,10 @@ public object ReactDrawableHelper { drawableDescriptionDict.getInt(ViewProps.COLOR) } else { if (context.theme.resolveAttribute( - android.R.attr.colorControlHighlight, resolveOutValue, true)) { + android.R.attr.colorControlHighlight, + resolveOutValue, + true, + )) { context.resources.getColor(resolveOutValue.resourceId, context.theme) } else { throw JSApplicationIllegalArgumentException( diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/view/ReactViewGroup.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/view/ReactViewGroup.kt index 1eddf361d42..dafbd54466b 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/view/ReactViewGroup.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/view/ReactViewGroup.kt @@ -106,7 +106,7 @@ public open class ReactViewGroup public constructor(context: Context?) : oldLeft: Int, oldTop: Int, oldRight: Int, - oldBottom: Int + oldBottom: Int, ) { if (parent?.removeClippedSubviews == true) { parent?.updateSubviewClipStatus(v) @@ -227,7 +227,9 @@ public open class ReactViewGroup public constructor(context: Context?) : assertExplicitMeasureSpec(widthMeasureSpec, heightMeasureSpec) setMeasuredDimension( - MeasureSpec.getSize(widthMeasureSpec), MeasureSpec.getSize(heightMeasureSpec)) + MeasureSpec.getSize(widthMeasureSpec), + MeasureSpec.getSize(heightMeasureSpec), + ) } override fun onLayout(changed: Boolean, left: Int, top: Int, right: Int, bottom: Int) { @@ -326,7 +328,8 @@ public open class ReactViewGroup public constructor(context: Context?) : @Deprecated( message = "setBorderRadius(Float) is deprecated and will be removed in the future.", - replaceWith = ReplaceWith("setBorderRadius(Float,LengthPercentage)")) + replaceWith = ReplaceWith("setBorderRadius(Float,LengthPercentage)"), + ) public fun setBorderRadius(borderRadius: Float) { val radius = if (borderRadius.isNaN()) null @@ -336,7 +339,8 @@ public open class ReactViewGroup public constructor(context: Context?) : @Deprecated( message = "setBorderRadius(Float) is deprecated and will be removed in the future.", - replaceWith = ReplaceWith("setBorderRadius(Float,LengthPercentage)")) + replaceWith = ReplaceWith("setBorderRadius(Float,LengthPercentage)"), + ) public fun setBorderRadius(borderRadius: Float, position: Int) { val radius = if (borderRadius.isNaN()) null @@ -445,7 +449,8 @@ public open class ReactViewGroup public constructor(context: Context?) : throw IllegalStateException( "Invalid clipping state. i=$i clippedSoFar=$clippedSoFar count=$childCount allChildrenCount=$allChildrenCount recycleCount=$recycleCount realClippedSoFar=$realClippedSoFar uniqueViewsCount=${uniqueViews.size} excludedViews=${excludedViewsSet?.size ?: 0}", - ex) + ex, + ) } if (isViewClipped(childArray[i], i)) { clippedSoFar++ @@ -462,7 +467,7 @@ public open class ReactViewGroup public constructor(context: Context?) : clippingRect: Rect, idx: Int, clippedSoFar: Int, - excludedViewsSet: Set? = null + excludedViewsSet: Set? = null, ) { assertOnUiThread() @@ -602,7 +607,8 @@ public open class ReactViewGroup public constructor(context: Context?) : if (expectedTag != tag) { logSoftException( ReactSoftExceptionLogger.Categories.RVG_ON_VIEW_REMOVED, - ReactNoCrashSoftException("View clipping tag mismatch: tag=$tag expected=$expectedTag")) + ReactNoCrashSoftException("View clipping tag mismatch: tag=$tag expected=$expectedTag"), + ) } } if (_removeClippedSubviews) { @@ -686,7 +692,8 @@ public open class ReactViewGroup public constructor(context: Context?) : logSoftException( ReactSoftExceptionLogger.Categories.CLIPPING_PROHIBITED_VIEW, ReactNoCrashSoftException( - "Child view has been added to Parent view in which it is clipped and not visible. This is not legal for this particular child view. Child: [${child.id}] $child Parent: [$id] ${toString()}")) + "Child view has been added to Parent view in which it is clipped and not visible. This is not legal for this particular child view. Child: [${child.id}] $child Parent: [$id] ${toString()}"), + ) } } }) @@ -740,7 +747,8 @@ public open class ReactViewGroup public constructor(context: Context?) : logSoftException( ReactSoftExceptionLogger.Categories.RVG_IS_VIEW_CLIPPED, ReactNoCrashSoftException( - "View missing clipping tag: index=$index parentNull=${parent == null} parentThis=${parent === this} transitioning=$transitioning")) + "View missing clipping tag: index=$index parentNull=${parent == null} parentThis=${parent === this} transitioning=$transitioning"), + ) } // fallback - should be transitioning or have no parent if the view was removed if (parent == null || transitioning) { @@ -857,7 +865,8 @@ public open class ReactViewGroup public constructor(context: Context?) : overflowInset.top.toFloat(), (width + -overflowInset.right).toFloat(), (height + -overflowInset.bottom).toFloat(), - null) + null, + ) super.draw(canvas) canvas.restore() } else { @@ -893,7 +902,8 @@ public open class ReactViewGroup public constructor(context: Context?) : overflowInset.top.toFloat(), (width + -overflowInset.right).toFloat(), (height + -overflowInset.bottom).toFloat(), - p) + p, + ) } } diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/view/ReactViewManager.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/view/ReactViewManager.kt index 79ee18f0421..6f8298187fa 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/view/ReactViewManager.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/view/ReactViewManager.kt @@ -72,7 +72,7 @@ public open class ReactViewManager : ReactClippingViewManager() override fun prepareToRecycleView( reactContext: ThemedReactContext, - view: ReactViewGroup + view: ReactViewGroup, ): ReactViewGroup? { // We don't want to run the view clipping when the view is being prepared for recycling to avoid // have size changes iterate over child view that should be removed anyway @@ -207,7 +207,8 @@ public open class ReactViewManager : ReactClippingViewManager() @Deprecated( "Don't use setBorderRadius(view, int, Float) as it was deprecated in React Native 0.75.0.", - ReplaceWith("setBorderRadius(view, index, DynamicFromObject(borderRadius)")) + ReplaceWith("setBorderRadius(view, index, DynamicFromObject(borderRadius)"), + ) public open fun setBorderRadius(view: ReactViewGroup, index: Int, borderRadius: Float) { setBorderRadius(view, index, DynamicFromObject(borderRadius)) } @@ -272,7 +273,7 @@ public open class ReactViewManager : ReactClippingViewManager() @ReactProp(name = ViewProps.NEEDS_OFFSCREEN_ALPHA_COMPOSITING) public open fun setNeedsOffscreenAlphaCompositing( view: ReactViewGroup, - needsOffscreenAlphaCompositing: Boolean + needsOffscreenAlphaCompositing: Boolean, ) { view.setNeedsOffscreenAlphaCompositing(needsOffscreenAlphaCompositing) } @@ -288,7 +289,8 @@ public open class ReactViewManager : ReactClippingViewManager() ViewProps.BORDER_START_WIDTH, ViewProps.BORDER_END_WIDTH, ], - defaultFloat = Float.NaN) + defaultFloat = Float.NaN, + ) public open fun setBorderWidth(view: ReactViewGroup, index: Int, width: Float) { BackgroundStyleApplicator.setBorderWidth(view, LogicalEdge.values()[index], width) } @@ -307,10 +309,14 @@ public open class ReactViewManager : ReactClippingViewManager() ViewProps.BORDER_BLOCK_END_COLOR, ViewProps.BORDER_BLOCK_START_COLOR, ], - customType = "Color") + customType = "Color", + ) public open fun setBorderColor(view: ReactViewGroup, index: Int, color: Int?) { BackgroundStyleApplicator.setBorderColor( - view, LogicalEdge.fromSpacingType(SPACING_TYPES[index]), color) + view, + LogicalEdge.fromSpacingType(SPACING_TYPES[index]), + color, + ) } @ReactProp(name = ViewProps.COLLAPSABLE) @@ -364,7 +370,7 @@ public open class ReactViewManager : ReactClippingViewManager() override fun setTransformProperty( view: ReactViewGroup, transforms: ReadableArray?, - transformOrigin: ReadableArray? + transformOrigin: ReadableArray?, ) { super.setTransformProperty(view, transforms, transformOrigin) view.setBackfaceVisibilityDependantOpacity() @@ -380,7 +386,8 @@ public open class ReactViewManager : ReactClippingViewManager() @Deprecated( "Use receiveCommand(View, String, ReadableArray)", - ReplaceWith("receiveCommand(root, commandIdString, args)")) + ReplaceWith("receiveCommand(root, commandIdString, args)"), + ) override fun receiveCommand(root: ReactViewGroup, commandId: Int, args: ReadableArray?) { when (commandId) { CMD_HOTSPOT_UPDATE -> handleHotspotUpdate(root, args) diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/view/WindowUtil.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/view/WindowUtil.kt index 60f2a944856..0cff3bc458d 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/view/WindowUtil.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/view/WindowUtil.kt @@ -48,7 +48,8 @@ internal fun Window.setStatusBarTranslucency(isTranslucent: Boolean) { defaultInsets.systemWindowInsetLeft, 0, defaultInsets.systemWindowInsetRight, - defaultInsets.systemWindowInsetBottom) + defaultInsets.systemWindowInsetBottom, + ) } } else { decorView.setOnApplyWindowInsetsListener(null) diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/virtual/view/ReactVirtualView.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/virtual/view/ReactVirtualView.kt index b09beeed5c0..35acd86f7de 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/virtual/view/ReactVirtualView.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/virtual/view/ReactVirtualView.kt @@ -127,7 +127,7 @@ public class ReactVirtualView(context: Context) : oldLeft: Int, oldTop: Int, oldRight: Int, - oldBottom: Int + oldBottom: Int, ) { offsetChanged = offsetChanged || oldLeft != left || oldTop != top dispatchOnModeChangeIfNeeded(true) @@ -141,7 +141,7 @@ public class ReactVirtualView(context: Context) : scrollView: ViewGroup?, scrollEventType: ScrollEventType?, xVelocity: Float, - yVelocity: Float + yVelocity: Float, ) { if (scrollView == parentScrollView) { dispatchOnModeChangeIfNeeded(checkRectChange = false) @@ -219,7 +219,8 @@ public class ReactVirtualView(context: Context) : if (prerenderRatio > 0.0) { thresholdRect.inset( (-thresholdRect.width() * prerenderRatio).toInt(), - (-thresholdRect.height() * prerenderRatio).toInt()) + (-thresholdRect.height() * prerenderRatio).toInt(), + ) prerender = rectsOverlap(targetRect, thresholdRect) } if (prerender) { @@ -271,7 +272,8 @@ public class ReactVirtualView(context: Context) : debugLog("Mode change") { "$oldMode->$newMode" } Systrace.beginSection( Systrace.TRACE_TAG_REACT, - "VirtualView::mode change $oldMode -> $newMode, nativeID=$nativeId") + "VirtualView::mode change $oldMode -> $newMode, nativeID=$nativeId", + ) when (newMode) { VirtualViewMode.Visible -> { if (renderState == VirtualViewRenderState.Unknown) { diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/virtual/view/ReactVirtualViewManager.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/virtual/view/ReactVirtualViewManager.kt index 9a07271c550..d3dea830788 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/virtual/view/ReactVirtualViewManager.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/virtual/view/ReactVirtualViewManager.kt @@ -85,7 +85,7 @@ public class ReactVirtualViewManager : public class VirtualViewEventEmitter( private val viewId: Int, private val surfaceId: Int, - private val dispatcher: EventDispatcher + private val dispatcher: EventDispatcher, ) : VirtualViewModeChangeEmitter { override fun emitModeChange( mode: VirtualViewMode, diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/virtual/viewexperimental/ReactVirtualViewExperimental.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/virtual/viewexperimental/ReactVirtualViewExperimental.kt index 42025395027..ec7dd29b69f 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/virtual/viewexperimental/ReactVirtualViewExperimental.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/virtual/viewexperimental/ReactVirtualViewExperimental.kt @@ -84,7 +84,7 @@ public class ReactVirtualViewExperimental(context: Context) : oldLeft: Int, oldTop: Int, oldRight: Int, - oldBottom: Int + oldBottom: Int, ) { if (oldLeft != left || oldTop != top) { updateParentOffset() @@ -128,7 +128,11 @@ public class ReactVirtualViewExperimental(context: Context) : if (renderState == VirtualViewRenderState.Unknown) { // Feature flag is disabled, so use the former logic. modeChangeEmitter?.emitModeChange( - VirtualViewMode.Visible, containerRelativeRect, thresholdRect, synchronous = true) + VirtualViewMode.Visible, + containerRelativeRect, + thresholdRect, + synchronous = true, + ) } else { // If the previous mode was prerender and the result of dispatching that event was // committed, we do not need to dispatch an event for visible. @@ -136,19 +140,31 @@ public class ReactVirtualViewExperimental(context: Context) : oldMode == VirtualViewMode.Prerender && renderState == VirtualViewRenderState.Rendered if (!wasPrerenderCommitted) { modeChangeEmitter?.emitModeChange( - VirtualViewMode.Visible, containerRelativeRect, thresholdRect, synchronous = true) + VirtualViewMode.Visible, + containerRelativeRect, + thresholdRect, + synchronous = true, + ) } } } VirtualViewMode.Prerender -> { if (oldMode != VirtualViewMode.Visible) { modeChangeEmitter?.emitModeChange( - VirtualViewMode.Prerender, containerRelativeRect, thresholdRect, synchronous = false) + VirtualViewMode.Prerender, + containerRelativeRect, + thresholdRect, + synchronous = false, + ) } } VirtualViewMode.Hidden -> { modeChangeEmitter?.emitModeChange( - VirtualViewMode.Hidden, containerRelativeRect, thresholdRect, synchronous = false) + VirtualViewMode.Hidden, + containerRelativeRect, + thresholdRect, + synchronous = false, + ) } } } diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/virtual/viewexperimental/ReactVirtualViewExperimentalManager.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/virtual/viewexperimental/ReactVirtualViewExperimentalManager.kt index 66993aeaef1..ac194d860bc 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/virtual/viewexperimental/ReactVirtualViewExperimentalManager.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/virtual/viewexperimental/ReactVirtualViewExperimentalManager.kt @@ -64,7 +64,7 @@ public class ReactVirtualViewExperimentalManager : override fun addEventEmitters( reactContext: ThemedReactContext, - view: ReactVirtualViewExperimental + view: ReactVirtualViewExperimental, ) { val dispatcher = UIManagerHelper.getEventDispatcherForReactTag(reactContext, view.id) ?: return view.modeChangeEmitter = @@ -88,7 +88,7 @@ public class ReactVirtualViewExperimentalManager : public class VirtualViewEventEmitter( private val viewId: Int, private val surfaceId: Int, - private val dispatcher: EventDispatcher + private val dispatcher: EventDispatcher, ) : VirtualViewModeChangeEmitter { override fun emitModeChange( mode: VirtualViewMode, diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/systrace/Systrace.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/systrace/Systrace.kt index 95a2556b0cb..6349fc234f7 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/systrace/Systrace.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/systrace/Systrace.kt @@ -110,6 +110,6 @@ internal object Systrace { enum class EventScope(val code: Char) { THREAD('t'), PROCESS('p'), - GLOBAL('g') + GLOBAL('g'), } } diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/systrace/SystraceMessage.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/systrace/SystraceMessage.kt index 6a397548c1c..c60ae92e1bd 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/systrace/SystraceMessage.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/systrace/SystraceMessage.kt @@ -43,7 +43,8 @@ internal object SystraceMessage { " (${java.lang.String.join(", ", args)})" } else { "" - }) + }, + ) } override fun arg(key: String, value: Any): Builder { diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/yoga/YogaMeasureFunction.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/yoga/YogaMeasureFunction.kt index 10b5cfc0d5d..53109a08f3b 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/yoga/YogaMeasureFunction.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/yoga/YogaMeasureFunction.kt @@ -14,6 +14,6 @@ public fun interface YogaMeasureFunction { width: Float, widthMode: YogaMeasureMode, height: Float, - heightMode: YogaMeasureMode + heightMode: YogaMeasureMode, ): Long } diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/yoga/annotations/DoNotStrip.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/yoga/annotations/DoNotStrip.kt index c0890371726..532bb060d28 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/yoga/annotations/DoNotStrip.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/yoga/annotations/DoNotStrip.kt @@ -13,6 +13,7 @@ package com.facebook.yoga.annotations AnnotationTarget.FUNCTION, AnnotationTarget.PROPERTY_GETTER, AnnotationTarget.PROPERTY_SETTER, - AnnotationTarget.CONSTRUCTOR) + AnnotationTarget.CONSTRUCTOR, +) @Retention(AnnotationRetention.BINARY) public annotation class DoNotStrip diff --git a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/RootViewTest.kt b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/RootViewTest.kt index 4ee6636e0b0..fd92a4bd393 100644 --- a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/RootViewTest.kt +++ b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/RootViewTest.kt @@ -131,7 +131,8 @@ class RootViewTest { "identifier", 0.0, "targetSurface", - -1)) + -1, + )) // Test ACTION_UP event reset(eventEmitterModuleMock, eventDispatcher) @@ -163,7 +164,8 @@ class RootViewTest { "identifier", 0.0, "targetSurface", - -1)) + -1, + )) // Test other action reset(eventDispatcher) diff --git a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/animated/NativeAnimatedInterpolationTest.kt b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/animated/NativeAnimatedInterpolationTest.kt index 32355ae5fb6..7d48203548b 100644 --- a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/animated/NativeAnimatedInterpolationTest.kt +++ b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/animated/NativeAnimatedInterpolationTest.kt @@ -75,7 +75,8 @@ class NativeAnimatedInterpolationTest { input, output, InterpolationAnimatedNode.EXTRAPOLATE_TYPE_CLAMP, - InterpolationAnimatedNode.EXTRAPOLATE_TYPE_CLAMP)) + InterpolationAnimatedNode.EXTRAPOLATE_TYPE_CLAMP, + )) .isEqualTo(1.0) assertThat( InterpolationAnimatedNode.interpolate( @@ -83,7 +84,8 @@ class NativeAnimatedInterpolationTest { input, output, InterpolationAnimatedNode.EXTRAPOLATE_TYPE_CLAMP, - InterpolationAnimatedNode.EXTRAPOLATE_TYPE_CLAMP)) + InterpolationAnimatedNode.EXTRAPOLATE_TYPE_CLAMP, + )) .isEqualTo(0.0) } @@ -97,7 +99,8 @@ class NativeAnimatedInterpolationTest { input, output, InterpolationAnimatedNode.EXTRAPOLATE_TYPE_IDENTITY, - InterpolationAnimatedNode.EXTRAPOLATE_TYPE_IDENTITY)) + InterpolationAnimatedNode.EXTRAPOLATE_TYPE_IDENTITY, + )) .isEqualTo(30.0) assertThat( InterpolationAnimatedNode.interpolate( @@ -105,7 +108,8 @@ class NativeAnimatedInterpolationTest { input, output, InterpolationAnimatedNode.EXTRAPOLATE_TYPE_IDENTITY, - InterpolationAnimatedNode.EXTRAPOLATE_TYPE_IDENTITY)) + InterpolationAnimatedNode.EXTRAPOLATE_TYPE_IDENTITY, + )) .isEqualTo(5.0) } @@ -125,7 +129,8 @@ class NativeAnimatedInterpolationTest { val output = arrayOf( doubleArrayOf(20.0, 20.0, 20.0, 80.0, 80.0, 80.0, 80.0, 20.0), - doubleArrayOf(40.0, 40.0, 33.0, 60.0, 60.0, 60.0, 65.0, 40.0)) + doubleArrayOf(40.0, 40.0, 33.0, 60.0, 60.0, 60.0, 65.0, 40.0), + ) val pattern = "M20,20L20,80L80,80L80,20Z" assertThat( InterpolationAnimatedNode.interpolateString( @@ -134,7 +139,8 @@ class NativeAnimatedInterpolationTest { input, output, InterpolationAnimatedNode.EXTRAPOLATE_TYPE_IDENTITY, - InterpolationAnimatedNode.EXTRAPOLATE_TYPE_IDENTITY)) + InterpolationAnimatedNode.EXTRAPOLATE_TYPE_IDENTITY, + )) .isEqualTo("M20,20L20,80L80,80L80,20Z") assertThat( InterpolationAnimatedNode.interpolateString( @@ -143,7 +149,8 @@ class NativeAnimatedInterpolationTest { input, output, InterpolationAnimatedNode.EXTRAPOLATE_TYPE_IDENTITY, - InterpolationAnimatedNode.EXTRAPOLATE_TYPE_IDENTITY)) + InterpolationAnimatedNode.EXTRAPOLATE_TYPE_IDENTITY, + )) .isEqualTo("M30,30L26.5,70L70,70L72.5,30Z") } @@ -153,5 +160,6 @@ class NativeAnimatedInterpolationTest { input, output, InterpolationAnimatedNode.EXTRAPOLATE_TYPE_EXTEND, - InterpolationAnimatedNode.EXTRAPOLATE_TYPE_EXTEND) + InterpolationAnimatedNode.EXTRAPOLATE_TYPE_EXTEND, + ) } diff --git a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/animated/NativeAnimatedNodeTraversalTest.kt b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/animated/NativeAnimatedNodeTraversalTest.kt index 065c804e437..730c36e0cb1 100644 --- a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/animated/NativeAnimatedNodeTraversalTest.kt +++ b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/animated/NativeAnimatedNodeTraversalTest.kt @@ -115,11 +115,17 @@ class NativeAnimatedNodeTraversalTest { private fun createSimpleAnimatedViewWithOpacity(viewTag: Int = 1000) { val opacity = 0.0 nativeAnimatedNodesManager.createAnimatedNode( - 1, JavaOnlyMap.of("type", "value", "value", opacity, "offset", 0.0)) + 1, + JavaOnlyMap.of("type", "value", "value", opacity, "offset", 0.0), + ) nativeAnimatedNodesManager.createAnimatedNode( - 2, JavaOnlyMap.of("type", "style", "style", JavaOnlyMap.of("opacity", 1))) + 2, + JavaOnlyMap.of("type", "style", "style", JavaOnlyMap.of("opacity", 1)), + ) nativeAnimatedNodesManager.createAnimatedNode( - 3, JavaOnlyMap.of("type", "props", "props", JavaOnlyMap.of("style", 2))) + 3, + JavaOnlyMap.of("type", "props", "props", JavaOnlyMap.of("style", 2)), + ) nativeAnimatedNodesManager.connectAnimatedNodes(1, 2) nativeAnimatedNodesManager.connectAnimatedNodes(2, 3) nativeAnimatedNodesManager.connectAnimatedNodeToView(3, viewTag) @@ -133,7 +139,11 @@ class NativeAnimatedNodeTraversalTest { val animationCallback: Callback = mock() nativeAnimatedNodesManager.startAnimatingNode( - 1, 1, JavaOnlyMap.of("type", "frames", "frames", frames, "toValue", 1.0), animationCallback) + 1, + 1, + JavaOnlyMap.of("type", "frames", "frames", frames, "toValue", 1.0), + animationCallback, + ) val stylesCaptor: ArgumentCaptor = ArgumentCaptor.forClass(ReadableMap::class.java) @@ -160,7 +170,8 @@ class NativeAnimatedNodeTraversalTest { 1, 1, JavaOnlyMap.of("type", "frames", "frames", frames, "toValue", 1.0, "iterations", 2), - animationCallback) + animationCallback, + ) val stylesCaptor: ArgumentCaptor = ArgumentCaptor.forClass(ReadableMap::class.java) @@ -193,7 +204,8 @@ class NativeAnimatedNodeTraversalTest { 1, 1, JavaOnlyMap.of("type", "frames", "frames", frames, "toValue", 1.0, "iterations", 5), - animationCallback) + animationCallback, + ) val stylesCaptor: ArgumentCaptor = ArgumentCaptor.forClass(ReadableMap::class.java) @@ -226,7 +238,8 @@ class NativeAnimatedNodeTraversalTest { 1, nodeId, JavaOnlyMap.of("type", "frames", "frames", frames, "toValue", 1.0), - animationCallback) + animationCallback, + ) nativeAnimatedNodesManager.runUpdates(nextFrameTime()) verify(valueListener).onValueUpdate(eq(0.0), eq(0.0)) @@ -253,7 +266,8 @@ class NativeAnimatedNodeTraversalTest { 1, nodeId, JavaOnlyMap.of("type", "frames", "frames", frames, "toValue", 1.0), - animationCallback) + animationCallback, + ) for (i in 0 until frames.size()) { reset(valueListener) @@ -268,7 +282,7 @@ class NativeAnimatedNodeTraversalTest { private fun performSpringAnimationTestWithConfig( config: JavaOnlyMap, - testForCriticallyDamped: Boolean + testForCriticallyDamped: Boolean, ) { createSimpleAnimatedViewWithOpacity() @@ -335,8 +349,10 @@ class NativeAnimatedNodeTraversalTest { "restDisplacementThreshold", 0.001, "overshootClamping", - false), - false) + false, + ), + false, + ) } @Test @@ -360,8 +376,10 @@ class NativeAnimatedNodeTraversalTest { "restDisplacementThreshold", 0.001, "overshootClamping", - false), - true) + false, + ), + true, + ) } @Test @@ -392,8 +410,10 @@ class NativeAnimatedNodeTraversalTest { "overshootClamping", false, "iterations", - 5), - animationCallback) + 5, + ), + animationCallback, + ) val stylesCaptor: ArgumentCaptor = ArgumentCaptor.forClass(ReadableMap::class.java) @@ -452,7 +472,8 @@ class NativeAnimatedNodeTraversalTest { 1, 1, JavaOnlyMap.of("type", "decay", "velocity", 0.5, "deceleration", 0.998), - animationCallback) + animationCallback, + ) val stylesCaptor: ArgumentCaptor = ArgumentCaptor.forClass(ReadableMap::class.java) @@ -502,7 +523,8 @@ class NativeAnimatedNodeTraversalTest { 1, 1, JavaOnlyMap.of("type", "decay", "velocity", 0.5, "deceleration", 0.998, "iterations", 5), - animationCallback) + animationCallback, + ) val stylesCaptor: ArgumentCaptor = ArgumentCaptor.forClass(ReadableMap::class.java) @@ -552,7 +574,11 @@ class NativeAnimatedNodeTraversalTest { val frames: JavaOnlyArray = JavaOnlyArray.of(0.0, 1.0) val animationCallback: Callback = mock() nativeAnimatedNodesManager.startAnimatingNode( - 1, 1, JavaOnlyMap.of("type", "frames", "frames", frames, "toValue", 1.0), animationCallback) + 1, + 1, + JavaOnlyMap.of("type", "frames", "frames", frames, "toValue", 1.0), + animationCallback, + ) val callbackResponseCaptor: ArgumentCaptor = ArgumentCaptor.forClass(ReadableMap::class.java) @@ -582,20 +608,30 @@ class NativeAnimatedNodeTraversalTest { private fun createAnimatedGraphWithAdditionNode( viewTag: Int = 50, firstValue: Double = 100.0, - secondValue: Double = 1000.0 + secondValue: Double = 1000.0, ) { nativeAnimatedNodesManager.createAnimatedNode( - 1, JavaOnlyMap.of("type", "value", "value", firstValue, "offset", 0.0)) + 1, + JavaOnlyMap.of("type", "value", "value", firstValue, "offset", 0.0), + ) nativeAnimatedNodesManager.createAnimatedNode( - 2, JavaOnlyMap.of("type", "value", "value", secondValue, "offset", 0.0)) + 2, + JavaOnlyMap.of("type", "value", "value", secondValue, "offset", 0.0), + ) nativeAnimatedNodesManager.createAnimatedNode( - 3, JavaOnlyMap.of("type", "addition", "input", JavaOnlyArray.of(1, 2))) + 3, + JavaOnlyMap.of("type", "addition", "input", JavaOnlyArray.of(1, 2)), + ) nativeAnimatedNodesManager.createAnimatedNode( - 4, JavaOnlyMap.of("type", "style", "style", JavaOnlyMap.of("translateX", 3))) + 4, + JavaOnlyMap.of("type", "style", "style", JavaOnlyMap.of("translateX", 3)), + ) nativeAnimatedNodesManager.createAnimatedNode( - 5, JavaOnlyMap.of("type", "props", "props", JavaOnlyMap.of("style", 4))) + 5, + JavaOnlyMap.of("type", "props", "props", JavaOnlyMap.of("style", 4)), + ) nativeAnimatedNodesManager.connectAnimatedNodes(1, 3) nativeAnimatedNodesManager.connectAnimatedNodes(2, 3) nativeAnimatedNodesManager.connectAnimatedNodes(3, 4) @@ -613,13 +649,15 @@ class NativeAnimatedNodeTraversalTest { 1, 1, JavaOnlyMap.of("type", "frames", "frames", frames, "toValue", 101.0), - animationCallback) + animationCallback, + ) nativeAnimatedNodesManager.startAnimatingNode( 2, 2, JavaOnlyMap.of("type", "frames", "frames", frames, "toValue", 1010.0), - animationCallback) + animationCallback, + ) val stylesCaptor: ArgumentCaptor = ArgumentCaptor.forClass(ReadableMap::class.java) @@ -656,7 +694,8 @@ class NativeAnimatedNodeTraversalTest { 1, 1, JavaOnlyMap.of("type", "frames", "frames", frames, "toValue", 101.0), - animationCallback) + animationCallback, + ) val stylesCaptor: ArgumentCaptor = ArgumentCaptor.forClass(ReadableMap::class.java) @@ -695,7 +734,8 @@ class NativeAnimatedNodeTraversalTest { 1, 1, JavaOnlyMap.of("type", "frames", "frames", firstFrames, "toValue", 200.0), - animationCallback) + animationCallback, + ) // Start animating for the first addition input node, will have 6 frames val secondFrames: JavaOnlyArray = JavaOnlyArray.of(0.0, 0.2, 0.4, 0.6, 0.8, 1.0) @@ -703,7 +743,8 @@ class NativeAnimatedNodeTraversalTest { 2, 2, JavaOnlyMap.of("type", "frames", "frames", secondFrames, "toValue", 1010.0), - animationCallback) + animationCallback, + ) val stylesCaptor: ArgumentCaptor = ArgumentCaptor.forClass(ReadableMap::class.java) @@ -728,17 +769,27 @@ class NativeAnimatedNodeTraversalTest { @Test fun testMultiplicationNode() { nativeAnimatedNodesManager.createAnimatedNode( - 1, JavaOnlyMap.of("type", "value", "value", 1.0, "offset", 0.0)) + 1, + JavaOnlyMap.of("type", "value", "value", 1.0, "offset", 0.0), + ) nativeAnimatedNodesManager.createAnimatedNode( - 2, JavaOnlyMap.of("type", "value", "value", 5.0, "offset", 0.0)) + 2, + JavaOnlyMap.of("type", "value", "value", 5.0, "offset", 0.0), + ) nativeAnimatedNodesManager.createAnimatedNode( - 3, JavaOnlyMap.of("type", "multiplication", "input", JavaOnlyArray.of(1, 2))) + 3, + JavaOnlyMap.of("type", "multiplication", "input", JavaOnlyArray.of(1, 2)), + ) nativeAnimatedNodesManager.createAnimatedNode( - 4, JavaOnlyMap.of("type", "style", "style", JavaOnlyMap.of("translateX", 3))) + 4, + JavaOnlyMap.of("type", "style", "style", JavaOnlyMap.of("translateX", 3)), + ) nativeAnimatedNodesManager.createAnimatedNode( - 5, JavaOnlyMap.of("type", "props", "props", JavaOnlyMap.of("style", 4))) + 5, + JavaOnlyMap.of("type", "props", "props", JavaOnlyMap.of("style", 4)), + ) nativeAnimatedNodesManager.connectAnimatedNodes(1, 3) nativeAnimatedNodesManager.connectAnimatedNodes(2, 3) nativeAnimatedNodesManager.connectAnimatedNodes(3, 4) @@ -748,13 +799,18 @@ class NativeAnimatedNodeTraversalTest { val animationCallback: Callback = mock() val frames: JavaOnlyArray = JavaOnlyArray.of(0.0, 1.0) nativeAnimatedNodesManager.startAnimatingNode( - 1, 1, JavaOnlyMap.of("type", "frames", "frames", frames, "toValue", 2.0), animationCallback) + 1, + 1, + JavaOnlyMap.of("type", "frames", "frames", frames, "toValue", 2.0), + animationCallback, + ) nativeAnimatedNodesManager.startAnimatingNode( 2, 2, JavaOnlyMap.of("type", "frames", "frames", frames, "toValue", 10.0), - animationCallback) + animationCallback, + ) val stylesCaptor: ArgumentCaptor = ArgumentCaptor.forClass(ReadableMap::class.java) @@ -788,7 +844,8 @@ class NativeAnimatedNodeTraversalTest { 404, 1, JavaOnlyMap.of("type", "frames", "frames", frames, "toValue", 1.0), - animationCallback) + animationCallback, + ) val callbackResponseCaptor: ArgumentCaptor = ArgumentCaptor.forClass(ReadableMap::class.java) @@ -827,7 +884,9 @@ class NativeAnimatedNodeTraversalTest { fun testGetValue() { val tag = 1 nativeAnimatedNodesManager.createAnimatedNode( - tag, JavaOnlyMap.of("type", "value", "value", 1.0, "offset", 0.0)) + tag, + JavaOnlyMap.of("type", "value", "value", 1.0, "offset", 0.0), + ) val saveValueCallbackMock: Callback = mock() @@ -839,7 +898,9 @@ class NativeAnimatedNodeTraversalTest { @Test fun testInterpolationNode() { nativeAnimatedNodesManager.createAnimatedNode( - 1, JavaOnlyMap.of("type", "value", "value", 10.0, "offset", 0.0)) + 1, + JavaOnlyMap.of("type", "value", "value", 10.0, "offset", 0.0), + ) nativeAnimatedNodesManager.createAnimatedNode( 2, @@ -853,12 +914,18 @@ class NativeAnimatedNodeTraversalTest { "extrapolateLeft", "extend", "extrapolateRight", - "extend")) + "extend", + ), + ) nativeAnimatedNodesManager.createAnimatedNode( - 3, JavaOnlyMap.of("type", "style", "style", JavaOnlyMap.of("opacity", 2))) + 3, + JavaOnlyMap.of("type", "style", "style", JavaOnlyMap.of("opacity", 2)), + ) nativeAnimatedNodesManager.createAnimatedNode( - 4, JavaOnlyMap.of("type", "props", "props", JavaOnlyMap.of("style", 3))) + 4, + JavaOnlyMap.of("type", "props", "props", JavaOnlyMap.of("style", 3)), + ) nativeAnimatedNodesManager.connectAnimatedNodes(1, 2) nativeAnimatedNodesManager.connectAnimatedNodes(2, 3) nativeAnimatedNodesManager.connectAnimatedNodes(3, 4) @@ -870,7 +937,8 @@ class NativeAnimatedNodeTraversalTest { 1, 1, JavaOnlyMap.of("type", "frames", "frames", frames, "toValue", 20.0), - animationCallback) + animationCallback, + ) val stylesCaptor: ArgumentCaptor = ArgumentCaptor.forClass(ReadableMap::class.java) @@ -896,7 +964,10 @@ class NativeAnimatedNodeTraversalTest { @Deprecated("Deprecated in Java") override fun dispatch(rctEventEmitter: RCTEventEmitter) { rctEventEmitter.receiveEvent( - tag, "topScroll", JavaOnlyMap.of("contentOffset", JavaOnlyMap.of("y", value))) + tag, + "topScroll", + JavaOnlyMap.of("contentOffset", JavaOnlyMap.of("y", value)), + ) } } @@ -912,7 +983,12 @@ class NativeAnimatedNodeTraversalTest { viewTag, "onScroll", JavaOnlyMap.of( - "animatedValueTag", 1, "nativeEventPath", JavaOnlyArray.of("contentOffset", "y"))) + "animatedValueTag", + 1, + "nativeEventPath", + JavaOnlyArray.of("contentOffset", "y"), + ), + ) nativeAnimatedNodesManager.onEventDispatch(createScrollEvent(viewTag, 10.0)) @@ -934,13 +1010,23 @@ class NativeAnimatedNodeTraversalTest { viewTag, "otherEvent", JavaOnlyMap.of( - "animatedValueTag", 1, "nativeEventPath", JavaOnlyArray.of("contentOffset", "y"))) + "animatedValueTag", + 1, + "nativeEventPath", + JavaOnlyArray.of("contentOffset", "y"), + ), + ) nativeAnimatedNodesManager.addAnimatedEventToView( 999, "topScroll", JavaOnlyMap.of( - "animatedValueTag", 1, "nativeEventPath", JavaOnlyArray.of("contentOffset", "y"))) + "animatedValueTag", + 1, + "nativeEventPath", + JavaOnlyArray.of("contentOffset", "y"), + ), + ) nativeAnimatedNodesManager.onEventDispatch(createScrollEvent(viewTag, 10.0)) @@ -969,7 +1055,12 @@ class NativeAnimatedNodeTraversalTest { viewTag, "onScroll", JavaOnlyMap.of( - "animatedValueTag", 1, "nativeEventPath", JavaOnlyArray.of("contentOffset", "y"))) + "animatedValueTag", + 1, + "nativeEventPath", + JavaOnlyArray.of("contentOffset", "y"), + ), + ) nativeAnimatedNodesManager.onEventDispatch(createScrollEvent(viewTag, 10.0)) @@ -988,11 +1079,17 @@ class NativeAnimatedNodeTraversalTest { // restoreDefaultProps not called in Fabric, make sure it's a non-Fabric tag val propsNodeTag = 3 nativeAnimatedNodesManager.createAnimatedNode( - 1, JavaOnlyMap.of("type", "value", "value", 1.0, "offset", 0.0)) + 1, + JavaOnlyMap.of("type", "value", "value", 1.0, "offset", 0.0), + ) nativeAnimatedNodesManager.createAnimatedNode( - 2, JavaOnlyMap.of("type", "style", "style", JavaOnlyMap.of("opacity", 1))) + 2, + JavaOnlyMap.of("type", "style", "style", JavaOnlyMap.of("opacity", 1)), + ) nativeAnimatedNodesManager.createAnimatedNode( - propsNodeTag, JavaOnlyMap.of("type", "props", "props", JavaOnlyMap.of("style", 2))) + propsNodeTag, + JavaOnlyMap.of("type", "props", "props", JavaOnlyMap.of("style", 2)), + ) nativeAnimatedNodesManager.connectAnimatedNodes(1, 2) nativeAnimatedNodesManager.connectAnimatedNodes(2, propsNodeTag) nativeAnimatedNodesManager.connectAnimatedNodeToView(propsNodeTag, viewTag) @@ -1000,7 +1097,11 @@ class NativeAnimatedNodeTraversalTest { val frames: JavaOnlyArray = JavaOnlyArray.of(0.0, 0.5, 1.0) val animationCallback: Callback = mock() nativeAnimatedNodesManager.startAnimatingNode( - 1, 1, JavaOnlyMap.of("type", "frames", "frames", frames, "toValue", 0.0), animationCallback) + 1, + 1, + JavaOnlyMap.of("type", "frames", "frames", frames, "toValue", 0.0), + animationCallback, + ) val stylesCaptor: ArgumentCaptor = ArgumentCaptor.forClass(ReadableMap::class.java) @@ -1030,9 +1131,13 @@ class NativeAnimatedNodeTraversalTest { initialValue: Double = 0.0, ) { nativeAnimatedNodesManager.createAnimatedNode( - 1, JavaOnlyMap.of("type", "value", "value", initialValue, "offset", 0.0)) + 1, + JavaOnlyMap.of("type", "value", "value", initialValue, "offset", 0.0), + ) nativeAnimatedNodesManager.createAnimatedNode( - 3, JavaOnlyMap.of("type", "value", "value", initialValue, "offset", 0.0)) + 3, + JavaOnlyMap.of("type", "value", "value", initialValue, "offset", 0.0), + ) nativeAnimatedNodesManager.createAnimatedNode( 2, @@ -1046,12 +1151,18 @@ class NativeAnimatedNodeTraversalTest { "toValue", 1, "animationConfig", - animationConfig)) + animationConfig, + ), + ) nativeAnimatedNodesManager.createAnimatedNode( - 4, JavaOnlyMap.of("type", "style", "style", JavaOnlyMap.of("translateX", 3))) + 4, + JavaOnlyMap.of("type", "style", "style", JavaOnlyMap.of("translateX", 3)), + ) nativeAnimatedNodesManager.createAnimatedNode( - 5, JavaOnlyMap.of("type", "props", "props", JavaOnlyMap.of("style", 4))) + 5, + JavaOnlyMap.of("type", "props", "props", JavaOnlyMap.of("style", 4)), + ) nativeAnimatedNodesManager.connectAnimatedNodes(1, 2) nativeAnimatedNodesManager.connectAnimatedNodes(3, 4) nativeAnimatedNodesManager.connectAnimatedNodes(4, 5) @@ -1201,7 +1312,8 @@ class NativeAnimatedNodeTraversalTest { "stiffness", 157.8, "overshootClamping", - false) + false, + ) createAnimatedGraphWithTrackingNode(springConfig) diff --git a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/bridge/JavaOnlyMapTest.kt b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/bridge/JavaOnlyMapTest.kt index 4596b712bbe..d348a74f1d6 100644 --- a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/bridge/JavaOnlyMapTest.kt +++ b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/bridge/JavaOnlyMapTest.kt @@ -33,7 +33,8 @@ class JavaOnlyMapTest { "map", JavaOnlyMap.of(), "null", - null) + null, + ) assertThat(values.getType("int")).isEqualTo(ReadableType.Number) assertThat(values.getType("float")).isEqualTo(ReadableType.Number) diff --git a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/bridge/interop/FakeRCTEventEmitter.kt b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/bridge/interop/FakeRCTEventEmitter.kt index a2f1709c8e5..bc5fb4c7b27 100644 --- a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/bridge/interop/FakeRCTEventEmitter.kt +++ b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/bridge/interop/FakeRCTEventEmitter.kt @@ -24,6 +24,6 @@ class FakeRCTEventEmitter : RCTEventEmitter { override fun receiveTouches( eventName: String, touches: WritableArray, - changedIndices: WritableArray + changedIndices: WritableArray, ) = Unit } diff --git a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/defaults/DefaultNewArchitectureEntryPointTest.kt b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/defaults/DefaultNewArchitectureEntryPointTest.kt index 4b83910e531..d7dcf05140a 100644 --- a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/defaults/DefaultNewArchitectureEntryPointTest.kt +++ b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/defaults/DefaultNewArchitectureEntryPointTest.kt @@ -16,7 +16,10 @@ class DefaultNewArchitectureEntryPointTest { fun isConfigurationValid_withEverythingOff_returnsTrue() { val (isValid, _) = DefaultNewArchitectureEntryPoint.isConfigurationValid( - turboModulesEnabled = false, fabricEnabled = false, bridgelessEnabled = false) + turboModulesEnabled = false, + fabricEnabled = false, + bridgelessEnabled = false, + ) assertThat(isValid).isTrue() } @@ -24,7 +27,10 @@ class DefaultNewArchitectureEntryPointTest { fun isConfigurationValid_withNewArchOn_returnsTrue() { val (isValid, _) = DefaultNewArchitectureEntryPoint.isConfigurationValid( - turboModulesEnabled = true, fabricEnabled = true, bridgelessEnabled = false) + turboModulesEnabled = true, + fabricEnabled = true, + bridgelessEnabled = false, + ) assertThat(isValid).isTrue() } @@ -32,7 +38,10 @@ class DefaultNewArchitectureEntryPointTest { fun isConfigurationValid_withTurboModulesOnlyOn_returnsTrue() { val (isValid, _) = DefaultNewArchitectureEntryPoint.isConfigurationValid( - turboModulesEnabled = true, fabricEnabled = false, bridgelessEnabled = false) + turboModulesEnabled = true, + fabricEnabled = false, + bridgelessEnabled = false, + ) assertThat(isValid).isTrue() } @@ -40,7 +49,10 @@ class DefaultNewArchitectureEntryPointTest { fun isConfigurationValid_withBridgelessOn_returnsTrue() { val (isValid, _) = DefaultNewArchitectureEntryPoint.isConfigurationValid( - turboModulesEnabled = true, fabricEnabled = true, bridgelessEnabled = true) + turboModulesEnabled = true, + fabricEnabled = true, + bridgelessEnabled = true, + ) assertThat(isValid).isTrue() } @@ -48,7 +60,10 @@ class DefaultNewArchitectureEntryPointTest { fun isConfigurationValid_withFabricWithoutTurboModules_returnsFalse() { val (isValid, errorMessage) = DefaultNewArchitectureEntryPoint.isConfigurationValid( - turboModulesEnabled = false, fabricEnabled = true, bridgelessEnabled = false) + turboModulesEnabled = false, + fabricEnabled = true, + bridgelessEnabled = false, + ) assertThat(isValid).isFalse() assertThat(errorMessage) .isEqualTo( @@ -59,7 +74,10 @@ class DefaultNewArchitectureEntryPointTest { fun isConfigurationValid_withBridgelessWithoutTurboModules_returnsFalse() { val (isValid, errorMessage) = DefaultNewArchitectureEntryPoint.isConfigurationValid( - turboModulesEnabled = false, fabricEnabled = true, bridgelessEnabled = true) + turboModulesEnabled = false, + fabricEnabled = true, + bridgelessEnabled = true, + ) assertThat(isValid).isFalse() assertThat(errorMessage) .isEqualTo( @@ -70,7 +88,10 @@ class DefaultNewArchitectureEntryPointTest { fun isConfigurationValid_withBridgelessWithoutFabric_returnsFalse() { val (isValid, errorMessage) = DefaultNewArchitectureEntryPoint.isConfigurationValid( - turboModulesEnabled = true, fabricEnabled = false, bridgelessEnabled = true) + turboModulesEnabled = true, + fabricEnabled = false, + bridgelessEnabled = true, + ) assertThat(isValid).isFalse() assertThat(errorMessage) .isEqualTo( diff --git a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/devsupport/StackTraceHelperTest.kt b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/devsupport/StackTraceHelperTest.kt index b4ddb1df5f1..42c8e5bd99c 100644 --- a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/devsupport/StackTraceHelperTest.kt +++ b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/devsupport/StackTraceHelperTest.kt @@ -122,7 +122,7 @@ class StackTraceHelperTest { filename: String, methodName: String, lineNumber: Int, - columnNumber: Int + columnNumber: Int, ) { checkNotNull(map) assertThat(map.getString("file")).isEqualTo(filename) diff --git a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/fabric/events/TouchEventDispatchTest.kt b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/fabric/events/TouchEventDispatchTest.kt index be698965445..c8aabc8c490 100644 --- a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/fabric/events/TouchEventDispatchTest.kt +++ b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/fabric/events/TouchEventDispatchTest.kt @@ -52,25 +52,30 @@ class TouchEventDispatchTest { action = MotionEvent.ACTION_DOWN, pointerId = 0, pointerIds = intArrayOf(0), - pointerCoords = arrayOf(pointerCoords(1f, 1f))), + pointerCoords = arrayOf(pointerCoords(1f, 1f)), + ), createTouchEvent( gestureTime = GESTURE_START_TIME, action = MotionEvent.ACTION_MOVE, pointerId = 0, pointerIds = intArrayOf(0), - pointerCoords = arrayOf(pointerCoords(1f, 2f))), + pointerCoords = arrayOf(pointerCoords(1f, 2f)), + ), createTouchEvent( gestureTime = GESTURE_START_TIME, action = MotionEvent.ACTION_MOVE, pointerId = 0, pointerIds = intArrayOf(0), - pointerCoords = arrayOf(pointerCoords(1f, 3f))), + pointerCoords = arrayOf(pointerCoords(1f, 3f)), + ), createTouchEvent( gestureTime = GESTURE_START_TIME, action = MotionEvent.ACTION_UP, pointerId = 0, pointerIds = intArrayOf(0), - pointerCoords = arrayOf(pointerCoords(1f, 3f)))) + pointerCoords = arrayOf(pointerCoords(1f, 3f)), + ), + ) /** Expected values for [startMoveEndSequence] */ private val startMoveEndExpectedSequence = @@ -92,7 +97,8 @@ class TouchEventDispatchTest { touches = listOf(buildGesture(SURFACE_ID, TARGET_VIEW_ID, 1f, 1f, GESTURE_START_TIME, 0)), changedTouches = - listOf(buildGesture(SURFACE_ID, TARGET_VIEW_ID, 1f, 1f, GESTURE_START_TIME, 0))), + listOf(buildGesture(SURFACE_ID, TARGET_VIEW_ID, 1f, 1f, GESTURE_START_TIME, 0)), + ), /* * MOVE event for touch 1: * { @@ -110,7 +116,8 @@ class TouchEventDispatchTest { touches = listOf(buildGesture(SURFACE_ID, TARGET_VIEW_ID, 1f, 2f, GESTURE_START_TIME, 0)), changedTouches = - listOf(buildGesture(SURFACE_ID, TARGET_VIEW_ID, 1f, 2f, GESTURE_START_TIME, 0))), + listOf(buildGesture(SURFACE_ID, TARGET_VIEW_ID, 1f, 2f, GESTURE_START_TIME, 0)), + ), /* * MOVE event for touch 1: * { @@ -128,7 +135,8 @@ class TouchEventDispatchTest { touches = listOf(buildGesture(SURFACE_ID, TARGET_VIEW_ID, 1f, 3f, GESTURE_START_TIME, 0)), changedTouches = - listOf(buildGesture(SURFACE_ID, TARGET_VIEW_ID, 1f, 3f, GESTURE_START_TIME, 0))), + listOf(buildGesture(SURFACE_ID, TARGET_VIEW_ID, 1f, 3f, GESTURE_START_TIME, 0)), + ), /* * END event for touch 1: * { @@ -145,7 +153,9 @@ class TouchEventDispatchTest { pointerId = 0, touches = emptyList(), changedTouches = - listOf(buildGesture(SURFACE_ID, TARGET_VIEW_ID, 1f, 3f, GESTURE_START_TIME, 0)))) + listOf(buildGesture(SURFACE_ID, TARGET_VIEW_ID, 1f, 3f, GESTURE_START_TIME, 0)), + ), + ) /** Events (2 pointer): START 1st -> START 2nd -> MOVE 1st -> UP 2st -> UP 1st */ private val startPointerMoveUpSequence = @@ -155,31 +165,37 @@ class TouchEventDispatchTest { action = MotionEvent.ACTION_DOWN, pointerId = 0, pointerIds = intArrayOf(0), - pointerCoords = arrayOf(pointerCoords(1f, 1f))), + pointerCoords = arrayOf(pointerCoords(1f, 1f)), + ), createTouchEvent( gestureTime = GESTURE_START_TIME, action = MotionEvent.ACTION_POINTER_DOWN, pointerId = 1, pointerIds = intArrayOf(0, 1), - pointerCoords = arrayOf(pointerCoords(1f, 1f), pointerCoords(2f, 1f))), + pointerCoords = arrayOf(pointerCoords(1f, 1f), pointerCoords(2f, 1f)), + ), createTouchEvent( gestureTime = GESTURE_START_TIME, action = MotionEvent.ACTION_MOVE, pointerId = 0, pointerIds = intArrayOf(0, 1), - pointerCoords = arrayOf(pointerCoords(1f, 2f), pointerCoords(2f, 1f))), + pointerCoords = arrayOf(pointerCoords(1f, 2f), pointerCoords(2f, 1f)), + ), createTouchEvent( gestureTime = GESTURE_START_TIME, action = MotionEvent.ACTION_POINTER_UP, pointerId = 1, pointerIds = intArrayOf(0, 1), - pointerCoords = arrayOf(pointerCoords(1f, 2f), pointerCoords(2f, 1f))), + pointerCoords = arrayOf(pointerCoords(1f, 2f), pointerCoords(2f, 1f)), + ), createTouchEvent( gestureTime = GESTURE_START_TIME, action = MotionEvent.ACTION_POINTER_UP, pointerId = 0, pointerIds = intArrayOf(0), - pointerCoords = arrayOf(pointerCoords(1f, 2f)))) + pointerCoords = arrayOf(pointerCoords(1f, 2f)), + ), + ) /** Expected values for [startPointerMoveUpSequence] */ private val startPointerMoveUpExpectedSequence = @@ -202,7 +218,8 @@ class TouchEventDispatchTest { touches = listOf(buildGesture(SURFACE_ID, TARGET_VIEW_ID, 1f, 1f, GESTURE_START_TIME, 0)), changedTouches = - listOf(buildGesture(SURFACE_ID, TARGET_VIEW_ID, 1f, 1f, GESTURE_START_TIME, 0))), + listOf(buildGesture(SURFACE_ID, TARGET_VIEW_ID, 1f, 1f, GESTURE_START_TIME, 0)), + ), /* * START event for touch 2: * { @@ -221,9 +238,11 @@ class TouchEventDispatchTest { touches = listOf( buildGesture(SURFACE_ID, TARGET_VIEW_ID, 1f, 1f, GESTURE_START_TIME, 0), - buildGesture(SURFACE_ID, TARGET_VIEW_ID, 2f, 1f, GESTURE_START_TIME, 1)), + buildGesture(SURFACE_ID, TARGET_VIEW_ID, 2f, 1f, GESTURE_START_TIME, 1), + ), changedTouches = - listOf(buildGesture(SURFACE_ID, TARGET_VIEW_ID, 2f, 1f, GESTURE_START_TIME, 1))), + listOf(buildGesture(SURFACE_ID, TARGET_VIEW_ID, 2f, 1f, GESTURE_START_TIME, 1)), + ), /* * MOVE event for touch 1: * { @@ -247,11 +266,14 @@ class TouchEventDispatchTest { touches = listOf( buildGesture(SURFACE_ID, TARGET_VIEW_ID, 1f, 2f, GESTURE_START_TIME, 0), - buildGesture(SURFACE_ID, TARGET_VIEW_ID, 2f, 1f, GESTURE_START_TIME, 1)), + buildGesture(SURFACE_ID, TARGET_VIEW_ID, 2f, 1f, GESTURE_START_TIME, 1), + ), changedTouches = listOf( buildGesture(SURFACE_ID, TARGET_VIEW_ID, 1f, 2f, GESTURE_START_TIME, 0), - buildGesture(SURFACE_ID, TARGET_VIEW_ID, 2f, 1f, GESTURE_START_TIME, 1))), + buildGesture(SURFACE_ID, TARGET_VIEW_ID, 2f, 1f, GESTURE_START_TIME, 1), + ), + ), buildGestureEvent( surfaceId = SURFACE_ID, viewTag = TARGET_VIEW_ID, @@ -262,11 +284,14 @@ class TouchEventDispatchTest { touches = listOf( buildGesture(SURFACE_ID, TARGET_VIEW_ID, 1f, 2f, GESTURE_START_TIME, 0), - buildGesture(SURFACE_ID, TARGET_VIEW_ID, 2f, 1f, GESTURE_START_TIME, 1)), + buildGesture(SURFACE_ID, TARGET_VIEW_ID, 2f, 1f, GESTURE_START_TIME, 1), + ), changedTouches = listOf( buildGesture(SURFACE_ID, TARGET_VIEW_ID, 1f, 2f, GESTURE_START_TIME, 0), - buildGesture(SURFACE_ID, TARGET_VIEW_ID, 2f, 1f, GESTURE_START_TIME, 1))), + buildGesture(SURFACE_ID, TARGET_VIEW_ID, 2f, 1f, GESTURE_START_TIME, 1), + ), + ), /* * UP event pointer 1: * { @@ -285,7 +310,8 @@ class TouchEventDispatchTest { touches = listOf(buildGesture(SURFACE_ID, TARGET_VIEW_ID, 1f, 2f, GESTURE_START_TIME, 0)), changedTouches = - listOf(buildGesture(SURFACE_ID, TARGET_VIEW_ID, 2f, 1f, GESTURE_START_TIME, 1))), + listOf(buildGesture(SURFACE_ID, TARGET_VIEW_ID, 2f, 1f, GESTURE_START_TIME, 1)), + ), /* * UP event pointer 0: * { @@ -303,7 +329,9 @@ class TouchEventDispatchTest { pointerId = 0, touches = emptyList(), changedTouches = - listOf(buildGesture(SURFACE_ID, TARGET_VIEW_ID, 1f, 2f, GESTURE_START_TIME, 0)))) + listOf(buildGesture(SURFACE_ID, TARGET_VIEW_ID, 1f, 2f, GESTURE_START_TIME, 0)), + ), + ) /** Events (2 pointer): START 1st -> START 2nd -> MOVE 1st -> CANCEL */ private val startMoveCancelSequence = @@ -313,25 +341,30 @@ class TouchEventDispatchTest { action = MotionEvent.ACTION_DOWN, pointerId = 0, pointerIds = intArrayOf(0), - pointerCoords = arrayOf(pointerCoords(1f, 1f))), + pointerCoords = arrayOf(pointerCoords(1f, 1f)), + ), createTouchEvent( gestureTime = GESTURE_START_TIME, action = MotionEvent.ACTION_POINTER_DOWN, pointerId = 1, pointerIds = intArrayOf(0, 1), - pointerCoords = arrayOf(pointerCoords(1f, 1f), pointerCoords(2f, 1f))), + pointerCoords = arrayOf(pointerCoords(1f, 1f), pointerCoords(2f, 1f)), + ), createTouchEvent( gestureTime = GESTURE_START_TIME, action = MotionEvent.ACTION_MOVE, pointerId = 0, pointerIds = intArrayOf(0, 1), - pointerCoords = arrayOf(pointerCoords(1f, 2f), pointerCoords(2f, 1f))), + pointerCoords = arrayOf(pointerCoords(1f, 2f), pointerCoords(2f, 1f)), + ), createTouchEvent( gestureTime = GESTURE_START_TIME, action = MotionEvent.ACTION_CANCEL, pointerId = 0, pointerIds = intArrayOf(0, 1), - pointerCoords = arrayOf(pointerCoords(1f, 3f), pointerCoords(2f, 1f)))) + pointerCoords = arrayOf(pointerCoords(1f, 3f), pointerCoords(2f, 1f)), + ), + ) /** Expected values for [startMoveCancelSequence] */ private val startMoveCancelExpectedSequence = @@ -354,7 +387,8 @@ class TouchEventDispatchTest { touches = listOf(buildGesture(SURFACE_ID, TARGET_VIEW_ID, 1f, 1f, GESTURE_START_TIME, 0)), changedTouches = - listOf(buildGesture(SURFACE_ID, TARGET_VIEW_ID, 1f, 1f, GESTURE_START_TIME, 0))), + listOf(buildGesture(SURFACE_ID, TARGET_VIEW_ID, 1f, 1f, GESTURE_START_TIME, 0)), + ), /* * START event for touch 2: * { @@ -373,9 +407,11 @@ class TouchEventDispatchTest { touches = listOf( buildGesture(SURFACE_ID, TARGET_VIEW_ID, 1f, 1f, GESTURE_START_TIME, 0), - buildGesture(SURFACE_ID, TARGET_VIEW_ID, 2f, 1f, GESTURE_START_TIME, 1)), + buildGesture(SURFACE_ID, TARGET_VIEW_ID, 2f, 1f, GESTURE_START_TIME, 1), + ), changedTouches = - listOf(buildGesture(SURFACE_ID, TARGET_VIEW_ID, 2f, 1f, GESTURE_START_TIME, 1))), + listOf(buildGesture(SURFACE_ID, TARGET_VIEW_ID, 2f, 1f, GESTURE_START_TIME, 1)), + ), /* * MOVE event for touch 1: * { @@ -399,11 +435,14 @@ class TouchEventDispatchTest { touches = listOf( buildGesture(SURFACE_ID, TARGET_VIEW_ID, 1f, 2f, GESTURE_START_TIME, 0), - buildGesture(SURFACE_ID, TARGET_VIEW_ID, 2f, 1f, GESTURE_START_TIME, 1)), + buildGesture(SURFACE_ID, TARGET_VIEW_ID, 2f, 1f, GESTURE_START_TIME, 1), + ), changedTouches = listOf( buildGesture(SURFACE_ID, TARGET_VIEW_ID, 1f, 2f, GESTURE_START_TIME, 0), - buildGesture(SURFACE_ID, TARGET_VIEW_ID, 2f, 1f, GESTURE_START_TIME, 1))), + buildGesture(SURFACE_ID, TARGET_VIEW_ID, 2f, 1f, GESTURE_START_TIME, 1), + ), + ), buildGestureEvent( SURFACE_ID, TARGET_VIEW_ID, @@ -413,10 +452,13 @@ class TouchEventDispatchTest { 1, listOf( buildGesture(SURFACE_ID, TARGET_VIEW_ID, 1f, 2f, GESTURE_START_TIME, 0), - buildGesture(SURFACE_ID, TARGET_VIEW_ID, 2f, 1f, GESTURE_START_TIME, 1)), + buildGesture(SURFACE_ID, TARGET_VIEW_ID, 2f, 1f, GESTURE_START_TIME, 1), + ), listOf( buildGesture(SURFACE_ID, TARGET_VIEW_ID, 1f, 2f, GESTURE_START_TIME, 0), - buildGesture(SURFACE_ID, TARGET_VIEW_ID, 2f, 1f, GESTURE_START_TIME, 1))), + buildGesture(SURFACE_ID, TARGET_VIEW_ID, 2f, 1f, GESTURE_START_TIME, 1), + ), + ), /* * CANCEL event: * { @@ -441,7 +483,9 @@ class TouchEventDispatchTest { changedTouches = listOf( buildGesture(SURFACE_ID, TARGET_VIEW_ID, 1f, 3f, GESTURE_START_TIME, 0), - buildGesture(SURFACE_ID, TARGET_VIEW_ID, 2f, 1f, GESTURE_START_TIME, 1))), + buildGesture(SURFACE_ID, TARGET_VIEW_ID, 2f, 1f, GESTURE_START_TIME, 1), + ), + ), buildGestureEvent( surfaceId = SURFACE_ID, viewTag = TARGET_VIEW_ID, @@ -453,7 +497,10 @@ class TouchEventDispatchTest { changedTouches = listOf( buildGesture(SURFACE_ID, TARGET_VIEW_ID, 1f, 3f, GESTURE_START_TIME, 0), - buildGesture(SURFACE_ID, TARGET_VIEW_ID, 2f, 1f, GESTURE_START_TIME, 1)))) + buildGesture(SURFACE_ID, TARGET_VIEW_ID, 2f, 1f, GESTURE_START_TIME, 1), + ), + ), + ) private lateinit var eventDispatcher: EventDispatcher private lateinit var eventEmitter: FabricEventEmitter @@ -492,7 +539,14 @@ class TouchEventDispatchTest { val argument = ArgumentCaptor.forClass(WritableMap::class.java) verify(eventEmitter, times(4)) .receiveEvent( - anyInt(), anyInt(), anyString(), anyBoolean(), anyInt(), argument.capture(), anyInt()) + anyInt(), + anyInt(), + anyString(), + anyBoolean(), + anyInt(), + argument.capture(), + anyInt(), + ) assertThat(startMoveEndExpectedSequence).isEqualTo(argument.allValues) } @@ -504,7 +558,14 @@ class TouchEventDispatchTest { val argument = ArgumentCaptor.forClass(WritableMap::class.java) verify(eventEmitter, times(6)) .receiveEvent( - anyInt(), anyInt(), anyString(), anyBoolean(), anyInt(), argument.capture(), anyInt()) + anyInt(), + anyInt(), + anyString(), + anyBoolean(), + anyInt(), + argument.capture(), + anyInt(), + ) assertThat(startMoveCancelExpectedSequence).isEqualTo(argument.allValues) } @@ -516,7 +577,14 @@ class TouchEventDispatchTest { val argument = ArgumentCaptor.forClass(WritableMap::class.java) verify(eventEmitter, times(6)) .receiveEvent( - anyInt(), anyInt(), anyString(), anyBoolean(), anyInt(), argument.capture(), anyInt()) + anyInt(), + anyInt(), + anyString(), + anyBoolean(), + anyInt(), + argument.capture(), + anyInt(), + ) assertThat(startPointerMoveUpExpectedSequence).isEqualTo(argument.allValues) } @@ -525,7 +593,7 @@ class TouchEventDispatchTest { action: Int, pointerId: Int, pointerIds: IntArray, - pointerCoords: Array + pointerCoords: Array, ): TouchEvent { touchEventCoalescingKeyHelper.addCoalescingKey(gestureTime.toLong()) val shiftedAction = action or (pointerId shl MotionEvent.ACTION_POINTER_INDEX_SHIFT) @@ -547,11 +615,13 @@ class TouchEventDispatchTest { 0, 0, 0, - 0), + 0, + ), gestureTime.toLong(), pointerCoords[0].x, pointerCoords[0].y, - touchEventCoalescingKeyHelper) + touchEventCoalescingKeyHelper, + ) } companion object { @@ -579,7 +649,7 @@ class TouchEventDispatchTest { time: Int, pointerId: Int, touches: List, - changedTouches: List + changedTouches: List, ): ReadableMap = buildGesture(surfaceId, viewTag, locationX, locationY, time, pointerId).apply { putArray("changedTouches", JavaOnlyArray.from(changedTouches)) @@ -592,7 +662,7 @@ class TouchEventDispatchTest { locationX: Float, locationY: Float, time: Int, - pointerId: Int + pointerId: Int, ): WritableMap = JavaOnlyMap().apply { putInt("targetSurface", surfaceId) diff --git a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/modules/deviceinfo/DeviceInfoModuleTest.kt b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/modules/deviceinfo/DeviceInfoModuleTest.kt index 66c90ef5e12..684858be3b9 100644 --- a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/modules/deviceinfo/DeviceInfoModuleTest.kt +++ b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/modules/deviceinfo/DeviceInfoModuleTest.kt @@ -106,7 +106,8 @@ class DeviceInfoModuleTest : TestCase() { reactContext, fakeLandscapeDisplayMetrics, fakePortraitDisplayMetrics, - fakeLandscapeDisplayMetrics) + fakeLandscapeDisplayMetrics, + ) } private fun givenDisplayMetricsHolderContains(fakeDisplayMetrics: WritableMap?) { @@ -118,7 +119,7 @@ class DeviceInfoModuleTest : TestCase() { companion object { private fun verifyUpdateDimensionsEventsEmitted( context: ReactContext?, - vararg expectedEvents: WritableMap + vararg expectedEvents: WritableMap, ) { val expectedEventList = listOf(*expectedEvents) val captor = ArgumentCaptor.forClass(WritableMap::class.java) diff --git a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/modules/model/ReactModuleInfoTest.kt b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/modules/model/ReactModuleInfoTest.kt index 7b05b99b439..85576444a54 100644 --- a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/modules/model/ReactModuleInfoTest.kt +++ b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/modules/model/ReactModuleInfoTest.kt @@ -23,7 +23,8 @@ class ReactModuleInfoTest { /* canOverrideExistingModule = */ false, /* needsEagerInit = */ false, /* isCxxModule = */ false, - /* isTurboModule = */ false) + /* isTurboModule = */ false, + ) assertThat(reactModuleInfo.name).isEqualTo("name") assertThat(reactModuleInfo.canOverrideExistingModule).isFalse() assertThat(reactModuleInfo.needsEagerInit).isFalse() diff --git a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/modules/network/NetworkingModuleTest.kt b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/modules/network/NetworkingModuleTest.kt index 5f4543e0ccf..61cb6ad70b7 100644 --- a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/modules/network/NetworkingModuleTest.kt +++ b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/modules/network/NetworkingModuleTest.kt @@ -111,7 +111,8 @@ class NetworkingModuleTest { "text", /* responseType */ true, /* useIncrementalUpdates*/ 0.0, /* timeout */ - false /* withCredentials */) + false, /* withCredentials */ + ) with(requestArgumentCaptor) { verify(httpClient).newCall(capture()) @@ -136,7 +137,8 @@ class NetworkingModuleTest { "text", /* responseType */ true, /* useIncrementalUpdates*/ 0.0, /* timeout */ - false /* withCredentials */) + false, /* withCredentials */ + ) verifyErrorEmit(context, 0) } @@ -155,7 +157,8 @@ class NetworkingModuleTest { "text", /* responseType */ true, /* useIncrementalUpdates*/ 0.0, /* timeout */ - false /* withCredentials */) + false, /* withCredentials */ + ) verifyErrorEmit(context, 0) } @@ -171,7 +174,8 @@ class NetworkingModuleTest { "text", /* responseType */ true, /* useIncrementalUpdates*/ 0.0, /* timeout */ - false /* withCredentials */) + false, /* withCredentials */ + ) verifyErrorEmit(context, 0) } @@ -199,7 +203,8 @@ class NetworkingModuleTest { "text", /* responseType */ true, /* useIncrementalUpdates*/ 0.0, /* timeout */ - false /* withCredentials */) + false, /* withCredentials */ + ) with(requestArgumentCaptor) { verify(httpClient).newCall(capture()) @@ -219,7 +224,8 @@ class NetworkingModuleTest { val headers = listOf( JavaOnlyArray.of("Accept", "text/plain"), - JavaOnlyArray.of("User-Agent", "React test agent/1.0")) + JavaOnlyArray.of("User-Agent", "React test agent/1.0"), + ) networkingModule.sendRequest( "GET", @@ -230,7 +236,8 @@ class NetworkingModuleTest { "text", /* responseType */ true, /* useIncrementalUpdates*/ 0.0, /* timeout */ - false /* withCredentials */) + false, /* withCredentials */ + ) with(requestArgumentCaptor) { verify(httpClient).newCall(capture()) @@ -255,7 +262,8 @@ class NetworkingModuleTest { "text", /* responseType */ true, /* useIncrementalUpdates*/ 0.0, /* timeout */ - false /* withCredentials */) + false, /* withCredentials */ + ) verify(httpClient).newCall(requestArgumentCaptor.capture()) @@ -280,7 +288,8 @@ class NetworkingModuleTest { "text", /* responseType */ true, /* useIncrementalUpdates*/ 0.0, /* timeout */ - false /* withCredentials */) + false, /* withCredentials */ + ) verify(httpClient).newCall(requestArgumentCaptor.capture()) @@ -303,7 +312,8 @@ class NetworkingModuleTest { "text", /* responseType */ true, /* useIncrementalUpdates*/ 0.0, /* timeout */ - false /* withCredentials */) + false, /* withCredentials */ + ) verify(httpClient).newCall(requestArgumentCaptor.capture()) @@ -322,7 +332,9 @@ class NetworkingModuleTest { val bodyPart = JavaOnlyMap() bodyPart.putString("string", "value") bodyPart.putArray( - "headers", JavaOnlyArray.from(listOf(JavaOnlyArray.of("content-disposition", "name")))) + "headers", + JavaOnlyArray.from(listOf(JavaOnlyArray.of("content-disposition", "name"))), + ) formData.pushMap(bodyPart) body.putArray("formData", formData) @@ -335,7 +347,8 @@ class NetworkingModuleTest { "text", /* responseType */ true, /* useIncrementalUpdates*/ 0.0, /* timeout */ - false /* withCredentials */) + false, /* withCredentials */ + ) // verify url, method, headers with(requestArgumentCaptor) { @@ -358,14 +371,17 @@ class NetworkingModuleTest { listOf( JavaOnlyArray.of("Accept", "text/plain"), JavaOnlyArray.of("User-Agent", "React test agent/1.0"), - JavaOnlyArray.of("content-type", "multipart/form-data")) + JavaOnlyArray.of("content-type", "multipart/form-data"), + ) val body = JavaOnlyMap() val formData = JavaOnlyArray() val bodyPart = JavaOnlyMap() bodyPart.putString("string", "value") bodyPart.putArray( - "headers", JavaOnlyArray.from(listOf(JavaOnlyArray.of("content-disposition", "name")))) + "headers", + JavaOnlyArray.from(listOf(JavaOnlyArray.of("content-disposition", "name"))), + ) formData.pushMap(bodyPart) body.putArray("formData", formData) @@ -378,7 +394,8 @@ class NetworkingModuleTest { "text", /* responseType */ true, /* useIncrementalUpdates*/ 0.0, /* timeout */ - false /* withCredentials */) + false, /* withCredentials */ + ) // verify url, method, headers with(requestArgumentCaptor) { @@ -422,7 +439,9 @@ class NetworkingModuleTest { val bodyPart = JavaOnlyMap() bodyPart.putString("string", "locale") bodyPart.putArray( - "headers", JavaOnlyArray.from(listOf(JavaOnlyArray.of("content-disposition", "user")))) + "headers", + JavaOnlyArray.from(listOf(JavaOnlyArray.of("content-disposition", "user"))), + ) formData.pushMap(bodyPart) val imageBodyPart = JavaOnlyMap() @@ -434,7 +453,10 @@ class NetworkingModuleTest { JavaOnlyArray.of("content-type", "image/jpg"), JavaOnlyArray.of( "content-disposition", - "filename=\"测试photo.jpg\"; filename*=utf-8''%E6%B5%8B%E8%AF%95photo.jpg")))) + "filename=\"测试photo.jpg\"; filename*=utf-8''%E6%B5%8B%E8%AF%95photo.jpg", + ), + )), + ) formData.pushMap(imageBodyPart) @@ -447,7 +469,8 @@ class NetworkingModuleTest { "text", /* responseType */ true, /* useIncrementalUpdates*/ 0.0, /* timeout */ - false /* withCredentials */) + false, /* withCredentials */ + ) // verify RequestBodyPart for image requestBodyUtil.verify { RequestBodyUtil.getFileInputStream(any(), eq("imageUri")) } @@ -503,7 +526,8 @@ class NetworkingModuleTest { "text", /* responseType */ true, /* useIncrementalUpdates*/ 0.0, /* timeout */ - false /* withCredentials */) + false, /* withCredentials */ + ) } verify(httpClient, times(3)).newCall(any()) @@ -511,7 +535,9 @@ class NetworkingModuleTest { networkingModule.invalidate() val requestIdArguments = argumentCaptor() okHttpCallUtil.verify( - { OkHttpCallUtil.cancelTag(any(), requestIdArguments.capture()) }, times(requests)) + { OkHttpCallUtil.cancelTag(any(), requestIdArguments.capture()) }, + times(requests), + ) assertThat(requestIdArguments.allValues.size).isEqualTo(requests) for (idx in 0 until requests) { @@ -540,7 +566,8 @@ class NetworkingModuleTest { "text", /* responseType */ true, /* useIncrementalUpdates*/ 0.0, /* timeout */ - false /* withCredentials */) + false, /* withCredentials */ + ) } verify(httpClient, times(3)).newCall(any()) @@ -563,7 +590,8 @@ class NetworkingModuleTest { requestIdArguments = argumentCaptor() okHttpCallUtil.verify( { OkHttpCallUtil.cancelTag(clientArguments.capture(), requestIdArguments.capture()) }, - times(requests)) + times(requests), + ) assertThat(requestIdArguments.allValues.size).isEqualTo(requests) for (idx in 0 until requests) { assertThat(requestIdArguments.allValues.contains(idx + 1)).isTrue diff --git a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/modules/network/ProgressResponseBodyTest.kt b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/modules/network/ProgressResponseBodyTest.kt index 55f3e9493ea..b9dd17cd2ff 100644 --- a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/modules/network/ProgressResponseBodyTest.kt +++ b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/modules/network/ProgressResponseBodyTest.kt @@ -35,7 +35,7 @@ class ProgressResponseBodyTest { private fun createResponseBody( contentType: MediaType? = MediaType.parse("application/octet-stream"), contentLength: Long = 0L, - content: ByteArray = ByteArray(0) + content: ByteArray = ByteArray(0), ): ResponseBody { val inputStream = ByteArrayInputStream(content) val bufferedSource = Okio.buffer(Okio.source(inputStream)) diff --git a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/modules/share/ShareModuleTest.kt b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/modules/share/ShareModuleTest.kt index db668f62a1f..bd49577f90d 100644 --- a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/modules/share/ShareModuleTest.kt +++ b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/modules/share/ShareModuleTest.kt @@ -144,7 +144,7 @@ class ShareModuleTest { code: String?, message: String?, throwable: Throwable?, - userInfo: WritableMap? + userInfo: WritableMap?, ) { rejected++ diff --git a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/modules/timing/TimingModuleTest.kt b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/modules/timing/TimingModuleTest.kt index 21ad2403546..99d8e41b812 100644 --- a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/modules/timing/TimingModuleTest.kt +++ b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/modules/timing/TimingModuleTest.kt @@ -116,13 +116,17 @@ class TimingModuleTest { whenever( reactChoreographerMock.postFrameCallback( - MockCompat.eq(CallbackType.TIMERS_EVENTS), MockCompat.any())) + MockCompat.eq(CallbackType.TIMERS_EVENTS), + MockCompat.any(), + )) .thenAnswer { return@thenAnswer postFrameCallbackHandler.answer(it) } whenever( reactChoreographerMock.postFrameCallback( - MockCompat.eq(CallbackType.IDLE_EVENT), MockCompat.any())) + MockCompat.eq(CallbackType.IDLE_EVENT), + MockCompat.any(), + )) .thenAnswer { return@thenAnswer idlePostFrameCallbackHandler.answer(it) } diff --git a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/packagerconnection/JSPackagerClientTest.kt b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/packagerconnection/JSPackagerClientTest.kt index 7fa2998d289..7ff6eb42580 100644 --- a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/packagerconnection/JSPackagerClientTest.kt +++ b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/packagerconnection/JSPackagerClientTest.kt @@ -143,12 +143,12 @@ class JSPackagerClientTest { requestHandlers: Map, clientId: String = "test_client", settings: PackagerConnectionSettings = this.settings, - connectionCallback: ConnectionCallback? = null + connectionCallback: ConnectionCallback? = null, ): JSPackagerClient = JSPackagerClient(clientId, settings, requestHandlers, connectionCallback) private fun createRequestHandler( action: String, - handler: RequestHandler + handler: RequestHandler, ): Map = mapOf(action to handler) private fun encodeUtf8(input: String): ByteString = diff --git a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/runtime/BridgelessReactContextTest.kt b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/runtime/BridgelessReactContextTest.kt index 72a1b57c0ca..9c1c29ca42a 100644 --- a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/runtime/BridgelessReactContextTest.kt +++ b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/runtime/BridgelessReactContextTest.kt @@ -45,7 +45,8 @@ import org.robolectric.annotation.Config ShadowSoLoader::class, ShadowNativeLoader::class, ShadowArguments::class, - ShadowWritableNativeArray::class]) + ShadowWritableNativeArray::class, + ]) @OptIn(FrameworkAPI::class) class BridgelessReactContextTest { private lateinit var context: Context diff --git a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/runtime/ReactHostDelegateTest.kt b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/runtime/ReactHostDelegateTest.kt index 0407c0ae127..f3aefed9303 100644 --- a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/runtime/ReactHostDelegateTest.kt +++ b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/runtime/ReactHostDelegateTest.kt @@ -41,7 +41,8 @@ class ReactHostDelegateTest { jsMainModulePath = jsMainModulePathMocked, jsBundleLoader = jsBundleLoader, jsRuntimeFactory = hermesInstance, - turboModuleManagerDelegateBuilder = turboModuleManagerDelegateBuilderMock) + turboModuleManagerDelegateBuilder = turboModuleManagerDelegateBuilderMock, + ) assertThat(delegate.jsMainModulePath).isEqualTo(jsMainModulePathMocked) } diff --git a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/runtime/ReactHostTest.kt b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/runtime/ReactHostTest.kt index 10611bdfddc..181a04f8f33 100644 --- a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/runtime/ReactHostTest.kt +++ b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/runtime/ReactHostTest.kt @@ -118,7 +118,8 @@ class ReactHostTest { Task.IMMEDIATE_EXECUTOR, Task.IMMEDIATE_EXECUTOR, false /* allowPackagerServerAccess */, - true /* useDevSupport */) + true, /* useDevSupport */ + ) assertThat(reactHost.devSupportManager).isNotInstanceOf(ReleaseDevSupportManager::class.java) } diff --git a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/uimanager/BorderRadiusStyleTest.kt b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/uimanager/BorderRadiusStyleTest.kt index 3dd569f1b26..685964ebf05 100644 --- a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/uimanager/BorderRadiusStyleTest.kt +++ b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/uimanager/BorderRadiusStyleTest.kt @@ -35,25 +35,29 @@ class BorderRadiusStyleTest { BorderRadiusProp.BORDER_RADIUS, BorderRadiusProp.BORDER_TOP_LEFT_RADIUS, BorderRadiusProp.BORDER_TOP_START_RADIUS, - BorderRadiusProp.BORDER_START_START_RADIUS), + BorderRadiusProp.BORDER_START_START_RADIUS, + ), ComputedBorderRadiusProp.COMPUTED_BORDER_TOP_RIGHT_RADIUS to arrayOf( BorderRadiusProp.BORDER_RADIUS, BorderRadiusProp.BORDER_TOP_RIGHT_RADIUS, BorderRadiusProp.BORDER_TOP_END_RADIUS, - BorderRadiusProp.BORDER_END_START_RADIUS), + BorderRadiusProp.BORDER_END_START_RADIUS, + ), ComputedBorderRadiusProp.COMPUTED_BORDER_BOTTOM_LEFT_RADIUS to arrayOf( BorderRadiusProp.BORDER_RADIUS, BorderRadiusProp.BORDER_BOTTOM_LEFT_RADIUS, BorderRadiusProp.BORDER_BOTTOM_START_RADIUS, - BorderRadiusProp.BORDER_START_END_RADIUS), + BorderRadiusProp.BORDER_START_END_RADIUS, + ), ComputedBorderRadiusProp.COMPUTED_BORDER_BOTTOM_RIGHT_RADIUS to arrayOf( BorderRadiusProp.BORDER_RADIUS, BorderRadiusProp.BORDER_BOTTOM_RIGHT_RADIUS, BorderRadiusProp.BORDER_BOTTOM_END_RADIUS, - BorderRadiusProp.BORDER_END_END_RADIUS), + BorderRadiusProp.BORDER_END_END_RADIUS, + ), ) propertyOrderMap.forEach { order -> @@ -84,25 +88,29 @@ class BorderRadiusStyleTest { BorderRadiusProp.BORDER_RADIUS, BorderRadiusProp.BORDER_TOP_RIGHT_RADIUS, BorderRadiusProp.BORDER_TOP_END_RADIUS, - BorderRadiusProp.BORDER_END_START_RADIUS), + BorderRadiusProp.BORDER_END_START_RADIUS, + ), ComputedBorderRadiusProp.COMPUTED_BORDER_TOP_RIGHT_RADIUS to arrayOf( BorderRadiusProp.BORDER_RADIUS, BorderRadiusProp.BORDER_TOP_LEFT_RADIUS, BorderRadiusProp.BORDER_TOP_START_RADIUS, - BorderRadiusProp.BORDER_START_START_RADIUS), + BorderRadiusProp.BORDER_START_START_RADIUS, + ), ComputedBorderRadiusProp.COMPUTED_BORDER_BOTTOM_LEFT_RADIUS to arrayOf( BorderRadiusProp.BORDER_RADIUS, BorderRadiusProp.BORDER_BOTTOM_RIGHT_RADIUS, BorderRadiusProp.BORDER_BOTTOM_END_RADIUS, - BorderRadiusProp.BORDER_END_END_RADIUS), + BorderRadiusProp.BORDER_END_END_RADIUS, + ), ComputedBorderRadiusProp.COMPUTED_BORDER_BOTTOM_RIGHT_RADIUS to arrayOf( BorderRadiusProp.BORDER_RADIUS, BorderRadiusProp.BORDER_BOTTOM_LEFT_RADIUS, BorderRadiusProp.BORDER_BOTTOM_START_RADIUS, - BorderRadiusProp.BORDER_START_END_RADIUS), + BorderRadiusProp.BORDER_START_END_RADIUS, + ), ) propertyOrderMap.forEach { order -> @@ -128,25 +136,29 @@ class BorderRadiusStyleTest { BorderRadiusProp.BORDER_RADIUS, BorderRadiusProp.BORDER_TOP_LEFT_RADIUS, BorderRadiusProp.BORDER_TOP_END_RADIUS, - BorderRadiusProp.BORDER_END_START_RADIUS), + BorderRadiusProp.BORDER_END_START_RADIUS, + ), ComputedBorderRadiusProp.COMPUTED_BORDER_TOP_RIGHT_RADIUS to arrayOf( BorderRadiusProp.BORDER_RADIUS, BorderRadiusProp.BORDER_TOP_RIGHT_RADIUS, BorderRadiusProp.BORDER_TOP_START_RADIUS, - BorderRadiusProp.BORDER_START_START_RADIUS), + BorderRadiusProp.BORDER_START_START_RADIUS, + ), ComputedBorderRadiusProp.COMPUTED_BORDER_BOTTOM_LEFT_RADIUS to arrayOf( BorderRadiusProp.BORDER_RADIUS, BorderRadiusProp.BORDER_BOTTOM_LEFT_RADIUS, BorderRadiusProp.BORDER_BOTTOM_START_RADIUS, - BorderRadiusProp.BORDER_END_END_RADIUS), + BorderRadiusProp.BORDER_END_END_RADIUS, + ), ComputedBorderRadiusProp.COMPUTED_BORDER_BOTTOM_RIGHT_RADIUS to arrayOf( BorderRadiusProp.BORDER_RADIUS, BorderRadiusProp.BORDER_BOTTOM_RIGHT_RADIUS, BorderRadiusProp.BORDER_BOTTOM_END_RADIUS, - BorderRadiusProp.BORDER_START_END_RADIUS), + BorderRadiusProp.BORDER_START_END_RADIUS, + ), ) propertyOrderMap.forEach { order -> @@ -186,7 +198,9 @@ class BorderRadiusStyleTest { private fun setContextLeftAndRightSwap(context: Context, leftAndRightSwap: Boolean) { val sharedPrefs = context.getSharedPreferences( - "com.facebook.react.modules.i18nmanager.I18nUtil", Context.MODE_PRIVATE) + "com.facebook.react.modules.i18nmanager.I18nUtil", + Context.MODE_PRIVATE, + ) val editor = sharedPrefs.edit() editor.putBoolean("RCTI18nUtil_makeRTLFlipLeftAndRightStyles", leftAndRightSwap) editor.apply() diff --git a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/uimanager/JSPointerDispatcherTest.kt b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/uimanager/JSPointerDispatcherTest.kt index dd95644e7de..63279df820b 100644 --- a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/uimanager/JSPointerDispatcherTest.kt +++ b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/uimanager/JSPointerDispatcherTest.kt @@ -76,7 +76,10 @@ class JSPointerDispatcherTest { val childRect = getChildViewRectInRootCoordinates(0) val ev = createMotionEvent( - MotionEvent.ACTION_DOWN, childRect.centerX().toFloat(), childRect.centerY().toFloat()) + MotionEvent.ACTION_DOWN, + childRect.centerX().toFloat(), + childRect.centerY().toFloat(), + ) val mockDispatcher: EventDispatcher = mock() pointerDispatcher.handleMotionEvent(ev, mockDispatcher, false) verify(mockDispatcher).dispatchEvent(argThat(EventWithName(PointerEventHelper.POINTER_DOWN))) diff --git a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/uimanager/MatrixMathHelperTest.kt b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/uimanager/MatrixMathHelperTest.kt index 2e28ac341e1..27a03f9d12e 100644 --- a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/uimanager/MatrixMathHelperTest.kt +++ b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/uimanager/MatrixMathHelperTest.kt @@ -29,8 +29,25 @@ class MatrixMathHelperTest { MatrixMathHelper.decomposeMatrix( doubleArrayOf( - 1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 0.0, 1.0), - ctx) + 1.0, + 0.0, + 0.0, + 0.0, + 0.0, + 1.0, + 0.0, + 0.0, + 0.0, + 0.0, + 1.0, + 0.0, + 0.0, + 0.0, + 0.0, + 1.0, + ), + ctx, + ) assertThat(ctx.rotationDegrees).containsSequence(0.0, 0.0, 0.0) @@ -111,10 +128,42 @@ class MatrixMathHelperTest { fun testMultiplyInto() { val matrixA = doubleArrayOf( - 1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0, 10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0) + 1.0, + 2.0, + 3.0, + 4.0, + 5.0, + 6.0, + 7.0, + 8.0, + 9.0, + 10.0, + 11.0, + 12.0, + 13.0, + 14.0, + 15.0, + 16.0, + ) val matrixB = doubleArrayOf( - 2.0, 0.0, 0.0, 0.0, 0.0, 2.0, 0.0, 0.0, 0.0, 0.0, 2.0, 0.0, 0.0, 0.0, 0.0, 2.0) + 2.0, + 0.0, + 0.0, + 0.0, + 0.0, + 2.0, + 0.0, + 0.0, + 0.0, + 0.0, + 2.0, + 0.0, + 0.0, + 0.0, + 0.0, + 2.0, + ) val result = DoubleArray(16) MatrixMathHelper.multiplyInto(result, matrixA, matrixB) @@ -136,7 +185,8 @@ class MatrixMathHelperTest { 26.0, 28.0, 30.0, - 32.0) + 32.0, + ) assertThat(result).containsExactly(*expected) } @@ -147,7 +197,23 @@ class MatrixMathHelperTest { val expected = doubleArrayOf( - 1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 0.0, 1.0) + 1.0, + 0.0, + 0.0, + 0.0, + 0.0, + 1.0, + 0.0, + 0.0, + 0.0, + 0.0, + 1.0, + 0.0, + 0.0, + 0.0, + 0.0, + 1.0, + ) assertThat(identity).containsExactly(*expected) } @@ -156,13 +222,45 @@ class MatrixMathHelperTest { fun testResetIdentityMatrix() { val matrix = doubleArrayOf( - 5.0, 2.0, 3.0, 4.0, 1.0, 6.0, 7.0, 8.0, 9.0, 10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0) + 5.0, + 2.0, + 3.0, + 4.0, + 1.0, + 6.0, + 7.0, + 8.0, + 9.0, + 10.0, + 11.0, + 12.0, + 13.0, + 14.0, + 15.0, + 16.0, + ) MatrixMathHelper.resetIdentityMatrix(matrix) val expected = doubleArrayOf( - 1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 0.0, 1.0) + 1.0, + 0.0, + 0.0, + 0.0, + 0.0, + 1.0, + 0.0, + 0.0, + 0.0, + 0.0, + 1.0, + 0.0, + 0.0, + 0.0, + 0.0, + 1.0, + ) assertThat(matrix).containsExactly(*expected) } @@ -174,7 +272,23 @@ class MatrixMathHelperTest { val matrix = doubleArrayOf( - 2.0, 0.0, 0.0, 0.0, 0.0, 2.0, 0.0, 0.0, 0.0, 0.0, 2.0, 0.0, 0.0, 0.0, 0.0, 2.0) + 2.0, + 0.0, + 0.0, + 0.0, + 0.0, + 2.0, + 0.0, + 0.0, + 0.0, + 0.0, + 2.0, + 0.0, + 0.0, + 0.0, + 0.0, + 2.0, + ) assertThat(MatrixMathHelper.determinant(matrix)).isEqualTo(16.0) } @@ -182,13 +296,45 @@ class MatrixMathHelperTest { fun testInverse() { val matrix = doubleArrayOf( - 2.0, 0.0, 0.0, 0.0, 0.0, 2.0, 0.0, 0.0, 0.0, 0.0, 2.0, 0.0, 0.0, 0.0, 0.0, 2.0) + 2.0, + 0.0, + 0.0, + 0.0, + 0.0, + 2.0, + 0.0, + 0.0, + 0.0, + 0.0, + 2.0, + 0.0, + 0.0, + 0.0, + 0.0, + 2.0, + ) val inverse = MatrixMathHelper.inverse(matrix) val expected = doubleArrayOf( - 0.5, 0.0, 0.0, 0.0, 0.0, 0.5, 0.0, 0.0, 0.0, 0.0, 0.5, 0.0, 0.0, 0.0, 0.0, 0.5) + 0.5, + 0.0, + 0.0, + 0.0, + 0.0, + 0.5, + 0.0, + 0.0, + 0.0, + 0.0, + 0.5, + 0.0, + 0.0, + 0.0, + 0.0, + 0.5, + ) assertThat(inverse).containsExactly(*expected) } @@ -197,13 +343,45 @@ class MatrixMathHelperTest { fun testTranspose() { val matrix = doubleArrayOf( - 1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0, 10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0) + 1.0, + 2.0, + 3.0, + 4.0, + 5.0, + 6.0, + 7.0, + 8.0, + 9.0, + 10.0, + 11.0, + 12.0, + 13.0, + 14.0, + 15.0, + 16.0, + ) val transposed = MatrixMathHelper.transpose(matrix) val expected = doubleArrayOf( - 1.0, 5.0, 9.0, 13.0, 2.0, 6.0, 10.0, 14.0, 3.0, 7.0, 11.0, 15.0, 4.0, 8.0, 12.0, 16.0) + 1.0, + 5.0, + 9.0, + 13.0, + 2.0, + 6.0, + 10.0, + 14.0, + 3.0, + 7.0, + 11.0, + 15.0, + 4.0, + 8.0, + 12.0, + 16.0, + ) assertThat(transposed).containsExactly(*expected) } @@ -213,7 +391,23 @@ class MatrixMathHelperTest { val vector = doubleArrayOf(1.0, 2.0, 3.0, 1.0) val matrix = doubleArrayOf( - 2.0, 0.0, 0.0, 0.0, 0.0, 2.0, 0.0, 0.0, 0.0, 0.0, 2.0, 0.0, 0.0, 0.0, 0.0, 1.0) + 2.0, + 0.0, + 0.0, + 0.0, + 0.0, + 2.0, + 0.0, + 0.0, + 0.0, + 0.0, + 2.0, + 0.0, + 0.0, + 0.0, + 0.0, + 1.0, + ) val result = DoubleArray(4) MatrixMathHelper.multiplyVectorByMatrix(vector, matrix, result) @@ -527,7 +721,7 @@ class MatrixMathHelperTest { degreesZ: Double, rotX: Double, rotY: Double, - rotZ: Double + rotZ: Double, ) { val ctx = MatrixDecompositionContext() val matrixX = createRotateX(degreesToRadians(degreesX)) diff --git a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/uimanager/ReactPropAnnotationSetterTest.kt b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/uimanager/ReactPropAnnotationSetterTest.kt index de928b429ce..e2e683a7c44 100644 --- a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/uimanager/ReactPropAnnotationSetterTest.kt +++ b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/uimanager/ReactPropAnnotationSetterTest.kt @@ -145,7 +145,8 @@ class ReactPropAnnotationSetterTest { @ReactPropGroup( names = ["floatGroupPropWithDefaultFirst", "floatGroupPropWithDefaultSecond"], - defaultFloat = -100.0f) + defaultFloat = -100.0f, + ) fun setFloatGroupPropWithDefault(v: View?, index: Int, value: Float) { viewManagerUpdatesReceiver.onFloatGroupPropSetterCalled(index, value) } @@ -156,7 +157,9 @@ class ReactPropAnnotationSetterTest { } @ReactPropGroup( - names = ["intGroupPropWithDefaultFirst", "intGroupPropWithDefaultSecond"], defaultInt = 555) + names = ["intGroupPropWithDefaultFirst", "intGroupPropWithDefaultSecond"], + defaultInt = 555, + ) fun setIntGroupPropWithDefault(v: View?, index: Int, value: Int) { viewManagerUpdatesReceiver.onIntGroupPropSetterCalled(index, value) } diff --git a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/uimanager/ReactPropConstantsTest.kt b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/uimanager/ReactPropConstantsTest.kt index ac8639e2204..a95159c51fa 100644 --- a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/uimanager/ReactPropConstantsTest.kt +++ b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/uimanager/ReactPropConstantsTest.kt @@ -84,7 +84,8 @@ class ReactPropConstantsTest { @ReactPropGroup( names = ["customBoxedIntGroupPropFirst", "customBoxedIntGroupPropSecond"], - customType = "color") + customType = "color", + ) fun customIntGroupProp(v: View?, index: Int, value: Int?) = Unit } diff --git a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/uimanager/UIManagerModuleConstantsTest.kt b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/uimanager/UIManagerModuleConstantsTest.kt index 6c43884936a..b7a09dd7d92 100644 --- a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/uimanager/UIManagerModuleConstantsTest.kt +++ b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/uimanager/UIManagerModuleConstantsTest.kt @@ -156,7 +156,8 @@ class UIManagerModuleConstantsTest { mapOf( "keyToOverride" to "innerValueX", "anotherKey" to "valueX", - ))) + ), + )) val managerY = ConcreteViewManager("ManagerY") managerY.exportedCustomDirectEventTypeConstants = @@ -169,7 +170,8 @@ class UIManagerModuleConstantsTest { mapOf( "keyToOverride" to "innerValueY", "extraKey" to "valueY", - ))) + ), + )) val viewManagers = listOf(managerX, managerY) val uiManagerModule = UIManagerModule(reactContext, viewManagers, 0) diff --git a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/uimanager/layoutanimation/AbstractLayoutAnimationTest.kt b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/uimanager/layoutanimation/AbstractLayoutAnimationTest.kt index 93664100824..cd10239c471 100644 --- a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/uimanager/layoutanimation/AbstractLayoutAnimationTest.kt +++ b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/uimanager/layoutanimation/AbstractLayoutAnimationTest.kt @@ -55,7 +55,7 @@ class AbstractLayoutAnimationTest { x: Int, y: Int, width: Int, - height: Int + height: Int, ): Animation = mock() } } @@ -102,7 +102,7 @@ class AbstractLayoutAnimationTest { x: Int, y: Int, width: Int, - height: Int + height: Int, ): Animation = mock() } @@ -126,7 +126,7 @@ class AbstractLayoutAnimationTest { x: Int, y: Int, width: Int, - height: Int + height: Int, ): Animation = mock() } diff --git a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/uimanager/style/ColorStopTest.kt b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/uimanager/style/ColorStopTest.kt index c3ad96bd30f..707c4328e1d 100644 --- a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/uimanager/style/ColorStopTest.kt +++ b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/uimanager/style/ColorStopTest.kt @@ -33,7 +33,8 @@ class ColorStopTest { val colorStops = listOf( ColorStop(Color.RED, LengthPercentage(0f, LengthPercentageType.PERCENT)), - ColorStop(Color.GREEN, LengthPercentage(42f, LengthPercentageType.PERCENT))) + ColorStop(Color.GREEN, LengthPercentage(42f, LengthPercentageType.PERCENT)), + ) val processed = ColorStopUtils.getFixedColorStops(colorStops, 60f) assertThat(processed).hasSize(2) @@ -49,7 +50,8 @@ class ColorStopTest { listOf( ColorStop(Color.RED), ColorStop(Color.GREEN, LengthPercentage(30f, LengthPercentageType.PERCENT)), - ColorStop(Color.BLUE)) + ColorStop(Color.BLUE), + ) val processed = ColorStopUtils.getFixedColorStops(colorStops, 80f) assertThat(processed).hasSize(3) @@ -69,7 +71,8 @@ class ColorStopTest { ColorStop(Color.GREEN, LengthPercentage(30f, LengthPercentageType.PERCENT)), ColorStop(Color.BLUE, LengthPercentage(20f, LengthPercentageType.PERCENT)), ColorStop(Color.GRAY, LengthPercentage(60f, LengthPercentageType.PERCENT)), - ColorStop(Color.CYAN, LengthPercentage(50f, LengthPercentageType.PERCENT))) + ColorStop(Color.CYAN, LengthPercentage(50f, LengthPercentageType.PERCENT)), + ) val processed = ColorStopUtils.getFixedColorStops(colorStops, 80f) assertThat(processed).hasSize(5) @@ -92,7 +95,8 @@ class ColorStopTest { ColorStop(Color.RED, LengthPercentage(0f, LengthPercentageType.PERCENT)), ColorStop(Color.GREEN), ColorStop(Color.BLUE), - ColorStop(Color.TRANSPARENT, LengthPercentage(100f, LengthPercentageType.PERCENT))) + ColorStop(Color.TRANSPARENT, LengthPercentage(100f, LengthPercentageType.PERCENT)), + ) val processed = ColorStopUtils.getFixedColorStops(colorStops, 100f) assertThat(processed).hasSize(4) @@ -111,7 +115,8 @@ class ColorStopTest { val colorStops = listOf( ColorStop(Color.YELLOW, LengthPercentage(100f, LengthPercentageType.POINT)), - ColorStop(Color.BLUE, LengthPercentage(50f, LengthPercentageType.PERCENT))) + ColorStop(Color.BLUE, LengthPercentage(50f, LengthPercentageType.PERCENT)), + ) val processed200px = ColorStopUtils.getFixedColorStops(colorStops, 200f) assertThat(processed200px).hasSize(2) @@ -138,7 +143,8 @@ class ColorStopTest { ColorStop(null, LengthPercentage(10f, LengthPercentageType.PERCENT)), ColorStop(Color.GREEN, LengthPercentage(50f, LengthPercentageType.PERCENT)), ColorStop(null, LengthPercentage(85f, LengthPercentageType.PERCENT)), - ColorStop(Color.BLUE, LengthPercentage(100f, LengthPercentageType.PERCENT))) + ColorStop(Color.BLUE, LengthPercentage(100f, LengthPercentageType.PERCENT)), + ) val processed = ColorStopUtils.getFixedColorStops(colorStops, 100f) assertThat(processed.size).isEqualTo(21) assertThat(processed.first().color).isEqualTo(Color.RED) diff --git a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/util/JSStackTraceTest.kt b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/util/JSStackTraceTest.kt index 6bb0f280f50..38d6bae02a6 100644 --- a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/util/JSStackTraceTest.kt +++ b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/util/JSStackTraceTest.kt @@ -26,7 +26,8 @@ class JSStackTraceTest { "lineNumber", 7, "file", - "Fb4aBundle.js"), + "Fb4aBundle.js", + ), JavaOnlyMap.of( "methodName", "method_from_ram_bundle", @@ -35,7 +36,8 @@ class JSStackTraceTest { "lineNumber", 18, "file", - "199.js"), + "199.js", + ), JavaOnlyMap.of( "methodName", "method_from_ram_bundle_with_address", @@ -44,7 +46,8 @@ class JSStackTraceTest { "lineNumber", 18, "file", - "address at 199.js"), + "address at 199.js", + ), JavaOnlyMap.of( "methodName", "method_from_segment", @@ -53,7 +56,8 @@ class JSStackTraceTest { "lineNumber", 9, "file", - "seg-1.js"), + "seg-1.js", + ), JavaOnlyMap.of( "methodName", "method_from_segment_with_address", @@ -62,7 +66,8 @@ class JSStackTraceTest { "lineNumber", 9, "file", - "address at seg-1.js"), + "address at seg-1.js", + ), JavaOnlyMap.of( "methodName", "method_from_ram_segment", @@ -71,7 +76,8 @@ class JSStackTraceTest { "lineNumber", 10, "file", - "seg-3_198.js"), + "seg-3_198.js", + ), JavaOnlyMap.of( "methodName", "method_from_ram_segment_with_address", @@ -80,7 +86,9 @@ class JSStackTraceTest { "lineNumber", 10, "file", - "address at seg-3_198.js")) + "address at seg-3_198.js", + ), + ) val message = JSStackTrace.format("Error", values) assertThat(message) .isEqualTo( diff --git a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/views/textinput/ReactTextInputPropertyTest.kt b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/views/textinput/ReactTextInputPropertyTest.kt index 14c0ce0960b..d5ebb1518e1 100644 --- a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/views/textinput/ReactTextInputPropertyTest.kt +++ b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/views/textinput/ReactTextInputPropertyTest.kt @@ -96,19 +96,25 @@ class ReactTextInputPropertyTest { assertThat(view.inputType and InputType.TYPE_TEXT_FLAG_CAP_CHARACTERS).isZero manager.updateProperties( - view, buildStyles("autoCapitalize", InputType.TYPE_TEXT_FLAG_CAP_SENTENCES)) + view, + buildStyles("autoCapitalize", InputType.TYPE_TEXT_FLAG_CAP_SENTENCES), + ) assertThat(view.inputType and InputType.TYPE_TEXT_FLAG_CAP_SENTENCES).isNotZero assertThat(view.inputType and InputType.TYPE_TEXT_FLAG_CAP_WORDS).isZero assertThat(view.inputType and InputType.TYPE_TEXT_FLAG_CAP_CHARACTERS).isZero manager.updateProperties( - view, buildStyles("autoCapitalize", InputType.TYPE_TEXT_FLAG_CAP_WORDS)) + view, + buildStyles("autoCapitalize", InputType.TYPE_TEXT_FLAG_CAP_WORDS), + ) assertThat(view.inputType and InputType.TYPE_TEXT_FLAG_CAP_SENTENCES).isZero assertThat(view.inputType and InputType.TYPE_TEXT_FLAG_CAP_WORDS).isNotZero assertThat(view.inputType and InputType.TYPE_TEXT_FLAG_CAP_CHARACTERS).isZero manager.updateProperties( - view, buildStyles("autoCapitalize", InputType.TYPE_TEXT_FLAG_CAP_CHARACTERS)) + view, + buildStyles("autoCapitalize", InputType.TYPE_TEXT_FLAG_CAP_CHARACTERS), + ) assertThat(view.inputType and InputType.TYPE_TEXT_FLAG_CAP_SENTENCES).isZero assertThat(view.inputType and InputType.TYPE_TEXT_FLAG_CAP_WORDS).isZero assertThat(view.inputType and InputType.TYPE_TEXT_FLAG_CAP_CHARACTERS).isNotZero @@ -362,7 +368,9 @@ class ReactTextInputPropertyTest { // region TextAlign + TextAlignVertical manager.updateProperties( - view, buildStyles("textAlign", "center", "textAlignVertical", "center")) + view, + buildStyles("textAlign", "center", "textAlignVertical", "center"), + ) assertThat(view.gravity).isEqualTo(Gravity.CENTER) manager.updateProperties(view, buildStyles("textAlign", "right", "textAlignVertical", "bottom")) diff --git a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/views/virtual/view/ReactVirtualViewTest.kt b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/views/virtual/view/ReactVirtualViewTest.kt index 75c6821e3ae..8290f5961b3 100644 --- a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/views/virtual/view/ReactVirtualViewTest.kt +++ b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/views/virtual/view/ReactVirtualViewTest.kt @@ -83,14 +83,16 @@ class ReactVirtualViewTest { expectedTargetY = 0, expectedTargetHeight = 50, expectedThresholdY = 0, - expectedThresholdHeight = 200) + expectedThresholdHeight = 200, + ) verifyEvent( allValues[1], expectedMode = VirtualViewMode.Hidden, expectedTargetY = 0, expectedTargetHeight = 50, expectedThresholdY = 0, - expectedThresholdHeight = 0) + expectedThresholdHeight = 0, + ) } } diff --git a/packages/react-native/ReactAndroid/src/test/java/com/facebook/testutils/fakes/FakeUIManager.kt b/packages/react-native/ReactAndroid/src/test/java/com/facebook/testutils/fakes/FakeUIManager.kt index f0841bf89d0..057006764a2 100644 --- a/packages/react-native/ReactAndroid/src/test/java/com/facebook/testutils/fakes/FakeUIManager.kt +++ b/packages/react-native/ReactAndroid/src/test/java/com/facebook/testutils/fakes/FakeUIManager.kt @@ -39,7 +39,7 @@ class FakeUIManager : UIManager, UIBlockViewResolver { moduleName: String, initialProps: WritableMap?, widthMeasureSpec: Int, - heightMeasureSpec: Int + heightMeasureSpec: Int, ): Int { error("Not yet implemented") } @@ -53,7 +53,7 @@ class FakeUIManager : UIManager, UIBlockViewResolver { widthMeasureSpec: Int, heightMeasureSpec: Int, offsetX: Int, - offsetY: Int + offsetY: Int, ) { error("Not yet implemented") } diff --git a/packages/react-native/ReactAndroid/src/test/java/com/facebook/testutils/shadows/ShadowNativeMap.kt b/packages/react-native/ReactAndroid/src/test/java/com/facebook/testutils/shadows/ShadowNativeMap.kt index 2f7a535fcc8..5f9dddeead0 100644 --- a/packages/react-native/ReactAndroid/src/test/java/com/facebook/testutils/shadows/ShadowNativeMap.kt +++ b/packages/react-native/ReactAndroid/src/test/java/com/facebook/testutils/shadows/ShadowNativeMap.kt @@ -22,14 +22,20 @@ open class ShadowNativeMap { @Deprecated( "Use ShadowReadableNativeMap", ReplaceWith( - "ShadowReadableNativeMap", "com.facebook.testutils.shadows.ShadowReadableNativeMap")) + "ShadowReadableNativeMap", + "com.facebook.testutils.shadows.ShadowReadableNativeMap", + ), + ) @Implements(ReadableNativeMap::class) class Readable : ShadowNativeMap() @Deprecated( "Use ShadowWritableNativeMap", ReplaceWith( - "ShadowWritableNativeMap", "com.facebook.testutils.shadows.ShadowWritableNativeMap")) + "ShadowWritableNativeMap", + "com.facebook.testutils.shadows.ShadowWritableNativeMap", + ), + ) @Implements(WritableNativeMap::class) class Writable : ShadowNativeMap() diff --git a/packages/react-native/ReactCommon/react/nativemodule/samples/platform/android/SampleLegacyModule.kt b/packages/react-native/ReactCommon/react/nativemodule/samples/platform/android/SampleLegacyModule.kt index 690125d77b5..2780c93ef7e 100644 --- a/packages/react-native/ReactCommon/react/nativemodule/samples/platform/android/SampleLegacyModule.kt +++ b/packages/react-native/ReactCommon/react/nativemodule/samples/platform/android/SampleLegacyModule.kt @@ -202,7 +202,8 @@ public class SampleLegacyModule(private val context: ReactApplicationContext) : log( "getValue", mapOf("1-numberArg" to numberArg, "2-stringArg" to stringArg, "3-mapArg" to mapArg), - map) + map, + ) return map } @@ -234,7 +235,10 @@ public class SampleLegacyModule(private val context: ReactApplicationContext) : public fun getValueWithPromise(error: Boolean, promise: Promise?) { if (error) { promise?.reject( - "code 1", "intentional promise rejection", Throwable("promise intentionally rejected")) + "code 1", + "intentional promise rejection", + Throwable("promise intentionally rejected"), + ) } else { promise?.resolve("result") } diff --git a/packages/react-native/ReactCommon/react/nativemodule/samples/platform/android/SampleTurboModule.kt b/packages/react-native/ReactCommon/react/nativemodule/samples/platform/android/SampleTurboModule.kt index c435e0ef9c2..e6ae5f5060f 100644 --- a/packages/react-native/ReactCommon/react/nativemodule/samples/platform/android/SampleTurboModule.kt +++ b/packages/react-native/ReactCommon/react/nativemodule/samples/platform/android/SampleTurboModule.kt @@ -179,7 +179,10 @@ public class SampleTurboModule(private val context: ReactApplicationContext) : override fun getValueWithPromise(error: Boolean, promise: Promise) { if (error) { promise?.reject( - "code 1", "intentional promise rejection", Throwable("promise intentionally rejected")) + "code 1", + "intentional promise rejection", + Throwable("promise intentionally rejected"), + ) } else { promise?.resolve("result") } @@ -238,7 +241,8 @@ public class SampleTurboModule(private val context: ReactApplicationContext) : } else { promise.resolve(null) } - }) + }, + ) .launch("image/*") } else { promise.reject("error", "Unable to obtain an image uri without current activity") diff --git a/packages/rn-tester/android/app/benchmark/src/main/java/com/facebook/react/uiapp/benchmark/RNTesterStartupBenchmark.kt b/packages/rn-tester/android/app/benchmark/src/main/java/com/facebook/react/uiapp/benchmark/RNTesterStartupBenchmark.kt index bc3c2fb22c6..086e6449dba 100644 --- a/packages/rn-tester/android/app/benchmark/src/main/java/com/facebook/react/uiapp/benchmark/RNTesterStartupBenchmark.kt +++ b/packages/rn-tester/android/app/benchmark/src/main/java/com/facebook/react/uiapp/benchmark/RNTesterStartupBenchmark.kt @@ -34,11 +34,12 @@ class RNTesterStartupBenchmark { metrics = listOf(StartupTimingMetric()), iterations = 10, startupMode = StartupMode.COLD, - setupBlock = { pressHome() }) { - startActivityAndWait() + setupBlock = { pressHome() }, + ) { + startActivityAndWait() - // Waits for an element that corresponds to fully drawn state - device.wait(Until.hasObject(By.text("Components")), 10_000) - device.waitForIdle() - } + // Waits for an element that corresponds to fully drawn state + device.wait(Until.hasObject(By.text("Components")), 10_000) + device.waitForIdle() + } } diff --git a/packages/rn-tester/android/app/src/main/java/com/facebook/react/uiapp/RNTesterActivity.kt b/packages/rn-tester/android/app/src/main/java/com/facebook/react/uiapp/RNTesterActivity.kt index c3ae4b0d51e..4df826527df 100644 --- a/packages/rn-tester/android/app/src/main/java/com/facebook/react/uiapp/RNTesterActivity.kt +++ b/packages/rn-tester/android/app/src/main/java/com/facebook/react/uiapp/RNTesterActivity.kt @@ -100,7 +100,7 @@ internal class RNTesterActivity : ReactActivity() { prefix: String, fd: FileDescriptor?, writer: PrintWriter, - args: Array? + args: Array?, ) { FBRNTesterEndToEndHelper.maybeDump(prefix, writer, args) } diff --git a/packages/rn-tester/android/app/src/main/java/com/facebook/react/uiapp/RNTesterApplication.kt b/packages/rn-tester/android/app/src/main/java/com/facebook/react/uiapp/RNTesterApplication.kt index aa966356f80..507a08ad4a9 100644 --- a/packages/rn-tester/android/app/src/main/java/com/facebook/react/uiapp/RNTesterApplication.kt +++ b/packages/rn-tester/android/app/src/main/java/com/facebook/react/uiapp/RNTesterApplication.kt @@ -36,7 +36,8 @@ import com.facebook.react.uimanager.ViewManager internal class RNTesterApplication : Application(), ReactApplication { @Deprecated( "You should not use ReactNativeHost directly in the New Architecture. Use ReactHost instead.", - replaceWith = ReplaceWith("reactHost")) + replaceWith = ReplaceWith("reactHost"), + ) override val reactNativeHost: ReactNativeHost by lazy(LazyThreadSafetyMode.NONE) { object : DefaultReactNativeHost(this) { @@ -52,7 +53,7 @@ internal class RNTesterApplication : Application(), ReactApplication { object : BaseReactPackage() { override fun getModule( name: String, - reactContext: ReactApplicationContext + reactContext: ReactApplicationContext, ): NativeModule? = when { SampleTurboModule.NAME == name -> SampleTurboModule(reactContext) @@ -73,7 +74,8 @@ internal class RNTesterApplication : Application(), ReactApplication { canOverrideExistingModule = false, needsEagerInit = false, isCxxModule = false, - isTurboModule = true), + isTurboModule = true, + ), SampleLegacyModule.NAME to ReactModuleInfo( SampleLegacyModule.NAME, @@ -81,14 +83,19 @@ internal class RNTesterApplication : Application(), ReactApplication { canOverrideExistingModule = false, needsEagerInit = false, isCxxModule = false, - isTurboModule = false)) + isTurboModule = false, + ), + ) } }) add( object : ReactPackage, ViewManagerOnDemandReactPackage { override fun getViewManagerNames(reactContext: ReactApplicationContext) = listOf( - "RNTMyNativeView", "RNTMyLegacyNativeView", "RNTReportFullyDrawnView") + "RNTMyNativeView", + "RNTMyLegacyNativeView", + "RNTReportFullyDrawnView", + ) override fun createViewManagers( reactContext: ReactApplicationContext @@ -96,11 +103,12 @@ internal class RNTesterApplication : Application(), ReactApplication { listOf( MyNativeViewManager(), MyLegacyViewManager(reactContext), - ReportFullyDrawnViewManager()) + ReportFullyDrawnViewManager(), + ) override fun createViewManager( reactContext: ReactApplicationContext, - viewManagerName: String + viewManagerName: String, ): ViewManager<*, out ReactShadowNode<*>>? = when (viewManagerName) { "RNTMyNativeView" -> MyNativeViewManager() diff --git a/packages/rn-tester/android/app/src/main/java/com/facebook/react/uiapp/component/MyNativeView.kt b/packages/rn-tester/android/app/src/main/java/com/facebook/react/uiapp/component/MyNativeView.kt index 0a818b92ca2..bf893d66d86 100644 --- a/packages/rn-tester/android/app/src/main/java/com/facebook/react/uiapp/component/MyNativeView.kt +++ b/packages/rn-tester/android/app/src/main/java/com/facebook/react/uiapp/component/MyNativeView.kt @@ -136,7 +136,7 @@ internal class MyNativeView(context: ThemedReactContext) : View(context) { inner class OnIntArrayChangedEvent( surfaceId: Int, viewId: Int, - private val payload: WritableMap + private val payload: WritableMap, ) : Event(surfaceId, viewId) { override fun getEventName() = "topIntArrayChanged"