Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Make file tree sidebar collapsible #89

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Make file tree sidebar collapsible #89

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
140 changes: 111 additions & 29 deletions src/components/file_tree.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,16 @@ use std::rc::Rc;
use web_sys::HtmlInputElement;
use yew::prelude::*;

macro_rules! toggle_bool {
($bool:expr) => {{
let boolean = $bool.clone();
Callback::from(move |event: MouseEvent| {
event.prevent_default();
boolean.set(!*boolean);
})
}};
}

#[derive(PartialEq, Clone, Debug)]
struct Context {
old_krate: String,
Expand Down Expand Up @@ -87,8 +97,17 @@ impl SearchFilter {
}
}

#[derive(Properties, PartialEq, Clone)]
pub struct FileNavigationProps {
pub diff: Rc<VersionDiff>,
pub path: Utf8PathBuf,
}

#[derive(Properties, PartialEq, Clone)]
pub struct FileTreeProps {
search_filter: UseStateHandle<SearchFilter>,
change_filter: UseStateHandle<ChangeFilter>,
is_expanded: UseStateHandle<bool>,
pub diff: Rc<VersionDiff>,
pub path: Utf8PathBuf,
}
Expand Down Expand Up @@ -260,22 +279,97 @@ fn SubTree(props: &SubTreeProps) -> Html {
}

#[function_component]
pub fn FileTree(props: &FileTreeProps) -> Html {
let entries = match props.diff.tree.item.clone() {
Item::File => Default::default(),
Item::Dir(entries) => entries,
};

pub fn FileTreeNavigation(props: &FileNavigationProps) -> Html {
let change_filter = use_state(|| ChangeFilter::All);
let search_filter = use_state(|| SearchFilter::All);
let expanded = use_state_eq(|| true);

if *expanded {
html! {
<nav id="files" class="md:w-72 lg:w-84 xl:w-96" aria-label="Files">
<ExpandedFileTree diff={props.diff.clone()} path={props.path.clone()} is_expanded={expanded.clone()} change_filter={change_filter.clone()} search_filter={search_filter.clone()} />
</nav>
}
} else {
html! {
<nav id="files" class="w-4" aria-label="Files">
<HiddenFileTree diff={props.diff.clone()} path={props.path.clone()} is_expanded={expanded.clone()} change_filter={change_filter.clone()} search_filter={search_filter.clone()}/>
</nav>
}
}
}

#[function_component]
pub fn HiddenFileTree(props: &FileTreeProps) -> Html {
html! {
<div class="file-tree">
<FileTreeNavigationHeader
is_expanded={props.is_expanded.clone()}
search_filter={props.search_filter.clone()}
change_filter={props.change_filter.clone()}
/>
</div>
}
}

#[derive(Properties, PartialEq, Clone)]
pub struct FileTreeNavigationHeaderProps {
is_expanded: UseStateHandle<bool>,
search_filter: UseStateHandle<SearchFilter>,
change_filter: UseStateHandle<ChangeFilter>,
}

#[function_component]
pub fn FileTreeNavigationHeader(props: &FileTreeNavigationHeaderProps) -> Html {
let change_filter_set = |filter: ChangeFilter| {
let change_filter = change_filter.clone();
let change_filter = props.change_filter.clone();
move |event: MouseEvent| {
change_filter.set(filter);
event.prevent_default();
}
};

let search_filter = use_state(|| SearchFilter::All);
if *props.is_expanded {
html! {
<div class="header">
<button class={classes!("toggle", "active")} onclick={toggle_bool!(props.is_expanded)} title="Hide tree">
<ExpandIcon is_expanded=true />
</button>
<FileSearch filter={props.search_filter.clone()} />
<div class="button-group" role="group">
<button
type="button"
class={classes!("first", props.change_filter.is_all().then_some("active"))}
onclick={change_filter_set(ChangeFilter::All)}>
{"all"}
</button>
<button
type="button"
class={classes!("last", props.change_filter.is_changed().then_some("active"))}
onclick={change_filter_set(ChangeFilter::Changed)}>
{"changed"}
</button>
</div>
</div>
}
} else {
html! {
<div class="header">
<button class={classes!("toggle")} onclick={toggle_bool!(props.is_expanded)} title="Show File tree">
<ExpandIcon is_expanded=false />
</button>
</div>
}
}
}

#[function_component]
pub fn ExpandedFileTree(props: &FileTreeProps) -> Html {
let entries = match props.diff.tree.item.clone() {
Item::File => Default::default(),
Item::Dir(entries) => entries,
};

let prefix = Rc::new(Utf8PathBuf::default());
let active = Rc::new(props.path.clone());

Expand All @@ -288,37 +382,25 @@ pub fn FileTree(props: &FileTreeProps) -> Html {

html! {
<div class="file-tree">
<div class="header">
<FileSearch filter={search_filter.clone()} />
<div class="button-group" role="group">
<button
type="button"
class={classes!("first", change_filter.is_all().then_some("active"))}
onclick={change_filter_set(ChangeFilter::All)}>
{"all"}
</button>
<button
type="button"
class={classes!("last", change_filter.is_changed().then_some("active"))}
onclick={change_filter_set(ChangeFilter::Changed)}>
{"changed"}
</button>
</div>
</div>
<FileTreeNavigationHeader
is_expanded={props.is_expanded.clone()}
search_filter={props.search_filter.clone()}
change_filter={props.change_filter.clone()}
/>
{
entries
.into_iter()
.filter(|(_, entry)| change_filter.matches(entry.changes))
.filter(|(_, entry)| search_filter.matches(&entry.name) || entry.item.is_dir())
.filter(|(_, entry)| props.change_filter.matches(entry.changes))
.filter(|(_, entry)| props.search_filter.matches(&entry.name) || entry.item.is_dir())
.map(|(key, entry)| html! {
<FileEntry
{key}
{entry}
prefix={prefix.clone()}
active={active.clone()}
context={context.clone()}
change_filter={*change_filter}
search_filter={(*search_filter).clone()}
change_filter={*props.change_filter}
search_filter={(*props.search_filter).clone()}
/>
})
.collect::<Html>()
Expand Down
4 changes: 4 additions & 0 deletions src/tailwind.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,10 @@
@apply flex flex-row items-center gap-2 h-8 mb-2 mt-2;
}

.file-tree .header .toggle {
@apply w-4 shrink-0;
}

.file-tree .header .button-group {
@apply inline-flex rounded-md shadow-sm;
}
Expand Down
4 changes: 1 addition & 3 deletions src/views/diff.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -293,12 +293,10 @@ pub fn SourceView(props: &SourceViewProps) -> Html {
/>
<Content>
<main class="flex flex-col md:flex-row gap-2 lg:gap-4 p-2">
<nav id="files" class="md:w-72 lg:w-84 xl:w-96" aria-label="Files">
<FileTree
<FileTreeNavigation
diff={diff.clone()}
path={props.path.clone()}
/>
</nav>
<div id="diff-view" class="flex-1">
<DiffView {diff} path={props.path.clone()} />
</div>
Expand Down
10 changes: 4 additions & 6 deletions src/views/repo.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,12 +208,10 @@ fn RepoSourceFetcherInner(props: &RepoSourceFetcherInnerProps) -> HtmlResult {
Ok(html! {
<Content>
<main class="flex flex-col md:flex-row gap-2 lg:gap-4 p-2">
<nav id="files" class="md:w-72 lg:w-84 xl:w-96" aria-label="Files">
<FileTree
diff={diff.clone()}
path={props.path.clone()}
/>
</nav>
<FileTreeNavigation
diff={diff.clone()}
path={props.path.clone()}
/>
<div id="diff-view" class="flex-1">
<DiffView {diff} path={props.path.clone()} />
</div>
Expand Down