1 files changed, 30 insertions, 17 deletions

diff --git a/lazy/src/lazy.rs b/widget/src/lazy.rs
index 5e909a49..b08ed8cb 100644
--- a/lazy/src/lazy.rs
+++ b/widget/src/lazy.rs
@@ -1,12 +1,25 @@
-use iced_native::event;
-use iced_native::layout::{self, Layout};
-use iced_native::mouse;
-use iced_native::overlay;
-use iced_native::renderer;
-use iced_native::widget::tree::{self, Tree};
-use iced_native::widget::{self, Widget};
-use iced_native::Element;
-use iced_native::{Clipboard, Hasher, Length, Point, Rectangle, Shell, Size};
+#![allow(clippy::await_holding_refcell_ref, clippy::type_complexity)]
+pub(crate) mod helpers;
+
+pub mod component;
+pub mod responsive;
+
+pub use component::Component;
+pub use responsive::Responsive;
+
+mod cache;
+
+use crate::core::event::{self, Event};
+use crate::core::layout::{self, Layout};
+use crate::core::mouse;
+use crate::core::overlay;
+use crate::core::renderer;
+use crate::core::widget::tree::{self, Tree};
+use crate::core::widget::{self, Widget};
+use crate::core::Element;
+use crate::core::{
+    self, Clipboard, Hasher, Length, Point, Rectangle, Shell, Size,
+};
 
 use ouroboros::self_referencing;
 use std::cell::RefCell;
@@ -41,7 +54,7 @@ where
 
     fn with_element<T>(
         &self,
-        f: impl FnOnce(&Element<Message, Renderer>) -> T,
+        f: impl FnOnce(&Element<'_, Message, Renderer>) -> T,
     ) -> T {
         f(self
             .element
@@ -55,7 +68,7 @@ where
 
     fn with_element_mut<T>(
         &self,
-        f: impl FnOnce(&mut Element<Message, Renderer>) -> T,
+        f: impl FnOnce(&mut Element<'_, Message, Renderer>) -> T,
     ) -> T {
         f(self
             .element
@@ -79,7 +92,7 @@ where
     View: Into<Element<'static, Message, Renderer>> + 'static,
     Dependency: Hash + 'a,
     Message: 'static,
-    Renderer: iced_native::Renderer + 'static,
+    Renderer: core::Renderer + 'static,
 {
     fn tag(&self) -> tree::Tag {
         struct Tag<T>(T);
@@ -163,7 +176,7 @@ where
     fn on_event(
         &mut self,
         tree: &mut Tree,
-        event: iced_native::Event,
+        event: Event,
         layout: Layout<'_>,
         cursor_position: Point,
         renderer: &Renderer,
@@ -304,7 +317,7 @@ impl<'a, Message, Renderer> Overlay<'a, Message, Renderer> {
 impl<'a, Message, Renderer> overlay::Overlay<Message, Renderer>
     for Overlay<'a, Message, Renderer>
 where
-    Renderer: iced_native::Renderer,
+    Renderer: core::Renderer,
 {
     fn layout(
         &self,
@@ -353,7 +366,7 @@ where
 
     fn on_event(
         &mut self,
-        event: iced_native::Event,
+        event: Event,
         layout: Layout<'_>,
         cursor_position: Point,
         renderer: &Renderer,
@@ -370,7 +383,7 @@ where
                 shell,
             )
         })
-        .unwrap_or(iced_native::event::Status::Ignored)
+        .unwrap_or(event::Status::Ignored)
     }
 
     fn is_over(&self, layout: Layout<'_>, cursor_position: Point) -> bool {
@@ -386,7 +399,7 @@ impl<'a, Message, Renderer, Dependency, View>
     for Element<'a, Message, Renderer>
 where
     View: Into<Element<'static, Message, Renderer>> + 'static,
-    Renderer: iced_native::Renderer + 'static,
+    Renderer: core::Renderer + 'static,
     Message: 'static,
     Dependency: Hash + 'a,
 {