Revert "pause gifs until hover"

This reverts commit e97a03c5c9.
This commit is contained in:
Sean Yesmunt 2020-05-28 12:31:30 -04:00
parent e41d3b61a5
commit 06f71f2f0d
7 changed files with 26 additions and 71 deletions

View file

@ -3,7 +3,6 @@ import React from 'react';
import { parseURI } from 'lbry-redux'; import { parseURI } from 'lbry-redux';
import classnames from 'classnames'; import classnames from 'classnames';
import Gerbil from './gerbil.png'; import Gerbil from './gerbil.png';
import FreezeframeWrapper from 'component/fileThumbnail/FreezeframeWrapper';
type Props = { type Props = {
thumbnail: ?string, thumbnail: ?string,
@ -12,17 +11,10 @@ type Props = {
thumbnailPreview: ?string, thumbnailPreview: ?string,
obscure?: boolean, obscure?: boolean,
small?: boolean, small?: boolean,
allowGifs?: boolean,
}; };
function ChannelThumbnail(props: Props) { function ChannelThumbnail(props: Props) {
const { thumbnail, uri, className, thumbnailPreview, obscure, small = false, allowGifs = false } = props; const { thumbnail, uri, className, thumbnailPreview, obscure, small = false } = props;
const channelThumbnail = thumbnail || thumbnailPreview;
if (channelThumbnail && channelThumbnail.endsWith('gif') && !allowGifs) {
return <FreezeframeWrapper src={channelThumbnail} className="channel-thumbnail" />;
}
const showThumb = (!obscure && !!thumbnail) || thumbnailPreview; const showThumb = (!obscure && !!thumbnail) || thumbnailPreview;
// Generate a random color class based on the first letter of the channel name // Generate a random color class based on the first letter of the channel name

View file

@ -1,7 +1,7 @@
// @flow // @flow
import type { Node } from 'react'; import type { Node } from 'react';
import React from 'react'; import React from 'react';
import FreezeframeWrapper from './FreezeframeWrapper'; // import FreezeframeWrapper from './FreezeframeWrapper';
import Placeholder from './placeholder.png'; import Placeholder from './placeholder.png';
type Props = { type Props = {
@ -11,14 +11,14 @@ type Props = {
const className = 'media__thumb'; const className = 'media__thumb';
class FileThumbnail extends React.PureComponent<Props> { class CardMedia extends React.PureComponent<Props> {
render() { render() {
const { thumbnail, children } = this.props; const { thumbnail, children } = this.props;
if (thumbnail && thumbnail.endsWith('gif')) { // Disabling temporarily to see if people complain
return <FreezeframeWrapper src={thumbnail} className={className} />; // if (thumbnail && thumbnail.endsWith('gif')) {
} // return <FreezeframeWrapper src={thumbnail} className={className} />;
// }
let url; let url;
// @if TARGET='web' // @if TARGET='web'
// Pass image urls through a compression proxy // Pass image urls through a compression proxy
@ -41,4 +41,4 @@ class FileThumbnail extends React.PureComponent<Props> {
} }
} }
export default FileThumbnail; export default CardMedia;

View file

@ -175,7 +175,7 @@ function TxoList(props: Props) {
title={__(`Transactions`)} title={__(`Transactions`)}
titleActions={ titleActions={
<div className="card__actions--inline"> <div className="card__actions--inline">
<Button button="alt" label={__('Refresh')} onClick={() => fetchTxoPage()} /> <Button button="secondary" label={__('Refresh')} onClick={() => fetchTxoPage()} />
</div> </div>
} }
isBodyList isBodyList

View file

@ -233,20 +233,10 @@ function ChannelPage(props: Props) {
{/* component that offers select/upload */} {/* component that offers select/upload */}
<div className="channel__primary-info"> <div className="channel__primary-info">
{!editing && ( {!editing && (
<ChannelThumbnail <ChannelThumbnail className="channel__thumbnail--channel-page" uri={uri} obscure={channelIsBlocked} />
className="channel__thumbnail--channel-page"
uri={uri}
obscure={channelIsBlocked}
allowGifs
/>
)} )}
{editing && ( {editing && (
<ChannelThumbnail <ChannelThumbnail className="channel__thumbnail--channel-page" uri={uri} thumbnailPreview={thumbPreview} />
className="channel__thumbnail--channel-page"
uri={uri}
thumbnailPreview={thumbPreview}
allowGifs
/>
)} )}
<h1 className="channel__title">{title || '@' + channelName}</h1> <h1 className="channel__title">{title || '@' + channelName}</h1>
<div className="channel__meta"> <div className="channel__meta">

View file

@ -90,16 +90,14 @@
} }
.media__thumb { .media__thumb {
$width: var(--file-list-thumbnail-width); width: var(--file-list-thumbnail-width);
width: $width;
@include handleClaimListGifThumbnail($width);
flex-shrink: 0; flex-shrink: 0;
margin-right: var(--spacing-medium); margin-right: var(--spacing-medium);
} }
.channel-thumbnail { .channel-thumbnail {
@include handleChannelGif(6rem); width: 6rem;
height: 6rem;
} }
&:hover { &:hover {
@ -117,7 +115,8 @@
} }
.channel-thumbnail { .channel-thumbnail {
@include handleChannelGif(5rem); width: 5rem;
height: 5rem;
} }
} }
} }
@ -138,7 +137,8 @@
} }
.channel-thumbnail { .channel-thumbnail {
@include handleChannelGif(7.5rem); width: 7.5rem;
height: 7.5rem;
} }
} }
@ -149,7 +149,8 @@
} }
.channel-thumbnail { .channel-thumbnail {
@include handleChannelGif(4rem); width: 4rem;
height: 4rem;
} }
} }
@ -317,10 +318,7 @@
} }
.claim-preview--tile { .claim-preview--tile {
$width: calc((100vw - var(--side-nav-width) - (var(--spacing-large) * 4) - var(--spacing-medium) * 3) / 4); width: calc((100% - var(--spacing-medium) * 3) / 4);
width: $width;
@include handleClaimListGifThumbnail($width);
margin-bottom: var(--spacing-large); margin-bottom: var(--spacing-large);
margin-right: 0; margin-right: 0;
margin-top: 0; margin-top: 0;
@ -344,9 +342,7 @@
} }
@media (max-width: $breakpoint-medium) and (min-width: $breakpoint-small) { @media (max-width: $breakpoint-medium) and (min-width: $breakpoint-small) {
$width: calc((100vw - var(--side-nav-width) - (var(--spacing-large) * 4) - var(--spacing-medium) * 2) / 3); width: calc((100% - var(--spacing-medium) * 2) / 3);
width: $width;
@include handleClaimListGifThumbnail($width);
&:first-child, &:first-child,
&:nth-child(3n + 1) { &:nth-child(3n + 1) {
@ -359,9 +355,7 @@
} }
@media (max-width: $breakpoint-small) { @media (max-width: $breakpoint-small) {
$width: calc((100vw / 2) - var(--spacing-medium) * 2); width: calc((100% - var(--spacing-medium) * 1) / 2);
width: $width;
@include handleClaimListGifThumbnail($width);
margin-bottom: var(--spacing-large); margin-bottom: var(--spacing-large);
&:first-child, &:first-child,
@ -396,7 +390,8 @@
color: var(--color-subtitle); color: var(--color-subtitle);
.channel-thumbnail { .channel-thumbnail {
@include handleChannelGif(2.1rem); width: 2.1rem;
height: 2.1rem;
margin-right: var(--spacing-small); margin-right: var(--spacing-small);
} }
} }

View file

@ -15,7 +15,7 @@
margin-left: auto; margin-left: auto;
margin-right: auto; margin-right: auto;
margin-top: var(--header-height); margin-top: var(--header-height);
padding: var(--spacing-large); // Unfortunately this is coupled with .claim-preview--tile width calculation padding: var(--spacing-large);
@media (max-width: $breakpoint-small) { @media (max-width: $breakpoint-small) {
padding: var(--spacing-small); padding: var(--spacing-small);

View file

@ -17,25 +17,3 @@
} }
} }
} }
@mixin handleClaimListGifThumbnail($width) {
.ff-container {
.ff-canvas.ff-canvas-ready,
img {
height: calc(#{$width} * (9 / 16));
}
}
}
@mixin handleChannelGif($size) {
height: $size;
width: $size;
.ff-container {
.ff-canvas.ff-canvas-ready,
img {
height: $size;
width: $size;
}
}
}