From 3e5bc5e8d900958d16ad16c15df4b5d5285e40cb Mon Sep 17 00:00:00 2001 From: Dario Russo Date: Mon, 1 Nov 2021 11:37:42 +0000 Subject: [PATCH 1/4] fix comma bug in psammead-brand --- packages/components/psammead-brand/src/index.jsx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/components/psammead-brand/src/index.jsx b/packages/components/psammead-brand/src/index.jsx index dcd57bc293..01b3088f44 100644 --- a/packages/components/psammead-brand/src/index.jsx +++ b/packages/components/psammead-brand/src/index.jsx @@ -126,7 +126,8 @@ const LocalisedBrandName = ({ product, serviceLocalisedName }) => serviceLocalisedName ? ( // eslint-disable-next-line jsx-a11y/aria-role - {product}, {serviceLocalisedName} + {$`{product}, `} + {serviceLocalisedName} ) : ( {product} From d7c15e1ca7efcf63625e655fa5efcfe3d3d3e8cd Mon Sep 17 00:00:00 2001 From: Dario Russo Date: Mon, 1 Nov 2021 11:57:59 +0000 Subject: [PATCH 2/4] resolve syntax error --- packages/components/psammead-brand/src/index.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/components/psammead-brand/src/index.jsx b/packages/components/psammead-brand/src/index.jsx index 01b3088f44..8d75b72b09 100644 --- a/packages/components/psammead-brand/src/index.jsx +++ b/packages/components/psammead-brand/src/index.jsx @@ -126,7 +126,7 @@ const LocalisedBrandName = ({ product, serviceLocalisedName }) => serviceLocalisedName ? ( // eslint-disable-next-line jsx-a11y/aria-role - {$`{product}, `} + {`${product}, `} {serviceLocalisedName} ) : ( From e88befaf16b98b52b52c9a81799b2f108f64afd6 Mon Sep 17 00:00:00 2001 From: Dario Russo Date: Mon, 1 Nov 2021 12:00:48 +0000 Subject: [PATCH 3/4] snapshot updates --- .../src/__snapshots__/index.test.jsx.snap | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/packages/components/psammead-brand/src/__snapshots__/index.test.jsx.snap b/packages/components/psammead-brand/src/__snapshots__/index.test.jsx.snap index 8397c7f996..d94f395a91 100644 --- a/packages/components/psammead-brand/src/__snapshots__/index.test.jsx.snap +++ b/packages/components/psammead-brand/src/__snapshots__/index.test.jsx.snap @@ -127,10 +127,11 @@ exports[`Brand should render correctly with link not provided 1`] = ` - Default Brand Name + Default Brand Name, + + + Service - , - Service @@ -285,10 +286,11 @@ exports[`Brand should render correctly with link provided 1`] = ` - Default Brand Name + Default Brand Name, + + + Service - , - Service From 4d9ee7290c4de7886846f2dca7d259c663ce0f7b Mon Sep 17 00:00:00 2001 From: Dario Russo Date: Mon, 1 Nov 2021 12:03:42 +0000 Subject: [PATCH 4/4] changelog PR --- packages/components/psammead-brand/CHANGELOG.md | 1 + packages/components/psammead-brand/package.json | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/components/psammead-brand/CHANGELOG.md b/packages/components/psammead-brand/CHANGELOG.md index fd3ee53248..7295d621df 100644 --- a/packages/components/psammead-brand/CHANGELOG.md +++ b/packages/components/psammead-brand/CHANGELOG.md @@ -3,6 +3,7 @@ | Version | Description | | ------- | ----------- | +| 7.3.13 | [PR#4589](https://github.com/bbc/psammead/pull/4589) Fix comma bug in TalkBack | | 7.3.12 | [PR#4574](https://github.com/bbc/psammead/pull/4574) Bumps psammead-styles | | 7.3.11 | [PR#4568](https://github.com/bbc/psammead/pull/4568) Bump dependencies | | 7.3.10 | [PR#4565](https://github.com/bbc/psammead/pull/4565) Bump from psammead-styles | diff --git a/packages/components/psammead-brand/package.json b/packages/components/psammead-brand/package.json index 458e82fb1b..a8928e7138 100644 --- a/packages/components/psammead-brand/package.json +++ b/packages/components/psammead-brand/package.json @@ -1,6 +1,6 @@ { "name": "@bbc/psammead-brand", - "version": "7.3.12", + "version": "7.3.13", "main": "dist/index.js", "module": "esm/index.js", "sideEffects": false,