From 37d5684d41b756210332111b91379fd4207ad065 Mon Sep 17 00:00:00 2001
From: Somay Chauhan <somaychauhan98@gmail.com>
Date: Mon, 23 Mar 2026 13:55:27 +0530
Subject: [PATCH 1/3] fix: bi-directional links show button overlapping
 database view settings

---
 .../core/src/blocksuite/block-suite-editor/styles.css.ts        | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/frontend/core/src/blocksuite/block-suite-editor/styles.css.ts b/packages/frontend/core/src/blocksuite/block-suite-editor/styles.css.ts
index 2ee4ebccf70e1..20863a6c465ae 100644
--- a/packages/frontend/core/src/blocksuite/block-suite-editor/styles.css.ts
+++ b/packages/frontend/core/src/blocksuite/block-suite-editor/styles.css.ts
@@ -21,6 +21,8 @@ export const affineEdgelessDocViewport = style({
 
 export const docContainer = style({
   display: 'block',
+  position: 'relative',
+  zIndex: 1,
   selectors: ['generating', 'finished', 'error'].reduce<
     NonNullable<StyleRule['selectors']>
   >((rules, state) => {

From 7ac7c99bd521c91653e9e046444a855980162ad0 Mon Sep 17 00:00:00 2001
From: Somay Chauhan <somaychauhan98@gmail.com>
Date: Fri, 3 Apr 2026 13:22:36 +0530
Subject: [PATCH 2/3] fix: type check and lint

---
 .../calendar/__tests__/service.spec.ts        | 22 +++++++++++++------
 .../src/desktop/dialogs/setting/index.tsx     |  4 +---
 2 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/packages/backend/server/src/plugins/calendar/__tests__/service.spec.ts b/packages/backend/server/src/plugins/calendar/__tests__/service.spec.ts
index 9fa7c6bf4e30d..bc8ba059a9b09 100644
--- a/packages/backend/server/src/plugins/calendar/__tests__/service.spec.ts
+++ b/packages/backend/server/src/plugins/calendar/__tests__/service.spec.ts
@@ -17,8 +17,8 @@ import type {
   UpsertCalendarSubscriptionInput,
 } from '../../../models';
 import { Models } from '../../../models';
-import { CalendarModule } from '../index';
 import { CalendarCronJobs } from '../cron';
+import { CalendarModule } from '../index';
 import {
   CalendarProvider,
   CalendarProviderFactory,
@@ -614,9 +614,13 @@ test('pollAccounts skips syncing when cluster lock is unavailable', async t => {
     'listAllWithAccountForSync',
     async () => []
   );
-  const syncAccountMock = mock.method(calendarService, 'syncAccount', async () => {
-    return;
-  });
+  const syncAccountMock = mock.method(
+    calendarService,
+    'syncAccount',
+    async () => {
+      return;
+    }
+  );
 
   await calendarCronJobs.pollAccounts();
 
@@ -649,9 +653,13 @@ test('pollAccounts only syncs due accounts', async t => {
       ] as any
   );
 
-  const syncAccountMock = mock.method(calendarService, 'syncAccount', async () => {
-    return;
-  });
+  const syncAccountMock = mock.method(
+    calendarService,
+    'syncAccount',
+    async () => {
+      return;
+    }
+  );
 
   await calendarCronJobs.pollAccounts();
 
diff --git a/packages/frontend/core/src/desktop/dialogs/setting/index.tsx b/packages/frontend/core/src/desktop/dialogs/setting/index.tsx
index 661835333eecd..419ac312e6b0f 100644
--- a/packages/frontend/core/src/desktop/dialogs/setting/index.tsx
+++ b/packages/frontend/core/src/desktop/dialogs/setting/index.tsx
@@ -15,7 +15,7 @@ import type {
 import { GlobalContextService } from '@affine/core/modules/global-context';
 import { createIsland, type Island } from '@affine/core/utils/island';
 import { ServerDeploymentType } from '@affine/graphql';
-import { Trans, useTranslation } from '@affine/i18n';
+import { Trans } from '@affine/i18n';
 import { ContactWithUsIcon } from '@blocksuite/icons/rc';
 import { FrameworkScope, useLiveData, useService } from '@toeverything/infra';
 import { debounce } from 'lodash-es';
@@ -72,12 +72,10 @@ const SettingModalInner = ({
     scrollAnchor: initialScrollAnchor,
   });
   const globalContextService = useService(GlobalContextService);
-  const { i18n } = useTranslation('translation');
 
   const currentServerId = useLiveData(
     globalContextService.globalContext.serverId.$
   );
-  const currentLanguageKey = i18n.resolvedLanguage ?? i18n.language;
   const serversService = useService(ServersService);
   const defaultServerService = useService(DefaultServerService);
   const currentServer =

From 38482f4a7dbeb5839691265239dd05b3eff7f266 Mon Sep 17 00:00:00 2001
From: Somay Chauhan <somaychauhan98@gmail.com>
Date: Fri, 3 Apr 2026 14:04:38 +0530
Subject: [PATCH 3/3] Fix view settings popup layering in data view

---
 .../tools/presets/view-options/view-options.ts            | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/blocksuite/affine/data-view/src/widget-presets/tools/presets/view-options/view-options.ts b/blocksuite/affine/data-view/src/widget-presets/tools/presets/view-options/view-options.ts
index 79a81d642eac3..8f15fbbf43947 100644
--- a/blocksuite/affine/data-view/src/widget-presets/tools/presets/view-options/view-options.ts
+++ b/blocksuite/affine/data-view/src/widget-presets/tools/presets/view-options/view-options.ts
@@ -74,7 +74,13 @@ export class DataViewHeaderToolsViewOptions extends WidgetBase {
   };
 
   openMoreAction = (target: PopupTarget) => {
-    popViewOptions(target, this.dataViewLogic);
+    popViewOptions(
+      {
+        ...target,
+        root: document.body,
+      },
+      this.dataViewLogic
+    );
   };
 
   override render() {