Switch to bun, clean up web implementation

packages/desktop/headless_tests/utils.rs

@@ -1,3 +1,5 @@
+#![allow(unused)] // for whatever reason, the compiler is not recognizing the use of these functions
+
 use dioxus::prelude::*;
 use dioxus_core::Element;
 

packages/desktop/js/prevent_file_upload.js

@@ -11,7 +11,7 @@
           let target_id = find_real_id(target);
           if (target_id !== null) {
             const send = (event_name) => {
-              const message = window.interpreter.serializeIpcMessage("file_diolog", { accept: target.getAttribute("accept"), directory: target.getAttribute("webkitdirectory") === "true", multiple: target.hasAttribute("multiple"), target: parseInt(target_id), bubbles: event_bubbles(event_name), event: event_name });
+              const message = window.interpreter.serializeIpcMessage("file_dialog", { accept: target.getAttribute("accept"), directory: target.getAttribute("webkitdirectory") === "true", multiple: target.hasAttribute("multiple"), target: parseInt(target_id), bubbles: event_bubbles(event_name), event: event_name });
               window.ipc.postMessage(message);
             };
             send("change&input");

packages/desktop/src/ipc.rs

@@ -49,7 +49,7 @@ impl IpcMessage {
     pub(crate) fn method(&self) -> IpcMethod {
         match self.method.as_str() {
             // todo: this is a misspelling, needs to be fixed
-            "file_diolog" => IpcMethod::FileDialog,
+            "file_dialog" => IpcMethod::FileDialog,
             "user_event" => IpcMethod::UserEvent,
             "query" => IpcMethod::Query,
             "browser_open" => IpcMethod::BrowserOpen,

packages/desktop/src/protocol.rs

@@ -1,5 +1,5 @@
 use crate::{assets::*, edits::EditQueue};
-use dioxus_interpreter_js::unified_bindings::{native_js, SLEDGEHAMMER_JS};
+use dioxus_interpreter_js::unified_bindings::native_js;
 use std::path::{Path, PathBuf};
 use wry::{
     http::{status::StatusCode, Request, Response},

packages/interpreter/src/js/hash.txt

@@ -1 +1 @@
-4429706825984325407
+3599957386864841107

packages/interpreter/src/js/native.js

@@ -11,13 +11,16 @@ class Interpreter {
     this.handler = handler;
     this.initialize(root);
   }
-  initialize(root) {
+  initialize(root, handler = null) {
     this.global = {};
     this.local = {};
     this.root = root;
     this.nodes = [root];
     this.stack = [root];
     this.templates = {};
+    if (handler) {
+      this.handler = handler;
+    }
   }
   createListener(event_name, element, bubbles) {
     if (bubbles) {

packages/interpreter/src/js/web.js

@@ -11,13 +11,16 @@ class Interpreter {
     this.handler = handler;
     this.initialize(root);
   }
-  initialize(root) {
+  initialize(root, handler = null) {
     this.global = {};
     this.local = {};
     this.root = root;
     this.nodes = [root];
     this.stack = [root];
     this.templates = {};
+    if (handler) {
+      this.handler = handler;
+    }
   }
   createListener(event_name, element, bubbles) {
     if (bubbles) {
@@ -73,6 +76,86 @@ class Interpreter {
   }
 }
 
+// src/ts/set_attribute.ts
+function setAttributeInner(node, field, value, ns) {
+  if (ns === "style") {
+    node.style.setProperty(field, value);
+    return;
+  }
+  if (!!ns) {
+    node.setAttributeNS(ns, field, value);
+    return;
+  }
+  switch (field) {
+    case "value":
+      if (node.value !== value) {
+        node.value = value;
+      }
+      break;
+    case "initial_value":
+      node.defaultValue = value;
+      break;
+    case "checked":
+      node.checked = truthy(value);
+      break;
+    case "initial_checked":
+      node.defaultChecked = truthy(value);
+      break;
+    case "selected":
+      node.selected = truthy(value);
+      break;
+    case "initial_selected":
+      node.defaultSelected = truthy(value);
+      break;
+    case "dangerous_inner_html":
+      node.innerHTML = value;
+      break;
+    default:
+      if (!truthy(value) && isBoolAttr(field)) {
+        node.removeAttribute(field);
+      } else {
+        node.setAttribute(field, value);
+      }
+  }
+}
+var truthy = function(val) {
+  return val === "true" || val === true;
+};
+var isBoolAttr = function(field) {
+  switch (field) {
+    case "allowfullscreen":
+    case "allowpaymentrequest":
+    case "async":
+    case "autofocus":
+    case "autoplay":
+    case "checked":
+    case "controls":
+    case "default":
+    case "defer":
+    case "disabled":
+    case "formnovalidate":
+    case "hidden":
+    case "ismap":
+    case "itemscope":
+    case "loop":
+    case "multiple":
+    case "muted":
+    case "nomodule":
+    case "novalidate":
+    case "open":
+    case "playsinline":
+    case "readonly":
+    case "required":
+    case "reversed":
+    case "selected":
+    case "truespeed":
+    case "webkitdirectory":
+      return true;
+    default:
+      return false;
+  }
+};
+
 // src/ts/interpreter_web.ts
 class PlatformInterpreter extends Interpreter {
   m;
@@ -126,5 +209,6 @@ class PlatformInterpreter extends Interpreter {
   }
 }
 export {
+  setAttributeInner,
   PlatformInterpreter
 };

packages/interpreter/src/lib.rs

@@ -11,6 +11,12 @@ mod write_native_mutations;
 #[cfg(all(feature = "binary-protocol", feature = "sledgehammer"))]
 pub use write_native_mutations::*;
 
+#[cfg(feature = "sledgehammer")]
+pub mod unified_bindings;
+
+#[cfg(feature = "sledgehammer")]
+pub use unified_bindings::*;
+
 // Common bindings for minimal usage.
 #[cfg(all(feature = "minimal_bindings", feature = "webonly"))]
 pub mod minimal_bindings {
@@ -28,9 +34,3 @@ pub mod minimal_bindings {
         pub fn collectFormValues(node: JsValue) -> JsValue;
     }
 }
-
-#[cfg(feature = "sledgehammer")]
-pub mod unified_bindings;
-
-#[cfg(feature = "sledgehammer")]
-pub use unified_bindings::*;

packages/interpreter/src/ts/interpreter_core.ts

@@ -28,14 +28,18 @@ export class Interpreter {
     this.initialize(root);
   }
 
-  initialize(root: HTMLElement) {
+  initialize(root: HTMLElement, handler: EventListener | null = null) {
     this.global = {};
     this.local = {};
     this.root = root;
 
     this.nodes = [root];
     this.stack = [root];
     this.templates = {};
+
+    if (handler) {
+      this.handler = handler;
+    }
   }
 
   createListener(event_name: string, element: HTMLElement, bubbles: boolean) {

packages/interpreter/src/ts/interpreter_web.ts

@@ -5,6 +5,7 @@
 // We're using sledgehammer directly
 
 import { Interpreter } from "./interpreter_core";
+export { setAttributeInner } from "./set_attribute";
 
 export class PlatformInterpreter extends Interpreter {
   m: any;

packages/interpreter/src/unified_bindings.rs

@@ -6,40 +6,13 @@ use wasm_bindgen::prelude::wasm_bindgen;
 
 use sledgehammer_bindgen::bindgen;
 
+/// Combine the interpreter class with the sledgehammer_bindgen generated methods.
 pub fn native_js() -> String {
     format!("{}\n{}", include_str!("./js/native.js"), GENERATED_JS,)
 }
 
 pub const SLEDGEHAMMER_JS: &str = GENERATED_JS;
 
-/// Extensions to the interpreter that are specific to the web platform.
-#[cfg(feature = "webonly")]
-#[wasm_bindgen(module = "src/js/web.js")]
-extern "C" {
-    pub type WebInterpreter;
-
-    #[wasm_bindgen(method, js_name = "saveTemplate")]
-    pub fn save_template(this: &WebInterpreter, nodes: Vec<Node>, tmpl_id: u16);
-
-    #[wasm_bindgen(method)]
-    pub fn hydrate(this: &WebInterpreter, ids: Vec<u32>);
-
-    #[wasm_bindgen(method, js_name = "getNode")]
-    pub fn get_node(this: &WebInterpreter, id: u32) -> Node;
-}
-
-#[cfg(feature = "webonly")]
-type PlatformInterpreter = WebInterpreter;
-
-#[cfg(feature = "webonly")]
-impl Interpreter {
-    /// Convert the interpreter to a web interpreter, enabling methods like hydrate and save_template.
-    pub fn as_web(&self) -> &WebInterpreter {
-        use wasm_bindgen::prelude::JsCast;
-        &self.js_channel().unchecked_ref()
-    }
-}
-
 #[bindgen(module)]
 mod js {
     /// The interpreter extends the core interpreter which contains the state for the interpreter along with some functions that all platforms use like `AppendChildren`.
@@ -222,3 +195,34 @@ mod js {
         "{this.els = this.stack.splice(this.stack.length - $n$); let node = this.LoadChild($array$); node.replaceWith(...this.els);}"
     }
 }
+
+/// Extensions to the interpreter that are specific to the web platform.
+#[cfg(feature = "webonly")]
+#[wasm_bindgen(module = "src/js/web.js")]
+extern "C" {
+    pub type WebInterpreter;
+
+    #[wasm_bindgen(method)]
+    pub fn initialize(this: &WebInterpreter, root: Node, handler: &js_sys::Function);
+
+    #[wasm_bindgen(method, js_name = "saveTemplate")]
+    pub fn save_template(this: &WebInterpreter, nodes: Vec<Node>, tmpl_id: u16);
+
+    #[wasm_bindgen(method)]
+    pub fn hydrate(this: &WebInterpreter, ids: Vec<u32>);
+
+    #[wasm_bindgen(method, js_name = "getNode")]
+    pub fn get_node(this: &WebInterpreter, id: u32) -> Node;
+}
+
+#[cfg(feature = "webonly")]
+type PlatformInterpreter = WebInterpreter;
+
+#[cfg(feature = "webonly")]
+impl Interpreter {
+    /// Convert the interpreter to a web interpreter, enabling methods like hydrate and save_template.
+    pub fn as_web(&self) -> &WebInterpreter {
+        use wasm_bindgen::prelude::JsCast;
+        &self.js_channel().unchecked_ref()
+    }
+}

packages/liveview/src/lib.rs

@@ -31,7 +31,7 @@ pub enum LiveViewError {
 }
 
 fn handle_edits_code() -> String {
-    use dioxus_interpreter_js::binary_protocol::SLEDGEHAMMER_JS;
+    use dioxus_interpreter_js::unified_bindings::SLEDGEHAMMER_JS;
     use minify_js::{minify, Session, TopLevelMode};
 
     let serialize_file_uploads = r#"if (

packages/plasmo/src/hooks.rs

@@ -18,7 +18,6 @@ use dioxus_html::input_data::keyboard_types::{Code, Key, Location, Modifiers};
 use dioxus_html::input_data::{
     MouseButton as DioxusMouseButton, MouseButtonSet as DioxusMouseButtons,
 };
-use dioxus_html::FormValue;
 use dioxus_html::{event_bubbles, prelude::*};
 use std::any::Any;
 use std::collections::HashMap;
@@ -67,7 +66,7 @@ impl EventData {
 pub struct FormData {
     pub(crate) value: String,
 
-    pub values: HashMap<String, FormValue>,
+    pub values: HashMap<String, String>,
 
     pub(crate) files: Option<Files>,
 }
@@ -77,7 +76,7 @@ impl HasFormData for FormData {
         self.value.clone()
     }
 
-    fn values(&self) -> HashMap<String, FormValue> {
+    fn values(&self) -> HashMap<String, String> {
         self.values.clone()
     }
 

packages/web/ric_raf/README.md

@@ -0,0 +1,3 @@
+requestIdleCallback and requestAnimationFrame implemenation
+
+These currently actually slow down our DOM patching and thus are temporarily removed. Technically we can schedule around rIC and rAF but choose not to.