Merge pull request #1029 from vivliostyle/fix/issue1028

fix: Error with undefined CSS variables in calc expression in shorthand property
vivliostyle · Oct 21, 2022 · 2d0dd9d · 2d0dd9d · vercel · Oct 21, 2022
2 parents c0b5fca + db948cb
commit 2d0dd9d
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/packages/core/src/vivliostyle/css-cascade.ts b/packages/core/src/vivliostyle/css-cascade.ts
@@ -4400,11 +4400,15 @@ export class CalcFilterVisitor extends Css.FilterVisitor {
       return value;
     }
     const exprText = value.toString().replace(/^calc\b/, "-epubx-expr");
-    if (/\d(%|em|ex|cap|ch|ic|lh|p?v[whbi]|p?vmin|p?vmax)\W/i.test(exprText)) {
+    if (
+      /\d(%|em|ex|cap|ch|ic|lh|p?v[whbi]|p?vmin|p?vmax)\W|\Wvar\(\s*--/i.test(
+        exprText,
+      )
+    ) {
       return value;
     }
     const exprVal = CssParser.parseValue(
-      null,
+      this.context.rootScope,
       new CssTokenizer.Tokenizer(exprText, null),
       "",
     );