Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat(css/prefixer): place-* properties #6685

Merged
merged 5 commits into from
Dec 20, 2022
Merged

feat(css/prefixer): place-* properties #6685

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
34e9818
feat(css/prefixer): place-* properties
alexander-akait Dec 19, 2022
7709a68
fix: handle deep prefixes
alexander-akait Dec 19, 2022
65f40a3
refactor: remove todo
alexander-akait Dec 19, 2022
d1b44c4
refactor: code
alexander-akait Dec 20, 2022
0827267
Merge branch 'main' into feat-align
swc-bot Dec 20, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
42 changes: 42 additions & 0 deletions crates/swc_css_prefixer/data/prefixes_and_browsers.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3895,6 +3895,48 @@
},
{}
],

"place-content": [
{
"chrome": "4",
"edge": "12",
"safari": "3.1",
"firefox": "2",
"opera": "10",
"ie": "6",
"ios": "3.2",
"samsung": "4",
"android": "2.1"
},
{
"chrome": "58",
"edge": "18",
"safari": "8",
"firefox": "44",
"opera": "45",
"ie": "11",
"ios": "8.4",
"android": "4.4.4",
"samsung": "6.4"
}
],
"place-items": [
{
"chrome": "4"
},
{
"chrome": "58"
}
],
"place-self": [
{
"chrome": "4"
},
{
"chrome": "58"
}
],

"opacity": [
{
"chrome": "4",
Expand Down
95 changes: 91 additions & 4 deletions crates/swc_css_prefixer/src/prefixer.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1578,19 +1578,28 @@ impl VisitMut for Prefixer {
let value: Option<Box<dyn Fn() -> Vec<ComponentValue>>> = $value;

if let Some(value) = value {
self.added_declarations.push(Box::new(Declaration {
let mut declaration = Declaration {
span: n.span,
name,
value: value(),
important: n.important.clone(),
}));
};

// TODO should we handle with prefix?
declaration.visit_mut_with(self);

self.added_declarations.push(Box::new(declaration));
} else {
self.added_declarations.push(Box::new(Declaration {
let mut declaration = Declaration {
span: n.span,
name,
value: n.value.clone(),
important: n.important.clone(),
}));
};

declaration.visit_mut_with(self);

self.added_declarations.push(Box::new(declaration));
}
}
}};
Expand Down Expand Up @@ -3558,6 +3567,84 @@ impl VisitMut for Prefixer {
}
}

js_word!("place-content") if should_prefix("place-content", self.env, false) => {
match (n.value.get(0), n.value.get(1)) {
(Some(left), Some(right)) => {
add_declaration!(
js_word!("align-content"),
Some(Box::new(|| { vec![left.clone()] }))
);
add_declaration!(
js_word!("justify-content"),
Some(Box::new(|| { vec![right.clone()] }))
);
}
(Some(left), None) => {
add_declaration!(
js_word!("align-content"),
Some(Box::new(|| { vec![left.clone()] }))
);
add_declaration!(
js_word!("justify-content"),
Some(Box::new(|| { vec![left.clone()] }))
);
}
_ => {}
}
}

js_word!("place-items") if should_prefix("place-items", self.env, false) => {
match (n.value.get(0), n.value.get(1)) {
(Some(left), Some(right)) => {
add_declaration!(
js_word!("align-items"),
Some(Box::new(|| { vec![left.clone()] }))
);
add_declaration!(
js_word!("justify-items"),
Some(Box::new(|| { vec![right.clone()] }))
);
}
(Some(left), None) => {
add_declaration!(
js_word!("align-items"),
Some(Box::new(|| { vec![left.clone()] }))
);
add_declaration!(
js_word!("justify-items"),
Some(Box::new(|| { vec![left.clone()] }))
);
}
_ => {}
}
}

js_word!("place-self") if should_prefix("place-self", self.env, false) => {
match (n.value.get(0), n.value.get(1)) {
(Some(left), Some(right)) => {
add_declaration!(
js_word!("align-self"),
Some(Box::new(|| { vec![left.clone()] }))
);
add_declaration!(
js_word!("justify-self"),
Some(Box::new(|| { vec![right.clone()] }))
);
}
(Some(left), None) => {
add_declaration!(
js_word!("align-self"),
Some(Box::new(|| { vec![left.clone()] }))
);
add_declaration!(
js_word!("justify-self"),
Some(Box::new(|| { vec![left.clone()] }))
);
}
_ => {}
}
}

// TODO add `grid` support https://github.com/postcss/autoprefixer/tree/main/lib/hacks (starting with grid)
// TODO fix me https://github.com/postcss/autoprefixer/blob/main/test/cases/custom-prefix.out.css
_ => {}
Expand Down
8 changes: 8 additions & 0 deletions crates/swc_css_prefixer/tests/fixture/display/output.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,10 +83,18 @@
display: list-item inline flow;
}
.block-flex {
display: -webkit-box;
display: -webkit-flex;
display: -moz-box;
display: -ms-flexbox;
display: flex;
display: block flex;
}
.inline-flex {
display: -webkit-inline-box;
display: -webkit-inline-flex;
display: -moz-inline-box;
display: -ms-inline-flexbox;
display: inline-flex;
display: inline flex;
}
Expand Down
82 changes: 82 additions & 0 deletions crates/swc_css_prefixer/tests/fixture/place/input.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,82 @@
a {
place-content: space-between center;
place-items: center normal;
place-self: center;
}

A {
PLACE-CONTENT: space-between center;
PLACE-ITEMS: center normal;
PLACE-SELF: auto center;
}

b {
place-content: space-between;
place-items: center;
place-self: center;
}

c {
place-content: var(--first) center;
place-items: var(--first) normal;
place-self: var(--first);
}

d {
place-content: space-between var(--second);
place-items: self-start var(--second);
}

e {
place-content: var(--first, var(--fallback)) center;
place-items: var(--first, var(--fallback)) legacy;
}

.test-unparseable-var-in-place-declaration {
place-content: var(var(--foo), ; );
}

.order-0 {
-webkit-place-content: first second;
}

.order-1 {
-moz-place-content: first second;
}

.order-2 {
-ms-place-content: first second;
}

.order-3 {
-o-place-content: first second;
}

.order-4 {
--place-content: first second;
}

.order-5 {
foo-place-content: first second;
}

/* place-content: first second; */

.content {
content: 'place-content: first second;';
}

.important {
place-content: first second !important;
}

@supports (place-content: first second) {
.support {
place-content: first second;
}
}
@keyframes KEYFRAMES {
50% {
place-content: first second;
}
}