Skip to content

Commit 1c2c696

Browse files
TtTRzTtTRz
committed
fix: change css property default value
1 parent 4053a34 commit 1c2c696

File tree

7 files changed

+67
-69
lines changed

7 files changed

+67
-69
lines changed

‎float-pigment-css/src/property.rs‎

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ property_list! (PropertyValueWithGlobal, {
6060
0x2c ColumnGap: GapType as Initial default Gap::Normal;
6161

6262
// background
63-
0x30 BackgroundColor: ColorType as Initial default Color::Undefined;
63+
0x30 BackgroundColor: ColorType as Initial default Color::Specified(0, 0, 0, 0);
6464
0x31 BackgroundImage: BackgroundImageType as Initial default BackgroundImage::List(Array::empty());
6565
0x32 BackgroundSize: BackgroundSizeType as Initial default BackgroundSize::List(vec![BackgroundSizeItem::Auto].into());
6666
0x33 BackgroundPosition: BackgroundPositionType as Initial deprecated default BackgroundPosition::List(vec![BackgroundPositionItem::Pos(BackgroundPositionValue::Left(Length::Ratio(0.)), BackgroundPositionValue::Top(Length::Ratio(0.)))].into());
@@ -80,51 +80,51 @@ property_list! (PropertyValueWithGlobal, {
8080
0x3f MaskMode: MaskModeType as Initial default MaskMode::List(vec![MaskModeItem::MatchSource].into());
8181

8282
// basic sizing
83-
0x40 Width: LengthType as Initial default Length::Undefined, resolver = Length::resolve_em;
84-
0x41 Height: LengthType as Initial default Length::Undefined, resolver = Length::resolve_em;
85-
0x42 MinWidth: LengthType as Initial default Length::Undefined, resolver = Length::resolve_em;
86-
0x43 MinHeight: LengthType as Initial default Length::Undefined, resolver = Length::resolve_em;
83+
0x40 Width: LengthType as Initial default Length::Auto, resolver = Length::resolve_em;
84+
0x41 Height: LengthType as Initial default Length::Auto, resolver = Length::resolve_em;
85+
0x42 MinWidth: LengthType as Initial default Length::Auto, resolver = Length::resolve_em;
86+
0x43 MinHeight: LengthType as Initial default Length::Auto, resolver = Length::resolve_em;
8787
0x44 MaxWidth: LengthType as Initial default Length::Undefined, resolver = Length::resolve_em;
8888
0x45 MaxHeight: LengthType as Initial default Length::Undefined, resolver = Length::resolve_em;
89-
0x46 Left: LengthType as Initial default Length::Undefined, resolver = Length::resolve_em;
90-
0x47 Right: LengthType as Initial default Length::Undefined, resolver = Length::resolve_em;
91-
0x48 Top: LengthType as Initial default Length::Undefined, resolver = Length::resolve_em;
92-
0x49 Bottom: LengthType as Initial default Length::Undefined, resolver = Length::resolve_em;
89+
0x46 Left: LengthType as Initial default Length::Auto, resolver = Length::resolve_em;
90+
0x47 Right: LengthType as Initial default Length::Auto, resolver = Length::resolve_em;
91+
0x48 Top: LengthType as Initial default Length::Auto, resolver = Length::resolve_em;
92+
0x49 Bottom: LengthType as Initial default Length::Auto, resolver = Length::resolve_em;
9393

9494
// padding and margin
95-
0x50 PaddingLeft: LengthType as Initial default Length::Undefined, resolver = Length::resolve_em;
96-
0x51 PaddingRight: LengthType as Initial default Length::Undefined, resolver = Length::resolve_em;
97-
0x52 PaddingTop: LengthType as Initial default Length::Undefined, resolver = Length::resolve_em;
98-
0x53 PaddingBottom: LengthType as Initial default Length::Undefined, resolver = Length::resolve_em;
99-
0x54 MarginLeft: LengthType as Initial default Length::Undefined, resolver = Length::resolve_em;
100-
0x55 MarginRight: LengthType as Initial default Length::Undefined, resolver = Length::resolve_em;
101-
0x56 MarginTop: LengthType as Initial default Length::Undefined, resolver = Length::resolve_em;
102-
0x57 MarginBottom: LengthType as Initial default Length::Undefined, resolver = Length::resolve_em;
95+
0x50 PaddingLeft: LengthType as Initial default Length::Px(0.), resolver = Length::resolve_em;
96+
0x51 PaddingRight: LengthType as Initial default Length::Px(0.), resolver = Length::resolve_em;
97+
0x52 PaddingTop: LengthType as Initial default Length::Px(0.), resolver = Length::resolve_em;
98+
0x53 PaddingBottom: LengthType as Initial default Length::Px(0.), resolver = Length::resolve_em;
99+
0x54 MarginLeft: LengthType as Initial default Length::Px(0.), resolver = Length::resolve_em;
100+
0x55 MarginRight: LengthType as Initial default Length::Px(0.), resolver = Length::resolve_em;
101+
0x56 MarginTop: LengthType as Initial default Length::Px(0.), resolver = Length::resolve_em;
102+
0x57 MarginBottom: LengthType as Initial default Length::Px(0.), resolver = Length::resolve_em;
103103

104104
// other
105105
0x58 MaskPositionX: BackgroundPositionType as Initial default BackgroundPosition::List(vec![BackgroundPositionItem::Value(BackgroundPositionValue::Left(Length::Ratio(0.)))].into());
106106
0x59 MaskPositionY: BackgroundPositionType as Initial default BackgroundPosition::List(vec![BackgroundPositionItem::Value(BackgroundPositionValue::Top(Length::Ratio(0.)))].into());
107107

108108
// border
109-
0x60 BorderLeftWidth: LengthType as Initial default Length::Undefined, resolver = Length::resolve_em;
109+
0x60 BorderLeftWidth: LengthType as Initial default Length::Px(3.), resolver = Length::resolve_em;
110110
0x61 BorderLeftStyle: BorderStyleType as Initial default BorderStyle::None;
111111
0x62 BorderLeftColor: ColorType as Initial default Color::CurrentColor;
112-
0x63 BorderRightWidth: LengthType as Initial default Length::Undefined, resolver = Length::resolve_em;
112+
0x63 BorderRightWidth: LengthType as Initial default Length::Px(3.), resolver = Length::resolve_em;
113113
0x64 BorderRightStyle: BorderStyleType as Initial default BorderStyle::None;
114114
0x65 BorderRightColor: ColorType as Initial default Color::CurrentColor;
115-
0x66 BorderTopWidth: LengthType as Initial default Length::Undefined, resolver = Length::resolve_em;
115+
0x66 BorderTopWidth: LengthType as Initial default Length::Px(3.), resolver = Length::resolve_em;
116116
0x67 BorderTopStyle: BorderStyleType as Initial default BorderStyle::None;
117117
0x68 BorderTopColor: ColorType as Initial default Color::CurrentColor;
118-
0x69 BorderBottomWidth: LengthType as Initial default Length::Undefined, resolver = Length::resolve_em;
118+
0x69 BorderBottomWidth: LengthType as Initial default Length::Px(3.), resolver = Length::resolve_em;
119119
0x6a BorderBottomStyle: BorderStyleType as Initial default BorderStyle::None;
120120
0x6b BorderBottomColor: ColorType as Initial default Color::CurrentColor;
121121
0x6c BoxShadow: BoxShadowType as Initial default BoxShadow::None;
122122

123123
// border radius
124-
0x70 BorderTopLeftRadius: BorderRadiusType as Initial default BorderRadius::Pos(Length::Undefined, Length::Undefined);
125-
0x71 BorderTopRightRadius: BorderRadiusType as Initial default BorderRadius::Pos(Length::Undefined, Length::Undefined);
126-
0x72 BorderBottomRightRadius: BorderRadiusType as Initial default BorderRadius::Pos(Length::Undefined, Length::Undefined);
127-
0x73 BorderBottomLeftRadius: BorderRadiusType as Initial default BorderRadius::Pos(Length::Undefined, Length::Undefined);
124+
0x70 BorderTopLeftRadius: BorderRadiusType as Initial default BorderRadius::Pos(Length::Px(0.), Length::Px(0.));
125+
0x71 BorderTopRightRadius: BorderRadiusType as Initial default BorderRadius::Pos(Length::Px(0.), Length::Px(0.));
126+
0x72 BorderBottomRightRadius: BorderRadiusType as Initial default BorderRadius::Pos(Length::Px(0.), Length::Px(0.));
127+
0x73 BorderBottomLeftRadius: BorderRadiusType as Initial default BorderRadius::Pos(Length::Px(0.), Length::Px(0.));
128128

129129
// transition
130130
0x80 TransitionProperty: TransitionPropertyType as Initial default TransitionProperty::List(Array::empty());

‎float-pigment-css/tests/calc.rs‎

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -31,15 +31,10 @@ pub fn calc() {
3131
margin_left,
3232
"margin-left",
3333
"calc(10px + 10deg)",
34-
Length::Undefined
34+
Length::Px(0.)
3535
);
3636
test_parse_property!(margin_left, "margin-left", "calc(10px / 2)", Length::Px(5.));
37-
test_parse_property!(
38-
margin_left,
39-
"margin-left",
40-
"calc(10px / 0)",
41-
Length::Undefined
42-
);
37+
test_parse_property!(margin_left, "margin-left", "calc(10px / 0)", Length::Px(0.));
4338
test_parse_property!(
4439
margin_left,
4540
"margin-left",
@@ -507,10 +502,10 @@ pub fn calc_fraction() {
507502
pub fn calc_operator_whitespace() {
508503
test_parse_property!(width, "width", "calc(1px + 2px)", Length::Px(3.));
509504
test_parse_property!(width, "width", "calc(1px - 2px)", Length::Px(-1.));
510-
test_parse_property!(width, "width", "calc(1px -2px)", Length::Undefined);
511-
test_parse_property!(width, "width", "calc(1px +2px)", Length::Undefined);
512-
test_parse_property!(width, "width", "calc(1px- 2px)", Length::Undefined);
513-
test_parse_property!(width, "width", "calc(1px+ 2px)", Length::Undefined);
505+
test_parse_property!(width, "width", "calc(1px -2px)", Length::Auto);
506+
test_parse_property!(width, "width", "calc(1px +2px)", Length::Auto);
507+
test_parse_property!(width, "width", "calc(1px- 2px)", Length::Auto);
508+
test_parse_property!(width, "width", "calc(1px+ 2px)", Length::Auto);
514509

515510
test_parse_property!(width, "width", "calc(1px * 3)", Length::Px(3.));
516511
test_parse_property!(width, "width", "calc(1px *3)", Length::Px(3.));

‎float-pigment-css/tests/media.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -389,7 +389,7 @@ fn prefers_color_scheme() {
389389
StyleQuery::single(None, None, None, "", "", &classes),
390390
media_status,
391391
);
392-
assert_eq!(node_properties.height(), Length::Undefined);
392+
assert_eq!(node_properties.height(), Length::Auto);
393393
}
394394

395395
#[test]

‎float-pigment-css/tests/property.rs‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3645,7 +3645,7 @@ mod background {
36453645
)
36463646
);
36473647
assert_eq!(np.background_image(), BackgroundImage::List(vec![].into()));
3648-
assert_eq!(np.background_color(), Color::Undefined);
3648+
assert_eq!(np.background_color(), Color::Specified(0, 0, 0, 0));
36493649
assert_eq!(
36503650
np.background_position(),
36513651
BackgroundPosition::List(
@@ -3728,7 +3728,7 @@ mod background {
37283728
)
37293729
);
37303730
assert_eq!(np.background_image(), BackgroundImage::List(vec![].into()));
3731-
assert_eq!(np.background_color(), Color::Undefined);
3731+
assert_eq!(np.background_color(), Color::Specified(0, 0, 0, 0));
37323732
assert_eq!(
37333733
np.background_position(),
37343734
BackgroundPosition::List(
@@ -3901,13 +3901,13 @@ mod sizing {
39013901
let mut ssg = StyleSheetGroup::new();
39023902
let ss = StyleSheet::from_str(
39033903
"
3904-
.a { width: 10vw; height: 10vh; }
3905-
",
3904+
.a { width: 10vw; height: 10vh; }
3905+
",
39063906
);
39073907
ssg.append(ss);
39083908
let np = query(&ssg, "", "", [""], []);
3909-
assert_eq!(np.width(), Length::Undefined);
3910-
assert_eq!(np.height(), Length::Undefined);
3909+
assert_eq!(np.width(), Length::Auto);
3910+
assert_eq!(np.height(), Length::Auto);
39113911
let np = query(&ssg, "", "", ["a"], []);
39123912
assert_eq!(np.width(), Length::Vw(10.));
39133913
assert_eq!(np.height(), Length::Vh(10.));
@@ -4062,10 +4062,10 @@ mod padding_margin {
40624062
);
40634063
ssg.append(ss);
40644064
let np = query(&ssg, "", "", [""], []);
4065-
assert_eq!(np.padding_left(), Length::Undefined);
4066-
assert_eq!(np.padding_right(), Length::Undefined);
4067-
assert_eq!(np.padding_top(), Length::Undefined);
4068-
assert_eq!(np.padding_bottom(), Length::Undefined);
4065+
assert_eq!(np.padding_left(), Length::Px(0.));
4066+
assert_eq!(np.padding_right(), Length::Px(0.));
4067+
assert_eq!(np.padding_top(), Length::Px(0.));
4068+
assert_eq!(np.padding_bottom(), Length::Px(0.));
40694069
let np = query(&ssg, "", "", ["a"], []);
40704070
assert_eq!(np.padding_left(), Length::Px(16.));
40714071
assert_eq!(np.padding_right(), Length::Rem(2.));

‎float-pigment-css/tests/selector.rs‎

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ fn multi_classes() {
9595
assert_eq!(node_properties.width(), Length::Px(1.));
9696
}
9797
let node_properties = query(&ssg, "", "", ["b"], []);
98-
assert_eq!(node_properties.width(), Length::Undefined);
98+
assert_eq!(node_properties.width(), Length::Auto);
9999
let node_properties = query(&ssg, "", "", ["a", "b"], []);
100100
assert_eq!(node_properties.width(), Length::Px(2.));
101101
let node_properties = query(&ssg, "", "", ["a", "c"], []);
@@ -166,17 +166,17 @@ fn parent() {
166166
);
167167
ssg.append(ss);
168168
let node_properties = query(&ssg, "", "", ["a"], []);
169-
assert_eq!(node_properties.width(), Length::Undefined);
169+
assert_eq!(node_properties.width(), Length::Auto);
170170
assert_eq!(node_properties.height(), Length::Px(3.));
171171
let node_properties = query(&ssg, "", "", ["b"], []);
172172
assert_eq!(node_properties.width(), Length::Px(2.));
173-
assert_eq!(node_properties.height(), Length::Undefined);
173+
assert_eq!(node_properties.height(), Length::Auto);
174174
let node_properties = query_list(
175175
&ssg,
176176
[QueryItem::new().c("a").end(), QueryItem::new().c("b").end()],
177177
);
178178
assert_eq!(node_properties.width(), Length::Px(1.));
179-
assert_eq!(node_properties.height(), Length::Undefined);
179+
assert_eq!(node_properties.height(), Length::Auto);
180180
let node_properties = query_list(
181181
&ssg,
182182
[
@@ -186,7 +186,7 @@ fn parent() {
186186
],
187187
);
188188
assert_eq!(node_properties.width(), Length::Px(2.));
189-
assert_eq!(node_properties.height(), Length::Undefined);
189+
assert_eq!(node_properties.height(), Length::Auto);
190190
}
191191

192192
#[test]
@@ -304,8 +304,8 @@ fn attribute_selector() {
304304
);
305305
ssg.append(ss);
306306
let node_properties = query(&ssg, "a", "", [""], []);
307-
assert_eq!(node_properties.height(), Length::Undefined);
308-
assert_eq!(node_properties.width(), Length::Undefined);
307+
assert_eq!(node_properties.height(), Length::Auto);
308+
assert_eq!(node_properties.width(), Length::Auto);
309309
let node_properties = query(
310310
&ssg,
311311
"a",
@@ -317,7 +317,7 @@ fn attribute_selector() {
317317
],
318318
);
319319
assert_eq!(node_properties.height(), Length::Px(100.));
320-
assert_eq!(node_properties.width(), Length::Undefined);
320+
assert_eq!(node_properties.width(), Length::Auto);
321321
let node_properties = query(
322322
&ssg,
323323
"a",
@@ -333,7 +333,7 @@ fn attribute_selector() {
333333
let node_properties = query(&ssg, "a", "", ["b"], [("title".into(), "".into())]);
334334
assert_eq!(node_properties.height(), Length::Px(100.));
335335
let node_properties = query(&ssg, "", "", [], [("title".into(), "".into())]);
336-
assert_eq!(node_properties.height(), Length::Undefined);
336+
assert_eq!(node_properties.height(), Length::Auto);
337337

338338
let node_properties = query(
339339
&ssg,
@@ -342,8 +342,8 @@ fn attribute_selector() {
342342
[],
343343
[("href".into(), "https://example.org".into())],
344344
);
345-
assert_eq!(node_properties.height(), Length::Undefined);
346-
assert_eq!(node_properties.width(), Length::Undefined);
345+
assert_eq!(node_properties.height(), Length::Auto);
346+
assert_eq!(node_properties.width(), Length::Auto);
347347
assert_eq!(node_properties.min_height(), Length::Px(100.));
348348
assert_eq!(node_properties.max_height(), Length::Px(101.));
349349
assert_eq!(node_properties.min_width(), Length::Px(102.));
@@ -985,7 +985,10 @@ fn pseudo_elements_selector_matching() {
985985
ssg.append(ss);
986986
let node_properties = query_single(&ssg, QueryItem::new().pe(PseudoElements::Selection).end());
987987
assert_eq!(node_properties.color(), Color::Specified(255, 0, 0, 255));
988-
assert_eq!(node_properties.background_color(), Color::Undefined);
988+
assert_eq!(
989+
node_properties.background_color(),
990+
Color::Specified(0, 0, 0, 0)
991+
);
989992
let node_properties = query_single(
990993
&ssg,
991994
QueryItem::new()

‎float-pigment-css/tests/serde.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,8 +83,8 @@ fn media_queries() {
8383
media_query_status.width = 801.;
8484
{
8585
let node_properties = query_with_media(&ssg, "", "", ["a"], [], &media_query_status);
86-
assert_eq!(node_properties.width(), Length::Undefined);
87-
assert_eq!(node_properties.height(), Length::Undefined);
86+
assert_eq!(node_properties.width(), Length::Auto);
87+
assert_eq!(node_properties.height(), Length::Auto);
8888
assert_eq!(node_properties.font_size(), Length::Px(4.));
8989
}
9090
});

‎float-pigment-css/tests/style_sheet_group.rs‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -140,12 +140,12 @@ fn style_sheet_resource_media_import() {
140140
assert_eq!(node_properties.height(), Length::Px(8.));
141141
let media = MediaQueryStatus::default_screen_with_size(801., 600.);
142142
let node_properties = query_with_media(&ssg, "", "", ["a"], [], &media);
143-
assert_eq!(node_properties.width(), Length::Undefined);
143+
assert_eq!(node_properties.width(), Length::Auto);
144144
assert_eq!(node_properties.height(), Length::Px(8.));
145145
let media = MediaQueryStatus::default_screen_with_size(800., 601.);
146146
let node_properties = query_with_media(&ssg, "", "", ["a"], [], &media);
147-
assert_eq!(node_properties.width(), Length::Undefined);
148-
assert_eq!(node_properties.height(), Length::Undefined);
147+
assert_eq!(node_properties.width(), Length::Auto);
148+
assert_eq!(node_properties.height(), Length::Auto);
149149
}
150150

151151
#[test]
@@ -346,7 +346,7 @@ fn scopes_in_tag_name_and_id() {
346346
&mut node_properties,
347347
);
348348
assert_eq!(node_properties.width(), Length::Px(0.));
349-
assert_eq!(node_properties.height(), Length::Undefined);
349+
assert_eq!(node_properties.height(), Length::Auto);
350350
let query = StyleQuery::single(NonZeroUsize::new(1), None, None, "view", "i", &classes);
351351
let mut node_properties = NodeProperties::new(None);
352352
ssg.query_single(
@@ -355,7 +355,7 @@ fn scopes_in_tag_name_and_id() {
355355
&mut node_properties,
356356
);
357357
assert_eq!(node_properties.width(), Length::Px(1.));
358-
assert_eq!(node_properties.height(), Length::Undefined);
358+
assert_eq!(node_properties.height(), Length::Auto);
359359
let query = StyleQuery::single(NonZeroUsize::new(2), None, None, "view", "i", &classes);
360360
let mut node_properties = NodeProperties::new(None);
361361
ssg.query_single(
@@ -406,7 +406,7 @@ fn scopes_in_classes() {
406406
&mut node_properties,
407407
);
408408
assert_eq!(node_properties.width(), Length::Px(0.));
409-
assert_eq!(node_properties.height(), Length::Undefined);
409+
assert_eq!(node_properties.height(), Length::Auto);
410410
let classes = vec![("a".into(), NonZeroUsize::new(1))];
411411
let query = StyleQuery::single(None, None, None, "", "", &classes);
412412
let mut node_properties = NodeProperties::new(None);
@@ -416,7 +416,7 @@ fn scopes_in_classes() {
416416
&mut node_properties,
417417
);
418418
assert_eq!(node_properties.width(), Length::Px(1.));
419-
assert_eq!(node_properties.height(), Length::Undefined);
419+
assert_eq!(node_properties.height(), Length::Auto);
420420
let classes = vec![("a".into(), NonZeroUsize::new(2))];
421421
let query = StyleQuery::single(None, None, None, "", "", &classes);
422422
let mut node_properties = NodeProperties::new(None);
@@ -426,6 +426,6 @@ fn scopes_in_classes() {
426426
&mut node_properties,
427427
);
428428
assert_eq!(node_properties.width(), Length::Px(2.));
429-
assert_eq!(node_properties.height(), Length::Undefined);
429+
assert_eq!(node_properties.height(), Length::Auto);
430430
}
431431
}

0 commit comments

Comments
 (0)