Merge branch 'latest' into caption-paragraph-padding

BBC-archive · May 9, 2019 · 32e2754 · 32e2754
2 parents 2fe5313 + abe2cc4
commit 32e2754
Show file tree

Hide file tree

Showing 62 changed files with 713 additions and 145 deletions.
diff --git a/packages/components/psammead-caption/CHANGELOG.md b/packages/components/psammead-caption/CHANGELOG.md
@@ -3,7 +3,8 @@
 <!-- prettier-ignore -->
 | Version | Description |
 |---------|-------------|
-| 1.1.2 | [PR#491](https://github.com/bbc/psammead/pull/491) Remove bottom padding from paragraphs within Caption |
+| 1.1.3 | [PR#491](https://github.com/bbc/psammead/pull/491) Remove bottom padding from paragraphs within Caption |
+| 1.1.2 | [PR#498](https://github.com/bbc/psammead/pull/498) Update stories to use new input provider |
 | 1.1.1 | [PR#459](https://github.com/bbc/psammead/pull/459) Add custom propTypes shape |
 | 1.1.0 | [PR#446](https://github.com/bbc/psammead/pull/446) De-italicise text in italic tag |
 | 1.0.1 | [PR#424](https://github.com/bbc/psammead/pull/424) Add Snyk badge to readme |

diff --git a/packages/components/psammead-caption/package-lock.json b/packages/components/psammead-caption/package-lock.json
diff --git a/packages/components/psammead-caption/package.json b/packages/components/psammead-caption/package.json
@@ -22,9 +22,9 @@
   },
   "devDependencies": {
     "@bbc/psammead-paragraph": "^1.0.3",
-    "@bbc/psammead-storybook-helpers": "^1.0.0",
-    "@bbc/psammead-test-helpers": "^0.3.3",
     "@bbc/psammead-inline-link": "^0.3.4",
+    "@bbc/psammead-storybook-helpers": "^2.0.0",
+    "@bbc/psammead-test-helpers": "^0.3.3",
     "@bbc/psammead-visually-hidden-text": "^0.1.10",
     "react": "^16.6.3",
     "styled-components": "^4.1.3"

diff --git a/packages/components/psammead-caption/src/index.stories.jsx b/packages/components/psammead-caption/src/index.stories.jsx
@@ -5,25 +5,27 @@ import { inputProvider } from '@bbc/psammead-storybook-helpers';
 import InlineLink from '@bbc/psammead-inline-link';
 import Paragraph from '@bbc/psammead-paragraph';
 import VisuallyHiddenText from '@bbc/psammead-visually-hidden-text';
-import { latin } from '@bbc/gel-foundations/scripts';
 import notes from '../README.md';
 import Caption from '.';
 
 storiesOf('Caption', module)
   .addDecorator(withKnobs)
   .add(
     'default',
-    inputProvider(['caption'], captionText => (
-      <Caption script={latin}>{captionText}</Caption>
+    inputProvider([{ name: 'Caption' }], ([captionText], script) => (
+      <Caption script={script}>{captionText}</Caption>
     )),
     { notes, knobs: { escapeHTML: false } },
   )
   .add(
     'with offscreen text',
     inputProvider(
-      ['visually hidden text', 'caption'],
-      (hiddenText, captionText) => (
-        <Caption script={latin}>
+      [
+        { name: 'Visual hidden text', defaultText: 'visually hidden text' },
+        { name: 'Caption', defaultText: 'caption' },
+      ],
+      ([hiddenText, captionText], script) => (
+        <Caption script={script}>
           <VisuallyHiddenText>{hiddenText}</VisuallyHiddenText>
           {captionText}
         </Caption>
@@ -33,18 +35,24 @@ storiesOf('Caption', module)
   )
   .add(
     'containing an inline link',
-    inputProvider(['inline link', 'caption'], (linkText, captionText) => (
-      <Caption script={latin}>
-        {captionText}
-        <InlineLink href="https://www.bbc.com"> {linkText}</InlineLink>.
-      </Caption>
-    )),
+    inputProvider(
+      [
+        { name: 'Inline link', defaultText: 'inline link' },
+        { name: 'Caption', defaultText: 'caption' },
+      ],
+      ([linkText, captionText], script) => (
+        <Caption script={script}>
+          {captionText}
+          <InlineLink href="https://www.bbc.com"> {linkText}</InlineLink>.
+        </Caption>
+      ),
+    ),
     { notes, knobs: { escapeHTML: false } },
   )
   .add(
     'containing italicisation',
-    inputProvider([], () => (
-      <Caption script={latin}>
+    inputProvider([], (inputs, script) => (
+      <Caption script={script}>
         Example text with <i>italics</i>
       </Caption>
     )),

diff --git a/packages/components/psammead-figure/CHANGELOG.md b/packages/components/psammead-figure/CHANGELOG.md
@@ -3,7 +3,8 @@
 <!-- prettier-ignore -->
 | Version | Description |
 |---------|-------------|
-| 0.1.14  | [PR#491](https://github.com/bbc/psammead/pull/491) Updates Storybook to account for new styling on paragraph elements in captions |
+| 0.1.15  | [PR#491](https://github.com/bbc/psammead/pull/491) Updates Storybook to account for new styling on paragraph elements in captions |
+| 0.1.14  | [PR#498](https://github.com/bbc/psammead/pull/498) Update story to use new input provider |
 | 0.1.13  | [PR#430](https://github.com/bbc/psammead/pull/430) Add text knobs to story |
 | 0.1.12  | [PR#424](https://github.com/bbc/psammead/pull/424) Add Snyk badge to readme |
 | 0.1.11  | [PR#407](https://github.com/bbc/psammead/pull/407) Organise dependencies properly |

diff --git a/packages/components/psammead-figure/package-lock.json b/packages/components/psammead-figure/package-lock.json
diff --git a/packages/components/psammead-figure/package.json b/packages/components/psammead-figure/package.json
@@ -25,7 +25,7 @@
     "@bbc/psammead-image": "^0.3.3",
     "@bbc/psammead-image-placeholder": "^0.1.8",
     "@bbc/psammead-paragraph": "^1.0.3",
-    "@bbc/psammead-storybook-helpers": "^1.1.0",
+    "@bbc/psammead-storybook-helpers": "^2.0.0",
     "@bbc/psammead-test-helpers": "^0.3.3",
     "@bbc/psammead-visually-hidden-text": "^0.1.10",
     "react": "^16.6.3",

diff --git a/packages/components/psammead-figure/src/index.stories.jsx b/packages/components/psammead-figure/src/index.stories.jsx
@@ -31,7 +31,7 @@ storiesOf('Figure', module)
   )
   .add(
     'containing Image, ImagePlaceholder, Copyright and Caption',
-    inputProvider(['caption'], caption => (
+    inputProvider([{ name: 'Caption' }], ([caption]) => (
       <Figure>
         <ImagePlaceholder ratio={imageRatio}>
           <Image alt={imageAlt} src={imageSrc} width={imageWidth} />

diff --git a/packages/components/psammead-headings/CHANGELOG.md b/packages/components/psammead-headings/CHANGELOG.md
@@ -3,6 +3,7 @@
 <!-- prettier-ignore -->
 | Version | Description |
 |---------|-------------|
+| 1.1.3   | [PR#498](https://github.com/bbc/psammead/pull/498) Update stories to use new input provider |
 | 1.1.2   | [PR#428](https://github.com/bbc/psammead/pull/428) Add custom propTypes shape |
 | 1.1.1   | [PR#412](https://github.com/bbc/psammead/pull/412) Make SubHeading padding-bottom 24px instead of 16px |
 | 1.1.0   | [PR#424](https://github.com/bbc/psammead/pull/424) Add Snyk badge to readme |

diff --git a/packages/components/psammead-headings/package-lock.json b/packages/components/psammead-headings/package-lock.json