git/InvokeAI
1
0
Fork 0
mirror of https://github.com/invoke-ai/InvokeAI synced 2026-03-13 10:20:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into pr/8679

Browse Source
This commit is contained in:
blessedcoolant 2025-12-23 01:03:43 +05:30
commit 7b9ce35806
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
invokeai/frontend/web/src/features/system/components/HotkeysModal/HotkeysModal.tsx
View File

@ -23,7 +23,7 @@ import { useHotkeyData } from 'features/system/components/HotkeysModal/useHotkey
import { StickyScrollable } from 'features/system/components/StickyScrollable';
import { allHotkeysReset } from 'features/system/store/hotkeysSlice';
import type { ChangeEventHandler, ReactElement } from 'react';
import { cloneElement, Fragment, memo, useCallback, useMemo, useRef, useState } from 'react';
import { cloneElement, Fragment, memo, useCallback, useMemo, useState } from 'react';
import { useTranslation } from 'react-i18next';
import { PiXBold } from 'react-icons/pi';
@ -45,7 +45,6 @@ const HotkeysModal = ({ children }: HotkeysModalProps) => {
const dispatch = useAppDispatch();
const [hotkeyFilter, setHotkeyFilter] = useState('');
const [isEditMode, setIsEditMode] = useState(false);
const inputRef = useRef<HTMLInputElement | null>(null);
const clearHotkeyFilter = useCallback(() => setHotkeyFilter(''), []);
const onChange = useCallback<ChangeEventHandler<HTMLInputElement>>((e) => setHotkeyFilter(e.target.value), []);
const toggleEditMode = useCallback(() => setIsEditMode((prev) => !prev), []);
@ -91,14 +90,20 @@ const HotkeysModal = ({ children }: HotkeysModalProps) => {
{cloneElement(children, {
onClick: onOpen,
})}
<Modal isOpen={isOpen} onClose={onClose} isCentered size="2xl" useInert={false} initialFocusRef={inputRef}>
<Modal isOpen={isOpen} onClose={onClose} isCentered size="2xl" useInert={false}>
<ModalOverlay />
<ModalContent maxH="80vh" h="80vh">
<ModalHeader>{t('hotkeys.hotkeys')}</ModalHeader>
<ModalCloseButton />
<ModalBody display="flex" flexDir="column" gap={4}>
<InputGroup>
<Input ref={inputRef} placeholder={t('hotkeys.searchHotkeys')} value={hotkeyFilter} onChange={onChange} />
<Input
autoFocus
placeholder={t('hotkeys.searchHotkeys')}
value={hotkeyFilter}
onChange={onChange}
tabIndex={1}
/>
{hotkeyFilter.length && (
<InputRightElement h="full" pe={2}>
<IconButton

2
invokeai/frontend/web/src/features/system/components/SettingsModal/SettingsModal.tsx
View File

@ -171,7 +171,7 @@ const SettingsModal = (props: { children: ReactElement }) => {
<ModalOverlay />
<ModalContent maxH="80vh" h="68rem">
<ModalHeader bg="none">{t('common.settingsLabel')}</ModalHeader>
<ModalCloseButton />
<ModalCloseButton tabIndex={1} />
<ModalBody display="flex" flexDir="column" gap={4}>
<ScrollableContent>
<Flex flexDir="column" gap={4}>