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

SUPPORT-1295: Fixed issues with image cycles not restarting #146

Merged
merged 1 commit into from
Nov 7, 2023
Merged

SUPPORT-1295: Fixed issues with image cycles not restarting #146

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
4 changes: 4 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file.

## [Unreleased]

- [#146](https://github.com/os2display/display-templates/pull/146)
- Fixed issue where image-text image cycle is not restarting when only on slide is displayed.
- Fixed issue with slideshow default duration being 5000 s.

## [1.3.1] - 2023-10-26

- [#145](https://github.com/os2display/display-templates/pull/145)
Expand Down
4 changes: 2 additions & 2 deletions build/image-text-config-develop.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
"id": "01FP2SNGFN0BZQH03KCBXHKYHG",
"description": "Mulighed for at sætte billede og tekst, med forskellige visninger.",
"resources": {
"component": "https://raw.githubusercontent.com/os2display/display-templates/develop/build/image-text.js?ts=1680079550081",
"admin": "https://raw.githubusercontent.com/os2display/display-templates/develop/build/image-text-admin.json?ts=1680079550081",
"component": "https://raw.githubusercontent.com/os2display/display-templates/develop/build/image-text.js?ts=1699164803061",
"admin": "https://raw.githubusercontent.com/os2display/display-templates/develop/build/image-text-admin.json?ts=1699164803061",
"schema": "https://raw.githubusercontent.com/os2display/display-templates/develop/build/image-text-schema.json",
"assets": [],
"options": {},
Expand Down
4 changes: 2 additions & 2 deletions build/image-text-config-main.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
"id": "01FP2SNGFN0BZQH03KCBXHKYHG",
"description": "Mulighed for at sætte billede og tekst, med forskellige visninger.",
"resources": {
"component": "https://raw.githubusercontent.com/os2display/display-templates/main/build/image-text.js?ts=1680079550081",
"admin": "https://raw.githubusercontent.com/os2display/display-templates/main/build/image-text-admin.json?ts=1680079550081",
"component": "https://raw.githubusercontent.com/os2display/display-templates/main/build/image-text.js?ts=1699164803061",
"admin": "https://raw.githubusercontent.com/os2display/display-templates/main/build/image-text-admin.json?ts=1699164803061",
"schema": "https://raw.githubusercontent.com/os2display/display-templates/main/build/image-text-schema.json",
"assets": [],
"options": {},
Expand Down
2 changes: 1 addition & 1 deletion build/image-text.js
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions build/slideshow-config-develop.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
"id": "01FP2SNSC9VXD10ZKXQR819NS9",
"description": "Skabelon til slideshow af billeder med forskellige effekter",
"resources": {
"component": "https://raw.githubusercontent.com/os2display/display-templates/develop/build/slideshow.js?ts=1677590005936",
"admin": "https://raw.githubusercontent.com/os2display/display-templates/develop/build/slideshow-admin.json?ts=1677590005936",
"component": "https://raw.githubusercontent.com/os2display/display-templates/develop/build/slideshow.js?ts=1699164803061",
"admin": "https://raw.githubusercontent.com/os2display/display-templates/develop/build/slideshow-admin.json?ts=1699164803061",
"schema": "https://raw.githubusercontent.com/os2display/display-templates/develop/build/slideshow-schema.json",
"assets": [],
"options": {},
Expand Down
4 changes: 2 additions & 2 deletions build/slideshow-config-main.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
"id": "01FP2SNSC9VXD10ZKXQR819NS9",
"description": "Skabelon til slideshow af billeder med forskellige effekter",
"resources": {
"component": "https://raw.githubusercontent.com/os2display/display-templates/main/build/slideshow.js?ts=1677590005936",
"admin": "https://raw.githubusercontent.com/os2display/display-templates/main/build/slideshow-admin.json?ts=1677590005936",
"component": "https://raw.githubusercontent.com/os2display/display-templates/main/build/slideshow.js?ts=1699164803061",
"admin": "https://raw.githubusercontent.com/os2display/display-templates/main/build/slideshow-admin.json?ts=1699164803061",
"schema": "https://raw.githubusercontent.com/os2display/display-templates/main/build/slideshow-schema.json",
"assets": [],
"options": {},
Expand Down
2 changes: 1 addition & 1 deletion build/slideshow.js
View file
Open in desktop

Large diffs are not rendered by default.

9 changes: 8 additions & 1 deletion src/image-text/image-text.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@ function ImageText({ slide, content, run, slideDone, executionId }) {
}
}, [slide]);

useEffect(() => {
const startTheShow = () => {
if (images?.length > 0 && !currentImage) {
setCurrentImage(images[0]);
}
Expand All @@ -177,13 +177,20 @@ function ImageText({ slide, content, run, slideDone, executionId }) {
// Kickoff the display of multiple images with the zero indexed
changeImage(0);
}
};

useEffect(() => {
if (!currentImage) {
startTheShow();
}
}, [images]);

/** Setup slide run function. */
const slideExecution = new BaseSlideExecution(slide, slideDone);

useEffect(() => {
if (run) {
startTheShow();
slideExecution.start(duration);
}

Expand Down
53 changes: 29 additions & 24 deletions src/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,15 +60,20 @@ export const renderScreen = (screen) => {
);
};

const slideDone = () => {
// eslint-disable-next-line no-console
console.log("slide done");
};

Comment on lines +63 to +67
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should we revert the debugging changes made to this file?

export const renderSlide = (slide) => {
switch (slide.type) {
case "book-review":
return (
<BookReview
content={slide.content}
slide={slide}
run={new Date().toISOString()}
slideDone={() => {}}
run="1234"
slideDone={slideDone}
executionId="SLIDE_ID"
/>
);
Expand All @@ -77,8 +82,8 @@ export const renderSlide = (slide) => {
<Calendar
content={slide.content}
slide={slide}
run={new Date().toISOString()}
slideDone={() => {}}
run="1234"
slideDone={slideDone}
executionId="SLIDE_ID"
/>
);
Expand All @@ -87,8 +92,8 @@ export const renderSlide = (slide) => {
<Contacts
content={slide.content}
slide={slide}
run={new Date().toISOString()}
slideDone={() => {}}
run="1234"
slideDone={slideDone}
executionId="SLIDE_ID"
/>
);
Expand All @@ -97,8 +102,8 @@ export const renderSlide = (slide) => {
<ImageText
content={slide.content}
slide={slide}
run={new Date().toISOString()}
slideDone={() => {}}
run="1234"
slideDone={slideDone}
executionId="SLIDE_ID"
/>
);
Expand All @@ -107,8 +112,8 @@ export const renderSlide = (slide) => {
<IFrame
content={slide.content}
slide={slide}
run={new Date().toISOString()}
slideDone={() => {}}
run="1234"
slideDone={slideDone}
executionId="SLIDE_ID"
/>
);
Expand All @@ -117,8 +122,8 @@ export const renderSlide = (slide) => {
<Poster
content={slide.content}
slide={slide}
run={new Date().toISOString()}
slideDone={() => {}}
run="1234"
slideDone={slideDone}
executionId="SLIDE_ID"
/>
);
Expand All @@ -127,8 +132,8 @@ export const renderSlide = (slide) => {
<RSS
content={slide.content}
slide={slide}
run={new Date().toISOString()}
slideDone={() => {}}
run="1234"
slideDone={slideDone}
executionId="SLIDE_ID"
/>
);
Expand All @@ -137,8 +142,8 @@ export const renderSlide = (slide) => {
<Slideshow
content={slide.content}
slide={slide}
run={new Date().toISOString()}
slideDone={() => {}}
run="1234"
slideDone={slideDone}
executionId="SLIDE_ID"
/>
);
Expand All @@ -147,8 +152,8 @@ export const renderSlide = (slide) => {
<InstagramFeed
content={slide.content}
slide={slide}
run={new Date().toISOString()}
slideDone={() => {}}
run="1234"
slideDone={slideDone}
executionId="SLIDE_ID"
/>
);
Expand All @@ -157,8 +162,8 @@ export const renderSlide = (slide) => {
<Table
content={slide.content}
slide={slide}
run={new Date().toISOString()}
slideDone={() => {}}
run="1234"
slideDone={slideDone}
executionId="SLIDE_ID"
/>
);
Expand All @@ -167,8 +172,8 @@ export const renderSlide = (slide) => {
<Video
content={slide.content}
slide={slide}
run={new Date().toISOString()}
slideDone={() => {}}
run="1234"
slideDone={slideDone}
executionId="SLIDE_ID"
/>
);
Expand All @@ -177,8 +182,8 @@ export const renderSlide = (slide) => {
<Travel
content={slide.content}
slide={slide}
run={new Date().toISOString()}
slideDone={() => {}}
run="1234"
slideDone={slideDone}
executionId="SLIDE_ID"
/>
);
Expand Down
12 changes: 6 additions & 6 deletions src/slideshow/slideshow.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,19 +20,19 @@ import "./slideshow.scss";
* @returns {JSX.Element} The component.
*/
function Slideshow({ slide, content, run, slideDone, executionId }) {
const { images, imageDuration = 5000, transition, animation } = content;
const { images, imageDuration = 5, transition, animation } = content;
const [index, setIndex] = useState(0);
const fadeEnabled = transition === "fade";
const fadeDuration = 1000;
const [fade, setFade] = useState(false);
const imageDurationInSeconds = imageDuration * 1000;
const imageDurationInMilliseconds = imageDuration * 1000;
// Map images to mediaData.
const imageUrls = getAllMediaUrlsFromField(slide.mediaData, images);

const animationName = "animationForImage";
const [animationIndex, setAnimationIndex] = useState(0);
const [animationDuration, setAnimationDuration] = useState(
imageDurationInSeconds + fadeDuration
imageDurationInMilliseconds + fadeDuration
);

const logo = slide?.themeData?.logo;
Expand Down Expand Up @@ -176,7 +176,7 @@ function Slideshow({ slide, content, run, slideDone, executionId }) {
// Fade to next image.
setFade(true);
setAnimationIndex(newIndex);
setAnimationDuration(imageDurationInSeconds + fadeDuration * 2);
setAnimationDuration(imageDurationInMilliseconds + fadeDuration * 2);
fadeRef.current = setTimeout(() => {
setFade(false);
setIndex(newIndex);
Expand All @@ -185,9 +185,9 @@ function Slideshow({ slide, content, run, slideDone, executionId }) {
// Change to next.
setIndex(newIndex);
setAnimationIndex(newIndex);
setAnimationDuration(imageDurationInSeconds);
setAnimationDuration(imageDurationInMilliseconds);
}
}, imageDurationInSeconds);
}, imageDurationInMilliseconds);
} else {
// If there are no images in slide, wait for 2s before continuing to avoid crashes.
setTimeout(() => {
Expand Down
Loading