rowAttrs customization is unused

Author: skaerg

src/Rudder/Table.elm

@@ -118,6 +118,8 @@ type alias Column row msg =
     { name : ColumnName
     , renderHtml : row -> Html msg
     , ordering : Ordering row
+    , columnAttrs : List (Attribute msg)
+    , entryAttrs : List (Attribute msg)
     }
 
 
@@ -197,16 +199,16 @@ type alias CsvExportData =
 The defaults should be fine, but customizations can be added and defined depending on each case.
 -}
 type alias Customizations row msg =
-    { tableContainerAttrs : List (Attribute (Msg msg))
-    , tableAttrs : List (Attribute (Msg msg))
-    , optionsHeaderAttrs : List (Attribute (Msg msg))
+    { tableContainerAttrs : List (Attribute msg)
+    , tableAttrs : List (Attribute msg)
+    , optionsHeaderAttrs : List (Attribute msg)
 
     -- , caption : Maybe (HtmlDetails msg)
-    , theadAttrs : List (Attribute (Msg msg))
+    , theadAttrs : List (Attribute msg)
 
     -- , tfoot : Maybe (HtmlDetails msg)
-    , tbodyAttrs : List (Attribute (Msg msg))
-    , rowAttrs : row -> List (Attribute (Msg msg))
+    , tbodyAttrs : List (Attribute msg)
+    , rowAttrs : row -> List (Attribute msg)
     }
 
 
@@ -779,19 +781,22 @@ encodeStorageEffect key filter =
 view : Model row msg -> Html (Msg msg)
 view (Model ({ columns, data, options } as model)) =
     let
+        mapAttribute =
+            Html.Attributes.map ParentMsg
+
         theadAttrs =
-            options.customizations.theadAttrs
+            options.customizations.theadAttrs |> List.map mapAttribute
 
         tbodyAttrs =
-            options.customizations.tbodyAttrs
+            options.customizations.tbodyAttrs |> List.map mapAttribute
 
         tableContainerAttrs =
-            options.customizations.tableContainerAttrs
+            options.customizations.tableContainerAttrs |> List.map mapAttribute
 
         tableView =
-            table options.customizations.tableAttrs
+            table (options.customizations.tableAttrs |> List.map mapAttribute)
                 [ thead theadAttrs [ tableHeader columns model ]
-                , tbody tbodyAttrs (tableBody columns data)
+                , tbody tbodyAttrs (tableBody columns data options.customizations.rowAttrs)
                 ]
 
         content =
@@ -800,7 +805,7 @@ view (Model ({ columns, data, options } as model)) =
                     [ tableView ]
 
                 elems ->
-                    [ div options.customizations.optionsHeaderAttrs elems
+                    [ div (options.customizations.optionsHeaderAttrs |> List.map mapAttribute) elems
                     , tableView
                     ]
     in
@@ -907,15 +912,17 @@ tableHeader columns sort =
     tr [ class "head" ]
         (columns
             |> NonEmptyList.toList
-            |> List.map (\column -> ( column.name, thClass sort column.name ))
+            |> List.map (\column -> ( column.name, thClass sort column.name, column.columnAttrs ))
             |> List.map
-                (\( ColumnName name, thClassValue ) ->
+                (\( ColumnName name, thClassValue, columnAttrs ) ->
                     th
-                        [ class thClassValue
-                        , rowspan 1
-                        , colspan 1
-                        , onClick (SortColumn (ColumnName name))
-                        ]
+                        ([ class thClassValue
+                         , rowspan 1
+                         , colspan 1
+                         , onClick (SortColumn (ColumnName name))
+                         ]
+                            ++ List.map (Html.Attributes.map ParentMsg) columnAttrs
+                        )
                         [ text name ]
                 )
         )
@@ -935,15 +942,19 @@ thClass { sortBy, sortOrder } columnName =
         "sorting"
 
 
-tableBody : NonEmptyList.Nonempty (Column row msg) -> List row -> List (Html (Msg msg))
-tableBody columns data =
+tableBody : NonEmptyList.Nonempty (Column row msg) -> List row -> (row -> List (Attribute msg)) -> List (Html (Msg msg))
+tableBody columns data rowAttrs =
     let
         rowTable n =
-            tr []
+            tr (List.map (Html.Attributes.map ParentMsg) (rowAttrs n))
                 (columns
                     |> NonEmptyList.toList
-                    |> List.map (\{ renderHtml } -> Html.map ParentMsg (n |> renderHtml))
-                    |> List.map (\s -> td [] [ s ])
+                    |> List.map
+                        (\{ renderHtml, entryAttrs } ->
+                            td
+                                (List.map (Html.Attributes.map ParentMsg) entryAttrs)
+                                [ Html.map ParentMsg (n |> renderHtml) ]
+                        )
                 )
     in
     if List.length data > 0 then

tests/ProgramTestTable.elm

@@ -76,6 +76,8 @@ testConfig columnNames ordering renderHtml options =
                 { name = ColumnName columnName
                 , renderHtml = renderHtml
                 , ordering = ordering
+                , entryAttrs = []
+                , columnAttrs = []
                 }
     in
     { columns = columnNames |> NonEmpty.map toColumn
@@ -146,8 +148,8 @@ mockFilterConfigWithData =
         columns : NonEmpty.Nonempty (Column { a : String, b : Int } msg)
         columns =
             NonEmpty.Nonempty
-                { name = ColumnName "Name", renderHtml = .a >> Html.text, ordering = Ordering.byField .a }
-                [ { name = ColumnName "Age", renderHtml = .b >> String.fromInt >> Html.text, ordering = Ordering.byField .b } ]
+                { name = ColumnName "Name", renderHtml = .a >> Html.text, ordering = Ordering.byField .a, entryAttrs = [], columnAttrs = [] }
+                [ { name = ColumnName "Age", renderHtml = .b >> String.fromInt >> Html.text, ordering = Ordering.byField .b, entryAttrs = [], columnAttrs = [] } ]
 
         options =
             buildOptions.newOptions

tests/TestTable.elm

@@ -41,6 +41,8 @@ columnFuzz =
         |> andMap columnNameFuzz
         |> andMap (constant (\_ -> Html.text ""))
         |> andMap (constant Ordering.natural)
+        |> andMap (constant [])
+        |> andMap (constant [])
 
 
 nonEmptyListFuzzer : Fuzzer a -> Fuzzer (NonEmptyList.Nonempty a)
@@ -80,7 +82,7 @@ sortModelFuzz sortBy sortOrder =
     let
         config =
             constant Config
-                |> andMap (constant (NonEmptyList.singleton { name = sortBy, renderHtml = \_ -> Html.text "", ordering = Ordering.natural }))
+                |> andMap (constant (NonEmptyList.singleton { name = sortBy, renderHtml = \_ -> Html.text "", ordering = Ordering.natural, entryAttrs = [], columnAttrs = [] }))
                 |> andMap (constant sortBy)
                 |> andMap (constant sortOrder)
                 |> andMap (optionsFuzz Filters.empty)
@@ -97,6 +99,8 @@ csvColumnFuzz (NonEmptyList.Nonempty head tail) =
                     |> andMap (constant (ColumnName colName))
                     |> andMap (constant (\_ -> Html.text ""))
                     |> andMap (constant (\_ _ -> LT))
+                    |> andMap (constant [])
+                    |> andMap (constant [])
     in
     map2 NonEmptyList.Nonempty
         (head |> colNameToColumnFuzz)