diff --git a/packages/react-native/ReactAndroid/api/ReactAndroid.api b/packages/react-native/ReactAndroid/api/ReactAndroid.api index a5735a889fe..73cf29d3c0d 100644 --- a/packages/react-native/ReactAndroid/api/ReactAndroid.api +++ b/packages/react-native/ReactAndroid/api/ReactAndroid.api @@ -5998,13 +5998,16 @@ public final class com/facebook/react/views/drawer/events/DrawerOpenedEvent : co public final class com/facebook/react/views/drawer/events/DrawerOpenedEvent$Companion { } -public class com/facebook/react/views/drawer/events/DrawerSlideEvent : com/facebook/react/uimanager/events/Event { +public final class com/facebook/react/views/drawer/events/DrawerSlideEvent : com/facebook/react/uimanager/events/Event { + public static final field Companion Lcom/facebook/react/views/drawer/events/DrawerSlideEvent$Companion; public static final field EVENT_NAME Ljava/lang/String; public fun (IF)V public fun (IIF)V - protected fun getEventData ()Lcom/facebook/react/bridge/WritableMap; public fun getEventName ()Ljava/lang/String; - public fun getOffset ()F + public final fun getOffset ()F +} + +public final class com/facebook/react/views/drawer/events/DrawerSlideEvent$Companion { } public class com/facebook/react/views/drawer/events/DrawerStateChangedEvent : com/facebook/react/uimanager/events/Event { diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/drawer/events/DrawerSlideEvent.java b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/drawer/events/DrawerSlideEvent.java deleted file mode 100644 index f9de87fbf63..00000000000 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/drawer/events/DrawerSlideEvent.java +++ /dev/null @@ -1,49 +0,0 @@ -/* - * 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. - */ - -package com.facebook.react.views.drawer.events; - -import com.facebook.infer.annotation.Nullsafe; -import com.facebook.react.bridge.Arguments; -import com.facebook.react.bridge.WritableMap; -import com.facebook.react.uimanager.common.ViewUtil; -import com.facebook.react.uimanager.events.Event; - -/** Event emitted by a DrawerLayout as it is being moved open/closed. */ -@Nullsafe(Nullsafe.Mode.LOCAL) -public class DrawerSlideEvent extends Event { - - public static final String EVENT_NAME = "topDrawerSlide"; - - private final float mOffset; - - @Deprecated - public DrawerSlideEvent(int viewId, float offset) { - this(ViewUtil.NO_SURFACE_ID, viewId, offset); - } - - public DrawerSlideEvent(int surfaceId, int viewId, float offset) { - super(surfaceId, viewId); - mOffset = offset; - } - - public float getOffset() { - return mOffset; - } - - @Override - public String getEventName() { - return EVENT_NAME; - } - - @Override - protected WritableMap getEventData() { - WritableMap eventData = Arguments.createMap(); - eventData.putDouble("offset", getOffset()); - return eventData; - } -} 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 new file mode 100644 index 00000000000..5761485728a --- /dev/null +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/drawer/events/DrawerSlideEvent.kt @@ -0,0 +1,41 @@ +/* + * 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. + */ + +package com.facebook.react.views.drawer.events + +import com.facebook.react.bridge.Arguments +import com.facebook.react.bridge.WritableMap +import com.facebook.react.uimanager.common.ViewUtil +import com.facebook.react.uimanager.events.Event + +/** Event emitted by a DrawerLayout as it is being moved open/closed. */ +public class DrawerSlideEvent : Event { + + private val offset: Float + + @Deprecated( + "Use constructor with surfaceId", ReplaceWith("DrawerSlideEvent(surfaceId, viewId, offset)")) + public constructor(viewId: Int, offset: Float) : this(ViewUtil.NO_SURFACE_ID, viewId, offset) + + public constructor(surfaceId: Int, viewId: Int, offset: Float) : super(surfaceId, viewId) { + this.offset = offset + } + + public fun getOffset(): Float = offset + + override public fun getEventName(): String = EVENT_NAME + + override protected fun getEventData(): WritableMap? { + val eventData: WritableMap = Arguments.createMap() + eventData.putDouble("offset", getOffset().toDouble()) + return eventData + } + + public companion object { + public const val EVENT_NAME: String = "topDrawerSlide" + } +}