@onekeyfe/react-native-native-list 3.0.157-alpha.254 → 3.0.157-alpha.255

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (87) hide show
  1. package/android/build.gradle +7 -0
  2. package/android/src/main/java/com/onekey/nativelist/HybridNativeList.kt +20 -0
  3. package/android/src/main/java/com/onekey/nativelist/NativeListActivityDetailsView.kt +179 -0
  4. package/android/src/main/java/com/onekey/nativelist/NativeListActivityRenderer.kt +23 -2
  5. package/android/src/main/java/com/onekey/nativelist/NativeListContainerSlotAdapter.kt +53 -0
  6. package/android/src/main/java/com/onekey/nativelist/NativeListEndAlignment.kt +5 -0
  7. package/android/src/main/java/com/onekey/nativelist/NativeListMediaPreviewSlot.kt +215 -0
  8. package/android/src/main/java/com/onekey/nativelist/NativeListMediaTileRenderer.kt +15 -6
  9. package/android/src/main/java/com/onekey/nativelist/NativeListModels.kt +3 -1
  10. package/android/src/main/java/com/onekey/nativelist/NativeListScrollPositionTracker.kt +29 -0
  11. package/android/src/main/java/com/onekey/nativelist/NativeListSectionHeaderRenderer.kt +16 -1
  12. package/android/src/main/java/com/onekey/nativelist/NativeListView.kt +163 -26
  13. package/android/src/main/res/values/native_scroll_coordinator_ids.xml +4 -0
  14. package/android/src/test/java/com/margelo/nitro/nativelist/NativeListEndAlignmentTest.kt +34 -0
  15. package/android/src/test/java/com/margelo/nitro/nativelist/NativeListScrollPositionTrackerTest.kt +28 -0
  16. package/docs/DESIGN.md +4 -2
  17. package/docs/ROW_TEMPLATES.md +45 -0
  18. package/docs/SPEC.md +227 -1
  19. package/docs/STYLE_SPEC.md +8 -0
  20. package/ios/HybridNativeList.swift +30 -0
  21. package/ios/NativeListActivityDetailsView.swift +229 -0
  22. package/ios/NativeListActivityRenderer.swift +24 -2
  23. package/ios/NativeListMediaPreviewSlot.swift +199 -0
  24. package/ios/NativeListMediaTileRenderer.swift +10 -4
  25. package/ios/NativeListModels.swift +4 -1
  26. package/ios/NativeListScrollPositionTracker.swift +30 -0
  27. package/ios/NativeListSectionHeaderRenderer.swift +27 -1
  28. package/ios/RNCNativeListView.swift +159 -4
  29. package/ios/tests/NativeListActivityPresentationTests.swift +43 -0
  30. package/ios/tests/NativeListLifecycleTests.swift +123 -0
  31. package/ios/tests/NativeListMediaVisibilityTests.swift +42 -0
  32. package/ios/tests/NativeListScrollPositionTrackerTests.swift +25 -0
  33. package/lib/module/NativeList.js +56 -3
  34. package/lib/module/NativeList.web.js +5 -0
  35. package/lib/module/validation.js +64 -4
  36. package/lib/nitrogen/generated/android/c++/JFunc_void_bool.hpp +75 -0
  37. package/lib/nitrogen/generated/android/c++/JHybridNativeListSpec.cpp +39 -3
  38. package/lib/nitrogen/generated/android/c++/JHybridNativeListSpec.hpp +6 -0
  39. package/lib/nitrogen/generated/android/c++/views/JHybridNativeListStateUpdater.cpp +15 -0
  40. package/lib/nitrogen/generated/android/kotlin/com/margelo/nitro/nativelist/Func_void_bool.kt +78 -0
  41. package/lib/nitrogen/generated/android/kotlin/com/margelo/nitro/nativelist/HybridNativeListSpec.kt +26 -0
  42. package/lib/nitrogen/generated/android/kotlin/com/margelo/nitro/nativelist/views/HybridNativeListManager.kt +24 -9
  43. package/lib/nitrogen/generated/android/nativelistOnLoad.cpp +2 -0
  44. package/lib/nitrogen/generated/ios/NativeListModule-Swift-Cxx-Bridge.cpp +8 -0
  45. package/lib/nitrogen/generated/ios/NativeListModule-Swift-Cxx-Bridge.hpp +37 -0
  46. package/lib/nitrogen/generated/ios/c++/HybridNativeListSpecSwift.hpp +23 -2
  47. package/lib/nitrogen/generated/ios/c++/views/HybridNativeListComponent.mm +32 -0
  48. package/lib/nitrogen/generated/ios/swift/Func_void_bool.swift +46 -0
  49. package/lib/nitrogen/generated/ios/swift/HybridNativeListSpec.swift +3 -0
  50. package/lib/nitrogen/generated/ios/swift/HybridNativeListSpec_cxx.swift +54 -0
  51. package/lib/nitrogen/generated/shared/c++/HybridNativeListSpec.cpp +6 -0
  52. package/lib/nitrogen/generated/shared/c++/HybridNativeListSpec.hpp +8 -2
  53. package/lib/nitrogen/generated/shared/c++/views/HybridNativeListComponent.cpp +6 -0
  54. package/lib/nitrogen/generated/shared/c++/views/HybridNativeListComponent.hpp +11 -2
  55. package/lib/nitrogen/generated/shared/json/NativeListConfig.json +3 -0
  56. package/lib/typescript/src/NativeList.nitro.d.ts +3 -0
  57. package/lib/typescript/src/NativeList.types.d.ts +14 -1
  58. package/lib/typescript/src/models.d.ts +33 -5
  59. package/nitrogen/generated/android/c++/JFunc_void_bool.hpp +75 -0
  60. package/nitrogen/generated/android/c++/JHybridNativeListSpec.cpp +39 -3
  61. package/nitrogen/generated/android/c++/JHybridNativeListSpec.hpp +6 -0
  62. package/nitrogen/generated/android/c++/views/JHybridNativeListStateUpdater.cpp +15 -0
  63. package/nitrogen/generated/android/kotlin/com/margelo/nitro/nativelist/Func_void_bool.kt +78 -0
  64. package/nitrogen/generated/android/kotlin/com/margelo/nitro/nativelist/HybridNativeListSpec.kt +26 -0
  65. package/nitrogen/generated/android/kotlin/com/margelo/nitro/nativelist/views/HybridNativeListManager.kt +24 -9
  66. package/nitrogen/generated/android/nativelistOnLoad.cpp +2 -0
  67. package/nitrogen/generated/ios/NativeListModule-Swift-Cxx-Bridge.cpp +8 -0
  68. package/nitrogen/generated/ios/NativeListModule-Swift-Cxx-Bridge.hpp +37 -0
  69. package/nitrogen/generated/ios/c++/HybridNativeListSpecSwift.hpp +23 -2
  70. package/nitrogen/generated/ios/c++/views/HybridNativeListComponent.mm +32 -0
  71. package/nitrogen/generated/ios/swift/Func_void_bool.swift +46 -0
  72. package/nitrogen/generated/ios/swift/HybridNativeListSpec.swift +3 -0
  73. package/nitrogen/generated/ios/swift/HybridNativeListSpec_cxx.swift +54 -0
  74. package/nitrogen/generated/shared/c++/HybridNativeListSpec.cpp +6 -0
  75. package/nitrogen/generated/shared/c++/HybridNativeListSpec.hpp +8 -2
  76. package/nitrogen/generated/shared/c++/views/HybridNativeListComponent.cpp +6 -0
  77. package/nitrogen/generated/shared/c++/views/HybridNativeListComponent.hpp +11 -2
  78. package/nitrogen/generated/shared/json/NativeListConfig.json +3 -0
  79. package/package.json +6 -5
  80. package/scripts/enable-container-slots.mjs +58 -0
  81. package/scripts/enable-container-slots.test.mjs +58 -0
  82. package/src/NativeList.nitro.ts +3 -0
  83. package/src/NativeList.tsx +84 -2
  84. package/src/NativeList.types.ts +14 -1
  85. package/src/NativeList.web.tsx +5 -0
  86. package/src/models.ts +38 -1
  87. package/src/validation.ts +146 -4
@@ -52,6 +52,12 @@ namespace margelo::nitro::nativelist {
52
52
  // Properties
53
53
  std::string getSnapshotJson() override;
54
54
  void setSnapshotJson(const std::string& snapshotJson) override;
55
+ std::string getContainerSlotHeightsJson() override;
56
+ void setContainerSlotHeightsJson(const std::string& containerSlotHeightsJson) override;
57
+ std::string getScrollPositionThresholdsJson() override;
58
+ void setScrollPositionThresholdsJson(const std::string& scrollPositionThresholdsJson) override;
59
+ std::optional<std::function<void(bool /* isBeyondThreshold */)>> getOnScrollPositionThresholdChange() override;
60
+ void setOnScrollPositionThresholdChange(const std::optional<std::function<void(bool /* isBeyondThreshold */)>>& onScrollPositionThresholdChange) override;
55
61
  NativeListKeyboardDismissMode getKeyboardDismissMode() override;
56
62
  void setKeyboardDismissMode(NativeListKeyboardDismissMode keyboardDismissMode) override;
57
63
  NativeListKeyboardShouldPersistTaps getKeyboardShouldPersistTaps() override;
@@ -58,6 +58,21 @@ void JHybridNativeListStateUpdater::updateViewProps(jni::alias_ref<jni::JClass>
58
58
  : !newProps->snapshotJson.hasSameValue(oldProps->snapshotJson)) {
59
59
  hybridView->setSnapshotJson(newProps->snapshotJson.get());
60
60
  }
61
+ if (oldProps == nullptr
62
+ ? newProps->containerSlotHeightsJson.isProvided()
63
+ : !newProps->containerSlotHeightsJson.hasSameValue(oldProps->containerSlotHeightsJson)) {
64
+ hybridView->setContainerSlotHeightsJson(newProps->containerSlotHeightsJson.get());
65
+ }
66
+ if (oldProps == nullptr
67
+ ? newProps->scrollPositionThresholdsJson.isProvided()
68
+ : !newProps->scrollPositionThresholdsJson.hasSameValue(oldProps->scrollPositionThresholdsJson)) {
69
+ hybridView->setScrollPositionThresholdsJson(newProps->scrollPositionThresholdsJson.get());
70
+ }
71
+ if (oldProps == nullptr
72
+ ? newProps->onScrollPositionThresholdChange.isProvided()
73
+ : !newProps->onScrollPositionThresholdChange.hasSameValue(oldProps->onScrollPositionThresholdChange)) {
74
+ hybridView->setOnScrollPositionThresholdChange(newProps->onScrollPositionThresholdChange.get());
75
+ }
61
76
  if (oldProps == nullptr
62
77
  ? newProps->keyboardDismissMode.isProvided()
63
78
  : !newProps->keyboardDismissMode.hasSameValue(oldProps->keyboardDismissMode)) {
@@ -0,0 +1,78 @@
1
+ ///
2
+ /// Func_void_bool.kt
3
+ /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
4
+ /// https://github.com/mrousavy/nitro
5
+ /// Copyright © Marc Rousavy @ Margelo
6
+ ///
7
+
8
+ package com.margelo.nitro.nativelist
9
+
10
+ import androidx.annotation.Keep
11
+ import com.facebook.jni.HybridData
12
+ import com.facebook.proguard.annotations.DoNotStrip
13
+
14
+
15
+ /**
16
+ * Represents the JavaScript callback `(isBeyondThreshold: boolean) => void`.
17
+ * This can be either implemented in C++ (in which case it might be a callback coming from JS),
18
+ * or in Kotlin/Java (in which case it is a native callback).
19
+ */
20
+ @DoNotStrip
21
+ @Keep
22
+ @Suppress("ClassName", "RedundantUnitReturnType")
23
+ fun interface Func_void_bool: (Boolean) -> Unit {
24
+ /**
25
+ * Call the given JS callback.
26
+ * @throws Throwable if the JS function itself throws an error, or if the JS function/runtime has already been deleted.
27
+ */
28
+ @DoNotStrip
29
+ @Keep
30
+ override fun invoke(isBeyondThreshold: Boolean): Unit
31
+ }
32
+
33
+ /**
34
+ * Represents the JavaScript callback `(isBeyondThreshold: boolean) => void`.
35
+ * This is implemented in C++, via a `std::function<...>`.
36
+ * The callback might be coming from JS.
37
+ */
38
+ @DoNotStrip
39
+ @Keep
40
+ @Suppress(
41
+ "KotlinJniMissingFunction", "unused",
42
+ "RedundantSuppression", "RedundantUnitReturnType", "FunctionName",
43
+ "ConvertSecondaryConstructorToPrimary", "ClassName", "LocalVariableName",
44
+ )
45
+ class Func_void_bool_cxx: Func_void_bool {
46
+ @DoNotStrip
47
+ @Keep
48
+ private val mHybridData: HybridData
49
+
50
+ @DoNotStrip
51
+ @Keep
52
+ private constructor(hybridData: HybridData) {
53
+ mHybridData = hybridData
54
+ }
55
+
56
+ @DoNotStrip
57
+ @Keep
58
+ override fun invoke(isBeyondThreshold: Boolean): Unit
59
+ = invoke_cxx(isBeyondThreshold)
60
+
61
+ private external fun invoke_cxx(isBeyondThreshold: Boolean): Unit
62
+ }
63
+
64
+ /**
65
+ * Represents the JavaScript callback `(isBeyondThreshold: boolean) => void`.
66
+ * This is implemented in Java/Kotlin, via a `(Boolean) -> Unit`.
67
+ * The callback is always coming from native.
68
+ */
69
+ @DoNotStrip
70
+ @Keep
71
+ @Suppress("ClassName", "RedundantUnitReturnType", "unused")
72
+ class Func_void_bool_java(private val function: (Boolean) -> Unit): Func_void_bool {
73
+ @DoNotStrip
74
+ @Keep
75
+ override fun invoke(isBeyondThreshold: Boolean): Unit {
76
+ return this.function(isBeyondThreshold)
77
+ }
78
+ }
@@ -33,6 +33,32 @@ abstract class HybridNativeListSpec: HybridView() {
33
33
  @set:Keep
34
34
  abstract var snapshotJson: String
35
35
 
36
+ @get:DoNotStrip
37
+ @get:Keep
38
+ @set:DoNotStrip
39
+ @set:Keep
40
+ abstract var containerSlotHeightsJson: String
41
+
42
+ @get:DoNotStrip
43
+ @get:Keep
44
+ @set:DoNotStrip
45
+ @set:Keep
46
+ abstract var scrollPositionThresholdsJson: String
47
+
48
+ abstract var onScrollPositionThresholdChange: ((isBeyondThreshold: Boolean) -> Unit)?
49
+
50
+ private var onScrollPositionThresholdChange_cxx: Func_void_bool?
51
+ @Keep
52
+ @DoNotStrip
53
+ get() {
54
+ return onScrollPositionThresholdChange?.let { Func_void_bool_java(it) }
55
+ }
56
+ @Keep
57
+ @DoNotStrip
58
+ set(value) {
59
+ onScrollPositionThresholdChange = value?.let { it }
60
+ }
61
+
36
62
  @get:DoNotStrip
37
63
  @get:Keep
38
64
  @set:DoNotStrip
@@ -8,8 +8,9 @@
8
8
  package com.margelo.nitro.nativelist.views
9
9
 
10
10
  import android.view.View
11
+ import android.view.ViewGroup
11
12
  import com.facebook.react.uimanager.ReactStylesDiffMap
12
- import com.facebook.react.uimanager.SimpleViewManager
13
+ import com.facebook.react.uimanager.ViewGroupManager
13
14
  import com.facebook.react.uimanager.StateWrapper
14
15
  import com.facebook.react.uimanager.ThemedReactContext
15
16
  import com.margelo.nitro.R.id.associated_hybrid_view_tag
@@ -19,7 +20,7 @@ import com.margelo.nitro.nativelist.*
19
20
  /**
20
21
  * Represents the React Native `ViewManager` for the "NativeList" Nitro HybridView.
21
22
  */
22
- public class HybridNativeListManager: SimpleViewManager<View>() {
23
+ public class HybridNativeListManager: ViewGroupManager<ViewGroup>() {
23
24
  /**
24
25
  * Represents the View and its last state snapshot (mutable)
25
26
  */
@@ -35,18 +36,32 @@ public class HybridNativeListManager: SimpleViewManager<View>() {
35
36
  }
36
37
  }
37
38
 
39
+ // NativeList container slot mounting
40
+ override fun needsCustomLayoutForChildren(): Boolean = true
41
+ override fun addView(parent: ViewGroup, child: View, index: Int) {
42
+ (parent as NativeListView).mountContainerSlot(child, index)
43
+ }
44
+ override fun getChildCount(parent: ViewGroup): Int = (parent as NativeListView).containerSlotCount()
45
+ override fun getChildAt(parent: ViewGroup, index: Int): View = (parent as NativeListView).containerSlotAt(index)
46
+ override fun removeViewAt(parent: ViewGroup, index: Int) {
47
+ (parent as NativeListView).unmountContainerSlot(index)
48
+ }
49
+ override fun removeAllViews(parent: ViewGroup) {
50
+ while (getChildCount(parent) > 0) removeViewAt(parent, getChildCount(parent) - 1)
51
+ }
52
+
38
53
  override fun getName(): String {
39
54
  return "NativeList"
40
55
  }
41
56
 
42
- override fun createViewInstance(reactContext: ThemedReactContext): View {
57
+ override fun createViewInstance(reactContext: ThemedReactContext): ViewGroup {
43
58
  val hybridView = HybridNativeList(reactContext)
44
- val view = hybridView.view
59
+ val view = hybridView.view as ViewGroup
45
60
  view.setTag(associated_hybrid_view_tag, HybridViewHolder(hybridView))
46
61
  return view
47
62
  }
48
63
 
49
- override fun updateState(view: View, props: ReactStylesDiffMap, stateWrapper: StateWrapper): Any? {
64
+ override fun updateState(view: ViewGroup, props: ReactStylesDiffMap, stateWrapper: StateWrapper): Any? {
50
65
  val holder = getHybridViewHolder(view)
51
66
  ?: throw Error("Couldn't find view $view in local views table!")
52
67
  val hybridView = holder.hybridView
@@ -63,14 +78,14 @@ public class HybridNativeListManager: SimpleViewManager<View>() {
63
78
  return super.updateState(view, props, newState)
64
79
  }
65
80
 
66
- override fun onDropViewInstance(view: View) {
81
+ override fun onDropViewInstance(view: ViewGroup) {
67
82
  val holder = getHybridViewHolder(view)
68
83
  holder?.lastState = null
69
84
  holder?.hybridView?.onDropView()
70
85
  return super.onDropViewInstance(view)
71
86
  }
72
87
 
73
- protected override fun prepareToRecycleView(reactContext: ThemedReactContext, view: View): View? {
88
+ protected override fun prepareToRecycleView(reactContext: ThemedReactContext, view: ViewGroup): ViewGroup? {
74
89
  val preparedView = super.prepareToRecycleView(reactContext, view)
75
90
  ?: return null
76
91
  val holder = getHybridViewHolder(preparedView)
@@ -84,13 +99,13 @@ public class HybridNativeListManager: SimpleViewManager<View>() {
84
99
  hybridView.prepareForRecycle()
85
100
 
86
101
  // Maybe update the view if it changed
87
- return hybridView.view
102
+ return hybridView.view as ViewGroup
88
103
  } else {
89
104
  return null
90
105
  }
91
106
  }
92
107
 
93
- private fun getHybridViewHolder(view: View): HybridViewHolder? {
108
+ private fun getHybridViewHolder(view: ViewGroup): HybridViewHolder? {
94
109
  return view.getTag(associated_hybrid_view_tag) as? HybridViewHolder
95
110
  }
96
111
  }
@@ -16,6 +16,7 @@
16
16
  #include <NitroModules/HybridObjectRegistry.hpp>
17
17
 
18
18
  #include "JHybridNativeListSpec.hpp"
19
+ #include "JFunc_void_bool.hpp"
19
20
  #include "JFunc_void_std__string.hpp"
20
21
  #include "views/JHybridNativeListStateUpdater.hpp"
21
22
  #include <NitroModules/DefaultConstructableObject.hpp>
@@ -43,6 +44,7 @@ void registerAllNatives() {
43
44
 
44
45
  // Register native JNI methods
45
46
  margelo::nitro::nativelist::JHybridNativeListSpec::CxxPart::registerNatives();
47
+ margelo::nitro::nativelist::JFunc_void_bool_cxx::registerNatives();
46
48
  margelo::nitro::nativelist::JFunc_void_std__string_cxx::registerNatives();
47
49
  margelo::nitro::nativelist::views::JHybridNativeListStateUpdater::registerNatives();
48
50
 
@@ -14,6 +14,14 @@
14
14
 
15
15
  namespace margelo::nitro::nativelist::bridge::swift {
16
16
 
17
+ // pragma MARK: std::function<void(bool /* isBeyondThreshold */)>
18
+ Func_void_bool create_Func_void_bool(void* NON_NULL swiftClosureWrapper) noexcept {
19
+ auto swiftClosure = NativeListModule::Func_void_bool::fromUnsafe(swiftClosureWrapper);
20
+ return [swiftClosure = std::move(swiftClosure)](bool isBeyondThreshold) mutable -> void {
21
+ swiftClosure.call(isBeyondThreshold);
22
+ };
23
+ }
24
+
17
25
  // pragma MARK: std::function<void(const std::string& /* payloadJson */)>
18
26
  Func_void_std__string create_Func_void_std__string(void* NON_NULL swiftClosureWrapper) noexcept {
19
27
  auto swiftClosure = NativeListModule::Func_void_std__string::fromUnsafe(swiftClosureWrapper);
@@ -30,6 +30,43 @@ namespace NativeListModule { class HybridNativeListSpec_cxx; }
30
30
  */
31
31
  namespace margelo::nitro::nativelist::bridge::swift {
32
32
 
33
+ // pragma MARK: std::function<void(bool /* isBeyondThreshold */)>
34
+ /**
35
+ * Specialized version of `std::function<void(bool)>`.
36
+ */
37
+ using Func_void_bool = std::function<void(bool /* isBeyondThreshold */)>;
38
+ /**
39
+ * Wrapper class for a `std::function<void(bool / * isBeyondThreshold * /)>`, this can be used from Swift.
40
+ */
41
+ class Func_void_bool_Wrapper final {
42
+ public:
43
+ explicit Func_void_bool_Wrapper(std::function<void(bool /* isBeyondThreshold */)>&& func): _function(std::make_unique<std::function<void(bool /* isBeyondThreshold */)>>(std::move(func))) {}
44
+ inline void call(bool isBeyondThreshold) const noexcept {
45
+ _function->operator()(isBeyondThreshold);
46
+ }
47
+ private:
48
+ std::unique_ptr<std::function<void(bool /* isBeyondThreshold */)>> _function;
49
+ } SWIFT_NONCOPYABLE;
50
+ Func_void_bool create_Func_void_bool(void* NON_NULL swiftClosureWrapper) noexcept;
51
+ inline Func_void_bool_Wrapper wrap_Func_void_bool(Func_void_bool value) noexcept {
52
+ return Func_void_bool_Wrapper(std::move(value));
53
+ }
54
+
55
+ // pragma MARK: std::optional<std::function<void(bool /* isBeyondThreshold */)>>
56
+ /**
57
+ * Specialized version of `std::optional<std::function<void(bool / * isBeyondThreshold * /)>>`.
58
+ */
59
+ using std__optional_std__function_void_bool____isBeyondThreshold______ = std::optional<std::function<void(bool /* isBeyondThreshold */)>>;
60
+ inline std::optional<std::function<void(bool /* isBeyondThreshold */)>> create_std__optional_std__function_void_bool____isBeyondThreshold______(const std::function<void(bool /* isBeyondThreshold */)>& value) noexcept {
61
+ return std::optional<std::function<void(bool /* isBeyondThreshold */)>>(value);
62
+ }
63
+ inline bool has_value_std__optional_std__function_void_bool____isBeyondThreshold______(const std::optional<std::function<void(bool /* isBeyondThreshold */)>>& optional) noexcept {
64
+ return optional.has_value();
65
+ }
66
+ inline std::function<void(bool /* isBeyondThreshold */)> get_std__optional_std__function_void_bool____isBeyondThreshold______(const std::optional<std::function<void(bool /* isBeyondThreshold */)>>& optional) noexcept {
67
+ return optional.value();
68
+ }
69
+
33
70
  // pragma MARK: std::function<void(const std::string& /* payloadJson */)>
34
71
  /**
35
72
  * Specialized version of `std::function<void(const std::string&)>`.
@@ -20,10 +20,10 @@ namespace margelo::nitro::nativelist { enum class NativeListKeyboardShouldPersis
20
20
  namespace margelo::nitro::nativelist { enum class NativeListScrollAlignment; }
21
21
 
22
22
  #include <string>
23
- #include "NativeListKeyboardDismissMode.hpp"
24
- #include "NativeListKeyboardShouldPersistTaps.hpp"
25
23
  #include <functional>
26
24
  #include <optional>
25
+ #include "NativeListKeyboardDismissMode.hpp"
26
+ #include "NativeListKeyboardShouldPersistTaps.hpp"
27
27
  #include "NativeListScrollAlignment.hpp"
28
28
 
29
29
  #include "NativeListModule-Swift-Cxx-Umbrella.hpp"
@@ -79,6 +79,27 @@ namespace margelo::nitro::nativelist {
79
79
  inline void setSnapshotJson(const std::string& snapshotJson) noexcept override {
80
80
  _swiftPart.setSnapshotJson(snapshotJson);
81
81
  }
82
+ inline std::string getContainerSlotHeightsJson() noexcept override {
83
+ auto __result = _swiftPart.getContainerSlotHeightsJson();
84
+ return __result;
85
+ }
86
+ inline void setContainerSlotHeightsJson(const std::string& containerSlotHeightsJson) noexcept override {
87
+ _swiftPart.setContainerSlotHeightsJson(containerSlotHeightsJson);
88
+ }
89
+ inline std::string getScrollPositionThresholdsJson() noexcept override {
90
+ auto __result = _swiftPart.getScrollPositionThresholdsJson();
91
+ return __result;
92
+ }
93
+ inline void setScrollPositionThresholdsJson(const std::string& scrollPositionThresholdsJson) noexcept override {
94
+ _swiftPart.setScrollPositionThresholdsJson(scrollPositionThresholdsJson);
95
+ }
96
+ inline std::optional<std::function<void(bool /* isBeyondThreshold */)>> getOnScrollPositionThresholdChange() noexcept override {
97
+ auto __result = _swiftPart.getOnScrollPositionThresholdChange();
98
+ return __result;
99
+ }
100
+ inline void setOnScrollPositionThresholdChange(const std::optional<std::function<void(bool /* isBeyondThreshold */)>>& onScrollPositionThresholdChange) noexcept override {
101
+ _swiftPart.setOnScrollPositionThresholdChange(onScrollPositionThresholdChange);
102
+ }
82
103
  inline NativeListKeyboardDismissMode getKeyboardDismissMode() noexcept override {
83
104
  auto __result = _swiftPart.getKeyboardDismissMode();
84
105
  return static_cast<NativeListKeyboardDismissMode>(__result);
@@ -35,6 +35,11 @@ using namespace margelo::nitro::nativelist::views;
35
35
  + (BOOL)shouldBeRecycled;
36
36
  @end
37
37
 
38
+ @interface UIView (NativeListContainerSlots)
39
+ - (void)mountContainerSlot:(UIView *)view atIndex:(NSInteger)index;
40
+ - (void)unmountContainerSlot:(UIView *)view;
41
+ @end
42
+
38
43
  @implementation HybridNativeListComponent {
39
44
  std::shared_ptr<HybridNativeListSpecSwift> _hybridView;
40
45
  BOOL _didDropView;
@@ -59,6 +64,15 @@ using namespace margelo::nitro::nativelist::views;
59
64
  return self;
60
65
  }
61
66
 
67
+ // NativeList container slot mounting
68
+ - (void)mountChildComponentView:(UIView<RCTComponentViewProtocol> *)child index:(NSInteger)index {
69
+ [self.contentView mountContainerSlot:child atIndex:index];
70
+ }
71
+
72
+ - (void)unmountChildComponentView:(UIView<RCTComponentViewProtocol> *)child index:(NSInteger)index {
73
+ [self.contentView unmountContainerSlot:child];
74
+ }
75
+
62
76
  - (void) updateView {
63
77
  // 1. Get Swift part
64
78
  NativeListModule::HybridNativeListSpec_cxx& swiftPart = _hybridView->getSwiftPart();
@@ -104,6 +118,24 @@ using namespace margelo::nitro::nativelist::views;
104
118
  : !newViewProps.snapshotJson.hasSameValue(oldViewProps->snapshotJson)) {
105
119
  swiftPart.setSnapshotJson(newViewProps.snapshotJson.get());
106
120
  }
121
+ // containerSlotHeightsJson: string
122
+ if (oldViewProps == nullptr
123
+ ? newViewProps.containerSlotHeightsJson.isProvided()
124
+ : !newViewProps.containerSlotHeightsJson.hasSameValue(oldViewProps->containerSlotHeightsJson)) {
125
+ swiftPart.setContainerSlotHeightsJson(newViewProps.containerSlotHeightsJson.get());
126
+ }
127
+ // scrollPositionThresholdsJson: string
128
+ if (oldViewProps == nullptr
129
+ ? newViewProps.scrollPositionThresholdsJson.isProvided()
130
+ : !newViewProps.scrollPositionThresholdsJson.hasSameValue(oldViewProps->scrollPositionThresholdsJson)) {
131
+ swiftPart.setScrollPositionThresholdsJson(newViewProps.scrollPositionThresholdsJson.get());
132
+ }
133
+ // onScrollPositionThresholdChange: optional
134
+ if (oldViewProps == nullptr
135
+ ? newViewProps.onScrollPositionThresholdChange.isProvided()
136
+ : !newViewProps.onScrollPositionThresholdChange.hasSameValue(oldViewProps->onScrollPositionThresholdChange)) {
137
+ swiftPart.setOnScrollPositionThresholdChange(newViewProps.onScrollPositionThresholdChange.get());
138
+ }
107
139
  // keyboardDismissMode: enum
108
140
  if (oldViewProps == nullptr
109
141
  ? newViewProps.keyboardDismissMode.isProvided()
@@ -0,0 +1,46 @@
1
+ ///
2
+ /// Func_void_bool.swift
3
+ /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
4
+ /// https://github.com/mrousavy/nitro
5
+ /// Copyright © Marc Rousavy @ Margelo
6
+ ///
7
+
8
+ import NitroModules
9
+
10
+ /**
11
+ * Wraps a Swift `(_ isBeyondThreshold: Bool) -> Void` as a class.
12
+ * This class can be used from C++, e.g. to wrap the Swift closure as a `std::function`.
13
+ */
14
+ public final class Func_void_bool {
15
+ public typealias bridge = margelo.nitro.nativelist.bridge.swift
16
+
17
+ private let closure: (_ isBeyondThreshold: Bool) -> Void
18
+
19
+ public init(_ closure: @escaping (_ isBeyondThreshold: Bool) -> Void) {
20
+ self.closure = closure
21
+ }
22
+
23
+ @inline(__always)
24
+ public func call(isBeyondThreshold: Bool) -> Void {
25
+ self.closure(isBeyondThreshold)
26
+ }
27
+
28
+ /**
29
+ * Casts this instance to a retained unsafe raw pointer.
30
+ * This acquires one additional strong reference on the object!
31
+ */
32
+ @inline(__always)
33
+ public func toUnsafe() -> UnsafeMutableRawPointer {
34
+ return Unmanaged.passRetained(self).toOpaque()
35
+ }
36
+
37
+ /**
38
+ * Casts an unsafe pointer to a `Func_void_bool`.
39
+ * The pointer has to be a retained opaque `Unmanaged<Func_void_bool>`.
40
+ * This removes one strong reference from the object!
41
+ */
42
+ @inline(__always)
43
+ public static func fromUnsafe(_ pointer: UnsafeMutableRawPointer) -> Func_void_bool {
44
+ return Unmanaged<Func_void_bool>.fromOpaque(pointer).takeRetainedValue()
45
+ }
46
+ }
@@ -11,6 +11,9 @@ import NitroModules
11
11
  public protocol HybridNativeListSpec_protocol: HybridObject, HybridView {
12
12
  // Properties
13
13
  var snapshotJson: String { get set }
14
+ var containerSlotHeightsJson: String { get set }
15
+ var scrollPositionThresholdsJson: String { get set }
16
+ var onScrollPositionThresholdChange: ((_ isBeyondThreshold: Bool) -> Void)? { get set }
14
17
  var keyboardDismissMode: NativeListKeyboardDismissMode { get set }
15
18
  var keyboardShouldPersistTaps: NativeListKeyboardShouldPersistTaps { get set }
16
19
  var onRowAction: ((_ payloadJson: String) -> Void)? { get set }
@@ -132,6 +132,60 @@ open class HybridNativeListSpec_cxx {
132
132
  }
133
133
  }
134
134
 
135
+ public final var containerSlotHeightsJson: std.string {
136
+ @inline(__always)
137
+ get {
138
+ return std.string(self.__implementation.containerSlotHeightsJson)
139
+ }
140
+ @inline(__always)
141
+ set {
142
+ self.__implementation.containerSlotHeightsJson = String(newValue)
143
+ }
144
+ }
145
+
146
+ public final var scrollPositionThresholdsJson: std.string {
147
+ @inline(__always)
148
+ get {
149
+ return std.string(self.__implementation.scrollPositionThresholdsJson)
150
+ }
151
+ @inline(__always)
152
+ set {
153
+ self.__implementation.scrollPositionThresholdsJson = String(newValue)
154
+ }
155
+ }
156
+
157
+ public final var onScrollPositionThresholdChange: bridge.std__optional_std__function_void_bool____isBeyondThreshold______ {
158
+ @inline(__always)
159
+ get {
160
+ return { () -> bridge.std__optional_std__function_void_bool____isBeyondThreshold______ in
161
+ if let __unwrappedValue = self.__implementation.onScrollPositionThresholdChange {
162
+ return bridge.create_std__optional_std__function_void_bool____isBeyondThreshold______({ () -> bridge.Func_void_bool in
163
+ let __closureWrapper = Func_void_bool(__unwrappedValue)
164
+ return bridge.create_Func_void_bool(__closureWrapper.toUnsafe())
165
+ }())
166
+ } else {
167
+ return .init()
168
+ }
169
+ }()
170
+ }
171
+ @inline(__always)
172
+ set {
173
+ self.__implementation.onScrollPositionThresholdChange = { () -> ((_ isBeyondThreshold: Bool) -> Void)? in
174
+ if bridge.has_value_std__optional_std__function_void_bool____isBeyondThreshold______(newValue) {
175
+ let __unwrapped = bridge.get_std__optional_std__function_void_bool____isBeyondThreshold______(newValue)
176
+ return { () -> (Bool) -> Void in
177
+ let __wrappedFunction = bridge.wrap_Func_void_bool(__unwrapped)
178
+ return { (__isBeyondThreshold: Bool) -> Void in
179
+ __wrappedFunction.call(__isBeyondThreshold)
180
+ }
181
+ }()
182
+ } else {
183
+ return nil
184
+ }
185
+ }()
186
+ }
187
+ }
188
+
135
189
  public final var keyboardDismissMode: Int32 {
136
190
  @inline(__always)
137
191
  get {
@@ -16,6 +16,12 @@ namespace margelo::nitro::nativelist {
16
16
  registerHybrids(this, [](Prototype& prototype) {
17
17
  prototype.registerHybridGetter("snapshotJson", &HybridNativeListSpec::getSnapshotJson);
18
18
  prototype.registerHybridSetter("snapshotJson", &HybridNativeListSpec::setSnapshotJson);
19
+ prototype.registerHybridGetter("containerSlotHeightsJson", &HybridNativeListSpec::getContainerSlotHeightsJson);
20
+ prototype.registerHybridSetter("containerSlotHeightsJson", &HybridNativeListSpec::setContainerSlotHeightsJson);
21
+ prototype.registerHybridGetter("scrollPositionThresholdsJson", &HybridNativeListSpec::getScrollPositionThresholdsJson);
22
+ prototype.registerHybridSetter("scrollPositionThresholdsJson", &HybridNativeListSpec::setScrollPositionThresholdsJson);
23
+ prototype.registerHybridGetter("onScrollPositionThresholdChange", &HybridNativeListSpec::getOnScrollPositionThresholdChange);
24
+ prototype.registerHybridSetter("onScrollPositionThresholdChange", &HybridNativeListSpec::setOnScrollPositionThresholdChange);
19
25
  prototype.registerHybridGetter("keyboardDismissMode", &HybridNativeListSpec::getKeyboardDismissMode);
20
26
  prototype.registerHybridSetter("keyboardDismissMode", &HybridNativeListSpec::setKeyboardDismissMode);
21
27
  prototype.registerHybridGetter("keyboardShouldPersistTaps", &HybridNativeListSpec::getKeyboardShouldPersistTaps);
@@ -21,10 +21,10 @@ namespace margelo::nitro::nativelist { enum class NativeListKeyboardShouldPersis
21
21
  namespace margelo::nitro::nativelist { enum class NativeListScrollAlignment; }
22
22
 
23
23
  #include <string>
24
- #include "NativeListKeyboardDismissMode.hpp"
25
- #include "NativeListKeyboardShouldPersistTaps.hpp"
26
24
  #include <functional>
27
25
  #include <optional>
26
+ #include "NativeListKeyboardDismissMode.hpp"
27
+ #include "NativeListKeyboardShouldPersistTaps.hpp"
28
28
  #include "NativeListScrollAlignment.hpp"
29
29
 
30
30
  namespace margelo::nitro::nativelist {
@@ -56,6 +56,12 @@ namespace margelo::nitro::nativelist {
56
56
  // Properties
57
57
  virtual std::string getSnapshotJson() = 0;
58
58
  virtual void setSnapshotJson(const std::string& snapshotJson) = 0;
59
+ virtual std::string getContainerSlotHeightsJson() = 0;
60
+ virtual void setContainerSlotHeightsJson(const std::string& containerSlotHeightsJson) = 0;
61
+ virtual std::string getScrollPositionThresholdsJson() = 0;
62
+ virtual void setScrollPositionThresholdsJson(const std::string& scrollPositionThresholdsJson) = 0;
63
+ virtual std::optional<std::function<void(bool /* isBeyondThreshold */)>> getOnScrollPositionThresholdChange() = 0;
64
+ virtual void setOnScrollPositionThresholdChange(const std::optional<std::function<void(bool /* isBeyondThreshold */)>>& onScrollPositionThresholdChange) = 0;
59
65
  virtual NativeListKeyboardDismissMode getKeyboardDismissMode() = 0;
60
66
  virtual void setKeyboardDismissMode(NativeListKeyboardDismissMode keyboardDismissMode) = 0;
61
67
  virtual NativeListKeyboardShouldPersistTaps getKeyboardShouldPersistTaps() = 0;
@@ -21,6 +21,9 @@ namespace margelo::nitro::nativelist::views {
21
21
  const react::RawProps& rawProps):
22
22
  react::ViewProps(context, sourceProps, rawProps, filterObjectKeys),
23
23
  snapshotJson(nitro::ReactProp<std::string>::fromRawValue("NativeList", "snapshotJson", rawProps, sourceProps.snapshotJson)),
24
+ containerSlotHeightsJson(nitro::ReactProp<std::string>::fromRawValue("NativeList", "containerSlotHeightsJson", rawProps, sourceProps.containerSlotHeightsJson)),
25
+ scrollPositionThresholdsJson(nitro::ReactProp<std::string>::fromRawValue("NativeList", "scrollPositionThresholdsJson", rawProps, sourceProps.scrollPositionThresholdsJson)),
26
+ onScrollPositionThresholdChange(nitro::ReactProp<std::optional<std::function<void(bool /* isBeyondThreshold */)>>>::fromRawValue("NativeList", "onScrollPositionThresholdChange", rawProps, sourceProps.onScrollPositionThresholdChange)),
24
27
  keyboardDismissMode(nitro::ReactProp<NativeListKeyboardDismissMode>::fromRawValue("NativeList", "keyboardDismissMode", rawProps, sourceProps.keyboardDismissMode)),
25
28
  keyboardShouldPersistTaps(nitro::ReactProp<NativeListKeyboardShouldPersistTaps>::fromRawValue("NativeList", "keyboardShouldPersistTaps", rawProps, sourceProps.keyboardShouldPersistTaps)),
26
29
  onRowAction(nitro::ReactProp<std::optional<std::function<void(const std::string& /* payloadJson */)>>>::fromRawValue("NativeList", "onRowAction", rawProps, sourceProps.onRowAction)),
@@ -34,6 +37,9 @@ namespace margelo::nitro::nativelist::views {
34
37
  bool HybridNativeListProps::filterObjectKeys(const std::string& propName) {
35
38
  switch (hashString(propName)) {
36
39
  case hashString("snapshotJson"): return true;
40
+ case hashString("containerSlotHeightsJson"): return true;
41
+ case hashString("scrollPositionThresholdsJson"): return true;
42
+ case hashString("onScrollPositionThresholdChange"): return true;
37
43
  case hashString("keyboardDismissMode"): return true;
38
44
  case hashString("keyboardShouldPersistTaps"): return true;
39
45
  case hashString("onRowAction"): return true;
@@ -18,10 +18,10 @@
18
18
  #include <string>
19
19
 
20
20
  #include <string>
21
- #include "NativeListKeyboardDismissMode.hpp"
22
- #include "NativeListKeyboardShouldPersistTaps.hpp"
23
21
  #include <functional>
24
22
  #include <optional>
23
+ #include "NativeListKeyboardDismissMode.hpp"
24
+ #include "NativeListKeyboardShouldPersistTaps.hpp"
25
25
  #include <memory>
26
26
  #include "HybridNativeListSpec.hpp"
27
27
 
@@ -46,6 +46,9 @@ namespace margelo::nitro::nativelist::views {
46
46
 
47
47
  public:
48
48
  nitro::ReactProp<std::string> snapshotJson;
49
+ nitro::ReactProp<std::string> containerSlotHeightsJson;
50
+ nitro::ReactProp<std::string> scrollPositionThresholdsJson;
51
+ nitro::ReactProp<std::optional<std::function<void(bool /* isBeyondThreshold */)>>> onScrollPositionThresholdChange;
49
52
  nitro::ReactProp<NativeListKeyboardDismissMode> keyboardDismissMode;
50
53
  nitro::ReactProp<NativeListKeyboardShouldPersistTaps> keyboardShouldPersistTaps;
51
54
  nitro::ReactProp<std::optional<std::function<void(const std::string& /* payloadJson */)>>> onRowAction;
@@ -59,6 +62,9 @@ namespace margelo::nitro::nativelist::views {
59
62
  [[nodiscard]]
60
63
  bool hasSameProps(const HybridNativeListProps& other) const noexcept {
61
64
  return snapshotJson.hasSameValue(other.snapshotJson) &&
65
+ containerSlotHeightsJson.hasSameValue(other.containerSlotHeightsJson) &&
66
+ scrollPositionThresholdsJson.hasSameValue(other.scrollPositionThresholdsJson) &&
67
+ onScrollPositionThresholdChange.hasSameValue(other.onScrollPositionThresholdChange) &&
62
68
  keyboardDismissMode.hasSameValue(other.keyboardDismissMode) &&
63
69
  keyboardShouldPersistTaps.hasSameValue(other.keyboardShouldPersistTaps) &&
64
70
  onRowAction.hasSameValue(other.onRowAction) &&
@@ -73,6 +79,9 @@ namespace margelo::nitro::nativelist::views {
73
79
  [[nodiscard]]
74
80
  bool hasAnyProvidedProps() const noexcept {
75
81
  return snapshotJson.isProvided() ||
82
+ containerSlotHeightsJson.isProvided() ||
83
+ scrollPositionThresholdsJson.isProvided() ||
84
+ onScrollPositionThresholdChange.isProvided() ||
76
85
  keyboardDismissMode.isProvided() ||
77
86
  keyboardShouldPersistTaps.isProvided() ||
78
87
  onRowAction.isProvided() ||
@@ -5,6 +5,9 @@
5
5
  "directEventTypes": {},
6
6
  "validAttributes": {
7
7
  "snapshotJson": true,
8
+ "containerSlotHeightsJson": true,
9
+ "scrollPositionThresholdsJson": true,
10
+ "onScrollPositionThresholdChange": true,
8
11
  "keyboardDismissMode": true,
9
12
  "keyboardShouldPersistTaps": true,
10
13
  "onRowAction": true,
@@ -6,6 +6,9 @@ import type { HybridView, HybridViewMethods, HybridViewProps } from 'react-nativ
6
6
  */
7
7
  export interface NativeListNativeProps extends HybridViewProps {
8
8
  snapshotJson: string;
9
+ containerSlotHeightsJson: string;
10
+ scrollPositionThresholdsJson: string;
11
+ onScrollPositionThresholdChange?: (isBeyondThreshold: boolean) => void;
9
12
  keyboardDismissMode: NativeListKeyboardDismissMode;
10
13
  keyboardShouldPersistTaps: NativeListKeyboardShouldPersistTaps;
11
14
  onRowAction?: (payloadJson: string) => void;