NoRedInk/noredink-ui
1
1
Fork 0
mirror of https://github.com/NoRedInk/noredink-ui.git synced 2025-01-02 11:28:01 +03:00
Code Issues Packages Projects Releases Wiki Activity

Begins updating component for its new context

Browse Source
This commit is contained in:
Tessa Kelly 2020-05-07 12:47:14 -07:00
parent e22f067d9f
commit 415edb38b0
1 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/Nri/Ui/Menu/V1.elm
View File

@ -1,4 +1,4 @@
module Nri.Menu exposing module Nri.Ui.Menu.V1 exposing
( view, Alignment(..), TitleWrapping(..) ( view, Alignment(..), TitleWrapping(..)
, iconButton , iconButton
, iconButtonWithMenu , iconButtonWithMenu
@ -31,18 +31,17 @@ import Accessibility.Styled.Widget as Widget
import Css exposing (..) import Css exposing (..)
import Css.Extra exposing (Snippet, classSelector, classSelectors) import Css.Extra exposing (Snippet, classSelector, classSelectors)
import Css.Global exposing (descendants) import Css.Global exposing (descendants)
import Data.Url as Url exposing (Url)
import Html.Styled as Html exposing (..) import Html.Styled as Html exposing (..)
import Html.Styled.Attributes as Attr import Html.Styled.Attributes as Attr
import Html.Styled.Attributes.Extra
import Html.Styled.Events exposing (onClick, onMouseDown) import Html.Styled.Events exposing (onClick, onMouseDown)
import Html.Styled.Extra exposing (viewJust)
import Nri.Tooltip as Tooltip exposing (Tooltip)
import Nri.Ui.Colors.V1 import Nri.Ui.Colors.V1
import Nri.Ui.Fonts.V1 import Nri.Ui.Fonts.V1
import Nri.Ui.Html.Attributes.V2 as AttributesExtra
import Nri.Ui.Html.V3 exposing (viewJust)
import Nri.Ui.Svg.V1 as Svg import Nri.Ui.Svg.V1 as Svg
import Nri.Ui.Tooltip.V1 as Tooltip exposing (Tooltip)
import Nri.Ui.UiIcon.V1 as UiIcon import Nri.Ui.UiIcon.V1 as UiIcon
import Util import String.Extra
@ -156,7 +155,7 @@ view config =
, Attr.id buttonId , Attr.id buttonId
, config.buttonWidth , config.buttonWidth
|> Maybe.map (\w -> Attr.style "width" (String.fromInt w ++ "px")) |> Maybe.map (\w -> Attr.style "width" (String.fromInt w ++ "px"))
|> Maybe.withDefault Html.Styled.Attributes.Extra.none |> Maybe.withDefault AttributesExtra.none
] ]
[ div [ class [ ButtonInner ] ] [ div [ class [ ButtonInner ] ]
[ viewTitle { icon = config.icon, wrapping = config.wrapping, title = config.title, dataDescription = config.id } [ viewTitle { icon = config.icon, wrapping = config.wrapping, title = config.title, dataDescription = config.id }
@ -315,7 +314,7 @@ iconButton config =
in in
div [ class [ IconButtonContainer ] ] div [ class [ IconButtonContainer ] ]
[ tooltip [ text config.label ] [ tooltip [ text config.label ]
|> Tooltip.view |> Tooltip.primaryLabel
{ trigger = Tooltip.OnHover { trigger = Tooltip.OnHover
, onTrigger = config.onShowTooltip , onTrigger = config.onShowTooltip
, isOpen = config.isTooltipOpen , isOpen = config.isTooltipOpen
@ -331,6 +330,10 @@ iconButton config =
) )
[ Svg.toHtml config.icon [ Svg.toHtml config.icon
] ]
, extraButtonAttrs = []
, onTrigger = config.onShowTooltip
, isOpen = config.isTooltipOpen
, id = config.id ++ "-tooltip"
} }
] ]
@ -416,7 +419,7 @@ iconLink :
, label : String , label : String
, isTooltipOpen : Bool , isTooltipOpen : Bool
, onShowTooltip : Bool -> msg , onShowTooltip : Bool -> msg
, linkUrl : Url , linkUrl : String
, isDisabled : Bool , isDisabled : Bool
} }
-> Html msg -> Html msg
@ -427,11 +430,11 @@ iconLink config =
[] []
else else
[ Attr.href <| Url.toString config.linkUrl ] [ Attr.href config.linkUrl ]
in in
div [ class [ IconButtonContainer ] ] div [ class [ IconButtonContainer ] ]
[ tooltip [ text config.label ] [ tooltip [ text config.label ]
|> Tooltip.view |> Tooltip.primaryLabel
{ trigger = Tooltip.OnHover { trigger = Tooltip.OnHover
, onTrigger = config.onShowTooltip , onTrigger = config.onShowTooltip
, isOpen = config.isTooltipOpen , isOpen = config.isTooltipOpen
@ -442,13 +445,17 @@ iconLink config =
, ( Disabled, config.isDisabled ) -- `a` tags don't allow the `disabled` attribute so we have to use a class to apply disabled styles , ( Disabled, config.isDisabled ) -- `a` tags don't allow the `disabled` attribute so we have to use a class to apply disabled styles
] ]
, Widget.disabled config.isDisabled , Widget.disabled config.isDisabled
, Attr.id (Util.dashify config.label) , Attr.id (String.Extra.dashify config.label)
, Widget.label config.label , Widget.label config.label
] ]
++ perhapsHref ++ perhapsHref
) )
[ Svg.toHtml config.icon [ Svg.toHtml config.icon
] ]
, extraButtonAttrs = []
, onTrigger = config.onShowTooltip
, isOpen = config.isTooltipOpen
, id = String.replace " " "-" config.label ++ "-tooltip"
} }
] ]