Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix(web-twig): Do not render class in the style attribute of the GridItem #1166

Merged
merged 2 commits into from
Nov 30, 2023
Merged

Fix(web-twig): Do not render class in the style attribute of the GridItem #1166

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b5fe9c6
Fix(web-twig): Do not render class in the `style` attribute of the `G…
dlouhak Nov 27, 2023
5ba282a
Fix(web-twig): Do not render class in the style attribute of the `Mod…
crishpeen Nov 28, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/web-twig/src/Resources/components/Grid/GridItem.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
{%- endfor -%}

{# Attributes #}
{%- set _styleAttr = _style or (_styleProps.style is not same as(null)) ? 'style="' ~ _style ~ _styleProps | join() ~ '"' -%}
{%- set _styleAttr = _style or (_styleProps.style is not same as(null)) ? 'style="' ~ _style ~ _styleProps.style | join() ~ '"' -%}

<{{ _elementType }}
{{ mainProps(props) }}
Expand Down
2 changes: 1 addition & 1 deletion packages/web-twig/src/Resources/components/Grid/__tests__/__fixtures__/gridItemDefault.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<Grid>
<GridItem columnStart="1" columnEnd="10">
<GridItem columnStart="1" columnEnd="10" UNSAFE_className="d-tablet-none">
1–10
</GridItem>
<GridItem columnStart="1" columnEnd="span 2">
Expand Down
2 changes: 1 addition & 1 deletion ...twig/src/Resources/components/Grid/__tests__/__snapshots__/gridItemDefault.twig.snap.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
</head>
<body>
<div class="Grid">
<div class="GridItem" style="--grid-item-column-start: 1;--grid-item-column-end: 10;">
<div class="GridItem d-tablet-none" style="--grid-item-column-start: 1;--grid-item-column-end: 10;">
1&acirc;&#128;&#147;10
</div>

Expand Down
2 changes: 1 addition & 1 deletion packages/web-twig/src/Resources/components/Modal/ModalDialog.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
{%- endif -%}

{# Attributes #}
{%- set _styleAttr = _style or (_styleProps.style is not same as(null)) ? 'style="' ~ _style ~ _styleProps | join() ~ '"' -%}
{%- set _styleAttr = _style or (_styleProps.style is not same as(null)) ? 'style="' ~ _style ~ _styleProps.style | join() ~ '"' -%}
crishpeen marked this conversation as resolved.
Show resolved Hide resolved

<{{ _elementType }}
{{ mainProps(props, _allowedAttributes) }}
Expand Down
1 change: 1 addition & 0 deletions packages/web-twig/src/Resources/components/Modal/__tests__/__fixtures__/modalDefault.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@
method="dialog"
preferredHeightOnMobile="400px"
preferredHeightFromTabletUp="500px"
UNSAFE_className="custom-class"
UNSAFE_style="outline: 5px solid blue; outline-offset: -5px;"
>
<ModalHeader
Expand Down
2 changes: 1 addition & 1 deletion ...b-twig/src/Resources/components/Modal/__tests__/__snapshots__/modalDefault.twig.snap.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ <h2 class="ModalHeader__title" id="modal-example-title">
<!-- Render with all props -->

<dialog class="Modal" id="modal-example-2" aria-labelledby="modal-example-2-title">
<form autocomplete="on" method="dialog" class="ModalDialog" style="--modal-max-height-tablet: 700px;--modal-preferred-height-mobile: 400px;--modal-preferred-height-tablet: 500px;outline: 5px solid blue; outline-offset: -5px;">
<form autocomplete="on" method="dialog" class="ModalDialog custom-class" style="--modal-max-height-tablet: 700px;--modal-preferred-height-mobile: 400px;--modal-preferred-height-tablet: 500px;outline: 5px solid blue; outline-offset: -5px;">
<header class="ModalHeader">
<h2 class="ModalHeader__title" id="modal-example-2-title">
Title of the Modal
Expand Down