diff --git a/CHANGELOG.md b/CHANGELOG.md index ec183109fb..7bef76df2c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,7 @@ | Version | Description | |---------|-------------| +| 2.0.188 | [PR#3600](https://github.com/bbc/psammead/pull/3600) Bump version to include using new @bbc/psammead-image-placeholder | | 2.0.187 | [PR#3631](https://github.com/bbc/psammead/pull/3629) Update codeowners | | 2.0.186 | [PR#3626](https://github.com/bbc/psammead/pull/3626) 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-figure, @bbc/psammead-grid, @bbc/psammead-heading-index, @bbc/psammead-headings, @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-storybook-helpers, @bbc/psammead-timestamp, @bbc/psammead-timestamp-container, @bbc/psammead-useful-links | | 2.0.185 | [PR#3629](https://github.com/bbc/psammead/pull/3629) Talos - Bump Dependencies - @bbc/psammead-embed-error, @bbc/psammead-navigation | diff --git a/package-lock.json b/package-lock.json index 825f984a9e..0533ff7cd2 100644 --- a/package-lock.json +++ b/package-lock.json @@ -3807,12 +3807,12 @@ "dev": true }, "@bbc/psammead-image-placeholder": { - "version": "1.2.36", - "resolved": "https://registry.npmjs.org/@bbc/psammead-image-placeholder/-/psammead-image-placeholder-1.2.36.tgz", - "integrity": "sha512-j9yi9vmfxDS4NmNOXqznRX6Js6vVvwfk6HUbhUojB0l0zb4LSLBvXXACb4T50SVpGM8qgpINwTD3dk3If/CEAQ==", + "version": "1.2.41", + "resolved": "https://registry.npmjs.org/@bbc/psammead-image-placeholder/-/psammead-image-placeholder-1.2.41.tgz", + "integrity": "sha512-QKQHyyVouYe8DBjev6NRt/0TdDgstuN/xlva5HA+t2mtBgFvB5nDaa8oflsjCoXMoPBcleGkenu0NUHV9Nhliw==", "dev": true, "requires": { - "@bbc/psammead-assets": "^2.14.0", + "@bbc/psammead-assets": "^2.14.1", "@bbc/psammead-styles": "^4.4.0" } }, diff --git a/package.json b/package.json index 35c2712312..e0d8ebbe22 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@bbc/psammead", - "version": "2.0.187", + "version": "2.0.188", "description": "Core Components Library Developed & Maintained By The Articles and Reach & Languages Team", "main": "index.js", "private": true, @@ -68,7 +68,7 @@ "@bbc/psammead-heading-index": "^1.0.2", "@bbc/psammead-headings": "^3.1.33", "@bbc/psammead-image": "^1.2.4", - "@bbc/psammead-image-placeholder": "^1.2.36", + "@bbc/psammead-image-placeholder": "^1.2.41", "@bbc/psammead-inline-link": "^1.3.22", "@bbc/psammead-live-label": "^1.0.0", "@bbc/psammead-locales": "^4.1.10", diff --git a/packages/components/psammead-media-player/CHANGELOG.md b/packages/components/psammead-media-player/CHANGELOG.md index 1691967d18..e06f94da65 100644 --- a/packages/components/psammead-media-player/CHANGELOG.md +++ b/packages/components/psammead-media-player/CHANGELOG.md @@ -3,6 +3,7 @@ | Version | Description | | ------------- | ---------------------------------------------------------------------------------------------------------------------------- | +| 2.8.0 | [PR#3600](https://github.com/bbc/psammead/pull/3600) Implementing dark mode compatible placeholder with media player | | 2.7.16 | [PR#3626](https://github.com/bbc/psammead/pull/3626) Talos - Bump Dependencies - @bbc/psammead-play-button | | 2.7.15 | [PR#3613](https://github.com/bbc/psammead/pull/3613) Talos - Bump Dependencies - @bbc/psammead-assets | | 2.7.14 | [PR#3605](https://github.com/bbc/psammead/pull/3605) Talos - Bump Dependencies - @bbc/psammead-play-button | diff --git a/packages/components/psammead-media-player/package-lock.json b/packages/components/psammead-media-player/package-lock.json index 839b034f76..8363c5928c 100644 --- a/packages/components/psammead-media-player/package-lock.json +++ b/packages/components/psammead-media-player/package-lock.json @@ -1,6 +1,6 @@ { "name": "@bbc/psammead-media-player", - "version": "2.7.16", + "version": "2.8.0", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -19,6 +19,15 @@ "resolved": "https://registry.npmjs.org/@bbc/psammead-image/-/psammead-image-1.2.4.tgz", "integrity": "sha512-1v9jM7RCizOqtCbUpuyK/YXb0UfskaAMwr2mhu+P38C/PNrhj2yIxtK820bWd/zpuKccFntOG70L4KHVO0W8hw==" }, + "@bbc/psammead-image-placeholder": { + "version": "1.2.41", + "resolved": "https://registry.npmjs.org/@bbc/psammead-image-placeholder/-/psammead-image-placeholder-1.2.41.tgz", + "integrity": "sha512-QKQHyyVouYe8DBjev6NRt/0TdDgstuN/xlva5HA+t2mtBgFvB5nDaa8oflsjCoXMoPBcleGkenu0NUHV9Nhliw==", + "requires": { + "@bbc/psammead-assets": "^2.14.1", + "@bbc/psammead-styles": "^4.4.0" + } + }, "@bbc/psammead-play-button": { "version": "1.1.19", "resolved": "https://registry.npmjs.org/@bbc/psammead-play-button/-/psammead-play-button-1.1.19.tgz", diff --git a/packages/components/psammead-media-player/package.json b/packages/components/psammead-media-player/package.json index 1b62751829..a42891c4d9 100644 --- a/packages/components/psammead-media-player/package.json +++ b/packages/components/psammead-media-player/package.json @@ -1,6 +1,6 @@ { "name": "@bbc/psammead-media-player", - "version": "2.7.16", + "version": "2.8.0", "description": "Provides a media player with optional placeholder", "main": "dist/index.js", "module": "esm/index.js", @@ -29,6 +29,7 @@ "styled-components": "^4.3.2" }, "dependencies": { + "@bbc/psammead-image-placeholder": "^1.2.41", "@bbc/psammead-assets": "^2.14.1", "@bbc/psammead-image": "^1.2.4", "@bbc/psammead-play-button": "^1.1.19" diff --git a/packages/components/psammead-media-player/src/Canonical/__snapshots__/index.test.jsx.snap b/packages/components/psammead-media-player/src/Canonical/__snapshots__/index.test.jsx.snap index c7cc87d329..c2303e8b57 100644 --- a/packages/components/psammead-media-player/src/Canonical/__snapshots__/index.test.jsx.snap +++ b/packages/components/psammead-media-player/src/Canonical/__snapshots__/index.test.jsx.snap @@ -2,6 +2,7 @@ exports[`Media Player: Canonical should render an iframe 1`] = ` .c0 { + z-index: 1; border: 0; left: 0; overflow: hidden; diff --git a/packages/components/psammead-media-player/src/Canonical/index.jsx b/packages/components/psammead-media-player/src/Canonical/index.jsx index 3007500977..7aa39581e2 100644 --- a/packages/components/psammead-media-player/src/Canonical/index.jsx +++ b/packages/components/psammead-media-player/src/Canonical/index.jsx @@ -1,6 +1,7 @@ import React from 'react'; import { string, bool } from 'prop-types'; import styled from 'styled-components'; +import ImagePlaceholder from '@bbc/psammead-image-placeholder'; import Message from '../Message'; const Canonical = ({ @@ -11,6 +12,8 @@ const Canonical = ({ service, noJsMessage, showPlaceholder, + showLoadingImage, + darkMode, }) => { const backgroundStyle = ` background-image: url(${placeholderSrc}); @@ -18,7 +21,16 @@ const Canonical = ({ background-size: contain; `; + const LoadingImageWrapper = styled.div` + position: absolute; + left: 0; + top: 0; + width: 100%; + height: 100%; + `; + const StyledIframe = styled.iframe` + z-index: 1; border: 0; left: 0; overflow: hidden; @@ -39,6 +51,11 @@ const Canonical = ({ gesture="media" allowFullScreen /> + {showLoadingImage && ( + + + + )}