Skip to content

Node Editor: QoL Fixes #3734

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jul 12, 2023
Merged

Node Editor: QoL Fixes #3734

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
acea304
feat(node-editor): fit view on init
blessedcoolant Jul 11, 2023
cd11d08
feat: Update Reload Schema button
blessedcoolant Jul 11, 2023
222d8b0
fix: Update Sync icon to FontAwesom
blessedcoolant Jul 12, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions invokeai/frontend/web/public/locales/en.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -674,5 +674,8 @@
"showProgressImages": "Show Progress Images",
"hideProgressImages": "Hide Progress Images",
"swapSizes": "Swap Sizes"
},
"nodes": {
"reloadSchema": "Reload Schema"
}
}
9 changes: 9 additions & 0 deletions invokeai/frontend/web/src/features/nodes/components/Flow.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,10 @@ import {
OnConnectEnd,
OnConnectStart,
OnEdgesChange,
OnInit,
OnNodesChange,
ReactFlow,
ReactFlowInstance,
} from 'reactflow';
import {
connectionEnded,
Expand Down Expand Up @@ -67,6 +69,12 @@ export const Flow = () => {
dispatch(connectionEnded());
}, [dispatch]);

const onInit: OnInit = useCallback((v: ReactFlowInstance) => {
if (v) {
v.fitView();
}
}, []);

return (
<ReactFlow
nodeTypes={nodeTypes}
Expand All @@ -77,6 +85,7 @@ export const Flow = () => {
onConnectStart={onConnectStart}
onConnect={onConnect}
onConnectEnd={onConnectEnd}
onInit={onInit}
defaultEdgeOptions={{
style: { strokeWidth: 2 },
}}
Expand Down
17 changes: 5 additions & 12 deletions invokeai/frontend/web/src/features/nodes/components/panels/TopCenterPanel.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,25 +1,18 @@
import { HStack } from '@chakra-ui/react';
import { useAppDispatch } from 'app/store/storeHooks';
import IAIButton from 'common/components/IAIButton';
import { memo, useCallback } from 'react';
import { memo } from 'react';
import { Panel } from 'reactflow';
import { receivedOpenAPISchema } from 'services/api/thunks/schema';
import NodeInvokeButton from '../ui/NodeInvokeButton';

import CancelButton from 'features/parameters/components/ProcessButtons/CancelButton';
import NodeInvokeButton from '../ui/NodeInvokeButton';
import ReloadSchemaButton from '../ui/ReloadSchemaButton';

const TopCenterPanel = () => {
const dispatch = useAppDispatch();

const handleReloadSchema = useCallback(() => {
dispatch(receivedOpenAPISchema());
}, [dispatch]);

return (
<Panel position="top-center">
<HStack>
<NodeInvokeButton />
<CancelButton />
<IAIButton onClick={handleReloadSchema}>Reload Schema</IAIButton>
<ReloadSchemaButton />
</HStack>
</Panel>
);
Expand Down
24 changes: 24 additions & 0 deletions invokeai/frontend/web/src/features/nodes/components/ui/ReloadSchemaButton.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
import { useAppDispatch } from 'app/store/storeHooks';
import IAIIconButton from 'common/components/IAIIconButton';
import { useCallback } from 'react';
import { useTranslation } from 'react-i18next';
import { FaSyncAlt } from 'react-icons/fa';
import { receivedOpenAPISchema } from 'services/api/thunks/schema';

export default function ReloadSchemaButton() {
const { t } = useTranslation();
const dispatch = useAppDispatch();

const handleReloadSchema = useCallback(() => {
dispatch(receivedOpenAPISchema());
}, [dispatch]);

return (
<IAIIconButton
icon={<FaSyncAlt />}
tooltip={t('nodes.reloadSchema')}
aria-label={t('nodes.reloadSchema')}
onClick={handleReloadSchema}
/>
);
}