From 27ac85a9d98474904c422a891e54888376dec00a Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector0193@gmail.com>
Date: Sat, 14 Sep 2019 20:54:50 +0200
Subject: Draft web runtime and widgets

---
 web/src/widget/slider.rs | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 web/src/widget/slider.rs

(limited to 'web/src/widget/slider.rs')

diff --git a/web/src/widget/slider.rs b/web/src/widget/slider.rs
new file mode 100644
index 00000000..9c83befb
--- /dev/null
+++ b/web/src/widget/slider.rs
@@ -0,0 +1,16 @@
+use crate::{Element, Widget};
+
+pub use iced::slider::State;
+
+pub type Slider<'a, Message> = iced::Slider<'a, Message>;
+
+impl<'a, Message> Widget<Message> for Slider<'a, Message> {}
+
+impl<'a, Message> From<Slider<'a, Message>> for Element<'a, Message>
+where
+    Message: 'static,
+{
+    fn from(slider: Slider<'a, Message>) -> Element<'a, Message> {
+        Element::new(slider)
+    }
+}
-- 
cgit 


From 655978f480c32bc696f0d5fe2fff834bfbf238ea Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector0193@gmail.com>
Date: Sun, 15 Sep 2019 18:53:13 +0200
Subject: Draft nodes for missing widgets

---
 web/src/widget/slider.rs | 55 ++++++++++++++++++++++++++++++++++++++++++++----
 1 file changed, 51 insertions(+), 4 deletions(-)

(limited to 'web/src/widget/slider.rs')

diff --git a/web/src/widget/slider.rs b/web/src/widget/slider.rs
index 9c83befb..31bfcbf3 100644
--- a/web/src/widget/slider.rs
+++ b/web/src/widget/slider.rs
@@ -1,14 +1,61 @@
-use crate::{Element, Widget};
+use crate::{Bus, Element, Widget};
 
-pub use iced::slider::State;
+use dodrio::bumpalo;
 
 pub type Slider<'a, Message> = iced::Slider<'a, Message>;
 
-impl<'a, Message> Widget<Message> for Slider<'a, Message> {}
+pub use iced::slider::State;
+
+impl<'a, Message> Widget<Message> for Slider<'a, Message>
+where
+    Message: 'static + Copy,
+{
+    fn node<'b>(
+        &self,
+        bump: &'b bumpalo::Bump,
+        bus: &Bus<Message>,
+    ) -> dodrio::Node<'b> {
+        use dodrio::builder::*;
+        use wasm_bindgen::JsCast;
+
+        let (start, end) = self.range.clone().into_inner();
+
+        let min = bumpalo::format!(in bump, "{}", start);
+        let max = bumpalo::format!(in bump, "{}", end);
+        let value = bumpalo::format!(in bump, "{}", self.value);
+
+        let on_change = self.on_change.clone();
+        let event_bus = bus.clone();
+
+        // TODO: Make `step` configurable
+        label(bump)
+            .children(vec![input(bump)
+                .attr("type", "range")
+                .attr("step", "0.01")
+                .attr("min", min.into_bump_str())
+                .attr("max", max.into_bump_str())
+                .attr("value", value.into_bump_str())
+                .on("input", move |root, vdom, event| {
+                    let slider = match event.target().and_then(|t| {
+                        t.dyn_into::<web_sys::HtmlInputElement>().ok()
+                    }) {
+                        None => return,
+                        Some(slider) => slider,
+                    };
+
+                    if let Ok(value) = slider.value().parse::<f32>() {
+                        event_bus.publish(on_change(value), root);
+                        vdom.schedule_render();
+                    }
+                })
+                .finish()])
+            .finish()
+    }
+}
 
 impl<'a, Message> From<Slider<'a, Message>> for Element<'a, Message>
 where
-    Message: 'static,
+    Message: 'static + Copy,
 {
     fn from(slider: Slider<'a, Message>) -> Element<'a, Message> {
         Element::new(slider)
-- 
cgit 


From b9e0f7494881ad7cdfbcbc16878ecc6ef717753f Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector0193@gmail.com>
Date: Fri, 20 Sep 2019 19:15:31 +0200
Subject: Create `iced_core` and `iced_native`

---
 web/src/widget/slider.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'web/src/widget/slider.rs')

diff --git a/web/src/widget/slider.rs b/web/src/widget/slider.rs
index 31bfcbf3..19668025 100644
--- a/web/src/widget/slider.rs
+++ b/web/src/widget/slider.rs
@@ -2,9 +2,9 @@ use crate::{Bus, Element, Widget};
 
 use dodrio::bumpalo;
 
-pub type Slider<'a, Message> = iced::Slider<'a, Message>;
+pub type Slider<'a, Message> = iced_core::Slider<'a, Message>;
 
-pub use iced::slider::State;
+pub use iced_core::slider::State;
 
 impl<'a, Message> Widget<Message> for Slider<'a, Message>
 where
-- 
cgit 


From 86dede4c4cc2bca9be7d2e6bd831daa98bd7043d Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector0193@gmail.com>
Date: Sat, 21 Sep 2019 13:38:14 +0200
Subject: Make example work on web and update READMEs

---
 web/src/widget/slider.rs | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'web/src/widget/slider.rs')

diff --git a/web/src/widget/slider.rs b/web/src/widget/slider.rs
index 19668025..54b2fdf6 100644
--- a/web/src/widget/slider.rs
+++ b/web/src/widget/slider.rs
@@ -2,9 +2,7 @@ use crate::{Bus, Element, Widget};
 
 use dodrio::bumpalo;
 
-pub type Slider<'a, Message> = iced_core::Slider<'a, Message>;
-
-pub use iced_core::slider::State;
+pub use iced_core::slider::*;
 
 impl<'a, Message> Widget<Message> for Slider<'a, Message>
 where
@@ -28,6 +26,7 @@ where
         let event_bus = bus.clone();
 
         // TODO: Make `step` configurable
+        // TODO: Complete styling
         label(bump)
             .children(vec![input(bump)
                 .attr("type", "range")
-- 
cgit