From dcfe60c164dafce96cd65d8dcd6fec1467f13b07 Mon Sep 17 00:00:00 2001 From: Evan Almloff Date: Fri, 10 Jun 2022 17:23:30 -0500 Subject: [PATCH] use taffy instead of stretch2 --- packages/native-core/Cargo.toml | 2 +- packages/native-core/src/layout_attributes.rs | 32 ++++++----------- packages/tui/Cargo.toml | 2 +- packages/tui/src/hooks.rs | 8 ++--- packages/tui/src/layout.rs | 23 ++++++------- packages/tui/src/lib.rs | 34 +++++++++---------- packages/tui/src/render.rs | 6 ++-- packages/tui/src/style_attributes.rs | 4 +-- 8 files changed, 49 insertions(+), 62 deletions(-) diff --git a/packages/native-core/Cargo.toml b/packages/native-core/Cargo.toml index 4e7112eb0..1c54e0711 100644 --- a/packages/native-core/Cargo.toml +++ b/packages/native-core/Cargo.toml @@ -15,7 +15,7 @@ dioxus-core = { path = "../core", version = "^0.2.1" } dioxus-html = { path = "../html", version = "^0.2.1" } dioxus-core-macro = { path = "../core-macro", version = "^0.2.1" } -stretch2 = { git = "https://github.com/mockersf/stretch/", branch = "remove_round_layout_changes" } +taffy = "0.1.0" smallvec = "1.6" fxhash = "0.2" anymap = "0.12.1" diff --git a/packages/native-core/src/layout_attributes.rs b/packages/native-core/src/layout_attributes.rs index 45461a3f9..578acb304 100644 --- a/packages/native-core/src/layout_attributes.rs +++ b/packages/native-core/src/layout_attributes.rs @@ -1,6 +1,6 @@ /* - [ ] pub display: Display, -- [x] pub position_type: PositionType, --> kinda, stretch doesnt support everything +- [x] pub position_type: PositionType, --> kinda, taffy doesnt support everything - [ ] pub direction: Direction, - [x] pub flex_direction: FlexDirection, @@ -9,7 +9,7 @@ - [x] pub flex_shrink: f32, - [x] pub flex_basis: Dimension, -- [x] pub overflow: Overflow, ---> kinda implemented... stretch doesnt have support for directional overflow +- [x] pub overflow: Overflow, ---> kinda implemented... taffy doesnt have support for directional overflow - [x] pub align_items: AlignItems, - [x] pub align_self: AlignSelf, @@ -29,7 +29,10 @@ - [ ] pub aspect_ratio: Number, */ -use stretch2::{prelude::*, style::PositionType}; +use taffy::{ + prelude::*, + style::{FlexDirection, PositionType}, +}; /// applies the entire html namespace defined in dioxus-html pub fn apply_layout_attributes(name: &str, value: &str, style: &mut Style) { @@ -109,13 +112,7 @@ pub fn apply_layout_attributes(name: &str, value: &str, style: &mut Style) { "counter-reset" => {} "cursor" => {} - "direction" => { - match value { - "ltr" => style.direction = Direction::LTR, - "rtl" => style.direction = Direction::RTL, - _ => {} - } - } + "direction" => {} "display" => apply_display(name, value, style), @@ -283,18 +280,9 @@ pub fn parse_value(value: &str) -> Option { } } -fn apply_overflow(name: &str, value: &str, style: &mut Style) { +fn apply_overflow(name: &str, _value: &str, _style: &mut Style) { match name { - // todo: add more overflow support to stretch2 - "overflow" | "overflow-x" | "overflow-y" => { - style.overflow = match value { - "auto" => Overflow::Visible, - "hidden" => Overflow::Hidden, - "scroll" => Overflow::Scroll, - "visible" => Overflow::Visible, - _ => Overflow::Visible, - }; - } + // todo: add overflow support to taffy _ => {} } } @@ -307,7 +295,7 @@ fn apply_display(_name: &str, value: &str, style: &mut Style) { } // TODO: there are way more variants - // stretch needs to be updated to handle them + // taffy needs to be updated to handle them // // "block" => Display::Block, // "inline" => Display::Inline, diff --git a/packages/tui/Cargo.toml b/packages/tui/Cargo.toml index d9ccb8584..bfc1c8902 100644 --- a/packages/tui/Cargo.toml +++ b/packages/tui/Cargo.toml @@ -23,7 +23,7 @@ crossterm = "0.23.0" anyhow = "1.0.42" tokio = { version = "1.15.0", features = ["full"] } futures = "0.3.19" -stretch2 = { git = "https://github.com/mockersf/stretch/", branch = "remove_round_layout_changes" } +taffy = "0.1.0" smallvec = "1.6" fxhash = "0.2" anymap = "0.12.1" diff --git a/packages/tui/src/hooks.rs b/packages/tui/src/hooks.rs index 9def817a8..c7cc83280 100644 --- a/packages/tui/src/hooks.rs +++ b/packages/tui/src/hooks.rs @@ -12,7 +12,7 @@ use std::{ sync::Arc, time::{Duration, Instant}, }; -use stretch2::{prelude::Layout, Stretch}; +use taffy::{prelude::Layout, Taffy}; use crate::{Dom, Node}; @@ -163,7 +163,7 @@ impl InnerInputState { &mut self, evts: &mut [EventCore], resolved_events: &mut Vec, - layout: &Stretch, + layout: &Taffy, dom: &mut Dom, ) { let previous_mouse = self.mouse.as_ref().map(|m| (m.0.clone(), m.1.clone())); @@ -185,7 +185,7 @@ impl InnerInputState { &self, previous_mouse: Option<(MouseData, Vec)>, resolved_events: &mut Vec, - layout: &Stretch, + layout: &Taffy, dom: &mut Dom, ) { fn layout_contains_point(layout: &Layout, point: (i32, i32)) -> bool { @@ -513,7 +513,7 @@ impl RinkInputHandler { ) } - pub(crate) fn get_events(&self, layout: &Stretch, dom: &mut Dom) -> Vec { + pub(crate) fn get_events(&self, layout: &Taffy, dom: &mut Dom) -> Vec { let mut resolved_events = Vec::new(); (*self.state).borrow_mut().update( diff --git a/packages/tui/src/layout.rs b/packages/tui/src/layout.rs index c13435896..231eb1285 100644 --- a/packages/tui/src/layout.rs +++ b/packages/tui/src/layout.rs @@ -6,7 +6,7 @@ use dioxus_native_core::layout_attributes::apply_layout_attributes; use dioxus_native_core::node_ref::{AttributeMask, NodeMask, NodeView}; use dioxus_native_core::state::ChildDepState; use dioxus_native_core_macro::sorted_str_slice; -use stretch2::prelude::*; +use taffy::prelude::*; #[derive(Debug, Clone, Copy, PartialEq)] pub(crate) enum PossiblyUninitalized { @@ -28,13 +28,13 @@ impl Default for PossiblyUninitalized { } #[derive(Clone, PartialEq, Default, Debug)] -pub(crate) struct StretchLayout { +pub(crate) struct TaffyLayout { pub style: Style, pub node: PossiblyUninitalized, } -impl ChildDepState for StretchLayout { - type Ctx = Rc>; +impl ChildDepState for TaffyLayout { + type Ctx = Rc>; type DepState = Self; // use tag to force this to be called when a node is built const NODE_MASK: NodeMask = @@ -53,7 +53,7 @@ impl ChildDepState for StretchLayout { Self::DepState: 'a, { let mut changed = false; - let mut stretch = ctx.borrow_mut(); + let mut taffy = ctx.borrow_mut(); let mut style = Style::default(); if let Some(text) = node.text() { let char_len = text.chars().count(); @@ -70,11 +70,10 @@ impl ChildDepState for StretchLayout { }; if let PossiblyUninitalized::Initialized(n) = self.node { if self.style != style { - stretch.set_style(n, style).unwrap(); + taffy.set_style(n, style).unwrap(); } } else { - self.node = - PossiblyUninitalized::Initialized(stretch.new_node(style, &[]).unwrap()); + self.node = PossiblyUninitalized::Initialized(taffy.new_node(style, &[]).unwrap()); changed = true; } } else { @@ -100,14 +99,14 @@ impl ChildDepState for StretchLayout { if let PossiblyUninitalized::Initialized(n) = self.node { if self.style != style { - stretch.set_style(n, style).unwrap(); + taffy.set_style(n, style).unwrap(); } - if stretch.children(n).unwrap() != child_layout { - stretch.set_children(n, &child_layout).unwrap(); + if taffy.children(n).unwrap() != child_layout { + taffy.set_children(n, &child_layout).unwrap(); } } else { self.node = PossiblyUninitalized::Initialized( - stretch.new_node(style, &child_layout).unwrap(), + taffy.new_node(style, &child_layout).unwrap(), ); changed = true; } diff --git a/packages/tui/src/lib.rs b/packages/tui/src/lib.rs index 3f647ffd1..22d70524e 100644 --- a/packages/tui/src/lib.rs +++ b/packages/tui/src/lib.rs @@ -13,12 +13,12 @@ use futures::{ channel::mpsc::{UnboundedReceiver, UnboundedSender}, pin_mut, StreamExt, }; -use layout::StretchLayout; +use layout::TaffyLayout; use std::cell::RefCell; use std::rc::Rc; use std::{io, time::Duration}; -use stretch2::{geometry::Point, prelude::Size, Stretch}; use style_attributes::StyleModifier; +use taffy::{geometry::Point, prelude::Size, Taffy}; use tui::{backend::CrosstermBackend, layout::Rect, Terminal}; mod config; @@ -37,8 +37,8 @@ type Node = dioxus_native_core::real_dom::Node; #[derive(Debug, Clone, State, Default)] struct NodeState { - #[child_dep_state(layout, RefCell)] - layout: StretchLayout, + #[child_dep_state(layout, RefCell)] + layout: TaffyLayout, // depends on attributes, the C component of it's parent and a u8 context #[parent_dep_state(style)] style: StyleModifier, @@ -88,9 +88,9 @@ pub fn launch_cfg(app: Component<()>, cfg: Config) { let mut rdom: Dom = RealDom::new(); let mutations = dom.rebuild(); let to_update = rdom.apply_mutations(vec![mutations]); - let stretch = Rc::new(RefCell::new(Stretch::new())); + let taffy = Rc::new(RefCell::new(Taffy::new())); let mut any_map = AnyMap::new(); - any_map.insert(stretch.clone()); + any_map.insert(taffy.clone()); let _to_rerender = rdom.update_state(&dom, to_update, any_map).unwrap(); render_vdom( @@ -99,7 +99,7 @@ pub fn launch_cfg(app: Component<()>, cfg: Config) { handler, cfg, rdom, - stretch, + taffy, register_event, ) .unwrap(); @@ -111,7 +111,7 @@ fn render_vdom( handler: RinkInputHandler, cfg: Config, mut rdom: Dom, - stretch: Rc>, + taffy: Rc>, mut register_event: impl FnMut(crossterm::event::Event), ) -> Result<()> { tokio::runtime::Builder::new_current_thread() @@ -146,17 +146,17 @@ fn render_vdom( if !to_rerender.is_empty() || resized { resized = false; - fn resize(dims: Rect, stretch: &mut Stretch, rdom: &Dom) { + fn resize(dims: Rect, taffy: &mut Taffy, rdom: &Dom) { let width = dims.width; let height = dims.height; let root_node = rdom[0].state.layout.node.unwrap(); - stretch + taffy .compute_layout( root_node, Size { - width: stretch2::prelude::Number::Defined((width - 1) as f32), - height: stretch2::prelude::Number::Defined((height - 1) as f32), + width: taffy::prelude::Number::Defined((width - 1) as f32), + height: taffy::prelude::Number::Defined((height - 1) as f32), }, ) .unwrap(); @@ -164,11 +164,11 @@ fn render_vdom( if let Some(terminal) = &mut terminal { terminal.draw(|frame| { // size is guaranteed to not change when rendering - resize(frame.size(), &mut stretch.borrow_mut(), &rdom); + resize(frame.size(), &mut taffy.borrow_mut(), &rdom); let root = &rdom[0]; render::render_vnode( frame, - &stretch.borrow(), + &taffy.borrow(), &rdom, root, cfg, @@ -183,7 +183,7 @@ fn render_vdom( width: 300, height: 300, }, - &mut stretch.borrow_mut(), + &mut taffy.borrow_mut(), &rdom, ); } @@ -223,7 +223,7 @@ fn render_vdom( } { - let evts = handler.get_events(&stretch.borrow(), &mut rdom); + let evts = handler.get_events(&taffy.borrow(), &mut rdom); for e in evts { vdom.handle_message(SchedulerMsg::Event(e)); } @@ -232,7 +232,7 @@ fn render_vdom( let to_update = rdom.apply_mutations(mutations); // update the style and layout let mut any_map = AnyMap::new(); - any_map.insert(stretch.clone()); + any_map.insert(taffy.clone()); to_rerender = rdom.update_state(vdom, to_update, any_map).unwrap(); } } diff --git a/packages/tui/src/render.rs b/packages/tui/src/render.rs index 4df83f8b6..f4d72cb26 100644 --- a/packages/tui/src/render.rs +++ b/packages/tui/src/render.rs @@ -1,9 +1,9 @@ use dioxus_native_core::layout_attributes::UnitSystem; use std::io::Stdout; -use stretch2::{ +use taffy::{ geometry::Point, prelude::{Layout, Size}, - Stretch, + Taffy, }; use tui::{backend::CrosstermBackend, layout::Rect}; @@ -18,7 +18,7 @@ const RADIUS_MULTIPLIER: [f32; 2] = [1.0, 0.5]; pub(crate) fn render_vnode( frame: &mut tui::Frame>, - layout: &Stretch, + layout: &Taffy, rdom: &Dom, node: &Node, cfg: Config, diff --git a/packages/tui/src/style_attributes.rs b/packages/tui/src/style_attributes.rs index fd8d51cb3..210fedb34 100644 --- a/packages/tui/src/style_attributes.rs +++ b/packages/tui/src/style_attributes.rs @@ -1,6 +1,6 @@ /* - [ ] pub display: Display, -- [x] pub position_type: PositionType, --> kinda, stretch doesnt support everything +- [x] pub position_type: PositionType, --> kinda, taffy doesnt support everything - [ ] pub direction: Direction, - [x] pub flex_direction: FlexDirection, @@ -9,7 +9,7 @@ - [x] pub flex_shrink: f32, - [x] pub flex_basis: Dimension, -- [x] pub overflow: Overflow, ---> kinda implemented... stretch doesnt have support for directional overflow +- [x] pub overflow: Overflow, ---> kinda implemented... taffy doesnt have support for directional overflow - [x] pub align_items: AlignItems, - [x] pub align_self: AlignSelf,