Skip to content

Manuals: Sync sidebar without collapsing rows #691

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

Merged
sonnyp merged 2 commits into from
Oct 21, 2023
Merged

Manuals: Sync sidebar without collapsing rows #691

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
367addc
Manuals: Sync sidebar without collapsing rows
AkshayWarrier Oct 17, 2023
13a5993
Extract finding index into a function and add comments
AkshayWarrier Oct 21, 2023
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
39 changes: 28 additions & 11 deletions src/Manuals/DocumentationViewer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,6 @@ export default function DocumentationViewer({ application }) {
adj.connect("value-changed", () => {
if (scrolled_to) {
const index = browse_selection_model.selected;
const adj = browse_page.get_vscrollbar().adjustment;
const bottom_edge = (index + 1) * 38 - adj.value;
const top_edge = bottom_edge - 38;
// If row is not visible after scroll_to, adjust
Expand Down Expand Up @@ -260,12 +259,8 @@ function collapseAllRows(model) {

function selectSidebarItem(browse_list_view, path) {
const selection_model = browse_list_view.model;
collapseAllRows(selection_model.model);
for (const index of path.slice(0, -1)) {
const row = selection_model.model.get_row(index);
row.expanded = true;
}
const index = path[path.length - 1];
const tree_model = selection_model.model;
const index = getItemIndex(tree_model, path);
// If possible, overshoot scrolling by one row to ensure selected row is visible
index + 1 === selection_model.n_items
? browse_list_view.scroll_to(index, Gtk.ListScrollFlags.NONE, null)
Expand All @@ -274,6 +269,31 @@ function selectSidebarItem(browse_list_view, path) {
scrolled_to = true;
}

function getItemIndex(tree_model, path) {
let relative_index = 0; // Relative index of the item under its parent
let absolute_index = 0; // Index of the item in the entire model
let skip = 0; // Number of items to skip due to expanded rows

for (let i = 0; i < path.length; i++) {
while (relative_index < path[i]) {
const row = tree_model.get_row(absolute_index);
if (row.expanded) {
skip += row.children.get_n_items();
}
if (!skip) relative_index++; // Go to next sibling
else skip--;
absolute_index++;
}
// Check to ensure the last item is not expanded
if (i < path.length - 1) {
tree_model.get_row(absolute_index).expanded = true;
absolute_index++;
relative_index = 1;
}
}
return absolute_index;
}

async function loadLibrary(model, directory) {
try {
const json_file = directory.get_child("index.json");
Expand Down Expand Up @@ -340,10 +360,7 @@ function flattenModel(
for (const item of list_store) {
if (item.search_name) flattened_model.append(item);
if (item.children) {
flattenModel(item.children, flattened_model, [
...path,
path[path.length - 1] + 1,
]);
flattenModel(item.children, flattened_model, [...path, 1]);
}
URI_TO_SIDEBAR_PATH[item.uri] = path.slice();
path[path.length - 1]++;
Expand Down