From b48cc825e0058cdfdfff76691074466124c9a9ce Mon Sep 17 00:00:00 2001
From: JimmFly <yangjinfei001@gmail.com>
Date: Mon, 9 Sep 2024 07:54:56 +0000
Subject: [PATCH] fix(core): unexpected jump when clicking save tag (#8171)

close AF-1285

https://github.com/user-attachments/assets/1ec4adf5-4340-4e94-9e56-6a05e7a65f18
---
 .../frontend/core/src/components/page-list/list.css.ts     | 1 +
 .../core/src/components/page-list/tags/create-tag.tsx      | 7 +++++++
 2 files changed, 8 insertions(+)

diff --git a/packages/frontend/core/src/components/page-list/list.css.ts b/packages/frontend/core/src/components/page-list/list.css.ts
index 72963f66c6..4380e8b976 100644
--- a/packages/frontend/core/src/components/page-list/list.css.ts
+++ b/packages/frontend/core/src/components/page-list/list.css.ts
@@ -73,6 +73,7 @@ export const editTagWrapper = style({
   width: '100%',
   height: '60px',
   display: 'none',
+  zIndex: 1,
   selectors: {
     '&[data-show=true]': {
       background: cssVar('backgroundPrimaryColor'),
diff --git a/packages/frontend/core/src/components/page-list/tags/create-tag.tsx b/packages/frontend/core/src/components/page-list/tags/create-tag.tsx
index c1f2fb7217..b35cd9a0f7 100644
--- a/packages/frontend/core/src/components/page-list/tags/create-tag.tsx
+++ b/packages/frontend/core/src/components/page-list/tags/create-tag.tsx
@@ -3,6 +3,7 @@ import { TagService } from '@affine/core/modules/tag';
 import { useI18n } from '@affine/i18n';
 import { useLiveData, useService } from '@toeverything/infra';
 import clsx from 'clsx';
+import type { MouseEvent } from 'react';
 import { useCallback, useEffect, useMemo, useState } from 'react';
 
 import type { TagMeta } from '../types';
@@ -107,6 +108,11 @@ export const CreateOrEditTag = ({
     return;
   }, [onClose, t, tag, tagIcon, tagMeta, tagName, tagOptions, tagList]);
 
+  const handlePropagation = useCallback((event: MouseEvent) => {
+    event.preventDefault();
+    event.stopPropagation();
+  }, []);
+
   useEffect(() => {
     if (!open) return;
     if (menuOpen) return;
@@ -138,6 +144,7 @@ export const CreateOrEditTag = ({
       className={styles.createTagWrapper}
       data-show={open}
       data-testid="edit-tag-modal"
+      onClick={handlePropagation}
     >
       <Menu
         rootOptions={{