@onekeyfe/react-native-pager-view 3.0.157-alpha.257 → 3.0.157-alpha.258

package/android/src/main/java/com/reactnativepagerview/NativeScrollerViewManager.kt

@@ -0,0 +1,130 @@
+package com.reactnativepagerview
+
+import android.graphics.Color
+import android.view.View
+import com.facebook.react.bridge.ReadableArray
+import com.facebook.react.module.annotations.ReactModule
+import com.facebook.react.uimanager.ReactStylesDiffMap
+import com.facebook.react.uimanager.StateWrapper
+import com.facebook.react.uimanager.ThemedReactContext
+import com.facebook.react.uimanager.ViewGroupManager
+import com.facebook.react.uimanager.ViewManagerDelegate
+import com.facebook.react.uimanager.annotations.ReactProp
+import com.facebook.react.viewmanagers.RNCNativeScrollerManagerDelegate
+import com.facebook.react.viewmanagers.RNCNativeScrollerManagerInterface
+
+@ReactModule(name = NativeScrollerViewManager.NAME)
+class NativeScrollerViewManager : ViewGroupManager<NativeScrollerView>(),
+  RNCNativeScrollerManagerInterface<NativeScrollerView> {
+  private val delegate: ViewManagerDelegate<NativeScrollerView> = RNCNativeScrollerManagerDelegate(this)
+  override fun getDelegate() = delegate
+  override fun getName() = NAME
+  override fun createViewInstance(context: ThemedReactContext) = NativeScrollerView(context)
+  override fun needsCustomLayoutForChildren() = false
+  override fun addView(parent: NativeScrollerView, child: View, index: Int) = parent.addReactChild(child, index)
+  override fun getChildCount(parent: NativeScrollerView) = parent.reactChildCount()
+  override fun getChildAt(parent: NativeScrollerView, index: Int) = parent.reactChildAt(index)
+  override fun removeViewAt(parent: NativeScrollerView, index: Int) {
+    require(index == 0)
+    parent.removeReactChild()
+  }
+  override fun removeAllViews(parent: NativeScrollerView) = parent.removeReactChild()
+  override fun onDropViewInstance(view: NativeScrollerView) {
+    view.viewport.stopMotion()
+    view.setFabricState(null)
+    super.onDropViewInstance(view)
+  }
+  override fun updateState(view: NativeScrollerView, props: ReactStylesDiffMap, stateWrapper: StateWrapper): Any? {
+    view.setFabricState(stateWrapper)
+    return null
+  }
+  override fun onAfterUpdateTransaction(view: NativeScrollerView) {
+    super.onAfterUpdateTransaction(view)
+    view.scheduleLayout()
+  }
+
+  @ReactProp(name = "contentWidth")
+  override fun setContentWidth(view: NativeScrollerView, value: Double) = view.setContentSize(width = view.dip(value))
+  @ReactProp(name = "contentHeight")
+  override fun setContentHeight(view: NativeScrollerView, value: Double) = view.setContentSize(height = view.dip(value))
+  @ReactProp(name = "scrollEnabled", defaultBoolean = true)
+  override fun setScrollEnabled(view: NativeScrollerView, value: Boolean) = view.setScrollEnabled(value)
+  @ReactProp(name = "nestedScrollEnabled", defaultBoolean = true)
+  override fun setNestedScrollEnabled(view: NativeScrollerView, value: Boolean) {
+    if (!value) view.viewport.stopMotion()
+    view.viewport.isNestedScrollingEnabled = value
+  }
+  @ReactProp(name = "showsVerticalScrollIndicator", defaultBoolean = true)
+  override fun setShowsVerticalScrollIndicator(view: NativeScrollerView, value: Boolean) {
+    view.viewport.isVerticalScrollBarEnabled = value
+  }
+  @ReactProp(name = "showsHorizontalScrollIndicator")
+  override fun setShowsHorizontalScrollIndicator(view: NativeScrollerView, value: Boolean) {
+    view.viewport.isHorizontalScrollBarEnabled = value
+  }
+  // UIKit-only properties: Android keeps the platform NestedScrollView fling/edge policy.
+  @ReactProp(name = "bounces", defaultBoolean = true)
+  override fun setBounces(view: NativeScrollerView, value: Boolean) = Unit
+  @ReactProp(name = "alwaysBounceVertical", defaultBoolean = true)
+  override fun setAlwaysBounceVertical(view: NativeScrollerView, value: Boolean) = Unit
+  @ReactProp(name = "decelerationRate", defaultDouble = 0.998)
+  override fun setDecelerationRate(view: NativeScrollerView, value: Double) = Unit
+  @ReactProp(name = "keyboardDismissMode")
+  override fun setKeyboardDismissMode(view: NativeScrollerView, value: String?) {
+    view.keyboardDismissMode = value ?: "none"
+  }
+  @ReactProp(name = "keyboardShouldPersistTaps")
+  override fun setKeyboardShouldPersistTaps(view: NativeScrollerView, value: String?) {
+    // The JS responder wrapper owns never/handled/always and TextInput exceptions.
+    view.keyboardShouldPersistTaps = value ?: "never"
+  }
+  @ReactProp(name = "scrollEventThrottle")
+  override fun setScrollEventThrottle(view: NativeScrollerView, value: Double) {
+    view.scrollEventThrottle = value.coerceAtLeast(0.0)
+  }
+  @ReactProp(name = "contentInsetTop")
+  override fun setContentInsetTop(view: NativeScrollerView, value: Double) { view.insetTop = view.dip(value).coerceAtLeast(0) }
+  @ReactProp(name = "contentInsetRight")
+  override fun setContentInsetRight(view: NativeScrollerView, value: Double) { view.insetRight = view.dip(value).coerceAtLeast(0) }
+  @ReactProp(name = "contentInsetBottom")
+  override fun setContentInsetBottom(view: NativeScrollerView, value: Double) { view.insetBottom = view.dip(value).coerceAtLeast(0) }
+  @ReactProp(name = "contentInsetLeft")
+  override fun setContentInsetLeft(view: NativeScrollerView, value: Double) { view.insetLeft = view.dip(value).coerceAtLeast(0) }
+  @ReactProp(name = "refreshEnabled")
+  override fun setRefreshEnabled(view: NativeScrollerView, value: Boolean) { view.refreshEnabled = value }
+  @ReactProp(name = "refreshing")
+  override fun setRefreshing(view: NativeScrollerView, value: Boolean) = view.setRefreshing(value)
+  @ReactProp(name = "refreshTintColor", customType = "Color")
+  override fun setRefreshTintColor(view: NativeScrollerView, value: Int?) {
+    // Android's refreshColors determines the native arc; tintColor is iOS-only.
+  }
+  @ReactProp(name = "refreshColors", customType = "ColorArray")
+  override fun setRefreshColors(view: NativeScrollerView, value: ReadableArray?) {
+    view.setRefreshColors(if (value == null) intArrayOf(Color.GRAY) else IntArray(value.size()) { value.getInt(it) })
+  }
+  @ReactProp(name = "refreshProgressBackgroundColor", customType = "Color")
+  override fun setRefreshProgressBackgroundColor(view: NativeScrollerView, value: Int?) =
+    view.setRefreshBackground(value ?: Color.WHITE)
+  @ReactProp(name = "refreshProgressViewOffset")
+  override fun setRefreshProgressViewOffset(view: NativeScrollerView, value: Double) = view.setRefreshOffset(view.dip(value))
+  @ReactProp(name = "refreshTitle")
+  override fun setRefreshTitle(view: NativeScrollerView, value: String?) = Unit
+  @ReactProp(name = "refreshTitleColor", customType = "Color")
+  override fun setRefreshTitleColor(view: NativeScrollerView, value: Int?) = Unit
+  @ReactProp(name = "refreshSize")
+  override fun setRefreshSize(view: NativeScrollerView, value: String?) = view.setRefreshSize(value)
+
+  override fun receiveCommand(view: NativeScrollerView, commandId: String, args: ReadableArray?) =
+    delegate.receiveCommand(view, commandId, args)
+  override fun setRefreshState(view: NativeScrollerView, refreshing: Boolean) = view.setRefreshing(refreshing)
+  override fun scrollTo(view: NativeScrollerView, x: Double, y: Double, animated: Boolean) =
+    view.scrollToPosition(view.dip(x), view.dip(y), animated)
+  override fun scrollToEnd(view: NativeScrollerView, animated: Boolean) = view.scrollToEnd(animated)
+  override fun flashScrollIndicators(view: NativeScrollerView) { view.viewport.flashIndicators() }
+
+  override fun getExportedCustomDirectEventTypeConstants(): MutableMap<String, Map<String, String>> =
+    listOf("Scroll", "ScrollBeginDrag", "ScrollEndDrag", "MomentumScrollBegin", "MomentumScrollEnd", "Refresh", "ContentViewportChange")
+      .associate { "top$it" to mapOf("registrationName" to "on$it") }.toMutableMap()
+
+  companion object { const val NAME = "RNCNativeScroller" }
+}

package/android/src/main/java/com/reactnativepagerview/PagerViewViewPackage.kt

@@ -12,6 +12,6 @@ class PagerViewPackage : ReactPackage {
     }
 
     override fun createViewManagers(reactContext: ReactApplicationContext): List<ViewManager<*, *>> {
-        return listOf(PagerViewViewManager(), CollapsiblePagerViewManager())
+        return listOf(PagerViewViewManager(), CollapsiblePagerViewManager(), NativeScrollerViewManager())
     }
 }

package/android/src/main/jni/CMakeLists.txt

@@ -0,0 +1,19 @@
+cmake_minimum_required(VERSION 3.13)
+
+set(PAGER_ROOT ${CMAKE_CURRENT_SOURCE_DIR}/../../../..)
+set(PAGER_GENERATED ${PAGER_ROOT}/android/build/generated/source/codegen/jni)
+set(PAGER_COMMON ${PAGER_ROOT}/common/cpp)
+file(GLOB PAGER_GENERATED_SOURCES CONFIGURE_DEPENDS
+  ${PAGER_GENERATED}/*.cpp
+  ${PAGER_GENERATED}/react/renderer/components/pagerview/*.cpp)
+
+add_library(react_codegen_pagerview OBJECT
+  ${PAGER_GENERATED_SOURCES}
+  ${PAGER_COMMON}/react/renderer/components/pagerview/RNCNativeScrollerShadowNode.cpp)
+target_include_directories(react_codegen_pagerview PUBLIC
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${PAGER_COMMON}
+  ${PAGER_GENERATED}
+  ${PAGER_GENERATED}/react/renderer/components/pagerview)
+target_link_libraries(react_codegen_pagerview fbjni jsi reactnative)
+target_compile_reactnative_options(react_codegen_pagerview PRIVATE)

package/android/src/main/jni/pagerview.h

@@ -0,0 +1,11 @@
+#pragma once
+
+#include <ReactCommon/JavaTurboModule.h>
+#include <ReactCommon/TurboModule.h>
+#include <jsi/jsi.h>
+#include <react/renderer/components/pagerview/RNCNativeScrollerComponentDescriptor.h>
+
+namespace facebook::react {
+JSI_EXPORT std::shared_ptr<TurboModule> pagerview_ModuleProvider(
+    const std::string &moduleName, const JavaTurboModule::InitParams &params);
+} // namespace facebook::react

package/android/src/main/res/values/native_scroll_coordinator_ids.xml

@@ -1,4 +1,5 @@
 <resources>
     <item name="onekey_native_scroll_coordinator_consumed_offsets" type="id" />
     <item name="onekey_native_scroll_coordinator_offset_listener" type="id" />
+    <item name="onekey_native_scroll_coordinator_refresh_inset" type="id" />
 </resources>

package/android/src/test/java/com/reactnativepagerview/NativeScrollerScrollAwayInsetsTest.kt

@@ -37,59 +37,39 @@ fun main() {
 
   val firstOwner = Any()
   val secondOwner = Any()
-  val translation = NativeScrollerRefreshTranslation(7.5f)
-  check(translation.isEmpty)
-  var current = translation.update(7.5f, firstOwner, 230f)
-  check(current == 237.5f)
-  check(!translation.isEmpty)
-  current = translation.update(current, firstOwner, 230f)
-  check(current == 237.5f)
-  current = translation.update(current, firstOwner, 358f)
-  check(current == 365.5f)
-  current = translation.update(current, secondOwner, 64f)
-  check(current == 429.5f)
-  current = translation.update(current, firstOwner, null)
-  check(current == 71.5f)
-  check(!translation.isEmpty)
-  current = translation.update(current, secondOwner, null)
-  check(current == 7.5f)
-  check(translation.isEmpty)
+  val alpha = NativeRefreshForegroundAlpha(0.75f)
+  check(alpha.isEmpty)
+  var current = alpha.update(0.75f, firstOwner, acquire = true)
+  check(current == 0f && alpha.drawingAlpha == 0.75f && !alpha.isEmpty)
+  current = alpha.update(current, firstOwner, acquire = true)
+  check(current == 0f && alpha.drawingAlpha == 0.75f)
+  current = alpha.update(current, secondOwner, acquire = true)
+  current = alpha.update(current, firstOwner, acquire = false)
+  check(current == 0f && !alpha.isEmpty)
+  current = alpha.update(current, secondOwner, acquire = false)
+  check(current == 0.75f && alpha.isEmpty)
 
-  // Reversing release order must restore the same original translation.
-  current = translation.update(current, firstOwner, 230f)
-  current = translation.update(current, secondOwner, 64f)
-  current = translation.update(current, secondOwner, null)
-  check(current == 237.5f)
-  current = translation.update(current, firstOwner, null)
-  check(current == 7.5f)
-  check(translation.isEmpty)
+  current = alpha.update(current, firstOwner, acquire = true)
+  current = alpha.update(current, secondOwner, acquire = true)
+  current = alpha.update(current, secondOwner, acquire = false)
+  check(current == 0f)
+  current = alpha.update(current, firstOwner, acquire = false)
+  check(current == 0.75f && alpha.isEmpty)
 
-  // A caller's absolute translation update replaces the baseline, not its inset.
-  current = translation.update(current, firstOwner, 230f)
-  check(current == 237.5f)
-  current = translation.update(-12.5f, firstOwner, 230f)
-  check(current == 217.5f)
-  current = translation.update(current, secondOwner, 64f)
-  check(current == 281.5f)
-  current = translation.update(current, firstOwner, null)
-  check(current == 51.5f)
-  current = translation.update(current, secondOwner, null)
-  check(current == -12.5f)
-  check(translation.isEmpty)
+  current = alpha.update(current, firstOwner, acquire = true)
+  current = alpha.update(0.4f, firstOwner, acquire = true)
+  check(current == 0f && alpha.drawingAlpha == 0.4f)
+  current = alpha.update(current, firstOwner, acquire = false)
+  check(current == 0.4f && alpha.isEmpty)
 
-  // Zero is a real owned contribution; only null releases ownership.
-  current = translation.update(current, firstOwner, 0f)
-  check(current == -12.5f)
-  check(!translation.isEmpty)
-  current = translation.update(current, secondOwner, 0f)
-  current = translation.update(current, firstOwner, null)
-  check(current == -12.5f)
-  check(!translation.isEmpty)
-  current = translation.update(current, secondOwner, null)
-  check(current == -12.5f)
-  check(translation.isEmpty)
-  current = translation.update(9f, firstOwner, null)
-  check(current == 9f)
-  check(translation.isEmpty)
-  println("NativeScroller refresh translation: repeat, resize, nested release orders, external baseline, zero contribution, and final restoration passed")
+  val transparent = NativeRefreshForegroundAlpha(0f)
+  check(transparent.update(0f, firstOwner, acquire = true) == 0f)
+  check(!transparent.isEmpty && transparent.drawingAlpha == 0f)
+  check(transparent.update(0f, firstOwner, acquire = false) == 0f && transparent.isEmpty)
+  // RN caller offset is already in top; an absent coordinator inset is zero.
+  check(nativeRefreshForegroundTop(37, 0f) == 37f)
+  // A list publishes the sum of both actual ancestor insets; subtract it once.
+  check(nativeRefreshForegroundTop(37 + 230 + 64, 294f) == 37f)
+  check(nativeRefreshForegroundTop(-40 + 294, 294f) == -40f)
+  println("Refresh foreground policy: repeat, owner transfer/release, external alpha, transparent baseline, caller offset, and combined nested inset passed")
 }

package/common/cpp/react/renderer/components/pagerview/RNCNativeScrollerComponentDescriptor.h

@@ -0,0 +1,8 @@
+#pragma once
+
+#include <react/renderer/components/pagerview/RNCNativeScrollerShadowNode.h>
+#include <react/renderer/core/ConcreteComponentDescriptor.h>
+
+namespace facebook::react {
+using RNCNativeScrollerComponentDescriptor = ConcreteComponentDescriptor<RNCNativeScrollerShadowNode>;
+} // namespace facebook::react

package/common/cpp/react/renderer/components/pagerview/RNCNativeScrollerShadowNode.cpp

@@ -0,0 +1,15 @@
+#include <react/renderer/components/pagerview/RNCNativeScrollerShadowNode.h>
+
+namespace facebook::react {
+
+const char RNCNativeScrollerComponentName[] = "RNCNativeScroller";
+
+Point RNCNativeScrollerShadowNode::getContentOriginOffset(bool includeTransform) const {
+  const auto state = getStateData();
+  const auto origin = state.contentOrigin;
+  const auto transform = includeTransform ? getTransform() : Transform::Identity();
+  const auto result = transform * Vector{origin.x, origin.y, 0.0f, 1.0f};
+  return {result.x + state.ancestorOffset.x, result.y + state.ancestorOffset.y};
+}
+
+} // namespace facebook::react

package/common/cpp/react/renderer/components/pagerview/RNCNativeScrollerShadowNode.h

@@ -0,0 +1,23 @@
+#pragma once
+
+#include <jsi/jsi.h>
+#include <react/renderer/components/pagerview/EventEmitters.h>
+#include <react/renderer/components/pagerview/Props.h>
+#include <react/renderer/components/pagerview/RNCNativeScrollerState.h>
+#include <react/renderer/components/view/ConcreteViewShadowNode.h>
+
+namespace facebook::react {
+
+JSI_EXPORT extern const char RNCNativeScrollerComponentName[];
+
+class JSI_EXPORT RNCNativeScrollerShadowNode final
+    : public ConcreteViewShadowNode<RNCNativeScrollerComponentName,
+                                    RNCNativeScrollerProps,
+                                    RNCNativeScrollerEventEmitter,
+                                    RNCNativeScrollerState> {
+ public:
+  using ConcreteViewShadowNode::ConcreteViewShadowNode;
+  Point getContentOriginOffset(bool includeTransform) const override;
+};
+
+} // namespace facebook::react

package/common/cpp/react/renderer/components/pagerview/RNCNativeScrollerState.h

@@ -0,0 +1,33 @@
+#pragma once
+
+#include <react/renderer/graphics/Point.h>
+#ifdef RN_SERIALIZABLE_STATE
+#include <folly/dynamic.h>
+#endif
+
+namespace facebook::react {
+
+// Local content displacement and ancestor translation have different transform spaces.
+class RNCNativeScrollerState final {
+ public:
+  Point contentOrigin{};
+  Point ancestorOffset{};
+  RNCNativeScrollerState() = default;
+  explicit RNCNativeScrollerState(Point origin) : contentOrigin(origin) {}
+
+#ifdef RN_SERIALIZABLE_STATE
+  RNCNativeScrollerState(const RNCNativeScrollerState &, folly::dynamic data)
+      : contentOrigin({static_cast<Float>(data["contentOriginX"].getDouble()),
+                       static_cast<Float>(data["contentOriginY"].getDouble())}),
+        ancestorOffset({static_cast<Float>(data.getDefault("ancestorOffsetX", 0.0).getDouble()),
+                        static_cast<Float>(data.getDefault("ancestorOffsetY", 0.0).getDouble())}) {}
+
+  folly::dynamic getDynamic() const {
+    return folly::dynamic::object("contentOriginX", contentOrigin.x)
+        ("contentOriginY", contentOrigin.y)
+        ("ancestorOffsetX", ancestorOffset.x)("ancestorOffsetY", ancestorOffset.y);
+  }
+#endif
+};
+
+} // namespace facebook::react