From fbeaefcf051d76b4009f6792f88210bb4ef8878c Mon Sep 17 00:00:00 2001
From: milan <mk@egroupware.org>
Date: Thu, 27 Feb 2025 12:03:55 +0100
Subject: [PATCH] WIP hide From in mail compose header

---
 mail/js/app.js                     | 11 ++++++-----
 mail/templates/default/app.css     | 16 +++++++++-------
 mail/templates/default/compose.xet |  3 ++-
 3 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/mail/js/app.js b/mail/js/app.js
index dcae34bbf2..f49075657f 100755
--- a/mail/js/app.js
+++ b/mail/js/app.js
@@ -31,7 +31,7 @@ import {Et2VfsSelectButton} from "../../api/js/etemplate/Et2Vfs/Et2VfsSelectButt
 import {et2_nextmatch} from "../../api/js/etemplate/et2_extension_nextmatch";
 /* required dependency, commented out because no module, but egw:uses is no longer parsed
 */
-
+var keepFromExpander;
 /**
  * UI for mail
  *
@@ -4841,7 +4841,7 @@ app.classes.mail = AppJS.extend(
 					&& typeof widgets[expanderBtn].widget != 'undefined'
 					&& (!widgets[widget].widget.value || !widgets[widget].widget.value.length)
 					&& actions.indexOf(expanderBtn)<0)
-					|| expanderBtn ==='from_expander'
+					|| expanderBtn ==='from_expander' && !keepFromExpander
 			)
 			{
 				widgets[expanderBtn].widget?.set_disabled(false);
@@ -4902,12 +4902,13 @@ app.classes.mail = AppJS.extend(
 					}
 					break;
 				case 'from_expander':
-					document.querySelector('.mailComposeHideFrom').style.display=''
+					document.querySelector('.mailComposeJQueryFrom').style.display=''
+					keepFromExpander = true;
 					break;
 			}
 			widget.parentElement.hide()
 		}
-		else if (typeof widget == "undefined")
+		else if (typeof widget == "undefined") //show all widgets
 		{
 			const widgets = {cc:{},bcc:{},folder:{},replyto:{}};
 
@@ -4960,7 +4961,7 @@ app.classes.mail = AppJS.extend(
 	{
 		if (!document.getElementById('mail_folder_lock_div'))
 		{
-			var parent = jQuery('#mail-index_nm\\[foldertree\\]');
+			var parent = document.querySelector('#mail-index_nm\\[foldertree\\]');
 			var lock_div = jQuery(document.createElement('div'));
 			lock_div.attr('id', 'mail_folder_lock_div')
 				.addClass('mail_folder_lock');
diff --git a/mail/templates/default/app.css b/mail/templates/default/app.css
index bb4476e5e1..ba4f0e9693 100644
--- a/mail/templates/default/app.css
+++ b/mail/templates/default/app.css
@@ -1001,10 +1001,18 @@ et2-image.smime_cert_unknownemail {
   border: none;
   outline: none;
 }
+#mail-compose tr.mailComposeHeaders > td > et2-dropdown {
+	position: relative;
+	max-width: 100%;
+}
 #mail-compose tr.mailComposeHeaders et2-dropdown et2-button::part(base){
-	margin-left: 1ex;
 	background-color: var(--sl-color-gray-150);
 }
+#mail-compose tr.mailComposeHeaders et2-dropdown et2-button::part(label){
+	padding-left: 0;
+	margin-left: -1px;
+}
+
 
 #mail-compose tr.mailComposeHeaders .et2_taglist .ms-ctn-focus {
   border: none;
@@ -1135,9 +1143,3 @@ table.et2_egw_action_ddHelper_row .innerContainer {
 tr.mailComposeJQueryCc, tr.mailComposeJQueryBcc, tr.mailComposeJQueryFolder, tr.mailComposeJQueryReplyto  {
 	display: none;
 }
-tr.mailComposeHeaders > td > et2-dropdown {
-	position: relative;
-	left: -1em;
-	width: 100%;
-	max-width: 100%;
-}
\ No newline at end of file
diff --git a/mail/templates/default/compose.xet b/mail/templates/default/compose.xet
index 18b9af2654..0800d5f4d4 100644
--- a/mail/templates/default/compose.xet
+++ b/mail/templates/default/compose.xet
@@ -44,7 +44,7 @@
 					<column width="90%"/>
 				</columns>
 				<rows>
-					<row class="mailComposeHeaders" >
+					<row class="mailComposeHeaders mailComposeJQueryFrom" >
 						<et2-description  value="From"></et2-description>
 						<et2-select  id="mailaccount" onchange="app.mail.submitOnChange"></et2-select>
 					</row>
@@ -62,6 +62,7 @@
 							<et2-button slot="trigger" caret="true" noSubmit="true">
 								<et2-description value="To"></et2-description>
 							</et2-button>
+							<et2-button id="from_expander" label="From" onclick="app.mail.compose_fieldExpander"></et2-button>
 							<et2-button id="cc_expander" label="Cc" onclick="app.mail.compose_fieldExpander"></et2-button>
 							<et2-button id="bcc_expander" label="Bcc" onclick="app.mail.compose_fieldExpander"></et2-button>
 							<et2-button id="replyto_expander" label="Reply to" onclick="app.mail.compose_fieldExpander"></et2-button>