react-native-purchases-ui 8.11.1 → 8.11.2

package/android/build.gradle

@@ -59,7 +59,7 @@ android {
     minSdkVersion getExtOrIntegerDefault("minSdkVersion")
     targetSdkVersion getExtOrIntegerDefault("targetSdkVersion")
     versionCode 1
-    versionName '8.11.1'
+    versionName '8.11.2'
   }
 
   buildTypes {

package/android/src/main/java/com/revenuecat/purchases/react/ui/PaywallFooterViewManager.kt

@@ -3,19 +3,17 @@ package com.revenuecat.purchases.react.ui
 import androidx.core.view.children
 import com.facebook.react.uimanager.ThemedReactContext
 import com.revenuecat.purchases.react.ui.events.OnMeasureEvent
-import com.revenuecat.purchases.ui.revenuecatui.ExperimentalPreviewRevenueCatUIPurchasesAPI
+import com.revenuecat.purchases.react.ui.views.WrappedPaywallFooterComposeView
 import com.revenuecat.purchases.ui.revenuecatui.fonts.CustomFontProvider
-import com.revenuecat.purchases.ui.revenuecatui.views.PaywallFooterView
 
-@OptIn(ExperimentalPreviewRevenueCatUIPurchasesAPI::class)
-internal class PaywallFooterViewManager : BasePaywallViewManager<PaywallFooterView>() {
+internal class PaywallFooterViewManager : BasePaywallViewManager<WrappedPaywallFooterComposeView>() {
 
     override fun getName(): String {
         return "RCPaywallFooterView"
     }
 
-    override fun createViewInstance(themedReactContext: ThemedReactContext): PaywallFooterView {
-        return object : PaywallFooterView(themedReactContext) {
+    override fun createViewInstance(themedReactContext: ThemedReactContext): WrappedPaywallFooterComposeView {
+        return object : WrappedPaywallFooterComposeView(themedReactContext) {
 
             // This is required so the change from Loading to Loaded resizes the view
             // https://github.com/facebook/react-native/issues/17968#issuecomment-1672111483
@@ -43,27 +41,29 @@ internal class PaywallFooterViewManager : BasePaywallViewManager<PaywallFooterVi
             // https://medium.com/traveloka-engineering/react-native-at-traveloka-native-ui-components-c6b66f789f35
             public override fun onMeasure(widthMeasureSpec: Int, heightMeasureSpec: Int) {
                 super.onMeasure(widthMeasureSpec, heightMeasureSpec)
-                var maxWidth = 0
-                var maxHeight = 0
-                children.forEach {
-                    it.measure(widthMeasureSpec, MeasureSpec.UNSPECIFIED)
-                    maxWidth = maxWidth.coerceAtLeast(it.measuredWidth)
-                    maxHeight = maxHeight.coerceAtLeast(it.measuredHeight)
-                }
-                val finalWidth = maxWidth.coerceAtLeast(suggestedMinimumWidth)
-                val finalHeight = maxHeight.coerceAtLeast(suggestedMinimumHeight)
-                setMeasuredDimension(finalWidth, finalHeight)
+                if (isAttached) {
+                    var maxWidth = 0
+                    var maxHeight = 0
+                    children.forEach {
+                        it.measure(widthMeasureSpec, MeasureSpec.UNSPECIFIED)
+                        maxWidth = maxWidth.coerceAtLeast(it.measuredWidth)
+                        maxHeight = maxHeight.coerceAtLeast(it.measuredHeight)
+                    }
+                    val finalWidth = maxWidth.coerceAtLeast(suggestedMinimumWidth)
+                    val finalHeight = maxHeight.coerceAtLeast(suggestedMinimumHeight)
+                    setMeasuredDimension(finalWidth, finalHeight)
 
-                val density = context.resources.displayMetrics.density
-                val finalHeightInDp = finalHeight / density
+                    val density = context.resources.displayMetrics.density
+                    val finalHeightInDp = finalHeight / density
 
-                val onMeasureEvent = OnMeasureEvent(
-                    this.surfaceId,
-                    this.id,
-                    finalHeightInDp.toInt()
-                )
-                (context as? ThemedReactContext)?.reactApplicationContext?.let { reactApplicationContext ->
-                    emitEvent(reactApplicationContext, this.id, onMeasureEvent)
+                    val onMeasureEvent = OnMeasureEvent(
+                        this.surfaceId,
+                        this.id,
+                        finalHeightInDp.toInt()
+                    )
+                    (context as? ThemedReactContext)?.reactApplicationContext?.let { reactApplicationContext ->
+                        emitEvent(reactApplicationContext, this.id, onMeasureEvent)
+                    }
                 }
             }
         }.also { view ->
@@ -72,15 +72,15 @@ internal class PaywallFooterViewManager : BasePaywallViewManager<PaywallFooterVi
         }
     }
 
-    override fun setOfferingId(view: PaywallFooterView, identifier: String) {
+    override fun setOfferingId(view: WrappedPaywallFooterComposeView, identifier: String) {
         view.setOfferingId(identifier)
     }
 
-    override fun setFontFamily(view: PaywallFooterView, customFontProvider: CustomFontProvider) {
+    override fun setFontFamily(view: WrappedPaywallFooterComposeView, customFontProvider: CustomFontProvider) {
         view.setFontProvider(customFontProvider)
     }
 
-    override fun setDisplayDismissButton(view: PaywallFooterView, display: Boolean) {
+    override fun setDisplayDismissButton(view: WrappedPaywallFooterComposeView, display: Boolean) {
         // No-op since PaywallFooterView doesn't have a dismiss button
     }
 

package/android/src/main/java/com/revenuecat/purchases/react/ui/PaywallViewManager.kt

@@ -1,11 +1,11 @@
 package com.revenuecat.purchases.react.ui
 
 import com.facebook.react.uimanager.ThemedReactContext
+import com.revenuecat.purchases.react.ui.views.WrappedPaywallComposeView
 import com.revenuecat.purchases.ui.revenuecatui.fonts.CustomFontProvider
-import com.revenuecat.purchases.ui.revenuecatui.views.PaywallView
 
 
-internal class PaywallViewManager : BasePaywallViewManager<PaywallView>() {
+internal class PaywallViewManager : BasePaywallViewManager<WrappedPaywallComposeView>() {
 
     companion object {
         const val REACT_CLASS = "Paywall"
@@ -15,8 +15,8 @@ internal class PaywallViewManager : BasePaywallViewManager<PaywallView>() {
         return REACT_CLASS
     }
 
-    override fun createViewInstance(themedReactContext: ThemedReactContext): PaywallView {
-        return PaywallView(themedReactContext).also { view ->
+    override fun createViewInstance(themedReactContext: ThemedReactContext): WrappedPaywallComposeView {
+        return WrappedPaywallComposeView(themedReactContext).also { view ->
             view.setPaywallListener(createPaywallListenerWrapper(themedReactContext, view))
             view.setDismissHandler(getDismissHandler(themedReactContext, view))
         }
@@ -26,15 +26,15 @@ internal class PaywallViewManager : BasePaywallViewManager<PaywallView>() {
         return PaywallViewShadowNode()
     }
 
-    override fun setOfferingId(view: PaywallView, identifier: String) {
+    override fun setOfferingId(view: WrappedPaywallComposeView, identifier: String) {
         view.setOfferingId(identifier)
     }
 
-    override fun setFontFamily(view: PaywallView, customFontProvider: CustomFontProvider) {
+    override fun setFontFamily(view: WrappedPaywallComposeView, customFontProvider: CustomFontProvider) {
         view.setFontProvider(customFontProvider)
     }
 
-    override fun setDisplayDismissButton(view: PaywallView, display: Boolean) {
+    override fun setDisplayDismissButton(view: WrappedPaywallComposeView, display: Boolean) {
         view.setDisplayDismissButton(display)
     }
 

package/android/src/main/java/com/revenuecat/purchases/react/ui/views/ComposeViewWrapper.kt

@@ -0,0 +1,65 @@
+package com.revenuecat.purchases.react.ui.views
+
+import android.content.Context
+import android.util.AttributeSet
+import android.view.View
+import android.view.ViewGroup
+import android.widget.FrameLayout
+
+abstract class ComposeViewWrapper<T : View> : FrameLayout {
+    protected var wrappedView: T? = null
+    protected var isAttached = false
+
+    constructor(context: Context, attrs: AttributeSet?) : super(context, attrs) {
+        init(context, attrs)
+    }
+
+    constructor(context: Context, attrs: AttributeSet?, defStyleAttr: Int) : super(context, attrs, defStyleAttr) {
+        init(context, attrs)
+    }
+
+    constructor(context: Context) : super(context) {
+        init(context, null)
+    }
+
+    protected abstract fun createWrappedView(context: Context, attrs: AttributeSet?): T
+
+    private fun init(context: Context, attrs: AttributeSet?) {
+        wrappedView = createWrappedView(context, attrs).apply {
+            layoutParams = LayoutParams(
+                ViewGroup.LayoutParams.MATCH_PARENT,
+                ViewGroup.LayoutParams.MATCH_PARENT
+            )
+        }
+        addView(wrappedView)
+    }
+
+    override fun onAttachedToWindow() {
+        super.onAttachedToWindow()
+        isAttached = true
+        requestLayout()
+    }
+
+    override fun onDetachedFromWindow() {
+        super.onDetachedFromWindow()
+        isAttached = false
+    }
+
+    override fun onMeasure(widthMeasureSpec: Int, heightMeasureSpec: Int) {
+        if (isAttached) {
+            super.onMeasure(widthMeasureSpec, heightMeasureSpec)
+        } else {
+            setMeasuredDimension(
+                MeasureSpec.getSize(widthMeasureSpec),
+                MeasureSpec.getSize(heightMeasureSpec)
+            )
+        }
+    }
+
+    override fun onLayout(changed: Boolean, left: Int, top: Int, right: Int, bottom: Int) {
+        super.onLayout(changed, left, top, right, bottom)
+        if (isAttached) {
+            wrappedView?.requestLayout()
+        }
+    }
+}

package/android/src/main/java/com/revenuecat/purchases/react/ui/views/WrappedPaywallComposeView.kt

@@ -0,0 +1,34 @@
+package com.revenuecat.purchases.react.ui.views
+
+import android.content.Context
+import android.util.AttributeSet
+import com.revenuecat.purchases.ui.revenuecatui.PaywallListener
+import com.revenuecat.purchases.ui.revenuecatui.fonts.FontProvider
+import com.revenuecat.purchases.ui.revenuecatui.views.PaywallView
+
+class WrappedPaywallComposeView(context: Context) : ComposeViewWrapper<PaywallView>(context) {
+
+    override fun createWrappedView(context: Context, attrs: AttributeSet?): PaywallView {
+        return PaywallView(context, attrs)
+    }
+
+    fun setPaywallListener(listener: PaywallListener?) {
+        wrappedView?.setPaywallListener(listener)
+    }
+
+    fun setDismissHandler(dismissHandler: (() -> Unit)?) {
+        wrappedView?.setDismissHandler(dismissHandler)
+    }
+
+    fun setOfferingId(offeringId: String?) {
+        wrappedView?.setOfferingId(offeringId)
+    }
+
+    fun setFontProvider(fontProvider: FontProvider?) {
+        wrappedView?.setFontProvider(fontProvider)
+    }
+
+    fun setDisplayDismissButton(shouldDisplayDismissButton: Boolean) {
+        wrappedView?.setDisplayDismissButton(shouldDisplayDismissButton)
+    }
+}

package/android/src/main/java/com/revenuecat/purchases/react/ui/views/WrappedPaywallFooterComposeView.kt

@@ -0,0 +1,31 @@
+package com.revenuecat.purchases.react.ui.views
+
+import android.content.Context
+import android.util.AttributeSet
+import com.revenuecat.purchases.ui.revenuecatui.PaywallListener
+import com.revenuecat.purchases.ui.revenuecatui.fonts.CustomFontProvider
+import com.revenuecat.purchases.ui.revenuecatui.views.OriginalTemplatePaywallFooterView
+
+open class WrappedPaywallFooterComposeView(context: Context) : ComposeViewWrapper<OriginalTemplatePaywallFooterView>(context) {
+
+    override fun createWrappedView(context: Context, attrs: AttributeSet?): OriginalTemplatePaywallFooterView {
+        return OriginalTemplatePaywallFooterView(context, attrs)
+    }
+
+    fun setOfferingId(identifier: String) {
+        wrappedView?.setOfferingId(identifier)
+    }
+
+    fun setFontProvider(customFontProvider: CustomFontProvider) {
+        wrappedView?.setFontProvider(customFontProvider)
+    }
+
+    fun setPaywallListener(listener: PaywallListener) {
+        wrappedView?.setPaywallListener(listener)
+    }
+
+    fun setDismissHandler(handler: (() -> Unit)) {
+        wrappedView?.setDismissHandler(handler)
+    }
+
+}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "react-native-purchases-ui",
   "title": "React Native Purchases UI",
-  "version": "8.11.1",
+  "version": "8.11.2",
   "description": "React Native in-app purchases and subscriptions made easy. Supports iOS and Android.",
   "main": "lib/commonjs/index",
   "module": "lib/module/index",
@@ -115,6 +115,6 @@
   },
   "dependencies": {
     "@revenuecat/purchases-typescript-internal": "13.33.0",
-    "react-native-purchases": "8.11.1"
+    "react-native-purchases": "8.11.2"
   }
 }