Skip to content

feat(minify): avoid removing the default value of the filter function #1121

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

Open
yisibl wants to merge 1 commit into
base: master
Choose a base branch
from
+40 −37
Open

feat(minify): avoid removing the default value of the filter function #1121

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 31 additions & 3 deletions src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27257,9 +27257,23 @@ mod tests {
".foo{filter:url(filters.svg#filter-id)}",
);
minify_test(".foo { filter: blur(5px); }", ".foo{filter:blur(5px)}");
minify_test(".foo { filter: blur(0px); }", ".foo{filter:blur()}");
minify_test(".foo { filter: blur(0px); }", ".foo{filter:blur(0)}");
minify_test(".foo { filter: brightness(0.520); }", ".foo{filter:brightness(.52)}");
minify_test(".foo { filter: brightness(10%); }", ".foo{filter:brightness(10%)}");
minify_test(".foo { filter: brightness(100%); }", ".foo{filter:brightness()}");
minify_test(".foo { filter: brightness(100%); }", ".foo{filter:brightness(100%)}");
minify_test(".foo { filter: brightness(1); }", ".foo{filter:brightness(1)}");
minify_test(".foo { filter: contrast(100%); }", ".foo{filter:contrast(100%)}");
minify_test(".foo { filter: contrast(1); }", ".foo{filter:contrast(1)}");
minify_test(".foo { filter: grayscale(100%); }", ".foo{filter:grayscale(100%)}");
minify_test(".foo { filter: grayscale(1); }", ".foo{filter:grayscale(1)}");
minify_test(".foo { filter: invert(100%); }", ".foo{filter:invert(100%)}");
minify_test(".foo { filter: invert(1); }", ".foo{filter:invert(1)}");
minify_test(".foo { filter: opacity(100%); }", ".foo{filter:opacity(100%)}");
minify_test(".foo { filter: opacity(1); }", ".foo{filter:opacity(1)}");
minify_test(".foo { filter: saturate(100%); }", ".foo{filter:saturate(100%)}");
minify_test(".foo { filter: saturate(1); }", ".foo{filter:saturate(1)}");
minify_test(".foo { filter: sepia(100%); }", ".foo{filter:sepia(100%)}");
minify_test(".foo { filter: sepia(1); }", ".foo{filter:sepia(1)}");
minify_test(
".foo { filter: drop-shadow(16px 16px 20px yellow); }",
".foo{filter:drop-shadow(16px 16px 20px #ff0)}",
Expand All @@ -27268,7 +27282,21 @@ mod tests {
".foo { filter: contrast(175%) brightness(3%); }",
".foo{filter:contrast(175%)brightness(3%)}",
);
minify_test(".foo { filter: hue-rotate(0) }", ".foo{filter:hue-rotate()}");
minify_test(".foo { filter: hue-rotate(0) }", ".foo{filter:hue-rotate(0)}");

prefix_test(
".foo { filter: brightness(1) }",
indoc! { r#"
.foo {
-webkit-filter: brightness(1);
filter: brightness(1);
}
"#},
Browsers {
chrome: Some(20 << 16),
..Browsers::default()
},
);

prefix_test(
".foo { filter: blur(5px) }",
Expand Down
43 changes: 9 additions & 34 deletions src/properties/effects.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,72 +122,47 @@ impl<'i> ToCss for Filter<'i> {
match self {
Filter::Blur(val) => {
dest.write_str("blur(")?;
if *val != Length::zero() {
val.to_css(dest)?;
}
val.to_css(dest)?;
dest.write_char(')')
}
Filter::Brightness(val) => {
dest.write_str("brightness(")?;
let v: f32 = val.into();
if v != 1.0 {
val.to_css(dest)?;
}
val.to_css(dest)?;
dest.write_char(')')
}
Filter::Contrast(val) => {
dest.write_str("contrast(")?;
let v: f32 = val.into();
if v != 1.0 {
val.to_css(dest)?;
}
val.to_css(dest)?;
dest.write_char(')')
}
Filter::Grayscale(val) => {
dest.write_str("grayscale(")?;
let v: f32 = val.into();
if v != 1.0 {
val.to_css(dest)?;
}
val.to_css(dest)?;
dest.write_char(')')
}
Filter::HueRotate(val) => {
dest.write_str("hue-rotate(")?;
if !val.is_zero() {
val.to_css(dest)?;
}
val.to_css_with_unitless_zero(dest)?;
dest.write_char(')')
}
Filter::Invert(val) => {
dest.write_str("invert(")?;
let v: f32 = val.into();
if v != 1.0 {
val.to_css(dest)?;
}
val.to_css(dest)?;
dest.write_char(')')
}
Filter::Opacity(val) => {
dest.write_str("opacity(")?;
let v: f32 = val.into();
if v != 1.0 {
val.to_css(dest)?;
}
val.to_css(dest)?;
dest.write_char(')')
}
Filter::Saturate(val) => {
dest.write_str("saturate(")?;
let v: f32 = val.into();
if v != 1.0 {
val.to_css(dest)?;
}
val.to_css(dest)?;
dest.write_char(')')
}
Filter::Sepia(val) => {
dest.write_str("sepia(")?;
let v: f32 = val.into();
if v != 1.0 {
val.to_css(dest)?;
}
val.to_css(dest)?;
dest.write_char(')')
}
Filter::DropShadow(val) => {
Expand Down
Loading