merge conflicts

CHANGELOG.md

@@ -4,6 +4,7 @@
 <!-- prettier-ignore -->
 | Version | Description |
 |---------|-------------|
+| 1.1.3   | [PR#423](https://github.com/BBC/psammead/pull/423) Update Storybook to version 5.0.6 |
 | 1.1.2   | [PR#407](https://github.com/BBC/psammead/pull/407) Change styled-component version to be consistent everywhere and use peer dependencies |
 | 1.1.1   | [PR#403](https://github.com/BBC/psammead/pull/402) Update to use REITH_SANS_BOLD_ITALIC instead of REITH_SERIF_LIGHT in storybook |
 | 1.1.0   | [PR#336](https://github.com/BBC/psammead/pull/336) Add RTL Storybook add-on for testing |

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bbc/psammead",
-  "version": "1.1.2",
+  "version": "1.1.3",
   "description": "Core Components Library Developed & Maintained By The Articles and Reach & Languages Team",
   "main": "index.js",
   "scripts": {
@@ -34,7 +34,7 @@
   "homepage": "https://github.com/bbc/psammead#readme",
   "dependencies": {
     "@bbc/psammead-styles": "^0.3.0",
-    "@storybook/theming": "^5.0.1",
+    "@storybook/theming": "^5.0.6",
     "styled-components": "^4.1.3",
     "styled-normalize": "^8.0.4"
   },
@@ -44,11 +44,11 @@
     "@babel/preset-env": "^7.2.0",
     "@babel/preset-react": "^7.0.0",
     "@bbc/psammead-assets": "^0.1.3",
-    "@storybook/addon-actions": "^5.0.1",
-    "@storybook/addon-knobs": "^5.0.1",
-    "@storybook/addon-notes": "^5.0.1",
-    "@storybook/addon-viewport": "^5.0.1",
-    "@storybook/react": "^5.0.1",
+    "@storybook/addon-actions": "^5.0.6",
+    "@storybook/addon-knobs": "^5.0.6",
+    "@storybook/addon-notes": "^5.0.6",
+    "@storybook/addon-viewport": "^5.0.6",
+    "@storybook/react": "^5.0.6",
     "babel-core": "^7.0.0-bridge.0",
     "babel-eslint": "^8.2.6",
     "babel-loader": "^8.0.4",
@@ -78,7 +78,7 @@
     "semver": "^5.6.0",
     "shelljs": "^0.8.3",
     "storybook-addon-rtl": "^0.2.2",
-    "storybook-readme": "^4.0.0-beta1",
+    "storybook-readme": "^5.0.1",
     "strip-ansi": "^5.0.0",
     "stylelint": "^9.8.0",
     "stylelint-config-recommended": "^2.1.0",

packages/components/psammead-copyright/CHANGELOG.md

@@ -3,6 +3,7 @@
 <!-- prettier-ignore -->
 | Version | Description |
 |---------|-------------|
+| 0.3.6   | [PR#417](https://github.com/bbc/psammead/pull/417) Add text input knob to Copyright |
 | 0.3.5   | [PR#407](https://github.com/bbc/psammead/pull/407) Organise dependencies properly |
 | 0.3.4   | [PR#398](https://github.com/bbc/psammead/pull/398) Update dependencies |
 | 0.3.3   | [PR#329](https://github.com/BBC/psammead/pull/329) Adding Visually Hidden Text to copyright component story. |

packages/components/psammead-copyright/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bbc/psammead-copyright",
-  "version": "0.3.5",
+  "version": "0.3.6",
   "main": "dist/index.js",
   "description": "React styled component for overlaid copyright or source attribution.",
   "repository": {

packages/components/psammead-copyright/src/index.stories.jsx

@@ -1,18 +1,26 @@
 import React from 'react';
 import { storiesOf } from '@storybook/react';
+import { withKnobs, text } from '@storybook/addon-knobs';
 import VisuallyHiddenText from '@bbc/psammead-visually-hidden-text';
 import notes from '../README.md';
 import Copyright from './index';
 
 storiesOf('Copyright', module)
-  .add('default', () => <Copyright>Getty Images</Copyright>, { notes })
+  .addDecorator(withKnobs)
+  .add(
+    'default',
+    () => <Copyright>{text('copyright', 'Getty Images')}</Copyright>,
+    { notes, knobs: { escapeHTML: false } },
+  )
   .add(
     'with visually hidden text',
     () => (
       <Copyright>
-        <VisuallyHiddenText>Image source, </VisuallyHiddenText>
-        Getty Images
+        <VisuallyHiddenText>
+          {text('visually hidden text', 'Image source, ')}
+        </VisuallyHiddenText>
+        {text('copyright', 'Getty Images')}
       </Copyright>
     ),
-    { notes },
+    { notes, knobs: { escapeHTML: false } },
   );

packages/components/psammead-headings/CHANGELOG.md

@@ -3,7 +3,8 @@
 <!-- prettier-ignore -->
 | Version | Description |
 |---------|-------------|
-| 0.4.4   | [PR#412](https://github.com/bbc/psammead/pull/412) Make SubHeading padding-bottom 24px instead of 16px |
+| 1.0.1   | [PR#412](https://github.com/bbc/psammead/pull/412) Make SubHeading padding-bottom 24px instead of 16px |
+| 1.0.0   | [PR#421](https://github.com/bbc/psammead/pull/421) Add support for different scripts typographies |
 | 0.4.3   | [PR#418](https://github.com/bbc/psammead/pull/418) Add language variants knob to Headings |
 | 0.4.2   | [PR#407](https://github.com/bbc/psammead/pull/407) Organise dependencies properly |
 | 0.4.1   | [PR#381](https://github.com/bbc/psammead/pull/381) Make SubHeading padding-top 32px when viewport 400px and above |

packages/components/psammead-headings/README.md

@@ -12,17 +12,18 @@ The Headings are a set of two components, `Headline` and `SubHeading`. They use
 
 | Argument  | Type | Required | Default | Example |
 | --------- | ---- | -------- | ------- | ------- |
-| No props. |      |          |         |         |
+| Script    | object | yes | latin | { canon: { groupA: { fontSize: '28', lineHeight: '32',}, groupB: { fontSize: '32', lineHeight: '36', }, groupD: { fontSize: '44', lineHeight: '48', }, }, trafalgar: { groupA: { fontSize: '20', lineHeight: '24', }, groupB: { fontSize: '24', lineHeight: '28', }, groupD: { fontSize: '32', lineHeight: '36', }, }, }|
 
 ## Usage
 
 ```jsx
 import { Headline, SubHeading } from '@bbc/psammead-headings';
+import { latin } from '@bbc/gel-foundations/scripts';
 
 const Wrapper = () => (
   <Fragment>
-    <Heading>Some headline</Heading>
-    <SubHeading>Some subheadline</SubHeading>
+    <Heading script={latin}>Some headline</Heading>
+    <SubHeading script={latin}>Some subheadline</SubHeading>
   </Fragment>
 );
 ```

packages/components/psammead-headings/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bbc/psammead-headings",
-  "version": "0.4.4",
+  "version": "1.0.1",
   "main": "dist/index.js",
   "description": "React styled components for a Headline and SubHeading",
   "repository": {
@@ -17,7 +17,7 @@
   },
   "homepage": "https://github.com/bbc/psammead/blob/latest/packages/components/psammead-headings/README.md",
   "dependencies": {
-    "@bbc/gel-foundations": "^0.3.0",
+    "@bbc/gel-foundations": "^1.0.0",
     "@bbc/psammead-styles": "^0.3.2"
   },
   "devDependencies": {