From f70f11ea8886c7b5b572ad9ec772a2dab2f1a68d Mon Sep 17 00:00:00 2001 From: Juan Edi Date: Wed, 6 Sep 2023 15:42:45 -0300 Subject: [PATCH] keep config field names consistent with TabsInternal --- component-catalog/src/Examples/Carousel.elm | 32 ++++++++++----------- src/Nri/Ui/Carousel/V2.elm | 16 +++++------ tests/Spec/Nri/Ui/Carousel.elm | 8 +++--- 3 files changed, 28 insertions(+), 28 deletions(-) diff --git a/component-catalog/src/Examples/Carousel.elm b/component-catalog/src/Examples/Carousel.elm index e6f9a668..c35020dd 100644 --- a/component-catalog/src/Examples/Carousel.elm +++ b/component-catalog/src/Examples/Carousel.elm @@ -421,8 +421,8 @@ viewCustomizableWithCombinedControls model = Carousel.viewWithCombinedControls { selected = model.selected , slides = List.map Tuple.second allItems - , tabControlStyles = \_ -> [] - , tabControlListStyles = [] + , tabStyles = \_ -> [] + , tabListStyles = [] , previousButton = { attributes = [], icon = UiIcon.arrowLeft, name = "Previous" } , nextButton = @@ -438,8 +438,8 @@ viewCustomizableWithCombinedControls model = ++ Code.record [ ( "selected", Code.int model.selected ) , ( "slides", Code.listMultiline (List.map Tuple.first allItems) 2 ) - , ( "tabControlStyles", "(\\_ -> [])" ) - , ( "tabControlListStyles", Code.list [] ) + , ( "tabStyles", "(\\_ -> [])" ) + , ( "tabListStyles", Code.list [] ) , ( "previousButton" , Code.recordMultiline [ ( "name", Code.string "Previous" ) @@ -487,8 +487,8 @@ viewCustomizableWithTabControls model = Carousel.viewWithTabControls { selected = model.selected , slides = List.map Tuple.second allItems - , tabControlStyles = \_ -> [] - , tabControlListStyles = [] + , tabStyles = \_ -> [] + , tabListStyles = [] , role = Carousel.Group , name = "Items" , visibleLabelId = Nothing @@ -506,8 +506,8 @@ viewCustomizableWithTabControls model = ++ Code.record [ ( "selected", Code.int model.selected ) , ( "slides", Code.listMultiline (List.map Tuple.first allItems) 2 ) - , ( "tabControlStyles", "(\\_ -> [])" ) - , ( "tabControlListStyles", Code.list [] ) + , ( "tabStyles", "(\\_ -> [])" ) + , ( "tabListStyles", Code.list [] ) , ( "role", Code.fromModule moduleName "Group" ) , ( "name", Code.string "Items" ) , ( "visibleLabelId", Code.maybe Nothing ) @@ -735,8 +735,8 @@ viewTestimonials selected = , tabControlHtml = span Style.invisible [ text "Testimonial 3" ] } ] - , tabControlStyles = tabControlStyles - , tabControlListStyles = tabControlListStyles + , tabStyles = tabStyles + , tabListStyles = tabListStyles , role = Carousel.Group , name = "Testimonials" , visibleLabelId = Nothing @@ -788,8 +788,8 @@ viewPackages selected = , tabControlHtml = span Style.invisible [ text "Enterprise tier" ] } ] - , tabControlStyles = tabControlStyles - , tabControlListStyles = tabControlListStyles + , tabStyles = tabStyles + , tabListStyles = tabListStyles , previousButton = { attributes = [ ClickableSvg.withBorder @@ -846,8 +846,8 @@ type Package | EnterpriseTier -tabControlStyles : Bool -> List Style -tabControlStyles isSelected = +tabStyles : Bool -> List Style +tabStyles isSelected = [ borderRadius (pct 100) , overflow hidden , padding zero @@ -870,8 +870,8 @@ tabControlStyles isSelected = ] -tabControlListStyles : List Style -tabControlListStyles = +tabListStyles : List Style +tabListStyles = [ displayFlex , property "gap" "15px" , justifyContent center diff --git a/src/Nri/Ui/Carousel/V2.elm b/src/Nri/Ui/Carousel/V2.elm index ae98ac9e..d6a86aee 100644 --- a/src/Nri/Ui/Carousel/V2.elm +++ b/src/Nri/Ui/Carousel/V2.elm @@ -150,8 +150,8 @@ viewWithTabControls : , slideHtml : Html msg , tabControlHtml : Html Never } - , tabControlStyles : Bool -> List Style - , tabControlListStyles : List Style + , tabStyles : Bool -> List Style + , tabListStyles : List Style , role : Role , name : String , visibleLabelId : Maybe String @@ -175,8 +175,8 @@ viewWithTabControls config = { focusAndSelect = config.focusAndSelect , selected = config.selected , tabs = List.map buildTab config.slides - , tabStyles = always config.tabControlStyles - , tabListStyles = config.tabControlListStyles + , tabStyles = always config.tabStyles + , tabListStyles = config.tabListStyles } in { tabs = tabList @@ -210,8 +210,8 @@ viewWithCombinedControls : , slideHtml : Html msg , tabControlHtml : Html Never } - , tabControlStyles : Bool -> List Style - , tabControlListStyles : List Style + , tabStyles : Bool -> List Style + , tabListStyles : List Style , previousButton : { name : String, icon : Svg, attributes : List (ClickableSvg.Attribute msg) } , nextButton : { name : String, icon : Svg, attributes : List (ClickableSvg.Attribute msg) } , role : Role @@ -257,8 +257,8 @@ viewWithCombinedControls config = } ) config.slides - , tabControlStyles = config.tabControlStyles - , tabControlListStyles = config.tabControlListStyles + , tabStyles = config.tabStyles + , tabListStyles = config.tabListStyles , role = config.role , name = config.name , visibleLabelId = config.visibleLabelId diff --git a/tests/Spec/Nri/Ui/Carousel.elm b/tests/Spec/Nri/Ui/Carousel.elm index 039b1b35..4bd039b3 100644 --- a/tests/Spec/Nri/Ui/Carousel.elm +++ b/tests/Spec/Nri/Ui/Carousel.elm @@ -273,8 +273,8 @@ viewWithTabControlsSpec = Carousel.viewWithTabControls { selected = model.selected , slides = List.take slideCount allSlides - , tabControlStyles = \_ -> [] - , tabControlListStyles = [] + , tabStyles = \_ -> [] + , tabListStyles = [] , role = Carousel.Group , name = "Slides" , visibleLabelId = @@ -433,8 +433,8 @@ viewWithCombinedControlsSpec = { selected = model.selected , slides = List.take slideCount allSlides , role = Carousel.Group - , tabControlStyles = \_ -> [] - , tabControlListStyles = [] + , tabStyles = \_ -> [] + , tabListStyles = [] , name = "Slides" , visibleLabelId = Nothing , previousButton = { attributes = [], icon = UiIcon.arrowLeft, name = "Previous" }