Fix #84: CSS cal with vh incorrect

primefaces-extensions · Aug 4, 2022 · a5de5c4 · a5de5c4
1 parent 57e47d4
commit a5de5c4
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/src/main/java/org/primefaces/extensions/optimizerplugin/optimizer/CssCompressor.java b/src/main/java/org/primefaces/extensions/optimizerplugin/optimizer/CssCompressor.java
@@ -554,10 +554,10 @@ public void compress(Writer out, int linebreakpos) throws IOException {
 		while (m.find()) {
 			String s = m.group();
 			s = s.replaceAll("\\s+", "");
-			s = s.replaceAll("(?<=[-|%|)|px|em|rem|vw|\\d])\\+", " + ");
-			s = s.replaceAll("(?<=[-|%|)|px|em|rem|vw|\\d])\\-", " - ");
-			s = s.replaceAll("(?<=[-|%|)|px|em|rem|vw|\\d])\\*", " * ");
-			s = s.replaceAll("(?<=[-|%|)|px|em|rem|vw|\\d])\\/", " / ");
+			s = s.replaceAll("(?<=[-|%|)|px|em|rem|vh|vw|\\d])\\+", " + ");
+			s = s.replaceAll("(?<=[-|%|)|px|em|rem|vh|vw|\\d])\\-", " - ");
+			s = s.replaceAll("(?<=[-|%|)|px|em|rem|vh|vw|\\d])\\*", " * ");
+			s = s.replaceAll("(?<=[-|%|)|px|em|rem|vh|vw|\\d])\\/", " / ");
 
 			m.appendReplacement(sb, s);
 		}

diff --git a/src/test/resources/calc.css b/src/test/resources/calc.css
@@ -3,5 +3,6 @@
 	left:calc(50%-(100px * 2));
 	width: calc( 25% +10px);
 	right: calc(((100% - 1200px) /2) + 16px);
-	height:calc(50% + 4px)
+	height:calc(50% + 4px);
+	bottom:calc(100vh - 20px);
 }
diff --git a/src/test/resources/calc.css.min b/src/test/resources/calc.css.min
@@ -1 +1 @@
-.test-calc{top:calc(-100vw + 4em) !important;left:calc(50% - (100px * 2));width:calc(25% + 10px);right:calc(((100% - 1200px) / 2) + 16px);height:calc(50% + 4px)}
+.test-calc{top:calc(-100vw + 4em) !important;left:calc(50% - (100px * 2));width:calc(25% + 10px);right:calc(((100% - 1200px) / 2) + 16px);height:calc(50% + 4px);bottom:calc(100vh - 20px)}