Merge branch 'master' into feature/reader-mode

hakimel · Oct 12, 2023 · 7108476 · 7108476
2 parents b8b55b8 + 88fbfc5
commit 7108476
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 9 deletions.
diff --git a/dist/reveal.esm.js.map b/dist/reveal.esm.js.map
diff --git a/js/reveal.js b/js/reveal.js
@@ -287,7 +287,18 @@ export default function( revealElement, options ) {
 
 		if( !config.showHiddenSlides ) {
 			Util.queryAll( dom.wrapper, 'section[data-visibility="hidden"]' ).forEach( slide => {
-				slide.parentNode.removeChild( slide );
+				const parent = slide.parentNode;
+
+				// If this slide is part of a stack and that stack will be
+				// empty after removing the hidden slide, remove the entire
+				// stack
+				if( parent.childElementCount === 1 && /section/i.test( parent.nodeName ) ) {
+					parent.remove();
+				}
+				else {
+					slide.remove();
+				}
+
 			} );
 		}
 
@@ -473,8 +484,8 @@ export default function( revealElement, options ) {
 		dom.wrapper.setAttribute( 'data-background-transition', config.backgroundTransition );
 
 		// Expose our configured slide dimensions as custom props
-		dom.viewport.style.setProperty( '--slide-width', config.width + 'px' );
-		dom.viewport.style.setProperty( '--slide-height', config.height + 'px' );
+		dom.viewport.style.setProperty( '--slide-width', typeof config.width == 'string' ? config.width :  config.width + 'px' );
+		dom.viewport.style.setProperty( '--slide-height', typeof config.height == 'string' ? config.height :  config.height + 'px' );
 
 		if( config.shuffle ) {
 			shuffle();

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "reveal.js",
-  "version": "4.6.0",
+  "version": "4.6.1",
   "description": "The HTML Presentation Framework",
   "homepage": "https://revealjs.com",
   "subdomain": "revealjs",

diff --git a/plugin/notes/notes.esm.js b/plugin/notes/notes.esm.js
diff --git a/plugin/notes/notes.js b/plugin/notes/notes.js
diff --git a/plugin/notes/plugin.js b/plugin/notes/plugin.js
@@ -146,8 +146,12 @@ const Plugin = () => {
 		}
 
 		// Look for notes defined in an aside element
-		if( notesElements ) {
-			messageData.notes = Array.from(notesElements).map( notesElement => notesElement.innerHTML ).join( '\n' );
+		if( notesElements && notesElements.length ) {
+			// Ignore notes inside of fragments since those are shown
+			// individually when stepping through fragments
+			notesElements = Array.from( notesElements ).filter( notesElement => notesElement.closest( '.fragment' ) === null );
+
+			messageData.notes = notesElements.map( notesElement => notesElement.innerHTML ).join( '\n' );
 			messageData.markdown = notesElements[0] && typeof notesElements[0].getAttribute( 'data-markdown' ) === 'string';
 		}