Merge branch 'master' into add-file-data-drag-event

packages/interpreter/src/interpreter.js

@@ -159,22 +159,29 @@ class Interpreter {
     }
   }
   RemoveAttribute(root, field, ns) {
-    const name = field;
     const node = this.nodes[root];
-    if (ns == "style") {
+    if (!ns) {
+      switch (field) {
+        case "value":
+          node.value = "";
+          break;
+        case "checked":
+          node.checked = false;
+          break;
+        case "selected":
+          node.selected = false;
+          break;
+        case "dangerous_inner_html":
+          node.innerHTML = "";
+          break;
+        default:
+          node.removeAttribute(field);
+          break;
+      }
+    } else if (ns == "style") {
       node.style.removeProperty(name);
-    } else if (ns !== null || ns !== undefined) {
-      node.removeAttributeNS(ns, name);
-    } else if (name === "value") {
-      node.value = "";
-    } else if (name === "checked") {
-      node.checked = false;
-    } else if (name === "selected") {
-      node.selected = false;
-    } else if (name === "dangerous_inner_html") {
-      node.innerHTML = "";
     } else {
-      node.removeAttribute(name);
+      node.removeAttributeNS(ns, field);
     }
   }
 
@@ -383,7 +390,11 @@ class Interpreter {
 async function handler(event, name, bubbles, config) {
   let target = event.target;
   if (target != null) {
-    let preventDefaultRequests = target.getAttribute(`dioxus-prevent-default`);
+    let preventDefaultRequests = null;
+    // Some events can be triggered on text nodes, which don't have attributes
+    if (target instanceof Element) {
+      preventDefaultRequests = target.getAttribute(`dioxus-prevent-default`);
+    }
 
     if (event.type === "click") {
       // todo call prevent default if it's the right type of event
@@ -439,15 +450,24 @@ async function handler(event, name, bubbles, config) {
       target.tagName === "FORM" &&
       (event.type === "submit" || event.type === "input")
     ) {
-      if (
-        target.tagName === "FORM" &&
-        (event.type === "submit" || event.type === "input")
-      ) {
-        const formData = new FormData(target);
+      const formData = new FormData(target);
 
-        for (let name of formData.keys()) {
-          let value = formData.getAll(name);
-          contents.values[name] = value;
+      for (let name of formData.keys()) {
+        let value = formData.getAll(name);
+        contents.values[name] = value;
+      }
+    }
+
+    if (
+      target.tagName === "SELECT" &&
+      event.type === "input"
+    ) {
+      const selectData = target.options;
+      contents.values["options"] = [];
+      for (let i = 0; i < selectData.length; i++) {
+        let option = selectData[i];
+        if (option.selected) {
+          contents.values["options"].push(option.value.toString());
         }
       }
     }
@@ -467,7 +487,10 @@ async function handler(event, name, bubbles, config) {
 }
 
 function find_real_id(target) {
-  let realId = target.getAttribute(`data-dioxus-id`);
+  let realId = null;
+  if (target instanceof Element) {
+    realId = target.getAttribute(`data-dioxus-id`);
+  }
   // walk the tree to find the real element
   while (realId == null) {
     // we've reached the root we don't want to send an event
@@ -476,7 +499,9 @@ function find_real_id(target) {
     }
 
     target = target.parentElement;
-    realId = target.getAttribute(`data-dioxus-id`);
+    if (target instanceof Element) {
+      realId = target.getAttribute(`data-dioxus-id`);
+    }
   }
   return realId;
 }

packages/interpreter/src/sledgehammer_bindings.rs

@@ -230,23 +230,32 @@ mod js {
         "{node = nodes[$id$]; SetAttributeInner(node, $field$, $value$, $ns$);}"
     }
     fn remove_attribute(id: u32, field: &str<u8, attr>, ns: &str<u8, ns_cache>) {
-        r#"{name = $field$;
-        node = nodes[$id$];
-        if (ns == "style") {
-            node.style.removeProperty(name);
-        } else if (ns !== null && ns !== undefined && ns !== "") {
-            node.removeAttributeNS(ns, name);
-        } else if (name === "value") {
-            node.value = "";
-        } else if (name === "checked") {
-            node.checked = false;
-        } else if (name === "selected") {
-            node.selected = false;
-        } else if (name === "dangerous_inner_html") {
-            node.innerHTML = "";
-        } else {
-            node.removeAttribute(name);
-        }}"#
+        r#"{
+            node = nodes[$id$];
+            if (!ns) {
+                switch (field) {
+                    case "value":
+                        node.value = "";
+                        break;
+                    case "checked":
+                        node.checked = false;
+                        break;
+                    case "selected":
+                        node.selected = false;
+                        break;
+                    case "dangerous_inner_html":
+                        node.innerHTML = "";
+                        break;
+                    default:
+                        node.removeAttribute(field);
+                        break;
+                }
+            } else if (ns == "style") {
+                node.style.removeProperty(name);
+            } else {
+                node.removeAttributeNS(ns, field);
+            }
+        }"#
     }
     fn assign_id(ptr: u32, len: u8, id: u32) {
         "{nodes[$id$] = LoadChild($ptr$, $len$);}"