Export widget modules in iced_pure

... and fix collisions with the new `helpers`

pure/src/widget/button.rs

@@ -1,6 +1,6 @@
 use crate::overlay;
 use crate::widget::tree::{self, Tree};
-use crate::widget::{Element, Widget};
+use crate::{Element, Widget};
 
 use iced_native::event::{self, Event};
 use iced_native::layout;
@@ -10,9 +10,10 @@ use iced_native::widget::button;
 use iced_native::{
     Clipboard, Layout, Length, Padding, Point, Rectangle, Shell,
 };
-use iced_style::button::StyleSheet;
 
-pub use button::State;
+pub use iced_style::button::{Style, StyleSheet};
+
+use button::State;
 
 pub struct Button<'a, Message, Renderer> {
     content: Element<'a, Message, Renderer>,

pure/src/widget/checkbox.rs

@@ -1,4 +1,5 @@
-use crate::{Element, Tree, Widget};
+use crate::widget::Tree;
+use crate::{Element, Widget};
 
 use iced_native::event::{self, Event};
 use iced_native::layout::{self, Layout};
@@ -7,7 +8,7 @@ use iced_native::renderer;
 use iced_native::text;
 use iced_native::{Clipboard, Length, Point, Rectangle, Shell};
 
-pub use iced_native::widget::Checkbox;
+pub use iced_native::widget::checkbox::{Checkbox, Style, StyleSheet};
 
 impl<'a, Message, Renderer> Widget<Message, Renderer>
     for Checkbox<'a, Message, Renderer>

pure/src/widget/column.rs

@@ -1,6 +1,7 @@
 use crate::flex;
 use crate::overlay;
-use crate::widget::{Element, Tree, Widget};
+use crate::widget::Tree;
+use crate::{Element, Widget};
 
 use iced_native::event::{self, Event};
 use iced_native::layout::{self, Layout};

pure/src/widget/container.rs

@@ -1,5 +1,6 @@
 //! Decorate content and apply alignment.
-use crate::{Element, Tree, Widget};
+use crate::widget::Tree;
+use crate::{Element, Widget};
 
 use iced_native::alignment;
 use iced_native::event::{self, Event};

pure/src/widget/element.rs

@@ -1,163 +0,0 @@
-use crate::widget::tree::{self, Tree};
-use crate::widget::Widget;
-
-use iced_native::event::{self, Event};
-use iced_native::layout::{self, Layout};
-use iced_native::mouse;
-use iced_native::renderer;
-use iced_native::{Clipboard, Length, Point, Rectangle, Shell};
-
-pub struct Element<'a, Message, Renderer> {
-    widget: Box<dyn Widget<Message, Renderer> + 'a>,
-}
-
-impl<'a, Message, Renderer> Element<'a, Message, Renderer> {
-    pub fn new(widget: impl Widget<Message, Renderer> + 'a) -> Self {
-        Self {
-            widget: Box::new(widget),
-        }
-    }
-
-    pub fn as_widget(&self) -> &dyn Widget<Message, Renderer> {
-        self.widget.as_ref()
-    }
-
-    pub fn as_widget_mut(&mut self) -> &mut dyn Widget<Message, Renderer> {
-        self.widget.as_mut()
-    }
-
-    pub fn map<B>(
-        self,
-        f: impl Fn(Message) -> B + 'a,
-    ) -> Element<'a, B, Renderer>
-    where
-        Message: 'a,
-        Renderer: iced_native::Renderer + 'a,
-        B: 'a,
-    {
-        Element::new(Map::new(self.widget, f))
-    }
-}
-
-struct Map<'a, A, B, Renderer> {
-    widget: Box<dyn Widget<A, Renderer> + 'a>,
-    mapper: Box<dyn Fn(A) -> B + 'a>,
-}
-
-impl<'a, A, B, Renderer> Map<'a, A, B, Renderer> {
-    pub fn new<F>(
-        widget: Box<dyn Widget<A, Renderer> + 'a>,
-        mapper: F,
-    ) -> Map<'a, A, B, Renderer>
-    where
-        F: 'a + Fn(A) -> B,
-    {
-        Map {
-            widget,
-            mapper: Box::new(mapper),
-        }
-    }
-}
-
-impl<'a, A, B, Renderer> Widget<B, Renderer> for Map<'a, A, B, Renderer>
-where
-    Renderer: iced_native::Renderer + 'a,
-    A: 'a,
-    B: 'a,
-{
-    fn tag(&self) -> tree::Tag {
-        self.widget.tag()
-    }
-
-    fn state(&self) -> tree::State {
-        self.widget.state()
-    }
-
-    fn children(&self) -> Vec<Tree> {
-        self.widget.children()
-    }
-
-    fn diff(&self, tree: &mut Tree) {
-        self.widget.diff(tree)
-    }
-
-    fn width(&self) -> Length {
-        self.widget.width()
-    }
-
-    fn height(&self) -> Length {
-        self.widget.height()
-    }
-
-    fn layout(
-        &self,
-        renderer: &Renderer,
-        limits: &layout::Limits,
-    ) -> layout::Node {
-        self.widget.layout(renderer, limits)
-    }
-
-    fn on_event(
-        &mut self,
-        tree: &mut Tree,
-        event: Event,
-        layout: Layout<'_>,
-        cursor_position: Point,
-        renderer: &Renderer,
-        clipboard: &mut dyn Clipboard,
-        shell: &mut Shell<'_, B>,
-    ) -> event::Status {
-        let mut local_messages = Vec::new();
-        let mut local_shell = Shell::new(&mut local_messages);
-
-        let status = self.widget.on_event(
-            tree,
-            event,
-            layout,
-            cursor_position,
-            renderer,
-            clipboard,
-            &mut local_shell,
-        );
-
-        shell.merge(local_shell, &self.mapper);
-
-        status
-    }
-
-    fn draw(
-        &self,
-        tree: &Tree,
-        renderer: &mut Renderer,
-        style: &renderer::Style,
-        layout: Layout<'_>,
-        cursor_position: Point,
-        viewport: &Rectangle,
-    ) {
-        self.widget.draw(
-            tree,
-            renderer,
-            style,
-            layout,
-            cursor_position,
-            viewport,
-        )
-    }
-
-    fn mouse_interaction(
-        &self,
-        tree: &Tree,
-        layout: Layout<'_>,
-        cursor_position: Point,
-        viewport: &Rectangle,
-        renderer: &Renderer,
-    ) -> mouse::Interaction {
-        self.widget.mouse_interaction(
-            tree,
-            layout,
-            cursor_position,
-            viewport,
-            renderer,
-        )
-    }
-}

pure/src/widget/pane_grid.rs

@@ -54,7 +54,8 @@ pub use iced_style::pane_grid::{Line, StyleSheet};
 /// ## Example
 ///
 /// ```
-/// # use iced_pure::widget::{pane_grid, text};
+/// # use iced_pure::widget::pane_grid;
+/// # use iced_pure::text;
 /// #
 /// # type PaneGrid<'a, Message> =
 /// #     iced_pure::widget::PaneGrid<'a, Message, iced_native::renderer::Null>;

pure/src/widget/progress_bar.rs

@@ -1,4 +1,5 @@
-use crate::{Element, Tree, Widget};
+use crate::widget::Tree;
+use crate::{Element, Widget};
 
 use iced_native::event::{self, Event};
 use iced_native::layout::{self, Layout};

pure/src/widget/radio.rs

@@ -1,4 +1,5 @@
-use crate::{Element, Tree, Widget};
+use crate::widget::Tree;
+use crate::{Element, Widget};
 
 use iced_native::event::{self, Event};
 use iced_native::layout::{self, Layout};
@@ -7,7 +8,7 @@ use iced_native::renderer;
 use iced_native::text;
 use iced_native::{Clipboard, Length, Point, Rectangle, Shell};
 
-pub use iced_native::widget::Radio;
+pub use iced_native::widget::radio::{Radio, Style, StyleSheet};
 
 impl<'a, Message, Renderer> Widget<Message, Renderer>
     for Radio<'a, Message, Renderer>

pure/src/widget/row.rs

@@ -1,6 +1,7 @@
 use crate::flex;
 use crate::overlay;
-use crate::widget::{Element, Tree, Widget};
+use crate::widget::Tree;
+use crate::{Element, Widget};
 
 use iced_native::event::{self, Event};
 use iced_native::layout::{self, Layout};

pure/src/widget/rule.rs

@@ -1,4 +1,5 @@
-use crate::{Element, Tree, Widget};
+use crate::widget::Tree;
+use crate::{Element, Widget};
 
 use iced_native::event::{self, Event};
 use iced_native::layout::{self, Layout};

pure/src/widget/scrollable.rs

@@ -9,7 +9,7 @@ use iced_native::renderer;
 use iced_native::widget::scrollable;
 use iced_native::{Clipboard, Length, Point, Rectangle, Shell, Vector};
 
-pub use iced_style::scrollable::StyleSheet;
+pub use iced_style::scrollable::{Scrollbar, Scroller, StyleSheet};
 
 /// A widget that can vertically display an infinite amount of content with a
 /// scrollbar.

pure/src/widget/space.rs

@@ -1,4 +1,5 @@
-use crate::{Element, Tree, Widget};
+use crate::widget::Tree;
+use crate::{Element, Widget};
 
 use iced_native::event::{self, Event};
 use iced_native::layout::{self, Layout};

pure/src/widget/text.rs

@@ -1,4 +1,5 @@
-use crate::{Element, Tree, Widget};
+use crate::widget::Tree;
+use crate::{Element, Widget};
 
 use iced_native::layout::{self, Layout};
 use iced_native::renderer;

pure/src/widget/text_input.rs

@@ -1,5 +1,5 @@
 use crate::widget::tree::{self, Tree};
-use crate::widget::{Element, Widget};
+use crate::{Element, Widget};
 
 use iced_native::event::{self, Event};
 use iced_native::layout::{self, Layout};
@@ -9,7 +9,7 @@ use iced_native::text;
 use iced_native::widget::text_input;
 use iced_native::{Clipboard, Length, Padding, Point, Rectangle, Shell};
 
-pub use iced_style::text_input::StyleSheet;
+pub use iced_style::text_input::{Style, StyleSheet};
 
 /// A field that can be filled with text.
 ///

pure/src/widget/tree.rs

@@ -1,4 +1,4 @@
-use crate::widget::Element;
+use crate::Element;
 
 use std::any::{self, Any};