@onekeyfe/react-native-chart-webview 3.0.49 → 3.0.52

package/android/src/main/java/com/margelo/nitro/chartwebview/PooledChartWebView.kt

@@ -97,6 +97,7 @@ class PooledChartWebView private constructor(
   // How long the snapshot overlay stays up after a reparent, giving the WebView
   // time to draw its first frame in the new container (~5 frames).
   private val overlayHideDelayMs = 80L
+  private val attachGeneration = AtomicInteger(0)
 
   val webView: WebView = WebView(context).apply {
     settings.javaScriptEnabled = true
@@ -154,21 +155,41 @@ class PooledChartWebView private constructor(
 
   /** Move the WebView into [container], detaching it from any previous parent. */
   fun attachTo(container: ViewGroup) {
+    val generation = attachGeneration.incrementAndGet()
     runOnUiThread {
-      if (webView.parent === container) return@runOnUiThread
-      (webView.parent as? ViewGroup)?.removeView(webView)
-      container.addView(
-        webView,
-        FrameLayout.LayoutParams(
-          FrameLayout.LayoutParams.MATCH_PARENT,
-          FrameLayout.LayoutParams.MATCH_PARENT,
-        ),
-      )
-      // Mask the reparent's blank frame with the last captured frame, then
-      // refresh the cache (async) so the next move has a current frame.
-      showSnapshotOverlay(container)
-      refreshSnapshotSoon()
+      attachToContainer(container, generation, canRetry = true)
+    }
+  }
+
+  private fun attachToContainer(container: ViewGroup, generation: Int, canRetry: Boolean) {
+    if (generation != attachGeneration.get()) return
+    if (webView.parent === container) return
+
+    (webView.parent as? ViewGroup)?.removeView(webView)
+    val currentParent = webView.parent
+    if (currentParent != null) {
+      if (canRetry) {
+        webView.post { attachToContainer(container, generation, canRetry = false) }
+      } else {
+        android.util.Log.w(
+          "ChartWebviewPool",
+          "Skip attach key=$key because WebView parent was not cleared: $currentParent",
+        )
+      }
+      return
     }
+
+    container.addView(
+      webView,
+      FrameLayout.LayoutParams(
+        FrameLayout.LayoutParams.MATCH_PARENT,
+        FrameLayout.LayoutParams.MATCH_PARENT,
+      ),
+    )
+    // Mask the reparent's blank frame with the last captured frame, then
+    // refresh the cache (async) so the next move has a current frame.
+    showSnapshotOverlay(container)
+    refreshSnapshotSoon()
   }
 
   /** Remove the WebView from its current parent (keeps it alive, warm). */

package/ios/ChartWebview.swift

@@ -330,6 +330,7 @@ final class PooledChartWebView {
   private var webView: WKWebView!
   private var proxy: ChartWebViewProxy!
   private var lastLoadedUrl: String?
+  private var attachGeneration = 0
 
   /// Read by the scheme handler to resolve offline files.
   fileprivate var currentLocalBundle: String?
@@ -405,8 +406,11 @@ final class PooledChartWebView {
 
   /// Move the WebView into `container`, detaching it from any previous parent.
   func attach(to container: UIView) {
+    attachGeneration += 1
+    let generation = attachGeneration
     runOnMain { [weak self] in
       guard let self = self, let webView = self.webView else { return }
+      guard generation == self.attachGeneration else { return }
       guard webView.superview !== container else { return }
       webView.removeFromSuperview()
       webView.frame = container.bounds

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/react-native-chart-webview",
-  "version": "3.0.49",
+  "version": "3.0.52",
   "description": "react-native-chart-webview",
   "main": "./lib/module/index.js",
   "types": "./lib/typescript/src/index.d.ts",