.github/workflows/test.yml

@@ -167,10 +167,9 @@ jobs:
           env GOARCH=386 EBITENGINE_DIRECTX=version=12 go test -shuffle=on -v ./...
 
       - name: go test (Wasm)
-        if: ${{ runner.os != 'macOS' && runner.os != 'Windows' }}
+        if: runner.os != 'macOS'
         run: |
           # Wasm tests don't work on macOS with the headless mode, and the headless mode doesn't work in GitHub Actions (#2972).
-          # Wasm tests don't work on Windows well due to mysterious timeouts (#2982).
           env GOOS=js GOARCH=wasm cleanenv -remove-prefix GITHUB_ -remove-prefix JAVA_ -remove-prefix PSModulePath -remove-prefix STATS_ -remove-prefix RUNNER_ -- go test -shuffle=on -v ./...
 
       - name: Install ebitenmobile

exp/textinput/field.go

@@ -106,7 +106,7 @@ func (f *Field) HandleInput(x, y int) (handled bool, err error) {
 			f.ch, f.end = Start(x, y)
 			// Start returns nil for non-supported envrionments.
 			if f.ch == nil {
-				return false, nil
+				return true, nil
 			}
 		}
 

exp/textinput/textinput_js.go

@@ -16,7 +16,6 @@ package textinput
 
 import (
 	"fmt"
-	"strings"
 	"syscall/js"
 
 	"github.com/hajimehoshi/ebiten/v2/internal/ui"
@@ -80,10 +79,7 @@ func (t *textInput) init() {
 			e.Call("preventDefault")
 		}
 		if e.Get("code").String() == "Enter" || e.Get("key").String() == "Enter" {
-			// Ignore Enter key to avoid ebiten.IsKeyPressed(ebiten.KeyEnter) unexpectedly becomes true.
+			// Ignore Enter key to avoid ebiten.IsKeyPressed(ebiten.KeyEnter) unexpectedly becomes true, especially for iOS Safari.
-			e.Call("preventDefault")
-			ui.Get().UpdateInputFromEvent(e)
-			t.trySend(true)
 			return nil
 		}
 		if !e.Get("isComposing").Bool() {
@@ -100,11 +96,6 @@ func (t *textInput) init() {
 	}))
 	t.textareaElement.Call("addEventListener", "input", js.FuncOf(func(this js.Value, args []js.Value) any {
 		e := args[0]
-		// On iOS Safari, `isComposing` can be undefined.
-		if e.Get("isComposing").IsUndefined() {
-			t.trySend(false)
-			return nil
-		}
 		if e.Get("isComposing").Bool() {
 			t.trySend(false)
 			return nil
@@ -118,13 +109,9 @@ func (t *textInput) init() {
 			t.trySend(true)
 			return nil
 		}
-		// Though `isComposing` is false, send the text as being not committed for text completion with a virtual keyboard.
+		// Though `isComposing` is false, send the text as being not committed for text completion on mobile browsers.
-		if isVirtualKeyboard() {
 		t.trySend(false)
 		return nil
-		}
-		t.trySend(true)
-		return nil
 	}))
 	t.textareaElement.Call("addEventListener", "change", js.FuncOf(func(this js.Value, args []js.Value) any {
 		t.trySend(true)
@@ -185,13 +172,7 @@ func (t *textInput) Start(x, y int) (chan State, func()) {
 			s := newSession()
 			t.session = s
 		}
-		return t.session.ch, func() {
+		return t.session.ch, t.session.end
-			if t.session != nil {
-				t.session.end()
-				// Reset the session explictly, or a new session cannot be created above.
-				t.session = nil
-			}
-		}
 	}
 
 	if t.session != nil {
@@ -212,10 +193,6 @@ func (t *textInput) trySend(committed bool) {
 	}
 
 	textareaValue := t.textareaElement.Get("value").String()
-	if textareaValue == "" {
-		return
-	}
-
 	start := t.textareaElement.Get("selectionStart").Int()
 	end := t.textareaElement.Get("selectionEnd").Int()
 	startInBytes := convertUTF16CountToByteCount(textareaValue, start)
@@ -236,15 +213,3 @@ func (t *textInput) trySend(committed bool) {
 		t.textareaElement.Set("value", "")
 	}
 }
-
-func isVirtualKeyboard() bool {
-	// Detect a virtual keyboard by the user agent.
-	// Note that this is not a correct way to detect a virtual keyboard.
-	// In the future, we should use the `navigator.virtualKeyboard` API.
-	// https://developer.mozilla.org/en-US/docs/Web/API/Navigator/virtualKeyboard
-	ua := js.Global().Get("navigator").Get("userAgent").String()
-	if strings.Contains(ua, "Android") || strings.Contains(ua, "iPhone") || strings.Contains(ua, "iPad") || strings.Contains(ua, "iPod") {
-		return true
-	}
-	return false
-}