tzemanovic/inflorescence - Change SASAN2XCWDQ2VEHZ7TAQEN2R3Y7AG7JUGEFVRL4DZAGHXDFEZFRQC

use nav-scrollable

Created by Tomáš Zemanovič on July 3, 2025

SASAN2XCWDQ2VEHZ7TAQEN2R3Y7AG7JUGEFVRL4DZAGHXDFEZFRQC

Dependencies

In channels

main

Change contents

Deletion in libflorescence/src/lib.rs at line 1 [2.1776]
B:BD[2.1776] → [21.7:23]
```
pub mod cursor;
```

Replacement in justfile at line 31 [2.4]

B:BD[2.363] → [32.205:249]

    cargo +{{nightly}} clippy --all-targets

[2.363]

[2.380]

    cargo +{{nightly}} clippy --lib --tests
    cargo +{{nightly}} clippy --bins

Insertion in inflorescence_view/src/lib.rs at line 2 [16.102]
[18.259]
[18.259]
```
pub mod cursor;
```
Insertion in inflorescence_view/src/diff.rs at line 1 [18.417]
[18.417]
[22.752]
```
use iced_nav_scrollable::NavScrollable;
```

Replacement in inflorescence_view/src/diff.rs at line 5 [18.417]

B:BD[22.832] → [22.832:907]

    DiffWithoutContents, File, Lines, Section, State, UndecodableContents,

[22.832]

[22.907]

    DiffWithoutContents, File, Lines, Section, UndecodableContents,

Insertion in inflorescence_view/src/diff.rs at line 15 [18.417]

[31.578]

[18.912]


#[derive(Debug, Default)]
pub struct State {
    /// Initialized once the file is loaded
    pub contents_count: Option<usize>,
    /// Initialized once the file is loaded and opened in view
    pub nav: Option<NavScrollable>,
    pub state: libflorescence::diff::State,
}

Replacement in inflorescence_view/src/diff.rs at line 26 [18.417]
B:BD[18.937] → [18.937:953]
```
pub enum Msg {}
```
[18.937]
[18.2802]
```
pub enum Msg {
    NavScrollable(iced_nav_scrollable::Msg),
}
```
Replacement in inflorescence_view/src/diff.rs at line 43 [18.417]
B:BD[18.3893] → [18.3893:3924]
```
    _state: Option<&'a State>,
```
[18.3893]
[18.3924]
```
    state: Option<&'a State>,
```

Replacement in inflorescence_view/src/diff.rs at line 95 [18.417]

B:BD[18.5499] → [18.5499:5542]

    if diffs_without_contents.is_empty() {

[18.5499]

[18.5542]

    let sections = if let Some(nav) = state.and_then(|state| state.nav.as_ref())
    {
        el(column([
            el(text("NAV")),
            el(iced_nav_scrollable::view(
                nav,
                sections_view,
                Msg::NavScrollable,
            )),
        ]))
    } else {

Insertion in inflorescence_view/src/diff.rs at line 107 [18.417]

[18.5576]

    };
    if diffs_without_contents.is_empty() {
        sections

Replacement in inflorescence_view/src/diff.rs at line 116 [18.417]

B:BD[18.5721] → [18.5721:5866]

        el(column([
            el(column(diffs_without_contents_view)),
            el(column(sections_view)),
        ])
        .spacing(10))

[18.5721]

[18.5866]

        el(column([el(column(diffs_without_contents_view)), sections])
            .spacing(10))

Replacement in inflorescence_view/src/diff.rs at line 122 [18.417]
B:BD[18.5900] → [18.5900:5931]
```
    _state: Option<&'a State>,
```
[18.5900]
[18.5931]
```
    state: Option<&'a State>,
```

Replacement in inflorescence_view/src/diff.rs at line 130 [18.417]

B:BD[18.6088] → [18.6088:6124]

    let diffs = diffs_with_contents

[18.6088]

[18.6124]

    // TODO: only collecting to get `ExactSizeIterator` for `iced_nav_scrollable::view`, but the size can be determined from lengths of the two vecs
    let diffs: Vec<_> = diffs_with_contents

Replacement in inflorescence_view/src/diff.rs at line 138 [18.417]
B:BD[18.6303] → [18.6303:6314]
```
        );
```
[18.6303]
[18.6314]
```
        )
        .collect();
```

Replacement in inflorescence_view/src/diff.rs at line 141 [18.417]

B:BD[18.6315] → [18.6315:6349]

    el(column(diffs).spacing(10))

[18.6315]

[18.6349]

    if let Some(nav) = state.and_then(|state| state.nav.as_ref()) {
        el(column([
            el(text("NAV")),
            el(iced_nav_scrollable::view(
                nav,
                diffs.into_iter(),
                Msg::NavScrollable,
            )),
        ]))
    } else {
        el(column(diffs).spacing(10))
    }

File move: cursor.rs → cursor.rs
BF:BFD[13.31] → [21.4445:4478]
BF:BF[21.4478] → [21.3124:3124]
[16.85]
[21.3124]
Replacement in inflorescence_view/src/cursor.rs at line 2 [21.3124]
B:BD[21.3142] → [21.3142:3169]
```
use crate::prelude::pijul;
```
[21.3142]
[21.3169]
```
use libflorescence::prelude::pijul;
```
Replacement in inflorescence_view/src/app.rs at line 6 [18.12409]
B:BD[19.4204] → [20.7624:7661]
```
use crate::{diff, el, theme, Theme};
```
[19.4204]
[18.12583]
```
use crate::{cursor, diff, el, theme, Theme};
```
Replacement in inflorescence_view/src/app.rs at line 8 [18.12409]
B:BD[18.12615] → [21.5616:5658]
```
use libflorescence::{cursor, file, repo};
```
[18.12615]
[18.12641]
```
use libflorescence::{file, repo};
```
Insertion in inflorescence_view/src/app.rs at line 193 [18.12409]
[30.2349]
[30.2349]
Replacement in inflorescence_view/src/app.rs at line 196 [18.12409]
B:BD[30.2451] → [30.2451:2490]
```
                el(scrollable(diffs)),
```
[30.2451]
[30.2490]
```
                diffs,
```
Replacement in inflorescence_view/src/app.rs at line 219 [18.12409]
B:BD[30.3363] → [30.3363:3402]
```
                el(scrollable(diffs)),
```
[30.3363]
[30.3402]
```
                diffs,
```
Insertion in inflorescence_view/Cargo.toml at line 20 [16.330]
[16.582]
[16.582]
```
workspace = true
[dependencies.iced-nav-scrollable]
```
File deletion: task
BF:BFD[13.364] → [23.3626:3641]
BF:BFD[23.3641] → [23.3625:3625]
Deletion in inflorescence/src/test.rs at line 1 [24.2521]
B:BD[26.1279] → [26.1279:1320]
```
use crate::task::{await_next_msg, Task};
```

Replacement in inflorescence/src/test.rs at line 2 [24.2521]

B:BD[29.47] → [29.47:137]

    cursor, init, reindex_selection, repo_got_change_diffs, task, update, Msg,
    State,

[29.47]

[29.137]

    cursor, init, reindex_selection, repo_got_change_diffs, update, Msg, State,

Replacement in inflorescence/src/test.rs at line 4 [24.2521]
∅:D[27.87] → [26.1428:1459]
∅:D[28.106] → [26.1428:1459]
∅:D[29.140] → [26.1428:1459]
B:BD[26.1428] → [26.1428:1459]
```
use iced::widget::text_editor;
```
[29.140]
[26.1459]
```
use iced_utils::task::{self, await_next_msg};
use iced_utils::Task;
```
Insertion in inflorescence/src/test.rs at line 16 [24.2521]
[26.1646]
[26.1646]
```
use iced::widget::text_editor;
```

Replacement in inflorescence/src/test.rs at line 474 [24.2521]

B:BD[28.2424] → [28.2424:2494]

        libflorescence::cursor::Selection::UntrackedFile { ix, path }

[28.2424]

[28.2494]

        cursor::Selection::UntrackedFile { ix, path }

Replacement in inflorescence/src/test.rs at line 538 [24.2521]

B:BD[28.4426] → [28.4426:4494]

        libflorescence::cursor::Selection::ChangedFile { ix, path }

[28.4426]

[28.4494]

        cursor::Selection::ChangedFile { ix, path }

Replacement in inflorescence/src/test.rs at line 573 [24.2521]

B:BD[28.5552] → [28.5552:5620]

        libflorescence::cursor::Selection::ChangedFile { ix, path }

[28.5552]

[28.5620]

        cursor::Selection::ChangedFile { ix, path }

Replacement in inflorescence/src/test.rs at line 642 [24.2521]

B:BD[28.7664] → [28.7664:7734]

        libflorescence::cursor::Selection::LogChange { ix, hash, .. }

[28.7664]

[28.7734]

        cursor::Selection::LogChange { ix, hash, .. }

Deletion in inflorescence/src/main.rs at line 1 [2.2763]
B:BD[2.2763] → [23.5207:5222]
```
pub mod task;
```
Replacement in inflorescence/src/main.rs at line 7 [2.2763]
B:BD[5.1220] → [23.5223:5239]
∅:D[8.74] → [7.161:162]
∅:D[23.5239] → [7.161:162]
B:BD[7.161] → [7.161:162]
```
use task::Task;
```
[5.1220]
[18.25349]
```
use iced_utils::{task, Task};
```

Replacement in inflorescence/src/main.rs at line 67 [2.2763]

B:BD[32.4630] → [32.4630:4706]

    let (window_id, open_window_task) = task::open_window(window_settings);

[32.4630]

[24.4279]

    let (window_id, open_window_task) = task::window_open(window_settings);

Insertion in inflorescence/src/main.rs at line 119 [2.2763]
[15.189]
[15.189]
```
    // Diffs for untracked and changed files
```

Insertion in inflorescence/src/main.rs at line 135 [2.2763]

[15.260]

[3.735]

    DiffStateNav {
        id: file::Id,
        msg: diff::Msg,
    },
    LogChangeDiff {
        hash: pijul::Hash,
        file: String,
        msg: diff::Msg,
    },

Replacement in inflorescence/src/main.rs at line 174 [2.2763]

B:BD[18.26187] → [18.26187:26257]

            file::update(&mut state.files, state.repo.as_ref(), msg);

[18.26187]

[18.26257]

            let loaded =
                file::update(&mut state.files, state.repo.as_ref(), msg);
            if let Some(file::Loaded { id, contents_count }) = loaded {
                let diff_state =
                    state.diffs_state.entry(id.clone()).or_default();
                let (nav, tasks) = iced_nav_scrollable::init(contents_count);
                diff_state.nav = Some(nav);
                let id_clone = id.clone();
                return tasks.map(move |msg| Msg::DiffStateNav {
                    id: id_clone.clone(),
                    msg: diff::Msg::NavScrollable(msg),
                });
            }
            Task::none()
        }
        Msg::DiffStateNav { id, msg } => {
            if let Some(diff_state) = state.diffs_state.get_mut(&id) {
                let task = diff::update(diff_state, msg);
                let id_clone = id.clone();
                return task.map(move |msg| Msg::DiffStateNav {
                    id: id_clone.clone(),
                    msg,
                });
            }
            Task::none()
        }
        Msg::LogChangeDiff { hash, file, msg } => {
            if let Some(inflorescence_view::cursor::Selection::LogChange {
                ix: _,
                hash: selection_hash,
                message: _,
                diffs: Some(diffs),
                file: _,
            }) = state.cursor.selection.as_mut()
            {
                if selection_hash == &hash {
                    if let Some((_file, diff_state)) = diffs.get_mut(&file) {
                        let task = diff::update(diff_state, msg);
                        return task.map(move |msg| Msg::LogChangeDiff {
                            hash,
                            file: file.clone(),
                            msg,
                        });
                    }
                }
            }

Replacement in inflorescence/src/main.rs at line 264 [2.2763]

B:BD[18.26390] → [18.26390:26614]

        app::Msg::Cursor(msg) => cursor::update(
            &mut state.cursor,
            &mut state.files,
            state.repo.as_ref(),
            msg,
        )
        .map(|msg| Msg::View(app::Msg::ToRepo(msg))),

[18.26390]

[18.26614]

        app::Msg::Cursor(msg) => {
            let log_file_selection_before =
                if let Some(cursor::Selection::LogChange {
                    file: Some(file),
                    ..
                }) = state.cursor.selection.as_ref()
                {
                    Some(file.ix)
                } else {
                    None
                };
            let cursor_task = cursor::update(
                &mut state.cursor,
                &mut state.files,
                state.repo.as_ref(),
                msg,
            )
            .map(|msg| Msg::View(app::Msg::ToRepo(msg)));
            // If the log file selection has changed, initialize a nav for it
            if let Some(cursor::Selection::LogChange {
                hash,
                diffs: Some(diffs),
                file: Some(cursor::LogChangeFileSelection { ix, path }),
                ..
            }) = state.cursor.selection.as_mut()
            {
                if Some(*ix) != log_file_selection_before {
                    let (
                        _file,
                        diff::State {
                            contents_count,
                            nav,
                            ..
                        },
                    ) = diffs.get_mut(path).unwrap();
                    let (new_nav, nav_tasks) =
                        iced_nav_scrollable::init(contents_count.unwrap());
                    *nav = Some(new_nav);
                    let hash = *hash;
                    let path_clone = path.clone();
                    return Task::batch([
                        cursor_task,
                        nav_tasks.map(move |msg| Msg::LogChangeDiff {
                            hash,
                            file: path_clone.clone(),
                            msg: diff::Msg::NavScrollable(msg),
                        }),
                    ]);
                }
            }
            cursor_task
        }

Replacement in inflorescence/src/main.rs at line 513 [2.2763]

B:BD[25.6738] → [25.6738:6853]

                let diffs = state.diffs_state.entry(id).or_default();
                diff::update(diffs, action);

[25.6738]

[4.7355]

                let diffs = state.diffs_state.entry(id.clone()).or_default();
                return diff::update(diffs, action).map(move |msg| {
                    Msg::DiffStateNav {
                        id: id.clone(),
                        msg,
                    }
                });

Replacement in inflorescence/src/main.rs at line 525 [2.2763]

B:BD[25.7008] → [25.7008:7123]

                let diffs = state.diffs_state.entry(id).or_default();
                diff::update(diffs, action);

[25.7008]

[25.7123]

                let diffs = state.diffs_state.entry(id.clone()).or_default();
                let task = diff::update(diffs, action);
                return task.map(move |msg| Msg::DiffStateNav {
                    id: id.clone(),
                    msg,
                });

Replacement in inflorescence/src/main.rs at line 560 [2.2763]

B:BD[25.7804] → [25.7804:7845]

            diff::update(state, action);

[25.7804]

[12.874]

            return diff::update(state, action).map(move |msg| {
                Msg::LogChangeDiff {
                    hash,
                    file: file.clone(),
                    msg,
                }
            });

Replacement in inflorescence/src/main.rs at line 765 [2.2763]

B:BD[25.13140] → [25.13140:13170]

            let diffs = diffs

[25.13140]

[25.13170]

            let diffs: HashMap<String, (diff::File, diff::State)> = diffs

Replacement in inflorescence/src/main.rs at line 774 [2.2763]

B:BD[25.13552] → [25.13552:13611]

                    (path, (file, diff::State::default()))

[25.13552]

[25.13611]

                    let contents_count = diff::contents_count(&file);
                    let state = diff::State {
                        contents_count: Some(contents_count),
                        ..default()
                    };
                    (path.clone(), (file, state))

Replacement in inflorescence/src/file.rs at line 7 [15.1806]
B:BD[15.1887] → [23.5746:5769]
```
use crate::task::Task;
```
[15.1887]
[15.1887]
```
use iced_utils::Task;
```

Replacement in inflorescence/src/file.rs at line 91 [15.1806]

B:BD[15.4309] → [15.4309:4382]

pub fn update(state: &mut State, repo: Option<&repo::State>, msg: Msg) {

[15.4309]

[15.4382]

#[derive(Debug)]
pub struct Loaded {
    pub id: Id,
    pub contents_count: usize,
}
pub fn update(
    state: &mut State,
    repo: Option<&repo::State>,
    msg: Msg,
) -> Option<Loaded> {

Insertion in inflorescence/src/file.rs at line 121 [15.1806]

[15.5099]

                        let contents_count = diff::contents_count(&file_diff);

Replacement in inflorescence/src/file.rs at line 125 [15.1806]

B:BD[15.5192] → [15.5192:5224]

id,

[15.5192]

[15.5224]

                            id.clone(),

Insertion in inflorescence/src/file.rs at line 128 [15.1806]

[15.5304]


                        return Some(Loaded { id, contents_count });

Insertion in inflorescence/src/file.rs at line 137 [15.1806]

[15.5631]

                            let contents_count =
                                diff::contents_count(&file_diff);

Replacement in inflorescence/src/file.rs at line 142 [15.1806]

B:BD[15.5732] → [15.5732:5768]

id,

[15.5732]

[15.5768]

                                id.clone(),

Insertion in inflorescence/src/file.rs at line 145 [15.1806]

[15.5856]


                            return Some(Loaded { id, contents_count });

Insertion in inflorescence/src/file.rs at line 154 [15.1806]
[15.5976]
[15.5976]
```
    None
```
Replacement in inflorescence/src/diff.rs at line 4 [35.5018]
B:BD[22.1695] → [22.1695:1734]
```
pub use inflorescence_view::diff::Msg;
```
[22.1695]
[22.1734]
```
pub use inflorescence_view::diff::{Msg, State};
```

Replacement in inflorescence/src/diff.rs at line 8 [35.5018]

B:BD[22.1845] → [22.1845:1920]

    DiffWithoutContents, File, Lines, Section, State, UndecodableContents,

[22.1845]

[22.1920]

    DiffWithoutContents, File, Lines, Section, UndecodableContents,

Insertion in inflorescence/src/diff.rs at line 12 [35.5018]
[16.732]
[10.553]
```
use iced_utils::Task;
```

Replacement in inflorescence/src/diff.rs at line 18 [35.5018]

B:BD[11.288] → [18.29154:29202]

pub fn update(_state: &mut State, _msg: Msg) {}

[11.288]

[9.1927]

pub fn update(state: &mut State, msg: Msg) -> Task<Msg> {
    match msg {
        Msg::NavScrollable(msg) => {
            if let Some(nav) = state.nav.as_mut() {
                iced_nav_scrollable::update(nav, msg).map(Msg::NavScrollable)
            } else {
                Task::none()
            }
        }
    }
}

Insertion in inflorescence/src/diff.rs at line 159 [35.5018]

[14.1986]

[9.8673]

pub fn contents_count(diff: &File) -> usize {
    match diff {
        File::Decoded(file) => file.combined.sections.len(),
        File::Undecodable(file) => {
            file.diffs_with_contents.len() + file.diffs_without_contents.len()
        }
    }
}

Replacement in inflorescence/src/cursor.rs at line 2 [3.26]
∅:D[22.1961] → [21.6153:6187]
B:BD[3.26] → [21.6153:6187]
```
pub use libflorescence::cursor::{
```
[22.1961]
[18.29247]
```
pub use inflorescence_view::cursor::{
```
Deletion in inflorescence/src/cursor.rs at line 6 [3.26]
B:BD[18.29310] → [23.5772:5795]
```
use crate::task::Task;
```
Insertion in inflorescence/src/cursor.rs at line 7 [3.26]
[15.8519]
[15.8551]
```
use iced_utils::Task;
```

Insertion in inflorescence/Cargo.toml at line 18 [2.3369]

[10.675]

[2.3637]

workspace = true
[dependencies.iced-nav-scrollable]
workspace = true
[dependencies.iced-utils]

Insertion in inflorescence/Cargo.toml at line 45 [2.3369]
[24.4413]
[24.4413]
```
[dev-dependencies.iced-utils]
workspace = true
features = ["testing"]
```
File addition: iced_utils (d--x------)
[2.2]
File addition: src (d--x------)
[0.9309]
File addition: task (d--x------)
[0.9333]
File move: wrappers.rs → wrappers.rs
BF:BFD[23.3625] → [23.5170:5205]
BF:BF[23.5205] → [23.3643:3643]
[0.9350]
[23.3643]

Insertion in iced_utils/src/task/wrappers.rs at line 6 [23.3643]

[23.3733]


use iced::widget::scrollable;
use iced::{advanced, window};
/// Produces a [`Task`] that scrolls the [`scrollable::Scrollable`] with the
/// given [`scrollable::Id`] to the provided [`scrollable::AbsoluteOffset`].
pub fn scroll_to<T>(
    id: impl Into<scrollable::Id>,
    offset: scrollable::AbsoluteOffset,
) -> Task<T> {
    #[cfg(not(any(test, feature = "testing")))]
    let task = scrollable::scroll_to(id, offset);
    #[cfg(any(test, feature = "testing"))]
    let task = {
        let _ = (id, offset);
        Task::none()
    };

Replacement in iced_utils/src/task/wrappers.rs at line 25 [23.3643]

B:BD[23.3734] → [23.3734:3752]

use iced::window;

[23.3734]

[23.3752]

    task
}
/// Focuses the next focusable widget.
pub fn widget_focus_next<T>() -> Task<T> {
    #[cfg(not(any(test, feature = "testing")))]
    let task = iced::widget::focus_next();
    #[cfg(any(test, feature = "testing"))]
    let task = Task::none();
    task
}
/// Creates a new [`Task`] that runs the given [`advanced::widget::Operation`]
/// and produces its output.
pub fn widget_operate<T>(
    operation: impl advanced::widget::Operation<T> + 'static,
) -> Task<T>
where
    T: Send + 'static,
{
    #[cfg(not(any(test, feature = "testing")))]
    let task = advanced::widget::operate(operation);
    #[cfg(any(test, feature = "testing"))]
    let task = {
        let _ = operation;
        Task::none()
    };
    task
}

Replacement in iced_utils/src/task/wrappers.rs at line 59 [23.3643]

B:BD[23.3753] → [23.3753:3883]

/// Opens a new window with the given [`Settings`]; producing the [`Id`]
/// of the new window on completion.
pub fn open_window(

[23.3753]

[23.3883]

/// Opens a new window with the given [`window::Settings`]; producing the
/// [`window::Id`] of the new window on completion.
pub fn window_open(

Replacement in iced_utils/src/task/wrappers.rs at line 64 [23.3643]
B:BD[23.3953] → [23.3953:3975]
```
    #[cfg(not(test))]
```
[23.3953]
[23.3975]
```
    #[cfg(not(any(test, feature = "testing")))]
```
Replacement in iced_utils/src/task/wrappers.rs at line 67 [23.3643]
B:BD[23.4028] → [23.4028:4045]
```
    #[cfg(test)]
```
[23.4028]
[23.4045]
```
    #[cfg(any(test, feature = "testing"))]
```
Replacement in iced_utils/src/task/wrappers.rs at line 83 [23.3643]
B:BD[23.4414] → [23.4414:4436]
```
    #[cfg(not(test))]
```
[23.4414]
[23.4436]
```
    #[cfg(not(any(test, feature = "testing")))]
```
Replacement in iced_utils/src/task/wrappers.rs at line 96 [23.3643]
B:BD[23.4835] → [23.4835:4852]
```
    #[cfg(test)]
```
[23.4835]
[23.4852]
```
    #[cfg(any(test, feature = "testing"))]
```

Deletion in iced_utils/src/task/wrappers.rs at line 104 [23.3643]

B:BD[23.4962] → [23.4962:5169]


/// Focuses the next focusable widget.
pub fn widget_focus_next<T>() -> Task<T> {
    #[cfg(not(test))]
    let task = iced::widget::focus_next();
    #[cfg(test)]
    let task = Task::none();
    task
}

File move: task.rs → mod.rs
BF:BFD[13.364] → [23.3592:3623]
BF:BF[23.3623] → [23.33:33]
[0.9350]
[23.33]
Replacement in iced_utils/src/task/mod.rs at line 8 [23.33]
B:BD[23.166] → [23.166:184]
```
#[cfg(not(test))]
```
[23.166]
[23.184]
```
#[cfg(not(any(test, feature = "testing")))]
#[doc(inline)]
```
Replacement in iced_utils/src/task/mod.rs at line 12 [23.33]
B:BD[23.205] → [23.205:218]
```
#[cfg(test)]
```
[23.205]
[23.218]
```
#[cfg(any(test, feature = "testing"))]
```
Replacement in iced_utils/src/task/mod.rs at line 17 [23.33]
B:BD[23.308] → [23.308:321]
```
#[cfg(test)]
```
[23.308]
[26.7654]
```
#[cfg(any(test, feature = "testing"))]
```
Replacement in iced_utils/src/task/mod.rs at line 26 [23.33]
B:BD[23.616] → [23.616:629]
```
#[cfg(test)]
```
[23.616]
[23.629]
```
#[cfg(any(test, feature = "testing"))]
```

File addition: lib.rs (----------)

[0.9333]

pub mod task;
#[doc(inline)]
pub use task::Task;

File addition: Cargo.toml (----------)

[0.9309]

[package]
name = "iced-utils"
version.workspace = true
edition.workspace = true
license.workspace = true
authors.workspace = true
[features]
testing = []
[dependencies]
# External dependencies
[dependencies.iced]
workspace = true
[dependencies.tokio]
workspace = true
[dev-dependencies]
# External dependencies
[dev-dependencies.tokio]
workspace = true
features = ["macros"]

Insertion in iced_nav_scrollable/src/lib.rs at line 3 [33.95]
[33.189]
[33.189]
```
use iced_utils::{task, Task};
```

Replacement in iced_nav_scrollable/src/lib.rs at line 7 [33.95]

B:BD[33.239] → [33.239:309]

B:BD[33.309] → [34.47:76]

use iced::{advanced, window, Element, Rectangle, Subscription, Task};
use iced_futures::MaybeSend;

[33.239]

[33.309]

use iced::{advanced, window, Element, Rectangle, Subscription};

Insertion in iced_nav_scrollable/src/lib.rs at line 13 [33.95]
[33.485]
[34.77]
```
    pub ready: Option<NeedsScrolling>,
```
Deletion in iced_nav_scrollable/src/lib.rs at line 16 [33.95]
B:BD[34.119] → [34.119:160]
```
    pub needs_scrolling: NeedsScrolling,
```
Replacement in iced_nav_scrollable/src/lib.rs at line 26 [33.95]
B:BD[34.342] → [34.342:363]
```
        height: f32,
```
[34.342]
[34.363]
```
        height: Option<f32>,
```
Replacement in iced_nav_scrollable/src/lib.rs at line 31 [33.95]
B:BD[34.447] → [34.447:468]
```
        height: f32,
```
[34.447]
[34.468]
```
        height: Option<f32>,
```
Insertion in iced_nav_scrollable/src/lib.rs at line 78 [33.95]
[33.1520]
[34.1243]
```
            ready: None,
```
Deletion in iced_nav_scrollable/src/lib.rs at line 81 [33.95]
B:BD[34.1293] → [34.1293:1343]
```
            needs_scrolling: NeedsScrolling::Yes,
```
Insertion in iced_nav_scrollable/src/lib.rs at line 94 [33.95]
[33.1686]
[33.1686]
```
#[derive(Debug)]
pub struct Ready(pub NeedsScrolling);
```

Replacement in iced_nav_scrollable/src/lib.rs at line 98 [33.95]

B:BD[33.1687] → [34.1504:1788]

pub fn update<Message, MapFn, OnReady>(
    nav: &mut NavScrollable,
    msg: Msg,
    map_msg: MapFn,
    on_ready: OnReady,
) -> Task<Message>
where
    Message: MaybeSend + 'static,
    MapFn: Fn(Msg) -> Message + MaybeSend + 'static,
    OnReady: Fn(NeedsScrolling) -> Message,
{

[33.1687]

[33.1751]

pub fn update(nav: &mut NavScrollable, msg: Msg) -> Task<Msg> {

Deletion in iced_nav_scrollable/src/lib.rs at line 126 [33.95]
B:BD[34.2754] → [34.2754:2780]
```
            .map(map_msg)
```

Replacement in iced_nav_scrollable/src/lib.rs at line 128 [33.95]

B:BD[34.2851] → [34.2851:2934]

            if generation == nav.generation {
                nav.height = height;

[34.2851]

[34.2934]

            if let Some(height) = height {
                if generation == nav.generation {
                    nav.height = height;

Replacement in iced_nav_scrollable/src/lib.rs at line 132 [33.95]

B:BD[34.2935] → [34.2935:3215]

                if let Some(offsets) = nav.pending_tasks.as_mut() {
                    *offsets -= 1;
                    update_offsets_if_ready(nav);
                    if nav.pending_tasks.is_none() {
                        return Task::done(on_ready(nav.needs_scrolling));

[34.2935]

[34.3215]

                    if let Some(offsets) = nav.pending_tasks.as_mut() {
                        *offsets -= 1;
                        update_offsets_if_ready(nav);

Insertion in iced_nav_scrollable/src/lib.rs at line 137 [33.95]

[34.3255]

                Task::none()
            } else {
                // Re-try
                let generation = nav.generation;
                scrollable_height_task(nav.id.clone()).map(move |height| {
                    Msg::GotScrollableHeight { height, generation }
                })

Deletion in iced_nav_scrollable/src/lib.rs at line 145 [33.95]
B:BD[34.3269] → [34.3269:3294]
```
            Task::none()
```

Replacement in iced_nav_scrollable/src/lib.rs at line 151 [33.95]

B:BD[34.3402] → [34.3402:3504]

            if generation == nav.generation {
                nav.section_heights.insert(id, height);

[34.3402]

[34.3504]

            if let Some(height) = height {
                if generation == nav.generation {
                    nav.section_heights.insert(id, height);

Replacement in iced_nav_scrollable/src/lib.rs at line 155 [33.95]

B:BD[34.3505] → [34.3505:3785]

                if let Some(offsets) = nav.pending_tasks.as_mut() {
                    *offsets -= 1;
                    update_offsets_if_ready(nav);
                    if nav.pending_tasks.is_none() {
                        return Task::done(on_ready(nav.needs_scrolling));

[34.3505]

[34.3785]

                    if let Some(offsets) = nav.pending_tasks.as_mut() {
                        *offsets -= 1;
                        update_offsets_if_ready(nav);

Insertion in iced_nav_scrollable/src/lib.rs at line 160 [33.95]

[34.3825]

                Task::none()
            } else {
                // Re-try
                let generation = nav.generation;
                container_height_task(id.clone()).map(move |height| {
                    Msg::GotSectionHeight {
                        id: id.clone(),
                        height,
                        generation,
                    }
                })

Deletion in iced_nav_scrollable/src/lib.rs at line 172 [33.95]
∅:D[34.3839] → [33.2240:2265]
B:BD[33.2240] → [33.2240:2265]
```
            Task::none()
```

Replacement in iced_nav_scrollable/src/lib.rs at line 184 [33.95]

B:BD[33.2632] → [33.2632:2682]

                    return scrollable::scroll_to(

[33.2632]

[33.2682]

                    return task::scroll_to(

Replacement in iced_nav_scrollable/src/lib.rs at line 200 [33.95]

B:BD[33.3180] → [33.3180:3230]

                    return scrollable::scroll_to(

[33.3180]

[33.3230]

                    return task::scroll_to(

Replacement in iced_nav_scrollable/src/lib.rs at line 231 [33.95]
B:BD[33.4371] → [33.4371:4390]
```
    Element::from(
```
[33.4371]
[33.4390]
```
    let nav = Element::from(
```
Replacement in iced_nav_scrollable/src/lib.rs at line 235 [33.95]
B:BD[33.4549] → [33.4549:4555]
```
    )
```
[33.4549]
[33.4555]
```
    );
    Element::from(nav)
```
Insertion in iced_nav_scrollable/src/lib.rs at line 244 [33.95]
[34.4819]
[33.4633]
```
    nav.ready = None;
```
Replacement in iced_nav_scrollable/src/lib.rs at line 260 [33.95]
B:BD[34.5331] → [34.5331:5383]
```
        nav.needs_scrolling = if acc > nav.height {
```
[34.5331]
[34.5383]
```
        nav.ready = Some(if acc > nav.height {
```
Replacement in iced_nav_scrollable/src/lib.rs at line 264 [33.95]
B:BD[34.5463] → [34.5463:5474]
```
        };
```
[34.5463]
[34.5474]
```
        });
```

Replacement in iced_nav_scrollable/src/lib.rs at line 269 [33.95]

B:BD[34.5517] → [34.5517:5698]

/// Produces a [`Task`] that queries the height of the contents of [`Scrollable`] with the
/// given [`Id`].
fn scrollable_height_task(id: impl Into<scrollable::Id>) -> Task<f32> {

[34.5517]

[34.5698]

/// Produces a [`Task`] that queries the height of the contents of
/// [`Scrollable`] with the given [`Id`].
fn scrollable_height_task(id: impl Into<scrollable::Id>) -> Task<Option<f32>> {

Replacement in iced_nav_scrollable/src/lib.rs at line 279 [33.95]

B:BD[34.5817] → [34.5817:5872]

    impl advanced::widget::Operation<f32> for SizeOp {

[34.5817]

[34.5872]

    impl advanced::widget::Operation<Option<f32>> for SizeOp {

Deletion in iced_nav_scrollable/src/lib.rs at line 289 [33.95]
B:BD[34.6200] → [34.6200:6249]
```
                dbg!(&_bounds, &content_bounds);
```
Deletion in iced_nav_scrollable/src/lib.rs at line 290 [33.95]
B:BD[34.6308] → [34.6308:6332]
```
                return;
```

Replacement in iced_nav_scrollable/src/lib.rs at line 298 [33.95]

B:BD[34.6531] → [34.6531:6590]

                &mut dyn advanced::widget::Operation<f32>,

[34.6531]

[34.6590]

                &mut dyn advanced::widget::Operation<Option<f32>>,

Replacement in iced_nav_scrollable/src/lib.rs at line 304 [33.95]

B:BD[34.6667] → [34.6667:6960]

        fn finish(&self) -> advanced::widget::operation::Outcome<f32> {
            advanced::widget::operation::Outcome::Some(
                self.height.expect("Must be able to determine the size. If this even panics, make the height optional and re-try the task when None"),
            )

[34.6667]

[34.6960]

        fn finish(&self) -> advanced::widget::operation::Outcome<Option<f32>> {
            advanced::widget::operation::Outcome::Some(self.height)

Replacement in iced_nav_scrollable/src/lib.rs at line 309 [33.95]
B:BD[34.6972] → [34.6972:7011]
```
    advanced::widget::operate(SizeOp {
```
[34.6972]
[34.7011]
```
    task::widget_operate(SizeOp {
```

Replacement in iced_nav_scrollable/src/lib.rs at line 317 [33.95]

B:BD[33.5208] → [34.7068:7138]

fn container_height_task(id: impl Into<container::Id>) -> Task<f32> {

[33.5208]

[33.5268]

fn container_height_task(id: impl Into<container::Id>) -> Task<Option<f32>> {

Replacement in iced_nav_scrollable/src/lib.rs at line 325 [33.95]

B:BD[33.5387] → [33.5387:5442]

    impl advanced::widget::Operation<f32> for SizeOp {

[33.5387]

[33.5442]

    impl advanced::widget::Operation<Option<f32>> for SizeOp {

Replacement in iced_nav_scrollable/src/lib.rs at line 331 [33.95]

B:BD[33.5614] → [33.5614:5673]

                &mut dyn advanced::widget::Operation<f32>,

[33.5614]

[33.5673]

                &mut dyn advanced::widget::Operation<Option<f32>>,

Replacement in iced_nav_scrollable/src/lib.rs at line 342 [33.95]

B:BD[33.5882] → [33.5882:6175]

        fn finish(&self) -> advanced::widget::operation::Outcome<f32> {
            advanced::widget::operation::Outcome::Some(
                self.height.expect("Must be able to determine the size. If this even panics, make the height optional and re-try the task when None"),
            )

[33.5882]

[33.6175]

        fn finish(&self) -> advanced::widget::operation::Outcome<Option<f32>> {
            advanced::widget::operation::Outcome::Some(self.height)

Replacement in iced_nav_scrollable/src/lib.rs at line 347 [33.95]
B:BD[33.6192] → [33.6192:6231]
```
    advanced::widget::operate(SizeOp {
```
[33.6192]
[33.6231]
```
    task::widget_operate(SizeOp {
```
Insertion in iced_nav_scrollable/Cargo.toml at line 10 [33.6322]
[33.6580]
[33.6580]
```
# Internal dependencies
[dependencies.iced-utils]
workspace = true
```
Replacement in iced_nav_scrollable/Cargo.toml at line 17 [33.6322]
B:BD[34.7157] → [34.7157:7185]
```
[dependencies.iced_futures]
```
[34.7157]
[33.6625]
```
[dependencies.indexmap]
```
Replacement in iced_nav_scrollable/Cargo.toml at line 19 [33.6322]
B:BD[33.6642] → [33.6642:6666]
```
[dependencies.indexmap]
```
[33.6642]
[33.6666]
```
[dev-dependencies]
# Internal dependencies
[dev-dependencies.iced-utils]
```
Insertion in iced_nav_scrollable/Cargo.toml at line 24 [33.6322]
[33.6683]
```
features = ["testing"]
```
Insertion in Cargo.toml at line 7 [2.3754]
[33.6749]
[2.3861]
```
    "iced_utils",
```

Insertion in Cargo.toml at line 21 [2.3754]

[13.607]

[2.4146]

iced-nav-scrollable = { path = "iced_nav_scrollable" }
iced-utils = { path = "iced_utils" }

Deletion in Cargo.toml at line 45 [2.3754]

B:BD[17.1060] → [34.7189:7343]

[workspace.dependencies.iced_futures]
git = "https://github.com/iced-rs/iced"
rev = "c952ea8485b00e58bdff153989f708553272e131"
# path = "../iced/futures"

Replacement in Cargo.lock at line 2102 [2.4495]
B:BD[33.6884] → [34.7542:7559]
```
 "iced_futures",
```
[33.6884]
[33.6884]
```
 "iced-utils",
```

Insertion in Cargo.lock at line 2107 [2.4495]

[2.39501]

name = "iced-utils"
version = "0.1.0"
dependencies = [
 "iced",
 "tokio",
]
[[package]]

Insertion in Cargo.lock at line 2492 [2.4495]
[6.409]
[16.947]
```
 "iced-nav-scrollable",
 "iced-utils",
```
Insertion in Cargo.lock at line 2509 [2.4495]
[16.1043]
[18.29727]
```
 "iced-nav-scrollable",
```

use nav-scrollable

Dependencies

In channels

Change contents

Deletion in libflorescence/src/lib.rs at line 1 [2.1776]

Replacement in justfile at line 31 [2.4]

Insertion in inflorescence_view/src/lib.rs at line 2 [16.102]

Insertion in inflorescence_view/src/diff.rs at line 1 [18.417]

Replacement in inflorescence_view/src/diff.rs at line 5 [18.417]

Insertion in inflorescence_view/src/diff.rs at line 15 [18.417]

Replacement in inflorescence_view/src/diff.rs at line 26 [18.417]

Replacement in inflorescence_view/src/diff.rs at line 43 [18.417]

Replacement in inflorescence_view/src/diff.rs at line 95 [18.417]

Insertion in inflorescence_view/src/diff.rs at line 107 [18.417]

Replacement in inflorescence_view/src/diff.rs at line 116 [18.417]

Replacement in inflorescence_view/src/diff.rs at line 122 [18.417]

Replacement in inflorescence_view/src/diff.rs at line 130 [18.417]

Replacement in inflorescence_view/src/diff.rs at line 138 [18.417]

Replacement in inflorescence_view/src/diff.rs at line 141 [18.417]

File move: cursor.rs → cursor.rs

Replacement in inflorescence_view/src/cursor.rs at line 2 [21.3124]

Replacement in inflorescence_view/src/app.rs at line 6 [18.12409]

Replacement in inflorescence_view/src/app.rs at line 8 [18.12409]

Insertion in inflorescence_view/src/app.rs at line 193 [18.12409]

Replacement in inflorescence_view/src/app.rs at line 196 [18.12409]

Replacement in inflorescence_view/src/app.rs at line 219 [18.12409]

Insertion in inflorescence_view/Cargo.toml at line 20 [16.330]

File deletion: task

Deletion in inflorescence/src/test.rs at line 1 [24.2521]

Replacement in inflorescence/src/test.rs at line 2 [24.2521]

Replacement in inflorescence/src/test.rs at line 4 [24.2521]

Insertion in inflorescence/src/test.rs at line 16 [24.2521]

Replacement in inflorescence/src/test.rs at line 474 [24.2521]

Replacement in inflorescence/src/test.rs at line 538 [24.2521]

Replacement in inflorescence/src/test.rs at line 573 [24.2521]

Replacement in inflorescence/src/test.rs at line 642 [24.2521]

Deletion in inflorescence/src/main.rs at line 1 [2.2763]

Replacement in inflorescence/src/main.rs at line 7 [2.2763]

Replacement in inflorescence/src/main.rs at line 67 [2.2763]

Insertion in inflorescence/src/main.rs at line 119 [2.2763]

Insertion in inflorescence/src/main.rs at line 135 [2.2763]

Replacement in inflorescence/src/main.rs at line 174 [2.2763]

Replacement in inflorescence/src/main.rs at line 264 [2.2763]

Replacement in inflorescence/src/main.rs at line 513 [2.2763]

Replacement in inflorescence/src/main.rs at line 525 [2.2763]

Replacement in inflorescence/src/main.rs at line 560 [2.2763]

Replacement in inflorescence/src/main.rs at line 765 [2.2763]

Replacement in inflorescence/src/main.rs at line 774 [2.2763]

Replacement in inflorescence/src/file.rs at line 7 [15.1806]

Replacement in inflorescence/src/file.rs at line 91 [15.1806]

Insertion in inflorescence/src/file.rs at line 121 [15.1806]

Replacement in inflorescence/src/file.rs at line 125 [15.1806]

Insertion in inflorescence/src/file.rs at line 128 [15.1806]

Insertion in inflorescence/src/file.rs at line 137 [15.1806]

Replacement in inflorescence/src/file.rs at line 142 [15.1806]

Insertion in inflorescence/src/file.rs at line 145 [15.1806]

Insertion in inflorescence/src/file.rs at line 154 [15.1806]

Replacement in inflorescence/src/diff.rs at line 4 [35.5018]

Replacement in inflorescence/src/diff.rs at line 8 [35.5018]

Insertion in inflorescence/src/diff.rs at line 12 [35.5018]

Replacement in inflorescence/src/diff.rs at line 18 [35.5018]

Insertion in inflorescence/src/diff.rs at line 159 [35.5018]

Replacement in inflorescence/src/cursor.rs at line 2 [3.26]

Deletion in inflorescence/src/cursor.rs at line 6 [3.26]

Insertion in inflorescence/src/cursor.rs at line 7 [3.26]

Insertion in inflorescence/Cargo.toml at line 18 [2.3369]

Insertion in inflorescence/Cargo.toml at line 45 [2.3369]

File addition: iced_utils (d--x------)

File addition: src (d--x------)

File addition: task (d--x------)

File move: wrappers.rs → wrappers.rs

Insertion in iced_utils/src/task/wrappers.rs at line 6 [23.3643]

Replacement in iced_utils/src/task/wrappers.rs at line 25 [23.3643]

Replacement in iced_utils/src/task/wrappers.rs at line 59 [23.3643]

Replacement in iced_utils/src/task/wrappers.rs at line 64 [23.3643]

Replacement in iced_utils/src/task/wrappers.rs at line 67 [23.3643]

Replacement in iced_utils/src/task/wrappers.rs at line 83 [23.3643]

Replacement in iced_utils/src/task/wrappers.rs at line 96 [23.3643]

Deletion in iced_utils/src/task/wrappers.rs at line 104 [23.3643]

File move: task.rs → mod.rs