From c498b9e2b13453708e94917afe94ab66cea8a149 Mon Sep 17 00:00:00 2001
From: Pauan <pauanyu+github@pm.me>
Date: Tue, 2 Jun 2020 03:08:34 +0200
Subject: [PATCH] Minor improvement to the text implementation

---
 src/bindings.rs |  6 +-----
 src/dom.rs      | 38 +++++++++++++++++---------------------
 2 files changed, 18 insertions(+), 26 deletions(-)

diff --git a/src/bindings.rs b/src/bindings.rs
index d12adf0..0ce39ad 100644
--- a/src/bindings.rs
+++ b/src/bindings.rs
@@ -149,10 +149,6 @@ pub(crate) fn remove_class(classes: &DomTokenList, value: &str) {
     classes.remove_1(value).unwrap_throw();
 }
 
-pub(crate) fn set_text_content(elem: &Node, value: &str) {
-    elem.set_text_content(Some(value));
-}
-
 pub(crate) fn get_style(style: &CssStyleDeclaration, name: &str) -> String {
     style.get_property_value(name).unwrap_throw()
 }
@@ -197,5 +193,5 @@ pub(crate) fn blur(elem: &HtmlElement) {
 
 #[inline]
 pub(crate) fn remove_all_children(node: &Node) {
-    set_text_content(node, intern(""));
+    node.set_text_content(Some(intern("")));
 }
diff --git a/src/dom.rs b/src/dom.rs
index dac116e..2700567 100644
--- a/src/dom.rs
+++ b/src/dom.rs
@@ -11,7 +11,7 @@ use futures_util::FutureExt;
 use futures_channel::oneshot;
 use discard::{Discard, DiscardOnDrop};
 use wasm_bindgen::{JsValue, UnwrapThrowExt, JsCast, intern};
-use web_sys::{HtmlElement, Node, EventTarget, Element, CssStyleSheet, CssStyleDeclaration, ShadowRoot, ShadowRootMode, ShadowRootInit};
+use web_sys::{HtmlElement, Node, EventTarget, Element, CssStyleSheet, CssStyleDeclaration, ShadowRoot, ShadowRootMode, ShadowRootInit, Text};
 
 use crate::bindings;
 use crate::callbacks::Callbacks;
@@ -190,15 +190,12 @@ pub fn text(value: &str) -> Dom {
 }
 
 
-// TODO should this inline ?
-pub fn text_signal<A, B>(value: B) -> Dom
+fn make_text_signal<A, B>(callbacks: &mut Callbacks, value: B) -> Text
     where A: AsStr,
           B: Signal<Item = A> + 'static {
 
     let element = bindings::create_text_node(intern(""));
 
-    let mut callbacks = Callbacks::new();
-
     {
         let element = element.clone();
 
@@ -210,6 +207,18 @@ pub fn text_signal<A, B>(value: B) -> Dom
         }));
     }
 
+    element
+}
+
+// TODO should this inline ?
+pub fn text_signal<A, B>(value: B) -> Dom
+    where A: AsStr,
+          B: Signal<Item = A> + 'static {
+
+    let mut callbacks = Callbacks::new();
+
+    let element = make_text_signal(&mut callbacks, value);
+
     Dom {
         element: element.into(),
         callbacks: callbacks,
@@ -585,31 +594,18 @@ impl<A> DomBuilder<A> where A: AsRef<Node> {
     pub fn text(mut self, value: &str) -> Self {
         self.check_children();
         // TODO should this intern ?
-        bindings::set_text_content(self.element.as_ref(), &value);
+        bindings::append_child(self.element.as_ref(), &bindings::create_text_node(value));
         self
     }
 
-    // TODO should this inline ?
-    fn set_text_signal<B, C>(&mut self, value: C)
-        where B: AsStr,
-              C: Signal<Item = B> + 'static {
-
-        let element = self.element.as_ref().clone();
-
-        self.callbacks.after_remove(for_each(value, move |value| {
-            let value = value.as_str();
-            // TODO maybe intern this ?
-            bindings::set_text_content(&element, &value);
-        }));
-    }
-
     #[inline]
     pub fn text_signal<B, C>(mut self, value: C) -> Self
         where B: AsStr,
               C: Signal<Item = B> + 'static {
 
         self.check_children();
-        self.set_text_signal(value);
+        let element = make_text_signal(&mut self.callbacks, value);
+        bindings::append_child(self.element.as_ref(), &element);
         self
     }