Merge branch 'latest' into Talos/202117145326

CHANGELOG.md

@@ -3,7 +3,8 @@
 <!-- prettier-ignore -->
 | Version | Description |
 |---------|-------------|
-| 4.0.58 | [PR#4202](https://github.com/bbc/psammead/pull/4202) Talos - Bump Dependencies - @bbc/psammead-radio-schedule |
+| 4.0.59 | [PR#4202](https://github.com/bbc/psammead/pull/4202) Talos - Bump Dependencies - @bbc/psammead-radio-schedule |
+| 4.0.58 | [PR#4211](https://github.com/bbc/psammead/pull/4211) Talos - Bump Dependencies - @bbc/psammead-storybook-helpers |
 | 4.0.57 | [PR#4198](https://github.com/bbc/psammead/pull/4198) Talos - Bump Dependencies - @bbc/psammead-brand, @bbc/psammead-bulletin, @bbc/psammead-episode-list, @bbc/psammead-media-player, @bbc/psammead-most-read, @bbc/psammead-radio-schedule, @bbc/psammead-timestamp-container |
 | 4.0.56 | [PR#4199](https://github.com/bbc/psammead/pull/4199) Talos - Bump Dependencies - @bbc/psammead-storybook-helpers |
 | 4.0.55 | [PR#4197](https://github.com/bbc/psammead/pull/4197) Talos - Bump Dependencies - @bbc/psammead-brand, @bbc/psammead-bulleted-list, @bbc/psammead-bulletin, @bbc/psammead-byline, @bbc/psammead-caption, @bbc/psammead-consent-banner, @bbc/psammead-copyright, @bbc/psammead-embed-error, @bbc/psammead-episode-list, @bbc/psammead-grid, @bbc/psammead-heading-index, @bbc/psammead-headings, @bbc/psammead-image-placeholder, @bbc/psammead-inline-link, @bbc/psammead-live-label, @bbc/psammead-media-player, @bbc/psammead-media-indicator, @bbc/psammead-most-read, @bbc/psammead-navigation, @bbc/psammead-paragraph, @bbc/psammead-play-button, @bbc/psammead-radio-schedule, @bbc/psammead-script-link, @bbc/psammead-section-label, @bbc/psammead-sitewide-links, @bbc/psammead-social-embed, @bbc/psammead-story-promo, @bbc/psammead-story-promo-list, @bbc/psammead-timestamp, @bbc/psammead-useful-links |

package.json

@@ -96,7 +96,7 @@
     "@bbc/psammead-social-embed": "^3.1.3",
     "@bbc/psammead-story-promo": "^8.0.8",
     "@bbc/psammead-story-promo-list": "^6.0.6",
-    "@bbc/psammead-storybook-helpers": "^9.0.6",
+    "@bbc/psammead-storybook-helpers": "^9.0.7",
     "@bbc/psammead-styles": "^7.0.2",
     "@bbc/psammead-test-helpers": "^5.0.1",
     "@bbc/psammead-timestamp": "^4.0.7",

packages/utilities/psammead-storybook-helpers/CHANGELOG.md

@@ -3,6 +3,7 @@
 <!-- prettier-ignore -->
 | Version | Description |
 |---------|-------------|
+| 9.0.7 | [PR#4203](https://github.com/bbc/psammead/pull/4203) Adds another brand colour to service knob and export the colours |
 | 9.0.6 | [PR#4190](https://github.com/bbc/psammead/pull/4190) Add brand colours and services in text-variants |
 | 9.0.5 | [PR#4191](https://github.com/bbc/psammead/pull/4191) remove use of deprecated waitForDomChange |
 | 9.0.4 | [PR#4052](https://github.com/bbc/psammead/pull/4052) Talos - Bump Dependencies - @bbc/gel-foundations |

packages/utilities/psammead-storybook-helpers/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bbc/psammead-storybook-helpers",
-  "version": "9.0.6",
+  "version": "9.0.7",
   "main": "dist/index.js",
   "module": "esm/index.js",
   "sideEffects": false,

packages/utilities/psammead-storybook-helpers/src/withServicesKnob.jsx

@@ -35,6 +35,10 @@ export default ({
     locale,
     dir = 'ltr',
     timezone = 'GMT',
+    brandBackgroundColour,
+    brandForegroundColour,
+    brandBorderColour,
+    brandHighlightColour,
   } = TEXT_VARIANTS[selectedService];
 
   const storyProps = {
@@ -48,6 +52,10 @@ export default ({
     variant: variant || 'default',
     selectedService,
     timezone,
+    brandBackgroundColour,
+    brandForegroundColour,
+    brandBorderColour,
+    brandHighlightColour,
   };
 
   return (

packages/utilities/psammead-storybook-helpers/src/withServicesKnob.test.jsx

@@ -65,6 +65,10 @@ it('should pass the correct props to the story function', () => {
     script: latin,
     service: 'news',
     articlePath: '/news/articles/cn7k01xp8kxo',
+    brandBackgroundColour: '#B80000',
+    brandBorderColour: '#EAB3B3',
+    brandForegroundColour: '#FDFDFD',
+    brandHighlightColour: '#FFFFFF',
     text: 'Could a computer ever create better art than a human?',
     longText:
       'The critic, author, poet and TV host was known for his witty commentary on international television.',
@@ -88,6 +92,10 @@ it('should pass the correct chosen service props to the story function', () => {
     script: arabic,
     service: 'arabic',
     articlePath: '/arabic/articles/c1er5mjnznzo',
+    brandBackgroundColour: '#B80000',
+    brandBorderColour: '#EAB3B3',
+    brandForegroundColour: '#FDFDFD',
+    brandHighlightColour: '#FFFFFF',
     text: 'لماذا يخجل البعض من اسم قريته في مصر؟',
     longText:
       'هناك وقائع عدة تتسم بالسخرية والجدل والتنمر، ضد أهل القرية الذين أصابهم الغضب والسخط مما دفعهم إلى تقديم طلب لتغيير اسم قريتهم.',
@@ -111,6 +119,10 @@ it('should pass the correct chosen service props to the story function', () => {
     script: chinese,
     service: 'ukchina',
     articlePath: '/ukchina/articles/c0e8weny66ko/simp',
+    brandBackgroundColour: '#B80000',
+    brandBorderColour: '#EAB3B3',
+    brandForegroundColour: '#FDFDFD',
+    brandHighlightColour: '#FFFFFF',
     text: '该计划的批评者说，这个政策不能解决住房短缺的问题',
     longText:
       '但在当今世界，尽管许多人已不再把步行作为一种主要的出行方式，但巴黎仍然是属于孤僻、哲学式观察者的理想城市。毕竟，法国人习惯于花时间以文学和哲学的方式观察和思考周围的环境',