@pinwheel/react-native-pinwheel 3.2.0-rc.4 → 3.2.0-rc.5

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

@@ -48,7 +48,7 @@ class Pinwheel : FrameLayout {
   private fun createFragment() {
     Handler(Looper.getMainLooper()).post {
       this.token?.let {
-        val pinwheelFragment = PinwheelFragment.newInstance(it, "react native", "3.2.0-rc.4")
+        val pinwheelFragment = PinwheelFragment.newInstance(it, "react native", "3.2.0-rc.5")
         pinwheelEventListener?.let { listener ->
           pinwheelFragment.pinwheelEventListener = listener
         }

package/ios/RTNPinwheelEvents.h

@@ -1,13 +1,29 @@
+#ifdef RCT_NEW_ARCH_ENABLED
+
 #import <RTNPinwheelSpec/RTNPinwheelSpec.h>
+
+#else 
+
+#import <React/RCTBridgeModule.h>
+
+#endif 
+
+
 #import <React/RCTEventEmitter.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
-@interface RTNPinwheelEvents : RCTEventEmitter <NativePinwheelEventsSpec>
+@interface RTNPinwheelEvents : RCTEventEmitter 
+
+#ifdef RCT_NEW_ARCH_ENABLED
+    <NativePinwheelEventsSpec>
+#else 
+    <RCTBridgeModule>
+#endif
 
 + (instancetype)sharedInstance;
 - (void)handlePinwheelEvent:(NSDictionary<NSString *, id> *)payload;
 
 @end
 
-NS_ASSUME_NONNULL_END
+NS_ASSUME_NONNULL_END

package/ios/RTNPinwheelEvents.mm

@@ -59,16 +59,20 @@ RCT_EXPORT_MODULE();
   return @[@"PINWHEEL_EVENT"]; // Add more event names here.
 }
 
+#if RCT_NEW_ARCH_ENABLED
 - (std::shared_ptr<facebook::react::TurboModule>)getTurboModule:(const facebook::react::ObjCTurboModule::InitParams &)params {
     return std::make_shared<facebook::react::NativePinwheelEventsSpecJSI>(params);
 }
+#endif
 
-- (void)removeListener { 
+RCT_EXPORT_METHOD(removeListener) { 
     [self stopObserving];
 }
 
-- (void)setListener { 
+RCT_EXPORT_METHOD(setListener) { 
     [self startObserving];
 }
 
+
+
 @end

package/ios/RTNPinwheelManager.mm

@@ -8,12 +8,15 @@
 
 @implementation RTNPinwheelManager
 
+#ifdef RCT_NEW_ARCH_ENABLED
 RCT_EXPORT_MODULE(RTNPinwheelView)
+#else
+RCT_EXPORT_MODULE(RTNPinwheel)
+#endif
 
 - (UIView *)view
 {   
-    RTNPinwheelView *pv = [[RTNPinwheelView alloc] init];
-    return pv;
+    return [[RTNPinwheelView alloc] init];
 }
 
 RCT_EXPORT_VIEW_PROPERTY(token, NSString);

package/ios/RTNPinwheelView.h

@@ -1,11 +1,24 @@
+#if RCT_NEW_ARCH_ENABLED
+
 #import <React/RCTViewComponentView.h>
-#import <UIKit/UIKit.h>
+
+# endif
+
 #import <ObjCWrapper/PinwheelVCWrapper.h>
+#import <UIKit/UIKit.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
+#ifdef RCT_NEW_ARCH_ENABLED
+
 @interface RTNPinwheelView : RCTViewComponentView <PinwheelVCWrapperDelegate>
 
+#else 
+
+@interface RTNPinwheelView : UIView <PinwheelVCWrapperDelegate>
+
+#endif
+
 @property (nonatomic, strong) PinwheelVCWrapper *pinwheelWrapperVC;
 @property (nonatomic, assign) NSString *token;
 
@@ -14,4 +27,3 @@ NS_ASSUME_NONNULL_BEGIN
 @end
 
 NS_ASSUME_NONNULL_END
-

package/ios/RTNPinwheelView.mm

@@ -1,3 +1,5 @@
+#ifdef RCT_NEW_ARCH_ENABLED
+
 #import "RTNPinwheelView.h"
 
 #import <react/renderer/components/RTNPinwheelSpec/ComponentDescriptors.h>
@@ -100,3 +102,74 @@ Class<RCTComponentViewProtocol> RTNPinwheelCls(void)
   return RTNPinwheelView.class;
 }
 
+#else 
+
+#import "RTNPinwheelView.h"
+#import "RTNPinwheelEvents.h"
+
+@implementation RTNPinwheelView
+
+- (instancetype)initWithFrame:(CGRect)frame {
+    if ((self = [super initWithFrame:frame])) {
+        [self initPinwheelWrapperVC];
+    }
+    return self;
+}
+
+- (instancetype)initWithFrame:(CGRect)frame token:(NSString *)token {
+    if ((self = [super initWithFrame:frame])) {
+        _token = token;
+    }
+    return self;
+}
+
+- (void)initPinwheelWrapperVC {
+    if (self.token != nil && self.pinwheelWrapperVC == nil) {
+        self.pinwheelWrapperVC = [[PinwheelVCWrapper alloc] initWithToken:self.token delegate:self sdk:@"react native" version: @"3.2.0"];
+        [self addSubview:self.pinwheelWrapperVC.view];
+    }
+}
+
+- (void)setToken:(NSString *)newToken {
+    if (![_token isEqualToString:newToken]) {
+        _token = newToken;
+        [self initPinwheelWrapperVC];
+    }
+}
+
+- (void)layoutSubviews
+{
+  [super layoutSubviews];
+  self.pinwheelWrapperVC.view.frame = self.bounds;
+}
+
+- (void)onEventWithName:(NSString *)name event:(NSDictionary<NSString *, id> *)event {
+    NSLog(@"%@", name);
+    NSDictionary *dataToSend = @{@"name": name, @"payload": event};
+    [RTNPinwheelEvents.sharedInstance handlePinwheelEvent:dataToSend];
+}
+
+- (void)onExit:(NSDictionary<NSString *, id> *)error {
+    NSLog(@"%@", error);
+}
+
+- (void)onSuccess:(NSDictionary<NSString *, id> *)result {
+    NSLog(@"%@", result);
+}
+
+- (void)onLogin:(NSDictionary<NSString *, id> *)result {
+    NSLog(@"%@", result);
+}
+
+- (void)onLoginAttempt:(NSDictionary<NSString *, id> *)result {
+    NSLog(@"%@", result);
+}
+
+- (void)onError:(NSDictionary<NSString *, id> *)error {
+    NSLog(@"%@", error);
+}
+
+@end
+
+
+#endif

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pinwheel/react-native-pinwheel",
-  "version": "3.2.0-rc.4",
+  "version": "3.2.0-rc.5",
   "type": "module",
   "main": "src/index.ts",
   "types": "src/index.ts",

package/src/Pinwheel.tsx

@@ -1,6 +1,6 @@
 import React, { useEffect, useCallback } from 'react';
 import { SafeAreaView } from 'react-native';
-import RTNPinwheel from './RTNPinwheelNativeComponent';
+const RTNPinwheel = require('./RTNPinwheelNativeComponent').default;
 import { PinwheelEvents } from './PinwheelEvents';
 import { LinkOptions } from './client-events/client';