Merge branch 'develop' into devsecops

itext/itext.layout/itext/layout/exceptions/LayoutExceptionMessageConstant.cs

@@ -67,7 +67,9 @@ public sealed class LayoutExceptionMessageConstant {
 
         public const String GRID_AUTO_REPEAT_CAN_BE_USED_ONLY_ONCE = "Automatic repetitions in the grid template are allowed only once per template.";
 
-        public const String GRID_AUTO_REPEAT_CANNOT_BE_COMBINED_WITH_INDEFINITE_SIZES = "Automatic repetitions in the grid template  cannot be combined with intrinsic or flexible sizes.";
+        public const String GRID_AUTO_REPEAT_CANNOT_BE_COMBINED_WITH_INDEFINITE_SIZES = "Automatic repetitions in the grid template cannot be combined with intrinsic or flexible sizes.";
+
+        public const String FLEXIBLE_ARENT_ALLOWED_AS_MINIMUM_IN_MINMAX = "Flexible values aren't allowed as minimum in minmax grid function.";
 
         private LayoutExceptionMessageConstant() {
         }

itext/itext.layout/itext/layout/renderer/GridSizer.cs

@@ -177,7 +177,7 @@ private void ResolveGridColumns() {
                         colsValues.Add(columnAutoWidth);
                     }
                     else {
-                        colsValues.Add(new FlexValue(1f));
+                        colsValues.Add(AutoValue.VALUE);
                     }
                 }
             }

itext/itext.layout/itext/layout/renderer/GridTemplateResolver.cs

@@ -141,9 +141,15 @@ private float ProcessValue(TemplateValue value) {
                     // or as its minimum track sizing function otherwise
                     // if encountered intrinsic or flexible before, then it doesn't matter what to process
                     bool currentValue = containsIntrinsicOrFlexible;
-                    float length = ProcessValue(((MinMaxValue)value).GetMax());
+                    MinMaxValue minMaxValue = (MinMaxValue)value;
+                    if (minMaxValue.GetMin().GetType() == TemplateValue.ValueType.FLEX) {
+                        // A future level of CSS Grid spec may allow <flex> minimums, but not now
+                        throw new InvalidOperationException(LayoutExceptionMessageConstant.FLEXIBLE_ARENT_ALLOWED_AS_MINIMUM_IN_MINMAX
+                            );
+                    }
+                    float length = ProcessValue(minMaxValue.GetMax());
                     if (containsIntrinsicOrFlexible) {
-                        length = ProcessValue(((MinMaxValue)value).GetMin());
+                        length = ProcessValue(minMaxValue.GetMin());
                     }
                     containsIntrinsicOrFlexible = currentValue;
                     result.SetFreeze(false);

port-hash

@@ -1 +1 @@
-fc414da4ec172670063a0b874ecf6af0b7629338
+79920462383c128f6e228589412e592c76db36fe