From 3ecb1e580f69ce6ca267d3fb3d2eb5ec2dc7950d Mon Sep 17 00:00:00 2001 From: Mary Hipp Date: Mon, 12 Feb 2024 12:57:51 -0500 Subject: [PATCH] update bc button is only ever used in modal context --- .../components/UploadWorkflowButton.tsx | 45 +++++++------------ .../components/WorkflowLibraryList.tsx | 4 +- 2 files changed, 16 insertions(+), 33 deletions(-) diff --git a/invokeai/frontend/web/src/features/workflowLibrary/components/UploadWorkflowButton.tsx b/invokeai/frontend/web/src/features/workflowLibrary/components/UploadWorkflowButton.tsx index 3d518476f1..0e5529593f 100644 --- a/invokeai/frontend/web/src/features/workflowLibrary/components/UploadWorkflowButton.tsx +++ b/invokeai/frontend/web/src/features/workflowLibrary/components/UploadWorkflowButton.tsx @@ -1,19 +1,16 @@ -import { Button, IconButton } from '@invoke-ai/ui-library'; +import { Button } from '@invoke-ai/ui-library'; +import { useWorkflowLibraryModalContext } from 'features/workflowLibrary/context/useWorkflowLibraryModalContext'; import { useLoadWorkflowFromFile } from 'features/workflowLibrary/hooks/useLoadWorkflowFromFile'; import { memo, useCallback, useRef } from 'react'; import { useDropzone } from 'react-dropzone'; import { useTranslation } from 'react-i18next'; import { PiUploadSimpleBold } from 'react-icons/pi'; -interface Props { - full?: boolean; - onSuccess?: () => void; -} - -const UploadWorkflowMenuItem = ({ full, onSuccess }: Props) => { +const UploadWorkflowButton = () => { const { t } = useTranslation(); const resetRef = useRef<() => void>(null); - const loadWorkflowFromFile = useLoadWorkflowFromFile({ resetRef, onSuccess }); + const { onClose } = useWorkflowLibraryModalContext(); + const loadWorkflowFromFile = useLoadWorkflowFromFile({ resetRef, onSuccess: onClose }); const onDropAccepted = useCallback( (files: File[]) => { @@ -32,28 +29,16 @@ const UploadWorkflowMenuItem = ({ full, onSuccess }: Props) => { multiple: false, }); return ( - <> - {full ? ( - - ) : ( - } - {...getRootProps()} - pointerEvents="auto" - /> - )} - + ); }; -export default memo(UploadWorkflowMenuItem); +export default memo(UploadWorkflowButton); diff --git a/invokeai/frontend/web/src/features/workflowLibrary/components/WorkflowLibraryList.tsx b/invokeai/frontend/web/src/features/workflowLibrary/components/WorkflowLibraryList.tsx index 726773c525..5daabe9db6 100644 --- a/invokeai/frontend/web/src/features/workflowLibrary/components/WorkflowLibraryList.tsx +++ b/invokeai/frontend/web/src/features/workflowLibrary/components/WorkflowLibraryList.tsx @@ -21,7 +21,6 @@ import ScrollableContent from 'common/components/OverlayScrollbars/ScrollableCon import type { WorkflowCategory } from 'features/nodes/types/workflow'; import WorkflowLibraryListItem from 'features/workflowLibrary/components/WorkflowLibraryListItem'; import WorkflowLibraryPagination from 'features/workflowLibrary/components/WorkflowLibraryPagination'; -import { useWorkflowLibraryModalContext } from 'features/workflowLibrary/context/useWorkflowLibraryModalContext'; import type { ChangeEvent, KeyboardEvent } from 'react'; import { memo, useCallback, useMemo, useState } from 'react'; import { useTranslation } from 'react-i18next'; @@ -59,7 +58,6 @@ const WorkflowLibraryList = () => { const [selectedCategory, setSelectedCategory] = useState('user'); const [page, setPage] = useState(0); const [query, setQuery] = useState(''); - const { onClose } = useWorkflowLibraryModalContext(); const projectId = useStore($projectId); const orderByOptions = useMemo(() => { @@ -229,7 +227,7 @@ const WorkflowLibraryList = () => { - + {data && }