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.

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

Fix issues with updating template images #338

Merged
merged 5 commits into from
Jan 14, 2021
Merged

Fix issues with updating template images #338

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0343c74
Fix warnings
jacobkeeler Dec 22, 2020
6aa692a
Fix issue where template images were cached and never updated
jacobkeeler Dec 22, 2020
6f5438e
Fix issues with scaling when rerendering template image
jacobkeeler Dec 22, 2020
20ae45f
Update on image error
jacobkeeler Jan 6, 2021
b75dcb7
Remove unused variables
jacobkeeler Jan 7, 2021
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
95 changes: 39 additions & 56 deletions src/js/Templates/Shared/Image.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,9 @@ class Image extends React.Component {
constructor(props) {
super(props);
this.state = {error: false, refreshed: false};
this.canvasStyle = {
this.initialCanvasDimensions = {
height: null,
width: null,
scaledDimensions: null,
x: null,
y: null
width: null
};
}

Expand All @@ -23,7 +20,7 @@ class Image extends React.Component {
}
var widthRatio = parentDimension.width / ogDimension.width
var heightRatio = parentDimension.height / ogDimension.height
var minScale = Math.min(widthRatio , heightRatio)
var minScale = Math.min(widthRatio, heightRatio)
scaledDimensions.width = ogDimension.width * minScale
scaledDimensions.height = ogDimension.height * minScale

Expand All @@ -37,51 +34,42 @@ class Image extends React.Component {
const canvas = this.refs.canvas
const ctx = canvas.getContext("2d")
const img = this.refs.image

if (this.canvasStyle.height && this.canvasStyle.width) {
canvas.width = this.canvasStyle.width
canvas.height = this.canvasStyle.height
} else {
canvas.width = canvasContainer.clientWidth
canvas.height = canvasContainer.clientHeight
this.canvasStyle.width = canvasContainer.clientWidth
this.canvasStyle.height = canvasContainer.clientHeight
if (!this.initialCanvasDimensions.height || !this.initialCanvasDimensions.width) {
this.initialCanvasDimensions.width = canvasContainer.clientWidth
this.initialCanvasDimensions.height = canvasContainer.clientHeight
}

canvas.width = this.initialCanvasDimensions.width
canvas.height = this.initialCanvasDimensions.height
img.onload = () => {
var scaledDimensions;
if (this.canvasStyle.scaledDimensions) {
scaledDimensions = this.canvasStyle.scaledDimensions
} else {
scaledDimensions= this.scaleImage({
"width": img.width,
"height": img.height
}, {
"width": this.canvasStyle.width,
"height": this.canvasStyle.height
}
);
}

ctx.clearRect(0, 0, this.canvasStyle.width, this.canvasStyle.height);
var scaledDimensions = this.scaleImage({
"width": img.width,
"height": img.height
}, {
"width": this.initialCanvasDimensions.width,
"height": this.initialCanvasDimensions.height
}
);
canvas.width = scaledDimensions.width
canvas.height = scaledDimensions.height

if (!this.canvasStyle.x || !this.canvasStyle.y) {
this.canvasStyle.x = (canvas.width / 2) - (scaledDimensions.width / 2);
this.canvasStyle.y = (canvas.height / 2) - (scaledDimensions.height / 2);
}
ctx.clearRect(0, 0, canvas.width, canvas.height);

var x = (canvas.width / 2) - (scaledDimensions.width / 2);
var y = (canvas.height / 2) - (scaledDimensions.height / 2);

ctx.drawImage(img, this.canvasStyle.x, this.canvasStyle.y, scaledDimensions.width, scaledDimensions.height);
ctx.drawImage(img, x, y, scaledDimensions.width, scaledDimensions.height);

ctx.globalCompositeOperation = "source-atop";
ctx.globalAlpha = 1.0;
ctx.fillStyle = fillColor;
ctx.fillRect(0, 0, this.canvasStyle.width, this.canvasStyle.height);
ctx.fillRect(0, 0, canvas.width, canvas.height);

ctx.globalCompositeOperation = "source-over";
ctx.globalAlpha = 1.0;
}
//Refresh image to trigger onload
img.src = this.props.image;
img.src = this.props.image + "?m=" + new Date().getTime();
}
}

Expand All @@ -95,21 +83,25 @@ class Image extends React.Component {

shouldComponentUpdate(nextProps, nextState) {
// Check if any props changed
if (this.props.fillColor != nextProps.fillColor) {
if (this.props.fillColor !== nextProps.fillColor) {
return true;
}
if (this.props.image != nextProps.image) {
if (this.props.image !== nextProps.image) {
return true;
}
if (this.props.isTemplate != nextProps.isTemplate) {
if (this.props.isTemplate !== nextProps.isTemplate) {
return true;
}
if (this.props.class != nextProps.class) {
if (this.props.class !== nextProps.class) {
return true;
}

// Check if next image is to be refreshed
if (nextProps.refreshImage == nextProps.image) {
if (nextProps.refreshImage === nextProps.image) {
return true;
}

if (nextState.error) {
return true;
}

Expand Down Expand Up @@ -142,28 +134,19 @@ class Image extends React.Component {

render() {
if(this.props.image && !this.state.error) {
if(this.props.isTemplate) {
if (this.props.isTemplate) {
var hidden = {display:'none'};
var size;
if (this.canvasStyle.height && this.canvasStyle.width) {
size = {
height: this.canvasStyle.height,
width: this.canvasStyle.width
}
} else {
size = {
height: "100%",
width: "100%"
}
var size = {
height: "100%",
width: "100%"
}

return (
<div style={size} ref="canvasContainer">
<canvas ref="canvas" className={this.props.class}/>
<img
ref="image"
style={hidden}
src={this.props.image}
src={this.props.image + "?m=" + new Date().getTime()}
alt="SDL_Image"
onError={e => this.onError(e)}
/>
Expand Down