fix: use compact template in non-destructive way (do not replace the PopupsCompose template if a different wysiwyg is used)

plugins/compact-composer/index.php

@@ -6,7 +6,7 @@ class CompactComposerPlugin extends \RainLoop\Plugins\AbstractPlugin
 		NAME = 'Compact Composer',
 		AUTHOR = 'Sergey Mosin',
 		URL = 'https://github.com/the-djmaze/snappymail/pull/1466',
-		VERSION = '1.0.0',
+		VERSION = '1.0.1',
 		RELEASE = '2024-02-23',
 		REQUIRED = '2.34.0',
 		LICENSE = 'AGPL v3',
@@ -14,7 +14,7 @@ class CompactComposerPlugin extends \RainLoop\Plugins\AbstractPlugin
 
 	public function Init(): void
 	{
-		$this->addTemplate('templates/PopupsCompose.html');
+		$this->addTemplate('templates/PopupsCompactCompose.html');
 		$this->addCss('css/composer.css');
 		$this->addJs('js/squire-raw.js');
 		$this->addJs('js/parsel.js');

plugins/compact-composer/js/CompactComposer.js

@@ -1,6 +1,39 @@
 /* eslint max-len: 0 */
 (win => {
 
+	const rl = win.rl;
+
+	if (!rl) {
+		return;
+	}
+
+	rl.registerWYSIWYG('CompactComposer', (owner, container, onReady) => {
+		const editor = new CompactComposer(container);
+		onReady(editor);
+	});
+
+	const doc = win.document;
+
+	// If a user (or admin) selected the CompactComposer we need to
+	// replace PopupsCompose template with PopupsCompactCompose template.
+	// --
+	// This might break some plugins if they query/change PopupsCompose template
+	// before this code is called. They should instead listen for
+	// 'rl-view-model.create' to work properly.
+	if (rl.settings.get('editorWysiwyg') === 'CompactComposer') {
+		const compactTemplate = doc.getElementById('PopupsCompactCompose');
+		if (!compactTemplate) {
+			console.error('CompactComposer: PopupsCompactCompose template not found');
+			return;
+		}
+		const originalTemplate = doc.getElementById('PopupsCompose');
+		if (originalTemplate) {
+			originalTemplate.id = 'PopupsCompose_replaced';
+		} else {
+			console.warn('CompactComposer: PopupsCompose template not found');
+		}
+		compactTemplate.id = 'PopupsCompose';
+
 		addEventListener('rl-view-model.create', e => {
 			if (e.detail.viewModelTemplateID === 'PopupsCompose') {
 				// There is a better way to do this probably,
@@ -8,9 +41,7 @@
 				e.detail.attachmentsArea = e.detail.bodyArea;
 			}
 		});
-
+	}
-	const doc = win.document;
-	const rl = win.rl;
 
 	const
 		removeElements = 'HEAD,LINK,META,NOSCRIPT,SCRIPT,TEMPLATE,TITLE',
@@ -956,12 +987,4 @@
 			}
 		}
 	}
-
-	if (rl) {
-		rl.registerWYSIWYG('CompactComposer', (owner, container, onReady) => {
-			const editor = new CompactComposer(container);
-			onReady(editor);
-		});
-	}
-
 })(window);