@pinwheel/react-native-pinwheel 3.2.3 → 3.2.4-rc.1

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

@@ -10,7 +10,6 @@ import android.view.Choreographer
 import android.view.View
 import android.widget.FrameLayout
 import androidx.fragment.app.FragmentActivity
-import com.facebook.react.bridge.ReactApplicationContext
 import com.underdog_tech.pinwheel_android.PinwheelEventListener
 import com.underdog_tech.pinwheel_android.PinwheelFragment
 import com.facebook.react.uimanager.ThemedReactContext
@@ -21,6 +20,7 @@ class Pinwheel : FrameLayout {
   private var pinwheelFragment: PinwheelFragment? = null
   private var pinwheelEventListener: PinwheelEventListener? = null
   private var handleInsets: Boolean = true
+  private var fragmentContainer: FrameLayout? = null
 
   constructor(context: Context) : super(context) {
     init()
@@ -41,6 +41,30 @@ class Pinwheel : FrameLayout {
   private fun init() {
     // Match background color of Link. We may want to have a loader here in the future.
     setBackgroundColor(Color.WHITE)
+
+    // Create a FrameLayout to act as the fragment container
+    fragmentContainer = FrameLayout(context)
+    fragmentContainer!!.id = View.generateViewId()
+    addView(fragmentContainer, LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT))
+
+    if (isAttachedToWindow) {
+      createFragment()
+    } else {
+      addOnAttachStateChangeListener(object : OnAttachStateChangeListener {
+        override fun onViewAttachedToWindow(v: View) {
+          createFragment()
+          removeOnAttachStateChangeListener(this)
+        }
+
+        override fun onViewDetachedFromWindow(v: View) {}
+      })
+
+      // Check again after adding the listener in case the the view attached before the listener
+      // was added.
+      if (isAttachedToWindow) {
+        createFragment()
+      }
+    }
   }
 
   fun setToken(token: String?) {
@@ -58,20 +82,23 @@ class Pinwheel : FrameLayout {
 
   private fun createFragment() {
     Handler(Looper.getMainLooper()).post {
-      this.token?.let {
-        val pinwheelFragment = PinwheelFragment.newInstance(it, "react native", "3.2.3", getReactNativeVersion(), this.handleInsets)
-        pinwheelEventListener?.let { listener ->
-          pinwheelFragment.pinwheelEventListener = listener
+      if (this.pinwheelFragment == null) {
+        this.token?.let {
+          val pinwheelFragment = PinwheelFragment.newInstance(it, "react native", "3.2.4", getReactNativeVersion(), this.handleInsets)
+          pinwheelEventListener?.let { listener ->
+            pinwheelFragment.pinwheelEventListener = listener
+          }
+          val reactContext = context as ThemedReactContext
+          val activity = reactContext.currentActivity as? FragmentActivity
+
+          val transaction = activity?.supportFragmentManager?.beginTransaction()
+          transaction?.runOnCommit {
+            fragmentContainer?.addView(pinwheelFragment.view)
+          }
+          transaction?.add(pinwheelFragment, pinwheelFragment.id.toString())?.commit()
+
+          this.pinwheelFragment = pinwheelFragment
         }
-        val reactContext = context as ThemedReactContext
-        val activity = reactContext.currentActivity as? FragmentActivity
-
-        activity?.supportFragmentManager
-          ?.beginTransaction()
-          ?.replace(id, pinwheelFragment, id.toString())
-          ?.commit()
-
-        this.pinwheelFragment = pinwheelFragment
       }
     }
 
@@ -99,14 +126,6 @@ class Pinwheel : FrameLayout {
     this.layout(left, top, left + width, top + height)
   }
 
-  override fun onLayout(changed: Boolean, left: Int, top: Int, right: Int, bottom: Int) {
-    super.onLayout(changed, left, top, right, bottom)
-
-    if (changed && this.pinwheelFragment == null) {
-      createFragment()
-    }
-  }
-
   fun setPinwheelEventListener(listener: PinwheelEventListener) {
     pinwheelEventListener = listener
     pinwheelFragment?.let {

package/ios/RTNPinwheelView.mm

@@ -43,7 +43,7 @@ using namespace facebook::react;
     }
 
     if (self.token != nil) {
-        self.pinwheelWrapperVC = [[PinwheelWrapperVC alloc] initWithToken:self.token delegate:self sdk:@"react native" version: @"3.2.3"];
+        self.pinwheelWrapperVC = [[PinwheelWrapperVC alloc] initWithToken:self.token delegate:self sdk:@"react native" version: @"3.2.4"];
         [self addSubview:self.pinwheelWrapperVC.view];
     }
 }
@@ -135,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.3"];
+        self.pinwheelWrapperVC = [[PinwheelWrapperVC alloc] initWithToken:self.token delegate:self sdk:@"react native" version: @"3.2.4"];
         [self addSubview:self.pinwheelWrapperVC.view];
     }
 }

package/package.json

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