Skip to content

Commit cf6e958

Browse files
author
xuanzebin
committed
fix: 修复以前样式解析写法不严谨导致的报错问题以及 ets 样式名错误问题
1 parent d2731f2 commit cf6e958

File tree

2 files changed

+13
-10
lines changed

2 files changed

+13
-10
lines changed

src/style_transform/background/background_position.rs

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ impl ToExpr for BackgroundImagePosition {
146146
.into(),
147147
ImagePosition::TopStart => Expr::Member(MemberExpr {
148148
span: DUMMY_SP,
149-
obj: Box::new(Expr::Ident(Ident::new("ImagePosition".into(), DUMMY_SP))),
149+
obj: Box::new(Expr::Ident(Ident::new("Alignment".into(), DUMMY_SP))),
150150
prop: MemberProp::Ident(Ident {
151151
span: DUMMY_SP,
152152
sym: "TopStart".into(),
@@ -156,7 +156,7 @@ impl ToExpr for BackgroundImagePosition {
156156
.into(),
157157
ImagePosition::Top => Expr::Member(MemberExpr {
158158
span: DUMMY_SP,
159-
obj: Box::new(Expr::Ident(Ident::new("ImagePosition".into(), DUMMY_SP))),
159+
obj: Box::new(Expr::Ident(Ident::new("Alignment".into(), DUMMY_SP))),
160160
prop: MemberProp::Ident(Ident {
161161
span: DUMMY_SP,
162162
sym: "Top".into(),
@@ -166,7 +166,7 @@ impl ToExpr for BackgroundImagePosition {
166166
.into(),
167167
ImagePosition::TopEnd => Expr::Member(MemberExpr {
168168
span: DUMMY_SP,
169-
obj: Box::new(Expr::Ident(Ident::new("ImagePosition".into(), DUMMY_SP))),
169+
obj: Box::new(Expr::Ident(Ident::new("Alignment".into(), DUMMY_SP))),
170170
prop: MemberProp::Ident(Ident {
171171
span: DUMMY_SP,
172172
sym: "TopEnd".into(),
@@ -176,7 +176,7 @@ impl ToExpr for BackgroundImagePosition {
176176
.into(),
177177
ImagePosition::Start => Expr::Member(MemberExpr {
178178
span: DUMMY_SP,
179-
obj: Box::new(Expr::Ident(Ident::new("ImagePosition".into(), DUMMY_SP))),
179+
obj: Box::new(Expr::Ident(Ident::new("Alignment".into(), DUMMY_SP))),
180180
prop: MemberProp::Ident(Ident {
181181
span: DUMMY_SP,
182182
sym: "Start".into(),
@@ -186,7 +186,7 @@ impl ToExpr for BackgroundImagePosition {
186186
.into(),
187187
ImagePosition::Center => Expr::Member(MemberExpr {
188188
span: DUMMY_SP,
189-
obj: Box::new(Expr::Ident(Ident::new("ImagePosition".into(), DUMMY_SP))),
189+
obj: Box::new(Expr::Ident(Ident::new("Alignment".into(), DUMMY_SP))),
190190
prop: MemberProp::Ident(Ident {
191191
span: DUMMY_SP,
192192
sym: "Center".into(),
@@ -196,7 +196,7 @@ impl ToExpr for BackgroundImagePosition {
196196
.into(),
197197
ImagePosition::End => Expr::Member(MemberExpr {
198198
span: DUMMY_SP,
199-
obj: Box::new(Expr::Ident(Ident::new("ImagePosition".into(), DUMMY_SP))),
199+
obj: Box::new(Expr::Ident(Ident::new("Alignment".into(), DUMMY_SP))),
200200
prop: MemberProp::Ident(Ident {
201201
span: DUMMY_SP,
202202
sym: "End".into(),
@@ -206,7 +206,7 @@ impl ToExpr for BackgroundImagePosition {
206206
.into(),
207207
ImagePosition::BottomStart => Expr::Member(MemberExpr {
208208
span: DUMMY_SP,
209-
obj: Box::new(Expr::Ident(Ident::new("ImagePosition".into(), DUMMY_SP))),
209+
obj: Box::new(Expr::Ident(Ident::new("Alignment".into(), DUMMY_SP))),
210210
prop: MemberProp::Ident(Ident {
211211
span: DUMMY_SP,
212212
sym: "BottomStart".into(),
@@ -216,7 +216,7 @@ impl ToExpr for BackgroundImagePosition {
216216
.into(),
217217
ImagePosition::Bottom => Expr::Member(MemberExpr {
218218
span: DUMMY_SP,
219-
obj: Box::new(Expr::Ident(Ident::new("ImagePosition".into(), DUMMY_SP))),
219+
obj: Box::new(Expr::Ident(Ident::new("Alignment".into(), DUMMY_SP))),
220220
prop: MemberProp::Ident(Ident {
221221
span: DUMMY_SP,
222222
sym: "Bottom".into(),
@@ -226,7 +226,7 @@ impl ToExpr for BackgroundImagePosition {
226226
.into(),
227227
ImagePosition::BottomEnd => Expr::Member(MemberExpr {
228228
span: DUMMY_SP,
229-
obj: Box::new(Expr::Ident(Ident::new("ImagePosition".into(), DUMMY_SP))),
229+
obj: Box::new(Expr::Ident(Ident::new("Alignment".into(), DUMMY_SP))),
230230
prop: MemberProp::Ident(Ident {
231231
span: DUMMY_SP,
232232
sym: "BottomEnd".into(),

src/utils.rs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,10 @@ pub fn create_qualname(str: &str) -> QualName {
2828
}
2929

3030
pub fn is_starts_with_uppercase(str: &str) -> bool {
31-
str.chars().next().unwrap().is_uppercase()
31+
match str.chars().next() {
32+
Some(c) => c.is_uppercase(),
33+
None => false,
34+
}
3235
}
3336

3437
pub fn to_camel_case(s: &str, is_first: bool) -> String {

0 commit comments

Comments
 (0)