Merge remote-tracking branch 'origin/main' into react/type_widgets

; Conflicts:
;	apps/client/src/layouts/desktop_layout.tsx
;	apps/client/src/layouts/mobile_layout.tsx
;	apps/client/src/widgets/note_detail.ts
;	apps/client/src/widgets/react/hooks.tsx

packages/commons/src/lib/hidden_subtree.ts

@@ -6,7 +6,9 @@ enum Command {
     createNoteIntoInbox,
     showRecentChanges,
     showOptions,
-    createAiChat
+    createAiChat,
+    commandPalette,
+    toggleZenMode
 }
 
 export interface HiddenSubtreeAttribute {
@@ -41,7 +43,9 @@ export interface HiddenSubtreeItem {
         | "protectedSession"
         | "calendar"
         | "quickSearch"
-        | "aiChatLauncher";
+        | "aiChatLauncher"
+        | "commandPalette"
+        | "toggleZenMode";
     command?: keyof typeof Command;
     /**
      * If set to true, then branches will be enforced to be in the correct place.

packages/commons/src/lib/options_interface.ts

@@ -82,6 +82,7 @@ export interface OptionDefinitions extends KeyboardShortcutsOptions<KeyboardActi
     autoReadonlySizeText: number;
     autoReadonlySizeCode: number;
     maxContentWidth: number;
+    centerContent: boolean;
     minTocHeadings: number;
     eraseUnusedAttachmentsAfterSeconds: number;
     eraseUnusedAttachmentsAfterTimeScale: number;

packages/commons/src/lib/rows.ts

@@ -12,7 +12,7 @@ export interface AttachmentRow {
     isProtected?: boolean;
     dateModified?: string;
     utcDateModified?: string;
-    utcDateScheduledForErasureSince?: string;
+    utcDateScheduledForErasureSince?: string | null;
     isDeleted?: boolean;
     deleteId?: string;
     contentLength?: number;