Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: prevent surrogate pairs from being split by the selected range #1226

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/test/system.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,6 @@ import "test/system/level_2_input_test"
import "test/system/list_formatting_test"
import "test/system/mutation_input_test"
import "test/system/pasting_test"
import "test/system/set_selected_range_test"
import "test/system/text_formatting_test"
import "test/system/undo_test"
193 changes: 193 additions & 0 deletions src/test/system/set_selected_range_test.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,193 @@
import { assert, insertString, test, testGroup } from "test/test_helper"

testGroup(
"Set selected range at the start of the text",
{ template: "editor_empty" },
() => {
test("selection of the surrogate pair", () => {
insertString("🙂foo")
getComposition().setSelectedRange([ 0, 2 ])
assert.selectedRange([ 0, 2 ])
})

test("selection of the first surrogate pair character", () => {
insertString("🙂foo")
getComposition().setSelectedRange([ 0, 1 ])
assert.selectedRange([ 0, 2 ])
})

test("selection of the second surrogate pair character", () => {
insertString("🙂foo")
getComposition().setSelectedRange([ 1, 2 ])
assert.selectedRange([ 2, 2 ])
})

test("collapssed selection in the middle of the surrogate pair", () => {
insertString("🙂foo")
getComposition().setSelectedRange([ 1, 1 ])
assert.selectedRange([ 2, 2 ])
})

test("collapsed selection after surrogate pair", () => {
insertString("🙂foo")
getComposition().setSelectedRange([ 2, 2 ])
assert.selectedRange([ 2, 2 ])
})

test("selection after surrogate pair", () => {
insertString("🙂foo")
getComposition().setSelectedRange([ 2, 4 ])
assert.selectedRange([ 2, 4 ])
})

test("collapsed selection far after surrogate pair", () => {
insertString("🙂foo")
getComposition().setSelectedRange([ 3, 3 ])
assert.selectedRange([ 3, 3 ])
})

test("selection far after surrogate pair", () => {
insertString("🙂foo")
getComposition().setSelectedRange([ 3, 5 ])
assert.selectedRange([ 3, 5 ])
})
},
)

testGroup(
"Set selected range in the middle of the text",
{ template: "editor_empty" },
() => {
test("collapsed selection far before surrogate pair", () => {
insertString("foo🙂bar")
getComposition().setSelectedRange([ 2, 2 ])
assert.selectedRange([ 2, 2 ])
})

test("selection far before surrogate pair", () => {
insertString("foo🙂bar")
getComposition().setSelectedRange([ 0, 2 ])
assert.selectedRange([ 0, 2 ])
})

test("collapsed selection before surrogate pair", () => {
insertString("foo🙂bar")
getComposition().setSelectedRange([ 3, 3 ])
assert.selectedRange([ 3, 3 ])
})

test("selection before surrogate pair", () => {
insertString("foo🙂bar")
getComposition().setSelectedRange([ 1, 3 ])
assert.selectedRange([ 1, 3 ])
})

test("selection of the surrogate pair", () => {
insertString("foo🙂bar")
getComposition().setSelectedRange([ 3, 5 ])
assert.selectedRange([ 3, 5 ])
})

test("selection of the first surrogate pair character", () => {
insertString("foo🙂bar")
getComposition().setSelectedRange([ 3, 4 ])
assert.selectedRange([ 3, 5 ])
})

test("selection of the second surrogate pair character", () => {
insertString("foo🙂bar")
getComposition().setSelectedRange([ 4, 5 ])
assert.selectedRange([ 5, 5 ])
})

test("collapssed selection in the middle of the surrogate pair", () => {
insertString("foo🙂bar")
getComposition().setSelectedRange([ 4, 4 ])
assert.selectedRange([ 5, 5 ])
})

test("selection after surrogate pair", () => {
insertString("foo🙂bar")
getComposition().setSelectedRange([ 5, 7 ])
assert.selectedRange([ 5, 7 ])
})

test("collapsed selection after surrogate pair", () => {
insertString("foo🙂bar")
getComposition().setSelectedRange([ 5, 5 ])
assert.selectedRange([ 5, 5 ])
})

test("selection far after surrogate pair", () => {
insertString("foo🙂bar")
getComposition().setSelectedRange([ 6, 8 ])
assert.selectedRange([ 6, 8 ])
})

test("collapsed selection far after surrogate pair", () => {
insertString("foo🙂bar")
getComposition().setSelectedRange([ 6, 6 ])
assert.selectedRange([ 6, 6 ])
})
},
)

testGroup(
"Set selected range at the end of the text",
{ template: "editor_empty" },
() => {
test("collapsed selection far before surrogate pair", () => {
insertString("foo🙂")
getComposition().setSelectedRange([ 2, 2 ])
assert.selectedRange([ 2, 2 ])
})

test("selection far before surrogate pair", () => {
insertString("foo🙂")
getComposition().setSelectedRange([ 0, 2 ])
assert.selectedRange([ 0, 2 ])
})

test("collapsed selection before surrogate pair", () => {
insertString("foo🙂")
getComposition().setSelectedRange([ 3, 3 ])
assert.selectedRange([ 3, 3 ])
})

test("selection before surrogate pair", () => {
insertString("foo🙂")
getComposition().setSelectedRange([ 1, 3 ])
assert.selectedRange([ 1, 3 ])
})

test("selection of the surrogate pair", () => {
insertString("foo🙂")
getComposition().setSelectedRange([ 3, 5 ])
assert.selectedRange([ 3, 5 ])
})

test("selection of the first surrogate pair character", () => {
insertString("foo🙂")
getComposition().setSelectedRange([ 3, 4 ])
assert.selectedRange([ 3, 5 ])
})

test("selection of the second surrogate pair character", () => {
insertString("foo🙂")
getComposition().setSelectedRange([ 4, 5 ])
assert.selectedRange([ 5, 5 ])
})

test("collapssed selection in the middle of the surrogate pair", () => {
insertString("foo🙂")
getComposition().setSelectedRange([ 4, 4 ])
assert.selectedRange([ 5, 5 ])
})

test("collapsed selection after surrogate pair", () => {
insertString("foo🙂")
getComposition().setSelectedRange([ 5, 5 ])
assert.selectedRange([ 5, 5 ])
})
},
)
13 changes: 12 additions & 1 deletion src/trix/models/composition.js
Original file line number Diff line number Diff line change
Expand Up @@ -521,7 +521,18 @@ export default class Composition extends BasicObject {
}

setSelectedRange(selectedRange) {
const locationRange = this.document.locationRangeFromRange(selectedRange)
const [ start, end ] = normalizeRange(selectedRange)

// Make sure that surrogate pairs are always selected both or neither.
const correctedSelectedRange = [
this.translateUTF16PositionFromOffset(start, 0),
this.translateUTF16PositionFromOffset(end, 0),
]

const locationRange = this.document.locationRangeFromRange(
correctedSelectedRange,
)

return this.getSelectionManager().setLocationRange(locationRange)
}

Expand Down