Build your own AI office with Univer Office SDK. Bring editing, calculation, collaboration, and file processing into your product for people and AI agents. Built on an extensible open-source core.
TypeScript boardcollaborationdocdocxexceloffce365officepdfpptpptxpresentationsdksheetslidesspreadsheetuniverwordwordprocessorworkspacexlsx
fix(find-replace): restore match navigation after switching dialogs (#8138)
白熱7dbd698fdb9a
diff --git a/packages/find-replace/src/views/dialog/FindReplaceDialog.tsx b/packages/find-replace/src/views/dialog/FindReplaceDialog.tsxindex af5b27f8eb..8ced589f9e 100644--- a/packages/find-replace/src/views/dialog/FindReplaceDialog.tsx+++ b/packages/find-replace/src/views/dialog/FindReplaceDialog.tsx@@ -334,7 +334,7 @@ export function FindReplaceDialog() {}});- // Focus the input element the first time we open the find replace dialog.+ // Sync focus after opening or switching forms, once the new input ref is attached.focusRef.current?.focus();setDialogContainerFocus(true);@@ -344,7 +344,7 @@ export function FindReplaceDialog() {focusSubscription.unsubscribe();setDialogContainerFocus(false);};- }, [setDialogContainerFocus, setDialogInputFocus]);+ }, [setDialogContainerFocus, setDialogInputFocus, state.replaceRevealed]);return (<div ref={dialogContainerRef} data-u-comp="find-replace-dialog">diff --git a/packages/find-replace/src/views/dialog/__tests__/FindReplaceDialog.spec.tsx b/packages/find-replace/src/views/dialog/__tests__/FindReplaceDialog.spec.tsxindex 0b5f162662..2c7b669ac4 100644--- a/packages/find-replace/src/views/dialog/__tests__/FindReplaceDialog.spec.tsx+++ b/packages/find-replace/src/views/dialog/__tests__/FindReplaceDialog.spec.tsx@@ -15,7 +15,17 @@*/import { awaitTime, ICommandService, LocaleService, LocaleType, toDisposable, UniverInstanceType } from '@univerjs/core';-import { ILayoutService, IMessageService, RediContext } from '@univerjs/ui';+import {+ ILayoutService,+ IMessageService,+ IPlatformService,+ IUIRuntimeScopeService,+ KeyCode,+ PlatformService,+ RediContext,+ ShortcutService,+ UIRuntimeScopeService,+} from '@univerjs/ui';import { act } from 'react';import { createRoot } from 'react-dom/client';import { BehaviorSubject, Subject } from 'rxjs';@@ -26,9 +36,12 @@ import {ReplaceCurrentMatchCommand,} from '../../../commands/commands/replace.command';import {+ GoToNextMatchOperation,+ GoToPreviousMatchOperation,OpenFindDialogOperation,OpenReplaceDialogOperation,} from '../../../commands/operations/find-replace.operation';+import { GoToNextFindMatchShortcutItem, GoToPreviousFindMatchShortcutItem } from '../../../controllers/find-replace.shortcut';import enUS from '../../../locale/en-US';import {FindBy,@@ -386,28 +399,58 @@ describe('FindReplaceDialog', () => {expect(readState(testBed.findReplaceService)).toMatchObject({ matchesCount: 3, matchesPosition: 1 });});- it('reveals replace controls from a focusable advanced action without restarting the session', async () => {+ it('keeps match navigation working after clicking the focusable advanced find action', async () => {const testBed = createDialogTestBed();- await act(async () => {- testBed.commandService.syncExecuteCommand(OpenFindDialogOperation.id);- });-- const rendered = renderDialog(testBed.univer.__getInjector());- root = rendered.root;- container = rendered.container;-- await act(async () => {- const button = getButton(container!, ADVANCED_LABEL);- button.focus();- expect(document.activeElement).toBe(button);- button.click();- });-- expect(testBed.findReplaceService.replaceRevealed).toBe(true);- expect(getButton(container!, FIND_LABEL).disabled).toBe(true);- expect(getButton(container!, REPLACE_LABEL).disabled).toBe(true);- expect(getButton(container!, REPLACE_ALL_LABEL).disabled).toBe(true);- expect(getInputs(container!)).toHaveLength(2);+ const injector = testBed.univer.__getInjector();+ injector.add([IPlatformService, { useClass: PlatformService }]);+ injector.add([IUIRuntimeScopeService, { useClass: UIRuntimeScopeService }]);+ injector.add([ShortcutService]);+ const shortcutService = injector.get(ShortcutService);+ [GoToNextMatchOperation, GoToPreviousMatchOperation].forEach((command) => testBed.commandService.registerCommand(command));+ [GoToNextFindMatchShortcutItem, GoToPreviousFindMatchShortcutItem].forEach((shortcut) => shortcutService.registerShortcut(shortcut));++ try {+ await act(async () => {+ testBed.commandService.syncExecuteCommand(OpenFindDialogOperation.id);+ });+ const rendered = renderDialog(injector);+ root = rendered.root;+ container = rendered.container;++ await act(async () => {+ setInputValue(getInputs(container!)[0], 'apple');+ await awaitTime(560);+ });+ await flushSearch();++ await act(async () => {+ const button = getButton(container!, ADVANCED_LABEL);+ button.focus();+ expect(document.activeElement).toBe(button);+ button.click();+ });+ const [findInput, replaceInput] = getInputs(container);+ expect(document.activeElement).toBe(findInput);++ await act(async () => {+ findInput.dispatchEvent(new KeyboardEvent('keydown', { key: 'Enter', keyCode: KeyCode.ENTER, bubbles: true, cancelable: true }));+ });+ expect(readCurrentMatch(testBed.findReplaceService)?.range).toEqual({ id: 'A2' });++ await act(async () => {+ findInput.dispatchEvent(new KeyboardEvent('keydown', { key: 'Enter', keyCode: KeyCode.ENTER, shiftKey: true, bubbles: true, cancelable: true }));+ });+ expect(readCurrentMatch(testBed.findReplaceService)?.range).toEqual({ id: 'A1' });++ await act(async () => {+ replaceInput.focus();+ replaceInput.dispatchEvent(new KeyboardEvent('keydown', { key: 'Enter', keyCode: KeyCode.ENTER, bubbles: true, cancelable: true }));+ });+ expect(readCurrentMatch(testBed.findReplaceService)?.range).toEqual({ id: 'A1' });+ expect(document.activeElement).toBe(replaceInput);+ } finally {+ shortcutService.dispose();+ }});it('shows only controls supported by the active provider', async () => {@@ -599,6 +642,8 @@ describe('FindReplaceDialog', () => {root = rendered.root;container = rendered.container;+ expect(getButton(container, FIND_LABEL).disabled).toBe(true);+await act(async () => {const inputs = getInputs(container!);setInputValue(inputs[0], 'kiwi');