monorail
/
mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[Glitch] Bump react-redux-loading-bar from 4.0.8 to 5.0.4 

Port d5ca204e89 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
This commit is contained in:
Yamagishi Kazutoshi 2022-07-20 20:56:44 +09:00 committed by Claire
parent d799fe2082
commit 969d805e86
2 changed files with 20 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
app/javascript/flavours/glitch/features/ui/components/image_loader.js
View File

@ -1,10 +1,10 @@
import React from 'react';
import PropTypes from 'prop-types';
import classNames from 'classnames'; import classNames from 'classnames';
import PropTypes from 'prop-types';
import React, { PureComponent } from 'react';
import { LoadingBar } from 'react-redux-loading-bar'; import { LoadingBar } from 'react-redux-loading-bar';
import ZoomableImage from './zoomable_image'; import ZoomableImage from './zoomable_image';
export default class ImageLoader extends React.PureComponent { export default class ImageLoader extends PureComponent {
static propTypes = { static propTypes = {
alt: PropTypes.string, alt: PropTypes.string,
@ -43,7 +43,7 @@ export default class ImageLoader extends React.PureComponent {
this.loadImage(this.props); this.loadImage(this.props);
} }
componentWillReceiveProps (nextProps) { UNSAFE_componentWillReceiveProps (nextProps) {
if (this.props.src !== nextProps.src) { if (this.props.src !== nextProps.src) {
this.loadImage(nextProps); this.loadImage(nextProps);
} }
@ -139,14 +139,18 @@ export default class ImageLoader extends React.PureComponent {
return ( return (
<div className={className}> <div className={className}>
<LoadingBar loading={loading ? 1 : 0} className='loading-bar' style={{ width: this.state.width || width }} />
{loading ? ( {loading ? (
<>
<div className='loading-bar__container' style={{ width: this.state.width || width }}>
<LoadingBar className='loading-bar' loading={1} />
</div>
<canvas <canvas
className='image-loader__preview-canvas' className='image-loader__preview-canvas'
ref={this.setCanvasRef} ref={this.setCanvasRef}
width={width} width={width}
height={height} height={height}
/> />
</>
) : ( ) : (
<ZoomableImage <ZoomableImage
alt={alt} alt={alt}

6
app/javascript/flavours/glitch/styles/components/index.scss
View File

@ -442,10 +442,14 @@
object-fit: contain; object-fit: contain;
} }
.loading-bar { .loading-bar__container {
position: relative; position: relative;
} }
.loading-bar {
position: absolute;
}
&.image-loader--amorphous .image-loader__preview-canvas { &.image-loader--amorphous .image-loader__preview-canvas {
display: none; display: none;
} }