Allow pure widgets to borrow from Application data 🎉

pure/src/widget/button.rs

@@ -13,17 +13,17 @@ use iced_style::button::StyleSheet;
 
 use std::any::Any;
 
-pub struct Button<Message, Renderer> {
-    content: Element<Message, Renderer>,
+pub struct Button<'a, Message, Renderer> {
+    content: Element<'a, Message, Renderer>,
     on_press: Option<Message>,
-    style_sheet: Box<dyn StyleSheet>,
+    style_sheet: Box<dyn StyleSheet + 'a>,
     width: Length,
     height: Length,
     padding: Padding,
 }
 
-impl<Message, Renderer> Button<Message, Renderer> {
-    pub fn new(content: impl Into<Element<Message, Renderer>>) -> Self {
+impl<'a, Message, Renderer> Button<'a, Message, Renderer> {
+    pub fn new(content: impl Into<Element<'a, Message, Renderer>>) -> Self {
         Button {
             content: content.into(),
             on_press: None,
@@ -40,7 +40,8 @@ impl<Message, Renderer> Button<Message, Renderer> {
     }
 }
 
-impl<Message, Renderer> Widget<Message, Renderer> for Button<Message, Renderer>
+impl<'a, Message, Renderer> Widget<Message, Renderer>
+    for Button<'a, Message, Renderer>
 where
     Message: 'static + Clone,
     Renderer: 'static + iced_native::Renderer,
@@ -96,7 +97,7 @@ where
 
     fn on_event(
         &mut self,
-        tree: &mut Tree<Message, Renderer>,
+        tree: &mut Tree,
         event: Event,
         layout: Layout<'_>,
         cursor_position: Point,
@@ -162,7 +163,7 @@ where
 
     fn draw(
         &self,
-        tree: &Tree<Message, Renderer>,
+        tree: &Tree,
         renderer: &mut Renderer,
         _style: &renderer::Style,
         layout: Layout<'_>,
@@ -238,7 +239,7 @@ where
 
     fn mouse_interaction(
         &self,
-        _tree: &Tree<Message, Renderer>,
+        _tree: &Tree,
         layout: Layout<'_>,
         cursor_position: Point,
         _viewport: &Rectangle,
@@ -260,13 +261,13 @@ struct State {
     is_pressed: bool,
 }
 
-impl<Message, Renderer> Into<Element<Message, Renderer>>
-    for Button<Message, Renderer>
+impl<'a, Message, Renderer> Into<Element<'a, Message, Renderer>>
+    for Button<'a, Message, Renderer>
 where
     Message: Clone + 'static,
     Renderer: iced_native::Renderer + 'static,
 {
-    fn into(self) -> Element<Message, Renderer> {
+    fn into(self) -> Element<'a, Message, Renderer> {
         Element::new(self)
     }
 }

pure/src/widget/column.rs

@@ -11,21 +11,23 @@ use iced_native::{
 
 use std::any::{self, Any};
 
-pub struct Column<Message, Renderer> {
+pub struct Column<'a, Message, Renderer> {
     spacing: u16,
     padding: Padding,
     width: Length,
     height: Length,
     align_items: Alignment,
-    children: Vec<Element<Message, Renderer>>,
+    children: Vec<Element<'a, Message, Renderer>>,
 }
 
-impl<'a, Message, Renderer> Column<Message, Renderer> {
+impl<'a, Message, Renderer> Column<'a, Message, Renderer> {
     pub fn new() -> Self {
         Self::with_children(Vec::new())
     }
 
-    pub fn with_children(children: Vec<Element<Message, Renderer>>) -> Self {
+    pub fn with_children(
+        children: Vec<Element<'a, Message, Renderer>>,
+    ) -> Self {
         Column {
             spacing: 0,
             padding: Padding::ZERO,
@@ -63,14 +65,15 @@ impl<'a, Message, Renderer> Column<Message, Renderer> {
 
     pub fn push(
         mut self,
-        child: impl Into<Element<Message, Renderer>>,
+        child: impl Into<Element<'a, Message, Renderer>>,
     ) -> Self {
         self.children.push(child.into());
         self
     }
 }
 
-impl<Message, Renderer> Widget<Message, Renderer> for Column<Message, Renderer>
+impl<'a, Message, Renderer> Widget<Message, Renderer>
+    for Column<'a, Message, Renderer>
 where
     Renderer: iced_native::Renderer,
 {
@@ -115,7 +118,7 @@ where
 
     fn on_event(
         &mut self,
-        tree: &mut Tree<Message, Renderer>,
+        tree: &mut Tree,
         event: Event,
         layout: Layout<'_>,
         cursor_position: Point,
@@ -143,7 +146,7 @@ where
 
     fn mouse_interaction(
         &self,
-        tree: &Tree<Message, Renderer>,
+        tree: &Tree,
         layout: Layout<'_>,
         cursor_position: Point,
         viewport: &Rectangle,
@@ -168,7 +171,7 @@ where
 
     fn draw(
         &self,
-        tree: &Tree<Message, Renderer>,
+        tree: &Tree,
         renderer: &mut Renderer,
         style: &renderer::Style,
         layout: Layout<'_>,
@@ -208,13 +211,13 @@ where
     }
 }
 
-impl<Message, Renderer> Into<Element<Message, Renderer>>
-    for Column<Message, Renderer>
+impl<'a, Message, Renderer> Into<Element<'a, Message, Renderer>>
+    for Column<'a, Message, Renderer>
 where
     Message: 'static,
     Renderer: iced_native::Renderer + 'static,
 {
-    fn into(self) -> Element<Message, Renderer> {
+    fn into(self) -> Element<'a, Message, Renderer> {
         Element::new(self)
     }
 }

pure/src/widget/element.rs

@@ -1,11 +1,11 @@
 use crate::Widget;
 
-pub struct Element<Message, Renderer> {
-    widget: Box<dyn Widget<Message, Renderer>>,
+pub struct Element<'a, Message, Renderer> {
+    widget: Box<dyn Widget<Message, Renderer> + 'a>,
 }
 
-impl<Message, Renderer> Element<Message, Renderer> {
-    pub fn new(widget: impl Widget<Message, Renderer> + 'static) -> Self {
+impl<'a, Message, Renderer> Element<'a, Message, Renderer> {
+    pub fn new(widget: impl Widget<Message, Renderer> + 'a) -> Self {
         Self {
             widget: Box::new(widget),
         }

pure/src/widget/text.rs

@@ -133,7 +133,7 @@ where
 
     fn draw(
         &self,
-        _tree: &Tree<Message, Renderer>,
+        _tree: &Tree,
         renderer: &mut Renderer,
         style: &renderer::Style,
         layout: Layout<'_>,
@@ -166,20 +166,22 @@ where
     }
 }
 
-impl<Message, Renderer> Into<Element<Message, Renderer>> for Text<Renderer>
+impl<'a, Message, Renderer> Into<Element<'a, Message, Renderer>>
+    for Text<Renderer>
 where
     Renderer: text::Renderer + 'static,
 {
-    fn into(self) -> Element<Message, Renderer> {
+    fn into(self) -> Element<'a, Message, Renderer> {
         Element::new(self)
     }
 }
 
-impl<Message, Renderer> Into<Element<Message, Renderer>> for &'static str
+impl<'a, Message, Renderer> Into<Element<'a, Message, Renderer>>
+    for &'static str
 where
     Renderer: text::Renderer + 'static,
 {
-    fn into(self) -> Element<Message, Renderer> {
+    fn into(self) -> Element<'a, Message, Renderer> {
         Text::new(self).into()
     }
 }

pure/src/widget/tree.rs

@@ -1,17 +1,27 @@
 use crate::widget::Element;
 
-use std::any::Any;
-use std::marker::PhantomData;
+use std::any::{self, Any};
 
-pub struct Tree<Message, Renderer> {
+pub struct Tree {
+    pub tag: any::TypeId,
     pub state: Box<dyn Any>,
-    pub children: Vec<Tree<Message, Renderer>>,
-    types_: PhantomData<(Message, Renderer)>,
+    pub children: Vec<Tree>,
 }
 
-impl<Message, Renderer> Tree<Message, Renderer> {
-    pub fn new(element: &Element<Message, Renderer>) -> Self {
+impl Tree {
+    pub fn empty() -> Self {
         Self {
+            tag: any::TypeId::of::<()>(),
+            state: Box::new(()),
+            children: Vec::new(),
+        }
+    }
+
+    pub fn new<Message, Renderer>(
+        element: &Element<'_, Message, Renderer>,
+    ) -> Self {
+        Self {
+            tag: element.as_widget().tag(),
             state: element.as_widget().state(),
             children: element
                 .as_widget()
@@ -19,36 +29,29 @@ impl<Message, Renderer> Tree<Message, Renderer> {
                 .iter()
                 .map(Self::new)
                 .collect(),
-            types_: PhantomData,
         }
     }
 
-    pub fn diff(
+    pub fn diff<Message, Renderer>(
         &mut self,
-        current: &Element<Message, Renderer>,
-        new: &Element<Message, Renderer>,
+        new: &Element<'_, Message, Renderer>,
     ) {
-        if current.as_widget().tag() == new.as_widget().tag() {
-            let current_children = current.as_widget().children();
+        if self.tag == new.as_widget().tag() {
             let new_children = new.as_widget().children();
 
-            if current_children.len() > new_children.len() {
+            if self.children.len() > new_children.len() {
                 self.children.truncate(new_children.len());
             }
 
-            for (child_state, (current, new)) in self
-                .children
-                .iter_mut()
-                .zip(current_children.iter().zip(new_children.iter()))
+            for (child_state, new) in
+                self.children.iter_mut().zip(new_children.iter())
             {
-                child_state.diff(current, new);
+                child_state.diff(new);
             }
 
-            if current_children.len() < new_children.len() {
+            if self.children.len() < new_children.len() {
                 self.children.extend(
-                    new_children[current_children.len()..]
-                        .iter()
-                        .map(Self::new),
+                    new_children[self.children.len()..].iter().map(Self::new),
                 );
             }
         } else {