Merge pull request #30 from ChristopherBiscardi/wasm32

Enable wasm, when it works

.cargo/config.toml

@@ -0,0 +1,2 @@
+[target.wasm32-unknown-unknown]
+runner = "wasm-server-runner"

Cargo.toml

@@ -13,8 +13,6 @@ debug-render = []
 metrics = []
 
 [dependencies]
-arboard = "3.4"
-bevy = "0.14"
 bevy_mod_picking = "0.20"
 bevy_vello = { version = "0.5", features = ["svg"] }
 bevy-inspector-egui = "0.25"
@@ -27,10 +25,22 @@ taffy = { version = "0.5", features = ["flexbox", "grid"] }
 thiserror = "1.0"
 unicode-segmentation = "1.10.0"
 usvg = "0.42"
+web-time = "1.1"
 
 # Local
 woodpecker_ui_macros.path = "crates/woodpecker_ui_macros" # TODO: Make this crates.io friendly..
 
+[target.'cfg(not(target_arch = "wasm32"))'.dependencies]
+arboard = "3.4"
+bevy = "0.14"
+
+[target.'cfg(target_arch = "wasm32")'.dependencies]
+bevy = { version = "0.14", default-features = false, features = ["webgpu"] }
+web-sys = "0.3"
+wasm-bindgen-futures = "0.4"
+futures-channel = "0.3"
+
+
 [dev-dependencies]
 calc = { version = "0.4.0", default-features = false }
 bevy = { version = "0.14", features = ["jpeg"] }

src/keyboard_input.rs

@@ -1,4 +1,4 @@
-use std::time::{Duration, Instant};
+use web_time::{Duration, Instant};
 
 use bevy::{
  input::{
@@ -53,6 +53,14 @@ pub struct WidgetPasteEvent {
  pub paste: smol_str::SmolStr,
 }
 
+#[cfg(target_arch = "wasm32")]
+#[derive(Component)]
+pub struct WidgetPasteEventWasm {
+ /// The target of this event
+ pub target: Entity,
+ pub receiver: futures_channel::oneshot::Receiver<String>,
+}
+
 #[derive(Debug, Deref, DerefMut)]
 pub(crate) struct TimeSinceLastPaste(Instant);
 impl Default for TimeSinceLastPaste {
@@ -61,13 +69,34 @@ impl Default for TimeSinceLastPaste {
  }
 }
 
+#[cfg(target_arch = "wasm32")]
+pub(crate) fn read_paste_events(
+ mut commands: Commands,
+ mut query: Query<(Entity, &mut WidgetPasteEventWasm)>,
+ mut paste_event_writer: EventWriter<WidgetPasteEvent>,
+ mut time_since_last_paste: Local<TimeSinceLastPaste>,
+) {
+ for (entity, mut event) in &mut query {
+ let Ok(Some(text)) = event.receiver.try_recv() else {
+ continue;
+ };
+ *time_since_last_paste = TimeSinceLastPaste::default();
+ paste_event_writer.send(WidgetPasteEvent {
+ target: event.target,
+ paste: smol_str::SmolStr::new(text.to_string()),
+ });
+ commands.entity(entity).despawn_recursive();
+ }
+}
+
 pub(crate) fn runner(
+ #[cfg(target_arch = "wasm32")] mut commands: Commands,
  mut time_since_last_paste: Local<TimeSinceLastPaste>,
  mut ctrl_pressed: Local<bool>,
  mut key_event: EventReader<KeyboardInput>,
  mut char_event_writer: EventWriter<WidgetKeyboardCharEvent>,
  mut button_event_writer: EventWriter<WidgetKeyboardButtonEvent>,
- mut paste_event_writer: EventWriter<WidgetPasteEvent>,
+ #[cfg(not(target_arch = "wasm32"))] mut paste_event_writer: EventWriter<WidgetPasteEvent>,
  current_focus: Res<CurrentFocus>,
 ) {
  let mut v_pressed = false;
@@ -97,18 +126,54 @@ pub(crate) fn runner(
  if time_since_last_paste.elapsed().as_secs_f32() < 0.1 {
  return;
  }
- let Ok(mut clipboard) = arboard::Clipboard::new() else {
+
+ #[cfg(not(target_arch = "wasm32"))]
+ {
+ let Ok(mut clipboard) = arboard::Clipboard::new() else {
+ return;
+ };
+ let Ok(text) = clipboard.get_text() else {
+ return;
+ };
+ *time_since_last_paste = TimeSinceLastPaste::default();
+ paste_event_writer.send(WidgetPasteEvent {
+ target: current_focus.get(),
+ paste: smol_str::SmolStr::new(text),
+ });
  return;
- };
- let Ok(text) = clipboard.get_text() else {
+ }
+
+ #[cfg(target_arch = "wasm32")]
+ {
+ let Some(clipboard) =
+ web_sys::window().and_then(|window| window.navigator().clipboard())
+ else {
+ warn!("no clipboard");
+ return;
+ };
+ let promise = clipboard.read_text();
+ let future = wasm_bindgen_futures::JsFuture::from(promise);
+
+ let (sender, receiver) = futures_channel::oneshot::channel::<String>();
+
+ let pool = bevy::tasks::TaskPool::new();
+ pool.spawn(async move {
+ let Ok(text) = future.await else {
+ return;
+ };
+ let Some(text) = text.as_string() else {
+ return;
+ };
+ let _ = sender.send(text);
+ });
+
+ commands.spawn(WidgetPasteEventWasm {
+ target: current_focus.get(),
+ receiver,
+ });
+
  return;
- };
- *time_since_last_paste = TimeSinceLastPaste::default();
- paste_event_writer.send(WidgetPasteEvent {
- target: current_focus.get(),
- paste: smol_str::SmolStr::new(text),
- });
- return;
+ }
  }
  match &event.logical_key {
  Key::Character(c) => {

src/lib.rs

@@ -19,6 +19,7 @@ mod entity_mapping;
 mod focus;
 mod font;
 mod hook_helper;
+mod image;
 mod keyboard_input;
 mod layout;
 mod metrics;
@@ -30,7 +31,6 @@ mod styles;
 mod svg;
 mod vello_svg;
 mod widgets;
-mod image;
 
 /// A module that exports all publicly exposed types.
 pub mod prelude {
@@ -120,7 +120,10 @@ impl Plugin for WoodpeckerUIPlugin {
  (
  runner::system,
  focus::CurrentFocus::click_focus,
+ #[cfg(not(target_arch = "wasm32"))]
  keyboard_input::runner,
+ #[cfg(target_arch = "wasm32")]
+ (keyboard_input::runner, keyboard_input::read_paste_events).chain(),
  hook_helper::HookHelper::update_context_helper,
  )
  .run_if(has_root()),

src/metrics.rs

@@ -1,4 +1,4 @@
-use std::time::Instant;
+use web_time::Instant;
 
 use bevy::prelude::*;
 

src/widgets/text_box.rs

@@ -1,4 +1,4 @@
-use std::time::Instant;
+use web_time::Instant;
 
 use crate::{
  keyboard_input::{WidgetKeyboardButtonEvent, WidgetPasteEvent},

src/widgets/transition.rs

@@ -1,7 +1,7 @@
 use bevy::prelude::*;
 use interpolation::Ease;
 use interpolation::EaseFunction;
-use std::time::Instant;
+use web_time::Instant;
 
 use crate::prelude::*;