Fixed poster duration and slide done

CHANGELOG.md

@@ -4,6 +4,8 @@ All notable changes to this project will be documented in this file.
 
 ## Unreleased
 
+- [#169](https://github.com/os2display/display-templates/pull/169)
+  - Fixed duration and slide done.
 - [#165](https://github.com/os2display/display-templates/pull/165)
   - Fixed transitions for poster.
   - Fixed dates for poster spanning multiple days.

build/poster-config-develop.json

@@ -4,9 +4,9 @@
   "id": "01FWJZQ25A1868V63CWYYHQFKQ",
   "description": "Mulighed for at vise plakat indhold.",
   "resources": {
-    "component": "https://raw.githubusercontent.com/os2display/display-templates/develop/build/poster.js?ts=1738154345932",
-    "admin": "https://raw.githubusercontent.com/os2display/display-templates/develop/build/poster-admin.json?ts=1738154345932",
-    "schema": "https://raw.githubusercontent.com/os2display/display-templates/develop/build/poster-schema.json?ts=1738154345932",
+    "component": "https://raw.githubusercontent.com/os2display/display-templates/develop/build/poster.js?ts=1742482693753",
+    "admin": "https://raw.githubusercontent.com/os2display/display-templates/develop/build/poster-admin.json?ts=1742482693753",
+    "schema": "https://raw.githubusercontent.com/os2display/display-templates/develop/build/poster-schema.json?ts=1742482693753",
     "assets": [],
     "options": {},
     "content": {}

build/poster-config-main.json

@@ -4,9 +4,9 @@
   "id": "01FWJZQ25A1868V63CWYYHQFKQ",
   "description": "Mulighed for at vise plakat indhold.",
   "resources": {
-    "component": "https://raw.githubusercontent.com/os2display/display-templates/main/build/poster.js?ts=1738154345932",
-    "admin": "https://raw.githubusercontent.com/os2display/display-templates/main/build/poster-admin.json?ts=1738154345932",
-    "schema": "https://raw.githubusercontent.com/os2display/display-templates/main/build/poster-schema.json?ts=1738154345932",
+    "component": "https://raw.githubusercontent.com/os2display/display-templates/main/build/poster.js?ts=1742482693753",
+    "admin": "https://raw.githubusercontent.com/os2display/display-templates/main/build/poster-admin.json?ts=1742482693753",
+    "schema": "https://raw.githubusercontent.com/os2display/display-templates/main/build/poster-schema.json?ts=1742482693753",
     "assets": [],
     "options": {},
     "content": {}

src/poster/poster.js

@@ -36,8 +36,7 @@ function Poster({ slide, content, run, slideDone, executionId }) {
 
   // Animation.
   const animationDuration = 500;
-  const { entryDuration = 15 } = content; // default 15s.
-  const entryDurationMilliseconds = entryDuration * 1000;
+  const { duration = 15000 } = content; // default 15s.
 
   // Props from currentEvent.
   const {
@@ -125,7 +124,7 @@ function Poster({ slide, content, run, slideDone, executionId }) {
 
       animationTimerRef.current = setTimeout(() => {
         setShow(false);
-      }, entryDurationMilliseconds - animationDuration + 50);
+      }, duration - animationDuration + 50);
     }
 
     if (timerRef?.current) {
@@ -138,12 +137,12 @@ function Poster({ slide, content, run, slideDone, executionId }) {
       } else {
         setCurrentIndex(nextIndex);
       }
-    }, entryDurationMilliseconds);
+    }, duration);
   }, [currentIndex]);
 
   useEffect(() => {
     if (run) {
-      if (feedData && currentEvent === null && feedData?.length > 0) {
+      if (feedData?.length > 0) {
         setCurrentIndex(0);
       } else {
         setTimeout(() => slideDone(slide), 1000);
@@ -315,7 +314,7 @@ Poster.propTypes = {
     ),
   }).isRequired,
   content: PropTypes.shape({
-    entryDuration: PropTypes.number,
+    duration: PropTypes.number,
     showLogo: PropTypes.bool,
     mediaContain: PropTypes.bool,
   }).isRequired,