From c02ae0c4a430994247e6fbc4318ac344ab89123c Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector@hecrj.dev>
Date: Tue, 4 Feb 2025 03:39:16 +0100
Subject: Introduce `view_with` customizers in `markdown` module

---
 widget/src/markdown.rs | 280 ++++++++++++++++++++++++++++++++-----------------
 1 file changed, 186 insertions(+), 94 deletions(-)

(limited to 'widget')

diff --git a/widget/src/markdown.rs b/widget/src/markdown.rs
index 858ee281..628a10c6 100644
--- a/widget/src/markdown.rs
+++ b/widget/src/markdown.rs
@@ -189,6 +189,130 @@ pub enum Item {
     },
 }
 
+impl Item {
+    /// Displays a Markdown [`Item`] using the default, built-in look for its children.
+    pub fn view<'a, 'b, Theme, Renderer>(
+        &'b self,
+        settings: Settings,
+        style: Style,
+        index: usize,
+    ) -> Element<'a, Url, Theme, Renderer>
+    where
+        Theme: Catalog + 'a,
+        Renderer: core::text::Renderer<Font = Font> + 'a,
+    {
+        self.view_with(index, settings, style, &DefaultView)
+    }
+
+    /// Displays a Markdown [`Item`] using the given [`View`] for its children.
+    pub fn view_with<'a, 'b, Theme, Renderer>(
+        &'b self,
+        index: usize,
+        settings: Settings,
+        style: Style,
+        view: &dyn View<'a, 'b, Url, Theme, Renderer>,
+    ) -> Element<'a, Url, Theme, Renderer>
+    where
+        Theme: Catalog + 'a,
+        Renderer: core::text::Renderer<Font = Font> + 'a,
+    {
+        let Settings {
+            text_size,
+            h1_size,
+            h2_size,
+            h3_size,
+            h4_size,
+            h5_size,
+            h6_size,
+            code_size,
+            spacing,
+        } = settings;
+
+        match self {
+            Item::Heading(level, heading) => {
+                container(rich_text(heading.spans(style)).size(match level {
+                    pulldown_cmark::HeadingLevel::H1 => h1_size,
+                    pulldown_cmark::HeadingLevel::H2 => h2_size,
+                    pulldown_cmark::HeadingLevel::H3 => h3_size,
+                    pulldown_cmark::HeadingLevel::H4 => h4_size,
+                    pulldown_cmark::HeadingLevel::H5 => h5_size,
+                    pulldown_cmark::HeadingLevel::H6 => h6_size,
+                }))
+                .padding(padding::top(if index > 0 {
+                    text_size / 2.0
+                } else {
+                    Pixels::ZERO
+                }))
+                .into()
+            }
+            Item::Paragraph(paragraph) => {
+                rich_text(paragraph.spans(style)).size(text_size).into()
+            }
+            Item::List { start: None, items } => {
+                column(items.iter().map(|items| {
+                    row![
+                        text("•").size(text_size),
+                        view_with(
+                            items,
+                            Settings {
+                                spacing: settings.spacing * 0.6,
+                                ..settings
+                            },
+                            style,
+                            view
+                        )
+                    ]
+                    .spacing(spacing)
+                    .into()
+                }))
+                .spacing(spacing * 0.75)
+                .into()
+            }
+            Item::List {
+                start: Some(start),
+                items,
+            } => column(items.iter().enumerate().map(|(i, items)| {
+                row![
+                    text!("{}.", i as u64 + *start).size(text_size),
+                    view_with(
+                        items,
+                        Settings {
+                            spacing: settings.spacing * 0.6,
+                            ..settings
+                        },
+                        style,
+                        view
+                    )
+                ]
+                .spacing(spacing)
+                .into()
+            }))
+            .spacing(spacing * 0.75)
+            .into(),
+            Item::CodeBlock(lines) => container(
+                scrollable(
+                    container(column(lines.iter().map(|line| {
+                        rich_text(line.spans(style))
+                            .font(Font::MONOSPACE)
+                            .size(code_size)
+                            .into()
+                    })))
+                    .padding(spacing.0 / 2.0),
+                )
+                .direction(scrollable::Direction::Horizontal(
+                    scrollable::Scrollbar::default()
+                        .width(spacing.0 / 2.0)
+                        .scroller_width(spacing.0 / 2.0),
+                )),
+            )
+            .width(Length::Fill)
+            .padding(spacing.0 / 2.0)
+            .class(Theme::code_block())
+            .into(),
+        }
+    }
+}
+
 /// A bunch of parsed Markdown text.
 #[derive(Debug, Clone)]
 pub struct Text {
@@ -900,100 +1024,68 @@ where
     Theme: Catalog + 'a,
     Renderer: core::text::Renderer<Font = Font> + 'a,
 {
-    let Settings {
-        text_size,
-        h1_size,
-        h2_size,
-        h3_size,
-        h4_size,
-        h5_size,
-        h6_size,
-        code_size,
-        spacing,
-    } = settings;
-
-    let blocks = items.into_iter().enumerate().map(|(i, item)| match item {
-        Item::Heading(level, heading) => {
-            container(rich_text(heading.spans(style)).size(match level {
-                pulldown_cmark::HeadingLevel::H1 => h1_size,
-                pulldown_cmark::HeadingLevel::H2 => h2_size,
-                pulldown_cmark::HeadingLevel::H3 => h3_size,
-                pulldown_cmark::HeadingLevel::H4 => h4_size,
-                pulldown_cmark::HeadingLevel::H5 => h5_size,
-                pulldown_cmark::HeadingLevel::H6 => h6_size,
-            }))
-            .padding(padding::top(if i > 0 {
-                text_size / 2.0
-            } else {
-                Pixels::ZERO
-            }))
-            .into()
-        }
-        Item::Paragraph(paragraph) => {
-            rich_text(paragraph.spans(style)).size(text_size).into()
-        }
-        Item::List { start: None, items } => {
-            column(items.iter().map(|items| {
-                row![
-                    text("•").size(text_size),
-                    view(
-                        items,
-                        Settings {
-                            spacing: settings.spacing * 0.6,
-                            ..settings
-                        },
-                        style
-                    )
-                ]
-                .spacing(spacing)
-                .into()
-            }))
-            .spacing(spacing * 0.75)
-            .into()
-        }
-        Item::List {
-            start: Some(start),
-            items,
-        } => column(items.iter().enumerate().map(|(i, items)| {
-            row![
-                text!("{}.", i as u64 + *start).size(text_size),
-                view(
-                    items,
-                    Settings {
-                        spacing: settings.spacing * 0.6,
-                        ..settings
-                    },
-                    style
-                )
-            ]
-            .spacing(spacing)
-            .into()
-        }))
-        .spacing(spacing * 0.75)
-        .into(),
-        Item::CodeBlock(lines) => container(
-            scrollable(
-                container(column(lines.iter().map(|line| {
-                    rich_text(line.spans(style))
-                        .font(Font::MONOSPACE)
-                        .size(code_size)
-                        .into()
-                })))
-                .padding(spacing.0 / 2.0),
-            )
-            .direction(scrollable::Direction::Horizontal(
-                scrollable::Scrollbar::default()
-                    .width(spacing.0 / 2.0)
-                    .scroller_width(spacing.0 / 2.0),
-            )),
-        )
-        .width(Length::Fill)
-        .padding(spacing.0 / 2.0)
-        .class(Theme::code_block())
-        .into(),
-    });
-
-    Element::new(column(blocks).spacing(spacing))
+    view_with(items, settings, style, &DefaultView)
+}
+
+/// Runs [`view`] but with a custom [`View`] to turn an [`Item`] into
+/// an [`Element`].
+///
+/// This is useful if you want to customize the look of certain Markdown
+/// elements.
+///
+/// You can use [`Item::view`] and [`Item::view_with`] for the default
+/// look.
+pub fn view_with<'a, 'b, Message, Theme, Renderer>(
+    items: impl IntoIterator<Item = &'b Item>,
+    settings: Settings,
+    style: Style,
+    view: &dyn View<'a, 'b, Message, Theme, Renderer>,
+) -> Element<'a, Message, Theme, Renderer>
+where
+    Message: 'a,
+    Theme: Catalog + 'a,
+    Renderer: core::text::Renderer<Font = Font> + 'a,
+{
+    let blocks = items
+        .into_iter()
+        .enumerate()
+        .map(move |(i, item)| view.view(settings, style, item, i));
+
+    Element::new(column(blocks).spacing(settings.spacing))
+}
+
+/// A view strategy to display a Markdown [`Item`].
+pub trait View<'a, 'b, Message, Theme, Renderer> {
+    /// Displays a Markdown [`Item`] by projecting it into an [`Element`].
+    ///
+    /// You can use [`Item::view`] and [`Item::view_with`] for the default
+    /// look.
+    fn view(
+        &self,
+        settings: Settings,
+        style: Style,
+        item: &'b Item,
+        index: usize,
+    ) -> Element<'a, Message, Theme, Renderer>;
+}
+
+#[derive(Debug, Clone, Copy)]
+struct DefaultView;
+
+impl<'a, 'b, Theme, Renderer> View<'a, 'b, Url, Theme, Renderer> for DefaultView
+where
+    Theme: Catalog + 'a,
+    Renderer: core::text::Renderer<Font = Font> + 'a,
+{
+    fn view(
+        &self,
+        settings: Settings,
+        style: Style,
+        item: &'b Item,
+        index: usize,
+    ) -> Element<'a, Url, Theme, Renderer> {
+        item.view(settings, style, index)
+    }
 }
 
 /// The theme catalog of Markdown items.
-- 
cgit 


From 565599876172b3f56d86b119ae453b5bcd8949e1 Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector@hecrj.dev>
Date: Tue, 4 Feb 2025 07:53:56 +0100
Subject: Draft `Viewer` trait for `markdown`

---
 widget/src/helpers.rs   |   6 +-
 widget/src/markdown.rs  | 553 +++++++++++++++++++++++++++++++-----------------
 widget/src/pop.rs       |  24 ++-
 widget/src/text/rich.rs |  57 +++--
 4 files changed, 428 insertions(+), 212 deletions(-)

(limited to 'widget')

diff --git a/widget/src/helpers.rs b/widget/src/helpers.rs
index 4cba197d..2716d4c6 100644
--- a/widget/src/helpers.rs
+++ b/widget/src/helpers.rs
@@ -187,7 +187,7 @@ macro_rules! text {
 #[macro_export]
 macro_rules! rich_text {
     () => (
-        $crate::Column::new()
+        $crate::text::Rich::new()
     );
     ($($x:expr),+ $(,)?) => (
         $crate::text::Rich::from_iter([$($crate::text::Span::from($x)),+])
@@ -1155,9 +1155,9 @@ where
 ///     .into()
 /// }
 /// ```
-pub fn rich_text<'a, Link, Theme, Renderer>(
+pub fn rich_text<'a, Link, Message, Theme, Renderer>(
     spans: impl AsRef<[text::Span<'a, Link, Renderer::Font>]> + 'a,
-) -> text::Rich<'a, Link, Theme, Renderer>
+) -> text::Rich<'a, Link, Message, Theme, Renderer>
 where
     Link: Clone + 'static,
     Theme: text::Catalog + 'a,
diff --git a/widget/src/markdown.rs b/widget/src/markdown.rs
index 628a10c6..d8d33763 100644
--- a/widget/src/markdown.rs
+++ b/widget/src/markdown.rs
@@ -47,6 +47,7 @@
 //!     }
 //! }
 //! ```
+#![allow(missing_docs)]
 use crate::core::border;
 use crate::core::font::{self, Font};
 use crate::core::padding;
@@ -144,6 +145,7 @@ impl Content {
                     let mut state = State {
                         leftover: String::new(),
                         references: self.state.references.clone(),
+                        images: HashSet::new(),
                         highlighter: None,
                     };
 
@@ -153,6 +155,7 @@ impl Content {
                         self.items[*index] = item;
                     }
 
+                    self.state.images.extend(state.images.drain());
                     drop(state);
                 }
 
@@ -167,6 +170,11 @@ impl Content {
     pub fn items(&self) -> &[Item] {
         &self.items
     }
+
+    /// Returns the URLs of the Markdown images present in the [`Content`].
+    pub fn images(&self) -> impl Iterator<Item = &Url> {
+        self.state.images.iter()
+    }
 }
 
 /// A Markdown item.
@@ -187,130 +195,13 @@ pub enum Item {
         /// The items of the list.
         items: Vec<Vec<Item>>,
     },
-}
-
-impl Item {
-    /// Displays a Markdown [`Item`] using the default, built-in look for its children.
-    pub fn view<'a, 'b, Theme, Renderer>(
-        &'b self,
-        settings: Settings,
-        style: Style,
-        index: usize,
-    ) -> Element<'a, Url, Theme, Renderer>
-    where
-        Theme: Catalog + 'a,
-        Renderer: core::text::Renderer<Font = Font> + 'a,
-    {
-        self.view_with(index, settings, style, &DefaultView)
-    }
-
-    /// Displays a Markdown [`Item`] using the given [`View`] for its children.
-    pub fn view_with<'a, 'b, Theme, Renderer>(
-        &'b self,
-        index: usize,
-        settings: Settings,
-        style: Style,
-        view: &dyn View<'a, 'b, Url, Theme, Renderer>,
-    ) -> Element<'a, Url, Theme, Renderer>
-    where
-        Theme: Catalog + 'a,
-        Renderer: core::text::Renderer<Font = Font> + 'a,
-    {
-        let Settings {
-            text_size,
-            h1_size,
-            h2_size,
-            h3_size,
-            h4_size,
-            h5_size,
-            h6_size,
-            code_size,
-            spacing,
-        } = settings;
-
-        match self {
-            Item::Heading(level, heading) => {
-                container(rich_text(heading.spans(style)).size(match level {
-                    pulldown_cmark::HeadingLevel::H1 => h1_size,
-                    pulldown_cmark::HeadingLevel::H2 => h2_size,
-                    pulldown_cmark::HeadingLevel::H3 => h3_size,
-                    pulldown_cmark::HeadingLevel::H4 => h4_size,
-                    pulldown_cmark::HeadingLevel::H5 => h5_size,
-                    pulldown_cmark::HeadingLevel::H6 => h6_size,
-                }))
-                .padding(padding::top(if index > 0 {
-                    text_size / 2.0
-                } else {
-                    Pixels::ZERO
-                }))
-                .into()
-            }
-            Item::Paragraph(paragraph) => {
-                rich_text(paragraph.spans(style)).size(text_size).into()
-            }
-            Item::List { start: None, items } => {
-                column(items.iter().map(|items| {
-                    row![
-                        text("•").size(text_size),
-                        view_with(
-                            items,
-                            Settings {
-                                spacing: settings.spacing * 0.6,
-                                ..settings
-                            },
-                            style,
-                            view
-                        )
-                    ]
-                    .spacing(spacing)
-                    .into()
-                }))
-                .spacing(spacing * 0.75)
-                .into()
-            }
-            Item::List {
-                start: Some(start),
-                items,
-            } => column(items.iter().enumerate().map(|(i, items)| {
-                row![
-                    text!("{}.", i as u64 + *start).size(text_size),
-                    view_with(
-                        items,
-                        Settings {
-                            spacing: settings.spacing * 0.6,
-                            ..settings
-                        },
-                        style,
-                        view
-                    )
-                ]
-                .spacing(spacing)
-                .into()
-            }))
-            .spacing(spacing * 0.75)
-            .into(),
-            Item::CodeBlock(lines) => container(
-                scrollable(
-                    container(column(lines.iter().map(|line| {
-                        rich_text(line.spans(style))
-                            .font(Font::MONOSPACE)
-                            .size(code_size)
-                            .into()
-                    })))
-                    .padding(spacing.0 / 2.0),
-                )
-                .direction(scrollable::Direction::Horizontal(
-                    scrollable::Scrollbar::default()
-                        .width(spacing.0 / 2.0)
-                        .scroller_width(spacing.0 / 2.0),
-                )),
-            )
-            .width(Length::Fill)
-            .padding(spacing.0 / 2.0)
-            .class(Theme::code_block())
-            .into(),
-        }
-    }
+    /// An image.
+    Image {
+        /// The destination URL of the image.
+        url: Url,
+        /// The title of the image.
+        title: Text,
+    },
 }
 
 /// A bunch of parsed Markdown text.
@@ -470,6 +361,7 @@ pub fn parse(markdown: &str) -> impl Iterator<Item = Item> + '_ {
 struct State {
     leftover: String,
     references: HashMap<String, String>,
+    images: HashSet<Url>,
     #[cfg(feature = "highlighter")]
     highlighter: Option<Highlighter>,
 }
@@ -560,6 +452,10 @@ fn parse_with<'a>(
     mut state: impl BorrowMut<State> + 'a,
     markdown: &'a str,
 ) -> impl Iterator<Item = (Item, &'a str, HashSet<String>)> + 'a {
+    enum Scope {
+        List(List),
+    }
+
     struct List {
         start: Option<u64>,
         items: Vec<Vec<Item>>,
@@ -575,7 +471,8 @@ fn parse_with<'a>(
     let mut metadata = false;
     let mut table = false;
     let mut link = None;
-    let mut lists = Vec::new();
+    let mut image = None;
+    let mut stack = Vec::new();
 
     #[cfg(feature = "highlighter")]
     let mut highlighter = None;
@@ -616,10 +513,18 @@ fn parse_with<'a>(
     }
 
     let produce = move |state: &mut State,
-                        lists: &mut Vec<List>,
+                        stack: &mut Vec<Scope>,
                         item,
                         source: Range<usize>| {
-        if lists.is_empty() {
+        if let Some(scope) = stack.last_mut() {
+            match scope {
+                Scope::List(list) => {
+                    list.items.last_mut().expect("item context").push(item);
+                }
+            }
+
+            None
+        } else {
             state.leftover = markdown[source.start..].to_owned();
 
             Some((
@@ -627,16 +532,6 @@ fn parse_with<'a>(
                 &markdown[source.start..source.end],
                 broken_links.take(),
             ))
-        } else {
-            lists
-                .last_mut()
-                .expect("list context")
-                .items
-                .last_mut()
-                .expect("item context")
-                .push(item);
-
-            None
         }
     };
 
@@ -673,31 +568,36 @@ fn parse_with<'a>(
 
                 None
             }
+            pulldown_cmark::Tag::Image { dest_url, .. }
+                if !metadata && !table =>
+            {
+                image = Url::parse(&dest_url).ok();
+                None
+            }
             pulldown_cmark::Tag::List(first_item) if !metadata && !table => {
                 let prev = if spans.is_empty() {
                     None
                 } else {
                     produce(
                         state.borrow_mut(),
-                        &mut lists,
+                        &mut stack,
                         Item::Paragraph(Text::new(spans.drain(..).collect())),
                         source,
                     )
                 };
 
-                lists.push(List {
+                stack.push(Scope::List(List {
                     start: first_item,
                     items: Vec::new(),
-                });
+                }));
 
                 prev
             }
             pulldown_cmark::Tag::Item => {
-                lists
-                    .last_mut()
-                    .expect("list context")
-                    .items
-                    .push(Vec::new());
+                if let Some(Scope::List(list)) = stack.last_mut() {
+                    list.items.push(Vec::new());
+                }
+
                 None
             }
             pulldown_cmark::Tag::CodeBlock(
@@ -726,7 +626,7 @@ fn parse_with<'a>(
                 } else {
                     produce(
                         state.borrow_mut(),
-                        &mut lists,
+                        &mut stack,
                         Item::Paragraph(Text::new(spans.drain(..).collect())),
                         source,
                     )
@@ -748,7 +648,7 @@ fn parse_with<'a>(
             pulldown_cmark::TagEnd::Heading(level) if !metadata && !table => {
                 produce(
                     state.borrow_mut(),
-                    &mut lists,
+                    &mut stack,
                     Item::Heading(level, Text::new(spans.drain(..).collect())),
                     source,
                 )
@@ -770,12 +670,16 @@ fn parse_with<'a>(
                 None
             }
             pulldown_cmark::TagEnd::Paragraph if !metadata && !table => {
-                produce(
-                    state.borrow_mut(),
-                    &mut lists,
-                    Item::Paragraph(Text::new(spans.drain(..).collect())),
-                    source,
-                )
+                if spans.is_empty() {
+                    None
+                } else {
+                    produce(
+                        state.borrow_mut(),
+                        &mut stack,
+                        Item::Paragraph(Text::new(spans.drain(..).collect())),
+                        source,
+                    )
+                }
             }
             pulldown_cmark::TagEnd::Item if !metadata && !table => {
                 if spans.is_empty() {
@@ -783,18 +687,20 @@ fn parse_with<'a>(
                 } else {
                     produce(
                         state.borrow_mut(),
-                        &mut lists,
+                        &mut stack,
                         Item::Paragraph(Text::new(spans.drain(..).collect())),
                         source,
                     )
                 }
             }
             pulldown_cmark::TagEnd::List(_) if !metadata && !table => {
-                let list = lists.pop().expect("list context");
+                let scope = stack.pop()?;
+
+                let Scope::List(list) = scope;
 
                 produce(
                     state.borrow_mut(),
-                    &mut lists,
+                    &mut stack,
                     Item::List {
                         start: list.start,
                         items: list.items,
@@ -802,6 +708,15 @@ fn parse_with<'a>(
                     source,
                 )
             }
+            pulldown_cmark::TagEnd::Image if !metadata && !table => {
+                let url = image.take()?;
+                let title = Text::new(spans.drain(..).collect());
+
+                let state = state.borrow_mut();
+                let _ = state.images.insert(url.clone());
+
+                produce(state, &mut stack, Item::Image { url, title }, source)
+            }
             pulldown_cmark::TagEnd::CodeBlock if !metadata && !table => {
                 #[cfg(feature = "highlighter")]
                 {
@@ -810,7 +725,7 @@ fn parse_with<'a>(
 
                 produce(
                     state.borrow_mut(),
-                    &mut lists,
+                    &mut stack,
                     Item::CodeBlock(code.drain(..).collect()),
                     source,
                 )
@@ -910,15 +825,25 @@ pub struct Settings {
     pub code_size: Pixels,
     /// The spacing to be used between elements.
     pub spacing: Pixels,
+    /// The styling of the Markdown.
+    pub style: Style,
 }
 
 impl Settings {
+    /// Creates new [`Settings`] with default text size and the given [`Style`].
+    pub fn with_style(style: impl Into<Style>) -> Self {
+        Self::with_text_size(16, style)
+    }
+
     /// Creates new [`Settings`] with the given base text size in [`Pixels`].
     ///
     /// Heading levels will be adjusted automatically. Specifically,
     /// the first level will be twice the base size, and then every level
     /// after that will be 25% smaller.
-    pub fn with_text_size(text_size: impl Into<Pixels>) -> Self {
+    pub fn with_text_size(
+        text_size: impl Into<Pixels>,
+        style: impl Into<Style>,
+    ) -> Self {
         let text_size = text_size.into();
 
         Self {
@@ -931,13 +856,14 @@ impl Settings {
             h6_size: text_size,
             code_size: text_size * 0.75,
             spacing: text_size * 0.875,
+            style: style.into(),
         }
     }
 }
 
-impl Default for Settings {
-    fn default() -> Self {
-        Self::with_text_size(16)
+impl From<&Theme> for Settings {
+    fn from(theme: &Theme) -> Self {
+        Self::with_style(Style::from(theme))
     }
 }
 
@@ -969,6 +895,18 @@ impl Style {
     }
 }
 
+impl From<theme::Palette> for Style {
+    fn from(palette: theme::Palette) -> Self {
+        Self::from_palette(palette)
+    }
+}
+
+impl From<&Theme> for Style {
+    fn from(theme: &Theme) -> Self {
+        Self::from_palette(theme.palette())
+    }
+}
+
 /// Display a bunch of Markdown items.
 ///
 /// You can obtain the items with [`parse`].
@@ -1015,16 +953,15 @@ impl Style {
 ///     }
 /// }
 /// ```
-pub fn view<'a, 'b, Theme, Renderer>(
-    items: impl IntoIterator<Item = &'b Item>,
-    settings: Settings,
-    style: Style,
+pub fn view<'a, Theme, Renderer>(
+    settings: impl Into<Settings>,
+    items: impl IntoIterator<Item = &'a Item>,
 ) -> Element<'a, Url, Theme, Renderer>
 where
     Theme: Catalog + 'a,
     Renderer: core::text::Renderer<Font = Font> + 'a,
 {
-    view_with(items, settings, style, &DefaultView)
+    view_with(&DefaultViewer, settings, items)
 }
 
 /// Runs [`view`] but with a custom [`View`] to turn an [`Item`] into
@@ -1035,56 +972,288 @@ where
 ///
 /// You can use [`Item::view`] and [`Item::view_with`] for the default
 /// look.
-pub fn view_with<'a, 'b, Message, Theme, Renderer>(
-    items: impl IntoIterator<Item = &'b Item>,
-    settings: Settings,
-    style: Style,
-    view: &dyn View<'a, 'b, Message, Theme, Renderer>,
+pub fn view_with<'a, Message, Theme, Renderer>(
+    viewer: &impl Viewer<'a, Message, Theme, Renderer>,
+    settings: impl Into<Settings>,
+    items: impl IntoIterator<Item = &'a Item>,
 ) -> Element<'a, Message, Theme, Renderer>
 where
     Message: 'a,
     Theme: Catalog + 'a,
     Renderer: core::text::Renderer<Font = Font> + 'a,
 {
+    let settings = settings.into();
+
     let blocks = items
         .into_iter()
         .enumerate()
-        .map(move |(i, item)| view.view(settings, style, item, i));
+        .map(|(i, item_)| item(viewer, settings, item_, i));
 
     Element::new(column(blocks).spacing(settings.spacing))
 }
 
-/// A view strategy to display a Markdown [`Item`].
-pub trait View<'a, 'b, Message, Theme, Renderer> {
-    /// Displays a Markdown [`Item`] by projecting it into an [`Element`].
-    ///
-    /// You can use [`Item::view`] and [`Item::view_with`] for the default
-    /// look.
-    fn view(
+pub fn item<'a, Message, Theme, Renderer>(
+    viewer: &impl Viewer<'a, Message, Theme, Renderer>,
+    settings: Settings,
+    item: &'a Item,
+    index: usize,
+) -> Element<'a, Message, Theme, Renderer>
+where
+    Message: 'a,
+    Theme: Catalog + 'a,
+    Renderer: core::text::Renderer<Font = Font> + 'a,
+{
+    match item {
+        Item::Image { title, url } => viewer.image(settings, title, url),
+        Item::Heading(level, text) => {
+            viewer.heading(settings, index, level, text)
+        }
+        Item::Paragraph(text) => viewer.paragraph(settings, text),
+        Item::CodeBlock(lines) => viewer.code_block(settings, lines),
+        Item::List { start: None, items } => {
+            viewer.unordered_list(settings, items)
+        }
+        Item::List {
+            start: Some(start),
+            items,
+        } => viewer.ordered_list(settings, *start, items),
+    }
+}
+
+pub fn heading<'a, Message, Theme, Renderer>(
+    settings: Settings,
+    index: usize,
+    level: &'a HeadingLevel,
+    text: &'a Text,
+    on_link_clicked: impl Fn(Url) -> Message + 'a,
+) -> Element<'a, Message, Theme, Renderer>
+where
+    Message: 'a,
+    Theme: Catalog + 'a,
+    Renderer: core::text::Renderer<Font = Font> + 'a,
+{
+    let Settings {
+        h1_size,
+        h2_size,
+        h3_size,
+        h4_size,
+        h5_size,
+        h6_size,
+        text_size,
+        ..
+    } = settings;
+
+    container(
+        rich_text(text.spans(settings.style))
+            .on_link_clicked(on_link_clicked)
+            .size(match level {
+                pulldown_cmark::HeadingLevel::H1 => h1_size,
+                pulldown_cmark::HeadingLevel::H2 => h2_size,
+                pulldown_cmark::HeadingLevel::H3 => h3_size,
+                pulldown_cmark::HeadingLevel::H4 => h4_size,
+                pulldown_cmark::HeadingLevel::H5 => h5_size,
+                pulldown_cmark::HeadingLevel::H6 => h6_size,
+            }),
+    )
+    .padding(padding::top(if index > 0 {
+        text_size / 2.0
+    } else {
+        Pixels::ZERO
+    }))
+    .into()
+}
+
+pub fn paragraph<'a, Message, Theme, Renderer>(
+    settings: Settings,
+    text: &'a Text,
+    on_link_clicked: impl Fn(Url) -> Message + 'a,
+) -> Element<'a, Message, Theme, Renderer>
+where
+    Message: 'a,
+    Theme: Catalog + 'a,
+    Renderer: core::text::Renderer<Font = Font> + 'a,
+{
+    rich_text(text.spans(settings.style))
+        .size(settings.text_size)
+        .on_link_clicked(on_link_clicked)
+        .into()
+}
+
+pub fn unordered_list<'a, Message, Theme, Renderer>(
+    viewer: &impl Viewer<'a, Message, Theme, Renderer>,
+    settings: Settings,
+    items: &'a [Vec<Item>],
+) -> Element<'a, Message, Theme, Renderer>
+where
+    Message: 'a,
+    Theme: Catalog + 'a,
+    Renderer: core::text::Renderer<Font = Font> + 'a,
+{
+    column(items.iter().map(|items| {
+        row![
+            text("•").size(settings.text_size),
+            view_with(
+                viewer,
+                Settings {
+                    spacing: settings.spacing * 0.6,
+                    ..settings
+                },
+                items,
+            )
+        ]
+        .spacing(settings.spacing)
+        .into()
+    }))
+    .spacing(settings.spacing * 0.75)
+    .padding([0.0, settings.spacing.0])
+    .into()
+}
+
+pub fn ordered_list<'a, Message, Theme, Renderer>(
+    viewer: &impl Viewer<'a, Message, Theme, Renderer>,
+    settings: Settings,
+    start: u64,
+    items: &'a [Vec<Item>],
+) -> Element<'a, Message, Theme, Renderer>
+where
+    Message: 'a,
+    Theme: Catalog + 'a,
+    Renderer: core::text::Renderer<Font = Font> + 'a,
+{
+    column(items.iter().enumerate().map(|(i, items)| {
+        row![
+            text!("{}.", i as u64 + start).size(settings.text_size),
+            view_with(
+                viewer,
+                Settings {
+                    spacing: settings.spacing * 0.6,
+                    ..settings
+                },
+                items,
+            )
+        ]
+        .spacing(settings.spacing)
+        .into()
+    }))
+    .spacing(settings.spacing * 0.75)
+    .padding([0.0, settings.spacing.0])
+    .into()
+}
+
+pub fn code_block<'a, Message, Theme, Renderer>(
+    settings: Settings,
+    lines: &'a [Text],
+    on_link_clicked: impl Fn(Url) -> Message + Clone + 'a,
+) -> Element<'a, Message, Theme, Renderer>
+where
+    Message: 'a,
+    Theme: Catalog + 'a,
+    Renderer: core::text::Renderer<Font = Font> + 'a,
+{
+    container(
+        scrollable(
+            container(column(lines.iter().map(|line| {
+                rich_text(line.spans(settings.style))
+                    .on_link_clicked(on_link_clicked.clone())
+                    .font(Font::MONOSPACE)
+                    .size(settings.code_size)
+                    .into()
+            })))
+            .padding(settings.spacing.0 / 2.0),
+        )
+        .direction(scrollable::Direction::Horizontal(
+            scrollable::Scrollbar::default()
+                .width(settings.spacing.0 / 2.0)
+                .scroller_width(settings.spacing.0 / 2.0),
+        )),
+    )
+    .width(Length::Fill)
+    .padding(settings.spacing.0 / 2.0)
+    .class(Theme::code_block())
+    .into()
+}
+
+/// A view strategy to display a Markdown [`Item`].j
+pub trait Viewer<'a, Message, Theme = crate::Theme, Renderer = crate::Renderer>
+where
+    Self: Sized + 'a,
+    Message: 'a,
+    Theme: Catalog + 'a,
+    Renderer: core::text::Renderer<Font = Font> + 'a,
+{
+    fn on_link_clicked(url: Url) -> Message;
+
+    fn image(
+        &self,
+        settings: Settings,
+        title: &Text,
+        url: &'a Url,
+    ) -> Element<'a, Message, Theme, Renderer> {
+        let _url = url;
+
+        container(
+            rich_text(title.spans(settings.style))
+                .on_link_clicked(Self::on_link_clicked),
+        )
+        .padding(settings.spacing.0)
+        .class(Theme::code_block())
+        .into()
+    }
+
+    fn heading(
         &self,
         settings: Settings,
-        style: Style,
-        item: &'b Item,
         index: usize,
-    ) -> Element<'a, Message, Theme, Renderer>;
+        level: &'a HeadingLevel,
+        text: &'a Text,
+    ) -> Element<'a, Message, Theme, Renderer> {
+        heading(settings, index, level, text, Self::on_link_clicked)
+    }
+
+    fn paragraph(
+        &self,
+        settings: Settings,
+        text: &'a Text,
+    ) -> Element<'a, Message, Theme, Renderer> {
+        paragraph(settings, text, Self::on_link_clicked)
+    }
+
+    fn code_block(
+        &self,
+        settings: Settings,
+        lines: &'a [Text],
+    ) -> Element<'a, Message, Theme, Renderer> {
+        code_block(settings, lines, Self::on_link_clicked)
+    }
+
+    fn unordered_list(
+        &self,
+        settings: Settings,
+        items: &'a [Vec<Item>],
+    ) -> Element<'a, Message, Theme, Renderer> {
+        unordered_list(self, settings, items)
+    }
+
+    fn ordered_list(
+        &self,
+        settings: Settings,
+        start: u64,
+        items: &'a [Vec<Item>],
+    ) -> Element<'a, Message, Theme, Renderer> {
+        ordered_list(self, settings, start, items)
+    }
 }
 
 #[derive(Debug, Clone, Copy)]
-struct DefaultView;
+struct DefaultViewer;
 
-impl<'a, 'b, Theme, Renderer> View<'a, 'b, Url, Theme, Renderer> for DefaultView
+impl<'a, Theme, Renderer> Viewer<'a, Url, Theme, Renderer> for DefaultViewer
 where
     Theme: Catalog + 'a,
     Renderer: core::text::Renderer<Font = Font> + 'a,
 {
-    fn view(
-        &self,
-        settings: Settings,
-        style: Style,
-        item: &'b Item,
-        index: usize,
-    ) -> Element<'a, Url, Theme, Renderer> {
-        item.view(settings, style, index)
+    fn on_link_clicked(url: Url) -> Url {
+        url
     }
 }
 
diff --git a/widget/src/pop.rs b/widget/src/pop.rs
index 6e9df4be..950371ea 100644
--- a/widget/src/pop.rs
+++ b/widget/src/pop.rs
@@ -3,6 +3,7 @@ use crate::core::layout;
 use crate::core::mouse;
 use crate::core::overlay;
 use crate::core::renderer;
+use crate::core::text;
 use crate::core::widget;
 use crate::core::widget::tree::{self, Tree};
 use crate::core::window;
@@ -17,6 +18,7 @@ use crate::core::{
 #[allow(missing_debug_implementations)]
 pub struct Pop<'a, Message, Theme = crate::Theme, Renderer = crate::Renderer> {
     content: Element<'a, Message, Theme, Renderer>,
+    key: Option<text::Fragment<'a>>,
     on_show: Option<Box<dyn Fn(Size) -> Message + 'a>>,
     on_resize: Option<Box<dyn Fn(Size) -> Message + 'a>>,
     on_hide: Option<Message>,
@@ -34,6 +36,7 @@ where
     ) -> Self {
         Self {
             content: content.into(),
+            key: None,
             on_show: None,
             on_resize: None,
             on_hide: None,
@@ -66,6 +69,14 @@ where
         self
     }
 
+    /// Sets the key of the [`Pop`] widget, for continuity.
+    ///
+    /// If the key changes, the [`Pop`] widget will trigger again.
+    pub fn key(mut self, key: impl text::IntoFragment<'a>) -> Self {
+        self.key = Some(key.into_fragment());
+        self
+    }
+
     /// Sets the distance in [`Pixels`] to use in anticipation of the
     /// content popping into view.
     ///
@@ -77,10 +88,11 @@ where
     }
 }
 
-#[derive(Debug, Clone, Copy, Default)]
+#[derive(Debug, Clone, Default)]
 struct State {
     has_popped_in: bool,
     last_size: Option<Size>,
+    last_key: Option<String>,
 }
 
 impl<Message, Theme, Renderer> Widget<Message, Theme, Renderer>
@@ -118,8 +130,16 @@ where
     ) {
         if let Event::Window(window::Event::RedrawRequested(_)) = &event {
             let state = tree.state.downcast_mut::<State>();
-            let bounds = layout.bounds();
 
+            if state.has_popped_in
+                && state.last_key.as_deref() != self.key.as_deref()
+            {
+                state.has_popped_in = false;
+                state.last_key =
+                    self.key.as_ref().cloned().map(text::Fragment::into_owned);
+            }
+
+            let bounds = layout.bounds();
             let top_left_distance = viewport.distance(bounds.position());
 
             let bottom_right_distance = viewport
diff --git a/widget/src/text/rich.rs b/widget/src/text/rich.rs
index a9e544d1..02348b54 100644
--- a/widget/src/text/rich.rs
+++ b/widget/src/text/rich.rs
@@ -14,8 +14,13 @@ use crate::core::{
 
 /// A bunch of [`Rich`] text.
 #[allow(missing_debug_implementations)]
-pub struct Rich<'a, Link, Theme = crate::Theme, Renderer = crate::Renderer>
-where
+pub struct Rich<
+    'a,
+    Link,
+    Message,
+    Theme = crate::Theme,
+    Renderer = crate::Renderer,
+> where
     Link: Clone + 'static,
     Theme: Catalog,
     Renderer: core::text::Renderer,
@@ -31,9 +36,11 @@ where
     wrapping: Wrapping,
     class: Theme::Class<'a>,
     hovered_link: Option<usize>,
+    on_link_clicked: Option<Box<dyn Fn(Link) -> Message + 'a>>,
 }
 
-impl<'a, Link, Theme, Renderer> Rich<'a, Link, Theme, Renderer>
+impl<'a, Link, Message, Theme, Renderer>
+    Rich<'a, Link, Message, Theme, Renderer>
 where
     Link: Clone + 'static,
     Theme: Catalog,
@@ -54,6 +61,7 @@ where
             wrapping: Wrapping::default(),
             class: Theme::default(),
             hovered_link: None,
+            on_link_clicked: None,
         }
     }
 
@@ -127,6 +135,16 @@ where
         self
     }
 
+    /// Sets the message that will be produced when a link of the [`Rich`] text
+    /// is clicked.
+    pub fn on_link_clicked(
+        mut self,
+        on_link_clicked: impl Fn(Link) -> Message + 'a,
+    ) -> Self {
+        self.on_link_clicked = Some(Box::new(on_link_clicked));
+        self
+    }
+
     /// Sets the default style of the [`Rich`] text.
     #[must_use]
     pub fn style(mut self, style: impl Fn(&Theme) -> Style + 'a) -> Self
@@ -164,7 +182,8 @@ where
     }
 }
 
-impl<'a, Link, Theme, Renderer> Default for Rich<'a, Link, Theme, Renderer>
+impl<'a, Link, Message, Theme, Renderer> Default
+    for Rich<'a, Link, Message, Theme, Renderer>
 where
     Link: Clone + 'a,
     Theme: Catalog,
@@ -182,8 +201,8 @@ struct State<Link, P: Paragraph> {
     paragraph: P,
 }
 
-impl<Link, Theme, Renderer> Widget<Link, Theme, Renderer>
-    for Rich<'_, Link, Theme, Renderer>
+impl<Link, Message, Theme, Renderer> Widget<Message, Theme, Renderer>
+    for Rich<'_, Link, Message, Theme, Renderer>
 where
     Link: Clone + 'static,
     Theme: Catalog,
@@ -252,7 +271,8 @@ where
         let style = theme.style(&self.class);
 
         for (index, span) in self.spans.as_ref().as_ref().iter().enumerate() {
-            let is_hovered_link = Some(index) == self.hovered_link;
+            let is_hovered_link = self.on_link_clicked.is_some()
+                && Some(index) == self.hovered_link;
 
             if span.highlight.is_some()
                 || span.underline
@@ -363,9 +383,13 @@ where
         cursor: mouse::Cursor,
         _renderer: &Renderer,
         _clipboard: &mut dyn Clipboard,
-        shell: &mut Shell<'_, Link>,
+        shell: &mut Shell<'_, Message>,
         _viewport: &Rectangle,
     ) {
+        let Some(on_link_clicked) = &self.on_link_clicked else {
+            return;
+        };
+
         let was_hovered = self.hovered_link.is_some();
 
         if let Some(position) = cursor.position_in(layout.bounds()) {
@@ -414,7 +438,7 @@ where
                             .get(span)
                             .and_then(|span| span.link.clone())
                         {
-                            shell.publish(link);
+                            shell.publish(on_link_clicked(link));
                         }
                     }
                     _ => {}
@@ -509,8 +533,9 @@ where
     })
 }
 
-impl<'a, Link, Theme, Renderer> FromIterator<Span<'a, Link, Renderer::Font>>
-    for Rich<'a, Link, Theme, Renderer>
+impl<'a, Link, Message, Theme, Renderer>
+    FromIterator<Span<'a, Link, Renderer::Font>>
+    for Rich<'a, Link, Message, Theme, Renderer>
 where
     Link: Clone + 'a,
     Theme: Catalog,
@@ -524,16 +549,18 @@ where
     }
 }
 
-impl<'a, Link, Theme, Renderer> From<Rich<'a, Link, Theme, Renderer>>
-    for Element<'a, Link, Theme, Renderer>
+impl<'a, Link, Message, Theme, Renderer>
+    From<Rich<'a, Link, Message, Theme, Renderer>>
+    for Element<'a, Message, Theme, Renderer>
 where
+    Message: 'a,
     Link: Clone + 'a,
     Theme: Catalog + 'a,
     Renderer: core::text::Renderer + 'a,
 {
     fn from(
-        text: Rich<'a, Link, Theme, Renderer>,
-    ) -> Element<'a, Link, Theme, Renderer> {
+        text: Rich<'a, Link, Message, Theme, Renderer>,
+    ) -> Element<'a, Message, Theme, Renderer> {
         Element::new(text)
     }
 }
-- 
cgit 


From 24cf355e96d8ae6432ca8972214c2c4f31d07b22 Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector@hecrj.dev>
Date: Tue, 4 Feb 2025 19:07:24 +0100
Subject: Fix documentation of `markdown` and `rich_text`

---
 widget/src/helpers.rs  | 12 ++++--
 widget/src/markdown.rs | 99 +++++++++++++++++++++++++++++++-------------------
 2 files changed, 69 insertions(+), 42 deletions(-)

(limited to 'widget')

diff --git a/widget/src/helpers.rs b/widget/src/helpers.rs
index 2716d4c6..4dd938ed 100644
--- a/widget/src/helpers.rs
+++ b/widget/src/helpers.rs
@@ -167,7 +167,7 @@ macro_rules! text {
 /// # pub type Element<'a, Message> = iced_widget::core::Element<'a, Message, iced_widget::Theme, iced_widget::Renderer>;
 /// use iced::font;
 /// use iced::widget::{rich_text, span};
-/// use iced::{color, Font};
+/// use iced::{color, never, Font};
 ///
 /// #[derive(Debug, Clone)]
 /// enum Message {
@@ -177,9 +177,10 @@ macro_rules! text {
 /// fn view(state: &State) -> Element<'_, Message> {
 ///     rich_text![
 ///         span("I am red!").color(color!(0xff0000)),
-///         " ",
+///         span(" "),
 ///         span("And I am bold!").font(Font { weight: font::Weight::Bold, ..Font::default() }),
 ///     ]
+///     .on_link_clicked(never)
 ///     .size(20)
 ///     .into()
 /// }
@@ -1138,10 +1139,11 @@ where
 /// # pub type Element<'a, Message> = iced_widget::core::Element<'a, Message, iced_widget::Theme, iced_widget::Renderer>;
 /// use iced::font;
 /// use iced::widget::{rich_text, span};
-/// use iced::{color, Font};
+/// use iced::{color, never, Font};
 ///
 /// #[derive(Debug, Clone)]
 /// enum Message {
+///     LinkClicked(&'static str),
 ///     // ...
 /// }
 ///
@@ -1151,6 +1153,7 @@ where
 ///         span(" "),
 ///         span("And I am bold!").font(Font { weight: font::Weight::Bold, ..Font::default() }),
 ///     ])
+///     .on_link_clicked(never)
 ///     .size(20)
 ///     .into()
 /// }
@@ -1181,7 +1184,7 @@ where
 /// # pub type Element<'a, Message> = iced_widget::core::Element<'a, Message, iced_widget::Theme, iced_widget::Renderer>;
 /// use iced::font;
 /// use iced::widget::{rich_text, span};
-/// use iced::{color, Font};
+/// use iced::{color, never, Font};
 ///
 /// #[derive(Debug, Clone)]
 /// enum Message {
@@ -1194,6 +1197,7 @@ where
 ///         " ",
 ///         span("And I am bold!").font(Font { weight: font::Weight::Bold, ..Font::default() }),
 ///     ]
+///     .on_link_clicked(never)
 ///     .size(20)
 ///     .into()
 /// }
diff --git a/widget/src/markdown.rs b/widget/src/markdown.rs
index d8d33763..d8989e72 100644
--- a/widget/src/markdown.rs
+++ b/widget/src/markdown.rs
@@ -29,13 +29,9 @@
 //!     }
 //!
 //!     fn view(&self) -> Element<'_, Message> {
-//!         markdown::view(
-//!             &self.markdown,
-//!             markdown::Settings::default(),
-//!             markdown::Style::from_palette(Theme::TokyoNightStorm.palette()),
-//!         )
-//!         .map(Message::LinkClicked)
-//!         .into()
+//!         markdown::view(&self.markdown, Theme::TokyoNight)
+//!             .map(Message::LinkClicked)
+//!             .into()
 //!     }
 //!
 //!     fn update(state: &mut State, message: Message) {
@@ -47,7 +43,6 @@
 //!     }
 //! }
 //! ```
-#![allow(missing_docs)]
 use crate::core::border;
 use crate::core::font::{self, Font};
 use crate::core::padding;
@@ -334,13 +329,9 @@ impl Span {
 ///     }
 ///
 ///     fn view(&self) -> Element<'_, Message> {
-///         markdown::view(
-///             &self.markdown,
-///             markdown::Settings::default(),
-///             markdown::Style::from_palette(Theme::TokyoNightStorm.palette()),
-///         )
-///         .map(Message::LinkClicked)
-///         .into()
+///         markdown::view(&self.markdown, Theme::TokyoNight)
+///            .map(Message::LinkClicked)
+///            .into()
 ///     }
 ///
 ///     fn update(state: &mut State, message: Message) {
@@ -867,6 +858,12 @@ impl From<&Theme> for Settings {
     }
 }
 
+impl From<Theme> for Settings {
+    fn from(theme: Theme) -> Self {
+        Self::with_style(Style::from(theme))
+    }
+}
+
 /// The text styling of some Markdown rendering in [`view`].
 #[derive(Debug, Clone, Copy, PartialEq)]
 pub struct Style {
@@ -907,6 +904,12 @@ impl From<&Theme> for Style {
     }
 }
 
+impl From<Theme> for Style {
+    fn from(theme: Theme) -> Self {
+        Self::from_palette(theme.palette())
+    }
+}
+
 /// Display a bunch of Markdown items.
 ///
 /// You can obtain the items with [`parse`].
@@ -935,13 +938,9 @@ impl From<&Theme> for Style {
 ///     }
 ///
 ///     fn view(&self) -> Element<'_, Message> {
-///         markdown::view(
-///             &self.markdown,
-///             markdown::Settings::default(),
-///             markdown::Style::from_palette(Theme::TokyoNightStorm.palette()),
-///         )
-///         .map(Message::LinkClicked)
-///         .into()
+///         markdown::view(&self.markdown, Theme::TokyoNight)
+///             .map(Message::LinkClicked)
+///             .into()
 ///     }
 ///
 ///     fn update(state: &mut State, message: Message) {
@@ -954,28 +953,25 @@ impl From<&Theme> for Style {
 /// }
 /// ```
 pub fn view<'a, Theme, Renderer>(
-    settings: impl Into<Settings>,
     items: impl IntoIterator<Item = &'a Item>,
+    settings: impl Into<Settings>,
 ) -> Element<'a, Url, Theme, Renderer>
 where
     Theme: Catalog + 'a,
     Renderer: core::text::Renderer<Font = Font> + 'a,
 {
-    view_with(&DefaultViewer, settings, items)
+    view_with(items, settings, &DefaultViewer)
 }
 
-/// Runs [`view`] but with a custom [`View`] to turn an [`Item`] into
+/// Runs [`view`] but with a custom [`Viewer`] to turn an [`Item`] into
 /// an [`Element`].
 ///
 /// This is useful if you want to customize the look of certain Markdown
 /// elements.
-///
-/// You can use [`Item::view`] and [`Item::view_with`] for the default
-/// look.
 pub fn view_with<'a, Message, Theme, Renderer>(
-    viewer: &impl Viewer<'a, Message, Theme, Renderer>,
-    settings: impl Into<Settings>,
     items: impl IntoIterator<Item = &'a Item>,
+    settings: impl Into<Settings>,
+    viewer: &impl Viewer<'a, Message, Theme, Renderer>,
 ) -> Element<'a, Message, Theme, Renderer>
 where
     Message: 'a,
@@ -992,6 +988,7 @@ where
     Element::new(column(blocks).spacing(settings.spacing))
 }
 
+/// Displays an [`Item`] using the given [`Viewer`].
 pub fn item<'a, Message, Theme, Renderer>(
     viewer: &impl Viewer<'a, Message, Theme, Renderer>,
     settings: Settings,
@@ -1006,7 +1003,7 @@ where
     match item {
         Item::Image { title, url } => viewer.image(settings, title, url),
         Item::Heading(level, text) => {
-            viewer.heading(settings, index, level, text)
+            viewer.heading(settings, level, text, index)
         }
         Item::Paragraph(text) => viewer.paragraph(settings, text),
         Item::CodeBlock(lines) => viewer.code_block(settings, lines),
@@ -1020,11 +1017,12 @@ where
     }
 }
 
+/// Displays a heading using the default look.
 pub fn heading<'a, Message, Theme, Renderer>(
     settings: Settings,
-    index: usize,
     level: &'a HeadingLevel,
     text: &'a Text,
+    index: usize,
     on_link_clicked: impl Fn(Url) -> Message + 'a,
 ) -> Element<'a, Message, Theme, Renderer>
 where
@@ -1063,6 +1061,7 @@ where
     .into()
 }
 
+/// Displays a paragraph using the default look.
 pub fn paragraph<'a, Message, Theme, Renderer>(
     settings: Settings,
     text: &'a Text,
@@ -1079,6 +1078,8 @@ where
         .into()
 }
 
+/// Displays an unordered list using the default look and
+/// calling the [`Viewer`] for each bullet point item.
 pub fn unordered_list<'a, Message, Theme, Renderer>(
     viewer: &impl Viewer<'a, Message, Theme, Renderer>,
     settings: Settings,
@@ -1093,12 +1094,12 @@ where
         row![
             text("•").size(settings.text_size),
             view_with(
-                viewer,
+                items,
                 Settings {
                     spacing: settings.spacing * 0.6,
                     ..settings
                 },
-                items,
+                viewer,
             )
         ]
         .spacing(settings.spacing)
@@ -1109,6 +1110,8 @@ where
     .into()
 }
 
+/// Displays an ordered list using the default look and
+/// calling the [`Viewer`] for each numbered item.
 pub fn ordered_list<'a, Message, Theme, Renderer>(
     viewer: &impl Viewer<'a, Message, Theme, Renderer>,
     settings: Settings,
@@ -1124,12 +1127,12 @@ where
         row![
             text!("{}.", i as u64 + start).size(settings.text_size),
             view_with(
-                viewer,
+                items,
                 Settings {
                     spacing: settings.spacing * 0.6,
                     ..settings
                 },
-                items,
+                viewer,
             )
         ]
         .spacing(settings.spacing)
@@ -1140,6 +1143,7 @@ where
     .into()
 }
 
+/// Displays a code block using the default look.
 pub fn code_block<'a, Message, Theme, Renderer>(
     settings: Settings,
     lines: &'a [Text],
@@ -1181,8 +1185,12 @@ where
     Theme: Catalog + 'a,
     Renderer: core::text::Renderer<Font = Font> + 'a,
 {
+    /// Produces a message when a link is clicked with the given [`Url`].
     fn on_link_clicked(url: Url) -> Message;
 
+    /// Displays an image.
+    ///
+    /// By default, it will show a container with the image title.
     fn image(
         &self,
         settings: Settings,
@@ -1200,16 +1208,22 @@ where
         .into()
     }
 
+    /// Displays a heading.
+    ///
+    /// By default, it calls [`heading`].
     fn heading(
         &self,
         settings: Settings,
-        index: usize,
         level: &'a HeadingLevel,
         text: &'a Text,
+        index: usize,
     ) -> Element<'a, Message, Theme, Renderer> {
-        heading(settings, index, level, text, Self::on_link_clicked)
+        heading(settings, level, text, index, Self::on_link_clicked)
     }
 
+    /// Displays a paragraph.
+    ///
+    /// By default, it calls [`paragraph`].
     fn paragraph(
         &self,
         settings: Settings,
@@ -1218,6 +1232,9 @@ where
         paragraph(settings, text, Self::on_link_clicked)
     }
 
+    /// Displays a code block.
+    ///
+    /// By default, it calls [`code_block`].
     fn code_block(
         &self,
         settings: Settings,
@@ -1226,6 +1243,9 @@ where
         code_block(settings, lines, Self::on_link_clicked)
     }
 
+    /// Displays an unordered list.
+    ///
+    /// By default, it calls [`unordered_list`].
     fn unordered_list(
         &self,
         settings: Settings,
@@ -1234,6 +1254,9 @@ where
         unordered_list(self, settings, items)
     }
 
+    /// Displays an ordered list.
+    ///
+    /// By default, it calls [`ordered_list`].
     fn ordered_list(
         &self,
         settings: Settings,
-- 
cgit 


From a6e64eac6f2a4451cdc100e4019ab76e1ce68064 Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector@hecrj.dev>
Date: Tue, 4 Feb 2025 19:57:51 +0100
Subject: Animate image fade in in `markdown` example

---
 widget/src/markdown.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'widget')

diff --git a/widget/src/markdown.rs b/widget/src/markdown.rs
index d8989e72..5ab43ab0 100644
--- a/widget/src/markdown.rs
+++ b/widget/src/markdown.rs
@@ -167,8 +167,8 @@ impl Content {
     }
 
     /// Returns the URLs of the Markdown images present in the [`Content`].
-    pub fn images(&self) -> impl Iterator<Item = &Url> {
-        self.state.images.iter()
+    pub fn images(&self) -> &HashSet<Url> {
+        &self.state.images
     }
 }
 
-- 
cgit 


From 387abafa3abda3ba68eb7a2e4ce4240ad3bdda53 Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector@hecrj.dev>
Date: Tue, 4 Feb 2025 20:18:49 +0100
Subject: Add `alt` and `title` to `markdown` images

---
 widget/src/markdown.rs | 39 ++++++++++++++++++++++++++-------------
 1 file changed, 26 insertions(+), 13 deletions(-)

(limited to 'widget')

diff --git a/widget/src/markdown.rs b/widget/src/markdown.rs
index 5ab43ab0..9ce5930f 100644
--- a/widget/src/markdown.rs
+++ b/widget/src/markdown.rs
@@ -195,7 +195,9 @@ pub enum Item {
         /// The destination URL of the image.
         url: Url,
         /// The title of the image.
-        title: Text,
+        title: String,
+        /// The alternative text of the image.
+        alt: Text,
     },
 }
 
@@ -374,7 +376,7 @@ impl Highlighter {
             parser: iced_highlighter::Stream::new(
                 &iced_highlighter::Settings {
                     theme: iced_highlighter::Theme::Base16Ocean,
-                    token: language.to_string(),
+                    token: language.to_owned(),
                 },
             ),
             language: language.to_owned(),
@@ -488,7 +490,7 @@ fn parse_with<'a>(
                     ))
                 } else {
                     let _ = RefCell::borrow_mut(&broken_links)
-                        .insert(broken_link.reference.to_string());
+                        .insert(broken_link.reference.into_string());
 
                     None
                 }
@@ -559,10 +561,12 @@ fn parse_with<'a>(
 
                 None
             }
-            pulldown_cmark::Tag::Image { dest_url, .. }
-                if !metadata && !table =>
-            {
-                image = Url::parse(&dest_url).ok();
+            pulldown_cmark::Tag::Image {
+                dest_url, title, ..
+            } if !metadata && !table => {
+                image = Url::parse(&dest_url)
+                    .ok()
+                    .map(|url| (url, title.into_string()));
                 None
             }
             pulldown_cmark::Tag::List(first_item) if !metadata && !table => {
@@ -700,13 +704,18 @@ fn parse_with<'a>(
                 )
             }
             pulldown_cmark::TagEnd::Image if !metadata && !table => {
-                let url = image.take()?;
-                let title = Text::new(spans.drain(..).collect());
+                let (url, title) = image.take()?;
+                let alt = Text::new(spans.drain(..).collect());
 
                 let state = state.borrow_mut();
                 let _ = state.images.insert(url.clone());
 
-                produce(state, &mut stack, Item::Image { url, title }, source)
+                produce(
+                    state,
+                    &mut stack,
+                    Item::Image { url, title, alt },
+                    source,
+                )
             }
             pulldown_cmark::TagEnd::CodeBlock if !metadata && !table => {
                 #[cfg(feature = "highlighter")]
@@ -1001,7 +1010,9 @@ where
     Renderer: core::text::Renderer<Font = Font> + 'a,
 {
     match item {
-        Item::Image { title, url } => viewer.image(settings, title, url),
+        Item::Image { url, title, alt } => {
+            viewer.image(settings, url, title, alt)
+        }
         Item::Heading(level, text) => {
             viewer.heading(settings, level, text, index)
         }
@@ -1194,13 +1205,15 @@ where
     fn image(
         &self,
         settings: Settings,
-        title: &Text,
         url: &'a Url,
+        title: &'a str,
+        alt: &Text,
     ) -> Element<'a, Message, Theme, Renderer> {
         let _url = url;
+        let _title = title;
 
         container(
-            rich_text(title.spans(settings.style))
+            rich_text(alt.spans(settings.style))
                 .on_link_clicked(Self::on_link_clicked),
         )
         .padding(settings.spacing.0)
-- 
cgit 


From e8020f3eaf3baec2b41847f6250d8554136e8d89 Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector@hecrj.dev>
Date: Tue, 4 Feb 2025 20:58:06 +0100
Subject: Add `Copy` action to code blocks in `markdown` example

---
 widget/src/markdown.rs | 28 ++++++++++++++++++++++------
 1 file changed, 22 insertions(+), 6 deletions(-)

(limited to 'widget')

diff --git a/widget/src/markdown.rs b/widget/src/markdown.rs
index 9ce5930f..3af301e9 100644
--- a/widget/src/markdown.rs
+++ b/widget/src/markdown.rs
@@ -55,6 +55,7 @@ use crate::{column, container, rich_text, row, scrollable, span, text};
 use std::borrow::BorrowMut;
 use std::cell::{Cell, RefCell};
 use std::collections::{HashMap, HashSet};
+use std::mem;
 use std::ops::Range;
 use std::rc::Rc;
 use std::sync::Arc;
@@ -182,7 +183,12 @@ pub enum Item {
     /// A code block.
     ///
     /// You can enable the `highlighter` feature for syntax highlighting.
-    CodeBlock(Vec<Text>),
+    CodeBlock {
+        /// The raw code of the code block.
+        code: String,
+        /// The styled lines of text in the code block.
+        lines: Vec<Text>,
+    },
     /// A list.
     List {
         /// The first number of the list, if it is ordered.
@@ -457,7 +463,8 @@ fn parse_with<'a>(
     let broken_links = Rc::new(RefCell::new(HashSet::new()));
 
     let mut spans = Vec::new();
-    let mut code = Vec::new();
+    let mut code = String::new();
+    let mut code_lines = Vec::new();
     let mut strong = false;
     let mut emphasis = false;
     let mut strikethrough = false;
@@ -726,7 +733,10 @@ fn parse_with<'a>(
                 produce(
                     state.borrow_mut(),
                     &mut stack,
-                    Item::CodeBlock(code.drain(..).collect()),
+                    Item::CodeBlock {
+                        code: mem::take(&mut code),
+                        lines: code_lines.drain(..).collect(),
+                    },
                     source,
                 )
             }
@@ -743,8 +753,10 @@ fn parse_with<'a>(
         pulldown_cmark::Event::Text(text) if !metadata && !table => {
             #[cfg(feature = "highlighter")]
             if let Some(highlighter) = &mut highlighter {
+                code.push_str(&text);
+
                 for line in text.lines() {
-                    code.push(Text::new(
+                    code_lines.push(Text::new(
                         highlighter.highlight_line(line).to_vec(),
                     ));
                 }
@@ -1017,7 +1029,9 @@ where
             viewer.heading(settings, level, text, index)
         }
         Item::Paragraph(text) => viewer.paragraph(settings, text),
-        Item::CodeBlock(lines) => viewer.code_block(settings, lines),
+        Item::CodeBlock { code, lines } => {
+            viewer.code_block(settings, code, lines)
+        }
         Item::List { start: None, items } => {
             viewer.unordered_list(settings, items)
         }
@@ -1157,6 +1171,7 @@ where
 /// Displays a code block using the default look.
 pub fn code_block<'a, Message, Theme, Renderer>(
     settings: Settings,
+    _code: &'a str,
     lines: &'a [Text],
     on_link_clicked: impl Fn(Url) -> Message + Clone + 'a,
 ) -> Element<'a, Message, Theme, Renderer>
@@ -1251,9 +1266,10 @@ where
     fn code_block(
         &self,
         settings: Settings,
+        code: &'a str,
         lines: &'a [Text],
     ) -> Element<'a, Message, Theme, Renderer> {
-        code_block(settings, lines, Self::on_link_clicked)
+        code_block(settings, code, lines, Self::on_link_clicked)
     }
 
     /// Displays an unordered list.
-- 
cgit 


From f8c71a20a99568b2ddd0e07ac021d37ce2933856 Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector@hecrj.dev>
Date: Tue, 4 Feb 2025 21:22:01 +0100
Subject: Rename `on_link_clicked` to `on_link_click`

---
 widget/src/helpers.rs   |  6 +++---
 widget/src/markdown.rs  | 24 ++++++++++++------------
 widget/src/text/rich.rs | 12 ++++++------
 3 files changed, 21 insertions(+), 21 deletions(-)

(limited to 'widget')

diff --git a/widget/src/helpers.rs b/widget/src/helpers.rs
index 4dd938ed..42d0f499 100644
--- a/widget/src/helpers.rs
+++ b/widget/src/helpers.rs
@@ -180,7 +180,7 @@ macro_rules! text {
 ///         span(" "),
 ///         span("And I am bold!").font(Font { weight: font::Weight::Bold, ..Font::default() }),
 ///     ]
-///     .on_link_clicked(never)
+///     .on_link_click(never)
 ///     .size(20)
 ///     .into()
 /// }
@@ -1153,7 +1153,7 @@ where
 ///         span(" "),
 ///         span("And I am bold!").font(Font { weight: font::Weight::Bold, ..Font::default() }),
 ///     ])
-///     .on_link_clicked(never)
+///     .on_link_click(never)
 ///     .size(20)
 ///     .into()
 /// }
@@ -1197,7 +1197,7 @@ where
 ///         " ",
 ///         span("And I am bold!").font(Font { weight: font::Weight::Bold, ..Font::default() }),
 ///     ]
-///     .on_link_clicked(never)
+///     .on_link_click(never)
 ///     .size(20)
 ///     .into()
 /// }
diff --git a/widget/src/markdown.rs b/widget/src/markdown.rs
index 3af301e9..ba4860d4 100644
--- a/widget/src/markdown.rs
+++ b/widget/src/markdown.rs
@@ -1048,7 +1048,7 @@ pub fn heading<'a, Message, Theme, Renderer>(
     level: &'a HeadingLevel,
     text: &'a Text,
     index: usize,
-    on_link_clicked: impl Fn(Url) -> Message + 'a,
+    on_link_click: impl Fn(Url) -> Message + 'a,
 ) -> Element<'a, Message, Theme, Renderer>
 where
     Message: 'a,
@@ -1068,7 +1068,7 @@ where
 
     container(
         rich_text(text.spans(settings.style))
-            .on_link_clicked(on_link_clicked)
+            .on_link_click(on_link_click)
             .size(match level {
                 pulldown_cmark::HeadingLevel::H1 => h1_size,
                 pulldown_cmark::HeadingLevel::H2 => h2_size,
@@ -1090,7 +1090,7 @@ where
 pub fn paragraph<'a, Message, Theme, Renderer>(
     settings: Settings,
     text: &'a Text,
-    on_link_clicked: impl Fn(Url) -> Message + 'a,
+    on_link_click: impl Fn(Url) -> Message + 'a,
 ) -> Element<'a, Message, Theme, Renderer>
 where
     Message: 'a,
@@ -1099,7 +1099,7 @@ where
 {
     rich_text(text.spans(settings.style))
         .size(settings.text_size)
-        .on_link_clicked(on_link_clicked)
+        .on_link_click(on_link_click)
         .into()
 }
 
@@ -1173,7 +1173,7 @@ pub fn code_block<'a, Message, Theme, Renderer>(
     settings: Settings,
     _code: &'a str,
     lines: &'a [Text],
-    on_link_clicked: impl Fn(Url) -> Message + Clone + 'a,
+    on_link_click: impl Fn(Url) -> Message + Clone + 'a,
 ) -> Element<'a, Message, Theme, Renderer>
 where
     Message: 'a,
@@ -1184,7 +1184,7 @@ where
         scrollable(
             container(column(lines.iter().map(|line| {
                 rich_text(line.spans(settings.style))
-                    .on_link_clicked(on_link_clicked.clone())
+                    .on_link_click(on_link_click.clone())
                     .font(Font::MONOSPACE)
                     .size(settings.code_size)
                     .into()
@@ -1212,7 +1212,7 @@ where
     Renderer: core::text::Renderer<Font = Font> + 'a,
 {
     /// Produces a message when a link is clicked with the given [`Url`].
-    fn on_link_clicked(url: Url) -> Message;
+    fn on_link_click(url: Url) -> Message;
 
     /// Displays an image.
     ///
@@ -1229,7 +1229,7 @@ where
 
         container(
             rich_text(alt.spans(settings.style))
-                .on_link_clicked(Self::on_link_clicked),
+                .on_link_click(Self::on_link_click),
         )
         .padding(settings.spacing.0)
         .class(Theme::code_block())
@@ -1246,7 +1246,7 @@ where
         text: &'a Text,
         index: usize,
     ) -> Element<'a, Message, Theme, Renderer> {
-        heading(settings, level, text, index, Self::on_link_clicked)
+        heading(settings, level, text, index, Self::on_link_click)
     }
 
     /// Displays a paragraph.
@@ -1257,7 +1257,7 @@ where
         settings: Settings,
         text: &'a Text,
     ) -> Element<'a, Message, Theme, Renderer> {
-        paragraph(settings, text, Self::on_link_clicked)
+        paragraph(settings, text, Self::on_link_click)
     }
 
     /// Displays a code block.
@@ -1269,7 +1269,7 @@ where
         code: &'a str,
         lines: &'a [Text],
     ) -> Element<'a, Message, Theme, Renderer> {
-        code_block(settings, code, lines, Self::on_link_clicked)
+        code_block(settings, code, lines, Self::on_link_click)
     }
 
     /// Displays an unordered list.
@@ -1304,7 +1304,7 @@ where
     Theme: Catalog + 'a,
     Renderer: core::text::Renderer<Font = Font> + 'a,
 {
-    fn on_link_clicked(url: Url) -> Url {
+    fn on_link_click(url: Url) -> Url {
         url
     }
 }
diff --git a/widget/src/text/rich.rs b/widget/src/text/rich.rs
index 02348b54..4d4a2861 100644
--- a/widget/src/text/rich.rs
+++ b/widget/src/text/rich.rs
@@ -36,7 +36,7 @@ pub struct Rich<
     wrapping: Wrapping,
     class: Theme::Class<'a>,
     hovered_link: Option<usize>,
-    on_link_clicked: Option<Box<dyn Fn(Link) -> Message + 'a>>,
+    on_link_click: Option<Box<dyn Fn(Link) -> Message + 'a>>,
 }
 
 impl<'a, Link, Message, Theme, Renderer>
@@ -61,7 +61,7 @@ where
             wrapping: Wrapping::default(),
             class: Theme::default(),
             hovered_link: None,
-            on_link_clicked: None,
+            on_link_click: None,
         }
     }
 
@@ -137,11 +137,11 @@ where
 
     /// Sets the message that will be produced when a link of the [`Rich`] text
     /// is clicked.
-    pub fn on_link_clicked(
+    pub fn on_link_click(
         mut self,
         on_link_clicked: impl Fn(Link) -> Message + 'a,
     ) -> Self {
-        self.on_link_clicked = Some(Box::new(on_link_clicked));
+        self.on_link_click = Some(Box::new(on_link_clicked));
         self
     }
 
@@ -271,7 +271,7 @@ where
         let style = theme.style(&self.class);
 
         for (index, span) in self.spans.as_ref().as_ref().iter().enumerate() {
-            let is_hovered_link = self.on_link_clicked.is_some()
+            let is_hovered_link = self.on_link_click.is_some()
                 && Some(index) == self.hovered_link;
 
             if span.highlight.is_some()
@@ -386,7 +386,7 @@ where
         shell: &mut Shell<'_, Message>,
         _viewport: &Rectangle,
     ) {
-        let Some(on_link_clicked) = &self.on_link_clicked else {
+        let Some(on_link_clicked) = &self.on_link_click else {
             return;
         };
 
-- 
cgit 


From c7711e59ab74f9cd5a31229b8fc4191ca1322917 Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector@hecrj.dev>
Date: Wed, 5 Feb 2025 01:33:16 +0100
Subject: Add `language` to `Item::CodeBlock` in `markdown`

---
 widget/src/markdown.rs | 28 ++++++++++++++++++++--------
 1 file changed, 20 insertions(+), 8 deletions(-)

(limited to 'widget')

diff --git a/widget/src/markdown.rs b/widget/src/markdown.rs
index ba4860d4..7ae89368 100644
--- a/widget/src/markdown.rs
+++ b/widget/src/markdown.rs
@@ -184,6 +184,8 @@ pub enum Item {
     ///
     /// You can enable the `highlighter` feature for syntax highlighting.
     CodeBlock {
+        /// The language of the code block, if any.
+        language: Option<String>,
         /// The raw code of the code block.
         code: String,
         /// The styled lines of text in the code block.
@@ -464,6 +466,7 @@ fn parse_with<'a>(
 
     let mut spans = Vec::new();
     let mut code = String::new();
+    let mut code_language = None;
     let mut code_lines = Vec::new();
     let mut strong = false;
     let mut emphasis = false;
@@ -603,7 +606,7 @@ fn parse_with<'a>(
                 None
             }
             pulldown_cmark::Tag::CodeBlock(
-                pulldown_cmark::CodeBlockKind::Fenced(_language),
+                pulldown_cmark::CodeBlockKind::Fenced(language),
             ) if !metadata && !table => {
                 #[cfg(feature = "highlighter")]
                 {
@@ -613,9 +616,9 @@ fn parse_with<'a>(
                             .highlighter
                             .take()
                             .filter(|highlighter| {
-                                highlighter.language == _language.as_ref()
+                                highlighter.language == language.as_ref()
                             })
-                            .unwrap_or_else(|| Highlighter::new(&_language));
+                            .unwrap_or_else(|| Highlighter::new(&language));
 
                         highlighter.prepare();
 
@@ -623,6 +626,9 @@ fn parse_with<'a>(
                     });
                 }
 
+                code_language =
+                    (!language.is_empty()).then(|| language.into_string());
+
                 let prev = if spans.is_empty() {
                     None
                 } else {
@@ -734,6 +740,7 @@ fn parse_with<'a>(
                     state.borrow_mut(),
                     &mut stack,
                     Item::CodeBlock {
+                        language: code_language.take(),
                         code: mem::take(&mut code),
                         lines: code_lines.drain(..).collect(),
                     },
@@ -1029,9 +1036,11 @@ where
             viewer.heading(settings, level, text, index)
         }
         Item::Paragraph(text) => viewer.paragraph(settings, text),
-        Item::CodeBlock { code, lines } => {
-            viewer.code_block(settings, code, lines)
-        }
+        Item::CodeBlock {
+            language,
+            code,
+            lines,
+        } => viewer.code_block(settings, language.as_deref(), code, lines),
         Item::List { start: None, items } => {
             viewer.unordered_list(settings, items)
         }
@@ -1171,7 +1180,6 @@ where
 /// Displays a code block using the default look.
 pub fn code_block<'a, Message, Theme, Renderer>(
     settings: Settings,
-    _code: &'a str,
     lines: &'a [Text],
     on_link_click: impl Fn(Url) -> Message + Clone + 'a,
 ) -> Element<'a, Message, Theme, Renderer>
@@ -1266,10 +1274,14 @@ where
     fn code_block(
         &self,
         settings: Settings,
+        language: Option<&'a str>,
         code: &'a str,
         lines: &'a [Text],
     ) -> Element<'a, Message, Theme, Renderer> {
-        code_block(settings, code, lines, Self::on_link_click)
+        let _language = language;
+        let _code = code;
+
+        code_block(settings, lines, Self::on_link_click)
     }
 
     /// Displays an unordered list.
-- 
cgit 


From ef25dfb7331c7ab5446e9b771c9bca8aff231957 Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector@hecrj.dev>
Date: Wed, 5 Feb 2025 02:01:41 +0100
Subject: Use `code_size` instead of `spacing` for `code_block` metrics

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

(limited to 'widget')

diff --git a/widget/src/markdown.rs b/widget/src/markdown.rs
index 7ae89368..b69c663e 100644
--- a/widget/src/markdown.rs
+++ b/widget/src/markdown.rs
@@ -1197,16 +1197,16 @@ where
                     .size(settings.code_size)
                     .into()
             })))
-            .padding(settings.spacing.0 / 2.0),
+            .padding(settings.code_size),
         )
         .direction(scrollable::Direction::Horizontal(
             scrollable::Scrollbar::default()
-                .width(settings.spacing.0 / 2.0)
-                .scroller_width(settings.spacing.0 / 2.0),
+                .width(settings.code_size / 2)
+                .scroller_width(settings.code_size / 2),
         )),
     )
     .width(Length::Fill)
-    .padding(settings.spacing.0 / 2.0)
+    .padding(settings.code_size / 4)
     .class(Theme::code_block())
     .into()
 }
-- 
cgit