erabo/spiegel-keyman
1
0
Fork 0
mirror of https://github.com/keymanapp/keyman.git synced 2026-08-31 12:47:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

fix(ios): proper context synchronization for combo emoji deletion

Browse source
This commit is contained in:
jahorton 2021-04-21 10:46:08 +07:00
parent 8709f442e2
commit 681d5d9bbb
1 changed files with 12 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
ios/engine/KMEI/KeymanEngine/Classes/InputViewController.swift
View file

@ -371,13 +371,18 @@ open class InputViewController: UIInputViewController, KeymanWebDelegate {
textDocumentProxy.deleteBackward()
let newContext = textDocumentProxy.documentContextBeforeInput ?? ""
let unitsDeleted = oldContext.utf16.count - newContext.utf16.count
if unitsDeleted > 1 {
if !InputViewController.isSurrogate(oldContext.utf16.last!) {
let lowerIndex = oldContext.utf16.index(oldContext.utf16.startIndex,
offsetBy: newContext.utf16.count)
let upperIndex = oldContext.utf16.index(lowerIndex, offsetBy: unitsDeleted - 1)
textDocumentProxy.insertText(String(oldContext[lowerIndex..<upperIndex]))
}
let unitsInPoint = InputViewController.isSurrogate(oldContext.utf16.last!) ? 2 : 1
// This CAN happen when a surrogate pair is deleted.
// For example, the emoji 👍🏻 is made of TWO surrogate pairs.
// Apple's .deleteBackward() implementation will delete both simultaneously,
// but our internal KMW engine can't do that b/c it's not emoji-aware.
if unitsDeleted > unitsInPoint {
// Delete only that many units.
let lowerIndex = oldContext.utf16.index(oldContext.utf16.startIndex,
offsetBy: newContext.utf16.count)
let upperIndex = oldContext.utf16.index(lowerIndex, offsetBy: unitsDeleted - unitsInPoint)
textDocumentProxy.insertText(String(oldContext[lowerIndex..<upperIndex]))
}
// Refer to `func textDidChange()` and https://github.com/keymanapp/keyman/pull/2770 for context.