Skip to content
This repository has been archived by the owner on Aug 13, 2023. It is now read-only.

Conditionally apply z-index change to psammead-media-player based on whether the loadingImage is being used #3640

Merged
merged 4 commits into from
Jul 30, 2020
Merged

Conditionally apply z-index change to psammead-media-player based on whether the loadingImage is being used #3640

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9fb4551
Make application of z-index style dependent on whether the component …
RichardPK Jul 30, 2020
0997993
Only apply z-index style when showLoadingImage prop is present
RichardPK Jul 30, 2020
5f40cba
Update snapshots
RichardPK Jul 30, 2020
5cf2229
Version bump
RichardPK Jul 30, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions packages/components/psammead-media-player/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
<!-- prettier-ignore -->
| Version | Description |
| ------------- | ---------------------------------------------------------------------------------------------------------------------------- |
| 2.8.1 | [PR#3600](https://github.com/bbc/psammead/pull/3600) Make z-index styling be conditional based on whether loadingImage is used |
| 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 |
Expand Down
2 changes: 1 addition & 1 deletion packages/components/psammead-media-player/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion packages/components/psammead-media-player/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@bbc/psammead-media-player",
"version": "2.8.0",
"version": "2.8.1",
"description": "Provides a media player with optional placeholder",
"main": "dist/index.js",
"module": "esm/index.js",
Expand Down
1 change: 0 additions & 1 deletion packages/components/psammead-media-player/src/Canonical/__snapshots__/index.test.jsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

exports[`Media Player: Canonical should render an iframe 1`] = `
.c0 {
z-index: 1;
border: 0;
left: 0;
overflow: hidden;
Expand Down
2 changes: 1 addition & 1 deletion packages/components/psammead-media-player/src/Canonical/index.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ const Canonical = ({
`;

const StyledIframe = styled.iframe`
z-index: 1;
${showLoadingImage ? `z-index: 1` : ''};
border: 0;
left: 0;
overflow: hidden;
Expand Down
2 changes: 0 additions & 2 deletions packages/components/psammead-media-player/src/__snapshots__/index.test.jsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -733,7 +733,6 @@ exports[`Media Player: Canonical Entry renders an iframe when showPlaceholder is
}

.c1 {
z-index: 1;
border: 0;
left: 0;
overflow: hidden;
Expand Down Expand Up @@ -772,7 +771,6 @@ exports[`Media Player: Canonical Entry renders the audio skin 1`] = `
}

.c1 {
z-index: 1;
border: 0;
left: 0;
overflow: hidden;
Expand Down
2 changes: 1 addition & 1 deletion packages/components/psammead-media-player/src/index.stories.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ storiesOf('Components|Media Player', module)
type: 'video',
...withDuration,
}}
showLoadingImage
showLoadingImage={boolean('Show loading image', true)}
darkMode={boolean('Dark mode', false)}
title="Media player"
noJsMessage="Dem no support media player for your device"
Expand Down