@openeditor/react-native-prose-editor 0.0.9 → 0.0.10

package/ios/NativeEditorExpoView.swift

@@ -1974,7 +1974,7 @@ final class EditorAccessoryPlaceholderView: UIView {
     }
 }
 
-class NativeEditorExpoView: ExpoView, EditorTextViewDelegate, UIGestureRecognizerDelegate {
+class NativeEditorExpoView: ExpoView, UIGestureRecognizerDelegate {
 
     // MARK: - Subviews
 
@@ -2091,29 +2091,23 @@ class NativeEditorExpoView: ExpoView, EditorTextViewDelegate, UIGestureRecognize
             self.invalidateIntrinsicContentSize()
             self.emitContentHeightIfNeeded(force: true, measuredHeight: measuredHeight)
         }
-        richTextView.textView.editorDelegate = self
+        richTextView.onSelectionChange = { [weak self] anchor, head in
+            self?.handleSelectionChange(anchor: anchor, head: head)
+        }
+        richTextView.onEditorUpdate = { [weak self] updateJSON in
+            self?.handleEditorUpdate(updateJSON)
+        }
+        richTextView.onFocusChange = { [weak self] focused in
+            if focused { self?.handleTextDidBeginEditing() }
+            else { self?.handleTextDidEndEditing() }
+        }
         configureAccessoryToolbar()
 
-        // Observe UITextView focus changes via NotificationCenter.
-        NotificationCenter.default.addObserver(
-            self,
-            selector: #selector(textViewDidBeginEditing(_:)),
-            name: UITextView.textDidBeginEditingNotification,
-            object: richTextView.textView
-        )
-        NotificationCenter.default.addObserver(
-            self,
-            selector: #selector(textViewDidEndEditing(_:)),
-            name: UITextView.textDidEndEditingNotification,
-            object: richTextView.textView
-        )
-
         addSubview(richTextView)
     }
 
     deinit {
         NativeEditorViewRegistry.shared.unregister(editorId: richTextView.editorId, view: self)
-        NotificationCenter.default.removeObserver(self)
     }
 
     // MARK: - Layout
@@ -2142,7 +2136,7 @@ class NativeEditorExpoView: ExpoView, EditorTextViewDelegate, UIGestureRecognize
 
     override func didMoveToWindow() {
         super.didMoveToWindow()
-        if richTextView.textView.isFirstResponder {
+        if richTextView.isEditorFocused {
             installOutsideTapRecognizerIfNeeded()
         } else {
             uninstallOutsideTapRecognizer()
@@ -2153,7 +2147,7 @@ class NativeEditorExpoView: ExpoView, EditorTextViewDelegate, UIGestureRecognize
 
     func handleEditorDestroyed(_ editorId: UInt64) {
         guard editorId != 0 else { return }
-        guard richTextView.editorId == editorId || richTextView.textView.editorId == editorId else {
+        guard richTextView.editorId == editorId else {
             NativeEditorViewRegistry.shared.unregister(editorId: editorId, view: self)
             return
         }
@@ -2166,7 +2160,7 @@ class NativeEditorExpoView: ExpoView, EditorTextViewDelegate, UIGestureRecognize
         clearPendingAccessoryRetry()
         clearPendingMentionSuggestionRetry()
         lastMentionEventJSON = nil
-        _ = richTextView.textView.resignFirstResponder()
+        richTextView.blurEditor()
         richTextView.editorId = 0
         mentionQueryState = nil
         _ = accessoryToolbar.setMentionSuggestions([])
@@ -2246,8 +2240,8 @@ class NativeEditorExpoView: ExpoView, EditorTextViewDelegate, UIGestureRecognize
         accessoryToolbar.apply(theme: theme?.toolbar)
         accessoryToolbar.apply(mentionTheme: theme?.mentions ?? addons.mentions?.theme)
         refreshSystemAssistantToolbarIfNeeded()
-        if richTextView.textView.isFirstResponder,
-           (richTextView.textView.inputAccessoryView === accessoryToolbar || shouldUseSystemAssistantToolbar)
+        if richTextView.isEditorFocused,
+           (richTextView.editorInputAccessoryView === accessoryToolbar || shouldUseSystemAssistantToolbar)
         {
             reloadInputViewsAfterPreparingOrRetry()
         }
@@ -2325,10 +2319,10 @@ class NativeEditorExpoView: ExpoView, EditorTextViewDelegate, UIGestureRecognize
     }
 
     private func prepareForInputAccessoryMutationOrRetry(_ action: PendingAccessoryRetryAction) -> Bool {
-        guard richTextView.editorId != 0, richTextView.textView.isFirstResponder else {
+        guard richTextView.editorId != 0, richTextView.isEditorFocused else {
             return true
         }
-        guard richTextView.textView.prepareForExternalEditorUpdate() else {
+        guard richTextView.activeTextView?.markedTextRange == nil else {
             scheduleAccessoryRetry(action)
             return false
         }
@@ -2337,7 +2331,7 @@ class NativeEditorExpoView: ExpoView, EditorTextViewDelegate, UIGestureRecognize
 
     private func reloadInputViewsAfterPreparingOrRetry() {
         guard prepareForInputAccessoryMutationOrRetry(.reloadInputViews) else { return }
-        richTextView.textView.reloadInputViews()
+        richTextView.reloadEditorInputViews()
         markAccessoryMutationSucceeded(.reloadInputViews)
     }
 
@@ -2434,7 +2428,7 @@ class NativeEditorExpoView: ExpoView, EditorTextViewDelegate, UIGestureRecognize
 
     private func hasActiveMentionQueryForCurrentAddons() -> Bool {
         guard richTextView.editorId != 0,
-              richTextView.textView.isFirstResponder,
+              richTextView.isEditorFocused,
               let mentions = addons.mentions
         else {
             return false
@@ -2446,7 +2440,7 @@ class NativeEditorExpoView: ExpoView, EditorTextViewDelegate, UIGestureRecognize
         guard lastAddonsJSON != addonsJson else { return }
         lastAddonsJSON = addonsJson
         addons = NativeEditorAddons.from(json: addonsJson)
-        accessoryToolbar.apply(mentionTheme: richTextView.textView.theme?.mentions ?? addons.mentions?.theme)
+        accessoryToolbar.apply(mentionTheme: richTextView.editorTheme?.mentions ?? addons.mentions?.theme)
         refreshMentionQuery()
     }
 
@@ -2458,9 +2452,9 @@ class NativeEditorExpoView: ExpoView, EditorTextViewDelegate, UIGestureRecognize
 
     func setEditable(_ editable: Bool) {
         if !editable,
-           richTextView.textView.isEditable,
+           richTextView.editorIsEditable,
            richTextView.editorId != 0,
-           !richTextView.textView.prepareForExternalEditorUpdate()
+           richTextView.activeTextView?.markedTextRange != nil
         {
             scheduleEditableRetry(editable)
             return
@@ -2504,19 +2498,36 @@ class NativeEditorExpoView: ExpoView, EditorTextViewDelegate, UIGestureRecognize
     }
 
     func setAutoCapitalize(_ autoCapitalize: String?) {
-        richTextView.textView.setAutoCapitalize(autoCapitalize)
+        let value: UITextAutocapitalizationType
+        switch autoCapitalize {
+        case "none": value = .none
+        case "words": value = .words
+        case "characters": value = .allCharacters
+        default: value = .sentences
+        }
+        richTextView.configureEditorInputTraits(autocapitalizationType: value)
     }
 
     func setAutoCorrect(_ autoCorrect: Bool?) {
-        richTextView.textView.setAutoCorrect(autoCorrect)
+        richTextView.configureEditorInputTraits(autocorrectionType: (autoCorrect ?? false) ? .yes : .no)
     }
 
     func setKeyboardType(_ keyboardType: String?) {
-        richTextView.textView.setKeyboardType(keyboardType)
+        let value: UIKeyboardType
+        switch keyboardType {
+        case "email-address": value = .emailAddress
+        case "numeric", "number-pad": value = .numberPad
+        case "decimal-pad": value = .decimalPad
+        case "phone-pad": value = .phonePad
+        case "url": value = .URL
+        default: value = .default
+        }
+        richTextView.configureEditorInputTraits(keyboardType: value)
     }
 
     func setKeyboardAppearance(_ keyboardAppearance: String?) {
-        richTextView.textView.setKeyboardAppearance(keyboardAppearance)
+        let value: UIKeyboardAppearance = keyboardAppearance == "dark" ? .dark : keyboardAppearance == "light" ? .light : .default
+        richTextView.configureEditorInputTraits(keyboardAppearance: value)
     }
 
     func setShowToolbar(_ showToolbar: Bool) {
@@ -2648,13 +2659,13 @@ class NativeEditorExpoView: ExpoView, EditorTextViewDelegate, UIGestureRecognize
     /// resulting delegate callback is NOT re-dispatched back to JS.
     @discardableResult
     func applyEditorUpdate(_ updateJson: String) -> Bool {
-        guard richTextView.textView.prepareForExternalEditorUpdate() else {
+        guard richTextView.activeTextView?.markedTextRange == nil else {
             scheduleViewCommandUpdateRetry(updateJson)
             return false
         }
         isApplyingJSUpdate = true
         defer { isApplyingJSUpdate = false }
-        richTextView.textView.applyUpdateJSON(updateJson)
+        richTextView.applyEditorUpdate(updateJson)
         return true
     }
 
@@ -2697,23 +2708,22 @@ class NativeEditorExpoView: ExpoView, EditorTextViewDelegate, UIGestureRecognize
     func prepareForEditorCommandJSON() -> String {
         isApplyingJSUpdate = true
         defer { isApplyingJSUpdate = false }
-        let preparation = richTextView.textView.prepareForExternalEditorCommand()
         return NativeEditorViewRegistry.commandPreparationJSON(
-            ready: preparation.ready,
-            updateJSON: preparation.updateJSON,
-            blockedReason: preparation.blockedReason
+            ready: richTextView.activeTextView?.markedTextRange == nil,
+            updateJSON: richTextView.editorId == 0 ? nil : editorGetSelectionState(id: richTextView.editorId),
+            blockedReason: richTextView.activeTextView?.markedTextRange == nil ? nil : "composition"
         )
     }
 
     // MARK: - Focus Commands
 
     func focus() {
-        _ = richTextView.textView.becomeFirstResponder()
+        _ = richTextView.focusEditor()
     }
 
     func blur() {
         clearRecentToolbarTouch()
-        _ = richTextView.textView.resignFirstResponder()
+        richTextView.blurEditor()
     }
 
     func getCaretRectJson() -> String? {
@@ -2742,30 +2752,28 @@ class NativeEditorExpoView: ExpoView, EditorTextViewDelegate, UIGestureRecognize
 
     // MARK: - Focus Notifications
 
-    @objc private func textViewDidBeginEditing(_ notification: Notification) {
+    private func handleTextDidBeginEditing() {
         installOutsideTapRecognizerIfNeeded()
-        richTextView.textView.refreshSelectionVisualState()
         refreshMentionQuery()
         onFocusChange(["isFocused": true])
     }
 
-    @objc private func textViewDidEndEditing(_ notification: Notification) {
+    private func handleTextDidEndEditing() {
         if consumeToolbarFocusPreservationForBlur() {
             DispatchQueue.main.async { [weak self] in
-                _ = self?.richTextView.textView.becomeFirstResponder()
+                _ = self?.richTextView.focusEditor()
             }
             return
         }
 
         uninstallOutsideTapRecognizer()
-        richTextView.textView.refreshSelectionVisualState()
         clearMentionQueryStateAndHidePopover()
         onFocusChange(["isFocused": false])
     }
 
     @objc private func handleOutsideTap(_ recognizer: UITapGestureRecognizer) {
         guard recognizer.state == .ended else { return }
-        guard richTextView.textView.isFirstResponder else { return }
+        guard richTextView.isEditorFocused else { return }
         guard let tapWindow = gestureWindow ?? window else { return }
         let locationInWindow = recognizer.location(in: tapWindow)
         guard shouldHandleOutsideTap(locationInWindow: locationInWindow, touchedView: nil) else {
@@ -2863,9 +2871,7 @@ class NativeEditorExpoView: ExpoView, EditorTextViewDelegate, UIGestureRecognize
         return true
     }
 
-    // MARK: - EditorTextViewDelegate
-
-    func editorTextView(_ textView: EditorTextView, selectionDidChange anchor: UInt32, head: UInt32) {
+    private func handleSelectionChange(anchor: UInt32, head: UInt32) {
         let stateJSON = refreshToolbarStateFromEditorSelection()
         refreshSystemAssistantToolbarIfNeeded()
         refreshMentionQuery()
@@ -2877,7 +2883,7 @@ class NativeEditorExpoView: ExpoView, EditorTextViewDelegate, UIGestureRecognize
         onSelectionChange(event)
     }
 
-    func editorTextView(_ textView: EditorTextView, didReceiveUpdate updateJSON: String) {
+    private func handleEditorUpdate(_ updateJSON: String) {
         if let state = NativeToolbarState(updateJSON: updateJSON) {
             toolbarState = state
             accessoryToolbar.apply(state: state)
@@ -2913,7 +2919,7 @@ class NativeEditorExpoView: ExpoView, EditorTextViewDelegate, UIGestureRecognize
 
     private func refreshMentionQuery() {
         guard richTextView.editorId != 0,
-              richTextView.textView.isFirstResponder,
+              richTextView.isEditorFocused,
               let mentions = addons.mentions
         else {
             clearMentionQueryStateAndHidePopover()
@@ -2929,14 +2935,14 @@ class NativeEditorExpoView: ExpoView, EditorTextViewDelegate, UIGestureRecognize
 
         let suggestions = filteredMentionSuggestions(for: queryState, config: mentions)
         mentionQueryState = queryState
-        accessoryToolbar.apply(mentionTheme: richTextView.textView.theme?.mentions ?? mentions.theme)
+        accessoryToolbar.apply(mentionTheme: richTextView.editorTheme?.mentions ?? mentions.theme)
         let didChangeToolbarHeight = accessoryToolbar.setMentionSuggestions(suggestions)
         refreshSystemAssistantToolbarIfNeeded()
         if didChangeToolbarHeight,
-           richTextView.textView.isFirstResponder,
-           richTextView.textView.inputAccessoryView === accessoryToolbar
+           richTextView.isEditorFocused,
+           richTextView.editorInputAccessoryView === accessoryToolbar
         {
-            richTextView.textView.reloadInputViews()
+            richTextView.reloadEditorInputViews()
         }
         markAccessoryMutationSucceeded(.refreshMentionQuery)
         emitMentionQueryChange(
@@ -2954,10 +2960,10 @@ class NativeEditorExpoView: ExpoView, EditorTextViewDelegate, UIGestureRecognize
         let didChangeToolbarHeight = accessoryToolbar.setMentionSuggestions([])
         refreshSystemAssistantToolbarIfNeeded()
         if didChangeToolbarHeight,
-           richTextView.textView.isFirstResponder,
-           richTextView.textView.inputAccessoryView === accessoryToolbar
+           richTextView.isEditorFocused,
+           richTextView.editorInputAccessoryView === accessoryToolbar
         {
-            richTextView.textView.reloadInputViews()
+            richTextView.reloadEditorInputViews()
         }
         markAccessoryMutationSucceeded(.clearMentionQueryState)
     }
@@ -3091,15 +3097,16 @@ class NativeEditorExpoView: ExpoView, EditorTextViewDelegate, UIGestureRecognize
     }
 
     private func currentMentionQueryState(trigger: String) -> MentionQueryState? {
-        guard let selectedTextRange = richTextView.textView.selectedTextRange,
+        guard let activeTextView = richTextView.activeTextView,
+              let selectedTextRange = activeTextView.selectedTextRange,
               selectedTextRange.isEmpty
         else {
             return nil
         }
 
-        let currentText = richTextView.textView.text ?? ""
-        let cursorUtf16Offset = richTextView.textView.offset(
-            from: richTextView.textView.beginningOfDocument,
+        let currentText = activeTextView.text ?? ""
+        let cursorUtf16Offset = activeTextView.offset(
+            from: activeTextView.beginningOfDocument,
             to: selectedTextRange.start
         )
         let visibleCursorScalar = PositionBridge.utf16OffsetToScalar(
@@ -3114,7 +3121,7 @@ class NativeEditorExpoView: ExpoView, EditorTextViewDelegate, UIGestureRecognize
             isCaretInsideMention: isCaretInsideMention(
                 cursorScalar: PositionBridge.textViewToScalar(
                     selectedTextRange.start,
-                    in: richTextView.textView
+                    in: activeTextView
                 )
             )
         ) else {
@@ -3130,39 +3137,22 @@ class NativeEditorExpoView: ExpoView, EditorTextViewDelegate, UIGestureRecognize
             in: currentText
         )
 
+        guard let anchorDoc = richTextView.activeDocPosition(forUTF16Offset: anchorUtf16Offset),
+              let headDoc = richTextView.activeDocPosition(forUTF16Offset: headUtf16Offset)
+        else { return nil }
         return MentionQueryState(
             query: visibleQueryState.query,
             trigger: visibleQueryState.trigger,
-            anchor: PositionBridge.utf16OffsetToScalar(
-                anchorUtf16Offset,
-                in: richTextView.textView
-            ),
-            head: PositionBridge.utf16OffsetToScalar(
-                headUtf16Offset,
-                in: richTextView.textView
-            )
+            anchor: editorDocToScalar(id: richTextView.editorId, docPos: anchorDoc),
+            head: editorDocToScalar(id: richTextView.editorId, docPos: headDoc)
         )
     }
 
     private func isCaretInsideMention(cursorScalar: UInt32) -> Bool {
-        let utf16Offset = PositionBridge.scalarToUtf16Offset(
-            cursorScalar,
-            in: richTextView.textView.text ?? ""
-        )
-        let textStorage = richTextView.textView.textStorage
-        guard textStorage.length > 0 else { return false }
-        let candidateOffsets = [
-            min(max(utf16Offset, 0), max(textStorage.length - 1, 0)),
-            min(max(utf16Offset - 1, 0), max(textStorage.length - 1, 0)),
-        ]
-
-        for offset in candidateOffsets where offset >= 0 && offset < textStorage.length {
-            if let nodeType = textStorage.attribute(InputCoordinatorAttributes.voidNodeType, at: offset, effectiveRange: nil) as? String,
-               nodeType == "mention" {
-                return true
-            }
-        }
-        return false
+        guard let activeTextView = richTextView.activeTextView else { return false }
+        let utf16Offset = PositionBridge.scalarToUtf16Offset(cursorScalar, in: activeTextView.text ?? "")
+        return richTextView.activeInlineAtomType(atUTF16Offset: utf16Offset) == "mention"
+            || richTextView.activeInlineAtomType(atUTF16Offset: max(0, utf16Offset - 1)) == "mention"
     }
 
     private func insertMentionSuggestion(
@@ -3200,8 +3190,9 @@ class NativeEditorExpoView: ExpoView, EditorTextViewDelegate, UIGestureRecognize
             clearMentionQueryStateAndHidePopover()
             return
         }
-        let preparation = richTextView.textView.prepareForExternalEditorCommand()
-        guard preparation.ready else {
+        let compositionActive = richTextView.activeTextView?.markedTextRange != nil
+        let preflightUpdateJSON = editorGetSelectionState(id: richTextView.editorId)
+        guard !compositionActive else {
             scheduleMentionSuggestionRetry(
                 PendingMentionSuggestionRetry(
                     suggestionKey: suggestionKey,
@@ -3211,13 +3202,13 @@ class NativeEditorExpoView: ExpoView, EditorTextViewDelegate, UIGestureRecognize
                     anchor: scopedQueryState.anchor,
                     head: scopedQueryState.head,
                     documentVersion: currentDocumentVersion(),
-                    textSnapshot: richTextView.textView.text ?? ""
+                    textSnapshot: richTextView.activeTextView?.text ?? ""
                 )
             )
             return
         }
         let queryState = currentMentionQueryState(trigger: mentions.trigger)
-            ?? (richTextView.textView.isFirstResponder ? nil : mentionQueryState)
+            ?? (richTextView.isEditorFocused ? nil : mentionQueryState)
         guard let queryState else {
             clearMentionQueryStateAndHidePopover()
             return
@@ -3226,8 +3217,8 @@ class NativeEditorExpoView: ExpoView, EditorTextViewDelegate, UIGestureRecognize
            !doesMentionQueryState(
                 queryState,
                 match: retryScope,
-                acceptingPreflightDocumentVersion: documentVersion(fromUpdateJSON: preparation.updateJSON),
-                currentText: richTextView.textView.text ?? ""
+                acceptingPreflightDocumentVersion: documentVersion(fromUpdateJSON: preflightUpdateJSON),
+                currentText: richTextView.activeTextView?.text ?? ""
            )
         {
             return
@@ -3248,7 +3239,7 @@ class NativeEditorExpoView: ExpoView, EditorTextViewDelegate, UIGestureRecognize
                 suggestion: currentSuggestion,
                 attrs: attrs,
                 range: queryState,
-                preflightUpdateJSON: preparation.updateJSON
+                preflightUpdateJSON: preflightUpdateJSON
             )
             lastMentionEventJSON = nil
             clearMentionQueryStateAndHidePopover()
@@ -3273,7 +3264,8 @@ class NativeEditorExpoView: ExpoView, EditorTextViewDelegate, UIGestureRecognize
             scalarHead: queryState.head,
             json: json
         )
-        richTextView.textView.applyUpdateJSON(updateJSON)
+        richTextView.applyEditorUpdate(updateJSON)
+        handleEditorUpdate(updateJSON)
         emitMentionSelect(trigger: mentions.trigger, suggestion: currentSuggestion, attrs: attrs)
         lastMentionEventJSON = nil
         clearMentionQueryStateAndHidePopover()
@@ -3477,15 +3469,15 @@ class NativeEditorExpoView: ExpoView, EditorTextViewDelegate, UIGestureRecognize
     }
 
     func inputAccessoryViewForTesting() -> UIView? {
-        richTextView.textView.inputAccessoryView
+        richTextView.editorInputAccessoryView
     }
 
     func isUsingAccessoryToolbarForTesting() -> Bool {
-        richTextView.textView.inputAccessoryView === accessoryToolbar
+        richTextView.editorInputAccessoryView === accessoryToolbar
     }
 
     func isUsingAccessoryPlaceholderForTesting() -> Bool {
-        richTextView.textView.inputAccessoryView === accessoryPlaceholder
+        richTextView.editorInputAccessoryView === accessoryPlaceholder
     }
 
     func markRecentToolbarTouchForTesting() {
@@ -3516,19 +3508,19 @@ class NativeEditorExpoView: ExpoView, EditorTextViewDelegate, UIGestureRecognize
         let nextAccessoryView: UIView?
         if showsToolbar &&
             toolbarPlacement == "keyboard" &&
-            richTextView.textView.isEditable &&
+            richTextView.editorIsEditable &&
             !shouldUseSystemAssistantToolbar
         {
             nextAccessoryView = accessoryToolbar
-        } else if richTextView.textView.isEditable && !shouldUseSystemAssistantToolbar {
+        } else if richTextView.editorIsEditable && !shouldUseSystemAssistantToolbar {
             nextAccessoryView = accessoryPlaceholder
         } else {
             nextAccessoryView = nil
         }
-        if richTextView.textView.inputAccessoryView !== nextAccessoryView {
-            richTextView.textView.inputAccessoryView = nextAccessoryView
-            if richTextView.textView.isFirstResponder {
-                richTextView.textView.reloadInputViews()
+        if richTextView.editorInputAccessoryView !== nextAccessoryView {
+            richTextView.setEditorInputAccessoryView(nextAccessoryView)
+            if richTextView.isEditorFocused {
+                richTextView.reloadEditorInputViews()
             }
         }
         markAccessoryMutationSucceeded(.updateAccessoryToolbarVisibility)
@@ -3541,7 +3533,7 @@ class NativeEditorExpoView: ExpoView, EditorTextViewDelegate, UIGestureRecognize
     private func refreshSystemAssistantToolbarIfNeeded() {
         guard #available(iOS 26.0, *) else { return }
 
-        let assistantItem = richTextView.textView.inputAssistantItem
+        guard let assistantItem = richTextView.editorInputAssistantItem else { return }
         assistantItem.allowsHidingShortcuts = false
         assistantItem.leadingBarButtonGroups = []
         assistantItem.trailingBarButtonGroups = []
@@ -3549,38 +3541,43 @@ class NativeEditorExpoView: ExpoView, EditorTextViewDelegate, UIGestureRecognize
 
     private func handleListToggle(_ listType: String) {
         let isActive = toolbarState.nodes[listType] == true
-        richTextView.textView.performToolbarToggleList(listType, isActive: isActive)
+        guard richTextView.editorId != 0 else { return }
+        _ = richTextView.performEditorCommand {
+            isActive
+                ? editorUnwrapFromList(id: richTextView.editorId)
+                : editorWrapInList(id: richTextView.editorId, listType: listType)
+        }
     }
 
     private func handleToolbarItemPress(_ item: NativeToolbarItem) {
         switch item.type {
         case .mark:
             guard let mark = item.mark else { return }
-            richTextView.textView.performToolbarToggleMark(mark)
+            _ = richTextView.performEditorCommand { editorToggleMark(id: richTextView.editorId, markName: mark) }
         case .heading:
             guard let level = item.headingLevel else { return }
-            richTextView.textView.performToolbarToggleHeading(level)
+            _ = richTextView.performEditorCommand { editorToggleHeading(id: richTextView.editorId, level: UInt8(level)) }
         case .blockquote:
-            richTextView.textView.performToolbarToggleBlockquote()
+            _ = richTextView.performEditorCommand { editorToggleBlockquote(id: richTextView.editorId) }
         case .list:
             guard let listType = item.listType?.rawValue else { return }
             handleListToggle(listType)
         case .command:
             switch item.command {
             case .indentList:
-                richTextView.textView.performToolbarIndentListItem()
+                _ = richTextView.performEditorCommand { editorIndentListItem(id: richTextView.editorId) }
             case .outdentList:
-                richTextView.textView.performToolbarOutdentListItem()
+                _ = richTextView.performEditorCommand { editorOutdentListItem(id: richTextView.editorId) }
             case .undo:
-                richTextView.textView.performToolbarUndo()
+                _ = richTextView.performEditorCommand { editorUndo(id: richTextView.editorId) }
             case .redo:
-                richTextView.textView.performToolbarRedo()
+                _ = richTextView.performEditorCommand { editorRedo(id: richTextView.editorId) }
             case .none:
                 break
             }
         case .node:
             guard let nodeType = item.nodeType else { return }
-            richTextView.textView.performToolbarInsertNode(nodeType)
+            _ = richTextView.performEditorCommand { editorInsertNode(id: richTextView.editorId, nodeType: nodeType) }
         case .action:
             guard let key = item.key else { return }
             onToolbarAction(["key": key])