Skip to content

Commit

Permalink
chore: Fix spelling mistakes (#528)
Browse files Browse the repository at this point in the history
  • Loading branch information
shuai132 authored Feb 27, 2024
1 parent 25353d5 commit 67f6f41
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 18 deletions.
6 changes: 3 additions & 3 deletions crates/core/src/events/event_name.rs
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ impl PartialOrd for EventName {
impl Ord for EventName {
fn cmp(&self, other: &Self) -> std::cmp::Ordering {
match self {
// Always priorize leave events before anything else
// Always prioritize leave events before anything else
Self::MouseLeave | Self::PointerLeave => {
if self == other {
std::cmp::Ordering::Equal
Expand All @@ -95,7 +95,7 @@ impl EventName {
/// Some events might cause other events, like for example:
/// A `mouseover` might also trigger a `mouseenter`
/// A `mousedown` or a `touchdown` might also trigger a `pointerdown`
pub fn get_colateral_events(&self) -> SmallVec<[Self; 4]> {
pub fn get_collateral_events(&self) -> SmallVec<[Self; 4]> {
let mut events = SmallVec::new();

events.push(*self);
Expand All @@ -113,7 +113,7 @@ impl EventName {
events
}

/// Check if the event event means that the pointer (e.g cursor) just entered a Node
/// Check if the event means that the pointer (e.g. cursor) just entered a Node
pub fn is_enter(&self) -> bool {
matches!(&self, Self::MouseEnter | Self::PointerEnter)
}
Expand Down
30 changes: 15 additions & 15 deletions crates/core/src/events/events_measurer.rs
Original file line number Diff line number Diff line change
Expand Up @@ -32,16 +32,16 @@ pub fn process_events(
// 3. Get what events can be actually emitted based on what elements are listening
let dom_events = measure_dom_events(potential_events, dom, scale_factor);

// 4. Filter the dom events and get potential colateral events, e.g mouseover -> mouseenter
let (potential_colateral_events, mut to_emit_dom_events) =
// 4. Filter the dom events and get potential collateral events, e.g. mouseover -> mouseenter
let (potential_collateral_events, mut to_emit_dom_events) =
nodes_state.process_events(&dom_events, events);

// 5. Get what colateral events can actually be emitted
let to_emit_dom_colateral_events =
measure_dom_events(potential_colateral_events, dom, scale_factor);
// 5. Get what collateral events can actually be emitted
let to_emit_dom_collateral_events =
measure_dom_events(potential_collateral_events, dom, scale_factor);

// 6. Join both the dom and colateral dom events and sort them
to_emit_dom_events.extend(to_emit_dom_colateral_events);
// 6. Join both the dom and collateral dom events and sort them
to_emit_dom_events.extend(to_emit_dom_collateral_events);
to_emit_dom_events.sort_unstable();

// 7. Emit the DOM events
Expand All @@ -56,7 +56,7 @@ pub fn process_events(
events.clear();
}

/// Measure globale events
/// Measure global events
pub fn measure_global_events(events: &EventsQueue) -> Vec<PlatformEvent> {
let mut global_events = Vec::default();
for event in events {
Expand Down Expand Up @@ -160,7 +160,7 @@ fn is_node_parent_of(rdom: &DioxusDOM, node: NodeId, parent_node: NodeId) -> boo
false
}

/// Measure what DOM events could be emited
/// Measure what DOM events could be emitted
fn measure_dom_events(
potential_events: PotentialEvents,
fdom: &FreyaDOM,
Expand All @@ -171,15 +171,15 @@ fn measure_dom_events(

// Iterate over all the events
for (event_name, event_nodes) in potential_events {
let colateral_events = event_name.get_colateral_events();
let collateral_events = event_name.get_collateral_events();

let mut valid_events: Vec<PotentialEvent> = Vec::new();

// Iterate over the colateral events (including the source)
'event: for colateral_event in colateral_events {
// Iterate over the collateral events (including the source)
'event: for collateral_event in collateral_events {
let mut child_node: Option<NodeId> = None;

let listeners = rdom.get_listening_sorted(colateral_event.into());
let listeners = rdom.get_listening_sorted(collateral_event.into());

// Iterate over the event nodes
for PotentialEvent {
Expand All @@ -203,7 +203,7 @@ fn measure_dom_events(

if valid_node {
let mut valid_event = event.clone();
valid_event.set_name(colateral_event);
valid_event.set_name(collateral_event);
valid_events.push(PotentialEvent {
node_id: *node_id,
event: valid_event,
Expand All @@ -224,7 +224,7 @@ fn measure_dom_events(
{
// If the background isn't transparent,
// we must make sure that next nodes are parent of it
// This only matters for events that bubble up (e.g cursor movement events)
// This only matters for events that bubble up (e.g. cursor movement events)
child_node = Some(*node_id);
}
}
Expand Down

0 comments on commit 67f6f41

Please sign in to comment.