Skip to content

feat: update to upstream @floating-ui/dom@1.8.0 #364

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
DanielleHuisman merged 2 commits into from
Aug 21, 2026
Merged

feat: update to upstream @floating-ui/dom@1.8.0 #364

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7741173
feat: update to upstream @floating-ui/dom@1.8.0
rust-for-web[bot] Aug 21, 2026
2d1d3f4
fix: upstream update
DanielleHuisman Aug 21, 2026
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
2 changes: 1 addition & 1 deletion packages/core/src/compute_coords_from_placement.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ pub fn compute_coords_from_placement(
if let Some(alignment) = get_alignment(placement) {
coords.update_axis(alignment_axis, |value| {
value
- common_align
+ common_align
* (if alignment == Alignment::End {
1.0
} else {
Expand Down
228 changes: 123 additions & 105 deletions packages/dom/src/auto_update.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ use floating_ui_utils::{
dom::{OverflowAncestor, get_document_element, get_overflow_ancestors, get_window},
};
use web_sys::{
AddEventListenerOptions, Element, EventTarget, IntersectionObserver, IntersectionObserverEntry,
Element, EventTarget, IntersectionObserver, IntersectionObserverEntry,
IntersectionObserverInit, ResizeObserver, ResizeObserverEntry,
wasm_bindgen::{JsCast, JsValue, closure::Closure},
window,
Expand All @@ -30,7 +30,7 @@ fn cancel_animation_frame(handle: i32) {
.expect("Cancel animation frame should be successful.")
}

fn observe_move(element: Element, on_move: Rc<dyn Fn()>) -> Box<dyn Fn()> {
fn observe_move(element: Element, on_move: Rc<dyn Fn()>, ancestor_resize: bool) -> Box<dyn Fn()> {
let io: Rc<RefCell<Option<IntersectionObserver>>> = Rc::new(RefCell::new(None));
let timeout_id: Rc<RefCell<Option<i32>>> = Rc::new(RefCell::new(None));

Expand Down Expand Up @@ -61,55 +61,65 @@ fn observe_move(element: Element, on_move: Rc<dyn Fn()>) -> Box<dyn Fn()> {
let refresh_closure_clone = refresh_closure.clone();

let refresh_cleanup = cleanup_rc.clone();
*refresh_closure_clone.borrow_mut() = Some(Box::new(move |skip: bool, threshold: f64| {
refresh_cleanup();
*refresh_closure_clone.borrow_mut() = Some(Box::new({
let element = element.clone();

let element_rect_for_root_margin = element.get_bounding_client_rect();
move |skip: bool, threshold: f64| {
refresh_cleanup();

if !skip {
on_move();
}

if element_rect_for_root_margin.width() == 0.0
|| element_rect_for_root_margin.height() == 0.0
{
return;
}

let inset_top = element_rect_for_root_margin.top().floor();
let inset_right = (root.client_width() as f64
- (element_rect_for_root_margin.left() + element_rect_for_root_margin.width()))
.floor();
let inset_bottom = (root.client_height() as f64
- (element_rect_for_root_margin.top() + element_rect_for_root_margin.height()))
.floor();
let inset_left = element_rect_for_root_margin.left().floor();
let root_margin = format!(
"{}px {}px {}px {}px",
-inset_top, -inset_right, -inset_bottom, -inset_left
);

let is_first_update: Rc<RefCell<bool>> = Rc::new(RefCell::new(true));

let timeout_refresh = refresh_closure.clone();
let timeout_closure: Rc<Closure<dyn Fn()>> = Rc::new(Closure::new(move || {
timeout_refresh
.borrow()
.as_ref()
.expect("Refresh closure should exist.")(false, 1e-7)
}));
let element_rect_for_root_margin = element.get_bounding_client_rect();

let observe_timeout_id = timeout_id.clone();
let observe_window = window.clone();
let observe_refresh = refresh_closure.clone();
let local_observe_closure = Closure::new({
let element = element.clone();
if !skip {
on_move();
}

move |entries: Vec<IntersectionObserverEntry>| {
let ratio = entries[0].intersection_ratio();
if element_rect_for_root_margin.width() == 0.0
|| element_rect_for_root_margin.height() == 0.0
{
return;
}

if ratio != threshold {
if !*is_first_update.borrow() {
let inset_top = element_rect_for_root_margin.top().floor();
let inset_right = (root.client_width() as f64
- (element_rect_for_root_margin.left() + element_rect_for_root_margin.width()))
.floor();
let inset_bottom = (root.client_height() as f64
- (element_rect_for_root_margin.top() + element_rect_for_root_margin.height()))
.floor();
let inset_left = element_rect_for_root_margin.left().floor();
let root_margin = format!(
"{}px {}px {}px {}px",
-inset_top, -inset_right, -inset_bottom, -inset_left
);

let is_first_update: Rc<RefCell<bool>> = Rc::new(RefCell::new(true));

let timeout_refresh = refresh_closure.clone();
let timeout_closure: Rc<Closure<dyn Fn()>> = Rc::new(Closure::new(move || {
timeout_refresh
.borrow()
.as_ref()
.expect("Refresh closure should exist.")(false, 1e-7)
}));

let observe_timeout_id = timeout_id.clone();
let observe_window = window.clone();
let observe_refresh = refresh_closure.clone();
let local_observe_closure = Closure::new({
let element = element.clone();

move |entries: Vec<IntersectionObserverEntry>| {
let ratio = entries[0].intersection_ratio();

// The entry is a snapshot, so the reference may have moved since the
// intersection was computed (under performance constraints, or between
// consecutive frames of a multi-frame layout shift). The reported ratio
// and the observed area are stale in that case and cannot be trusted to
// detect subsequent movement, so refresh regardless of the ratio.
if !rects_are_equal(
&(&element_rect_for_root_margin).into(),
&element.get_bounding_client_rect().into(),
) {
observe_refresh
.borrow()
.as_ref()
Expand All @@ -119,71 +129,85 @@ fn observe_move(element: Element, on_move: Rc<dyn Fn()>) -> Box<dyn Fn()> {
return;
}

if ratio == 0.0 {
// If the reference is clipped, the ratio is 0. Throttle the refresh to prevent an infinite loop of updates.
observe_timeout_id.replace(Some(
observe_window
.set_timeout_with_callback_and_timeout_and_arguments_0(
(*timeout_closure).as_ref().unchecked_ref(),
1000,
)
.expect("Set timeout should be successful."),
));
} else {
observe_refresh
.borrow()
.as_ref()
.expect("Refresh closure should exist.")(
false, ratio
);
if ratio != threshold {
if !*is_first_update.borrow() {
observe_refresh
.borrow()
.as_ref()
.expect("Refresh closure should exist.")(
false, 1.0
);
return;
}

if ratio == 0.0 {
// If the reference is clipped in place, the ratio is 0. Throttle the refresh to prevent an infinite loop of updates.
observe_timeout_id.replace(Some(
observe_window
.set_timeout_with_callback_and_timeout_and_arguments_0(
(*timeout_closure).as_ref().unchecked_ref(),
1000,
)
.expect("Set timeout should be successful."),
));
} else {
observe_refresh
.borrow()
.as_ref()
.expect("Refresh closure should exist.")(
false, ratio
);
}
}
}

if ratio == 1.0
&& !rects_are_equal(
&element_rect_for_root_margin.clone().into(),
&element.get_bounding_client_rect().into(),
)
{
// It's possible that even though the ratio is reported as 1, the
// element is not actually fully within the IntersectionObserver's root
// area anymore. This can happen under performance constraints. This may
// be a bug in the browser's IntersectionObserver implementation. To
// work around this, we compare the element's bounding rect now with
// what it was at the time we created the IntersectionObserver. If they
// are not equal then the element moved, so we refresh.
observe_refresh
.borrow()
.as_ref()
.expect("Refresh closure should exist.")(false, 1.0);
is_first_update.replace(false);
}
});

is_first_update.replace(false);
}
});
let options = IntersectionObserverInit::new();
options.set_root_margin(&root_margin);
options.set_threshold(&JsValue::from_f64(threshold.clamp(0.0, 1.0)));

let options = IntersectionObserverInit::new();
options.set_root_margin(&root_margin);
options.set_threshold(&JsValue::from_f64(threshold.clamp(0.0, 1.0)));
let local_io = IntersectionObserver::new_with_options(
local_observe_closure.as_ref().unchecked_ref(),
&options,
)
.expect("Intersection observer should be created.");

let local_io = IntersectionObserver::new_with_options(
local_observe_closure.as_ref().unchecked_ref(),
&options,
)
.expect("Intersection observer should be created.");
observe_closure.replace(Some(local_observe_closure));

observe_closure.replace(Some(local_observe_closure));

local_io.observe(&element);
io.replace(Some(local_io));
local_io.observe(&element);
io.replace(Some(local_io));
}
}));

// The window is a resize ancestor, so when `ancestor_resize` is enabled its
// listener already runs the update on resize. Here we only need to rebuild
// the `IntersectionObserver` for the new root size, skipping a redundant
// update. When `ancestor_resize` is disabled, this becomes the sole update.
let win = get_window(Some(&element));
let handle_resize: Closure<dyn Fn()> = Closure::new({
let refresh_closure_clone = refresh_closure_clone.clone();

move || {
refresh_closure_clone
.borrow()
.as_ref()
.expect("Refresh closure should exist.")(ancestor_resize, 1.0);
}
});

win.add_event_listener_with_callback("resize", handle_resize.as_ref().unchecked_ref())
.expect("Resize event listener should be added.");

refresh_closure_clone
.borrow()
.as_ref()
.expect("Refresh closure should exist.")(true, 1.0);

Box::new(move || {
win.remove_event_listener_with_callback("resize", handle_resize.as_ref().unchecked_ref())
.expect("Resize event listener should be removed.");
cleanup_rc();
})
}
Expand Down Expand Up @@ -303,15 +327,8 @@ pub fn auto_update(
};

if ancestor_scoll {
let options = AddEventListenerOptions::new();
options.set_passive(true);

event_target
.add_event_listener_with_callback_and_add_event_listener_options(
"scroll",
update_closure.as_ref().unchecked_ref(),
&options,
)
.add_event_listener_with_callback("scroll", update_closure.as_ref().unchecked_ref())
.expect("Scroll event listener should be added.");
}

Expand All @@ -323,7 +340,8 @@ pub fn auto_update(
}

let cleanup_observe_move = reference_element.as_ref().and_then(|reference_element| {
layout_shift.then(|| observe_move(reference_element.clone(), update.clone()))
layout_shift
.then(|| observe_move(reference_element.clone(), update.clone(), ancestor_resize))
});

let reobserve_frame: Rc<RefCell<Option<i32>>> = Rc::new(RefCell::new(None));
Expand Down
2 changes: 1 addition & 1 deletion packages/dom/src/platform/convert_offset_parent_relative_rect_to_viewport_relative_rect.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ pub fn convert_offset_parent_relative_rect_to_viewport_relative_rect(
});

#[allow(clippy::nonminimal_bool)]
if is_offset_parent_an_element || (!is_offset_parent_an_element && !is_fixed) {
if is_offset_parent_an_element || !is_fixed {
if let Some(offset_parent) = offset_parent.as_ref()
&& (get_node_name(offset_parent.into()) != "body"
|| is_overflow_element(&document_element))
Expand Down
14 changes: 9 additions & 5 deletions packages/dom/src/platform/get_clipping_rect.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,10 @@ use crate::{
platform::{Platform, get_scale::get_scale},
types::Boundary,
utils::{
get_bounding_client_rect::get_bounding_client_rect, get_document_rect::get_document_rect,
get_viewport_rect::get_viewport_rect, get_visual_offsets::get_visual_offsets,
get_bounding_client_rect::get_bounding_client_rect,
get_document_rect::get_document_rect,
get_viewport_rect::{ViewportRootBoundary, get_viewport_rect},
get_visual_offsets::get_visual_offsets,
},
};

Expand Down Expand Up @@ -50,9 +52,11 @@ fn get_client_rect_from_clipping_ancestor(
get_inner_bounding_client_rect(&element, strategy)
}
ElementOrRootBoundary::RootBoundary(RootBoundary::Viewport)
| ElementOrRootBoundary::RootBoundary(RootBoundary::LayoutViewport) => {
get_viewport_rect(&get_document_element(Some(element.into())), strategy)
}
| ElementOrRootBoundary::RootBoundary(RootBoundary::LayoutViewport) => get_viewport_rect(
&get_document_element(Some(element.into())),
strategy,
ViewportRootBoundary::Viewport,
),
ElementOrRootBoundary::RootBoundary(RootBoundary::Document) => {
get_document_rect(&get_document_element(Some(element.into())))
}
Expand Down
Loading
Loading