@pinwheel/react-native-pinwheel 3.2.2 → 3.2.3

package/android/src/main/java/com/rtnpinwheel/Pinwheel.kt

@@ -59,7 +59,7 @@ class Pinwheel : FrameLayout {
   private fun createFragment() {
     Handler(Looper.getMainLooper()).post {
       this.token?.let {
-        val pinwheelFragment = PinwheelFragment.newInstance(it, "react native", "3.2.2", getReactNativeVersion(), this.handleInsets)
+        val pinwheelFragment = PinwheelFragment.newInstance(it, "react native", "3.2.3", getReactNativeVersion(), this.handleInsets)
         pinwheelEventListener?.let { listener ->
           pinwheelFragment.pinwheelEventListener = listener
         }

package/ios/RTNPinwheelView.h

@@ -21,8 +21,8 @@ NS_ASSUME_NONNULL_BEGIN
 #endif
 
 
-@property (nonatomic, strong) PinwheelWrapperVC *pinwheelWrapperVC;
-@property (nonatomic, assign) NSString *token;
+@property (nonatomic, strong, nullable) PinwheelWrapperVC *pinwheelWrapperVC;
+@property (nonatomic, strong) NSString *token;
 
 - (instancetype)initWithFrame:(CGRect)frame token:(NSString *)token;
 

package/ios/RTNPinwheelView.mm

@@ -37,8 +37,13 @@ using namespace facebook::react;
 }
 
 - (void)initPinwheelWrapperVC {
-    if (self.token != nil && self.pinwheelWrapperVC == nil) {
-        self.pinwheelWrapperVC = [[PinwheelWrapperVC alloc] initWithToken:self.token delegate:self sdk:@"react native" version: @"3.2.2"];
+    if (self.pinwheelWrapperVC != nil) {
+        [self.pinwheelWrapperVC.view removeFromSuperview];
+        self.pinwheelWrapperVC = nil;
+    }
+
+    if (self.token != nil) {
+        self.pinwheelWrapperVC = [[PinwheelWrapperVC alloc] initWithToken:self.token delegate:self sdk:@"react native" version: @"3.2.3"];
         [self addSubview:self.pinwheelWrapperVC.view];
     }
 }
@@ -46,7 +51,6 @@ using namespace facebook::react;
 - (void)setToken:(NSString *)newToken {
     if (![_token isEqualToString:newToken]) {
         _token = newToken;
-        [self initPinwheelWrapperVC];
     }
 }
 
@@ -59,14 +63,20 @@ using namespace facebook::react;
         NSString* convertedToken = [NSString stringWithUTF8String:newViewProps.token.c_str()];
         [self setToken:convertedToken];
     }
+    // Ensures that the view is always re-initialized whenever the props change, or the React Native component is
+    // re-mounted. On the new architecture, there are optimizations which causes the view to be re-used in these
+    // scenarios, whereas the ideal functionality here is to have the Link modal reset to the starting state.
+    [self initPinwheelWrapperVC];
 
     [super updateProps:props oldProps:oldProps];
 }
 
 - (void)layoutSubviews
 {
-  [super layoutSubviews];
-  self.pinwheelWrapperVC.view.frame = self.bounds;
+    [super layoutSubviews];
+    if (self.pinwheelWrapperVC != nil) {
+        self.pinwheelWrapperVC.view.frame = self.bounds;
+    }
 }
 
 - (void)onEventWithName:(NSString *)name event:(NSDictionary<NSString *, id> *)event {
@@ -125,7 +135,7 @@ Class<RCTComponentViewProtocol> RTNPinwheelCls(void)
 
 - (void)initPinwheelWrapperVC {
     if (self.token != nil && self.pinwheelWrapperVC == nil) {
-        self.pinwheelWrapperVC = [[PinwheelWrapperVC alloc] initWithToken:self.token delegate:self sdk:@"react native" version: @"3.2.2"];
+        self.pinwheelWrapperVC = [[PinwheelWrapperVC alloc] initWithToken:self.token delegate:self sdk:@"react native" version: @"3.2.3"];
         [self addSubview:self.pinwheelWrapperVC.view];
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pinwheel/react-native-pinwheel",
-  "version": "3.2.2",
+  "version": "3.2.3",
   "type": "module",
   "main": "src/index.ts",
   "types": "src/index.ts",