Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

🖍 [amp-story-player] Extract iframe css to different file #26613

Merged
merged 3 commits into from
Feb 4, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 7 additions & 0 deletions build-system/tasks/css.js
Original file line number Diff line number Diff line change
Expand Up @@ -55,10 +55,17 @@ const cssEntryPoints = [
outCss: 'video-autoplay-out.css',
},
{
// Publisher imported CSS for `src/amp-story-player.js`.
path: 'amp-story-player.css',
outJs: 'amp-story-player.css.js',
outCss: 'amp-story-player-v0.css',
},
{
// Internal CSS used for the iframes inside `src/amp-story-player.js`.
path: 'amp-story-player-iframe.css',
outJs: 'amp-story-player-iframe.css.js',
outCss: 'amp-story-player-iframe-v0.css',
gmajoulet marked this conversation as resolved.
Show resolved Hide resolved
},
];

/**
Expand Down
4 changes: 4 additions & 0 deletions css/OWNERS
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,9 @@
{name: 'camelburrito', requestReviews: false},
],
},
{
pattern: '{amp-story-*}.css',
owners: [{name: 'newmuis'}, {name: 'gmajoulet'}, {name: 'enriqe'}],
},
],
}
43 changes: 43 additions & 0 deletions css/amp-story-player-iframe.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
/**
* Copyright 2020 The AMP HTML Authors. All Rights Reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS-IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

:host {
all: initial;
display: block;
border-radius: 0 !important;
width: 360px;
height: 600px;
overflow: auto;
}

.story-player-iframe {
height: 100%;
width: 100%;
flex: 0 0 100%;
border: 0;
opacity: 0;
transition: opacity 500ms ease;
}

main {
display: flex;
flex-direction: row;
height: 100%;
}

.i-amphtml-story-player-loaded iframe {
opacity: 1;
}
4 changes: 4 additions & 0 deletions css/amp-story-player.css
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,10 @@ amp-story-player a:first-of-type {
display: block;
}

amp-story-player a:not(:first-of-type) {
visibility: hidden;
}

amp-story-player::after {
content: " ";
position: absolute;
Expand Down
11 changes: 3 additions & 8 deletions src/amp-story-player.js
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@ import {
removeFragment,
} from './url';
import {dict} from './utils/object';
// Source for this constant is css/amp-story-player-iframe.css
import {cssText} from '../build/amp-story-player-iframe.css';
import {findIndex} from './utils/array';
import {setStyle} from './style';
import {toArray} from './types';
Expand All @@ -34,13 +36,6 @@ const LoadStateClass = {
ERROR: 'i-amphtml-story-player-error',
};

/** @const {string} */
const CSS = `
:host { all: initial; display: block; border-radius: 0 !important; width: 360px; height: 600px; overflow: auto; }
.story-player-iframe { height: 100%; width: 100%; flex: 0 0 100%; border: 0; opacity: 0; transition: opacity 500ms ease; }
main { display: flex; flex-direction: row; height: 100%; }
.i-amphtml-story-player-loaded iframe { opacity: 1; }`;

/**
* Note that this is a vanilla JavaScript class and should not depend on AMP
* services, as v0.js is not expected to be loaded in this context.
Expand Down Expand Up @@ -112,7 +107,7 @@ export class AmpStoryPlayer {

// Inject default styles
const styleEl = this.doc_.createElement('style');
styleEl.textContent = CSS;
styleEl.textContent = cssText;
shadowRoot.appendChild(styleEl);
shadowRoot.appendChild(this.rootEl_);
}
Expand Down