Jayden/AFFiNE-Mirror
1
0
Fork 0
mirror of https://github.com/toeverything/AFFiNE.git synced 2026-02-12 12:28:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(core): disable quick search when the link-popup is visitable (#5409)

Browse Source 
close AFF-471
This commit is contained in:
JimmFly
2024-01-04 11:36:50 +00:00
parent f5b74ca8a9
commit 971f2beed1
5 changed files with 54 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
packages/frontend/core/src/commands/affine-settings.tsx
View File

@@ -1,5 +1,6 @@
import type { useAFFiNEI18N } from '@affine/i18n/hooks';
import { SettingsIcon } from '@blocksuite/icons';
import type { AffineEditorContainer } from '@blocksuite/presets';
import { appSettingAtom } from '@toeverything/infra/atom';
import {
PreconditionStrategy,
@@ -16,11 +17,13 @@ export function registerAffineSettingsCommands({
store,
theme,
languageHelper,
editor,
}: {
t: ReturnType<typeof useAFFiNEI18N>;
store: ReturnType<typeof createStore>;
theme: ReturnType<typeof useTheme>;
languageHelper: ReturnType<typeof useLanguageHelper>;
editor: AffineEditorContainer | null;
}) {
const unsubs: Array<() => void> = [];
const { onLanguageChange, languagesList, currentLanguage } = languageHelper;
@@ -36,7 +39,18 @@ export function registerAffineSettingsCommands({
icon: <SettingsIcon />,
run() {
const quickSearchModalState = store.get(openQuickSearchModalAtom);
store.set(openQuickSearchModalAtom, !quickSearchModalState);
if (!editor) {
return store.set(openQuickSearchModalAtom, !quickSearchModalState);
}
// Due to a conflict with the shortcut for creating a link after selecting text in blocksuite,
// opening the quick search modal is disabled when link-popup is visitable.
const textSelection = editor.host?.std.selection.find('text');
if (textSelection && textSelection.from.length > 0) {
const linkPopup = document.querySelector('link-popup');
if (linkPopup) return;
}
return store.set(openQuickSearchModalAtom, !quickSearchModalState);
},
})
);