Merge branch 'latest' into add-figure

BBC-archive · Dec 19, 2018 · e8b9e61 · e8b9e61
2 parents b906d57 + f6b23dc
commit e8b9e61
Show file tree

Hide file tree

Showing 8 changed files with 22 additions and 13 deletions.
diff --git a/packages/components/psammead-image-placeholder/CHANGELOG.md b/packages/components/psammead-image-placeholder/CHANGELOG.md
@@ -2,5 +2,6 @@
 
 | Version | Description |
 |---------|-------------|
+| 0.1.2 | [PR#230](https://github.com/BBC-News/psammead/pull/230) Add README to Storybook |
 | 0.1.1   | [PR#228](https://github.com/BBC-News/psammead/pull/228) Ensure package-lock is https. |
 | 0.1.0   | [PR#213](https://github.com/BBC-News/psammead/pull/213) Create initial package, pulled in from [simorgh](https://github.com/BBC-News/simorgh). |
diff --git a/packages/components/psammead-image-placeholder/package-lock.json b/packages/components/psammead-image-placeholder/package-lock.json
diff --git a/packages/components/psammead-image-placeholder/package.json b/packages/components/psammead-image-placeholder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@bbc/psammead-image-placeholder",
-  "version": "0.1.1",
+  "version": "0.1.2",
   "main": "dist/index.js",
   "description": "Provides a 'BBC' image placeholder",
   "repository": {

diff --git a/packages/components/psammead-image-placeholder/src/index.stories.jsx b/packages/components/psammead-image-placeholder/src/index.stories.jsx
@@ -1,12 +1,15 @@
 import React from 'react';
-import { storiesOf } from '@storybook/react'; // eslint-disable-line import/no-extraneous-dependencies
+import { storiesOf } from '@storybook/react';
+import { withReadme } from 'storybook-readme';
+import Readme from '../README.md';
 import ImagePlaceholder from '.';
 
 const landscapeImageRatio = 56.25;
 const squareImageRatio = 100;
 const portraitImageRatio = 177.78;
 
 storiesOf('ImagePlaceholder', module)
+  .addDecorator(withReadme(Readme))
   .add('16x9 image placeholder', () => (
     <ImagePlaceholder ratio={landscapeImageRatio} />
   ))

diff --git a/packages/components/psammead-image/CHANGELOG.md b/packages/components/psammead-image/CHANGELOG.md
@@ -2,4 +2,5 @@
 
 | Version | Description |
 |---------|-------------|
+| 0.1.1 | [PR#230](https://github.com/BBC-News/psammead/pull/230) Add README to Storybook |
 | 0.1.0 | [PR#225](https://github.com/BBC-News/psammead/pull/225) Create initial package, pulled in from [Simorgh](https://github.com/BBC-News/simorgh). |
diff --git a/packages/components/psammead-image/package-lock.json b/packages/components/psammead-image/package-lock.json
diff --git a/packages/components/psammead-image/package.json b/packages/components/psammead-image/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@bbc/psammead-image",
-  "version": "0.1.0",
+  "version": "0.1.1",
   "main": "dist/index.js",
   "description": "React styled components for an Image",
   "repository": {

diff --git a/packages/components/psammead-image/src/index.stories.jsx b/packages/components/psammead-image/src/index.stories.jsx
@@ -1,5 +1,7 @@
 import React from 'react';
 import { storiesOf } from '@storybook/react';
+import { withReadme } from 'storybook-readme';
+import Readme from '../README.md';
 import Image from './index';
 
 const imageAlt =
@@ -9,11 +11,13 @@ const imageSrc =
 const imageWidth = 853;
 const imageHeight = 1067;
 
-storiesOf('Image', module).add('default', () => (
-  <Image
-    alt={imageAlt}
-    src={imageSrc}
-    width={imageWidth}
-    height={imageHeight}
-  />
-));
+storiesOf('Image', module)
+  .addDecorator(withReadme(Readme))
+  .add('default', () => (
+    <Image
+      alt={imageAlt}
+      src={imageSrc}
+      width={imageWidth}
+      height={imageHeight}
+    />
+  ));