From 93a95b82a4ef38276ecbe14439a79837414f3724 Mon Sep 17 00:00:00 2001 From: Evan Almloff Date: Wed, 4 Jan 2023 11:18:32 -0600 Subject: [PATCH] bump lightningcss version --- packages/native-core/Cargo.toml | 2 +- packages/native-core/src/layout_attributes.rs | 16 ++++++++++++---- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/packages/native-core/Cargo.toml b/packages/native-core/Cargo.toml index ae0027d1a..592269078 100644 --- a/packages/native-core/Cargo.toml +++ b/packages/native-core/Cargo.toml @@ -25,7 +25,7 @@ crossbeam-deque = "0.8.2" dashmap = "5.4.0" # for parsing attributes -lightningcss = "1.0.0-alpha.38" +lightningcss = "1.0.0-alpha.39" [dev-dependencies] rand = "0.8.5" diff --git a/packages/native-core/src/layout_attributes.rs b/packages/native-core/src/layout_attributes.rs index 7d722d5de..d149a11ac 100644 --- a/packages/native-core/src/layout_attributes.rs +++ b/packages/native-core/src/layout_attributes.rs @@ -160,7 +160,9 @@ pub fn apply_layout_attributes(name: &str, value: &str, style: &mut Style) { align::ContentDistribution::SpaceEvenly => SpaceEvenly, align::ContentDistribution::Stretch => Stretch, }, - align::AlignContent::ContentPosition(_, position) => match position { + align::AlignContent::ContentPosition { + value: position, .. + } => match position { align::ContentPosition::Center => Center, align::ContentPosition::Start | align::ContentPosition::FlexStart => { FlexStart @@ -181,7 +183,9 @@ pub fn apply_layout_attributes(name: &str, value: &str, style: &mut Style) { _ => return, } } - align::JustifyContent::ContentPosition(_, position) => match position { + align::JustifyContent::ContentPosition { + value: position, .. + } => match position { align::ContentPosition::Center => Center, // start ignores -reverse flex-direction but there is no way to specify that in Taffy align::ContentPosition::Start | align::ContentPosition::FlexStart => { @@ -199,7 +203,9 @@ pub fn apply_layout_attributes(name: &str, value: &str, style: &mut Style) { align::AlignSelf::Auto => Auto, align::AlignSelf::Stretch => Stretch, align::AlignSelf::BaselinePosition(_) => Baseline, - align::AlignSelf::SelfPosition(_overflow, position) => match position { + align::AlignSelf::SelfPosition { + value: position, .. + } => match position { align::SelfPosition::Center => Center, align::SelfPosition::Start | align::SelfPosition::SelfStart @@ -216,7 +222,9 @@ pub fn apply_layout_attributes(name: &str, value: &str, style: &mut Style) { style.align_items = match align { align::AlignItems::BaselinePosition(_) => Baseline, align::AlignItems::Stretch => Stretch, - align::AlignItems::SelfPosition(_overflow, position) => match position { + align::AlignItems::SelfPosition { + value: position, .. + } => match position { align::SelfPosition::Center => Center, align::SelfPosition::FlexStart => FlexStart, align::SelfPosition::FlexEnd => FlexEnd,