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/element.rs | 47 +++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 47 insertions(+)
 create mode 100644 web/src/element.rs

(limited to 'web/src/element.rs')

diff --git a/web/src/element.rs b/web/src/element.rs
new file mode 100644
index 00000000..c0c9ce5d
--- /dev/null
+++ b/web/src/element.rs
@@ -0,0 +1,47 @@
+use crate::{Color, Widget};
+
+pub struct Element<'a, Message> {
+    pub(crate) widget: Box<dyn Widget<Message> + 'a>,
+}
+
+impl<'a, Message> Element<'a, Message> {
+    pub fn new(widget: impl Widget<Message> + 'a) -> Self {
+        Self {
+            widget: Box::new(widget),
+        }
+    }
+
+    pub fn explain(self, color: Color) -> Element<'a, Message> {
+        self
+    }
+
+    pub fn map<F, B>(self, f: F) -> Element<'a, B>
+    where
+        Message: 'static,
+        B: 'static,
+        F: 'static + Fn(Message) -> B,
+    {
+        Element {
+            widget: Box::new(Map::new(self.widget, f)),
+        }
+    }
+}
+
+struct Map<'a, A, B> {
+    widget: Box<dyn Widget<A> + 'a>,
+    mapper: Box<dyn Fn(A) -> B>,
+}
+
+impl<'a, A, B> Map<'a, A, B> {
+    pub fn new<F>(widget: Box<dyn Widget<A> + 'a>, mapper: F) -> Map<'a, A, B>
+    where
+        F: 'static + Fn(A) -> B,
+    {
+        Map {
+            widget,
+            mapper: Box::new(mapper),
+        }
+    }
+}
+
+impl<'a, A, B> Widget<B> for Map<'a, A, B> {}
-- 
cgit 


From 8834772fa70850559f7bd82cc8432394e3fd9db7 Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector0193@gmail.com>
Date: Sun, 15 Sep 2019 17:43:15 +0200
Subject: Draft widget nodes and wire interaction

---
 web/src/element.rs | 25 ++++++++++++++++++++-----
 1 file changed, 20 insertions(+), 5 deletions(-)

(limited to 'web/src/element.rs')

diff --git a/web/src/element.rs b/web/src/element.rs
index c0c9ce5d..8270d8db 100644
--- a/web/src/element.rs
+++ b/web/src/element.rs
@@ -1,4 +1,7 @@
-use crate::{Color, Widget};
+use crate::{Bus, Color, Widget};
+
+use dodrio::bumpalo;
+use std::rc::Rc;
 
 pub struct Element<'a, Message> {
     pub(crate) widget: Box<dyn Widget<Message> + 'a>,
@@ -11,7 +14,7 @@ impl<'a, Message> Element<'a, Message> {
         }
     }
 
-    pub fn explain(self, color: Color) -> Element<'a, Message> {
+    pub fn explain(self, _color: Color) -> Element<'a, Message> {
         self
     }
 
@@ -29,7 +32,7 @@ impl<'a, Message> Element<'a, Message> {
 
 struct Map<'a, A, B> {
     widget: Box<dyn Widget<A> + 'a>,
-    mapper: Box<dyn Fn(A) -> B>,
+    mapper: Rc<Box<dyn Fn(A) -> B>>,
 }
 
 impl<'a, A, B> Map<'a, A, B> {
@@ -39,9 +42,21 @@ impl<'a, A, B> Map<'a, A, B> {
     {
         Map {
             widget,
-            mapper: Box::new(mapper),
+            mapper: Rc::new(Box::new(mapper)),
         }
     }
 }
 
-impl<'a, A, B> Widget<B> for Map<'a, A, B> {}
+impl<'a, A, B> Widget<B> for Map<'a, A, B>
+where
+    A: 'static,
+    B: 'static,
+{
+    fn node<'b>(
+        &self,
+        bump: &'b bumpalo::Bump,
+        bus: &Bus<B>,
+    ) -> dodrio::Node<'b> {
+        self.widget.node(bump, &bus.map(self.mapper.clone()))
+    }
+}
-- 
cgit