1 files changed, 39 insertions, 10 deletions

diff --git a/native/src/element.rs b/native/src/element.rs
index 73e39012..b00f9e55 100644
--- a/native/src/element.rs
+++ b/native/src/element.rs
@@ -1,6 +1,8 @@
 use crate::{
-    layout, Clipboard, Color, Event, Hasher, Layout, Length, Point, Widget,
+    layout, Clipboard, Color, Event, Hasher, Layout, Length, Overlay, Point,
+    Widget,
 };
+use std::rc::Rc;
 
 /// A generic [`Widget`].
 ///
@@ -15,7 +17,7 @@ use crate::{
 /// [`Element`]: struct.Element.html
 #[allow(missing_debug_implementations)]
 pub struct Element<'a, Message, Renderer> {
-    pub(crate) widget: Box<dyn Widget<Message, Renderer> + 'a>,
+    pub(crate) widget: Box<dyn Widget<'a, Message, Renderer> + 'a>,
 }
 
 impl<'a, Message, Renderer> Element<'a, Message, Renderer>
@@ -27,7 +29,7 @@ where
     /// [`Element`]: struct.Element.html
     /// [`Widget`]: widget/trait.Widget.html
     pub fn new(
-        widget: impl Widget<Message, Renderer> + 'a,
+        widget: impl Widget<'a, Message, Renderer> + 'a,
     ) -> Element<'a, Message, Renderer> {
         Element {
             widget: Box::new(widget),
@@ -270,16 +272,23 @@ where
     pub fn hash_layout(&self, state: &mut Hasher) {
         self.widget.hash_layout(state);
     }
+
+    pub fn overlay<'b>(
+        &'b mut self,
+        layout: Layout<'_>,
+    ) -> Option<Overlay<'b, Message, Renderer>> {
+        self.widget.overlay(layout)
+    }
 }
 
 struct Map<'a, A, B, Renderer> {
-    widget: Box<dyn Widget<A, Renderer> + 'a>,
-    mapper: Box<dyn Fn(A) -> B>,
+    widget: Box<dyn Widget<'a, A, Renderer> + 'a>,
+    mapper: Rc<dyn Fn(A) -> B>,
 }
 
 impl<'a, A, B, Renderer> Map<'a, A, B, Renderer> {
     pub fn new<F>(
-        widget: Box<dyn Widget<A, Renderer> + 'a>,
+        widget: Box<dyn Widget<'a, A, Renderer> + 'a>,
         mapper: F,
     ) -> Map<'a, A, B, Renderer>
     where
@@ -287,14 +296,16 @@ impl<'a, A, B, Renderer> Map<'a, A, B, Renderer> {
     {
         Map {
             widget,
-            mapper: Box::new(mapper),
+            mapper: Rc::new(mapper),
         }
     }
 }
 
-impl<'a, A, B, Renderer> Widget<B, Renderer> for Map<'a, A, B, Renderer>
+impl<'a, A, B, Renderer> Widget<'a, B, Renderer> for Map<'a, A, B, Renderer>
 where
-    Renderer: crate::Renderer,
+    Renderer: crate::Renderer + 'a,
+    A: 'static,
+    B: 'static,
 {
     fn width(&self) -> Length {
         self.widget.width()
@@ -351,6 +362,17 @@ where
     fn hash_layout(&self, state: &mut Hasher) {
         self.widget.hash_layout(state);
     }
+
+    fn overlay(
+        &mut self,
+        layout: Layout<'_>,
+    ) -> Option<Overlay<'_, B, Renderer>> {
+        let mapper = self.mapper.clone();
+
+        self.widget
+            .overlay(layout)
+            .map(move |overlay| overlay.map(mapper))
+    }
 }
 
 struct Explain<'a, Message, Renderer: crate::Renderer> {
@@ -367,7 +389,7 @@ where
     }
 }
 
-impl<'a, Message, Renderer> Widget<Message, Renderer>
+impl<'a, Message, Renderer> Widget<'a, Message, Renderer>
     for Explain<'a, Message, Renderer>
 where
     Renderer: crate::Renderer + layout::Debugger,
@@ -426,4 +448,11 @@ where
     fn hash_layout(&self, state: &mut Hasher) {
         self.element.widget.hash_layout(state);
     }
+
+    fn overlay(
+        &mut self,
+        layout: Layout<'_>,
+    ) -> Option<Overlay<'_, Message, Renderer>> {
+        self.element.overlay(layout)
+    }
 }