refactor: extract hovered block target helper
This commit is contained in:
BIN
Binary file not shown.
@@ -129,6 +129,16 @@ pub(crate) fn drop_indicator_from_block_rects(
|
||||
)
|
||||
}
|
||||
|
||||
pub(crate) fn hovered_block_from_target(
|
||||
target: EventTarget,
|
||||
root: &Element,
|
||||
handle_selector: &str,
|
||||
) -> Option<HoveredBlockState> {
|
||||
let element = crate::editor_runtime::dom_events::target_element(target)?;
|
||||
let index = direct_block_index_from_element(&element, root, handle_selector)?;
|
||||
block_state_from_index(index)
|
||||
}
|
||||
|
||||
pub(crate) fn block_state_from_index(index: usize) -> Option<HoveredBlockState> {
|
||||
let root = editor_root_element()?;
|
||||
let stage = editor_stage_element()?;
|
||||
|
||||
@@ -23,8 +23,8 @@ use web_sys::{
|
||||
use editor_runtime::attachment_upload::dispatch_editor_upload_request;
|
||||
use editor_runtime::block_dnd::{
|
||||
block_state_from_index as block_state_from_index_runtime, direct_block_from_element,
|
||||
direct_block_index_from_element, drop_indicator_from_block_rects, element_within_handle_shell,
|
||||
event_target_from_point, top_level_block_index,
|
||||
drop_indicator_from_block_rects, element_within_handle_shell, event_target_from_point,
|
||||
hovered_block_from_target as hovered_block_from_target_runtime, top_level_block_index,
|
||||
};
|
||||
use editor_runtime::block_menu_overlay;
|
||||
use editor_runtime::block_menu_document::{
|
||||
@@ -4847,9 +4847,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)?;
|
||||
let index = direct_block_index_from_element(&element, &root, HANDLE_SHELL_SELECTOR)?;
|
||||
block_state_from_index(index)
|
||||
hovered_block_from_target_runtime(target, &root, HANDLE_SHELL_SELECTOR)
|
||||
}
|
||||
|
||||
fn hovered_block_from_selection() -> Option<HoveredBlockState> {
|
||||
|
||||
Reference in New Issue
Block a user