refactor: extract hovered block index helper
This commit is contained in:
@@ -95,6 +95,18 @@ pub(crate) fn direct_block_from_element(mut element: Element, root: &Element) ->
|
||||
}
|
||||
}
|
||||
|
||||
pub(crate) fn direct_block_index_from_element(
|
||||
element: &Element,
|
||||
root: &Element,
|
||||
handle_selector: &str,
|
||||
) -> Option<usize> {
|
||||
if element_within_handle_shell(element, handle_selector) {
|
||||
return None;
|
||||
}
|
||||
let block = direct_block_from_element(element.clone(), root)?;
|
||||
top_level_block_index(root, &block)
|
||||
}
|
||||
|
||||
pub(crate) fn top_level_block_index(root: &Element, block: &Element) -> Option<usize> {
|
||||
let children = root.children();
|
||||
(0..children.length()).find_map(|index| {
|
||||
|
||||
@@ -22,9 +22,9 @@ use web_sys::{
|
||||
|
||||
use editor_runtime::attachment_upload::dispatch_editor_upload_request;
|
||||
use editor_runtime::block_dnd::{
|
||||
direct_block_from_element, drop_indicator_from_geometry, element_within_handle_shell,
|
||||
event_target_from_point, pointer_in_handle_corridor_geometry, top_level_block_index,
|
||||
HandleCorridorGeometry,
|
||||
direct_block_from_element, direct_block_index_from_element, drop_indicator_from_geometry,
|
||||
element_within_handle_shell, event_target_from_point,
|
||||
pointer_in_handle_corridor_geometry, top_level_block_index, HandleCorridorGeometry,
|
||||
};
|
||||
use editor_runtime::block_menu_overlay;
|
||||
use editor_runtime::block_menu_document::{
|
||||
@@ -4880,13 +4880,7 @@ fn trap_scroll_inside_menu(event: &WheelEvent) {
|
||||
fn hovered_block_from_target(target: web_sys::EventTarget) -> Option<HoveredBlockState> {
|
||||
let root = editor_root_element()?;
|
||||
let element = target_element(target)?;
|
||||
|
||||
if element_within_handle_shell(&element, HANDLE_SHELL_SELECTOR) {
|
||||
return None;
|
||||
}
|
||||
|
||||
let block = direct_block_from_element(element, &root)?;
|
||||
let index = top_level_block_index(&root, &block)?;
|
||||
let index = direct_block_index_from_element(&element, &root, HANDLE_SHELL_SELECTOR)?;
|
||||
block_state_from_index(index)
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user