From d0f79d2779d00752eef78cd98b6904cd888d59e3 Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector0193@gmail.com>
Date: Sat, 23 Nov 2019 20:23:38 +0100
Subject: Make `tour` work with `iced_web` again :tada:

- Implements `TextInput`, `Scrollable`, and `Container`
- Adds basic style generation
---
 web/src/element.rs | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

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

diff --git a/web/src/element.rs b/web/src/element.rs
index fcf0a4b6..0315d7d6 100644
--- a/web/src/element.rs
+++ b/web/src/element.rs
@@ -1,4 +1,4 @@
-use crate::{Bus, Color, Widget};
+use crate::{style, Bus, Color, Widget};
 
 use dodrio::bumpalo;
 use std::rc::Rc;
@@ -57,8 +57,9 @@ impl<'a, Message> Element<'a, Message> {
         &self,
         bump: &'b bumpalo::Bump,
         bus: &Bus<Message>,
+        style_sheet: &mut style::Sheet<'b>,
     ) -> dodrio::Node<'b> {
-        self.widget.node(bump, bus)
+        self.widget.node(bump, bus, style_sheet)
     }
 }
 
@@ -88,7 +89,9 @@ where
         &self,
         bump: &'b bumpalo::Bump,
         bus: &Bus<B>,
+        style_sheet: &mut style::Sheet<'b>,
     ) -> dodrio::Node<'b> {
-        self.widget.node(bump, &bus.map(self.mapper.clone()))
+        self.widget
+            .node(bump, &bus.map(self.mapper.clone()), style_sheet)
     }
 }
-- 
cgit 


From 9f3abe920271996cc4a9c533ad5e0e75e3d18a3d Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector0193@gmail.com>
Date: Sun, 24 Nov 2019 11:25:14 +0100
Subject: Spawn `Command` futures in `iced_web`

---
 web/src/element.rs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

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

diff --git a/web/src/element.rs b/web/src/element.rs
index 0315d7d6..85fa7c34 100644
--- a/web/src/element.rs
+++ b/web/src/element.rs
@@ -38,8 +38,8 @@ impl<'a, Message> Element<'a, Message> {
     /// [`Element`]: struct.Element.html
     pub fn map<F, B>(self, f: F) -> Element<'a, B>
     where
-        Message: 'static,
-        B: 'static,
+        Message: 'static + Clone,
+        B: 'static + Clone,
         F: 'static + Fn(Message) -> B,
     {
         Element {
@@ -82,8 +82,8 @@ impl<'a, A, B> Map<'a, A, B> {
 
 impl<'a, A, B> Widget<B> for Map<'a, A, B>
 where
-    A: 'static,
-    B: 'static,
+    A: 'static + Clone,
+    B: 'static + Clone,
 {
     fn node<'b>(
         &self,
-- 
cgit