Skip to content

Allow for disabling the preview screenshot #2982

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.

Sign up for GitHub

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

Merged
merged 1 commit into from
Nov 5, 2019
Merged

Allow for disabling the preview screenshot #2982

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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/app/src/embed/components/Content/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -454,6 +454,7 @@ export default class Content extends React.PureComponent<Props, State> {
onToggleProjectView={this.onToggleProjectView}
onResize={this.handleResize}
dragging={this.state.dragging}
showScreenshotOverlay
/>
),
actions: [],
Expand Down
26 changes: 15 additions & 11 deletions packages/common/src/components/Preview/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,11 @@ export type Props = {
delay?: number;
className?: string;
overlayMessage?: string;
/**
* Whether to show a screenshot in the preview as a "placeholder" while loading
* to reduce perceived loading time
*/
showScreenshotOverlay?: boolean;
};

type State = {
Expand Down Expand Up @@ -90,7 +95,7 @@ class BasePreview extends React.Component<Props, State> {
url: initialUrl,
forward: false,
back: false,
showScreenshot: true,
showScreenshot: props.showScreenshotOverlay,
useFallbackDomain: false,
};

Expand All @@ -104,7 +109,14 @@ class BasePreview extends React.Component<Props, State> {
// Remove screenshot after specific time, so the loading container spinner can still show
this.setState({ showScreenshot: false });
}, 100);
} else {
setTimeout(() => {
if (this.state.showScreenshot) {
this.setState({ showScreenshot: false });
}
}, 800);
}

this.listener = listen(this.handleMessage);

if (props.delay) {
Expand All @@ -114,12 +126,6 @@ class BasePreview extends React.Component<Props, State> {
(window as any).openNewWindow = this.openNewWindow;

this.testFallbackDomainIfNeeded();

setTimeout(() => {
if (this.state.showScreenshot) {
this.setState({ showScreenshot: false });
}
}, 800);
}

UNSAFE_componentWillUpdate(nextProps: Props, nextState: State) {
Expand Down Expand Up @@ -556,7 +562,7 @@ class BasePreview extends React.Component<Props, State> {
{overlayMessage && <Loading>{overlayMessage}</Loading>}

<AnySpring
from={{ opacity: 0 }}
from={{ opacity: this.props.showScreenshotOverlay ? 0 : 1 }}
to={{
opacity: this.state.showScreenshot ? 0 : 1,
}}
Expand Down Expand Up @@ -602,9 +608,7 @@ class BasePreview extends React.Component<Props, State> {
height: '100%',
filter: `blur(2px)`,
transform: 'scale(1.025, 1.025)',
backgroundImage: `url("${
this.props.sandbox.screenshotUrl
}")`,
backgroundImage: `url("${this.props.sandbox.screenshotUrl}")`,
backgroundRepeat: 'no-repeat',
backgroundPositionX: 'center',
}}
Expand Down