Browse Source

Merge pull request #9257 from AvaloniaUI/more-wasm-fixes

More wasm fixes
pull/9259/head
Dan Walmsley 4 years ago
committed by GitHub
parent
commit
dd8aefbe28
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 9
      src/Web/Avalonia.Web/AvaloniaView.cs
  2. 4
      src/Web/Avalonia.Web/webapp/modules/avalonia/dom.ts

9
src/Web/Avalonia.Web/AvaloniaView.cs

@ -254,7 +254,14 @@ namespace Avalonia.Web
private bool OnKeyDown (string code, string key, int modifier) private bool OnKeyDown (string code, string key, int modifier)
{ {
return _topLevelImpl.RawKeyboardEvent(RawKeyEventType.KeyDown, code, key, (RawInputModifiers)modifier); var handled = _topLevelImpl.RawKeyboardEvent(RawKeyEventType.KeyDown, code, key, (RawInputModifiers)modifier);
if (!handled && key.Length == 1)
{
handled = _topLevelImpl.RawTextEvent(key);
}
return handled;
} }
private bool OnKeyUp(string code, string key, int modifier) private bool OnKeyUp(string code, string key, int modifier)

4
src/Web/Avalonia.Web/webapp/modules/avalonia/dom.ts

@ -24,7 +24,7 @@ export class AvaloniaDOM {
// Native controls host // Native controls host
const nativeHost = document.createElement("div"); const nativeHost = document.createElement("div");
canvas.id = `nativeHost${randomIdPart}`; nativeHost.id = `nativeHost${randomIdPart}`;
nativeHost.classList.add("avalonia-native-host"); nativeHost.classList.add("avalonia-native-host");
nativeHost.style.left = "0px"; nativeHost.style.left = "0px";
nativeHost.style.top = "0px"; nativeHost.style.top = "0px";
@ -34,7 +34,7 @@ export class AvaloniaDOM {
// IME // IME
const inputElement = document.createElement("input"); const inputElement = document.createElement("input");
canvas.id = `input${randomIdPart}`; inputElement.id = `inputElement${randomIdPart}`;
inputElement.classList.add("avalonia-input-element"); inputElement.classList.add("avalonia-input-element");
inputElement.autocapitalize = "none"; inputElement.autocapitalize = "none";
inputElement.type = "text"; inputElement.type = "text";

Loading…
Cancel
Save