github/InvokeAI
1
1
Fork 0
mirror of https://github.com/invoke-ai/InvokeAI.git synced 2026-04-23 03:00:31 -04:00
Code Issues Packages Projects Releases Wiki Activity

Revert "fix(ui): Apple Pencil requires onPointerUp instead of onClick"

Browse Source 
This reverts commit 2a90f4f59e.
This commit is contained in:
psychedelicious
2024-10-07 08:08:32 +10:00
parent e0b63559d0
commit eee4175e4d
208 changed files with 413 additions and 445 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
invokeai/frontend/web/src/features/workflowLibrary/components/LoadWorkflowFromGraphModal/LoadWorkflowFromGraphModal.tsx
View File

@@ -69,7 +69,7 @@ export const LoadWorkflowFromGraphModal = () => {
<ModalCloseButton />
<ModalBody as={Flex} flexDir="column" gap={4} w="full" h="full" pb={4}>
<Flex gap={4}>
<Button onPointerUp={parse} size="sm" flexShrink={0}>
<Button onClick={parse} size="sm" flexShrink={0}>
{t('workflows.convertGraph')}
</Button>
<FormControl>
@@ -77,7 +77,7 @@ export const LoadWorkflowFromGraphModal = () => {
<Checkbox isChecked={shouldAutoLayout} onChange={onChangeShouldAutoLayout} />
</FormControl>
<Spacer />
<Button onPointerUp={loadWorkflow} size="sm" flexShrink={0}>
<Button onClick={loadWorkflow} size="sm" flexShrink={0}>
{t('workflows.loadWorkflow')}
</Button>
</Flex>

4
invokeai/frontend/web/src/features/workflowLibrary/components/NewWorkflowButton.tsx
View File

@@ -8,12 +8,12 @@ export const NewWorkflowButton = memo(() => {
const { t } = useTranslation();
const renderButton = useCallback(
(onPointerUp: () => void) => (
(onClick: () => void) => (
<IconButton
aria-label={t('nodes.newWorkflow')}
tooltip={t('nodes.newWorkflow')}
icon={<PiFilePlusBold />}
onPointerUp={onPointerUp}
onClick={onClick}
pointerEvents="auto"
/>
),

6
invokeai/frontend/web/src/features/workflowLibrary/components/NewWorkflowConfirmationAlertDialog.tsx
View File

@@ -7,7 +7,7 @@ import { memo, useCallback } from 'react';
import { useTranslation } from 'react-i18next';
type Props = {
renderButton: (onPointerUp: () => void) => JSX.Element;
renderButton: (onClick: () => void) => JSX.Element;
};
export const NewWorkflowConfirmationAlertDialog = memo((props: Props) => {
@@ -29,7 +29,7 @@ export const NewWorkflowConfirmationAlertDialog = memo((props: Props) => {
onClose();
}, [dispatch, onClose, t]);
const onPointerUp = useCallback(() => {
const onClick = useCallback(() => {
if (!isTouched) {
handleNewWorkflow();
return;
@@ -39,7 +39,7 @@ export const NewWorkflowConfirmationAlertDialog = memo((props: Props) => {
return (
<>
{props.renderButton(onPointerUp)}
{props.renderButton(onClick)}
<ConfirmationAlertDialog
isOpen={isOpen}

9
invokeai/frontend/web/src/features/workflowLibrary/components/SaveWorkflowAsDialog/SaveWorkflowAsDialog.tsx
View File

@@ -87,15 +87,10 @@ export const SaveWorkflowAsDialog = () => {
</AlertDialogBody>
<AlertDialogFooter>
<Button ref={cancelRef} onPointerUp={clearAndClose}>
<Button ref={cancelRef} onClick={clearAndClose}>
{t('common.cancel')}
</Button>
<Button
colorScheme="invokeBlue"
onPointerUp={onSave}
ml={3}
isDisabled={!workflowName || !workflowName.length}
>
<Button colorScheme="invokeBlue" onClick={onSave} ml={3} isDisabled={!workflowName || !workflowName.length}>
{t('common.saveAs')}
</Button>
</AlertDialogFooter>

2
invokeai/frontend/web/src/features/workflowLibrary/components/WorkflowLibraryButton.tsx
View File

@@ -17,7 +17,7 @@ const WorkflowLibraryButton = () => {
aria-label={t('workflows.workflowLibrary')}
tooltip={t('workflows.workflowLibrary')}
icon={<PiFolderOpenBold />}
onPointerUp={workflowLibraryModal.setTrue}
onClick={workflowLibraryModal.setTrue}
pointerEvents="auto"
/>
<WorkflowLibraryModal />

4
invokeai/frontend/web/src/features/workflowLibrary/components/WorkflowLibraryList.tsx
View File

@@ -161,7 +161,7 @@ const WorkflowLibraryList = () => {
<Button
key={category}
variant={selectedCategory === category ? undefined : 'ghost'}
onPointerUp={handleSetCategory.bind(null, category)}
onClick={handleSetCategory.bind(null, category)}
isChecked={selectedCategory === category}
>
{t(`workflows.${category}Workflows`)}
@@ -208,7 +208,7 @@ const WorkflowLibraryList = () => {
{query.trim().length && (
<InputRightElement h="full" pe={2}>
<IconButton
onPointerUp={resetFilterText}
onClick={resetFilterText}
size="sm"
variant="link"
aria-label={t('workflows.clearWorkflowSearchFilter')}

4
invokeai/frontend/web/src/features/workflowLibrary/components/WorkflowLibraryListItem.tsx
View File

@@ -72,7 +72,7 @@ const WorkflowLibraryListItem = ({ workflowDTO }: Props) => {
<Button
flexShrink={0}
isDisabled={isOpen}
onPointerUp={handleGetAndLoadWorkflow}
onClick={handleGetAndLoadWorkflow}
isLoading={getAndLoadWorkflowResult.isLoading}
aria-label={t('workflows.openWorkflow')}
>
@@ -83,7 +83,7 @@ const WorkflowLibraryListItem = ({ workflowDTO }: Props) => {
flexShrink={0}
colorScheme="error"
isDisabled={isOpen}
onPointerUp={handleDeleteWorkflow}
onClick={handleDeleteWorkflow}
isLoading={deleteWorkflowResult.isLoading}
aria-label={t('workflows.deleteWorkflow')}
>

2
invokeai/frontend/web/src/features/workflowLibrary/components/WorkflowLibraryMenu/DownloadWorkflowMenuItem.tsx
View File

@@ -9,7 +9,7 @@ const DownloadWorkflowMenuItem = () => {
const downloadWorkflow = useDownloadWorkflow();
return (
<MenuItem as="button" icon={<PiDownloadSimpleBold />} onPointerUp={downloadWorkflow}>
<MenuItem as="button" icon={<PiDownloadSimpleBold />} onClick={downloadWorkflow}>
{t('workflows.downloadWorkflow')}
</MenuItem>
);

2
invokeai/frontend/web/src/features/workflowLibrary/components/WorkflowLibraryMenu/LoadWorkflowFromGraphMenuItem.tsx
View File

@@ -13,7 +13,7 @@ const LoadWorkflowFromGraphMenuItem = () => {
const { onOpen } = useLoadWorkflowFromGraphModal();
return (
<MenuItem as="button" icon={<PiFlaskBold />} onPointerUp={onOpen} isDisabled={!size(templates)}>
<MenuItem as="button" icon={<PiFlaskBold />} onClick={onOpen} isDisabled={!size(templates)}>
{t('workflows.loadFromGraph')}
</MenuItem>
);

4
invokeai/frontend/web/src/features/workflowLibrary/components/WorkflowLibraryMenu/NewWorkflowMenuItem.tsx
View File

@@ -8,8 +8,8 @@ export const NewWorkflowMenuItem = memo(() => {
const { t } = useTranslation();
const renderButton = useCallback(
(onPointerUp: () => void) => (
<MenuItem as="button" icon={<PiFilePlusBold />} onPointerUp={onPointerUp}>
(onClick: () => void) => (
<MenuItem as="button" icon={<PiFilePlusBold />} onClick={onClick}>
{t('nodes.newWorkflow')}
</MenuItem>
),

2
invokeai/frontend/web/src/features/workflowLibrary/components/WorkflowLibraryMenu/SaveWorkflowAsMenuItem.tsx
View File

@@ -9,7 +9,7 @@ const SaveWorkflowAsMenuItem = () => {
const { onOpen } = useSaveWorkflowAsDialog();
return (
<MenuItem as="button" icon={<PiCopyBold />} onPointerUp={onOpen}>
<MenuItem as="button" icon={<PiCopyBold />} onClick={onOpen}>
{t('workflows.saveWorkflowAs')}
</MenuItem>
);

2
invokeai/frontend/web/src/features/workflowLibrary/components/WorkflowLibraryMenu/SaveWorkflowMenuItem.tsx
View File

@@ -28,7 +28,7 @@ const SaveWorkflowMenuItem = () => {
}, [onOpen, saveWorkflow]);
return (
<MenuItem as="button" isDisabled={!isTouched} icon={<PiFloppyDiskBold />} onPointerUp={handleClickSave}>
<MenuItem as="button" isDisabled={!isTouched} icon={<PiFloppyDiskBold />} onClick={handleClickSave}>
{t('workflows.saveWorkflow')}
</MenuItem>
);

2
invokeai/frontend/web/src/features/workflowLibrary/components/WorkflowLibraryMenu/SettingsMenuItem.tsx
View File

@@ -9,7 +9,7 @@ const DownloadWorkflowMenuItem = () => {
const modal = useWorkflowEditorSettingsModal();
return (
<MenuItem as="button" icon={<PiGearSixFill />} onPointerUp={modal.setTrue}>
<MenuItem as="button" icon={<PiGearSixFill />} onClick={modal.setTrue}>
{t('nodes.workflowSettings')}
</MenuItem>
);

10
invokeai/frontend/web/src/features/workflowLibrary/components/WorkflowLibraryPagination.tsx
View File

@@ -9,7 +9,7 @@ const PAGES_TO_DISPLAY = 7;
type PageData = {
page: number;
onPointerUp: () => void;
onClick: () => void;
};
type Props = {
@@ -39,7 +39,7 @@ const WorkflowLibraryPagination = ({ page, setPage, data }: Props) => {
for (let i = first; i < last; i++) {
pages.push({
page: i,
onPointerUp: () => setPage(i),
onClick: () => setPage(i),
});
}
return pages;
@@ -49,7 +49,7 @@ const WorkflowLibraryPagination = ({ page, setPage, data }: Props) => {
<ButtonGroup>
<IconButton
variant="ghost"
onPointerUp={handlePrevPage}
onClick={handlePrevPage}
isDisabled={page === 0}
aria-label={t('common.prevPage')}
icon={<PiCaretLeftBold />}
@@ -58,7 +58,7 @@ const WorkflowLibraryPagination = ({ page, setPage, data }: Props) => {
<Button
w={10}
isDisabled={data.pages === 1}
onPointerUp={p.page === page ? undefined : p.onPointerUp}
onClick={p.page === page ? undefined : p.onClick}
variant={p.page === page ? 'solid' : 'ghost'}
key={p.page}
transitionDuration="0s" // the delay in animation looks jank
@@ -68,7 +68,7 @@ const WorkflowLibraryPagination = ({ page, setPage, data }: Props) => {
))}
<IconButton
variant="ghost"
onPointerUp={handleNextPage}
onClick={handleNextPage}
isDisabled={page === data.pages - 1}
aria-label={t('common.nextPage')}
icon={<PiCaretRightBold />}