Begin replacing focusables type

src/Nri/Ui/Modal/V9.elm

@@ -276,8 +276,8 @@ custom styles =
 
 
 {-| -}
-type Focusable msg
+type alias Focusable msg =
-    = Focusable (Attribute msg) (List (Attribute msg))
+    Attribute msg
 
 
 {-| -}
@@ -290,43 +290,6 @@ multipleFocusableElementView :
     )
     -> Focusable msg
 multipleFocusableElementView f =
-    Focusable (multipleFocusableElementView_ (\attributes -> f attributes)) []
-
-
-{-| -}
-onlyFocusableElementView :
-    ({ onlyFocusableElement : List (Html.Attribute msg)
-     }
-     -> Html msg
-    )
-    -> Focusable msg
-onlyFocusableElementView f =
-    Focusable
-        (Attribute
-            (\config ->
-                { config
-                    | content =
-                        \{ onlyFocusableElement } ->
-                            f
-                                { onlyFocusableElement = onlyFocusableElement
-                                }
-                }
-            )
-        )
-        [ Attribute (\config -> { config | autofocusOn = Last })
-        ]
-
-
-{-| -}
-multipleFocusableElementView_ :
-    ({ firstFocusableElement : List (Html.Attribute msg)
-     , lastFocusableElement : List (Html.Attribute msg)
-     , autofocusElement : Html.Attribute msg
-     }
-     -> Html msg
-    )
-    -> Attribute msg
-multipleFocusableElementView_ f =
     Attribute
         (\config ->
             { config
@@ -341,6 +304,27 @@ multipleFocusableElementView_ f =
         )
 
 
+{-| -}
+onlyFocusableElementView :
+    ({ onlyFocusableElement : List (Html.Attribute msg)
+     }
+     -> Html msg
+    )
+    -> Focusable msg
+onlyFocusableElementView f =
+    Attribute
+        (\config ->
+            { config
+                | content =
+                    \{ onlyFocusableElement } ->
+                        f
+                            { onlyFocusableElement = onlyFocusableElement
+                            }
+                , autofocusOn = Last
+            }
+        )
+
+
 
 -- VIEW
 
@@ -368,9 +352,7 @@ view theme config getFocusable model =
             }
 
         focusables =
-            case getFocusable viewFuncs of
+            getFocusable viewFuncs
-                Focusable fst rst ->
-                    fst :: rst
     in
     view_
         config.wrapMsg
@@ -411,7 +393,7 @@ view theme config getFocusable model =
                 , Css.border Css.zero
                 ]
          ]
-            ++ focusables
+            ++ [ focusables ]
         )
         model
         |> List.singleton