Update to upstream @floating-ui/dom@1.6.12 (#49)

github-actions[bot] · DanielleHuisman · web-flow · commit aeb944307191 · 2024-11-03T19:45:55.000+01:00
* Update to upstream @floating-ui/dom@1.6.12

* Fix handling of relative html offset clipping rect

---------

Co-authored-by: github-actions[bot] &lt;github-actions[bot]@users.noreply.github.com&gt;
Co-authored-by: Daniëlle Huisman &lt;danielle@huisman.me&gt;
diff --git a/packages/dom/src/platform/convert_offset_parent_relative_rect_to_viewport_relative_rect.rs b/packages/dom/src/platform/convert_offset_parent_relative_rect_to_viewport_relative_rect.rs
@@ -9,7 +9,8 @@ use floating_ui_utils::{
 use web_sys::{Element, Window};
 
 use crate::{
-    platform::get_scale::get_scale, utils::get_bounding_client_rect::get_bounding_client_rect,
+    platform::get_scale::get_scale,
+    utils::{get_bounding_client_rect::get_bounding_client_rect, get_html_offset::get_html_offset},
 };
 
 pub fn convert_offset_parent_relative_rect_to_viewport_relative_rect(
@@ -68,9 +69,15 @@ pub fn convert_offset_parent_relative_rect_to_viewport_relative_rect(
         }
     }
 
+    let html_offset = if !is_offset_parent_an_element && !is_fixed {
+        get_html_offset(&document_element, &scroll, Some(true))
+    } else {
+        Coords::new(0.0)
+    };
+
     Rect {
-        x: rect.x * scale.x - scroll.scroll_left * scale.x + offsets.x,
-        y: rect.y * scale.y - scroll.scroll_top * scale.y + offsets.y,
+        x: rect.x * scale.x - scroll.scroll_left * scale.x + offsets.x + html_offset.x,
+        y: rect.y * scale.y - scroll.scroll_top * scale.y + offsets.y + html_offset.y,
         width: rect.width * scale.x,
         height: rect.height * scale.y,
     }
diff --git a/packages/dom/src/utils.rs b/packages/dom/src/utils.rs
@@ -1,6 +1,7 @@
 pub mod get_bounding_client_rect;
 pub mod get_css_dimensions;
 pub mod get_document_rect;
+pub mod get_html_offset;
 pub mod get_rect_relative_to_offset_parent;
 pub mod get_viewport_rect;
 pub mod get_visual_offsets;
diff --git a/packages/dom/src/utils/get_html_offset.rs b/packages/dom/src/utils/get_html_offset.rs
@@ -0,0 +1,24 @@
+use floating_ui_utils::{dom::NodeScroll, Coords};
+use web_sys::Element;
+
+use crate::utils::get_window_scroll_bar_x::get_window_scroll_bar_x;
+
+pub fn get_html_offset(
+    document_element: &Element,
+    scroll: &NodeScroll,
+    ignore_scrollbar_x: Option<bool>,
+) -> Coords {
+    let ignore_scrollbar_x = ignore_scrollbar_x.unwrap_or(false);
+
+    let html_rect = document_element.get_bounding_client_rect();
+    let x = html_rect.left() + scroll.scroll_left
+        - if ignore_scrollbar_x {
+            0.0
+        } else {
+            // RTL <body> scrollbar.
+            get_window_scroll_bar_x(document_element, Some(&html_rect))
+        };
+    let y = html_rect.top() + scroll.scroll_top;
+
+    Coords { x, y }
+}
diff --git a/packages/dom/src/utils/get_rect_relative_to_offset_parent.rs b/packages/dom/src/utils/get_rect_relative_to_offset_parent.rs
@@ -9,7 +9,7 @@ use floating_ui_utils::{
 use crate::{
     types::ElementOrVirtual,
     utils::{
-        get_bounding_client_rect::get_bounding_client_rect,
+        get_bounding_client_rect::get_bounding_client_rect, get_html_offset::get_html_offset,
         get_window_scroll_bar_x::get_window_scroll_bar_x,
     },
 };
@@ -59,19 +59,14 @@ pub fn get_rect_relative_to_offset_parent(
         }
     }
 
-    let mut html_x = 0.0;
-    let mut html_y = 0.0;
+    let html_offset = if !is_offset_parent_an_element && !is_fixed {
+        get_html_offset(&document_element, &scroll, None)
+    } else {
+        Coords::new(0.0)
+    };
 
-    if !is_offset_parent_an_element && !is_fixed {
-        let html_rect = document_element.get_bounding_client_rect();
-        html_y = html_rect.top() as f64 + scroll.scroll_top;
-        html_x = html_rect.left()as f64 + scroll.scroll_left
-            // RTL <body> scrollbar.
-            - get_window_scroll_bar_x(&document_element, Some(html_rect));
-    }
-
-    let x = rect.left + scroll.scroll_left - offsets.x - html_x;
-    let y = rect.top + scroll.scroll_top - offsets.y - html_y;
+    let x = rect.left + scroll.scroll_left - offsets.x - html_offset.x;
+    let y = rect.top + scroll.scroll_top - offsets.y - html_offset.y;
 
     Rect {
         x,
diff --git a/packages/dom/src/utils/get_window_scroll_bar_x.rs b/packages/dom/src/utils/get_window_scroll_bar_x.rs
@@ -4,7 +4,7 @@ use web_sys::{DomRect, Element};
 use crate::utils::get_bounding_client_rect::get_bounding_client_rect;
 
 // If <html> has a CSS width greater than the viewport, then this will be incorrect for RTL.
-pub fn get_window_scroll_bar_x(element: &Element, rect: Option<DomRect>) -> f64 {
+pub fn get_window_scroll_bar_x(element: &Element, rect: Option<&DomRect>) -> f64 {
     let left_scroll = get_node_scroll(element.into()).scroll_left;
 
     if let Some(rect) = rect {
diff --git a/upstream.toml b/upstream.toml
@@ -1,5 +1,5 @@
 [releases]
 core = "1.6.8"
-dom = "1.6.11"
+dom = "1.6.12"
 utils = "0.2.8"
 vue = "1.1.5"
