domma-cms 1.71.1 → 1.73.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (87) hide show
  1. package/CHANGELOG.md +13 -0
  2. package/docs/DommaFeatures.md +1 -0
  3. package/package.json +1 -1
  4. package/plugins/_lib/admin/mail/body-menu.js +1 -1
  5. package/plugins/_lib/admin/mail/cms-host.js +1 -1
  6. package/plugins/_lib/admin/mail/compose-window.js +90 -3
  7. package/plugins/_lib/admin/mail/contacts.js +1 -1
  8. package/plugins/_lib/admin/mail/diagnostics-section.js +75 -41
  9. package/plugins/_lib/admin/mail/drag-drop.js +1 -1
  10. package/plugins/_lib/admin/mail/folder-tree.js +1 -1
  11. package/plugins/_lib/admin/mail/font-controls.js +1 -1
  12. package/plugins/_lib/admin/mail/fonts.js +1 -1
  13. package/plugins/_lib/admin/mail/host-context.js +1 -1
  14. package/plugins/_lib/admin/mail/identity.js +1 -1
  15. package/plugins/_lib/admin/mail/image-senders-section.js +156 -99
  16. package/plugins/_lib/admin/mail/keyboard.js +1 -1
  17. package/plugins/_lib/admin/mail/mail.css +1 -1
  18. package/plugins/_lib/admin/mail/mail.html +1 -1
  19. package/plugins/_lib/admin/mail/message-actions.js +1 -1
  20. package/plugins/_lib/admin/mail/oauth-panel.js +1 -1
  21. package/plugins/_lib/admin/mail/panes.js +1 -1
  22. package/plugins/_lib/admin/mail/reader-kit.js +12 -4
  23. package/plugins/_lib/admin/mail/reader-runtime.js +372 -96
  24. package/plugins/_lib/admin/mail/reader-view.js +1 -1
  25. package/plugins/_lib/admin/mail/resizable.js +1 -1
  26. package/plugins/_lib/admin/mail/restore-spam.js +1 -1
  27. package/plugins/_lib/admin/mail/rules.js +1 -1
  28. package/plugins/_lib/admin/mail/scheduling.js +1 -1
  29. package/plugins/_lib/admin/mail/section-kit.js +1 -1
  30. package/plugins/_lib/admin/mail/security-note.js +1 -1
  31. package/plugins/_lib/admin/mail/settings-section.js +156 -99
  32. package/plugins/_lib/admin/mail/templates.js +1 -1
  33. package/plugins/_lib/admin/mail/threads.js +1 -1
  34. package/plugins/_lib/admin/mail/vacation.js +45 -1
  35. package/plugins/_lib/admin/mail/when-closed.js +1 -1
  36. package/plugins/_lib/admin/ui/dates.js +1 -1
  37. package/plugins/_lib/admin/ui/resizable.js +1 -1
  38. package/plugins/_lib/admin/ui/rich-field.js +291 -0
  39. package/plugins/_lib/domma-mail.lock.json +83 -80
  40. package/plugins/_lib/mail/accountFileStore.js +1 -1
  41. package/plugins/_lib/mail/accountRepository.js +31 -3
  42. package/plugins/_lib/mail/accountRoutes.js +1 -1
  43. package/plugins/_lib/mail/accounts.js +1 -1
  44. package/plugins/_lib/mail/bodyTokenProvider.js +1 -1
  45. package/plugins/_lib/mail/bodyTokens.js +1 -1
  46. package/plugins/_lib/mail/compose.js +1 -1
  47. package/plugins/_lib/mail/defaults.js +1 -1
  48. package/plugins/_lib/mail/envelope.js +1 -1
  49. package/plugins/_lib/mail/folderActions.js +1 -1
  50. package/plugins/_lib/mail/folderRuntime.js +1 -1
  51. package/plugins/_lib/mail/folders.js +1 -1
  52. package/plugins/_lib/mail/imapPoolRuntime.js +1 -1
  53. package/plugins/_lib/mail/mbox.js +1 -1
  54. package/plugins/_lib/mail/message-action.js +1 -1
  55. package/plugins/_lib/mail/messageSecurity.js +1 -1
  56. package/plugins/_lib/mail/messageSecurityProvider.js +1 -1
  57. package/plugins/_lib/mail/networkAddresses.js +1 -1
  58. package/plugins/_lib/mail/networkPolicy.js +1 -1
  59. package/plugins/_lib/mail/oauthAccounts.js +1 -1
  60. package/plugins/_lib/mail/oauthRouteRuntime.js +1 -1
  61. package/plugins/_lib/mail/oauthRuntime.js +1 -1
  62. package/plugins/_lib/mail/pollSchedule.js +1 -1
  63. package/plugins/_lib/mail/poller.js +1 -1
  64. package/plugins/_lib/mail/pollerRuntime.js +1 -1
  65. package/plugins/_lib/mail/priority.js +1 -1
  66. package/plugins/_lib/mail/publicMailbox.js +1 -1
  67. package/plugins/_lib/mail/readRuntime.js +1 -1
  68. package/plugins/_lib/mail/render.js +1 -1
  69. package/plugins/_lib/mail/ruleRunner.js +1 -1
  70. package/plugins/_lib/mail/schedulerRuntime.js +1 -1
  71. package/plugins/_lib/mail/secretProvider.js +1 -1
  72. package/plugins/_lib/mail/secretbox.js +1 -1
  73. package/plugins/_lib/mail/senderAuth.js +1 -1
  74. package/plugins/_lib/mail/sieve.js +1 -1
  75. package/plugins/_lib/mail/smtpService.js +1 -1
  76. package/plugins/_lib/mail/snoozeRuntime.js +1 -1
  77. package/plugins/_lib/mail/store.js +1 -1
  78. package/plugins/_lib/mail/subscriptions.js +1 -1
  79. package/plugins/_lib/mail/syncPlan.js +1 -1
  80. package/plugins/_lib/mail/syncRuntime.js +1 -1
  81. package/plugins/_lib/mail/syncSelection.js +1 -1
  82. package/plugins/_lib/mail/unreadBadge.js +1 -1
  83. package/plugins/_lib/mail/unsubscribe.js +1 -1
  84. package/plugins/_lib/mail/vacationRuntime.js +1 -1
  85. package/plugins/_lib/mail/write.js +1 -1
  86. package/plugins/_lib/public/rich-text.mjs +104 -0
  87. package/plugins/_lib/rich-text.js +153 -0
@@ -1,4 +1,4 @@
1
- // Source: @domma-mail/core 0.29.1, packages/core/src/admin/mail/image-senders-section.js.
1
+ // Source: @domma-mail/core 0.32.0, packages/core/src/admin/mail/image-senders-section.js.
2
2
  // Update with domma-mail/scripts/sync-cms.mjs; edit the shared source.
3
3
  /**
4
4
  * The settings section for senders whose images always load.
@@ -10,6 +10,11 @@
10
10
  * find is one they cannot revoke, and this one decides whether a sender learns
11
11
  * that their mail was opened.
12
12
  *
13
+ * Built with domma-reactive. Each trusted sender is a row with a menu
14
+ * (right-click, its ⋮ or Shift+F10: Stop trusting, Copy address), and
15
+ * "+ Trust a sender" sits under a divider. Contacts whose images stay blocked
16
+ * (where the host has contacts) are rows too, with Allow again.
17
+ *
13
18
  * @module _lib/admin/mail/image-senders-section
14
19
  */
15
20
 
@@ -17,21 +22,51 @@
17
22
  const TONE = {ok: 'text-success', bad: 'text-danger', quiet: 'text-muted'};
18
23
 
19
24
  /**
20
- * The section's markup. Its own DOM, never passed through `_.render`, so the
21
- * row's `{{address}}` is the list's template and not eaten on the way in.
25
+ * The section's markup. Its own DOM, never passed through `_.render`; every value
26
+ * reaches the page through a binding, never interpolated.
22
27
  */
23
28
  const TEMPLATE = `
24
29
  <div class="mail-image-senders">
25
30
  <p class="text-sm text-muted mb-3">Remote images are blocked by default, because loading one tells the sender that the message was opened and who opened it. Senders listed here are trusted, and their images load without asking.</p>
26
31
  <label class="mail-toggle-row text-sm">
27
- <input type="checkbox" class="mail-remember" data-bind-checked="remember.value">
32
+ <input type="checkbox" data-model="remember.value" data-on-change="saveRemember">
28
33
  Offer to remember senders
34
+ <span data-help-title="Offer to remember senders" data-help="When a message's images are blocked, the reader offers 'Always from this sender'. Switched off, it never offers, and the senders below are kept but ignored until you switch it back on."></span>
29
35
  </label>
36
+ <h4 class="mail-section-heading">Trusted senders <span data-help-title="Trusted senders" data-help="Images from these addresses load as soon as you open the message. Right-click one, use its ⋮, or press Shift+F10 to stop trusting it."></span></h4>
30
37
  <p class="text-sm text-muted mail-none" data-bind-hidden="senders.value.length">No senders trusted yet.</p>
31
- <div class="mail-sender-list" data-each="senders.value key=address">
32
- <div class="mail-box-row" data-address="{{address}}">
33
- <span class="flex-1 text-sm mail-ellipsis">{{address}}</span>
34
- <button type="button" class="btn btn-sm btn-ghost text-danger mail-untrust" data-bind-disabled="busy">Stop trusting</button>
38
+ <div class="mail-sender-list" data-ref="list" data-each="senders.value key=address">
39
+ <div class="mail-box-row mail-sender-row" tabindex="0" data-bind-data-address="address"
40
+ data-bind-aria-label="address + ' - Shift+F10 for actions'">
41
+ <span class="flex-1 text-sm mail-ellipsis" data-bind-text="address"></span>
42
+ <button type="button" class="btn btn-sm btn-ghost mail-row-more" aria-label="More actions" aria-haspopup="menu" title="More actions"
43
+ data-bind-disabled="busy" data-on-click="$root.more($data)">⋮</button>
44
+ </div>
45
+ </div>
46
+ <hr class="mail-list-divider">
47
+ <div class="flex items-center gap-2 flex-wrap" data-bind-hidden="!adding.value">
48
+ <input type="email" class="form-input form-input-sm" style="max-width:20rem" placeholder="news@example.com" aria-label="Sender address" data-model="newAddress.value" data-ref="new">
49
+ <button type="button" class="btn btn-sm btn-primary" data-on-click="trust" data-bind-disabled="!newAddress.value">Trust</button>
50
+ <button type="button" class="btn btn-sm btn-ghost" data-on-click="cancelAdd">Cancel</button>
51
+ </div>
52
+ <div class="flex items-center gap-2" data-bind-hidden="adding.value">
53
+ <button type="button" class="btn btn-sm btn-ghost" data-on-click="startAdd" data-bind-disabled="!remember.value">+ Trust a sender</button>
54
+ <span data-help-title="Trust a sender" data-help="Type an address to load its images from now on, without waiting for a message. Needs 'Offer to remember senders' on."></span>
55
+ </div>
56
+ <div data-bind-hidden="!hasContacts">
57
+ <h4 class="mail-section-heading">People in my contacts</h4>
58
+ <label class="mail-toggle-row text-sm">
59
+ <input type="checkbox" data-model="contactImages.value" data-on-change="saveContacts" data-bind-disabled="contactBusy.value">
60
+ Load images from people in my contacts
61
+ <span data-help-title="Images from contacts" data-help="Pictures from anyone in your Contacts load straight away - but only when your mail server confirms the message really came from them, because anyone can put a contact's address on a message."></span>
62
+ </label>
63
+ <p class="text-sm text-muted mail-hint">Only when your mail server confirms the message really came from them, because anyone can put a contact's address on a message.</p>
64
+ <p class="text-sm text-muted mail-none" data-bind-hidden="!blocks.value.length">Contacts whose images stay blocked:</p>
65
+ <div class="mail-sender-list mt-2" data-each="blocks.value key=address">
66
+ <div class="mail-box-row">
67
+ <span class="flex-1 text-sm mail-ellipsis" data-bind-text="address"></span>
68
+ <button type="button" class="btn btn-sm btn-ghost" data-on-click="$root.allow($data)">Allow again</button>
69
+ </div>
35
70
  </div>
36
71
  </div>
37
72
  <div data-bind-class="'text-sm mail-status mt-2 ' + statusClass.value" data-bind-text="status.value"></div>
@@ -47,22 +82,72 @@ async function render(container, ctx) {
47
82
  container.textContent = 'Add a mailbox first.';
48
83
  return;
49
84
  }
85
+ const M = ctx.host?.M ?? globalThis.M;
86
+ const E = ctx.host?.E ?? globalThis.E;
87
+ const openMenuAt = ctx.host?.helpers?.openMenuAt ?? ((el) => {
88
+ const r = el.getBoundingClientRect();
89
+ el.dispatchEvent(new MouseEvent('contextmenu', {bubbles: true, cancelable: true, clientX: r.left, clientY: r.bottom, view: window}));
90
+ });
50
91
 
51
92
  const params = new URLSearchParams({account: ctx.account.id});
52
93
  const data = await ctx.api(`${ctx.base}/image-senders?${params}`);
94
+ if (!container.isConnected) return;
53
95
 
54
96
  // ---- State ----
55
97
  const busy = new Set();
56
- const list = M.observable((data.senders ?? []).map(address => ({address, busy: false})));
57
- const remember = M.observable(data.remember !== false);
58
- const status = M.observable('');
59
- const tone = M.observable('quiet');
60
- const say = (text, t = 'quiet') => { status.value = text ?? ''; tone.value = t; };
61
- const paint = (senders) => { list.value = senders.map(address => ({address, busy: busy.has(address)})); };
98
+ const rowsOf = (senders) => senders.map(address => ({address, busy: busy.has(address)}));
99
+ const m = {
100
+ senders: M.observable(rowsOf(data.senders ?? [])),
101
+ remember: M.observable(data.remember !== false),
102
+ hasContacts: typeof data.contactImages === 'boolean',
103
+ contactImages: M.observable(data.contactImages !== false),
104
+ contactBusy: M.observable(false),
105
+ blocks: M.observable((data.contactImageBlocks ?? []).map(address => ({address}))),
106
+ adding: M.observable(false),
107
+ newAddress: M.observable(''),
108
+ status: M.observable(''),
109
+ tone: M.observable('quiet'),
110
+ more(row, event) {
111
+ event?.stopPropagation?.();
112
+ openMenuAt(event?.currentTarget ?? root);
113
+ },
114
+ startAdd() { m.adding.value = true; setTimeout(() => root.querySelector('[data-ref="new"]')?.focus(), 0); },
115
+ cancelAdd() { m.adding.value = false; m.newAddress.value = ''; },
116
+ async trust() {
117
+ const address = m.newAddress.peek().trim();
118
+ if (!address) return;
119
+ try {
120
+ const result = await ctx.api(`${ctx.base}/image-senders?${params}`, 'POST', {address});
121
+ paint(result.senders ?? []);
122
+ m.adding.value = false;
123
+ m.newAddress.value = '';
124
+ say(`Images from ${address} will load straight away.`, 'ok');
125
+ } catch (err) { say(err.message, 'bad'); }
126
+ },
127
+ async saveRemember() {
128
+ const wanted = m.remember.peek();
129
+ try {
130
+ const result = await ctx.api(`${ctx.base}/image-senders/remember?${params}`, 'PUT', {remember: wanted});
131
+ say(result.remember ? 'Senders can be remembered.' : 'Remembering is off. The list is kept but ignored.');
132
+ } catch (err) {
133
+ m.remember.value = !wanted;
134
+ say(err.message, 'bad');
135
+ }
136
+ },
137
+ async saveContacts() {
138
+ const enabled = m.contactImages.peek();
139
+ await saveContactChange({enabled}, enabled ? 'Images from verified contacts load straight away.'
140
+ : 'Images from contacts are blocked like anyone else\'s.', () => { m.contactImages.value = !enabled; });
141
+ },
142
+ allow(row) { saveContactChange({unblock: row.address}, `Images from ${row.address} load again when verified.`); }
143
+ };
144
+ m.statusClass = M.computed(() => TONE[m.tone.value] ?? TONE.quiet);
145
+ const say = (text, t = 'quiet') => { m.status.value = text ?? ''; m.tone.value = t; };
146
+ const paint = (senders) => { m.senders.value = rowsOf(senders); };
62
147
 
63
148
  async function untrust(address) {
64
149
  busy.add(address);
65
- paint(list.peek().map(r => r.address));
150
+ paint(m.senders.peek().map(r => r.address));
66
151
  try {
67
152
  const query = new URLSearchParams({account: ctx.account.id, address});
68
153
  const result = await ctx.api(`${ctx.base}/image-senders?${query}`, 'DELETE');
@@ -71,109 +156,81 @@ async function render(container, ctx) {
71
156
  say(`Images from ${address} will be blocked again.`);
72
157
  } catch (err) {
73
158
  busy.delete(address);
74
- paint(list.peek().map(r => r.address));
159
+ paint(m.senders.peek().map(r => r.address));
75
160
  say(err.message, 'bad');
76
161
  }
77
162
  }
78
163
 
79
- async function saveRemember(wanted) {
80
- remember.value = wanted;
164
+ async function saveContactChange(change, done, undo = () => {}) {
165
+ m.contactBusy.value = true;
81
166
  try {
82
- const result = await ctx.api(`${ctx.base}/image-senders/remember?${params}`, 'PUT', {remember: wanted});
83
- say(result.remember ? 'Senders can be remembered.' : 'Remembering is off. The list is kept but ignored.');
167
+ const result = await ctx.api(`${ctx.base}/image-senders/contacts?${params}`, 'PUT', change);
168
+ m.contactImages.value = result.contactImages !== false;
169
+ m.blocks.value = (result.contactImageBlocks ?? []).map(address => ({address}));
170
+ say(done, 'ok');
84
171
  } catch (err) {
85
- remember.value = !wanted;
172
+ undo();
86
173
  say(err.message, 'bad');
87
- }
174
+ } finally { m.contactBusy.value = false; }
88
175
  }
89
176
 
90
177
  const holder = document.createElement('div');
91
178
  holder.innerHTML = TEMPLATE.trim();
92
179
  const root = holder.firstElementChild;
93
180
  container.appendChild(root);
94
- M.applyBindings({
95
- senders: list, remember, status,
96
- statusClass: M.computed(() => TONE[tone.value] ?? TONE.quiet)
97
- }, root);
98
- root.querySelector('.mail-remember').addEventListener('change', (event) => saveRemember(event.target.checked));
99
-
100
- if (typeof data.contactImages === 'boolean') drawContacts(root, ctx, params, data, say);
101
-
102
- // One listener for every row's button - the rows are re-rendered by the list.
103
- root.addEventListener('click', (event) => {
104
- const button = event.target.closest('.mail-untrust');
105
- const row = button?.closest('[data-address]');
106
- if (row && !button.disabled) untrust(row.dataset.address);
107
- });
108
- }
181
+ const listEl = root.querySelector('[data-ref="list"]');
182
+ const bindings = M.applyBindings(m, root);
109
183
 
110
- /**
111
- * "Load images from people in my contacts" - only where the host has contacts
112
- * (the server sends `contactImages` then). On by default; the server also
113
- * insists the receiving mail server verified the sender, so a forged From
114
- * line naming a contact loads nothing.
115
- *
116
- * @returns {void}
117
- */
118
- function drawContacts(root, ctx, params, data, say) {
119
- const box = document.createElement('div');
120
- box.className = 'mail-contact-images mt-3';
121
- const label = document.createElement('label');
122
- label.className = 'mail-toggle-row text-sm';
123
- const input = document.createElement('input');
124
- input.type = 'checkbox';
125
- input.checked = data.contactImages !== false;
126
- label.append(input, ' Load images from people in my contacts');
127
- const hint = document.createElement('p');
128
- hint.className = 'text-sm text-muted mail-hint';
129
- hint.textContent = 'Only when your mail server confirms the message really came from them, because anyone can put a contact\'s address on a message.';
130
- const list = document.createElement('div');
131
- list.className = 'mail-sender-list mt-2';
132
- box.append(label, hint, list);
133
- const status = root.querySelector('.mail-status');
134
- root.insertBefore(box, status);
135
-
136
- const drawBlocks = (blocks) => {
137
- list.replaceChildren();
138
- if (!blocks.length) return;
139
- const head = document.createElement('p');
140
- head.className = 'text-sm text-muted mail-none';
141
- head.textContent = 'Contacts whose images stay blocked:';
142
- list.appendChild(head);
143
- for (const address of blocks) {
144
- const row = document.createElement('div');
145
- row.className = 'mail-box-row';
146
- const name = document.createElement('span');
147
- name.className = 'flex-1 text-sm mail-ellipsis';
148
- name.textContent = address;
149
- const allow = document.createElement('button');
150
- allow.type = 'button';
151
- allow.className = 'btn btn-sm btn-ghost';
152
- allow.textContent = 'Allow again';
153
- allow.addEventListener('click', () => save({unblock: address}, `Images from ${address} load again when verified.`));
154
- row.append(name, allow);
155
- list.appendChild(row);
184
+ // The row menu: right-click, its ⋮, or Shift+F10.
185
+ const rowOf = (el) => el?.closest?.('.mail-sender-row');
186
+ let menu = null;
187
+ if (typeof E?.contextMenu === 'function') {
188
+ menu = E.contextMenu(listEl, {
189
+ match: '.mail-sender-row',
190
+ inherit: false,
191
+ items: [],
192
+ onBeforeOpen: (c) => {
193
+ const row = rowOf(c?.target);
194
+ const address = row?.dataset.address;
195
+ if (!address) return false;
196
+ menu.setItems([
197
+ {label: 'Stop trusting', icon: 'x', action: () => untrust(address)},
198
+ {label: 'Copy address', icon: 'copy', action: () => navigator.clipboard?.writeText(address).then(() => say('Copied.'), () => {})}
199
+ ]);
200
+ return true;
201
+ }
202
+ });
203
+ }
204
+ const onKey = (event) => {
205
+ const row = rowOf(event.target);
206
+ if (!row) return;
207
+ if (event.key === 'F10' && event.shiftKey) {
208
+ event.preventDefault();
209
+ openMenuAt(row.querySelector('.mail-row-more') ?? row);
210
+ } else if ((event.key === 'ArrowDown' || event.key === 'ArrowUp') && event.target === row) {
211
+ const rows = [...listEl.querySelectorAll('.mail-sender-row')];
212
+ const next = rows[rows.indexOf(row) + (event.key === 'ArrowDown' ? 1 : -1)];
213
+ if (next) { event.preventDefault(); next.focus(); }
156
214
  }
157
215
  };
158
- async function save(change, done) {
159
- input.disabled = true;
160
- try {
161
- const result = await ctx.api(`${ctx.base}/image-senders/contacts?${params}`, 'PUT', change);
162
- input.checked = result.contactImages !== false;
163
- drawBlocks(result.contactImageBlocks ?? []);
164
- say(done, 'ok');
165
- } catch (err) {
166
- if (typeof change.enabled === 'boolean') input.checked = !change.enabled;
167
- say(err.message, 'bad');
168
- } finally { input.disabled = false; }
169
- }
170
- input.addEventListener('change', () => save({enabled: input.checked},
171
- input.checked ? 'Images from verified contacts load straight away.' : 'Images from contacts are blocked like anyone else\'s.'));
172
- drawBlocks(data.contactImageBlocks ?? []);
216
+ listEl.addEventListener('keydown', onKey);
217
+ ctx.onClose?.(() => {
218
+ listEl.removeEventListener('keydown', onKey);
219
+ try { menu?.destroy?.(); } catch { /* gone */ }
220
+ try { bindings?.dispose?.(); } catch { /* gone */ }
221
+ });
173
222
  }
174
223
 
175
224
  /** The section both editions show. */
176
225
  export const imageSendersSection = {
177
226
  id: 'images', label: 'Images', render,
178
- help: 'Pictures in mail are blocked until you ask for them, because loading one tells the sender you opened it. Senders listed here are trusted: their pictures load straight away.'
227
+ help: 'Pictures in mail are blocked until you ask for them, because loading one tells the sender you opened it. Senders listed here are trusted: their pictures load straight away.',
228
+ guide: `<p>Pictures in a message are often fetched from the sender's server when you open it, which tells them that you opened it, when, and roughly where. So they are blocked until you ask.</p>
229
+ <h4>Trusted senders</h4>
230
+ <ul><li>In the reader, <b>Load images</b> loads them once; <b>Always from this sender</b> adds the sender here.</li>
231
+ <li><b>+ Trust a sender</b> adds an address straight away.</li>
232
+ <li>Right-click a sender, use its <b>⋮</b>, or press Shift+F10 to <b>Stop trusting</b> it or copy the address.</li>
233
+ <li>Switch <b>Offer to remember senders</b> off to stop the reader offering; the list is kept but ignored.</li></ul>
234
+ <h4>People in my contacts</h4>
235
+ <p>Where Contacts is available, pictures from your contacts can load straight away - only when your mail server confirms the message really came from them. A contact you block from a message stays listed here until you allow it again.</p>`
179
236
  };
@@ -1,4 +1,4 @@
1
- // Source: @domma-mail/core 0.29.1, packages/core/src/admin/mail/keyboard.js.
1
+ // Source: @domma-mail/core 0.32.0, packages/core/src/admin/mail/keyboard.js.
2
2
  // Update with domma-mail/scripts/sync-cms.mjs; edit the shared source.
3
3
  /**
4
4
  * Keyboard navigation for the reader.
@@ -1 +1 @@
1
- #view-container.mail-fullbleed{max-width:none}.mail-layout [hidden],.dm-slideover [hidden]{display:none!important}.mail-reader-summary{display:flex;align-items:baseline;gap:.5rem;flex-wrap:wrap}.mail-header-toggle,.mail-extras-toggle{padding:0!important;font-size:.78rem;opacity:.75;text-decoration:underline}.mail-header-toggle:hover,.mail-extras-toggle:hover{opacity:1}.mail-header-details{display:grid;grid-template-columns:max-content 1fr;gap:.15rem .75rem;margin:.5rem 0 0;font-size:.8rem}.mail-header-details dt{opacity:.65}.mail-header-details dd{margin:0;overflow-wrap:anywhere}.mail-layout{display:grid;grid-template-columns:var(--mail-col-1, 190px) auto var(--mail-col-2, 340px) auto 1fr;height:calc(100vh - 140px);min-height:320px;border:1px solid var(--dm-border);border-radius:var(--dm-radius-md, 8px);overflow:hidden;background:var(--dm-surface)}.mail-folders-pane,.mail-list-pane{display:flex;flex-direction:column;border-right:1px solid var(--dm-border);min-width:0;min-height:0}.mail-reader-pane{display:flex;flex-direction:column;min-width:0;min-height:0}.mail-pane-head{display:flex;align-items:center;justify-content:space-between;gap:.5rem;padding:.5rem .75rem;font-size:.8rem;font-weight:600;text-transform:uppercase;letter-spacing:.04em;color:var(--dm-text-muted);border-bottom:1px solid var(--dm-border);flex-shrink:0}.mail-folders-list,.mail-list{overflow-y:auto;flex:1;min-height:0}.mail-search{display:flex;align-items:center;gap:.4rem;padding:.4rem .6rem;border-bottom:1px solid var(--dm-border);color:var(--dm-text-muted);flex-shrink:0}.mail-search input{flex:1;min-width:0;font-size:.85rem;padding:.25rem .4rem}.mail-search-note{padding:.3rem .6rem;font-size:.74rem;color:var(--dm-text-muted);border-bottom:1px solid var(--dm-border);flex-shrink:0}.mail-slideover-resizer{padding:0;position:absolute;left:0;top:0;bottom:0;width:6px;cursor:col-resize;z-index:2;background:transparent}.mail-slideover-resizer:hover,.is-resizing>.mail-slideover-resizer{background:var(--dm-primary);opacity:.7}.is-resizing{user-select:none;transition:none!important}.mail-selection{display:flex;align-items:center;gap:.35rem;flex-wrap:wrap;padding:.35rem .6rem;font-size:.78rem;background:var(--dm-primary);color:var(--dm-primary-text);flex-shrink:0}.mail-selection span{flex:1;min-width:0}.mail-selection .btn{color:var(--dm-primary-text);border:1px solid currentColor;background:transparent}.mail-selection .btn:hover{background:color-mix(in srgb,var(--dm-primary-text) 15%,transparent)}.mail-item.is-selected{background:var(--dm-active-bg);box-shadow:inset 3px 0 0 var(--dm-primary)}.mail-undo{display:flex;align-items:center;gap:.5rem;padding:.4rem .6rem;font-size:.78rem;background:var(--dm-active-bg);border-bottom:1px solid var(--dm-border);flex-shrink:0}.mail-undo span{flex:1;min-width:0;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.mail-splitter{width:5px;cursor:col-resize;background:var(--dm-border);flex-shrink:0;background-clip:content-box;border-left:2px solid transparent;border-right:2px solid transparent;box-sizing:content-box}.mail-splitter:hover,.mail-layout.is-resizing .mail-splitter{background-color:var(--dm-primary)}.mail-layout.is-resizing{user-select:none}.mail-layout.is-resizing .mail-folders-pane,.mail-layout.is-resizing .mail-list-pane,.mail-layout.is-resizing .mail-reader-pane,.mail-layout.is-resizing iframe{pointer-events:none}.mail-unread-filter{display:flex;align-items:center;gap:.3rem;font-size:.7rem;text-transform:none;letter-spacing:0;cursor:pointer;margin-left:auto;margin-right:.25rem}.mail-unread-pill{flex-shrink:0;min-width:1.15rem;padding:0 .3rem;border-radius:999px;background:var(--dm-primary);color:var(--dm-primary-text);font-size:.66rem;font-weight:700;line-height:1.35;text-align:center}.mail-folder.is-context .mail-folder-name{opacity:.6}.mail-account{display:flex;align-items:center;gap:.4rem;width:100%;padding:.45rem .6rem;border:none;background:var(--dm-surface);cursor:pointer;text-align:left;font-size:.78rem;font-weight:700;text-transform:uppercase;letter-spacing:.03em;color:var(--dm-text-muted)}.mail-account:hover{background:var(--dm-hover-bg)}.mail-account.is-active{color:var(--dm-text);position:sticky;top:0;z-index:1;background:var(--dm-surface)}.mail-account-name{overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.mail-folder{display:flex;align-items:center;gap:.5rem;padding:.45rem .75rem;font-size:.875rem;cursor:pointer;border:none;background:none;width:100%;text-align:left;color:var(--dm-text)}.mail-folder:hover{background:var(--dm-hover-bg)}.mail-folder.is-active{background:var(--dm-active-bg);color:var(--dm-primary);font-weight:600}.mail-folder.is-unselectable{opacity:.6;cursor:default}.mail-folder.is-unselectable:hover{background:none}.mail-folder-name{overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.mail-item{display:block;width:100%;text-align:left;padding:.55rem .75rem;border:none;border-bottom:1px solid var(--dm-border);background:none;cursor:pointer;color:var(--dm-text)}.mail-item:hover{background:var(--dm-hover-bg)}.mail-item.is-active{background:var(--dm-active-bg)}.mail-item-top{display:flex;justify-content:space-between;gap:.5rem;align-items:baseline}.mail-item-from{font-size:.85rem;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.mail-item.is-unread .mail-item-from,.mail-item.is-unread .mail-item-subject{font-weight:700}.mail-item-date{font-size:.72rem;color:var(--dm-text-muted);flex-shrink:0}.mail-item-subject{font-size:.82rem;margin-top:.1rem;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.mail-item-meta{display:flex;align-items:center;gap:.35rem;margin-top:.15rem;color:var(--dm-text-muted)}.mail-pager{display:flex;align-items:center;justify-content:space-between;gap:.5rem;padding:.4rem .6rem;border-top:1px solid var(--dm-border);font-size:.75rem;color:var(--dm-text-muted);flex-shrink:0}.mail-reader-head{padding:.75rem 1rem;border-bottom:1px solid var(--dm-border);flex-shrink:0}.mail-reader-head:empty{display:none}.mail-reader-subject{font-size:1.05rem;font-weight:600;margin:0 0 .3rem;color:var(--dm-text)}.mail-reader-actions{display:flex;gap:.25rem;margin:.1rem 0 .35rem;flex-wrap:wrap}.mail-reader-meta{font-size:.8rem;color:var(--dm-text-muted)}.mail-reader-body{flex:1;position:relative;overflow:hidden;display:flex;flex-direction:column;min-height:0;background:var(--dm-surface)}.mail-reader-body iframe{width:100%;flex:1;border:none;display:block;background:#fff}.mail-notice{display:flex;align-items:center;gap:.5rem;flex-wrap:wrap;padding:.4rem .75rem;font-size:.78rem;background:var(--dm-warning);color:var(--dm-warning-text);border-bottom:1px solid var(--dm-border)}.mail-notice .btn{color:var(--dm-warning-text);border:1px solid currentColor;background:transparent;opacity:.95}.mail-notice .btn:hover{background:color-mix(in srgb,var(--dm-warning-text) 15%,transparent);opacity:1}.mail-security--ok{background:color-mix(in srgb,var(--dm-success) 14%,var(--dm-surface));color:var(--dm-text)}.mail-security--bad{background:var(--dm-danger);color:var(--dm-danger-text)}.mail-security-detail{flex-basis:100%;opacity:.85;overflow-wrap:anywhere}.mail-attachments{display:flex;flex-wrap:wrap;gap:.4rem;padding:.5rem .75rem;border-bottom:1px solid var(--dm-border);background:var(--dm-background-alt)}.mail-empty{display:flex;flex-direction:column;align-items:center;justify-content:center;gap:.5rem;height:100%;color:var(--dm-text-muted);text-align:center;padding:1rem}.mail-empty p{margin:0;font-size:.875rem}@media(max-width:900px){.mail-layout{grid-template-columns:1fr;height:auto!important}.mail-splitter{display:none}.mail-folders-pane,.mail-list-pane{border-right:none;border-bottom:1px solid var(--dm-border)}.mail-folders-list,.mail-list{max-height:240px}.mail-reader-body{min-height:60vh}}.mail-box-row{display:flex;align-items:center;gap:.5rem;padding:.5rem .6rem;border:1px solid var(--dm-border);border-radius:var(--dm-radius-md, 6px)}.mail-default-badge{margin-left:.4rem;font-size:.7rem;font-weight:500;vertical-align:middle}.mail-item.is-dragging{opacity:.45}.mail-item{position:relative}.mail-item-tick{position:absolute;left:.45rem;top:.55rem;display:inline-flex;opacity:0;color:var(--dm-text-muted);transition:opacity .12s ease;padding:2px;margin:-2px;border-radius:var(--dm-radius-sm, 3px)}.mail-item:hover .mail-item-tick,.mail-item:focus-visible .mail-item-tick,.mail-list.is-selecting .mail-item-tick,.mail-item-tick[aria-checked=true]{opacity:1}.mail-item-tick[aria-checked=true]{color:var(--dm-primary)}.mail-item-tick:hover{color:var(--dm-primary);background:var(--dm-hover-bg)}.mail-item-top,.mail-item-subject,.mail-item-meta{padding-left:1.5rem}.mail-select-all{display:inline-flex;align-items:center;margin-right:.1rem;cursor:pointer}.mail-select-all input{cursor:pointer;margin:0}.sr-only{position:absolute;width:1px;height:1px;padding:0;margin:-1px;overflow:hidden;clip:rect(0,0,0,0);white-space:nowrap;border:0}.mail-item-meta>span{display:inline-flex}.mail-item-meta .is-replied{color:var(--dm-success)}.mail-item-meta .is-forwarded{color:var(--dm-info, var(--dm-primary))}.mail-item-meta .is-high{color:var(--dm-danger)}.mail-item-meta .is-low{color:var(--dm-text-muted);opacity:.7}.mail-folder.is-hidden-folder .mail-folder-name{opacity:.5;font-style:italic}.mail-thread-chip{display:inline-flex;align-items:center;margin-left:.4rem;padding:0 .35rem;border-radius:999px;font-size:.68rem;font-weight:700;line-height:1.5;color:var(--dm-text-muted);background:var(--dm-active-bg);cursor:pointer}.mail-thread-chip:hover{color:var(--dm-primary)}.mail-thread-chip.is-unread{background:var(--dm-primary);color:var(--dm-primary-text)}.mail-item.is-in-thread{padding-left:1.6rem;box-shadow:inset 3px 0 0 var(--dm-border)}.mail-item.is-in-thread .mail-item-from{font-size:.8rem}.mail-pane-head .btn.is-on{color:var(--dm-primary);background:var(--dm-active-bg)}#mail-outbox-btn{font-size:.72rem;font-weight:700}#mail-outbox-btn.is-failed{color:var(--dm-danger)}.mail-attachment{display:inline-flex;align-items:center;border:1px solid var(--dm-border);border-radius:var(--dm-radius-md, 6px);overflow:hidden}.mail-attachment .btn{border:none;border-radius:0}.mail-attachment-save{padding-left:.4rem!important;padding-right:.4rem!important;border-left:1px solid var(--dm-border)!important;opacity:.7}.mail-attachment-save:hover{opacity:1;color:var(--dm-primary)}.mail-section-heading{margin:1rem 0 .1rem;font-size:.8rem;text-transform:uppercase;letter-spacing:.04em;color:var(--dm-text-muted)}.mail-section-heading:first-child{margin-top:.25rem}.mail-section-form .domma-form{margin:0}.mail-section-form .domma-form-field:last-child{margin-bottom:0}.mail-item-card{margin:0}.mail-item-card .card-header{padding:.5rem .6rem}.mail-item-card .card-body{padding:.6rem}.mail-ellipsis{overflow:hidden;text-overflow:ellipsis;white-space:nowrap;min-width:0}.mail-status{min-height:1.2em}.mail-empty-line{margin:.25rem 0}.mail-editor-fallback{min-height:8rem;font-family:inherit;resize:vertical}.mail-clause{display:flex;gap:.3rem;align-items:center;flex-wrap:wrap}.mail-clause .form-select,.mail-clause .form-input{width:auto;flex:0 1 auto}.mail-clause .mail-clause-value{flex:1 1 8rem;min-width:8rem}.mail-section-list{display:flex;flex-direction:column;gap:.5rem}.mail-scroll-sm{max-height:20vh;overflow-y:auto}.mail-scroll-md{max-height:46vh;overflow-y:auto}.mail-section-form .domma-form-field:has(select) .form-label .text-danger{display:none}.mail-compose-form{padding:.25rem 0 .5rem;display:flex;flex-direction:column;gap:.6rem;height:100%}.mail-compose-body{display:flex;flex-direction:column;flex:1;min-height:0}.mail-compose-editor{flex:1;min-height:0}.mail-compose-textarea{flex:1;min-height:34vh;font-family:inherit;resize:vertical}.mail-attach-list{display:flex;flex-direction:column;gap:.2rem}.mail-template-row{margin:-.15rem 0 .35rem}.mail-template-picker{max-width:16rem}.mail-suggest-row{display:flex;flex-direction:column;line-height:1.25}.mail-suggest-detail{opacity:.7}.mail-rule-off{opacity:.55}.mail-panel{padding:.25rem 0 .5rem}.mail-panel-stack{padding:.25rem 0 .5rem;display:flex;flex-direction:column;gap:1rem}.mail-form-stack{padding:.25rem 0 .5rem;display:flex;flex-direction:column;gap:.75rem}.mail-dialog-stack{display:flex;flex-direction:column;gap:.5rem;padding:.25rem 0}.mail-hint{margin-top:.2rem}.mail-box-sub{overflow:hidden;text-overflow:ellipsis}.mail-add-btn{align-self:flex-start;margin-top:.5rem}.mail-none{margin:0;padding:.5rem .6rem}.mail-kv{padding:.5rem 0;display:flex;flex-direction:column;gap:.35rem}.mail-kv-row{display:flex;gap:.75rem}.mail-kv-key{min-width:8.5rem;flex-shrink:0}.mail-toggle-row{display:flex;align-items:center;gap:.5rem;margin-bottom:.75rem}.mail-sender-list{display:flex;flex-direction:column;gap:.2rem;max-height:40vh;overflow-y:auto}.mail-folder-pick{display:flex;align-items:center;gap:.5rem;padding:.3rem .4rem;border-radius:var(--dm-radius-md, 6px)}.mail-diag-log{width:100%;height:30vh;margin-top:.5rem;font-family:monospace;font-size:.72rem}.mail-facts{display:flex;flex-direction:column;gap:.2rem;margin-bottom:.75rem}.mail-item-more{position:absolute;right:.4rem;bottom:.35rem;display:inline-flex;align-items:center;justify-content:center;min-width:1.4rem;height:1.4rem;border-radius:var(--dm-radius-sm, 3px);font-size:1rem;line-height:1;color:var(--dm-text-muted);background:inherit;opacity:0;transition:opacity .12s ease}.mail-item:hover .mail-item-more,.mail-item:focus-visible .mail-item-more,.mail-item.is-active .mail-item-more{opacity:1}.mail-item-more:hover{color:var(--dm-primary)}.mail-section-intro{display:flex;align-items:center;gap:.35rem;margin:0 0 .75rem;padding-bottom:.5rem;border-bottom:1px solid var(--dm-border)}.mail-pager-middle{display:flex;align-items:center;gap:.5rem;min-width:0}.mail-page-size{font:inherit;color:inherit;background:transparent;border:1px solid var(--dm-border);border-radius:4px;padding:.1rem .25rem}.mail-auth-choice{display:flex;flex-wrap:wrap;align-items:center;gap:.4rem;padding-bottom:.5rem;border-bottom:1px solid var(--dm-border)}.mail-oauth{display:flex;flex-direction:column;gap:.75rem}.mail-oauth-warn{margin:0;padding:.5rem .7rem;border:1px solid var(--dm-warning);border-radius:var(--dm-radius-md);color:var(--dm-warning-text)}.mail-oauth-state{display:flex;align-items:center;gap:.5rem;flex-wrap:wrap}.mail-oauth-chip{margin-left:.4rem;border:1px solid var(--dm-border);background:var(--dm-surface);color:var(--dm-text-muted)}.mail-oauth-state .mail-oauth-chip{margin-left:0}.mail-oauth-chip--ok{border-color:var(--dm-success);color:var(--dm-success)}.mail-oauth-chip--bad{border-color:var(--dm-danger);color:var(--dm-danger)}.mail-oauth-guide{border:1px solid var(--dm-border);border-radius:var(--dm-radius-md);padding:.5rem .75rem;background:var(--dm-background-alt)}.mail-oauth-guide>summary{cursor:pointer;font-weight:600}.mail-oauth-guide-body ol{padding-left:1.2rem;margin:.5rem 0 0}.mail-oauth-guide-body li{margin-bottom:.45rem}.mail-oauth-code{word-break:break-all;user-select:all}.mail-loading-slot{display:block;min-height:3rem;padding:.5rem .6rem}.mail-row-more{flex-shrink:0;margin-left:auto;display:inline-flex;align-items:center;justify-content:center;min-width:1.3rem;height:1.3rem;border-radius:var(--dm-radius-sm);font-size:.95rem;line-height:1;color:var(--dm-text-muted);opacity:0;transition:opacity .12s ease}.mail-unread-pill+.mail-row-more{margin-left:0}.mail-folder:hover .mail-row-more,.mail-folder:focus-visible .mail-row-more,.mail-folder.is-active .mail-row-more,.mail-account:hover .mail-row-more,.mail-account:focus-visible .mail-row-more,.mail-account.is-active .mail-row-more{opacity:1}.mail-row-more:hover{color:var(--dm-primary)}.mail-box-row .mail-row-more{opacity:1;margin-left:0}.mail-box-row:focus-visible{outline:2px solid var(--dm-primary);outline-offset:-2px}.mail-restored-note{margin:0;padding:.4rem .6rem;border-left:3px solid var(--dm-warning);background:var(--dm-background-alt)}.mail-font-controls .mail-font-btn{width:auto;min-width:3.5rem;max-width:10rem;padding:0 .5rem;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;font-size:.8125rem}.domma-dropdown-menu:has(.mail-font-item),.domma-dropdown-menu:has(.mail-size-item){max-height:min(60vh,26rem);overflow-y:auto;z-index:10050}.domma-dropdown-item:has(.mail-font-item){display:flex;align-items:center;justify-content:space-between;gap:.75rem}.mail-font-item{font-size:.9375rem}.mail-font-web{font-size:.6875rem;color:var(--dm-text-muted);text-transform:uppercase;letter-spacing:.04em}.mail-item.is-dragging,.mail-folder.is-dragging{opacity:.45}.mail-folders-pane[data-drop-hint]{position:relative}.mail-folders-pane[data-drop-hint]:after{content:attr(data-drop-hint);position:absolute;bottom:0;left:0;right:0;padding:.65rem;background:var(--dm-primary);color:var(--dm-primary-text);font-size:.75rem;pointer-events:none;z-index:1}.mail-folders-pane.is-root-drop-target{outline:2px solid var(--dm-primary);outline-offset:-2px}.mail-folder.is-drop-target{background:var(--dm-primary);color:var(--dm-primary-text);outline:2px solid var(--dm-primary);outline-offset:-2px}.mail-folder.is-drop-target .mail-folder-name,.mail-folder.is-drop-target .mail-unread-pill{color:inherit}.mail-item.is-dragging *{pointer-events:none}.tab-item .mail-tab-pip{display:inline-block;width:.45rem;height:.45rem;margin-left:.35rem;border-radius:50%;background:var(--dm-warning, var(--dm-primary));vertical-align:middle}.mail-notice.mail-notice--quiet{background:var(--dm-background-alt);color:var(--dm-text-muted)}.mail-notice.mail-notice--quiet .btn{color:var(--dm-text)}
1
+ #view-container.mail-fullbleed{max-width:none}.mail-layout [hidden],.dm-slideover [hidden]{display:none!important}.mail-reader-summary{display:flex;align-items:baseline;gap:.5rem;flex-wrap:wrap}.mail-header-toggle,.mail-extras-toggle{padding:0!important;font-size:.78rem;opacity:.75;text-decoration:underline}.mail-header-toggle:hover,.mail-extras-toggle:hover{opacity:1}.mail-header-details{display:grid;grid-template-columns:max-content 1fr;gap:.15rem .75rem;margin:.5rem 0 0;font-size:.8rem}.mail-header-details dt{opacity:.65}.mail-header-details dd{margin:0;overflow-wrap:anywhere}.mail-layout{display:grid;grid-template-columns:var(--mail-col-1, 190px) auto var(--mail-col-2, 340px) auto 1fr;height:calc(100vh - 140px);min-height:320px;border:1px solid var(--dm-border);border-radius:var(--dm-radius-md, 8px);overflow:hidden;background:var(--dm-surface)}.mail-folders-pane,.mail-list-pane{display:flex;flex-direction:column;border-right:1px solid var(--dm-border);min-width:0;min-height:0}.mail-reader-pane{display:flex;flex-direction:column;min-width:0;min-height:0}.mail-pane-head{display:flex;align-items:center;justify-content:space-between;gap:.5rem;padding:.5rem .75rem;font-size:.8rem;font-weight:600;text-transform:uppercase;letter-spacing:.04em;color:var(--dm-text-muted);border-bottom:1px solid var(--dm-border);flex-shrink:0}.mail-folders-list,.mail-list{overflow-y:auto;flex:1;min-height:0}.mail-search{display:flex;align-items:center;gap:.4rem;padding:.4rem .6rem;border-bottom:1px solid var(--dm-border);color:var(--dm-text-muted);flex-shrink:0}.mail-search input{flex:1;min-width:0;font-size:.85rem;padding:.25rem .4rem}.mail-search-note{padding:.3rem .6rem;font-size:.74rem;color:var(--dm-text-muted);border-bottom:1px solid var(--dm-border);flex-shrink:0}.mail-slideover-resizer{padding:0;position:absolute;left:0;top:0;bottom:0;width:6px;cursor:col-resize;z-index:2;background:transparent}.mail-slideover-resizer:hover,.is-resizing>.mail-slideover-resizer{background:var(--dm-primary);opacity:.7}.is-resizing{user-select:none;transition:none!important}.mail-selection{display:flex;align-items:center;gap:.35rem;flex-wrap:wrap;padding:.35rem .6rem;font-size:.78rem;background:var(--dm-primary);color:var(--dm-primary-text);flex-shrink:0}.mail-selection span{flex:1;min-width:0}.mail-selection .btn{color:var(--dm-primary-text);border:1px solid currentColor;background:transparent}.mail-selection .btn:hover{background:color-mix(in srgb,var(--dm-primary-text) 15%,transparent)}.mail-item.is-selected{background:var(--dm-active-bg);box-shadow:inset 3px 0 0 var(--dm-primary)}.mail-undo{display:flex;align-items:center;gap:.5rem;padding:.4rem .6rem;font-size:.78rem;background:var(--dm-active-bg);border-bottom:1px solid var(--dm-border);flex-shrink:0}.mail-undo span{flex:1;min-width:0;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.mail-splitter{width:5px;cursor:col-resize;background:var(--dm-border);flex-shrink:0;background-clip:content-box;border-left:2px solid transparent;border-right:2px solid transparent;box-sizing:content-box}.mail-splitter:hover,.mail-layout.is-resizing .mail-splitter{background-color:var(--dm-primary)}.mail-layout.is-resizing{user-select:none}.mail-layout.is-resizing .mail-folders-pane,.mail-layout.is-resizing .mail-list-pane,.mail-layout.is-resizing .mail-reader-pane,.mail-layout.is-resizing iframe{pointer-events:none}.mail-unread-filter{display:flex;align-items:center;gap:.3rem;font-size:.7rem;text-transform:none;letter-spacing:0;cursor:pointer;margin-left:auto;margin-right:.25rem}.mail-unread-pill{flex-shrink:0;min-width:1.15rem;padding:0 .3rem;border-radius:999px;background:var(--dm-primary);color:var(--dm-primary-text);font-size:.66rem;font-weight:700;line-height:1.35;text-align:center}.mail-folder.is-context .mail-folder-name{opacity:.6}.mail-account{display:flex;align-items:center;gap:.4rem;width:100%;padding:.45rem .6rem;border:none;background:var(--dm-surface);cursor:pointer;text-align:left;font-size:.78rem;font-weight:700;text-transform:uppercase;letter-spacing:.03em;color:var(--dm-text-muted)}.mail-account:hover{background:var(--dm-hover-bg)}.mail-account.is-active{color:var(--dm-text);position:sticky;top:0;z-index:1;background:var(--dm-surface)}.mail-account-name{overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.mail-folder{display:flex;align-items:center;gap:.5rem;padding:.45rem .75rem;font-size:.875rem;cursor:pointer;border:none;background:none;width:100%;text-align:left;color:var(--dm-text)}.mail-folder:hover{background:var(--dm-hover-bg)}.mail-folder.is-active{background:var(--dm-active-bg);color:var(--dm-primary);font-weight:600}.mail-folder.is-unselectable{opacity:.6;cursor:default}.mail-folder.is-unselectable:hover{background:none}.mail-folder-name{overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.mail-item{display:block;width:100%;text-align:left;padding:.55rem .75rem;border:none;border-bottom:1px solid var(--dm-border);background:none;cursor:pointer;color:var(--dm-text)}.mail-item:hover{background:var(--dm-hover-bg)}.mail-item.is-active{background:var(--dm-active-bg)}.mail-item-top{display:flex;justify-content:space-between;gap:.5rem;align-items:baseline}.mail-item-from{font-size:.85rem;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.mail-item.is-unread .mail-item-from,.mail-item.is-unread .mail-item-subject{font-weight:700}.mail-item-date{font-size:.72rem;color:var(--dm-text-muted);flex-shrink:0}.mail-item-subject{font-size:.82rem;margin-top:.1rem;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.mail-item-meta{display:flex;align-items:center;gap:.35rem;margin-top:.15rem;color:var(--dm-text-muted)}.mail-pager{display:flex;align-items:center;justify-content:space-between;gap:.5rem;padding:.4rem .6rem;border-top:1px solid var(--dm-border);font-size:.75rem;color:var(--dm-text-muted);flex-shrink:0}.mail-reader-head{padding:.75rem 1rem;border-bottom:1px solid var(--dm-border);flex-shrink:0}.mail-reader-head:empty{display:none}.mail-reader-subject{font-size:1.05rem;font-weight:600;margin:0 0 .3rem;color:var(--dm-text)}.mail-reader-actions{display:flex;gap:.25rem;margin:.1rem 0 .35rem;flex-wrap:wrap}.mail-reader-meta{font-size:.8rem;color:var(--dm-text-muted)}.mail-reader-body{flex:1;position:relative;overflow:hidden;display:flex;flex-direction:column;min-height:0;background:var(--dm-surface)}.mail-reader-body iframe{width:100%;flex:1;border:none;display:block;background:#fff}.mail-notice{display:flex;align-items:center;gap:.5rem;flex-wrap:wrap;padding:.4rem .75rem;font-size:.78rem;background:var(--dm-warning);color:var(--dm-warning-text);border-bottom:1px solid var(--dm-border)}.mail-notice .btn{color:var(--dm-warning-text);border:1px solid currentColor;background:transparent;opacity:.95}.mail-notice .btn:hover{background:color-mix(in srgb,var(--dm-warning-text) 15%,transparent);opacity:1}.mail-security--ok{background:color-mix(in srgb,var(--dm-success) 14%,var(--dm-surface));color:var(--dm-text)}.mail-security--bad{background:var(--dm-danger);color:var(--dm-danger-text)}.mail-security-detail{flex-basis:100%;opacity:.85;overflow-wrap:anywhere}.mail-attachments{display:flex;flex-wrap:wrap;gap:.4rem;padding:.5rem .75rem;border-bottom:1px solid var(--dm-border);background:var(--dm-background-alt)}.mail-empty{display:flex;flex-direction:column;align-items:center;justify-content:center;gap:.5rem;height:100%;color:var(--dm-text-muted);text-align:center;padding:1rem}.mail-empty p{margin:0;font-size:.875rem}@media(max-width:900px){.mail-layout{grid-template-columns:1fr;height:auto!important}.mail-splitter{display:none}.mail-folders-pane,.mail-list-pane{border-right:none;border-bottom:1px solid var(--dm-border)}.mail-folders-list,.mail-list{max-height:240px}.mail-reader-body{min-height:60vh}}.mail-box-row{display:flex;align-items:center;gap:.5rem;padding:.5rem .6rem;border:1px solid var(--dm-border);border-radius:var(--dm-radius-md, 6px)}.mail-default-badge{margin-left:.4rem;font-size:.7rem;font-weight:500;vertical-align:middle}.mail-item.is-dragging{opacity:.45}.mail-item{position:relative}.mail-item-tick{position:absolute;left:.45rem;top:.55rem;display:inline-flex;opacity:0;color:var(--dm-text-muted);transition:opacity .12s ease;padding:2px;margin:-2px;border-radius:var(--dm-radius-sm, 3px)}.mail-item:hover .mail-item-tick,.mail-item:focus-visible .mail-item-tick,.mail-list.is-selecting .mail-item-tick,.mail-item-tick[aria-checked=true]{opacity:1}.mail-item-tick[aria-checked=true]{color:var(--dm-primary)}.mail-item-tick:hover{color:var(--dm-primary);background:var(--dm-hover-bg)}.mail-item-top,.mail-item-subject,.mail-item-meta{padding-left:1.5rem}.mail-select-all{display:inline-flex;align-items:center;margin-right:.1rem;cursor:pointer}.mail-select-all input{cursor:pointer;margin:0}.sr-only{position:absolute;width:1px;height:1px;padding:0;margin:-1px;overflow:hidden;clip:rect(0,0,0,0);white-space:nowrap;border:0}.mail-item-meta>span{display:inline-flex}.mail-item-meta .is-replied{color:var(--dm-success)}.mail-item-meta .is-forwarded{color:var(--dm-info, var(--dm-primary))}.mail-item-meta .is-high{color:var(--dm-danger)}.mail-item-meta .is-low{color:var(--dm-text-muted);opacity:.7}.mail-folder.is-hidden-folder .mail-folder-name{opacity:.5;font-style:italic}.mail-thread-chip{display:inline-flex;align-items:center;margin-left:.4rem;padding:0 .35rem;border-radius:999px;font-size:.68rem;font-weight:700;line-height:1.5;color:var(--dm-text-muted);background:var(--dm-active-bg);cursor:pointer}.mail-thread-chip:hover{color:var(--dm-primary)}.mail-thread-chip.is-unread{background:var(--dm-primary);color:var(--dm-primary-text)}.mail-item.is-in-thread{padding-left:1.6rem;box-shadow:inset 3px 0 0 var(--dm-border)}.mail-item.is-in-thread .mail-item-from{font-size:.8rem}.mail-pane-head .btn.is-on{color:var(--dm-primary);background:var(--dm-active-bg)}#mail-outbox-btn{font-size:.72rem;font-weight:700}#mail-outbox-btn.is-failed{color:var(--dm-danger)}.mail-attachment{display:inline-flex;align-items:center;border:1px solid var(--dm-border);border-radius:var(--dm-radius-md, 6px);overflow:hidden}.mail-attachment .btn{border:none;border-radius:0}.mail-attachment-save{padding-left:.4rem!important;padding-right:.4rem!important;border-left:1px solid var(--dm-border)!important;opacity:.7}.mail-attachment-save:hover{opacity:1;color:var(--dm-primary)}.mail-section-heading{margin:1rem 0 .1rem;font-size:.8rem;text-transform:uppercase;letter-spacing:.04em;color:var(--dm-text-muted)}.mail-section-heading:first-child{margin-top:.25rem}.mail-section-form .domma-form{margin:0}.mail-section-form .domma-form-field:last-child{margin-bottom:0}.mail-item-card{margin:0}.mail-item-card .card-header{padding:.5rem .6rem}.mail-item-card .card-body{padding:.6rem}.mail-ellipsis{overflow:hidden;text-overflow:ellipsis;white-space:nowrap;min-width:0}.mail-status{min-height:1.2em}.mail-empty-line{margin:.25rem 0}.mail-editor-fallback{min-height:8rem;font-family:inherit;resize:vertical}.mail-clause{display:flex;gap:.3rem;align-items:center;flex-wrap:wrap}.mail-clause .form-select,.mail-clause .form-input{width:auto;flex:0 1 auto}.mail-clause .mail-clause-value{flex:1 1 8rem;min-width:8rem}.mail-section-list{display:flex;flex-direction:column;gap:.5rem}.mail-scroll-sm{max-height:20vh;overflow-y:auto}.mail-scroll-md{max-height:46vh;overflow-y:auto}.mail-section-form .domma-form-field:has(select) .form-label .text-danger{display:none}.mail-compose-form{padding:.25rem 0 .5rem;display:flex;flex-direction:column;gap:.6rem;height:100%}.mail-compose-body{display:flex;flex-direction:column;flex:1;min-height:0}.mail-compose-editor{flex:1;min-height:0}.mail-compose-textarea{flex:1;min-height:34vh;font-family:inherit;resize:vertical}.mail-attach-list{display:flex;flex-direction:column;gap:.2rem}.mail-template-row{margin:-.15rem 0 .35rem}.mail-template-picker{max-width:16rem}.mail-suggest-row{display:flex;flex-direction:column;line-height:1.25}.mail-suggest-detail{opacity:.7}.mail-rule-off{opacity:.55}.mail-panel{padding:.25rem 0 .5rem}.mail-panel-stack{padding:.25rem 0 .5rem;display:flex;flex-direction:column;gap:1rem}.mail-form-stack{padding:.25rem 0 .5rem;display:flex;flex-direction:column;gap:.75rem}.mail-dialog-stack{display:flex;flex-direction:column;gap:.5rem;padding:.25rem 0}.mail-hint{margin-top:.2rem}.mail-box-sub{overflow:hidden;text-overflow:ellipsis}.mail-add-btn{align-self:flex-start;margin-top:.5rem}.mail-none{margin:0;padding:.5rem .6rem}.mail-kv{padding:.5rem 0;display:flex;flex-direction:column;gap:.35rem}.mail-kv-row{display:flex;gap:.75rem}.mail-kv-key{min-width:8.5rem;flex-shrink:0}.mail-toggle-row{display:flex;align-items:center;gap:.5rem;margin-bottom:.75rem}.mail-sender-list{display:flex;flex-direction:column;gap:.2rem;max-height:40vh;overflow-y:auto}.mail-folder-pick{display:flex;align-items:center;gap:.5rem;padding:.3rem .4rem;border-radius:var(--dm-radius-md, 6px)}.mail-diag-log{width:100%;height:30vh;margin-top:.5rem;font-family:monospace;font-size:.72rem}.mail-facts{display:flex;flex-direction:column;gap:.2rem;margin-bottom:.75rem}.mail-item-more{position:absolute;right:.4rem;bottom:.35rem;display:inline-flex;align-items:center;justify-content:center;min-width:1.4rem;height:1.4rem;border-radius:var(--dm-radius-sm, 3px);font-size:1rem;line-height:1;color:var(--dm-text-muted);background:inherit;opacity:0;transition:opacity .12s ease}.mail-item:hover .mail-item-more,.mail-item:focus-visible .mail-item-more,.mail-item.is-active .mail-item-more{opacity:1}.mail-item-more:hover{color:var(--dm-primary)}.mail-section-intro{display:flex;align-items:center;gap:.35rem;margin:0 0 .75rem;padding-bottom:.5rem;border-bottom:1px solid var(--dm-border)}.mail-pager-middle{display:flex;align-items:center;gap:.5rem;min-width:0}.mail-page-size{font:inherit;color:inherit;background:transparent;border:1px solid var(--dm-border);border-radius:4px;padding:.1rem .25rem}.mail-auth-choice{display:flex;flex-wrap:wrap;align-items:center;gap:.4rem;padding-bottom:.5rem;border-bottom:1px solid var(--dm-border)}.mail-oauth{display:flex;flex-direction:column;gap:.75rem}.mail-oauth-warn{margin:0;padding:.5rem .7rem;border:1px solid var(--dm-warning);border-radius:var(--dm-radius-md);color:var(--dm-warning-text)}.mail-oauth-state{display:flex;align-items:center;gap:.5rem;flex-wrap:wrap}.mail-oauth-chip{margin-left:.4rem;border:1px solid var(--dm-border);background:var(--dm-surface);color:var(--dm-text-muted)}.mail-oauth-state .mail-oauth-chip{margin-left:0}.mail-oauth-chip--ok{border-color:var(--dm-success);color:var(--dm-success)}.mail-oauth-chip--bad{border-color:var(--dm-danger);color:var(--dm-danger)}.mail-oauth-guide{border:1px solid var(--dm-border);border-radius:var(--dm-radius-md);padding:.5rem .75rem;background:var(--dm-background-alt)}.mail-oauth-guide>summary{cursor:pointer;font-weight:600}.mail-oauth-guide-body ol{padding-left:1.2rem;margin:.5rem 0 0}.mail-oauth-guide-body li{margin-bottom:.45rem}.mail-oauth-code{word-break:break-all;user-select:all}.mail-loading-slot{display:block;min-height:3rem;padding:.5rem .6rem}.mail-row-more{flex-shrink:0;margin-left:auto;display:inline-flex;align-items:center;justify-content:center;min-width:1.3rem;height:1.3rem;border-radius:var(--dm-radius-sm);font-size:.95rem;line-height:1;color:var(--dm-text-muted);opacity:0;transition:opacity .12s ease}.mail-unread-pill+.mail-row-more{margin-left:0}.mail-folder:hover .mail-row-more,.mail-folder:focus-visible .mail-row-more,.mail-folder.is-active .mail-row-more,.mail-account:hover .mail-row-more,.mail-account:focus-visible .mail-row-more,.mail-account.is-active .mail-row-more{opacity:1}.mail-row-more:hover{color:var(--dm-primary)}.mail-box-row .mail-row-more{opacity:1;margin-left:0}.mail-box-row:focus-visible{outline:2px solid var(--dm-primary);outline-offset:-2px}.mail-restored-note{margin:0;padding:.4rem .6rem;border-left:3px solid var(--dm-warning);background:var(--dm-background-alt)}.mail-font-controls .mail-font-btn{width:auto;min-width:3.5rem;max-width:10rem;padding:0 .5rem;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;font-size:.8125rem}.domma-dropdown-menu:has(.mail-font-item),.domma-dropdown-menu:has(.mail-size-item){max-height:min(60vh,26rem);overflow-y:auto;z-index:10050}.domma-dropdown-item:has(.mail-font-item){display:flex;align-items:center;justify-content:space-between;gap:.75rem}.mail-font-item{font-size:.9375rem}.mail-font-web{font-size:.6875rem;color:var(--dm-text-muted);text-transform:uppercase;letter-spacing:.04em}.mail-item.is-dragging,.mail-folder.is-dragging{opacity:.45}.mail-folders-pane[data-drop-hint]{position:relative}.mail-folders-pane[data-drop-hint]:after{content:attr(data-drop-hint);position:absolute;bottom:0;left:0;right:0;padding:.65rem;background:var(--dm-primary);color:var(--dm-primary-text);font-size:.75rem;pointer-events:none;z-index:1}.mail-folders-pane.is-root-drop-target{outline:2px solid var(--dm-primary);outline-offset:-2px}.mail-folder.is-drop-target{background:var(--dm-primary);color:var(--dm-primary-text);outline:2px solid var(--dm-primary);outline-offset:-2px}.mail-folder.is-drop-target .mail-folder-name,.mail-folder.is-drop-target .mail-unread-pill{color:inherit}.mail-item.is-dragging *{pointer-events:none}.tab-item .mail-tab-pip{display:inline-block;width:.45rem;height:.45rem;margin-left:.35rem;border-radius:50%;background:var(--dm-warning, var(--dm-primary));vertical-align:middle}.mail-notice.mail-notice--quiet{background:var(--dm-background-alt);color:var(--dm-text-muted)}.mail-notice.mail-notice--quiet .btn{color:var(--dm-text)}.mail-settings-screen{border:1px solid var(--dm-border);border-radius:var(--dm-radius-md, 8px);background:var(--dm-surface);min-height:calc(100vh - 140px);display:flex;flex-direction:column}.mail-settings-head{display:flex;align-items:center;gap:.75rem;padding:.6rem .9rem;border-bottom:1px solid var(--dm-border)}.mail-settings-title{margin:0;font-size:1.05rem;font-weight:600}.mail-settings-body{display:grid;grid-template-columns:220px minmax(0,1fr);flex:1;min-height:0}.mail-settings-nav{border-right:1px solid var(--dm-border);padding:.6rem .4rem;overflow-y:auto}.mail-settings-group{margin-bottom:.8rem}.mail-settings-group-label{font-size:.7rem;font-weight:700;text-transform:uppercase;letter-spacing:.05em;color:var(--dm-text-muted);padding:.2rem .6rem}.mail-settings-link{display:flex;align-items:center;gap:.4rem;width:100%;text-align:left;border:0;background:none;color:var(--dm-text);padding:.4rem .6rem;border-radius:var(--dm-radius-md, 6px);font-size:.875rem;cursor:pointer}.mail-settings-link:hover{background:var(--dm-hover-bg)}.mail-settings-link.is-active{background:var(--dm-active-bg);color:var(--dm-primary);font-weight:600}.mail-settings-main{padding:1rem 1.25rem;overflow-y:auto;min-width:0}.mail-settings-panel{max-width:960px}@media(max-width:800px){.mail-settings-body{grid-template-columns:1fr}.mail-settings-nav{border-right:0;border-bottom:1px solid var(--dm-border);display:flex;flex-wrap:wrap;gap:.25rem .75rem}.mail-settings-group{margin:0}.mail-settings-link{display:inline-flex;width:auto}}.mail-layout[hidden],.mail-settings-screen[hidden]{display:none!important}.mail-section-help{margin-left:auto}.mail-help-body{padding:.25rem 0 1rem;font-size:.9rem;line-height:1.55}.mail-help-body h4{margin:1rem 0 .3rem;font-size:.85rem;text-transform:uppercase;letter-spacing:.04em;color:var(--dm-text-muted)}.mail-help-body p,.mail-help-body ul{margin:0 0 .6rem}.mail-settings-nav .mail-settings-group-label:not(:first-child){margin-top:.8rem}.mail-list-divider{border:0;border-top:1px solid var(--dm-border);margin:.25rem 0}.mail-settings-main{padding:1.5rem 2rem 2.5rem}.mail-settings-panel .mail-section-intro{margin-bottom:1.25rem;padding-bottom:.75rem}.mail-settings-panel .form-label{display:block;margin-bottom:.4rem}.mail-settings-panel :is(div,fieldset):has(>.form-label){margin-bottom:.9rem}.mail-settings-panel :is(div,fieldset):has(>.form-label):last-child{margin-bottom:0}.mail-settings-panel .mail-section-heading{margin-top:1.75rem;margin-bottom:.75rem}.mail-settings-panel>div>.mail-section-heading:first-child{margin-top:0}.mail-settings-panel p.text-sm{margin-bottom:.9rem;line-height:1.55}.mail-settings-panel :is(.flex,div):has(>.btn-primary){margin-top:1.25rem}.mail-settings-panel label:has(>input[type=checkbox]){margin-bottom:.6rem}.mail-settings-panel hr{margin:1.5rem 0}.mail-settings-panel details{margin:1rem 0}@media(max-width:800px){.mail-settings-main{padding:1rem}}.mail-settings-panel :is(.away-list,.ids-list,.tpl-list)>.btn{align-self:flex-start;width:auto}.mail-settings-panel .btn-primary:not(.btn-sm.mail-section-help){margin-top:.5rem}
@@ -1,4 +1,4 @@
1
- <!-- Source: @domma-mail/core 0.29.1, packages/core/src/admin/mail/mail.html. -->
1
+ <!-- Source: @domma-mail/core 0.32.0, packages/core/src/admin/mail/mail.html. -->
2
2
  <div class="mail-layout">
3
3
 
4
4
  <!-- Folders -->
@@ -1,4 +1,4 @@
1
- // Source: @domma-mail/core 0.29.1, packages/core/src/admin/mail/message-actions.js.
1
+ // Source: @domma-mail/core 0.32.0, packages/core/src/admin/mail/message-actions.js.
2
2
  // Update with domma-mail/scripts/sync-cms.mjs; edit the shared source.
3
3
  /**
4
4
  * What other Tools add to a message's menu - Booking's "Book Sam...".
@@ -1,4 +1,4 @@
1
- // Source: @domma-mail/core 0.29.1, packages/core/src/admin/mail/oauth-panel.js.
1
+ // Source: @domma-mail/core 0.32.0, packages/core/src/admin/mail/oauth-panel.js.
2
2
  // Update with domma-mail/scripts/sync-cms.mjs; edit the shared source.
3
3
  /**
4
4
  * "Sign in with Microsoft / Google" for a mailbox - the part of the mailbox
@@ -1,4 +1,4 @@
1
- // Source: @domma-mail/core 0.29.1, packages/core/src/admin/mail/panes.js.
1
+ // Source: @domma-mail/core 0.32.0, packages/core/src/admin/mail/panes.js.
2
2
  // Update with domma-mail/scripts/sync-cms.mjs; edit the shared source.
3
3
  /**
4
4
  * Pane sizing for the mail reader, shared by the Mail Reader and Email Pro.
@@ -1,4 +1,4 @@
1
- // Source: @domma-mail/core 0.29.1, packages/core/src/admin/mail/reader-kit.js.
1
+ // Source: @domma-mail/core 0.32.0, packages/core/src/admin/mail/reader-kit.js.
2
2
  // Update with domma-mail/scripts/sync-cms.mjs; edit the shared source.
3
3
  /**
4
4
  * The reader view's decisions that need no DOM - escaping, the mailbox form's
@@ -296,13 +296,21 @@ export function folderReadMenuModel({selectable = true, hasChildren = false, col
296
296
  * @param {{isDefault: boolean, count: number}} o
297
297
  * @returns {object[]}
298
298
  */
299
- export function mailboxRowMenuModel({isDefault = false, count = 1} = {}) {
299
+ export function mailboxRowMenuModel({isDefault = false, count = 1, oauth = false, needsSignIn = false, isOpen = false} = {}) {
300
300
  return [
301
301
  {id: 'edit', label: 'Edit…', icon: 'edit-3'},
302
- {id: 'open', label: 'Open in the reader', icon: 'inbox'},
302
+ {id: 'open', label: isOpen ? 'Open in the reader (open now)' : 'Open in the reader', icon: 'inbox'},
303
+ {id: 'refresh', label: 'Check for new mail', icon: 'refresh-cw'},
304
+ {type: 'divider'},
305
+ {id: 'test', label: 'Test the connection', icon: 'check'},
306
+ // A mailbox that signs in with Microsoft or Google: where to sign in again.
307
+ ...(oauth ? [{id: 'reconnect', label: needsSignIn ? 'Sign in again…' : 'Sign-in…', icon: 'log-in'}] : []),
308
+ {id: 'folders', label: 'Folders to sync…', icon: 'folder'},
303
309
  ...(count > 1 ? [{id: 'default', label: isDefault ? 'Unset default' : 'Make default', icon: 'star'}] : []),
304
310
  {type: 'divider'},
305
- {id: 'remove', label: 'Remove…', icon: 'trash', danger: true}
311
+ {id: 'remove', label: 'Remove…', icon: 'trash', danger: true},
312
+ {type: 'divider'},
313
+ {id: 'add', label: 'Add mailbox…', icon: 'plus'}
306
314
  ];
307
315
  }
308
316