refactor: Rename node states to follow an unified naming (#713)

* chore: Rust 1.79

* refactor: Move rendering to freya-core

* refactor: Rename some of the Node States to follow an unified naming

Author: marc2332

crates/core/src/dom/doms.rs

@@ -24,14 +24,14 @@ use freya_native_core::{
 };
 use freya_node_state::{
     AccessibilityNodeState,
-    CursorSettings,
+    CursorState,
     CustomAttributeValues,
     FontStyleState,
     LayerState,
     LayoutState,
-    References,
-    Style,
-    Transform,
+    ReferencesState,
+    StyleState,
+    TransformState,
     ViewportState,
 };
 use torin::prelude::*;
@@ -124,12 +124,12 @@ pub struct FreyaDOM {
 impl Default for FreyaDOM {
     fn default() -> Self {
         let mut rdom = RealDom::<CustomAttributeValues>::new([
-            CursorSettings::to_type_erased(),
+            CursorState::to_type_erased(),
             FontStyleState::to_type_erased(),
-            References::to_type_erased(),
+            ReferencesState::to_type_erased(),
             LayoutState::to_type_erased(),
-            Style::to_type_erased(),
-            Transform::to_type_erased(),
+            StyleState::to_type_erased(),
+            TransformState::to_type_erased(),
             AccessibilityNodeState::to_type_erased(),
             ViewportState::to_type_erased(),
             LayerState::to_type_erased(),

crates/core/src/dom/mutations_writer.rs

@@ -13,7 +13,7 @@ use freya_native_core::{
     NodeId,
 };
 use freya_node_state::{
-    CursorSettings,
+    CursorState,
     CustomAttributeValues,
     LayerState,
 };
@@ -63,8 +63,8 @@ impl<'a> MutationsWriter<'a> {
                     .remove_node_from_layer(node_id, layer_state.layer);
 
                 // Remove from paragraph elements
-                let cursor_settings = node.get::<CursorSettings>().unwrap();
-                if let Some(cursor_ref) = cursor_settings.cursor_ref.as_ref() {
+                let cursor_state = node.get::<CursorState>().unwrap();
+                if let Some(cursor_ref) = cursor_state.cursor_ref.as_ref() {
                     self.paragraphs
                         .remove_paragraph(node_id, &cursor_ref.text_id);
                 }

crates/core/src/events/events_measurer.rs

@@ -6,7 +6,7 @@ use freya_native_core::{
 };
 use freya_node_state::{
     Fill,
-    Style,
+    StyleState,
     ViewportState,
 };
 use itertools::sorted;
@@ -232,7 +232,7 @@ fn measure_dom_events(
                     }
                 }
 
-                let Style { background, .. } = &*node.get::<Style>().unwrap();
+                let StyleState { background, .. } = &*node.get::<StyleState>().unwrap();
 
                 if background != &Fill::Color(Color::TRANSPARENT)
                     && !event.get_name().does_go_through_solid()

crates/core/src/node.rs

@@ -3,15 +3,15 @@ use freya_native_core::real_dom::NodeImmutable;
 use freya_node_state::{
     Border,
     CornerRadius,
-    CursorSettings,
+    CursorState,
     Fill,
     FontStyleState,
     LayoutState,
-    References,
+    ReferencesState,
     Shadow,
-    Style,
+    StyleState,
     TextOverflow,
-    Transform,
+    TransformState,
 };
 use torin::{
     alignment::Alignment,
@@ -24,17 +24,17 @@ use crate::dom::DioxusNode;
 
 #[derive(Clone, PartialEq)]
 pub struct NodeState {
-    pub cursor: CursorSettings,
+    pub cursor: CursorState,
     pub font_style: FontStyleState,
-    pub references: References,
+    pub references: ReferencesState,
     pub size: LayoutState,
-    pub style: Style,
-    pub transform: Transform,
+    pub style: StyleState,
+    pub transform: TransformState,
 }
 
 pub fn get_node_state(node: &DioxusNode) -> NodeState {
     let cursor = node
-        .get::<CursorSettings>()
+        .get::<CursorState>()
         .as_deref()
         .cloned()
         .unwrap_or_default();
@@ -44,7 +44,7 @@ pub fn get_node_state(node: &DioxusNode) -> NodeState {
         .cloned()
         .unwrap_or_default();
     let references = node
-        .get::<References>()
+        .get::<ReferencesState>()
         .as_deref()
         .cloned()
         .unwrap_or_default();
@@ -53,9 +53,13 @@ pub fn get_node_state(node: &DioxusNode) -> NodeState {
         .as_deref()
         .cloned()
         .unwrap_or_default();
-    let style = node.get::<Style>().as_deref().cloned().unwrap_or_default();
+    let style = node
+        .get::<StyleState>()
+        .as_deref()
+        .cloned()
+        .unwrap_or_default();
     let transform = node
-        .get::<Transform>()
+        .get::<TransformState>()
         .as_deref()
         .cloned()
         .unwrap_or_default();

crates/core/src/skia/paragraph.rs

@@ -6,7 +6,7 @@ use freya_common::{
     TextGroupMeasurement,
 };
 use freya_native_core::prelude::NodeImmutable;
-use freya_node_state::CursorSettings;
+use freya_node_state::CursorState;
 use torin::prelude::{
     CursorPoint,
     LayoutNode,
@@ -32,17 +32,17 @@ pub fn measure_paragraph(
         .unwrap()
         .0;
 
-    let cursor_settings = node.get::<CursorSettings>().unwrap();
+    let cursor_state = node.get::<CursorState>().unwrap();
 
     let scale_factors = scale_factor as f64;
 
-    if cursor_settings.cursor_id != Some(text_measurement.cursor_id) {
+    if cursor_state.cursor_id != Some(text_measurement.cursor_id) {
         return;
     }
 
     let y = align_main_align_paragraph(node, &layout_node.area, paragraph);
 
-    if let Some(cursor_reference) = &cursor_settings.cursor_ref {
+    if let Some(cursor_reference) = &cursor_state.cursor_ref {
         if let Some(cursor_position) = text_measurement.cursor_position {
             let position = CursorPoint::new(cursor_position.x, cursor_position.y - y as f64);
 

crates/core/src/skia/skia_measurer.rs

@@ -16,7 +16,7 @@ use freya_native_core::{
     NodeId,
 };
 use freya_node_state::{
-    CursorSettings,
+    CursorState,
     FontStyleState,
     HighlightMode,
     LayoutState,
@@ -166,12 +166,12 @@ pub fn align_highlights_and_cursor_paragraph(
     cursor_rect: &TextBox,
     width: Option<f32>,
 ) -> (Point2D, Point2D) {
-    let cursor_settings = node.get::<CursorSettings>().unwrap();
+    let cursor_state = node.get::<CursorState>().unwrap();
 
     let x = area.min_x() + cursor_rect.rect.left;
     let x2 = x + width.unwrap_or(cursor_rect.rect.right - cursor_rect.rect.left);
 
-    match cursor_settings.highlight_mode {
+    match cursor_state.highlight_mode {
         HighlightMode::Fit => {
             let y = area.min_y()
                 + align_main_align_paragraph(node, area, paragraph)

crates/core/src/skia/skia_renderer/image.rs

@@ -1,17 +1,17 @@
 use freya_engine::prelude::*;
 use freya_native_core::real_dom::NodeImmutable;
 use freya_node_state::{
-    References,
-    Style,
+    ReferencesState,
+    StyleState,
 };
 use torin::geometry::Area;
 
 use crate::dom::DioxusNode;
 
 /// Render an `image` element
 pub fn render_image(area: &Area, node_ref: &DioxusNode, canvas: &Canvas) {
-    let node_style = node_ref.get::<Style>().unwrap();
-    let node_references = node_ref.get::<References>().unwrap();
+    let node_style = node_ref.get::<StyleState>().unwrap();
+    let node_references = node_ref.get::<ReferencesState>().unwrap();
 
     let draw_img = |bytes: &[u8]| {
         let pic = Image::from_encoded(Data::new_copy(bytes));

crates/core/src/skia/skia_renderer/paragraph.rs

@@ -6,7 +6,7 @@ use freya_native_core::{
     real_dom::NodeImmutable,
     SendAnyMap,
 };
-use freya_node_state::CursorSettings;
+use freya_node_state::CursorState;
 use torin::geometry::Area;
 
 use crate::{
@@ -28,7 +28,7 @@ pub fn render_paragraph(
     default_fonts: &[String],
     scale_factor: f32,
 ) {
-    let node_cursor_settings = &*dioxus_node.get::<CursorSettings>().unwrap();
+    let node_cursor_state = &*dioxus_node.get::<CursorState>().unwrap();
 
     let paint = |paragraph: &Paragraph| {
         let x = area.min_x();
@@ -43,7 +43,7 @@ pub fn render_paragraph(
         paragraph.paint(canvas, (x, y));
     };
 
-    if node_cursor_settings.position.is_some() {
+    if node_cursor_state.position.is_some() {
         let paragraph = create_paragraph(
             dioxus_node,
             &area.size,
@@ -65,10 +65,10 @@ fn draw_cursor_highlights(
     canvas: &Canvas,
     dioxus_node: &DioxusNode,
 ) -> Option<()> {
-    let node_cursor_settings = &*dioxus_node.get::<CursorSettings>().unwrap();
+    let node_cursor_state = &*dioxus_node.get::<CursorState>().unwrap();
 
-    let highlights = node_cursor_settings.highlights.as_ref()?;
-    let highlight_color = node_cursor_settings.highlight_color;
+    let highlights = node_cursor_state.highlights.as_ref()?;
+    let highlight_color = node_cursor_state.highlight_color;
 
     for (from, to) in highlights.iter() {
         let (from, to) = {
@@ -110,10 +110,10 @@ fn draw_cursor(
     canvas: &Canvas,
     dioxus_node: &DioxusNode,
 ) -> Option<()> {
-    let node_cursor_settings = &*dioxus_node.get::<CursorSettings>().unwrap();
+    let node_cursor_state = &*dioxus_node.get::<CursorState>().unwrap();
 
-    let cursor = node_cursor_settings.position?;
-    let cursor_color = node_cursor_settings.color;
+    let cursor = node_cursor_state.position?;
+    let cursor_color = node_cursor_state.color;
     let cursor_position = cursor as usize;
 
     let cursor_rects = paragraph.get_rects_for_range(

crates/core/src/skia/skia_renderer/rect.rs

@@ -4,9 +4,9 @@ use freya_node_state::{
     BorderAlignment,
     BorderStyle,
     Fill,
-    References,
+    ReferencesState,
     ShadowPosition,
-    Style,
+    StyleState,
 };
 use torin::{
     prelude::Area,
@@ -23,7 +23,7 @@ pub fn render_rect(
     font_collection: &mut FontCollection,
     scale_factor: f32,
 ) {
-    let node_style = &*node_ref.get::<Style>().unwrap();
+    let node_style = &*node_ref.get::<StyleState>().unwrap();
 
     let mut paint = Paint::default();
     let mut path = Path::new();
@@ -186,7 +186,7 @@ pub fn render_rect(
         canvas.draw_path(&border_path, &border_paint);
     }
 
-    let references = node_ref.get::<References>().unwrap();
+    let references = node_ref.get::<ReferencesState>().unwrap();
 
     if let Some(canvas_ref) = &references.canvas_ref {
         (canvas_ref.runner)(canvas, font_collection, area, scale_factor);

crates/core/src/skia/skia_renderer/renderer.rs

@@ -7,8 +7,8 @@ use freya_native_core::{
     NodeId,
 };
 use freya_node_state::{
-    Style,
-    Transform,
+    StyleState,
+    TransformState,
     ViewportState,
 };
 use torin::{
@@ -67,8 +67,8 @@ impl SkiaRenderer<'_> {
         if let NodeType::Element(ElementNode { tag, .. }) = node_type {
             self.canvas.save();
 
-            let node_transform = &*dioxus_node.get::<Transform>().unwrap();
-            let node_style = &*dioxus_node.get::<Style>().unwrap();
+            let node_transform = &*dioxus_node.get::<TransformState>().unwrap();
+            let node_style = &*dioxus_node.get::<StyleState>().unwrap();
 
             // Pass rotate effect to children
             if let Some(rotate_degs) = node_transform.rotate_degs {