DEV/flutter_flutter
1
0
Fork 0
mirror of https://github.com/flutter/flutter.git synced 2026-02-20 02:29:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

Separate mutators for text and selection (#21612)

Browse Source 
Previously, TextInputModel's SetEditingState method was a 1:1 mapping of
the underlying protocol used on the text input channel between the
framework and the engine. This breaks it up into two methods, which
allows the selection to be updated independently of the text, and avoids
tying the API the the underlying protocol.

This will become more important when we add additional state to support
composing regions for multi-step input methods such as those used for
Japanese.

SetText resets the selection rather than making a best-efforts attempt
to preserve it. This choice was primarily to keep the code simple and
make the API easier to reason about. An alternative would have been to
make a best-effort attempt to preserve the selection, potentially
clamping one or both to the end of the new string. In all cases where an
embedder resets the string, it is expected that they also have the
selection, so can call SetSelection with an updated selection if needed.
This commit is contained in:
Chris Bracken 2020-10-06 11:07:21 -07:00 committed by GitHub
parent 8842e502ef
commit 7e6191de07
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 194 additions and 95 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
shell/platform/common/cpp/text_input_model.cc
View File

@ -35,17 +35,20 @@ TextInputModel::TextInputModel()
TextInputModel::~TextInputModel() = default;
bool TextInputModel::SetEditingState(size_t selection_base,
size_t selection_extent,
const std::string& text) {
if (selection_base > text.size() || selection_extent > text.size()) {
return false;
}
void TextInputModel::SetText(const std::string& text) {
std::wstring_convert<std::codecvt_utf8_utf16<char16_t>, char16_t>
utf16_converter;
text_ = utf16_converter.from_bytes(text);
selection_base_ = text_.begin() + selection_base;
selection_extent_ = text_.begin() + selection_extent;
selection_base_ = text_.begin();
selection_extent_ = selection_base_;
}
bool TextInputModel::SetSelection(size_t base, size_t extent) {
if (base > text_.size() || extent > text_.size()) {
return false;
}
selection_base_ = text_.begin() + base;
selection_extent_ = text_.begin() + extent;
return true;
}

14
shell/platform/common/cpp/text_input_model.h
View File

@ -17,13 +17,15 @@ class TextInputModel {
TextInputModel();
virtual ~TextInputModel();
// Attempts to set the text state.
// Sets the text.
//
// Returns false if the state is not valid (base or extent are out of
// bounds, or base is less than extent).
bool SetEditingState(size_t selection_base,
size_t selection_extent,
const std::string& text);
// Resets the selection base and extent.
void SetText(const std::string& text);
// Attempts to set the text selection.
//
// Returns false if the base or extent are out of bounds.
bool SetSelection(size_t base, size_t extent);
// Adds a Unicode code point.
//

247
shell/platform/common/cpp/text_input_model_unittests.cc
View File

@ -12,59 +12,94 @@
namespace flutter {
TEST(TextInputModel, SetEditingStateStart) {
TEST(TextInputModel, SetText) {
auto model = std::make_unique<TextInputModel>();
EXPECT_TRUE(model->SetEditingState(0, 0, "ABCDE"));
model->SetText("ABCDE");
EXPECT_STREQ(model->GetText().c_str(), "ABCDE");
}
TEST(TextInputModel, SetTextWideCharacters) {
auto model = std::make_unique<TextInputModel>();
model->SetText("😄🙃🤪🧐");
EXPECT_STREQ(model->GetText().c_str(), "😄🙃🤪🧐");
}
TEST(TextInputModel, SetTextEmpty) {
auto model = std::make_unique<TextInputModel>();
model->SetText("");
EXPECT_STREQ(model->GetText().c_str(), "");
}
TEST(TextInputModel, SetTextReplaceText) {
auto model = std::make_unique<TextInputModel>();
model->SetText("ABCDE");
EXPECT_STREQ(model->GetText().c_str(), "ABCDE");
model->SetText("");
EXPECT_STREQ(model->GetText().c_str(), "");
}
TEST(TextInputModel, SetTextResetsSelection) {
auto model = std::make_unique<TextInputModel>();
model->SetText("ABCDE");
EXPECT_TRUE(model->SetSelection(3, 3));
EXPECT_EQ(model->selection_base(), 3);
EXPECT_EQ(model->selection_extent(), 3);
model->SetText("FGHJI");
EXPECT_EQ(model->selection_base(), 0);
EXPECT_EQ(model->selection_extent(), 0);
}
TEST(TextInputModel, SetSelectionStart) {
auto model = std::make_unique<TextInputModel>();
model->SetText("ABCDE");
EXPECT_TRUE(model->SetSelection(0, 0));
EXPECT_EQ(model->selection_base(), 0);
EXPECT_EQ(model->selection_extent(), 0);
EXPECT_STREQ(model->GetText().c_str(), "ABCDE");
}
TEST(TextInputModel, SetEditingMiddle) {
TEST(TextInputModel, SetSelectionMiddle) {
auto model = std::make_unique<TextInputModel>();
EXPECT_TRUE(model->SetEditingState(2, 2, "ABCDE"));
model->SetText("ABCDE");
EXPECT_TRUE(model->SetSelection(2, 2));
EXPECT_EQ(model->selection_base(), 2);
EXPECT_EQ(model->selection_extent(), 2);
EXPECT_STREQ(model->GetText().c_str(), "ABCDE");
}
TEST(TextInputModel, SetEditingStateEnd) {
TEST(TextInputModel, SetSelectionEnd) {
auto model = std::make_unique<TextInputModel>();
EXPECT_TRUE(model->SetEditingState(5, 5, "ABCDE"));
model->SetText("ABCDE");
EXPECT_TRUE(model->SetSelection(5, 5));
EXPECT_EQ(model->selection_base(), 5);
EXPECT_EQ(model->selection_extent(), 5);
EXPECT_STREQ(model->GetText().c_str(), "ABCDE");
}
TEST(TextInputModel, SetEditingStateSelection) {
TEST(TextInputModel, SetSelectionWthExtent) {
auto model = std::make_unique<TextInputModel>();
EXPECT_TRUE(model->SetEditingState(1, 4, "ABCDE"));
model->SetText("ABCDE");
EXPECT_TRUE(model->SetSelection(1, 4));
EXPECT_EQ(model->selection_base(), 1);
EXPECT_EQ(model->selection_extent(), 4);
EXPECT_STREQ(model->GetText().c_str(), "ABCDE");
}
TEST(TextInputModel, SetEditingStateReverseSelection) {
TEST(TextInputModel, SetSelectionReverseExtent) {
auto model = std::make_unique<TextInputModel>();
EXPECT_TRUE(model->SetEditingState(4, 1, "ABCDE"));
model->SetText("ABCDE");
EXPECT_TRUE(model->SetSelection(4, 1));
EXPECT_EQ(model->selection_base(), 4);
EXPECT_EQ(model->selection_extent(), 1);
EXPECT_STREQ(model->GetText().c_str(), "ABCDE");
}
TEST(TextInputModel, SetEditingStateOutsideString) {
TEST(TextInputModel, SetSelectionOutsideString) {
auto model = std::make_unique<TextInputModel>();
EXPECT_FALSE(model->SetEditingState(4, 6, "ABCDE"));
EXPECT_FALSE(model->SetEditingState(5, 6, "ABCDE"));
EXPECT_FALSE(model->SetEditingState(6, 6, "ABCDE"));
}
TEST(TextInputModel, SetEditingStateWideCharacters) {
auto model = std::make_unique<TextInputModel>();
EXPECT_TRUE(model->SetEditingState(0, 0, "😄🙃🤪🧐"));
EXPECT_EQ(model->selection_base(), 0);
EXPECT_EQ(model->selection_extent(), 0);
EXPECT_STREQ(model->GetText().c_str(), "😄🙃🤪🧐");
model->SetText("ABCDE");
EXPECT_FALSE(model->SetSelection(4, 6));
EXPECT_FALSE(model->SetSelection(5, 6));
EXPECT_FALSE(model->SetSelection(6, 6));
}
TEST(TextInputModel, AddCodePoint) {
@ -81,7 +116,8 @@ TEST(TextInputModel, AddCodePoint) {
TEST(TextInputModel, AddCodePointSelection) {
auto model = std::make_unique<TextInputModel>();
EXPECT_TRUE(model->SetEditingState(1, 4, "ABCDE"));
model->SetText("ABCDE");
EXPECT_TRUE(model->SetSelection(1, 4));
model->AddCodePoint('x');
EXPECT_EQ(model->selection_base(), 2);
EXPECT_EQ(model->selection_extent(), 2);
@ -90,7 +126,8 @@ TEST(TextInputModel, AddCodePointSelection) {
TEST(TextInputModel, AddCodePointReverseSelection) {
auto model = std::make_unique<TextInputModel>();
EXPECT_TRUE(model->SetEditingState(4, 1, "ABCDE"));
model->SetText("ABCDE");
EXPECT_TRUE(model->SetSelection(4, 1));
model->AddCodePoint('x');
EXPECT_EQ(model->selection_base(), 2);
EXPECT_EQ(model->selection_extent(), 2);
@ -99,7 +136,8 @@ TEST(TextInputModel, AddCodePointReverseSelection) {
TEST(TextInputModel, AddCodePointSelectionWideCharacter) {
auto model = std::make_unique<TextInputModel>();
EXPECT_TRUE(model->SetEditingState(1, 4, "ABCDE"));
model->SetText("ABCDE");
EXPECT_TRUE(model->SetSelection(1, 4));
model->AddCodePoint(0x1f604);
EXPECT_EQ(model->selection_base(), 3);
EXPECT_EQ(model->selection_extent(), 3);
@ -108,7 +146,8 @@ TEST(TextInputModel, AddCodePointSelectionWideCharacter) {
TEST(TextInputModel, AddCodePointReverseSelectionWideCharacter) {
auto model = std::make_unique<TextInputModel>();
EXPECT_TRUE(model->SetEditingState(4, 1, "ABCDE"));
model->SetText("ABCDE");
EXPECT_TRUE(model->SetSelection(4, 1));
model->AddCodePoint(0x1f604);
EXPECT_EQ(model->selection_base(), 3);
EXPECT_EQ(model->selection_extent(), 3);
@ -127,7 +166,8 @@ TEST(TextInputModel, AddText) {
TEST(TextInputModel, AddTextSelection) {
auto model = std::make_unique<TextInputModel>();
EXPECT_TRUE(model->SetEditingState(1, 4, "ABCDE"));
model->SetText("ABCDE");
EXPECT_TRUE(model->SetSelection(1, 4));
model->AddText("xy");
EXPECT_EQ(model->selection_base(), 3);
EXPECT_EQ(model->selection_extent(), 3);
@ -136,7 +176,8 @@ TEST(TextInputModel, AddTextSelection) {
TEST(TextInputModel, AddTextReverseSelection) {
auto model = std::make_unique<TextInputModel>();
EXPECT_TRUE(model->SetEditingState(4, 1, "ABCDE"));
model->SetText("ABCDE");
EXPECT_TRUE(model->SetSelection(4, 1));
model->AddText("xy");
EXPECT_EQ(model->selection_base(), 3);
EXPECT_EQ(model->selection_extent(), 3);
@ -145,7 +186,8 @@ TEST(TextInputModel, AddTextReverseSelection) {
TEST(TextInputModel, AddTextSelectionWideCharacter) {
auto model = std::make_unique<TextInputModel>();
EXPECT_TRUE(model->SetEditingState(1, 4, "ABCDE"));
model->SetText("ABCDE");
EXPECT_TRUE(model->SetSelection(1, 4));
model->AddText(u"😄🙃");
EXPECT_EQ(model->selection_base(), 5);
EXPECT_EQ(model->selection_extent(), 5);
@ -154,7 +196,8 @@ TEST(TextInputModel, AddTextSelectionWideCharacter) {
TEST(TextInputModel, AddTextReverseSelectionWideCharacter) {
auto model = std::make_unique<TextInputModel>();
EXPECT_TRUE(model->SetEditingState(4, 1, "ABCDE"));
model->SetText("ABCDE");
EXPECT_TRUE(model->SetSelection(4, 1));
model->AddText(u"😄🙃");
EXPECT_EQ(model->selection_base(), 5);
EXPECT_EQ(model->selection_extent(), 5);
@ -163,7 +206,8 @@ TEST(TextInputModel, AddTextReverseSelectionWideCharacter) {
TEST(TextInputModel, DeleteStart) {
auto model = std::make_unique<TextInputModel>();
EXPECT_TRUE(model->SetEditingState(0, 0, "ABCDE"));
model->SetText("ABCDE");
EXPECT_TRUE(model->SetSelection(0, 0));
ASSERT_TRUE(model->Delete());
EXPECT_EQ(model->selection_base(), 0);
EXPECT_EQ(model->selection_extent(), 0);
@ -172,7 +216,8 @@ TEST(TextInputModel, DeleteStart) {
TEST(TextInputModel, DeleteMiddle) {
auto model = std::make_unique<TextInputModel>();
EXPECT_TRUE(model->SetEditingState(2, 2, "ABCDE"));
model->SetText("ABCDE");
EXPECT_TRUE(model->SetSelection(2, 2));
ASSERT_TRUE(model->Delete());
EXPECT_EQ(model->selection_base(), 2);
EXPECT_EQ(model->selection_extent(), 2);
@ -181,7 +226,8 @@ TEST(TextInputModel, DeleteMiddle) {
TEST(TextInputModel, DeleteEnd) {
auto model = std::make_unique<TextInputModel>();
EXPECT_TRUE(model->SetEditingState(5, 5, "ABCDE"));
model->SetText("ABCDE");
EXPECT_TRUE(model->SetSelection(5, 5));
ASSERT_FALSE(model->Delete());
EXPECT_EQ(model->selection_base(), 5);
EXPECT_EQ(model->selection_extent(), 5);
@ -190,7 +236,8 @@ TEST(TextInputModel, DeleteEnd) {
TEST(TextInputModel, DeleteWideCharacters) {
auto model = std::make_unique<TextInputModel>();
EXPECT_TRUE(model->SetEditingState(4, 4, "😄🙃🤪🧐"));
model->SetText("😄🙃🤪🧐");
EXPECT_TRUE(model->SetSelection(4, 4));
ASSERT_TRUE(model->Delete());
EXPECT_EQ(model->selection_base(), 4);
EXPECT_EQ(model->selection_extent(), 4);
@ -199,7 +246,8 @@ TEST(TextInputModel, DeleteWideCharacters) {
TEST(TextInputModel, DeleteSelection) {
auto model = std::make_unique<TextInputModel>();
EXPECT_TRUE(model->SetEditingState(1, 4, "ABCDE"));
model->SetText("ABCDE");
EXPECT_TRUE(model->SetSelection(1, 4));
ASSERT_TRUE(model->Delete());
EXPECT_EQ(model->selection_base(), 1);
EXPECT_EQ(model->selection_extent(), 1);
@ -208,7 +256,8 @@ TEST(TextInputModel, DeleteSelection) {
TEST(TextInputModel, DeleteReverseSelection) {
auto model = std::make_unique<TextInputModel>();
EXPECT_TRUE(model->SetEditingState(4, 1, "ABCDE"));
model->SetText("ABCDE");
EXPECT_TRUE(model->SetSelection(4, 1));
ASSERT_TRUE(model->Delete());
EXPECT_EQ(model->selection_base(), 1);
EXPECT_EQ(model->selection_extent(), 1);
@ -217,7 +266,8 @@ TEST(TextInputModel, DeleteReverseSelection) {
TEST(TextInputModel, DeleteSurroundingAtCursor) {
auto model = std::make_unique<TextInputModel>();
model->SetEditingState(2, 2, "ABCDE");
model->SetText("ABCDE");
EXPECT_TRUE(model->SetSelection(2, 2));
EXPECT_TRUE(model->DeleteSurrounding(0, 1));
EXPECT_EQ(model->selection_base(), 2);
EXPECT_EQ(model->selection_extent(), 2);
@ -226,7 +276,8 @@ TEST(TextInputModel, DeleteSurroundingAtCursor) {
TEST(TextInputModel, DeleteSurroundingAtCursorAll) {
auto model = std::make_unique<TextInputModel>();
model->SetEditingState(2, 2, "ABCDE");
model->SetText("ABCDE");
EXPECT_TRUE(model->SetSelection(2, 2));
EXPECT_TRUE(model->DeleteSurrounding(0, 3));
EXPECT_EQ(model->selection_base(), 2);
EXPECT_EQ(model->selection_extent(), 2);
@ -235,7 +286,8 @@ TEST(TextInputModel, DeleteSurroundingAtCursorAll) {
TEST(TextInputModel, DeleteSurroundingAtCursorGreedy) {
auto model = std::make_unique<TextInputModel>();
model->SetEditingState(2, 2, "ABCDE");
model->SetText("ABCDE");
EXPECT_TRUE(model->SetSelection(2, 2));
EXPECT_TRUE(model->DeleteSurrounding(0, 4));
EXPECT_EQ(model->selection_base(), 2);
EXPECT_EQ(model->selection_extent(), 2);
@ -244,7 +296,8 @@ TEST(TextInputModel, DeleteSurroundingAtCursorGreedy) {
TEST(TextInputModel, DeleteSurroundingBeforeCursor) {
auto model = std::make_unique<TextInputModel>();
model->SetEditingState(2, 2, "ABCDE");
model->SetText("ABCDE");
EXPECT_TRUE(model->SetSelection(2, 2));
EXPECT_TRUE(model->DeleteSurrounding(-1, 1));
EXPECT_EQ(model->selection_base(), 1);
EXPECT_EQ(model->selection_extent(), 1);
@ -253,7 +306,8 @@ TEST(TextInputModel, DeleteSurroundingBeforeCursor) {
TEST(TextInputModel, DeleteSurroundingBeforeCursorAll) {
auto model = std::make_unique<TextInputModel>();
model->SetEditingState(2, 2, "ABCDE");
model->SetText("ABCDE");
EXPECT_TRUE(model->SetSelection(2, 2));
EXPECT_TRUE(model->DeleteSurrounding(-2, 2));
EXPECT_EQ(model->selection_base(), 0);
EXPECT_EQ(model->selection_extent(), 0);
@ -262,7 +316,8 @@ TEST(TextInputModel, DeleteSurroundingBeforeCursorAll) {
TEST(TextInputModel, DeleteSurroundingBeforeCursorGreedy) {
auto model = std::make_unique<TextInputModel>();
model->SetEditingState(2, 2, "ABCDE");
model->SetText("ABCDE");
EXPECT_TRUE(model->SetSelection(2, 2));
EXPECT_TRUE(model->DeleteSurrounding(-3, 3));
EXPECT_EQ(model->selection_base(), 0);
EXPECT_EQ(model->selection_extent(), 0);
@ -271,7 +326,8 @@ TEST(TextInputModel, DeleteSurroundingBeforeCursorGreedy) {
TEST(TextInputModel, DeleteSurroundingAfterCursor) {
auto model = std::make_unique<TextInputModel>();
model->SetEditingState(2, 2, "ABCDE");
model->SetText("ABCDE");
EXPECT_TRUE(model->SetSelection(2, 2));
EXPECT_TRUE(model->DeleteSurrounding(1, 1));
EXPECT_EQ(model->selection_base(), 2);
EXPECT_EQ(model->selection_extent(), 2);
@ -280,7 +336,8 @@ TEST(TextInputModel, DeleteSurroundingAfterCursor) {
TEST(TextInputModel, DeleteSurroundingAfterCursorAll) {
auto model = std::make_unique<TextInputModel>();
model->SetEditingState(2, 2, "ABCDE");
model->SetText("ABCDE");
EXPECT_TRUE(model->SetSelection(2, 2));
EXPECT_TRUE(model->DeleteSurrounding(1, 2));
EXPECT_EQ(model->selection_base(), 2);
EXPECT_EQ(model->selection_extent(), 2);
@ -289,7 +346,8 @@ TEST(TextInputModel, DeleteSurroundingAfterCursorAll) {
TEST(TextInputModel, DeleteSurroundingAfterCursorGreedy) {
auto model = std::make_unique<TextInputModel>();
model->SetEditingState(2, 2, "ABCDE");
model->SetText("ABCDE");
EXPECT_TRUE(model->SetSelection(2, 2));
EXPECT_TRUE(model->DeleteSurrounding(1, 3));
EXPECT_EQ(model->selection_base(), 2);
EXPECT_EQ(model->selection_extent(), 2);
@ -298,7 +356,8 @@ TEST(TextInputModel, DeleteSurroundingAfterCursorGreedy) {
TEST(TextInputModel, DeleteSurroundingSelection) {
auto model = std::make_unique<TextInputModel>();
model->SetEditingState(2, 3, "ABCDE");
model->SetText("ABCDE");
EXPECT_TRUE(model->SetSelection(2, 3));
EXPECT_TRUE(model->DeleteSurrounding(0, 1));
EXPECT_EQ(model->selection_base(), 3);
EXPECT_EQ(model->selection_extent(), 3);
@ -307,7 +366,8 @@ TEST(TextInputModel, DeleteSurroundingSelection) {
TEST(TextInputModel, DeleteSurroundingReverseSelection) {
auto model = std::make_unique<TextInputModel>();
model->SetEditingState(4, 3, "ABCDE");
model->SetText("ABCDE");
EXPECT_TRUE(model->SetSelection(4, 3));
EXPECT_TRUE(model->DeleteSurrounding(0, 1));
EXPECT_EQ(model->selection_base(), 3);
EXPECT_EQ(model->selection_extent(), 3);
@ -316,7 +376,8 @@ TEST(TextInputModel, DeleteSurroundingReverseSelection) {
TEST(TextInputModel, BackspaceStart) {
auto model = std::make_unique<TextInputModel>();
EXPECT_TRUE(model->SetEditingState(0, 0, "ABCDE"));
model->SetText("ABCDE");
EXPECT_TRUE(model->SetSelection(0, 0));
ASSERT_FALSE(model->Backspace());
EXPECT_EQ(model->selection_base(), 0);
EXPECT_EQ(model->selection_extent(), 0);
@ -325,7 +386,8 @@ TEST(TextInputModel, BackspaceStart) {
TEST(TextInputModel, BackspaceMiddle) {
auto model = std::make_unique<TextInputModel>();
EXPECT_TRUE(model->SetEditingState(2, 2, "ABCDE"));
model->SetText("ABCDE");
EXPECT_TRUE(model->SetSelection(2, 2));
ASSERT_TRUE(model->Backspace());
EXPECT_EQ(model->selection_base(), 1);
EXPECT_EQ(model->selection_extent(), 1);
@ -334,7 +396,8 @@ TEST(TextInputModel, BackspaceMiddle) {
TEST(TextInputModel, BackspaceEnd) {
auto model = std::make_unique<TextInputModel>();
EXPECT_TRUE(model->SetEditingState(5, 5, "ABCDE"));
model->SetText("ABCDE");
EXPECT_TRUE(model->SetSelection(5, 5));
ASSERT_TRUE(model->Backspace());
EXPECT_EQ(model->selection_base(), 4);
EXPECT_EQ(model->selection_extent(), 4);
@ -343,7 +406,8 @@ TEST(TextInputModel, BackspaceEnd) {
TEST(TextInputModel, BackspaceWideCharacters) {
auto model = std::make_unique<TextInputModel>();
EXPECT_TRUE(model->SetEditingState(4, 4, "😄🙃🤪🧐"));
model->SetText("😄🙃🤪🧐");
EXPECT_TRUE(model->SetSelection(4, 4));
ASSERT_TRUE(model->Backspace());
EXPECT_EQ(model->selection_base(), 2);
EXPECT_EQ(model->selection_extent(), 2);
@ -352,7 +416,8 @@ TEST(TextInputModel, BackspaceWideCharacters) {
TEST(TextInputModel, BackspaceSelection) {
auto model = std::make_unique<TextInputModel>();
EXPECT_TRUE(model->SetEditingState(1, 4, "ABCDE"));
model->SetText("ABCDE");
EXPECT_TRUE(model->SetSelection(1, 4));
ASSERT_TRUE(model->Delete());
EXPECT_EQ(model->selection_base(), 1);
EXPECT_EQ(model->selection_extent(), 1);
@ -361,7 +426,8 @@ TEST(TextInputModel, BackspaceSelection) {
TEST(TextInputModel, BackspaceReverseSelection) {
auto model = std::make_unique<TextInputModel>();
EXPECT_TRUE(model->SetEditingState(4, 1, "ABCDE"));
model->SetText("ABCDE");
EXPECT_TRUE(model->SetSelection(4, 1));
ASSERT_TRUE(model->Delete());
EXPECT_EQ(model->selection_base(), 1);
EXPECT_EQ(model->selection_extent(), 1);
@ -370,7 +436,8 @@ TEST(TextInputModel, BackspaceReverseSelection) {
TEST(TextInputModel, MoveCursorForwardStart) {
auto model = std::make_unique<TextInputModel>();
EXPECT_TRUE(model->SetEditingState(0, 0, "ABCDE"));
model->SetText("ABCDE");
EXPECT_TRUE(model->SetSelection(0, 0));
EXPECT_TRUE(model->MoveCursorForward());
EXPECT_EQ(model->selection_base(), 1);
EXPECT_EQ(model->selection_extent(), 1);
@ -379,7 +446,8 @@ TEST(TextInputModel, MoveCursorForwardStart) {
TEST(TextInputModel, MoveCursorForwardMiddle) {
auto model = std::make_unique<TextInputModel>();
EXPECT_TRUE(model->SetEditingState(2, 2, "ABCDE"));
model->SetText("ABCDE");
EXPECT_TRUE(model->SetSelection(2, 2));
EXPECT_TRUE(model->MoveCursorForward());
EXPECT_EQ(model->selection_base(), 3);
EXPECT_EQ(model->selection_extent(), 3);
@ -388,7 +456,8 @@ TEST(TextInputModel, MoveCursorForwardMiddle) {
TEST(TextInputModel, MoveCursorForwardEnd) {
auto model = std::make_unique<TextInputModel>();
EXPECT_TRUE(model->SetEditingState(5, 5, "ABCDE"));
model->SetText("ABCDE");
EXPECT_TRUE(model->SetSelection(5, 5));
EXPECT_FALSE(model->MoveCursorForward());
EXPECT_EQ(model->selection_base(), 5);
EXPECT_EQ(model->selection_extent(), 5);
@ -397,7 +466,8 @@ TEST(TextInputModel, MoveCursorForwardEnd) {
TEST(TextInputModel, MoveCursorForwardWideCharacters) {
auto model = std::make_unique<TextInputModel>();
EXPECT_TRUE(model->SetEditingState(4, 4, "😄🙃🤪🧐"));
model->SetText("😄🙃🤪🧐");
EXPECT_TRUE(model->SetSelection(4, 4));
ASSERT_TRUE(model->MoveCursorForward());
EXPECT_EQ(model->selection_base(), 6);
EXPECT_EQ(model->selection_extent(), 6);
@ -406,7 +476,8 @@ TEST(TextInputModel, MoveCursorForwardWideCharacters) {
TEST(TextInputModel, MoveCursorForwardSelection) {
auto model = std::make_unique<TextInputModel>();
EXPECT_TRUE(model->SetEditingState(1, 4, "ABCDE"));
model->SetText("ABCDE");
EXPECT_TRUE(model->SetSelection(1, 4));
EXPECT_TRUE(model->MoveCursorForward());
EXPECT_EQ(model->selection_base(), 4);
EXPECT_EQ(model->selection_extent(), 4);
@ -415,7 +486,8 @@ TEST(TextInputModel, MoveCursorForwardSelection) {
TEST(TextInputModel, MoveCursorForwardReverseSelection) {
auto model = std::make_unique<TextInputModel>();
EXPECT_TRUE(model->SetEditingState(4, 1, "ABCDE"));
model->SetText("ABCDE");
EXPECT_TRUE(model->SetSelection(4, 1));
EXPECT_TRUE(model->MoveCursorForward());
EXPECT_EQ(model->selection_base(), 4);
EXPECT_EQ(model->selection_extent(), 4);
@ -424,7 +496,8 @@ TEST(TextInputModel, MoveCursorForwardReverseSelection) {
TEST(TextInputModel, MoveCursorBackStart) {
auto model = std::make_unique<TextInputModel>();
EXPECT_TRUE(model->SetEditingState(0, 0, "ABCDE"));
model->SetText("ABCDE");
EXPECT_TRUE(model->SetSelection(0, 0));
EXPECT_FALSE(model->MoveCursorBack());
EXPECT_EQ(model->selection_base(), 0);
EXPECT_EQ(model->selection_extent(), 0);
@ -433,7 +506,8 @@ TEST(TextInputModel, MoveCursorBackStart) {
TEST(TextInputModel, MoveCursorBackMiddle) {
auto model = std::make_unique<TextInputModel>();
model->SetEditingState(2, 2, "ABCDE");
model->SetText("ABCDE");
EXPECT_TRUE(model->SetSelection(2, 2));
EXPECT_TRUE(model->MoveCursorBack());
EXPECT_EQ(model->selection_base(), 1);
EXPECT_EQ(model->selection_extent(), 1);
@ -442,7 +516,8 @@ TEST(TextInputModel, MoveCursorBackMiddle) {
TEST(TextInputModel, MoveCursorBackEnd) {
auto model = std::make_unique<TextInputModel>();
model->SetEditingState(5, 5, "ABCDE");
model->SetText("ABCDE");
EXPECT_TRUE(model->SetSelection(5, 5));
EXPECT_TRUE(model->MoveCursorBack());
EXPECT_EQ(model->selection_base(), 4);
EXPECT_EQ(model->selection_extent(), 4);
@ -451,7 +526,8 @@ TEST(TextInputModel, MoveCursorBackEnd) {
TEST(TextInputModel, MoveCursorBackWideCharacters) {
auto model = std::make_unique<TextInputModel>();
EXPECT_TRUE(model->SetEditingState(4, 4, "😄🙃🤪🧐"));
model->SetText("😄🙃🤪🧐");
EXPECT_TRUE(model->SetSelection(4, 4));
ASSERT_TRUE(model->MoveCursorBack());
EXPECT_EQ(model->selection_base(), 2);
EXPECT_EQ(model->selection_extent(), 2);
@ -460,7 +536,8 @@ TEST(TextInputModel, MoveCursorBackWideCharacters) {
TEST(TextInputModel, MoveCursorBackSelection) {
auto model = std::make_unique<TextInputModel>();
model->SetEditingState(1, 4, "ABCDE");
model->SetText("ABCDE");
EXPECT_TRUE(model->SetSelection(1, 4));
EXPECT_TRUE(model->MoveCursorBack());
EXPECT_EQ(model->selection_base(), 1);
EXPECT_EQ(model->selection_extent(), 1);
@ -469,7 +546,8 @@ TEST(TextInputModel, MoveCursorBackSelection) {
TEST(TextInputModel, MoveCursorBackReverseSelection) {
auto model = std::make_unique<TextInputModel>();
model->SetEditingState(4, 1, "ABCDE");
model->SetText("ABCDE");
EXPECT_TRUE(model->SetSelection(4, 1));
EXPECT_TRUE(model->MoveCursorBack());
EXPECT_EQ(model->selection_base(), 1);
EXPECT_EQ(model->selection_extent(), 1);
@ -478,7 +556,8 @@ TEST(TextInputModel, MoveCursorBackReverseSelection) {
TEST(TextInputModel, MoveCursorToBeginningStart) {
auto model = std::make_unique<TextInputModel>();
model->SetEditingState(0, 0, "ABCDE");
model->SetText("ABCDE");
EXPECT_TRUE(model->SetSelection(0, 0));
EXPECT_FALSE(model->MoveCursorToBeginning());
EXPECT_EQ(model->selection_base(), 0);
EXPECT_EQ(model->selection_extent(), 0);
@ -487,7 +566,8 @@ TEST(TextInputModel, MoveCursorToBeginningStart) {
TEST(TextInputModel, MoveCursorToBeginningMiddle) {
auto model = std::make_unique<TextInputModel>();
model->SetEditingState(2, 2, "ABCDE");
model->SetText("ABCDE");
EXPECT_TRUE(model->SetSelection(2, 2));
EXPECT_TRUE(model->MoveCursorToBeginning());
EXPECT_EQ(model->selection_base(), 0);
EXPECT_EQ(model->selection_extent(), 0);
@ -496,7 +576,8 @@ TEST(TextInputModel, MoveCursorToBeginningMiddle) {
TEST(TextInputModel, MoveCursorToBeginningEnd) {
auto model = std::make_unique<TextInputModel>();
model->SetEditingState(5, 5, "ABCDE");
model->SetText("ABCDE");
EXPECT_TRUE(model->SetSelection(5, 5));
EXPECT_TRUE(model->MoveCursorToBeginning());
EXPECT_EQ(model->selection_base(), 0);
EXPECT_EQ(model->selection_extent(), 0);
@ -505,7 +586,8 @@ TEST(TextInputModel, MoveCursorToBeginningEnd) {
TEST(TextInputModel, MoveCursorToBeginningSelection) {
auto model = std::make_unique<TextInputModel>();
model->SetEditingState(1, 4, "ABCDE");
model->SetText("ABCDE");
EXPECT_TRUE(model->SetSelection(1, 4));
EXPECT_TRUE(model->MoveCursorToBeginning());
EXPECT_EQ(model->selection_base(), 0);
EXPECT_EQ(model->selection_extent(), 0);
@ -514,7 +596,8 @@ TEST(TextInputModel, MoveCursorToBeginningSelection) {
TEST(TextInputModel, MoveCursorToBeginningReverseSelection) {
auto model = std::make_unique<TextInputModel>();
model->SetEditingState(4, 1, "ABCDE");
model->SetText("ABCDE");
EXPECT_TRUE(model->SetSelection(4, 1));
EXPECT_TRUE(model->MoveCursorToBeginning());
EXPECT_EQ(model->selection_base(), 0);
EXPECT_EQ(model->selection_extent(), 0);
@ -523,7 +606,8 @@ TEST(TextInputModel, MoveCursorToBeginningReverseSelection) {
TEST(TextInputModel, MoveCursorToEndStart) {
auto model = std::make_unique<TextInputModel>();
model->SetEditingState(0, 0, "ABCDE");
model->SetText("ABCDE");
EXPECT_TRUE(model->SetSelection(0, 0));
EXPECT_TRUE(model->MoveCursorToEnd());
EXPECT_EQ(model->selection_base(), 5);
EXPECT_EQ(model->selection_extent(), 5);
@ -532,7 +616,8 @@ TEST(TextInputModel, MoveCursorToEndStart) {
TEST(TextInputModel, MoveCursorToEndMiddle) {
auto model = std::make_unique<TextInputModel>();
model->SetEditingState(2, 2, "ABCDE");
model->SetText("ABCDE");
EXPECT_TRUE(model->SetSelection(2, 2));
EXPECT_TRUE(model->MoveCursorToEnd());
EXPECT_EQ(model->selection_base(), 5);
EXPECT_EQ(model->selection_extent(), 5);
@ -541,7 +626,8 @@ TEST(TextInputModel, MoveCursorToEndMiddle) {
TEST(TextInputModel, MoveCursorToEndEnd) {
auto model = std::make_unique<TextInputModel>();
model->SetEditingState(5, 5, "ABCDE");
model->SetText("ABCDE");
EXPECT_TRUE(model->SetSelection(5, 5));
EXPECT_FALSE(model->MoveCursorToEnd());
EXPECT_EQ(model->selection_base(), 5);
EXPECT_EQ(model->selection_extent(), 5);
@ -550,7 +636,8 @@ TEST(TextInputModel, MoveCursorToEndEnd) {
TEST(TextInputModel, MoveCursorToEndSelection) {
auto model = std::make_unique<TextInputModel>();
model->SetEditingState(1, 4, "ABCDE");
model->SetText("ABCDE");
EXPECT_TRUE(model->SetSelection(1, 4));
EXPECT_TRUE(model->MoveCursorToEnd());
EXPECT_EQ(model->selection_base(), 5);
EXPECT_EQ(model->selection_extent(), 5);
@ -559,7 +646,8 @@ TEST(TextInputModel, MoveCursorToEndSelection) {
TEST(TextInputModel, MoveCursorToEndReverseSelection) {
auto model = std::make_unique<TextInputModel>();
model->SetEditingState(4, 1, "ABCDE");
model->SetText("ABCDE");
EXPECT_TRUE(model->SetSelection(4, 1));
EXPECT_TRUE(model->MoveCursorToEnd());
EXPECT_EQ(model->selection_base(), 5);
EXPECT_EQ(model->selection_extent(), 5);
@ -569,7 +657,8 @@ TEST(TextInputModel, MoveCursorToEndReverseSelection) {
TEST(TextInputModel, GetCursorOffset) {
auto model = std::make_unique<TextInputModel>();
// These characters take 1, 2, 3 and 4 bytes in UTF-8.
model->SetEditingState(0, 0, "$¢€𐍈");
model->SetText("$¢€𐍈");
EXPECT_TRUE(model->SetSelection(0, 0));
EXPECT_EQ(model->GetCursorOffset(), 0);
EXPECT_TRUE(model->MoveCursorForward());
EXPECT_EQ(model->GetCursorOffset(), 1);
@ -583,13 +672,15 @@ TEST(TextInputModel, GetCursorOffset) {
TEST(TextInputModel, GetCursorOffsetSelection) {
auto model = std::make_unique<TextInputModel>();
model->SetEditingState(1, 4, "ABCDE");
model->SetText("ABCDE");
EXPECT_TRUE(model->SetSelection(1, 4));
EXPECT_EQ(model->GetCursorOffset(), 4);
}
TEST(TextInputModel, GetCursorOffsetReverseSelection) {
auto model = std::make_unique<TextInputModel>();
model->SetEditingState(4, 1, "ABCDE");
model->SetText("ABCDE");
EXPECT_TRUE(model->SetSelection(4, 1));
EXPECT_EQ(model->GetCursorOffset(), 1);
}

3
shell/platform/glfw/text_input_plugin.cc
View File

@ -194,7 +194,8 @@ void TextInputPlugin::HandleMethodCall(
if (base == -1 && extent == -1) {
base = extent = 0;
}
active_model_->SetEditingState(base, extent, text->value.GetString());
active_model_->SetText(text->value.GetString());
active_model_->SetSelection(base, extent);
} else {
result->NotImplemented();
return;

3
shell/platform/linux/fl_text_input_plugin.cc
View File

@ -218,7 +218,8 @@ static FlMethodResponse* set_editing_state(FlTextInputPlugin* self,
selection_base = selection_extent = 0;
}
self->text_model->SetEditingState(selection_base, selection_extent, text);
self->text_model->SetText(text);
self->text_model->SetSelection(selection_base, selection_extent);
return FL_METHOD_RESPONSE(fl_method_success_response_new(nullptr));
}

3
shell/platform/windows/text_input_plugin.cc
View File

@ -195,7 +195,8 @@ void TextInputPlugin::HandleMethodCall(
if (base == -1 && extent == -1) {
base = extent = 0;
}
active_model_->SetEditingState(base, extent, text->value.GetString());
active_model_->SetText(text->value.GetString());
active_model_->SetSelection(base, extent);
} else {
result->NotImplemented();
return;