@dr33m/react-native-readium 5.0.0-rc.24 → 5.0.0-rc.25

package/android/src/main/java/com/reactnativereadium/reader/BaseReaderFragment.kt

@@ -45,7 +45,7 @@ abstract class BaseReaderFragment : Fragment() {
   // True while the user has an active text selection.
   // applyDecorations injects JS into the EPUB WebView; doing so while the user
   // is dragging selection handles causes the selection to jump or reset.
-  private var isUserSelecting = false
+  protected var isUserSelecting = false
 
   // Track active decoration listeners to avoid duplicates
   private val activeDecorationGroups = mutableSetOf<String>()
@@ -112,8 +112,8 @@ abstract class BaseReaderFragment : Fragment() {
     // Apply any pending decorations now that navigator is ready
     pendingDecorations?.let { applyDecorations(it) }
 
-    // Start monitoring text selection
-    startSelectionMonitoring()
+    // Selection detection is handled via ActionMode callbacks in EpubReaderFragment,
+    // not polling — see onSelectionActionModeCreated/Destroyed.
   }
 
   override fun onHiddenChanged(hidden: Boolean) {
@@ -317,64 +317,45 @@ abstract class BaseReaderFragment : Fragment() {
   }
 
   /**
-   * Start monitoring text selection and emit selection change events.
+   * Called by [EpubReaderFragment] when the WebView's ActionMode is created
+   * (i.e. the user selects text). Queries the selection once and emits a
+   * [SelectionChanged] event so the React Native side can show the highlight menu.
    *
-   * Uses 500ms polling because Readium's [SelectableNavigator] does not
-   * provide an observable API (Flow, callback, or listener) for selection
-   * changes. The only available method is the suspending
-   * [SelectableNavigator.currentSelection], which must be called on-demand.
-   * Polling is the least-invasive way to detect changes without forking the
-   * Readium toolkit.
+   * This replaces the old 500ms polling loop which executed JavaScript in the
+   * WebView every tick and disrupted the browser's selection state, causing
+   * the selection to glitch/jump while dragging handles.
    */
-  private fun startSelectionMonitoring() {
-    val viewScope = viewLifecycleOwner.lifecycleScope
-
-    viewScope.launch {
-      var previousSelection: Locator? = null
-
-      while (true) {
-        delay(500) // Check every 500ms
-
-        if (!isNavigatorReady) continue
-
-        val selectableNavigator = navigator as? SelectableNavigator
-        if (selectableNavigator == null) continue
-
-        val currentSelection = try {
-          selectableNavigator.currentSelection()
-        } catch (e: Exception) {
-          android.util.Log.w("BaseReaderFragment", "Error getting selection: ${e.message}")
-          null
-        }
-
-        val currentLocator = currentSelection?.locator
-        val currentText = currentLocator?.text?.highlight
-
-        // Keep the guard flag in sync so TTS decoration skips DOM updates
-        // while the user is dragging selection handles.
-        isUserSelecting = currentLocator != null
-
-        // Check if selection has changed
-        val hasChanged = when {
-          previousSelection == null && currentLocator == null -> false
-          previousSelection == null || currentLocator == null -> true
-          previousSelection.href != currentLocator.href -> true
-          previousSelection.text.highlight != currentText -> true
-          else -> false
-        }
-
-        if (hasChanged) {
-          channel.send(
-            ReaderViewModel.Event.SelectionChanged(
-              locator = currentLocator,
-              selectedText = currentText
-            )
+  fun onSelectionActionModeCreated() {
+    isUserSelecting = true
+    viewLifecycleOwner.lifecycleScope.launch {
+      delay(100) // brief delay so the WebView selection stabilises
+      if (!isNavigatorReady) return@launch
+      val sel = (navigator as? SelectableNavigator)?.currentSelection()
+      if (sel != null) {
+        channel.send(
+          ReaderViewModel.Event.SelectionChanged(
+            locator = sel.locator,
+            selectedText = sel.locator.text.highlight
           )
-
-          previousSelection = currentLocator
-        }
+        )
       }
     }
   }
 
+  /**
+   * Called by [EpubReaderFragment] when the WebView's ActionMode is destroyed
+   * (i.e. the user taps away or the selection is dismissed).
+   */
+  fun onSelectionActionModeDestroyed() {
+    isUserSelecting = false
+    viewLifecycleOwner.lifecycleScope.launch {
+      channel.send(
+        ReaderViewModel.Event.SelectionChanged(
+          locator = null,
+          selectedText = null
+        )
+      )
+    }
+  }
+
 }

package/android/src/main/java/com/reactnativereadium/reader/EpubReaderFragment.kt

@@ -133,11 +133,14 @@ class EpubReaderFragment : VisualReaderFragment() {
                   suppressNativeSelectionMenu -> selectionActionModeCallback = object : ActionMode.Callback {
                     override fun onCreateActionMode(mode: ActionMode, menu: Menu): Boolean {
                         menu.clear()
+                        onSelectionActionModeCreated()
                         return true
                     }
                     override fun onPrepareActionMode(mode: ActionMode, menu: Menu) = false
                     override fun onActionItemClicked(mode: ActionMode, item: MenuItem) = false
-                    override fun onDestroyActionMode(mode: ActionMode) {}
+                    override fun onDestroyActionMode(mode: ActionMode) {
+                        onSelectionActionModeDestroyed()
+                    }
                   }
                   selectionActions.isNotEmpty() -> selectionActionModeCallback = customSelectionActionModeCallback
                 }
@@ -225,6 +228,8 @@ class EpubReaderFragment : VisualReaderFragment() {
             // Clear previous action mappings
             actionIdMap.clear()
 
+            onSelectionActionModeCreated()
+
             // Only add menu items if navigator supports decorations
             if (navigator !is DecorableNavigator) {
                 return true
@@ -283,6 +288,7 @@ class EpubReaderFragment : VisualReaderFragment() {
         override fun onDestroyActionMode(mode: ActionMode) {
             // Clean up action mappings
             actionIdMap.clear()
+            onSelectionActionModeDestroyed()
         }
     }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dr33m/react-native-readium",
-  "version": "5.0.0-rc.24",
+  "version": "5.0.0-rc.25",
   "description": "A react-native wrapper for https://readium.org/",
   "main": "lib/src/index",
   "types": "lib/src/index.d.ts",