Merge class from html attributes when rendering cell

programcsharp · Jul 27, 2021 · cd9593f · cd9593f
1 parent bba34e5
commit cd9593f
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 2 deletions.
diff --git a/Griddly.NetCore.Razor/Pages/Shared/Griddly/Griddly.cshtml b/Griddly.NetCore.Razor/Pages/Shared/Griddly/Griddly.cshtml
@@ -317,7 +317,14 @@
             @foreach (GriddlyColumn column in settings.Columns)
             {
                 var underlyingValue = column.RenderUnderlyingValue(row, Html);
-                <td class="@column.RenderClassName(row, Model) @(!column.Visible ? "column-hidden" : null)" @column.GenerateHtmlAttributes(row, Model).ToHtmlAttributes() @if (underlyingValue != null) { <text> data-value="@underlyingValue" </text> }>@column.RenderCell(row, settings, Html)</td>
+                var htmlAttributes = column.GenerateHtmlAttributes(row, Model);
+                string additionalClassNames = null;
+                if (htmlAttributes?.ContainsKey("class") == true)
+                {
+                    additionalClassNames = htmlAttributes["class"]?.ToString();
+                    htmlAttributes.Remove("class");
+                }
+                <td class="@column.RenderClassName(row, Model) @(!column.Visible ? "column-hidden" : null) @additionalClassNames" @htmlAttributes.ToHtmlAttributes() @if (underlyingValue != null) { <text> data-value="@underlyingValue" </text> }>@column.RenderCell(row, settings, Html)</td>
             }
         </tr>
     }

diff --git a/Griddly/Views/Shared/Griddly/Griddly.cshtml b/Griddly/Views/Shared/Griddly/Griddly.cshtml
@@ -304,7 +304,14 @@
             @foreach (GriddlyColumn column in settings.Columns)
             {
                 var underlyingValue = column.RenderUnderlyingValue(row, Html);
-                <td class="@column.RenderClassName(row, Model) @(!column.Visible ? "column-hidden" : null)" @column.GenerateHtmlAttributes(row, Model).ToHtmlAttributes() @if (underlyingValue != null) { <text>data-value="@underlyingValue"</text> }>@column.RenderCell(row, settings, Html)</td>
+                var htmlAttributes = column.GenerateHtmlAttributes(row, Model);
+                string additionalClassNames = null;
+                if (htmlAttributes?.ContainsKey("class") == true)
+                {
+                    additionalClassNames = htmlAttributes["class"]?.ToString();
+                    htmlAttributes.Remove("class");
+                }
+                <td class="@column.RenderClassName(row, Model) @(!column.Visible ? "column-hidden" : null) @additionalClassNames" @htmlAttributes.ToHtmlAttributes() @if (underlyingValue != null) { <text> data-value="@underlyingValue" </text> }>@column.RenderCell(row, settings, Html)</td>
             }
         </tr>
     }