Skip to content

Fix container scroll bounds by factoring child layout heights #445

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

Open
notdanilo wants to merge 1 commit into
base: main
Choose a base branch
from
+31 −4
Open

Fix container scroll bounds by factoring child layout heights #445

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
35 changes: 31 additions & 4 deletions packages/blitz-dom/src/document.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1537,15 +1537,14 @@ impl BaseDocument {
y: f64,
mut dispatch_event: F,
) -> bool {
let Some(node) = self.nodes.get_mut(node_id) else {
// Pre-compute scroll capabilities and corrected scroll height using shared references (before mutable borrow)
let Some(node) = self.nodes.get(node_id) else {
return false;
};

let is_html_or_body = node.data.downcast_element().is_some_and(|e| {
let tag = &e.name.local;
tag == "html" || tag == "body"
});

let (can_x_scroll, can_y_scroll) = node
.primary_styles()
.map(|styles| {
Expand All @@ -1557,6 +1556,35 @@ impl BaseDocument {
})
.unwrap_or((false, false));

let mut scroll_height = node.final_layout.scroll_height() as f64;
if can_y_scroll {
let layout = &node.final_layout;
let padding_border = (layout.padding.top
+ layout.padding.bottom
+ layout.border.top
+ layout.border.bottom) as f64;
if let Some(ref children) = *node.layout_children.borrow() {
let mut max_child_bottom: f64 = 0.0;
for &child_id in children {
if let Some(child) = self.nodes.get(child_id) {
let child_bottom = (child.final_layout.location.y
+ child.final_layout.size.height)
as f64;
if child_bottom > max_child_bottom {
max_child_bottom = child_bottom;
}
}
}
let children_scroll_height =
(max_child_bottom + padding_border - layout.size.height as f64).max(0.0);
scroll_height = scroll_height.max(children_scroll_height);
}
}

let Some(node) = self.nodes.get_mut(node_id) else {
return false;
};

let initial = node.scroll_offset;
let new_x = node.scroll_offset.x - x;
let new_y = node.scroll_offset.y - y;
Expand All @@ -1565,7 +1593,6 @@ impl BaseDocument {
let mut bubble_y = 0.0;

let scroll_width = node.final_layout.scroll_width() as f64;
let scroll_height = node.final_layout.scroll_height() as f64;

// Handle sub document case
if let Some(mut sub_doc) = node.subdoc_mut().map(|doc| doc.inner_mut()) {
Expand Down
Loading