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

Change wording of expand button #79

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

Change wording of expand button #79

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
101 changes: 45 additions & 56 deletions src/components/diff_view.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -253,73 +253,62 @@ pub fn DiffLineGroup(props: &DiffLineGroupProps) -> Html {
props.group_start_index.2 + 1,
);

// use the fact that folded sections never contain changes
let end_index = (
start_index.0 + props.group.len() - 1,
start_index.1 + props.group.len() - 1,
start_index.2 + props.group.len() - 1,
);

// render button instead if we are folded.
if *folded {
html! {
let hidden = props.group.iter().count();
return html! {
<div class="expand">
<button class={classes!("button")} onclick={onclick.clone()}>
<ExpandIcon />
</button>
<button class={classes!("info")} {onclick}>
{
if start_index.1 == start_index.2 {
format!("Show lines {:?} to {:?}", start_index.1, end_index.1)
} else {
format!("Show lines {:?} to {:?}", (start_index.1,start_index.2), (end_index.1,end_index.2))
}
}
{format!("Expand {hidden} hidden lines")}
</button>
</div>
}
} else {
let (mut left_idx, mut right_idx) = (start_index.1, start_index.2);
html! {
<>
{
props.group.iter().map(|(tag, change)| {
let (sign, class, left, right) = match tag {
ChangeTag::Delete => ("-", "deletion", Some(left_idx), None),
ChangeTag::Insert => ("+", "insertion", None, Some(right_idx)),
ChangeTag::Equal => (" ", "unchanged", Some(left_idx), Some(right_idx)),
};
(left_idx, right_idx) = match tag {
ChangeTag::Delete => (left_idx + 1, right_idx),
ChangeTag::Insert => (left_idx, right_idx + 1),
ChangeTag::Equal => (left_idx + 1, right_idx + 1),
};
};
}

html! {
<div class={classes!("line", class)}>
<a id={left.map(|i| format!("L{i}"))} class="line-number">
if let Some(index) = left {
{index}
}
</a>
<a id={right.map(|i| format!("R{i}"))} class="line-number">
if let Some(index) = right {
{index}
}
</a>
<div class="change-icon">
{
format!("{sign}")
}
</div>
<div class="code-line">
<CodeLine stack={change.clone()} />
</div>
let (mut left_idx, mut right_idx) = (start_index.1, start_index.2);
html! {
<>
{
props.group.iter().map(|(tag, change)| {
let (sign, class, left, right) = match tag {
ChangeTag::Delete => ("-", "deletion", Some(left_idx), None),
ChangeTag::Insert => ("+", "insertion", None, Some(right_idx)),
ChangeTag::Equal => (" ", "unchanged", Some(left_idx), Some(right_idx)),
};
(left_idx, right_idx) = match tag {
ChangeTag::Delete => (left_idx + 1, right_idx),
ChangeTag::Insert => (left_idx, right_idx + 1),
ChangeTag::Equal => (left_idx + 1, right_idx + 1),
};

html! {
<div class={classes!("line", class)}>
<a id={left.map(|i| format!("L{i}"))} class="line-number">
if let Some(index) = left {
{index}
}
</a>
<a id={right.map(|i| format!("R{i}"))} class="line-number">
if let Some(index) = right {
{index}
}
</a>
<div class="change-icon">
{
format!("{sign}")
}
</div>
}
}).collect::<Html>()
}
</>
<div class="code-line">
<CodeLine stack={change.clone()} />
</div>
</div>
}
}).collect::<Html>()
}
</>
}
}

Expand Down