@onekeyfe/react-native-pager-view 3.0.134 → 3.0.136

package/ios/RNCCollapsiblePagerReleasedStatePolicy.h

@@ -0,0 +1,12 @@
+#import <Foundation/Foundation.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+// Keep the dictionary unspecialized: NSMutableDictionary generics are invariant,
+// so Objective-C++ callers with a concrete value type would fail to compile.
+FOUNDATION_EXPORT void RNCPruneReleasedPageStates(
+  NSMutableDictionary *releasedStates,
+  NSArray<NSString *> *validPageKeys
+);
+
+NS_ASSUME_NONNULL_END

package/ios/RNCCollapsiblePagerReleasedStatePolicy.m

@@ -0,0 +1,14 @@
+#import "RNCCollapsiblePagerReleasedStatePolicy.h"
+
+void RNCPruneReleasedPageStates(
+  NSMutableDictionary *releasedStates,
+  NSArray<NSString *> *validPageKeys
+)
+{
+  NSSet<NSString *> *validKeys = [NSSet setWithArray:validPageKeys];
+  for (NSString *pageKey in releasedStates.allKeys) {
+    if (![validKeys containsObject:pageKey]) {
+      [releasedStates removeObjectForKey:pageKey];
+    }
+  }
+}

package/ios/RNCCollapsiblePagerViewComponentView.mm

@@ -1,4 +1,5 @@
 #import "RNCCollapsiblePagerViewComponentView.h"
+#import "RNCCollapsiblePagerReleasedStatePolicy.h"
 
 #import <react/renderer/components/pagerview/ComponentDescriptors.h>
 #import <react/renderer/components/pagerview/EventEmitters.h>
@@ -1876,7 +1877,11 @@ static void RNCLogNativeTabScrollBoundary(NSString *owner,
     NSString *json = RCTNSStringFromString(newViewProps.pageKeys);
     NSData *data = [json dataUsingEncoding:NSUTF8StringEncoding];
     id parsed = data == nil ? nil : [NSJSONSerialization JSONObjectWithData:data options:0 error:nil];
-    _pageKeys = [parsed isKindOfClass:NSArray.class] ? parsed : @[];
+    NSArray<NSString *> *nextPageKeys = [parsed isKindOfClass:NSArray.class] ? parsed : @[];
+    // Stable keys keep their released identity across reorders. A missing key
+    // represents an unmounted React page and must not be reused by a later page.
+    RNCPruneReleasedPageStates(_releasedPageScrollStates, nextPageKeys);
+    _pageKeys = nextPageKeys;
   }
   if (_needsPropsReapply || oldViewProps.retainedPages != newViewProps.retainedPages) {
     _retainedPages = RCTNSStringFromString(newViewProps.retainedPages);

package/ios/tests/RNCCollapsiblePagerReleasedStatePolicyTests.mm

@@ -0,0 +1,37 @@
+#import <XCTest/XCTest.h>
+
+#import "RNCCollapsiblePagerReleasedStatePolicy.h"
+
+@interface RNCCollapsiblePagerReleasedStatePolicyTests : XCTestCase
+@end
+
+@implementation RNCCollapsiblePagerReleasedStatePolicyTests
+
+- (void)testPrunesRemovedKeysAndKeepsStableKeysAcrossReorders
+{
+  NSObject *alpha = [NSObject new];
+  NSObject *beta = [NSObject new];
+  // A concrete value type in Objective-C++ mirrors the component view call site.
+  NSMutableDictionary<NSString *, NSObject *> *releasedStates = [@{
+    @"alpha": alpha,
+    @"beta": beta,
+  } mutableCopy];
+
+  RNCPruneReleasedPageStates(releasedStates, @[@"beta", @"gamma"]);
+
+  XCTAssertEqualObjects(releasedStates, (@{ @"beta": beta }));
+}
+
+- (void)testClearsEveryReleasedStateWhenAllPagesUnmount
+{
+  NSMutableDictionary<NSString *, id> *releasedStates = [@{
+    @"page-0": [NSObject new],
+    @"page-1": [NSObject new],
+  } mutableCopy];
+
+  RNCPruneReleasedPageStates(releasedStates, @[]);
+
+  XCTAssertEqual(releasedStates.count, 0u);
+}
+
+@end

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/react-native-pager-view",
-  "version": "3.0.134",
+  "version": "3.0.136",
   "description": "React Native wrapper for Android and iOS ViewPager",
   "source": "./src/index.tsx",
   "main": "./lib/module/index.js",
@@ -66,7 +66,7 @@
     "typescript": "^5.9.2"
   },
   "peerDependencies": {
-    "@onekeyfe/react-native-native-logger": "3.0.134",
+    "@onekeyfe/react-native-native-logger": "3.0.136",
     "react": "*",
     "react-native": "*"
   },

package/react-native-pager-view.podspec

@@ -14,6 +14,11 @@ Pod::Spec.new do |s|
   s.source       = { :git => "https://github.com/nicholasxuu/app-modules.git", :tag => "#{s.version}" }
 
   s.source_files = "ios/**/*.{h,m,mm}"
+  s.exclude_files = "ios/tests/**/*"
+
+  s.test_spec "Tests" do |test_spec|
+    test_spec.source_files = "ios/tests/**/*.{m,mm}"
+  end
 
   install_modules_dependencies(s)