Merge e5ff205 into ef325bc

package.json

@@ -28,7 +28,6 @@
     "eslint": "^8.0.1",
     "eslint-plugin-import": "^2.25.2",
     "eslint-plugin-no-unsanitized": "^4.0.0",
-    "generate-changelog": "^1.8.0",
     "handlebars-loader": "^1.7.1",
     "jest": "^27.2.5",
     "jest-handlebars": "^1.0.1",
@@ -59,10 +58,6 @@
     "build": "npm run lint && npm run test && npm run bundle-js && npm run bundle-css && npm run size && npm run sloc",
     "format": "prettier --write \"**/*.{js,jsx,json,ts,md}\"",
     "lint": "eslint src tests",
-    "outdated": "npm outdated",
-    "release:major": "changelog -M && git add CHANGELOG.md && git commit -m 'updated CHANGELOG.md' && npm version major && git push origin && git push origin --tags",
-    "release:minor": "changelog -m && git add CHANGELOG.md && git commit -m 'updated CHANGELOG.md' && npm version minor && git push origin && git push origin --tags",
-    "release:patch": "changelog -p && git add CHANGELOG.md && git commit -m 'updated CHANGELOG.md' && npm version patch && git push origin && git push origin --tags",
     "size": "size-limit",
     "sloc": "echo \"Source code:\" > SLOC && npx sloc src >> SLOC && echo \"Tests:\" >> SLOC && npx sloc tests >> SLOC && echo \"Total:\" >> SLOC && npx sloc src tests >> SLOC",
     "test": "jest"

src/renderer/components/renderSong.js

@@ -68,7 +68,7 @@ export default function renderSong(
 		});
 
 	const sectionsStats = getSectionsStats(allLines);
-	const maxBeatsWidth = getMaxBeatsWidth(allLines, alignChordsWithLyrics);
+	const maxBeatsWidth = getMaxBeatsWidth(allLines, shouldAlignChords);
 
 	const song = renderAllLines().join('\n');
 
@@ -154,9 +154,10 @@ export default function renderSong(
 				let rendered;
 
 				if (line.type === lineTypes.CHORD) {
-					let spaced = alignBars
-						? alignedChordSpacer(line.model, maxBeatsWidth)
-						: simpleChordSpacer(line.model);
+					let spaced =
+						alignBars && !shouldAlignChords(line)
+							? alignedChordSpacer(line.model, maxBeatsWidth)
+							: simpleChordSpacer(line.model);
 
 					const nextLine = allFilteredLines[lineIndex + 1];
 					if (shouldAlignChords(line)) {

src/renderer/spacers/chord/getMaxBeatsWidth.js

@@ -3,17 +3,15 @@ import symbols from '../../symbols';
 
 /**
  * @param {SongLine[]} allLines
- * @param {Boolean} alignChordsWithLyrics
+ * @param {Function} shouldAlignChords
  * @returns {Array}
  */
-export default function getMaxBeatsWidth(allLines, alignChordsWithLyrics) {
+export default function getMaxBeatsWidth(allLines, shouldAlignChords) {
 	const maxBeatsWidth = [];
 
 	allLines
 		.filter((line) => line.type === lineTypes.CHORD)
-		.filter(
-			(line) => !(alignChordsWithLyrics && line.model.hasPositionedChords)
-		)
+		.filter((line) => !shouldAlignChords(line))
 		.forEach((line) => {
 			line.model.allBars.forEach((bar, barIndex) => {
 				if (!maxBeatsWidth[barIndex]) {

tests/unit/renderer/spacers/chord/getMaxBeatsWidth.spec.js

@@ -133,7 +133,7 @@ describe.each([
 			(chord) => (chord.symbol = getChordSymbol(chord.model))
 		);
 
-		const maxBeatsWidth = getMaxBeatsWidth(allLines, false);
+		const maxBeatsWidth = getMaxBeatsWidth(allLines, () => false);
 		expect(maxBeatsWidth).toEqual(output);
 	});
 });
@@ -181,7 +181,7 @@ describe.each([
 				(chord) => (chord.symbol = getChordSymbol(chord.model))
 			);
 
-			const maxBeatsWidth = getMaxBeatsWidth(allLines, false);
+			const maxBeatsWidth = getMaxBeatsWidth(allLines, () => false);
 			expect(maxBeatsWidth).toEqual(output);
 		});
 	}
@@ -190,7 +190,7 @@ describe.each([
 describe.each([
 	[
 		'positioned chords NOT TAKEN into account when they are aligned with lyrics',
-		true,
+		[true, false],
 		[
 			'Ami7.. B7(b9,#9).. D7(#11)',
 			'_A lyric _line with _position markers',
@@ -203,7 +203,7 @@ describe.each([
 	],
 	[
 		'positioned chords taken into account when they are NOT aligned with lyrics',
-		false,
+		[false, false],
 		[
 			'Am7.. B7(b9,#9).. D7(#11)',
 			'_A lyric _line with _position markers',
@@ -216,7 +216,7 @@ describe.each([
 	],
 ])(
 	'Only count lines with positioned chords when necessary',
-	(title, alignChordsWithLyrics, input, output) => {
+	(title, shouldAlignChords, input, output) => {
 		test(title, () => {
 			const parsedSong = parseSong(input);
 			let { allLines } = parsedSong;
@@ -229,9 +229,8 @@ describe.each([
 				(chord) => (chord.symbol = getChordSymbol(chord.model))
 			);
 
-			const maxBeatsWidth = getMaxBeatsWidth(
-				allLines,
-				alignChordsWithLyrics
+			const maxBeatsWidth = getMaxBeatsWidth(allLines, () =>
+				shouldAlignChords.shift()
 			);
 			expect(maxBeatsWidth).toEqual(output);
 		});