From 3505995da438d8fd8937ddc269cb35cdc5bac095 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Tue, 25 Jun 2024 16:01:47 +0000 Subject: [PATCH 1/2] Update to upstream @floating-ui/dom@1.6.6 --- upstream.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/upstream.toml b/upstream.toml index 337806f..7a2dd65 100644 --- a/upstream.toml +++ b/upstream.toml @@ -1,5 +1,5 @@ [releases] core = "1.6.2" -dom = "1.6.5" +dom = "1.6.6" utils = "0.2.3" vue = "1.0.6" From a6e5cbe4dd253e1895e226c05a91844ee9edc480 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABlle=20Huisman?= Date: Wed, 26 Jun 2024 08:45:38 +0200 Subject: [PATCH 2/2] Use `is_top_layer` from `floating-ui-utils` --- ...set_parent_relative_rect_to_viewport_relative_rect.rs | 8 +++++--- packages/dom/src/platform/get_clipping_rect.rs | 3 +-- packages/dom/src/platform/get_offset_parent.rs | 3 +-- packages/dom/src/utils.rs | 1 - packages/dom/src/utils/is_top_layer.rs | 9 --------- 5 files changed, 7 insertions(+), 17 deletions(-) delete mode 100644 packages/dom/src/utils/is_top_layer.rs 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 index 1cfff32..49cb79e 100644 --- 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 @@ -1,13 +1,15 @@ use floating_ui_core::ConvertOffsetParentRelativeRectToViewportRelativeRectArgs; use floating_ui_utils::{ - dom::{get_document_element, get_node_name, get_node_scroll, is_overflow_element, NodeScroll}, + dom::{ + get_document_element, get_node_name, get_node_scroll, is_overflow_element, is_top_layer, + NodeScroll, + }, Coords, ElementOrWindow, Rect, Strategy, }; use web_sys::{Element, Window}; use crate::{ - platform::get_scale::get_scale, - utils::{get_bounding_client_rect::get_bounding_client_rect, is_top_layer::is_top_layer}, + platform::get_scale::get_scale, utils::get_bounding_client_rect::get_bounding_client_rect, }; pub fn convert_offset_parent_relative_rect_to_viewport_relative_rect( diff --git a/packages/dom/src/platform/get_clipping_rect.rs b/packages/dom/src/platform/get_clipping_rect.rs index c0f4fc0..419ab3c 100644 --- a/packages/dom/src/platform/get_clipping_rect.rs +++ b/packages/dom/src/platform/get_clipping_rect.rs @@ -3,7 +3,7 @@ use floating_ui_utils::{ dom::{ get_computed_style, get_document_element, get_node_name, get_overflow_ancestors, get_parent_node, is_containing_block, is_last_traversable_node, is_overflow_element, - OverflowAncestor, + is_top_layer, OverflowAncestor, }, rect_to_client_rect, ClientRectObject, Rect, Strategy, }; @@ -15,7 +15,6 @@ use crate::{ 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, - is_top_layer::is_top_layer, }, }; diff --git a/packages/dom/src/platform/get_offset_parent.rs b/packages/dom/src/platform/get_offset_parent.rs index e15255f..f11f59d 100644 --- a/packages/dom/src/platform/get_offset_parent.rs +++ b/packages/dom/src/platform/get_offset_parent.rs @@ -1,13 +1,12 @@ use floating_ui_utils::dom::{ get_computed_style, get_containing_block, get_parent_node, get_window, is_containing_block, - is_element, is_html_element, is_last_traversable_node, is_table_element, + is_element, is_html_element, is_last_traversable_node, is_table_element, is_top_layer, }; use floating_ui_utils::OwnedElementOrWindow; use web_sys::Window; use web_sys::{wasm_bindgen::JsCast, Element, HtmlElement}; use crate::utils::is_static_positioned::is_static_positioned; -use crate::utils::is_top_layer::is_top_layer; pub type Polyfill = Box Option>; diff --git a/packages/dom/src/utils.rs b/packages/dom/src/utils.rs index c94f43f..3219d5e 100644 --- a/packages/dom/src/utils.rs +++ b/packages/dom/src/utils.rs @@ -6,4 +6,3 @@ pub mod get_viewport_rect; pub mod get_visual_offsets; pub mod get_window_scroll_bar_x; pub mod is_static_positioned; -pub mod is_top_layer; diff --git a/packages/dom/src/utils/is_top_layer.rs b/packages/dom/src/utils/is_top_layer.rs deleted file mode 100644 index f086405..0000000 --- a/packages/dom/src/utils/is_top_layer.rs +++ /dev/null @@ -1,9 +0,0 @@ -use web_sys::Element; - -const TOP_LAYER_SELECTORS: [&str; 2] = [":popover-open", ":modal"]; - -pub fn is_top_layer(floating: &Element) -> bool { - TOP_LAYER_SELECTORS - .into_iter() - .any(|selector| floating.matches(selector).unwrap_or(false)) -}