Merge bc5acce into 87252c6

no-chris · Feb 11, 2023 · 6a7e4e2 · 6a7e4e2
2 parents 87252c6 + bc5acce
commit 6a7e4e2
Show file tree

Hide file tree

Showing 2 changed files with 45 additions and 1 deletion.
diff --git a/packages/chord-mark/src/renderer/components/renderSong.js b/packages/chord-mark/src/renderer/components/renderSong.js
@@ -206,7 +206,9 @@ export default function renderSong(
 
 	function shouldRepeatLines(line) {
 		const shouldSkipAutoRepeatChordLine =
-			line.isFromAutoRepeatChords && !autoRepeatChords;
+			!autoRepeatChords &&
+			(line.isFromAutoRepeatChords ||
+				(line.type === lineTypes.CHORD && line.isFromSectionCopy));
 
 		const shouldSkipSectionMultiplyLine =
 			line.isFromSectionMultiply && !expandSectionMultiply;

diff --git a/packages/chord-mark/tests/unit/renderer/components/renderSong.spec.js b/packages/chord-mark/tests/unit/renderer/components/renderSong.spec.js
@@ -132,6 +132,48 @@ verseLine`;
 		expect(toText(rendered)).toBe(expected);
 	});
 
+	test('should not repeat chords when autoRepeatChords === false', () => {
+		const input = `#v
+A B
+verseLine
+#v
+#v`;
+		const expected = `Verse 1
+|A     |B     |
+verseLine
+Verse 2
+verseLine
+Verse 3
+verseLine`;
+		const rendered = renderSongText(input, {
+			expandSectionCopy: true,
+			autoRepeatChords: false,
+		});
+		expect(toText(rendered)).toBe(expected);
+	});
+
+	test('should not repeat chords when autoRepeatChords === false, even if the section contains only chords', () => {
+		const input = `#v
+A B
+C D
+
+#v
+
+#v`;
+		const expected = `Verse 1
+|A     |B     |
+|C     |D     |
+
+Verse 2
+
+Verse 3`;
+		const rendered = renderSongText(input, {
+			expandSectionCopy: true,
+			autoRepeatChords: false,
+		});
+		expect(toText(rendered)).toBe(expected);
+	});
+
 	test('should only repeat section label when expandSectionCopy === false', () => {
 		const input = `#v
 A B