Merge pull request #252 from Unity-Technologies/fix_text_input_action_issue

SiyaoHuang · web-flow · commit c8b1ee7c71b7 · 2021-09-29T13:34:13.000+08:00
Fix TextInputAction for desktop
diff --git a/com.unity.uiwidgets/Runtime/services/keyboard.cs b/com.unity.uiwidgets/Runtime/services/keyboard.cs
@@ -67,6 +67,8 @@ class DefaultKeyboardDelegate : KeyboardDelegate, TextInputOnGUIListener {
 
         TextEditingValue _value;
 
+        TextInputConfiguration _textInputConfiguration;
+
         public void show() {
         }
 
@@ -108,10 +110,12 @@ public void setIMEPos(Offset imeGlobalPos) {
 
         public void setClient(int client, TextInputConfiguration configuration) {
             _client = client;
+            _textInputConfiguration = configuration;
         }
 
         public void clearClient() {
             _client = 0;
+            _textInputConfiguration = null;
         }
 
         public bool imeRequired() {
@@ -161,7 +165,8 @@ public void OnGUI() {
                         }
 
                         if (ch == '\n') {
-                            Timer.create(TimeSpan.Zero, () => { TextInput._performAction(_client, TextInputAction.newline); });
+                            Timer.create(TimeSpan.Zero, () => { TextInput._performAction(_client, 
+                                _textInputConfiguration?.inputAction ?? TextInputAction.newline); });
                         }
 
                         if (_validateCharacter(ch)) {

Original file line number	Diff line number	Diff line change
`@@ -67,6 +67,8 @@ class DefaultKeyboardDelegate : KeyboardDelegate, TextInputOnGUIListener {`
`67`	`67`
`68`	`68`	`TextEditingValue _value;`
`69`	`69`
	`70`	`+ TextInputConfiguration _textInputConfiguration;`
	`71`	`+`
`70`	`72`	`public void show() {`
`71`	`73`	`}`
`72`	`74`
`@@ -108,10 +110,12 @@ public void setIMEPos(Offset imeGlobalPos) {`
`108`	`110`
`109`	`111`	`public void setClient(int client, TextInputConfiguration configuration) {`
`110`	`112`	`_client = client;`
	`113`	`+ _textInputConfiguration = configuration;`
`111`	`114`	`}`
`112`	`115`
`113`	`116`	`public void clearClient() {`
`114`	`117`	`_client = 0;`
	`118`	`+ _textInputConfiguration = null;`
`115`	`119`	`}`
`116`	`120`
`117`	`121`	`public bool imeRequired() {`
`@@ -161,7 +165,8 @@ public void OnGUI() {`
`161`	`165`	`}`
`162`	`166`
`163`	`167`	`if (ch == '\n') {`
`164`		`- Timer.create(TimeSpan.Zero, () => { TextInput._performAction(_client, TextInputAction.newline); });`
	`168`	`+ Timer.create(TimeSpan.Zero, () => { TextInput._performAction(_client,`
	`169`	`+ _textInputConfiguration?.inputAction ?? TextInputAction.newline); });`
`165`	`170`	`}`
`166`	`171`
`167`	`172`	`if (_validateCharacter(ch)) {`