Merge pull request #1894 from anyproto/ios-247-incorrect-cursor-posit…

…ion-when-we-delete-block-after-block IOS-247 Editor | Incorrect cursor position when we delete block after block with emoji
anyproto · Aug 9, 2024 · 775117f · 775117f
2 parents 42b434d + 4255681
commit 775117f
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/...Sources/ServiceLayer/Block/BlockActionHandler/BlockActionService/BlockActionService.swift b/...Sources/ServiceLayer/Block/BlockActionHandler/BlockActionService/BlockActionService.swift
@@ -127,9 +127,9 @@ final class BlockActionService: BlockActionServiceProtocol {
         if let textContent = previousBlock.info.textContent {
             cursorManager.focus(
                 at: previousBlock.blockId,
-                position: .at(.init(location: Int(textContent.text.count), length: 0))
+                position: .at(NSRange(location: Int(textContent.text.utf16.count), length: 0))
             )
-            cursorManager.blockFocus = BlockFocus(id: previousBlock.blockId, position: .at(NSRange(location: textContent.text.count, length: 0)))
+            cursorManager.blockFocus = BlockFocus(id: previousBlock.blockId, position: .at(NSRange(location: textContent.text.utf16.count, length: 0)))
         }
         try await textServiceHandler.merge(contextId: documentId, firstBlockId: previousBlock.blockId, secondBlockId: secondBlockId)
     }