@apollohg/react-native-prose-editor 0.5.20 → 0.5.21

package/ios/EditorCore.xcframework/Info.plist

@@ -8,32 +8,32 @@
 			<key>BinaryPath</key>
 			<string>libeditor_core.a</string>
 			<key>LibraryIdentifier</key>
-			<string>ios-arm64_x86_64-simulator</string>
+			<string>ios-arm64</string>
 			<key>LibraryPath</key>
 			<string>libeditor_core.a</string>
 			<key>SupportedArchitectures</key>
 			<array>
 				<string>arm64</string>
-				<string>x86_64</string>
 			</array>
 			<key>SupportedPlatform</key>
 			<string>ios</string>
-			<key>SupportedPlatformVariant</key>
-			<string>simulator</string>
 		</dict>
 		<dict>
 			<key>BinaryPath</key>
 			<string>libeditor_core.a</string>
 			<key>LibraryIdentifier</key>
-			<string>ios-arm64</string>
+			<string>ios-arm64_x86_64-simulator</string>
 			<key>LibraryPath</key>
 			<string>libeditor_core.a</string>
 			<key>SupportedArchitectures</key>
 			<array>
 				<string>arm64</string>
+				<string>x86_64</string>
 			</array>
 			<key>SupportedPlatform</key>
 			<string>ios</string>
+			<key>SupportedPlatformVariant</key>
+			<string>simulator</string>
 		</dict>
 	</array>
 	<key>CFBundlePackageType</key>

package/ios/NativeEditorExpoView.swift

@@ -2566,6 +2566,7 @@ class NativeEditorExpoView: ExpoView, EditorTextViewDelegate, UIGestureRecognize
     }
 
     func blur() {
+        clearRecentToolbarTouch()
         richTextView.textView.resignFirstResponder()
     }
 
@@ -2603,7 +2604,7 @@ class NativeEditorExpoView: ExpoView, EditorTextViewDelegate, UIGestureRecognize
     }
 
     @objc private func textViewDidEndEditing(_ notification: Notification) {
-        if shouldPreserveFocusAfterToolbarTouch() {
+        if consumeToolbarFocusPreservationForBlur() {
             DispatchQueue.main.async { [weak self] in
                 _ = self?.richTextView.textView.becomeFirstResponder()
             }
@@ -2624,6 +2625,7 @@ class NativeEditorExpoView: ExpoView, EditorTextViewDelegate, UIGestureRecognize
         guard shouldHandleOutsideTap(locationInWindow: locationInWindow, touchedView: nil) else {
             return
         }
+        clearRecentToolbarTouch()
         blur()
     }
 
@@ -2648,13 +2650,26 @@ class NativeEditorExpoView: ExpoView, EditorTextViewDelegate, UIGestureRecognize
         guard gestureRecognizer === outsideTapGestureRecognizer else { return true }
         guard let tapWindow = gestureWindow ?? window else { return true }
         let locationInWindow = touch.location(in: tapWindow)
+        return prepareOutsideTapForFocusHandling(
+            locationInWindow: locationInWindow,
+            touchedView: touch.view
+        )
+    }
+
+    private func prepareOutsideTapForFocusHandling(
+        locationInWindow: CGPoint,
+        touchedView: UIView?
+    ) -> Bool {
         if isLocationInStandaloneToolbarFrame(locationInWindow) {
             markRecentToolbarTouch()
         }
         let result = shouldHandleOutsideTap(
             locationInWindow: locationInWindow,
-            touchedView: touch.view
+            touchedView: touchedView
         )
+        if result {
+            clearRecentToolbarTouch()
+        }
         return result
     }
 
@@ -2662,10 +2677,20 @@ class NativeEditorExpoView: ExpoView, EditorTextViewDelegate, UIGestureRecognize
         lastToolbarTouchUptime = ProcessInfo.processInfo.systemUptime
     }
 
+    private func clearRecentToolbarTouch() {
+        lastToolbarTouchUptime = -Double.infinity
+    }
+
     private func shouldPreserveFocusAfterToolbarTouch() -> Bool {
         ProcessInfo.processInfo.systemUptime - lastToolbarTouchUptime <= 0.75
     }
 
+    private func consumeToolbarFocusPreservationForBlur() -> Bool {
+        guard shouldPreserveFocusAfterToolbarTouch() else { return false }
+        clearRecentToolbarTouch()
+        return true
+    }
+
     private func isLocationInStandaloneToolbarFrame(_ locationInWindow: CGPoint) -> Bool {
         toolbarFramesInWindow.contains(where: { $0.contains(locationInWindow) })
     }
@@ -3317,6 +3342,28 @@ class NativeEditorExpoView: ExpoView, EditorTextViewDelegate, UIGestureRecognize
         richTextView.textView.inputAccessoryView === accessoryPlaceholder
     }
 
+    func markRecentToolbarTouchForTesting() {
+        markRecentToolbarTouch()
+    }
+
+    func shouldPreserveFocusAfterToolbarTouchForTesting() -> Bool {
+        shouldPreserveFocusAfterToolbarTouch()
+    }
+
+    func consumeToolbarFocusPreservationForTesting() -> Bool {
+        consumeToolbarFocusPreservationForBlur()
+    }
+
+    func prepareOutsideTapForFocusHandlingForTesting(
+        locationInWindow: CGPoint,
+        touchedView: UIView? = nil
+    ) -> Bool {
+        prepareOutsideTapForFocusHandling(
+            locationInWindow: locationInWindow,
+            touchedView: touchedView
+        )
+    }
+
     private func updateAccessoryToolbarVisibility() {
         guard prepareForInputAccessoryMutationOrRetry(.updateAccessoryToolbarVisibility) else { return }
         refreshSystemAssistantToolbarIfNeeded()

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@apollohg/react-native-prose-editor",
-    "version": "0.5.20",
+    "version": "0.5.21",
     "description": "Native rich text editor with Rust core for React Native",
     "license": "Apache-2.0",
     "homepage": "https://github.com/apollohg/react-native-prose-editor",
@@ -20,7 +20,9 @@
             "types": "./dist/index.d.ts",
             "react-native": "./dist/index.js",
             "default": "./dist/index.js"
-        }
+        },
+        "./app.plugin": "./app.plugin.js",
+        "./app.plugin.js": "./app.plugin.js"
     },
     "private": false,
     "publishConfig": {
@@ -74,6 +76,7 @@
     "files": [
         "README.md",
         "LICENSE",
+        "app.plugin.js",
         "dist",
         "android/build.gradle",
         "android/consumer-rules.pro",