diff --git a/packages/web-twig/DEPRECATIONS-v3.md b/packages/web-twig/DEPRECATIONS-v3.md index 681066f003..f96152a2d9 100644 --- a/packages/web-twig/DEPRECATIONS-v3.md +++ b/packages/web-twig/DEPRECATIONS-v3.md @@ -110,11 +110,6 @@ non-scrollable by default. It will be possible to re-enable the inside scrolling Add `isScrollable` prop to the `ModalDialog` component. -### Alert `danger` Icon - -The `warning` icon as a fallback for the `danger` color in the Alert component will be removed in favor of the `danger` icon. -Please, add the `danger` icon to your project's assets. - #### Migration Guide Either install newer version of the `spirit-icons` package or add `danger` named icon to your project's icons. diff --git a/packages/web-twig/src/Resources/components/Alert/Alert.twig b/packages/web-twig/src/Resources/components/Alert/Alert.twig index 7e88cc22b3..40455eecba 100644 --- a/packages/web-twig/src/Resources/components/Alert/Alert.twig +++ b/packages/web-twig/src/Resources/components/Alert/Alert.twig @@ -19,17 +19,10 @@ {% elseif _color == 'warning' %} {%- set _iconNameByColor = 'warning' -%} {% elseif _color == 'danger' %} - {# @TODO: set the value to the `danger` in https://jira.almacareer.tech/browse/DS-1177 #} - {%- set _iconNameByColor = 'warning' -%} + {%- set _iconNameByColor = 'danger' -%} {% endif %} {%- set _iconNameValue = _iconName | default(_iconNameByColor) -%} -{# Deprecations #} -{% if _color == 'danger' %} - {% deprecated 'Alert: The "warning" icon for the "danger" color is deprecated. Make sure you have the "danger" icon in your assets. - The fallback to the "warning" icon will be removed in favor of the "danger" icon in the next major version.' %} -{% endif %} - <{{ _elementType }} {{ mainProps(props) }} {{ styleProp(_styleProps) }} {{ classProp(_classNames) }} role="alert">
diff --git a/packages/web-twig/src/Resources/components/Alert/README.md b/packages/web-twig/src/Resources/components/Alert/README.md index 7fb66f32ab..c7ea391557 100644 --- a/packages/web-twig/src/Resources/components/Alert/README.md +++ b/packages/web-twig/src/Resources/components/Alert/README.md @@ -31,16 +31,12 @@ Without lexer: | Color name | Icon name | | ------------- | ------------- | -| `danger` | `warning`\* | +| `danger` | `danger` | | `default` | `info` | | `informative` | `info` | | `success` | `check-plain` | | `warning` | `warning` | -(\*) The `warning` icon for the `danger` color has been marked as [deprecated]. -Please make sure you have the `danger` icon in your project assets. -The `warning` icon for the `danger` color will be removed in favor of the `danger` icon in the next major version. - ## API | Name | Type | Default | Required | Description | diff --git a/packages/web-twig/src/Resources/components/Alert/__tests__/__snapshots__/alertDefault.twig.snap.html b/packages/web-twig/src/Resources/components/Alert/__tests__/__snapshots__/alertDefault.twig.snap.html index b9c2f9c8c9..0a9967ca02 100644 --- a/packages/web-twig/src/Resources/components/Alert/__tests__/__snapshots__/alertDefault.twig.snap.html +++ b/packages/web-twig/src/Resources/components/Alert/__tests__/__snapshots__/alertDefault.twig.snap.html @@ -15,8 +15,8 @@