diff --git a/.changeset/neat-bobcats-clean.md b/.changeset/neat-bobcats-clean.md new file mode 100644 index 00000000000..3409993fd0b --- /dev/null +++ b/.changeset/neat-bobcats-clean.md @@ -0,0 +1,5 @@ +--- +'@shopify/polaris': patch +--- + +Add border to Banner on breakpoint-xs and change success icon to CheckCircleIcon diff --git a/polaris-react/src/components/Banner/Banner.module.css b/polaris-react/src/components/Banner/Banner.module.css index e30f8efbc62..05e1cf9eb9a 100644 --- a/polaris-react/src/components/Banner/Banner.module.css +++ b/polaris-react/src/components/Banner/Banner.module.css @@ -21,12 +21,18 @@ } .withinPage { - @mixin shadow-bevel var(--p-shadow-200), var(--p-border-radius-0); - @media (--p-breakpoints-sm-up) { @mixin shadow-bevel var(--p-shadow-200), var(--p-border-radius-300); } + @media (--p-breakpoints-xs-only) { + border-width: var(--p-border-width-025); + border-style: solid; + border-color: var(--p-color-border); + border-radius: var(--p-border-radius-300); + margin-inline: var(--p-space-300); + } + + .Banner { margin-top: var(--p-space-400); } diff --git a/polaris-react/src/components/Banner/Banner.tsx b/polaris-react/src/components/Banner/Banner.tsx index a46ab9e2b9c..7272969c023 100644 --- a/polaris-react/src/components/Banner/Banner.tsx +++ b/polaris-react/src/components/Banner/Banner.tsx @@ -23,7 +23,6 @@ import type {IconProps} from '../Icon'; import {BannerContext} from '../../utilities/banner-context'; import {WithinContentContext} from '../../utilities/within-content-context'; import {classNames} from '../../utilities/css'; -import {useBreakpoints} from '../../utilities/breakpoints'; import {useI18n} from '../../utilities/i18n'; import {useEventListener} from '../../utilities/use-event-listener'; import {BlockStack} from '../BlockStack'; @@ -81,6 +80,7 @@ export const Banner = forwardRef(function Banner( onMouseUp={handleMouseUp} onKeyUp={handleKeyUp} onBlur={handleBlur} + style={{overflow: 'hidden'}} > @@ -198,21 +198,12 @@ export function DefaultBanner({ dismissButton, children, }: PropsWithChildren) { - const {smUp} = useBreakpoints(); const hasContent = children || actionButtons; return ( - + ', () => { describe('icon', () => { it.each([ - ['success', CheckIcon], + ['success', CheckCircleIcon], ['info', InfoIcon], ['warning', AlertTriangleIcon], ['critical', AlertDiamondIcon], diff --git a/polaris-react/src/components/Banner/utilities.ts b/polaris-react/src/components/Banner/utilities.ts index 84d9936e1b0..9d30ecd1ae5 100644 --- a/polaris-react/src/components/Banner/utilities.ts +++ b/polaris-react/src/components/Banner/utilities.ts @@ -7,7 +7,7 @@ import { AlertDiamondIcon, InfoIcon, AlertTriangleIcon, - CheckIcon, + CheckCircleIcon, } from '@shopify/polaris-icons'; import {useImperativeHandle, useRef, useState} from 'react'; @@ -39,7 +39,7 @@ export const bannerAttributes: {[key in BannerTone]: BannerAttributes} = { text: 'text-success', icon: 'text-success', }, - icon: CheckIcon, + icon: CheckCircleIcon, }, warning: { withinPage: {