tidy(ui): organise tool module

- Canvas generation mode is replace with a boolean `sendToCanvas` flag. When off, images generated on the canvas go to the gallery. When on, they get added to the staging area.
- When an image result is received, if its destination is the canvas, staging is automatically started.
- Updated queue list to show the destination column.
- Added `IconSwitch` component to represent binary choices, used for the new `sendToCanvas` flag and image viewer toggle.
- Remove the queue actions menu in `QueueControls`. Move the queue count badge to the cancel button.
- Redo layout of `QueueControls` to prevent duplicate queue count badges.
- Fix issue where gallery and options panels could show thru transparent regions of queue tab.
- Disable panel hotkeys when on mm/queue tabs.

invokeai/app/services/events/events_common.py

@@ -88,7 +88,8 @@ class QueueItemEventBase(QueueEventBase):
 
     item_id: int = Field(description="The ID of the queue item")
     batch_id: str = Field(description="The ID of the queue batch")
-    origin: str | None = Field(default=None, description="The origin of the batch")
+    origin: str | None = Field(default=None, description="The origin of the queue item")
+    destination: str | None = Field(default=None, description="The destination of the queue item")
 
 
 class InvocationEventBase(QueueItemEventBase):
@@ -114,6 +115,7 @@ class InvocationStartedEvent(InvocationEventBase):
             item_id=queue_item.item_id,
             batch_id=queue_item.batch_id,
             origin=queue_item.origin,
+            destination=queue_item.destination,
             session_id=queue_item.session_id,
             invocation=invocation,
             invocation_source_id=queue_item.session.prepared_source_mapping[invocation.id],
@@ -148,6 +150,7 @@ class InvocationDenoiseProgressEvent(InvocationEventBase):
             item_id=queue_item.item_id,
             batch_id=queue_item.batch_id,
             origin=queue_item.origin,
+            destination=queue_item.destination,
             session_id=queue_item.session_id,
             invocation=invocation,
             invocation_source_id=queue_item.session.prepared_source_mapping[invocation.id],
@@ -186,6 +189,7 @@ class InvocationCompleteEvent(InvocationEventBase):
             item_id=queue_item.item_id,
             batch_id=queue_item.batch_id,
             origin=queue_item.origin,
+            destination=queue_item.destination,
             session_id=queue_item.session_id,
             invocation=invocation,
             invocation_source_id=queue_item.session.prepared_source_mapping[invocation.id],
@@ -219,6 +223,7 @@ class InvocationErrorEvent(InvocationEventBase):
             item_id=queue_item.item_id,
             batch_id=queue_item.batch_id,
             origin=queue_item.origin,
+            destination=queue_item.destination,
             session_id=queue_item.session_id,
             invocation=invocation,
             invocation_source_id=queue_item.session.prepared_source_mapping[invocation.id],
@@ -257,6 +262,7 @@ class QueueItemStatusChangedEvent(QueueItemEventBase):
             item_id=queue_item.item_id,
             batch_id=queue_item.batch_id,
             origin=queue_item.origin,
+            destination=queue_item.destination,
             session_id=queue_item.session_id,
             status=queue_item.status,
             error_type=queue_item.error_type,

invokeai/app/services/session_queue/session_queue_common.py

@@ -77,7 +77,14 @@ BatchDataCollection: TypeAlias = list[list[BatchDatum]]
 
 class Batch(BaseModel):
     batch_id: str = Field(default_factory=uuid_string, description="The ID of the batch")
-    origin: str | None = Field(default=None, description="The origin of this batch.")
+    origin: str | None = Field(
+        default=None,
+        description="The origin of this queue item. This data is used by the frontend to determine how to handle results.",
+    )
+    destination: str | None = Field(
+        default=None,
+        description="The origin of this queue item. This data is used by the frontend to determine how to handle results",
+    )
     data: Optional[BatchDataCollection] = Field(default=None, description="The batch data collection.")
     graph: Graph = Field(description="The graph to initialize the session with")
     workflow: Optional[WorkflowWithoutID] = Field(
@@ -196,7 +203,14 @@ class SessionQueueItemWithoutGraph(BaseModel):
     status: QUEUE_ITEM_STATUS = Field(default="pending", description="The status of this queue item")
     priority: int = Field(default=0, description="The priority of this queue item")
     batch_id: str = Field(description="The ID of the batch associated with this queue item")
-    origin: str | None = Field(default=None, description="The origin of this queue item. ")
+    origin: str | None = Field(
+        default=None,
+        description="The origin of this queue item. This data is used by the frontend to determine how to handle results.",
+    )
+    destination: str | None = Field(
+        default=None,
+        description="The origin of this queue item. This data is used by the frontend to determine how to handle results",
+    )
     session_id: str = Field(
         description="The ID of the session associated with this queue item. The session doesn't exist in graph_executions until the queue item is executed."
     )
@@ -297,6 +311,7 @@ class BatchStatus(BaseModel):
     queue_id: str = Field(..., description="The ID of the queue")
     batch_id: str = Field(..., description="The ID of the batch")
     origin: str | None = Field(..., description="The origin of the batch")
+    destination: str | None = Field(..., description="The destination of the batch")
     pending: int = Field(..., description="Number of queue items with status 'pending'")
     in_progress: int = Field(..., description="Number of queue items with status 'in_progress'")
     completed: int = Field(..., description="Number of queue items with status 'complete'")
@@ -443,6 +458,7 @@ class SessionQueueValueToInsert(NamedTuple):
     priority: int  # priority
     workflow: Optional[str]  # workflow json
     origin: str | None
+    destination: str | None
 
 
 ValuesToInsert: TypeAlias = list[SessionQueueValueToInsert]
@@ -464,6 +480,7 @@ def prepare_values_to_insert(queue_id: str, batch: Batch, priority: int, max_new
                 priority,  # priority
                 json.dumps(workflow, default=to_jsonable_python) if workflow else None,  # workflow (json)
                 batch.origin,  # origin
+                batch.destination,  # destination
             )
         )
     return values_to_insert

invokeai/app/services/session_queue/session_queue_sqlite.py

@@ -128,8 +128,8 @@ class SqliteSessionQueue(SessionQueueBase):
 
             self.__cursor.executemany(
                 """--sql
-                INSERT INTO session_queue (queue_id, session, session_id, batch_id, field_values, priority, workflow, origin)
-                VALUES (?, ?, ?, ?, ?, ?, ?, ?)
+                INSERT INTO session_queue (queue_id, session, session_id, batch_id, field_values, priority, workflow, origin, destination)
+                VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)
                 """,
                 values_to_insert,
             )
@@ -579,7 +579,8 @@ class SqliteSessionQueue(SessionQueueBase):
                     session_id,
                     batch_id,
                     queue_id,
-                    origin
+                    origin,
+                    destination
                 FROM session_queue
                 WHERE queue_id = ?
             """
@@ -659,7 +660,7 @@ class SqliteSessionQueue(SessionQueueBase):
             self.__lock.acquire()
             self.__cursor.execute(
                 """--sql
-                SELECT status, count(*), origin
+                SELECT status, count(*), origin, destination
                 FROM session_queue
                 WHERE
                   queue_id = ?
@@ -672,6 +673,7 @@ class SqliteSessionQueue(SessionQueueBase):
             total = sum(row[1] for row in result)
             counts: dict[str, int] = {row[0]: row[1] for row in result}
             origin = result[0]["origin"] if result else None
+            destination = result[0]["destination"] if result else None
         except Exception:
             self.__conn.rollback()
             raise
@@ -681,6 +683,7 @@ class SqliteSessionQueue(SessionQueueBase):
         return BatchStatus(
             batch_id=batch_id,
             origin=origin,
+            destination=destination,
             queue_id=queue_id,
             pending=counts.get("pending", 0),
             in_progress=counts.get("in_progress", 0),

invokeai/app/services/shared/sqlite_migrator/migrations/migration_15.py

@@ -10,9 +10,11 @@ class Migration15Callback:
     def _add_origin_col(self, cursor: sqlite3.Cursor) -> None:
         """
         - Adds `origin` column to the session queue table.
+        - Adds `destination` column to the session queue table.
         """
 
         cursor.execute("ALTER TABLE session_queue ADD COLUMN origin TEXT;")
+        cursor.execute("ALTER TABLE session_queue ADD COLUMN destination TEXT;")
 
 
 def build_migration_15() -> Migration:
@@ -21,6 +23,7 @@ def build_migration_15() -> Migration:
 
     This migration does the following:
         - Adds `origin` column to the session queue table.
+        - Adds `destination` column to the session queue table.
     """
     migration_15 = Migration(
         from_version=14,

invokeai/frontend/web/public/locales/en.json

@@ -164,10 +164,10 @@
         "alpha": "Alpha",
         "selected": "Selected",
         "tab": "Tab",
-        "viewing": "Viewing",
-        "viewingDesc": "Review images in a large gallery view",
-        "editing": "Editing",
-        "editingDesc": "Edit on the Control Layers canvas",
+        "view": "View",
+        "viewDesc": "Review images in a large gallery view",
+        "edit": "Edit",
+        "editDesc": "Edit on the Canvas",
         "comparing": "Comparing",
         "comparingDesc": "Comparing two images",
         "enabled": "Enabled",
@@ -328,9 +328,13 @@
         "completedIn": "Completed in",
         "batch": "Batch",
         "origin": "Origin",
-        "originCanvas": "Canvas",
-        "originWorkflows": "Workflows",
-        "originOther": "Other",
+        "destination": "Destination",
+        "upscaling": "Upscaling",
+        "canvas": "Canvas",
+        "generation": "Generation",
+        "workflows": "Workflows",
+        "other": "Other",
+        "gallery": "Gallery",
         "batchFieldValues": "Batch Field Values",
         "item": "Item",
         "session": "Session",
@@ -1675,32 +1679,44 @@
         "deletePrompt": "Delete Prompt",
         "resetRegion": "Reset Region",
         "debugLayers": "Debug Layers",
+        "showHUD": "Show HUD",
         "rectangle": "Rectangle",
         "maskFill": "Mask Fill",
         "addPositivePrompt": "Add $t(common.positivePrompt)",
         "addNegativePrompt": "Add $t(common.negativePrompt)",
         "addIPAdapter": "Add $t(common.ipAdapter)",
+        "addRasterLayer": "Add $t(controlLayers.rasterLayer)",
+        "addControlLayer": "Add $t(controlLayers.controlLayer)",
+        "addInpaintMask": "Add $t(controlLayers.inpaintMask)",
+        "addRegionalGuidance": "Add $t(controlLayers.regionalGuidance)",
         "regionalGuidanceLayer": "$t(controlLayers.regionalGuidance) $t(unifiedCanvas.layer)",
         "raster": "Raster",
-        "rasterLayer_one": "Raster Layer",
-        "controlLayer_one": "Control Layer",
-        "inpaintMask_one": "Inpaint Mask",
-        "regionalGuidance_one": "Regional Guidance",
-        "ipAdapter_one": "IP Adapter",
-        "rasterLayer_other": "Raster Layers",
-        "controlLayer_other": "Control Layers",
-        "inpaintMask_other": "Inpaint Masks",
-        "regionalGuidance_other": "Regional Guidance",
-        "ipAdapter_other": "IP Adapters",
+        "rasterLayer": "Raster Layer",
+        "controlLayer": "Control Layer",
+        "inpaintMask": "Inpaint Mask",
+        "regionalGuidance": "Regional Guidance",
+        "ipAdapter": "IP Adapter",
+        "sendToGallery": "Send To Gallery",
+        "sendToGalleryDesc": "Generations will be sent to the gallery.",
+        "sendToCanvas": "Send To Canvas",
+        "sendToCanvasDesc": "Generations will be staged onto the canvas.",
+        "rasterLayer_withCount_one": "$t(controlLayers.rasterLayer)",
+        "controlLayer_withCount_one": "$t(controlLayers.controlLayer)",
+        "inpaintMask_withCount_one": "$t(controlLayers.inpaintMask)",
+        "regionalGuidance_withCount_one": "$t(controlLayers.regionalGuidance)",
+        "ipAdapter_withCount_one": "$t(controlLayers.ipAdapter)",
+        "rasterLayer_withCount_other": "Raster Layers",
+        "controlLayer_withCount_other": "Control Layers",
+        "inpaintMask_withCount_other": "Inpaint Masks",
+        "regionalGuidance_withCount_other": "Regional Guidance",
+        "ipAdapter_withCount_other": "IP Adapters",
         "opacity": "Opacity",
         "regionalGuidance_withCount_hidden": "Regional Guidance ({{count}} hidden)",
-        "controlAdapters_withCount_hidden": "Control Adapters ({{count}} hidden)",
         "controlLayers_withCount_hidden": "Control Layers ({{count}} hidden)",
         "rasterLayers_withCount_hidden": "Raster Layers ({{count}} hidden)",
         "ipAdapters_withCount_hidden": "IP Adapters ({{count}} hidden)",
         "inpaintMasks_withCount_hidden": "Inpaint Masks ({{count}} hidden)",
         "regionalGuidance_withCount_visible": "Regional Guidance ({{count}})",
-        "controlAdapters_withCount_visible": "Control Adapters ({{count}})",
         "controlLayers_withCount_visible": "Control Layers ({{count}})",
         "rasterLayers_withCount_visible": "Raster Layers ({{count}})",
         "ipAdapters_withCount_visible": "IP Adapters ({{count}})",
@@ -1737,6 +1753,7 @@
         "flipHorizontal": "Flip Horizontal",
         "flipVertical": "Flip Vertical",
         "fill": {
+            "fillColor": "Fill Color",
             "fillStyle": "Fill Style",
             "solid": "Solid",
             "grid": "Grid",

invokeai/frontend/web/src/app/store/middleware/listenerMiddleware/listeners/addCommitStagingAreaImageListener.ts

@@ -68,7 +68,7 @@ export const addStagingListeners = (startAppListening: AppStartListening) => {
         objects: [imageObject],
       };
 
-      api.dispatch(rasterLayerAdded({ overrides, isSelected: true }));
+      api.dispatch(rasterLayerAdded({ overrides, isSelected: false }));
       api.dispatch(sessionStagingAreaReset());
     },
   });

invokeai/frontend/web/src/app/store/middleware/listenerMiddleware/listeners/enqueueRequestedLinear.ts

@@ -31,7 +31,7 @@ export const addEnqueueRequestedLinear = (startAppListening: AppStartListening)
 
       let didStartStaging = false;
 
-      if (!state.canvasSession.isStaging && state.canvasSession.mode === 'compose') {
+      if (!state.canvasSession.isStaging && state.canvasSession.sendToCanvas) {
         dispatch(sessionStartedStaging());
         didStartStaging = true;
       }
@@ -70,7 +70,11 @@ export const addEnqueueRequestedLinear = (startAppListening: AppStartListening)
 
       const { g, noise, posCond } = buildGraphResult.value;
 
-      const prepareBatchResult = withResult(() => prepareLinearUIBatch(state, g, prepend, noise, posCond));
+      const destination = state.canvasSession.sendToCanvas ? 'canvas' : 'gallery';
+
+      const prepareBatchResult = withResult(() =>
+        prepareLinearUIBatch(state, g, prepend, noise, posCond, 'generation', destination)
+      );
 
       if (isErr(prepareBatchResult)) {
         log.error({ error: serializeError(prepareBatchResult.error) }, 'Failed to prepare batch');

invokeai/frontend/web/src/app/store/middleware/listenerMiddleware/listeners/enqueueRequestedNodes.ts

@@ -32,6 +32,7 @@ export const addEnqueueRequestedNodes = (startAppListening: AppStartListening) =
           workflow: builtWorkflow,
           runs: state.params.iterations,
           origin: 'workflows',
+          destination: 'gallery',
         },
         prepend: action.payload.prepend,
       };

invokeai/frontend/web/src/app/store/middleware/listenerMiddleware/listeners/enqueueRequestedUpscale.ts

@@ -16,7 +16,7 @@ export const addEnqueueRequestedUpscale = (startAppListening: AppStartListening)
 
       const { g, noise, posCond } = await buildMultidiffusionUpscaleGraph(state);
 
-      const batchConfig = prepareLinearUIBatch(state, g, prepend, noise, posCond);
+      const batchConfig = prepareLinearUIBatch(state, g, prepend, noise, posCond, 'upscaling', 'gallery');
 
       const req = dispatch(
         queueApi.endpoints.enqueueBatch.initiate(batchConfig, {

invokeai/frontend/web/src/common/components/IconSwitch.tsx

@@ -0,0 +1,104 @@
+import type { SystemStyleObject } from '@invoke-ai/ui-library';
+import { Box, Flex, IconButton, Tooltip, useToken } from '@invoke-ai/ui-library';
+import type { ReactElement, ReactNode } from 'react';
+import { memo, useCallback, useMemo } from 'react';
+
+type IconSwitchProps = {
+  isChecked: boolean;
+  onChange: (checked: boolean) => void;
+  iconChecked: ReactElement;
+  tooltipChecked?: ReactNode;
+  iconUnchecked: ReactElement;
+  tooltipUnchecked?: ReactNode;
+  ariaLabel: string;
+};
+
+const getSx = (padding: string | number): SystemStyleObject => ({
+  transition: 'left 0.1s ease-in-out, transform 0.1s ease-in-out',
+  '&[data-checked="true"]': {
+    left: `calc(100% - ${padding})`,
+    transform: 'translateX(-100%)',
+  },
+  '&[data-checked="false"]': {
+    left: padding,
+    transform: 'translateX(0)',
+  },
+});
+
+export const IconSwitch = memo(
+  ({
+    isChecked,
+    onChange,
+    iconChecked,
+    tooltipChecked,
+    iconUnchecked,
+    tooltipUnchecked,
+    ariaLabel,
+  }: IconSwitchProps) => {
+    const onUncheck = useCallback(() => {
+      onChange(false);
+    }, [onChange]);
+    const onCheck = useCallback(() => {
+      onChange(true);
+    }, [onChange]);
+
+    const gap = useToken('space', 1.5);
+    const sx = useMemo(() => getSx(gap), [gap]);
+
+    return (
+      <Flex
+        position="relative"
+        bg="base.800"
+        borderRadius="base"
+        alignItems="center"
+        justifyContent="center"
+        h="full"
+        p={gap}
+        gap={gap}
+      >
+        <Box
+          position="absolute"
+          borderRadius="base"
+          bg="invokeBlue.400"
+          w={12}
+          top={gap}
+          bottom={gap}
+          data-checked={isChecked}
+          sx={sx}
+        />
+        <Tooltip hasArrow label={tooltipUnchecked}>
+          <IconButton
+            size="sm"
+            fontSize={16}
+            icon={iconUnchecked}
+            onClick={onUncheck}
+            variant={!isChecked ? 'solid' : 'ghost'}
+            colorScheme={!isChecked ? 'invokeBlue' : 'base'}
+            aria-label={ariaLabel}
+            data-checked={!isChecked}
+            w={12}
+            alignSelf="stretch"
+            h="auto"
+          />
+        </Tooltip>
+        <Tooltip hasArrow label={tooltipChecked}>
+          <IconButton
+            size="sm"
+            fontSize={16}
+            icon={iconChecked}
+            onClick={onCheck}
+            variant={isChecked ? 'solid' : 'ghost'}
+            colorScheme={isChecked ? 'invokeBlue' : 'base'}
+            aria-label={ariaLabel}
+            data-checked={isChecked}
+            w={12}
+            alignSelf="stretch"
+            h="auto"
+          />
+        </Tooltip>
+      </Flex>
+    );
+  }
+);
+
+IconSwitch.displayName = 'IconSwitch';

invokeai/frontend/web/src/common/hooks/useGlobalHotkeys.ts

@@ -1,7 +1,7 @@
 import { useAppDispatch } from 'app/store/storeHooks';
 import { addScope, removeScope, setScopes } from 'common/hooks/interactionScopes';
+import { useClearQueue } from 'features/queue/components/ClearQueueConfirmationAlertDialog';
 import { useCancelCurrentQueueItem } from 'features/queue/hooks/useCancelCurrentQueueItem';
-import { useClearQueue } from 'features/queue/hooks/useClearQueue';
 import { useQueueBack } from 'features/queue/hooks/useQueueBack';
 import { useQueueFront } from 'features/queue/hooks/useQueueFront';
 import { useFeatureStatus } from 'features/system/hooks/useFeatureStatus';

invokeai/frontend/web/src/features/controlLayers/components/CanvasAddEntityButtons.tsx

@@ -31,22 +31,22 @@ export const CanvasAddEntityButtons = memo(() => {
   }, [dispatch]);
 
   return (
-    <Flex flexDir="column" w="full" h="full" alignItems="center" justifyContent="center">
-      <ButtonGroup orientation="vertical" isAttached={false}>
+    <Flex flexDir="column" w="full" h="full" alignItems="center">
+      <ButtonGroup position="relative" orientation="vertical" isAttached={false} top="20%">
         <Button variant="ghost" justifyContent="flex-start" leftIcon={<PiPlusBold />} onClick={addInpaintMask}>
-          {t('controlLayers.inpaintMask', { count: 1 })}
+          {t('controlLayers.inpaintMask')}
         </Button>
         <Button variant="ghost" justifyContent="flex-start" leftIcon={<PiPlusBold />} onClick={addRegionalGuidance}>
-          {t('controlLayers.regionalGuidance', { count: 1 })}
+          {t('controlLayers.regionalGuidance')}
         </Button>
         <Button variant="ghost" justifyContent="flex-start" leftIcon={<PiPlusBold />} onClick={addRasterLayer}>
-          {t('controlLayers.rasterLayer', { count: 1 })}
+          {t('controlLayers.rasterLayer')}
         </Button>
         <Button variant="ghost" justifyContent="flex-start" leftIcon={<PiPlusBold />} onClick={addControlLayer}>
-          {t('controlLayers.controlLayer', { count: 1 })}
+          {t('controlLayers.controlLayer')}
         </Button>
         <Button variant="ghost" justifyContent="flex-start" leftIcon={<PiPlusBold />} onClick={addIPAdapter}>
-          {t('controlLayers.ipAdapter', { count: 1 })}
+          {t('controlLayers.ipAdapter')}
         </Button>
       </ButtonGroup>
     </Flex>

invokeai/frontend/web/src/features/controlLayers/components/CanvasEntityList/EntityListActionBarAddLayerMenuItems.tsx

@@ -33,19 +33,19 @@ export const CanvasEntityListMenuItems = memo(() => {
   return (
     <>
       <MenuItem icon={<PiPlusBold />} onClick={addInpaintMask}>
-        {t('controlLayers.inpaintMask', { count: 1 })}
+        {t('controlLayers.inpaintMask')}
       </MenuItem>
       <MenuItem icon={<PiPlusBold />} onClick={addRegionalGuidance}>
-        {t('controlLayers.regionalGuidance', { count: 1 })}
+        {t('controlLayers.regionalGuidance')}
       </MenuItem>
       <MenuItem icon={<PiPlusBold />} onClick={addRasterLayer}>
-        {t('controlLayers.rasterLayer', { count: 1 })}
+        {t('controlLayers.rasterLayer')}
       </MenuItem>
       <MenuItem icon={<PiPlusBold />} onClick={addControlLayer}>
-        {t('controlLayers.controlLayer', { count: 1 })}
+        {t('controlLayers.controlLayer')}
       </MenuItem>
       <MenuItem icon={<PiPlusBold />} onClick={addIPAdapter}>
-        {t('controlLayers.ipAdapter', { count: 1 })}
+        {t('controlLayers.ipAdapter')}
       </MenuItem>
     </>
   );

invokeai/frontend/web/src/features/controlLayers/components/CanvasModeSwitcher.tsx

@@ -1,29 +0,0 @@
-import { Button, ButtonGroup } from '@invoke-ai/ui-library';
-import { createSelector } from '@reduxjs/toolkit';
-import { useAppDispatch, useAppSelector } from 'app/store/storeHooks';
-import { selectCanvasSessionSlice, sessionModeChanged } from 'features/controlLayers/store/canvasSessionSlice';
-import { memo, useCallback } from 'react';
-import { useTranslation } from 'react-i18next';
-
-const selectCanvasMode = createSelector(selectCanvasSessionSlice, (canvasSession) => canvasSession.mode);
-
-export const CanvasModeSwitcher = memo(() => {
-  const { t } = useTranslation();
-  const dispatch = useAppDispatch();
-  const mode = useAppSelector(selectCanvasMode);
-  const onClickGenerate = useCallback(() => dispatch(sessionModeChanged({ mode: 'generate' })), [dispatch]);
-  const onClickCompose = useCallback(() => dispatch(sessionModeChanged({ mode: 'compose' })), [dispatch]);
-
-  return (
-    <ButtonGroup variant="outline">
-      <Button onClick={onClickGenerate} colorScheme={mode === 'generate' ? 'invokeBlue' : 'base'}>
-        {t('controlLayers.generateMode')}
-      </Button>
-      <Button onClick={onClickCompose} colorScheme={mode === 'compose' ? 'invokeBlue' : 'base'}>
-        {t('controlLayers.composeMode')}
-      </Button>
-    </ButtonGroup>
-  );
-});
-
-CanvasModeSwitcher.displayName = 'CanvasModeSwitcher';

invokeai/frontend/web/src/features/controlLayers/components/CanvasPanelContent.tsx

@@ -1,21 +1,37 @@
-import { Divider, Flex } from '@invoke-ai/ui-library';
+import { Box, ContextMenu, Divider, Flex, MenuList } from '@invoke-ai/ui-library';
 import { useAppSelector } from 'app/store/storeHooks';
 import { CanvasAddEntityButtons } from 'features/controlLayers/components/CanvasAddEntityButtons';
 import { CanvasEntityList } from 'features/controlLayers/components/CanvasEntityList/CanvasEntityList';
 import { EntityListActionBar } from 'features/controlLayers/components/CanvasEntityList/EntityListActionBar';
+import { CanvasEntityListMenuItems } from 'features/controlLayers/components/CanvasEntityList/EntityListActionBarAddLayerMenuItems';
 import { CanvasManagerProviderGate } from 'features/controlLayers/contexts/CanvasManagerProviderGate';
 import { selectHasEntities } from 'features/controlLayers/store/selectors';
-import { memo } from 'react';
+import { memo, useCallback } from 'react';
 
 export const CanvasPanelContent = memo(() => {
   const hasEntities = useAppSelector(selectHasEntities);
+  const renderMenu = useCallback(
+    () => (
+      <MenuList>
+        <CanvasEntityListMenuItems />
+      </MenuList>
+    ),
+    []
+  );
+
   return (
     <CanvasManagerProviderGate>
       <Flex flexDir="column" gap={2} w="full" h="full">
         <EntityListActionBar />
         <Divider py={0} />
-        {!hasEntities && <CanvasAddEntityButtons />}
-        {hasEntities && <CanvasEntityList />}
+        <ContextMenu<HTMLDivElement> renderMenu={renderMenu} stopImmediatePropagation stopPropagation>
+          {(ref) => (
+            <Box ref={ref} w="full" h="full">
+              {!hasEntities && <CanvasAddEntityButtons />}
+              {hasEntities && <CanvasEntityList />}
+            </Box>
+          )}
+        </ContextMenu>
       </Flex>
     </CanvasManagerProviderGate>
   );

invokeai/frontend/web/src/features/controlLayers/components/CanvasSendToToggle.tsx

@@ -0,0 +1,59 @@
+import { Flex, Text } from '@invoke-ai/ui-library';
+import { useAppDispatch, useAppSelector } from 'app/store/storeHooks';
+import { IconSwitch } from 'common/components/IconSwitch';
+import { selectIsComposing, sessionSendToCanvasChanged } from 'features/controlLayers/store/canvasSessionSlice';
+import { memo, useCallback } from 'react';
+import { useTranslation } from 'react-i18next';
+import { PiImageBold, PiPaintBrushBold } from 'react-icons/pi';
+
+const TooltipSendToGallery = memo(() => {
+  const { t } = useTranslation();
+
+  return (
+    <Flex flexDir="column">
+      <Text fontWeight="semibold">{t('controlLayers.sendToGallery')}</Text>
+      <Text fontWeight="normal">{t('controlLayers.sendToGalleryDesc')}</Text>
+    </Flex>
+  );
+});
+
+TooltipSendToGallery.displayName = 'TooltipSendToGallery';
+
+const TooltipSendToCanvas = memo(() => {
+  const { t } = useTranslation();
+
+  return (
+    <Flex flexDir="column">
+      <Text fontWeight="semibold">{t('controlLayers.sendToCanvas')}</Text>
+      <Text fontWeight="normal">{t('controlLayers.sendToCanvasDesc')}</Text>
+    </Flex>
+  );
+});
+
+TooltipSendToCanvas.displayName = 'TooltipSendToCanvas';
+
+export const CanvasSendToToggle = memo(() => {
+  const dispatch = useAppDispatch();
+  const isComposing = useAppSelector(selectIsComposing);
+
+  const onChange = useCallback(
+    (isChecked: boolean) => {
+      dispatch(sessionSendToCanvasChanged(isChecked));
+    },
+    [dispatch]
+  );
+
+  return (
+    <IconSwitch
+      isChecked={isComposing}
+      onChange={onChange}
+      iconUnchecked={<PiImageBold />}
+      tooltipUnchecked={<TooltipSendToGallery />}
+      iconChecked={<PiPaintBrushBold />}
+      tooltipChecked={<TooltipSendToCanvas />}
+      ariaLabel="Toggle canvas mode"
+    />
+  );
+});
+
+CanvasSendToToggle.displayName = 'CanvasSendToToggle';

invokeai/frontend/web/src/features/controlLayers/components/ControlLayer/ControlLayer.tsx

@@ -1,8 +1,7 @@
 import { Spacer } from '@invoke-ai/ui-library';
 import { CanvasEntityContainer } from 'features/controlLayers/components/common/CanvasEntityContainer';
-import { CanvasEntityEnabledToggle } from 'features/controlLayers/components/common/CanvasEntityEnabledToggle';
 import { CanvasEntityHeader } from 'features/controlLayers/components/common/CanvasEntityHeader';
-import { CanvasEntityIsLockedToggle } from 'features/controlLayers/components/common/CanvasEntityIsLockedToggle';
+import { CanvasEntityHeaderCommonActions } from 'features/controlLayers/components/common/CanvasEntityHeaderCommonActions';
 import { CanvasEntityPreviewImage } from 'features/controlLayers/components/common/CanvasEntityPreviewImage';
 import { CanvasEntitySettingsWrapper } from 'features/controlLayers/components/common/CanvasEntitySettingsWrapper';
 import { CanvasEntityEditableTitle } from 'features/controlLayers/components/common/CanvasEntityTitleEdit';
@@ -29,8 +28,7 @@ export const ControlLayer = memo(({ id }: Props) => {
             <CanvasEntityEditableTitle />
             <Spacer />
             <ControlLayerBadges />
-            <CanvasEntityIsLockedToggle />
-            <CanvasEntityEnabledToggle />
+            <CanvasEntityHeaderCommonActions />
           </CanvasEntityHeader>
           <CanvasEntitySettingsWrapper>
             <ControlLayerControlAdapter />

invokeai/frontend/web/src/features/controlLayers/components/ControlLayersToolbar.tsx

@@ -1,19 +1,20 @@
 /* eslint-disable i18next/no-literal-string */
 import { Flex, Spacer } from '@invoke-ai/ui-library';
-import { CanvasModeSwitcher } from 'features/controlLayers/components/CanvasModeSwitcher';
 import { CanvasResetViewButton } from 'features/controlLayers/components/CanvasResetViewButton';
 import { CanvasScale } from 'features/controlLayers/components/CanvasScale';
 import { CanvasSettingsPopover } from 'features/controlLayers/components/Settings/CanvasSettingsPopover';
 import { ToolChooser } from 'features/controlLayers/components/Tool/ToolChooser';
 import { ToolFillColorPicker } from 'features/controlLayers/components/Tool/ToolFillColorPicker';
 import { ToolSettings } from 'features/controlLayers/components/Tool/ToolSettings';
-import { UndoRedoButtonGroup } from 'features/controlLayers/components/UndoRedoButtonGroup';
 import { CanvasManagerProviderGate } from 'features/controlLayers/contexts/CanvasManagerProviderGate';
+import { useCanvasUndoRedo } from 'features/controlLayers/hooks/useCanvasUndoRedo';
 import { ToggleProgressButton } from 'features/gallery/components/ImageViewer/ToggleProgressButton';
-import { ViewerToggleMenu } from 'features/gallery/components/ImageViewer/ViewerToggleMenu';
+import { ViewerToggle } from 'features/gallery/components/ImageViewer/ViewerToggleMenu';
 import { memo } from 'react';
 
 export const ControlLayersToolbar = memo(() => {
+  useCanvasUndoRedo();
+
   return (
     <CanvasManagerProviderGate>
       <Flex w="full" gap={2} alignItems="center">
@@ -26,10 +27,8 @@ export const ControlLayersToolbar = memo(() => {
         <CanvasResetViewButton />
         <Spacer />
         <ToolFillColorPicker />
-        <CanvasModeSwitcher />
-        <UndoRedoButtonGroup />
         <CanvasSettingsPopover />
-        <ViewerToggleMenu />
+        <ViewerToggle />
       </Flex>
     </CanvasManagerProviderGate>
   );

invokeai/frontend/web/src/features/controlLayers/components/HeadsUpDisplay.tsx

@@ -1,53 +1,27 @@
-import { Box, Flex, Text } from '@invoke-ai/ui-library';
-import { useStore } from '@nanostores/react';
+import { Grid, GridItem, Text } from '@invoke-ai/ui-library';
 import { createSelector } from '@reduxjs/toolkit';
 import { useAppSelector } from 'app/store/storeHooks';
-import { useCanvasManager } from 'features/controlLayers/contexts/CanvasManagerProviderGate';
 import { selectCanvasSlice } from 'features/controlLayers/store/selectors';
-import { round } from 'lodash-es';
 import { memo } from 'react';
 
 const selectBbox = createSelector(selectCanvasSlice, (canvas) => canvas.bbox);
 
 export const HeadsUpDisplay = memo(() => {
-  const canvasManager = useCanvasManager();
-  const stageAttrs = useStore(canvasManager.stateApi.$stageAttrs);
-  const cursorPos = useStore(canvasManager.stateApi.$lastCursorPos);
-  const isDrawing = useStore(canvasManager.stateApi.$isDrawing);
-  const isMouseDown = useStore(canvasManager.stateApi.$isMouseDown);
-  const lastMouseDownPos = useStore(canvasManager.stateApi.$lastMouseDownPos);
-  const lastAddedPoint = useStore(canvasManager.stateApi.$lastAddedPoint);
   const bbox = useAppSelector(selectBbox);
 
   return (
-    <Flex flexDir="column" bg="blackAlpha.400" borderBottomEndRadius="base" p={2} minW={64} gap={2}>
-      <HUDItem label="Zoom" value={`${round(stageAttrs.scale * 100, 2)}%`} />
-      <HUDItem label="Stage Pos" value={`${round(stageAttrs.x, 3)}, ${round(stageAttrs.y, 3)}`} />
-      <HUDItem
-        label="Stage Size"
-        value={`${round(stageAttrs.width / stageAttrs.scale, 2)}×${round(stageAttrs.height / stageAttrs.scale, 2)} px`}
-      />
-      <HUDItem label="BBox Size" value={`${bbox.rect.width}×${bbox.rect.height} px`} />
-      <HUDItem label="BBox Position" value={`${bbox.rect.x}, ${bbox.rect.y}`} />
-      <HUDItem label="BBox Width % 8" value={round(bbox.rect.width % 8, 2)} />
-      <HUDItem label="BBox Height % 8" value={round(bbox.rect.height % 8, 2)} />
-      <HUDItem label="BBox X % 8" value={round(bbox.rect.x % 8, 2)} />
-      <HUDItem label="BBox Y % 8" value={round(bbox.rect.y % 8, 2)} />
-      <HUDItem
-        label="Cursor Position"
-        value={cursorPos ? `${round(cursorPos.x, 2)}, ${round(cursorPos.y, 2)}` : '?, ?'}
-      />
-      <HUDItem label="Is Drawing" value={isDrawing ? 'True' : 'False'} />
-      <HUDItem label="Is Mouse Down" value={isMouseDown ? 'True' : 'False'} />
-      <HUDItem
-        label="Last Mouse Down Pos"
-        value={lastMouseDownPos ? `${round(lastMouseDownPos.x, 2)}, ${round(lastMouseDownPos.y, 2)}` : '?, ?'}
-      />
-      <HUDItem
-        label="Last Added Point"
-        value={lastAddedPoint ? `${round(lastAddedPoint.x, 2)}, ${round(lastAddedPoint.y, 2)}` : '?, ?'}
-      />
-    </Flex>
+    <Grid
+      bg="base.900"
+      borderBottomEndRadius="base"
+      p={2}
+      gap={2}
+      borderRadius="base"
+      templateColumns="auto auto"
+      opacity={0.6}
+    >
+      <HUDItem label="BBox" value={`${bbox.rect.width}×${bbox.rect.height} px`} />
+      <HUDItem label="Scaled BBox" value={`${bbox.scaledSize.width}×${bbox.scaledSize.height} px`} />
+    </Grid>
   );
 });
 
@@ -55,12 +29,14 @@ HeadsUpDisplay.displayName = 'HeadsUpDisplay';
 
 const HUDItem = memo(({ label, value }: { label: string; value: string | number }) => {
   return (
-    <Box display="inline-block" lineHeight={1}>
-      <Text as="span">{label}: </Text>
-      <Text as="span" fontWeight="semibold">
-        {value}
-      </Text>
-    </Box>
+    <>
+      <GridItem>
+        <Text textAlign="end">{label}: </Text>
+      </GridItem>
+      <GridItem fontWeight="semibold">
+        <Text>{value}</Text>
+      </GridItem>
+    </>
   );
 });
 

invokeai/frontend/web/src/features/controlLayers/components/IPAdapter/IPAdapter.tsx

@@ -1,7 +1,7 @@
 import { Spacer } from '@invoke-ai/ui-library';
 import { CanvasEntityContainer } from 'features/controlLayers/components/common/CanvasEntityContainer';
-import { CanvasEntityEnabledToggle } from 'features/controlLayers/components/common/CanvasEntityEnabledToggle';
 import { CanvasEntityHeader } from 'features/controlLayers/components/common/CanvasEntityHeader';
+import { CanvasEntityHeaderCommonActions } from 'features/controlLayers/components/common/CanvasEntityHeaderCommonActions';
 import { CanvasEntityEditableTitle } from 'features/controlLayers/components/common/CanvasEntityTitleEdit';
 import { IPAdapterSettings } from 'features/controlLayers/components/IPAdapter/IPAdapterSettings';
 import { EntityIdentifierContext } from 'features/controlLayers/contexts/EntityIdentifierContext';
@@ -18,10 +18,10 @@ export const IPAdapter = memo(({ id }: Props) => {
   return (
     <EntityIdentifierContext.Provider value={entityIdentifier}>
       <CanvasEntityContainer>
-        <CanvasEntityHeader ps={4}>
+        <CanvasEntityHeader ps={4} py={5}>
           <CanvasEntityEditableTitle />
           <Spacer />
-          <CanvasEntityEnabledToggle />
+          <CanvasEntityHeaderCommonActions />
         </CanvasEntityHeader>
         <IPAdapterSettings />
       </CanvasEntityContainer>

invokeai/frontend/web/src/features/controlLayers/components/InpaintMask/InpaintMask.tsx

@@ -1,8 +1,7 @@
 import { Spacer } from '@invoke-ai/ui-library';
 import { CanvasEntityContainer } from 'features/controlLayers/components/common/CanvasEntityContainer';
-import { CanvasEntityEnabledToggle } from 'features/controlLayers/components/common/CanvasEntityEnabledToggle';
 import { CanvasEntityHeader } from 'features/controlLayers/components/common/CanvasEntityHeader';
-import { CanvasEntityIsLockedToggle } from 'features/controlLayers/components/common/CanvasEntityIsLockedToggle';
+import { CanvasEntityHeaderCommonActions } from 'features/controlLayers/components/common/CanvasEntityHeaderCommonActions';
 import { CanvasEntityPreviewImage } from 'features/controlLayers/components/common/CanvasEntityPreviewImage';
 import { CanvasEntityEditableTitle } from 'features/controlLayers/components/common/CanvasEntityTitleEdit';
 import { EntityMaskAdapterGate } from 'features/controlLayers/contexts/EntityAdapterContext';
@@ -25,8 +24,7 @@ export const InpaintMask = memo(({ id }: Props) => {
             <CanvasEntityPreviewImage />
             <CanvasEntityEditableTitle />
             <Spacer />
-            <CanvasEntityIsLockedToggle />
-            <CanvasEntityEnabledToggle />
+            <CanvasEntityHeaderCommonActions />
           </CanvasEntityHeader>
         </CanvasEntityContainer>
       </EntityMaskAdapterGate>

invokeai/frontend/web/src/features/controlLayers/components/RasterLayer/RasterLayer.tsx

@@ -1,8 +1,7 @@
 import { Spacer } from '@invoke-ai/ui-library';
 import { CanvasEntityContainer } from 'features/controlLayers/components/common/CanvasEntityContainer';
-import { CanvasEntityEnabledToggle } from 'features/controlLayers/components/common/CanvasEntityEnabledToggle';
 import { CanvasEntityHeader } from 'features/controlLayers/components/common/CanvasEntityHeader';
-import { CanvasEntityIsLockedToggle } from 'features/controlLayers/components/common/CanvasEntityIsLockedToggle';
+import { CanvasEntityHeaderCommonActions } from 'features/controlLayers/components/common/CanvasEntityHeaderCommonActions';
 import { CanvasEntityPreviewImage } from 'features/controlLayers/components/common/CanvasEntityPreviewImage';
 import { CanvasEntityEditableTitle } from 'features/controlLayers/components/common/CanvasEntityTitleEdit';
 import { EntityLayerAdapterGate } from 'features/controlLayers/contexts/EntityAdapterContext';
@@ -25,8 +24,7 @@ export const RasterLayer = memo(({ id }: Props) => {
             <CanvasEntityPreviewImage />
             <CanvasEntityEditableTitle />
             <Spacer />
-            <CanvasEntityIsLockedToggle />
-            <CanvasEntityEnabledToggle />
+            <CanvasEntityHeaderCommonActions />
           </CanvasEntityHeader>
         </CanvasEntityContainer>
       </EntityLayerAdapterGate>

invokeai/frontend/web/src/features/controlLayers/components/RegionalGuidance/RegionalGuidance.tsx

@@ -1,8 +1,7 @@
 import { Spacer } from '@invoke-ai/ui-library';
 import { CanvasEntityContainer } from 'features/controlLayers/components/common/CanvasEntityContainer';
-import { CanvasEntityEnabledToggle } from 'features/controlLayers/components/common/CanvasEntityEnabledToggle';
 import { CanvasEntityHeader } from 'features/controlLayers/components/common/CanvasEntityHeader';
-import { CanvasEntityIsLockedToggle } from 'features/controlLayers/components/common/CanvasEntityIsLockedToggle';
+import { CanvasEntityHeaderCommonActions } from 'features/controlLayers/components/common/CanvasEntityHeaderCommonActions';
 import { CanvasEntityPreviewImage } from 'features/controlLayers/components/common/CanvasEntityPreviewImage';
 import { CanvasEntityEditableTitle } from 'features/controlLayers/components/common/CanvasEntityTitleEdit';
 import { RegionalGuidanceBadges } from 'features/controlLayers/components/RegionalGuidance/RegionalGuidanceBadges';
@@ -28,8 +27,7 @@ export const RegionalGuidance = memo(({ id }: Props) => {
             <CanvasEntityEditableTitle />
             <Spacer />
             <RegionalGuidanceBadges />
-            <CanvasEntityIsLockedToggle />
-            <CanvasEntityEnabledToggle />
+            <CanvasEntityHeaderCommonActions />
           </CanvasEntityHeader>
           <RegionalGuidanceSettings />
         </CanvasEntityContainer>

invokeai/frontend/web/src/features/controlLayers/components/Settings/CanvasSettingsPopover.tsx

@@ -18,6 +18,7 @@ import { CanvasSettingsInvertScrollCheckbox } from 'features/controlLayers/compo
 import { CanvasSettingsLogDebugInfoButton } from 'features/controlLayers/components/Settings/CanvasSettingsLogDebugInfo';
 import { CanvasSettingsRecalculateRectsButton } from 'features/controlLayers/components/Settings/CanvasSettingsRecalculateRectsButton';
 import { CanvasSettingsResetButton } from 'features/controlLayers/components/Settings/CanvasSettingsResetButton';
+import { CanvasSettingsShowHUDSwitch } from 'features/controlLayers/components/Settings/CanvasSettingsShowHUDSwitch';
 import { memo } from 'react';
 import { useTranslation } from 'react-i18next';
 import { RiSettings4Fill } from 'react-icons/ri';
@@ -37,6 +38,7 @@ export const CanvasSettingsPopover = memo(() => {
             <CanvasSettingsInvertScrollCheckbox />
             <CanvasSettingsClipToBboxCheckbox />
             <CanvasSettingsDynamicGridSwitch />
+            <CanvasSettingsShowHUDSwitch />
             <CanvasSettingsResetButton />
             <DebugSettings />
           </Flex>

invokeai/frontend/web/src/features/controlLayers/components/Settings/CanvasSettingsShowHUDSwitch.tsx

@@ -0,0 +1,28 @@
+import { FormControl, FormLabel, Switch } from '@invoke-ai/ui-library';
+import { createSelector } from '@reduxjs/toolkit';
+import { useAppDispatch, useAppSelector } from 'app/store/storeHooks';
+import { selectCanvasSettingsSlice, settingsShowHUDToggled } from 'features/controlLayers/store/canvasSettingsSlice';
+import { memo, useCallback } from 'react';
+import { useTranslation } from 'react-i18next';
+
+const selectShowHUD = createSelector(selectCanvasSettingsSlice, (canvasSettings) => canvasSettings.showHUD);
+
+export const CanvasSettingsShowHUDSwitch = memo(() => {
+  const { t } = useTranslation();
+  const dispatch = useAppDispatch();
+  const showHUD = useAppSelector(selectShowHUD);
+  const onChange = useCallback(() => {
+    dispatch(settingsShowHUDToggled());
+  }, [dispatch]);
+
+  return (
+    <FormControl>
+      <FormLabel m={0} flexGrow={1}>
+        {t('controlLayers.showHUD')}
+      </FormLabel>
+      <Switch size="sm" isChecked={showHUD} onChange={onChange} />
+    </FormControl>
+  );
+});
+
+CanvasSettingsShowHUDSwitch.displayName = 'CanvasSettingsShowHUDSwitch';

invokeai/frontend/web/src/features/controlLayers/components/StageComponent.tsx

@@ -8,20 +8,18 @@ import { useAppSelector } from 'app/store/storeHooks';
 import { HeadsUpDisplay } from 'features/controlLayers/components/HeadsUpDisplay';
 import { CanvasManager } from 'features/controlLayers/konva/CanvasManager';
 import { TRANSPARENCY_CHECKER_PATTERN } from 'features/controlLayers/konva/constants';
+import { getPrefixedId } from 'features/controlLayers/konva/util';
 import { selectCanvasSettingsSlice } from 'features/controlLayers/store/canvasSettingsSlice';
 import Konva from 'konva';
 import { memo, useCallback, useEffect, useLayoutEffect, useState } from 'react';
 import { useDevicePixelRatio } from 'use-device-pixel-ratio';
-import { v4 as uuidv4 } from 'uuid';
 
 const log = logger('canvas');
 
-const showHud = false;
-
 // This will log warnings when layers > 5 - maybe use `import.meta.env.MODE === 'development'` instead?
 Konva.showWarnings = false;
 
-const useStageRenderer = (stage: Konva.Stage, container: HTMLDivElement | null, asPreview: boolean) => {
+const useStageRenderer = (stage: Konva.Stage, container: HTMLDivElement | null) => {
   const store = useAppStore();
   const socket = useStore($socket);
   const dpr = useDevicePixelRatio({ round: false });
@@ -42,28 +40,25 @@ const useStageRenderer = (stage: Konva.Stage, container: HTMLDivElement | null,
     const manager = new CanvasManager(stage, container, store, socket);
     manager.initialize();
     return manager.destroy;
-  }, [asPreview, container, socket, stage, store]);
+  }, [container, socket, stage, store]);
 
   useLayoutEffect(() => {
     Konva.pixelRatio = dpr;
   }, [dpr]);
 };
 
-type Props = {
-  asPreview?: boolean;
-};
-
 const selectDynamicGrid = createSelector(selectCanvasSettingsSlice, (canvasSettings) => canvasSettings.dynamicGrid);
+const selectShowHUD = createSelector(selectCanvasSettingsSlice, (canvasSettings) => canvasSettings.showHUD);
 
-export const StageComponent = memo(({ asPreview = false }: Props) => {
+export const StageComponent = memo(() => {
   const dynamicGrid = useAppSelector(selectDynamicGrid);
+  const showHUD = useAppSelector(selectShowHUD);
 
   const [stage] = useState(
     () =>
       new Konva.Stage({
-        id: uuidv4(),
+        id: getPrefixedId('konva_stage'),
         container: document.createElement('div'),
-        listening: !asPreview,
       })
   );
   const [container, setContainer] = useState<HTMLDivElement | null>(null);
@@ -72,7 +67,7 @@ export const StageComponent = memo(({ asPreview = false }: Props) => {
     setContainer(el);
   }, []);
 
-  useStageRenderer(stage, container, asPreview);
+  useStageRenderer(stage, container);
 
   useEffect(
     () => () => {
@@ -106,9 +101,9 @@ export const StageComponent = memo(({ asPreview = false }: Props) => {
         overflow="hidden"
         data-testid="control-layers-canvas"
       />
-      {!asPreview && (
-        <Flex position="absolute" top={0} insetInlineStart={0} pointerEvents="none">
-          {showHud && <HeadsUpDisplay />}
+      {showHUD && (
+        <Flex position="absolute" top={1} insetInlineStart={1} pointerEvents="none">
+          <HeadsUpDisplay />
         </Flex>
       )}
     </Flex>

invokeai/frontend/web/src/features/controlLayers/components/StagingArea/StagingAreaToolbar.tsx

@@ -98,9 +98,9 @@ export const StagingAreaToolbar = memo(() => {
     onPrev,
     {
       preventDefault: true,
-      enabled: isCanvasActive,
+      enabled: isCanvasActive && shouldShowStagedImage && imageCount > 1,
     },
-    [isCanvasActive]
+    [isCanvasActive, shouldShowStagedImage, imageCount]
   );
 
   useHotkeys(
@@ -108,9 +108,9 @@ export const StagingAreaToolbar = memo(() => {
     onNext,
     {
       preventDefault: true,
-      enabled: isCanvasActive,
+      enabled: isCanvasActive && shouldShowStagedImage && imageCount > 1,
     },
-    [isCanvasActive]
+    [isCanvasActive, shouldShowStagedImage, imageCount]
   );
 
   useHotkeys(
@@ -118,9 +118,9 @@ export const StagingAreaToolbar = memo(() => {
     onAccept,
     {
       preventDefault: true,
-      enabled: isCanvasActive,
+      enabled: isCanvasActive && shouldShowStagedImage && imageCount > 1,
     },
-    [isCanvasActive]
+    [isCanvasActive, shouldShowStagedImage, imageCount]
   );
 
   const counterText = useMemo(() => {

invokeai/frontend/web/src/features/controlLayers/components/Tool/ToolFillColorPicker.tsx

@@ -1,4 +1,4 @@
-import { Flex, Popover, PopoverBody, PopoverContent, PopoverTrigger } from '@invoke-ai/ui-library';
+import { Box, Flex, Popover, PopoverBody, PopoverContent, PopoverTrigger, Tooltip } from '@invoke-ai/ui-library';
 import { createSelector } from '@reduxjs/toolkit';
 import { useAppDispatch, useAppSelector } from 'app/store/storeHooks';
 import IAIColorPicker from 'common/components/IAIColorPicker';
@@ -23,17 +23,13 @@ export const ToolFillColorPicker = memo(() => {
   return (
     <Popover isLazy>
       <PopoverTrigger>
-        <Flex
-          as="button"
-          aria-label={t('controlLayers.brushColor')}
-          borderRadius="full"
-          borderWidth={1}
-          bg={rgbaColorToString(fill)}
-          w={8}
-          h={8}
-          cursor="pointer"
-          tabIndex={-1}
-        />
+        <Flex role="button" aria-label={t('controlLayers.fill.fillColor')} tabIndex={-1} w={8} h={8}>
+          <Tooltip label={t('controlLayers.fill.fillColor')}>
+            <Flex w="full" h="full" alignItems="center" justifyContent="center">
+              <Box borderRadius="full" w={6} h={6} borderWidth={1} bg={rgbaColorToString(fill)} />
+            </Flex>
+          </Tooltip>
+        </Flex>
       </PopoverTrigger>
       <PopoverContent>
         <PopoverBody minH={64}>

invokeai/frontend/web/src/features/controlLayers/components/common/CanvasEntityAddOfTypeButton.tsx

@@ -0,0 +1,70 @@
+import { IconButton } from '@invoke-ai/ui-library';
+import { useAppDispatch } from 'app/store/storeHooks';
+import {
+  controlLayerAdded,
+  inpaintMaskAdded,
+  ipaAdded,
+  rasterLayerAdded,
+  rgAdded,
+} from 'features/controlLayers/store/canvasSlice';
+import type { CanvasEntityIdentifier } from 'features/controlLayers/store/types';
+import { memo, useCallback, useMemo } from 'react';
+import { useTranslation } from 'react-i18next';
+import { PiPlusBold } from 'react-icons/pi';
+
+type Props = {
+  type: CanvasEntityIdentifier['type'];
+};
+
+export const CanvasEntityAddOfTypeButton = memo(({ type }: Props) => {
+  const { t } = useTranslation();
+  const dispatch = useAppDispatch();
+  const onClick = useCallback(() => {
+    switch (type) {
+      case 'inpaint_mask':
+        dispatch(inpaintMaskAdded({ isSelected: true }));
+        break;
+      case 'regional_guidance':
+        dispatch(rgAdded({ isSelected: true }));
+        break;
+      case 'raster_layer':
+        dispatch(rasterLayerAdded({ isSelected: true }));
+        break;
+      case 'control_layer':
+        dispatch(controlLayerAdded({ isSelected: true }));
+        break;
+      case 'ip_adapter':
+        dispatch(ipaAdded({ isSelected: true }));
+        break;
+    }
+  }, [dispatch, type]);
+
+  const label = useMemo(() => {
+    switch (type) {
+      case 'inpaint_mask':
+        return t('controlLayers.addInpaintMask');
+      case 'regional_guidance':
+        return t('controlLayers.addRegionalGuidance');
+      case 'raster_layer':
+        return t('controlLayers.addRasterLayer');
+      case 'control_layer':
+        return t('controlLayers.addControlLayer');
+      case 'ip_adapter':
+        return t('controlLayers.addIPAdapter');
+    }
+  }, [type, t]);
+
+  return (
+    <IconButton
+      size="sm"
+      aria-label={label}
+      tooltip={label}
+      variant="link"
+      icon={<PiPlusBold />}
+      onClick={onClick}
+      alignSelf="stretch"
+    />
+  );
+});
+
+CanvasEntityAddOfTypeButton.displayName = 'CanvasEntityAddOfTypeButton';

invokeai/frontend/web/src/features/controlLayers/components/common/CanvasEntityDeleteButton.tsx

@@ -0,0 +1,31 @@
+import { IconButton } from '@invoke-ai/ui-library';
+import { useAppDispatch } from 'app/store/storeHooks';
+import { useEntityIdentifierContext } from 'features/controlLayers/contexts/EntityIdentifierContext';
+import { entityDeleted } from 'features/controlLayers/store/canvasSlice';
+import { memo, useCallback } from 'react';
+import { useTranslation } from 'react-i18next';
+import { PiTrashSimpleFill } from 'react-icons/pi';
+
+export const CanvasEntityDeleteButton = memo(() => {
+  const { t } = useTranslation();
+  const entityIdentifier = useEntityIdentifierContext();
+  const dispatch = useAppDispatch();
+  const onClick = useCallback(() => {
+    dispatch(entityDeleted({ entityIdentifier }));
+  }, [dispatch, entityIdentifier]);
+
+  return (
+    <IconButton
+      size="sm"
+      aria-label={t('common.delete')}
+      tooltip={t('common.delete')}
+      variant="link"
+      alignSelf="stretch"
+      icon={<PiTrashSimpleFill />}
+      onClick={onClick}
+      colorScheme="error"
+    />
+  );
+});
+
+CanvasEntityDeleteButton.displayName = 'CanvasEntityDeleteButton';

invokeai/frontend/web/src/features/controlLayers/components/common/CanvasEntityEnabledToggle.tsx

@@ -21,7 +21,8 @@ export const CanvasEntityEnabledToggle = memo(() => {
       size="sm"
       aria-label={t(isEnabled ? 'common.enabled' : 'common.disabled')}
       tooltip={t(isEnabled ? 'common.enabled' : 'common.disabled')}
-      variant="ghost"
+      variant="link"
+      alignSelf="stretch"
       icon={isEnabled ? <PiCircleFill /> : <PiCircleBold />}
       onClick={onClick}
     />

invokeai/frontend/web/src/features/controlLayers/components/common/CanvasEntityGroupList.tsx

@@ -1,6 +1,7 @@
 import type { SystemStyleObject } from '@invoke-ai/ui-library';
 import { Button, Collapse, Flex, Icon, Spacer, Text } from '@invoke-ai/ui-library';
 import { useBoolean } from 'common/hooks/useBoolean';
+import { CanvasEntityAddOfTypeButton } from 'features/controlLayers/components/common/CanvasEntityAddOfTypeButton';
 import { CanvasEntityTypeIsHiddenToggle } from 'features/controlLayers/components/common/CanvasEntityTypeIsHiddenToggle';
 import { useEntityTypeTitle } from 'features/controlLayers/hooks/useEntityTypeTitle';
 import type { CanvasEntityIdentifier } from 'features/controlLayers/store/types';
@@ -53,6 +54,7 @@ export const CanvasEntityGroupList = memo(({ isSelected, type, children }: Props
           </Text>
           <Spacer />
         </Flex>
+        <CanvasEntityAddOfTypeButton type={type} />
         {type !== 'ip_adapter' && <CanvasEntityTypeIsHiddenToggle type={type} />}
       </Flex>
       <Collapse in={collapse.isTrue}>

invokeai/frontend/web/src/features/controlLayers/components/common/CanvasEntityHeaderCommonActions.tsx

@@ -0,0 +1,20 @@
+import { Flex } from '@invoke-ai/ui-library';
+import { CanvasEntityDeleteButton } from 'features/controlLayers/components/common/CanvasEntityDeleteButton';
+import { CanvasEntityEnabledToggle } from 'features/controlLayers/components/common/CanvasEntityEnabledToggle';
+import { CanvasEntityIsLockedToggle } from 'features/controlLayers/components/common/CanvasEntityIsLockedToggle';
+import { useEntityIdentifierContext } from 'features/controlLayers/contexts/EntityIdentifierContext';
+import { memo } from 'react';
+
+export const CanvasEntityHeaderCommonActions = memo(() => {
+  const entityIdentifier = useEntityIdentifierContext();
+
+  return (
+    <Flex alignSelf="stretch">
+      {entityIdentifier.type !== 'ip_adapter' && <CanvasEntityIsLockedToggle />}
+      <CanvasEntityEnabledToggle />
+      <CanvasEntityDeleteButton />
+    </Flex>
+  );
+});
+
+CanvasEntityHeaderCommonActions.displayName = 'CanvasEntityHeaderCommonActions';

invokeai/frontend/web/src/features/controlLayers/components/common/CanvasEntityIsLockedToggle.tsx

@@ -21,7 +21,8 @@ export const CanvasEntityIsLockedToggle = memo(() => {
       size="sm"
       aria-label={t(isLocked ? 'controlLayers.locked' : 'controlLayers.unlocked')}
       tooltip={t(isLocked ? 'controlLayers.locked' : 'controlLayers.unlocked')}
-      variant="ghost"
+      variant="link"
+      alignSelf="stretch"
       icon={isLocked ? <PiLockSimpleFill /> : <PiLockSimpleOpenBold />}
       onClick={onClick}
     />

invokeai/frontend/web/src/features/controlLayers/hooks/useCanvasUndoRedo.tsx

@@ -1,16 +1,14 @@
 /* eslint-disable i18next/no-literal-string */
-import { ButtonGroup, IconButton } from '@invoke-ai/ui-library';
 import { useAppSelector } from 'app/store/storeHooks';
+import { useAssertSingleton } from 'common/hooks/useAssertSingleton';
 import { canvasRedo, canvasUndo } from 'features/controlLayers/store/canvasSlice';
 import { selectCanvasMayRedo, selectCanvasMayUndo } from 'features/controlLayers/store/selectors';
-import { memo, useCallback } from 'react';
+import { useCallback } from 'react';
 import { useHotkeys } from 'react-hotkeys-hook';
-import { useTranslation } from 'react-i18next';
-import { PiArrowClockwiseBold, PiArrowCounterClockwiseBold } from 'react-icons/pi';
 import { useDispatch } from 'react-redux';
 
-export const UndoRedoButtonGroup = memo(() => {
-  const { t } = useTranslation();
+export const useCanvasUndoRedo = () => {
+  useAssertSingleton('useCanvasUndoRedo');
   const dispatch = useDispatch();
 
   const mayUndo = useAppSelector(selectCanvasMayUndo);
@@ -27,27 +25,4 @@ export const UndoRedoButtonGroup = memo(() => {
     mayRedo,
     handleRedo,
   ]);
-
-  return (
-    <ButtonGroup isAttached={false}>
-      <IconButton
-        aria-label={t('unifiedCanvas.undo')}
-        tooltip={t('unifiedCanvas.undo')}
-        onClick={handleUndo}
-        icon={<PiArrowCounterClockwiseBold />}
-        isDisabled={!mayUndo}
-        variant="ghost"
-      />
-      <IconButton
-        aria-label={t('unifiedCanvas.redo')}
-        tooltip={t('unifiedCanvas.redo')}
-        onClick={handleRedo}
-        icon={<PiArrowClockwiseBold />}
-        isDisabled={!mayRedo}
-        variant="ghost"
-      />
-    </ButtonGroup>
-  );
-});
-
-UndoRedoButtonGroup.displayName = 'UndoRedoButtonGroup';
+};

invokeai/frontend/web/src/features/controlLayers/hooks/useEntityTitle.ts

@@ -29,15 +29,15 @@ export const useEntityTitle = (entityIdentifier: CanvasEntityIdentifier) => {
 
     const parts: string[] = [];
     if (entityIdentifier.type === 'inpaint_mask') {
-      parts.push(t('controlLayers.inpaintMask', { count: 1 }));
+      parts.push(t('controlLayers.inpaintMask'));
     } else if (entityIdentifier.type === 'control_layer') {
-      parts.push(t('controlLayers.controlLayer', { count: 1 }));
+      parts.push(t('controlLayers.controlLayer'));
     } else if (entityIdentifier.type === 'raster_layer') {
-      parts.push(t('controlLayers.rasterLayer', { count: 1 }));
+      parts.push(t('controlLayers.rasterLayer'));
     } else if (entityIdentifier.type === 'ip_adapter') {
-      parts.push(t('common.ipAdapter', { count: 1 }));
+      parts.push(t('common.ipAdapter'));
     } else if (entityIdentifier.type === 'regional_guidance') {
-      parts.push(t('controlLayers.regionalGuidance', { count: 1 }));
+      parts.push(t('controlLayers.regionalGuidance'));
     } else {
       assert(false, 'Unexpected entity type');
     }

invokeai/frontend/web/src/features/controlLayers/hooks/useEntityTypeString.ts

@@ -8,15 +8,15 @@ export const useEntityTypeString = (type: CanvasEntityIdentifier['type']): strin
   const typeString = useMemo(() => {
     switch (type) {
       case 'control_layer':
-        return t('controlLayers.controlLayer', { count: 0 });
+        return t('controlLayers.controlLayer');
       case 'raster_layer':
-        return t('controlLayers.rasterLayer', { count: 0 });
+        return t('controlLayers.rasterLayer');
       case 'inpaint_mask':
-        return t('controlLayers.inpaintMask', { count: 0 });
+        return t('controlLayers.inpaintMask');
       case 'regional_guidance':
-        return t('controlLayers.regionalGuidance', { count: 0 });
+        return t('controlLayers.regionalGuidance');
       case 'ip_adapter':
-        return t('controlLayers.ipAdapter', { count: 0 });
+        return t('controlLayers.ipAdapter');
       default:
         return '';
     }

invokeai/frontend/web/src/features/controlLayers/konva/CanvasToolModule.ts

@@ -250,12 +250,10 @@ export class CanvasToolModule extends CanvasModuleABC {
     this.konva.colorPicker.group.visible(tool === 'colorPicker');
   };
 
-  render = () => {
+  syncCursorStyle = () => {
     const stage = this.manager.stage;
     const renderedEntityCount = this.manager.stateApi.getRenderedEntityCount();
-    const toolState = this.manager.stateApi.getToolState();
     const selectedEntity = this.manager.stateApi.getSelectedEntity();
-    const cursorPos = this.manager.stateApi.$lastCursorPos.get();
     const isMouseDown = this.manager.stateApi.$isMouseDown.get();
     const tool = this.manager.stateApi.$tool.get();
 
@@ -294,6 +292,158 @@ export class CanvasToolModule extends CanvasModuleABC {
       // Non-drawable layers don't have tools
       stage.container.style.cursor = 'not-allowed';
     }
+  };
+
+  renderBrushTool = (cursorPos: Coordinate) => {
+    const toolState = this.manager.stateApi.getToolState();
+    const brushPreviewFill = this.manager.stateApi.getBrushPreviewFill();
+    const alignedCursorPos = alignCoordForTool(cursorPos, toolState.brush.width);
+    const onePixel = this.manager.stage.getScaledPixels(1);
+    const twoPixels = this.manager.stage.getScaledPixels(2);
+    const radius = toolState.brush.width / 2;
+
+    // The circle is scaled
+    this.konva.brush.fillCircle.setAttrs({
+      x: alignedCursorPos.x,
+      y: alignedCursorPos.y,
+      radius,
+      fill: rgbaColorToString(brushPreviewFill),
+    });
+
+    // But the borders are in screen-pixels
+    this.konva.brush.innerBorder.setAttrs({
+      x: cursorPos.x,
+      y: cursorPos.y,
+      innerRadius: radius,
+      outerRadius: radius + onePixel,
+    });
+    this.konva.brush.outerBorder.setAttrs({
+      x: cursorPos.x,
+      y: cursorPos.y,
+      innerRadius: radius + onePixel,
+      outerRadius: radius + twoPixels,
+    });
+  };
+
+  renderEraserTool = (cursorPos: Coordinate) => {
+    const toolState = this.manager.stateApi.getToolState();
+    const alignedCursorPos = alignCoordForTool(cursorPos, toolState.eraser.width);
+    const onePixel = this.manager.stage.getScaledPixels(1);
+    const twoPixels = this.manager.stage.getScaledPixels(2);
+    const radius = toolState.eraser.width / 2;
+
+    // The circle is scaled
+    this.konva.eraser.fillCircle.setAttrs({
+      x: alignedCursorPos.x,
+      y: alignedCursorPos.y,
+      radius,
+      fill: 'white',
+    });
+
+    // But the borders are in screen-pixels
+    this.konva.eraser.innerBorder.setAttrs({
+      x: cursorPos.x,
+      y: cursorPos.y,
+      innerRadius: radius,
+      outerRadius: radius + onePixel,
+    });
+    this.konva.eraser.outerBorder.setAttrs({
+      x: cursorPos.x,
+      y: cursorPos.y,
+      innerRadius: radius + onePixel,
+      outerRadius: radius + twoPixels,
+    });
+  };
+
+  renderColorPicker = (cursorPos: Coordinate) => {
+    const toolState = this.manager.stateApi.getToolState();
+    const colorUnderCursor = this.manager.stateApi.$colorUnderCursor.get();
+    const colorPickerInnerRadius = this.manager.stage.getScaledPixels(CanvasToolModule.COLOR_PICKER_RADIUS);
+    const colorPickerOuterRadius = this.manager.stage.getScaledPixels(
+      CanvasToolModule.COLOR_PICKER_RADIUS + CanvasToolModule.COLOR_PICKER_THICKNESS
+    );
+    const onePixel = this.manager.stage.getScaledPixels(1);
+    const twoPixels = this.manager.stage.getScaledPixels(2);
+
+    this.konva.colorPicker.newColor.setAttrs({
+      x: cursorPos.x,
+      y: cursorPos.y,
+      fill: rgbColorToString(colorUnderCursor),
+      innerRadius: colorPickerInnerRadius,
+      outerRadius: colorPickerOuterRadius,
+    });
+    this.konva.colorPicker.oldColor.setAttrs({
+      x: cursorPos.x,
+      y: cursorPos.y,
+      fill: rgbColorToString(toolState.fill),
+      innerRadius: colorPickerInnerRadius,
+      outerRadius: colorPickerOuterRadius,
+    });
+    this.konva.colorPicker.innerBorder.setAttrs({
+      x: cursorPos.x,
+      y: cursorPos.y,
+      innerRadius: colorPickerOuterRadius,
+      outerRadius: colorPickerOuterRadius + onePixel,
+    });
+    this.konva.colorPicker.outerBorder.setAttrs({
+      x: cursorPos.x,
+      y: cursorPos.y,
+      innerRadius: colorPickerOuterRadius + onePixel,
+      outerRadius: colorPickerOuterRadius + twoPixels,
+    });
+
+    const size = this.manager.stage.getScaledPixels(CanvasToolModule.COLOR_PICKER_CROSSHAIR_SIZE);
+    const space = this.manager.stage.getScaledPixels(CanvasToolModule.COLOR_PICKER_CROSSHAIR_SPACE);
+    const innerThickness = this.manager.stage.getScaledPixels(CanvasToolModule.COLOR_PICKER_CROSSHAIR_INNER_THICKNESS);
+    const outerThickness = this.manager.stage.getScaledPixels(CanvasToolModule.COLOR_PICKER_CROSSHAIR_OUTER_THICKNESS);
+    this.konva.colorPicker.crosshairNorthOuter.setAttrs({
+      strokeWidth: outerThickness,
+      points: [cursorPos.x, cursorPos.y - size, cursorPos.x, cursorPos.y - space],
+    });
+    this.konva.colorPicker.crosshairNorthInner.setAttrs({
+      strokeWidth: innerThickness,
+      points: [cursorPos.x, cursorPos.y - size, cursorPos.x, cursorPos.y - space],
+    });
+    this.konva.colorPicker.crosshairEastOuter.setAttrs({
+      strokeWidth: outerThickness,
+      points: [cursorPos.x + space, cursorPos.y, cursorPos.x + size, cursorPos.y],
+    });
+    this.konva.colorPicker.crosshairEastInner.setAttrs({
+      strokeWidth: innerThickness,
+      points: [cursorPos.x + space, cursorPos.y, cursorPos.x + size, cursorPos.y],
+    });
+    this.konva.colorPicker.crosshairSouthOuter.setAttrs({
+      strokeWidth: outerThickness,
+      points: [cursorPos.x, cursorPos.y + space, cursorPos.x, cursorPos.y + size],
+    });
+    this.konva.colorPicker.crosshairSouthInner.setAttrs({
+      strokeWidth: innerThickness,
+      points: [cursorPos.x, cursorPos.y + space, cursorPos.x, cursorPos.y + size],
+    });
+    this.konva.colorPicker.crosshairWestOuter.setAttrs({
+      strokeWidth: outerThickness,
+      points: [cursorPos.x - space, cursorPos.y, cursorPos.x - size, cursorPos.y],
+    });
+    this.konva.colorPicker.crosshairWestInner.setAttrs({
+      strokeWidth: innerThickness,
+      points: [cursorPos.x - space, cursorPos.y, cursorPos.x - size, cursorPos.y],
+    });
+  };
+
+  render = () => {
+    const stage = this.manager.stage;
+    const renderedEntityCount = this.manager.stateApi.getRenderedEntityCount();
+    const selectedEntity = this.manager.stateApi.getSelectedEntity();
+    const cursorPos = this.manager.stateApi.$lastCursorPos.get();
+    const tool = this.manager.stateApi.$tool.get();
+
+    const isDrawable =
+      !!selectedEntity &&
+      selectedEntity.state.isEnabled &&
+      !selectedEntity.state.isLocked &&
+      isDrawableEntity(selectedEntity.state);
+
+    this.syncCursorStyle();
 
     stage.setIsDraggable(tool === 'view');
 
@@ -305,136 +455,11 @@ export class CanvasToolModule extends CanvasModuleABC {
 
       // No need to render the brush preview if the cursor position or color is missing
       if (cursorPos && tool === 'brush') {
-        const brushPreviewFill = this.manager.stateApi.getBrushPreviewFill();
-        const alignedCursorPos = alignCoordForTool(cursorPos, toolState.brush.width);
-        const onePixel = this.manager.stage.getScaledPixels(1);
-        const twoPixels = this.manager.stage.getScaledPixels(2);
-        const radius = toolState.brush.width / 2;
-
-        // The circle is scaled
-        this.konva.brush.fillCircle.setAttrs({
-          x: alignedCursorPos.x,
-          y: alignedCursorPos.y,
-          radius,
-          fill: rgbaColorToString(brushPreviewFill),
-        });
-
-        // But the borders are in screen-pixels
-        this.konva.brush.innerBorder.setAttrs({
-          x: cursorPos.x,
-          y: cursorPos.y,
-          innerRadius: radius,
-          outerRadius: radius + onePixel,
-        });
-        this.konva.brush.outerBorder.setAttrs({
-          x: cursorPos.x,
-          y: cursorPos.y,
-          innerRadius: radius + onePixel,
-          outerRadius: radius + twoPixels,
-        });
+        this.renderBrushTool(cursorPos);
       } else if (cursorPos && tool === 'eraser') {
-        const alignedCursorPos = alignCoordForTool(cursorPos, toolState.eraser.width);
-        const onePixel = this.manager.stage.getScaledPixels(1);
-        const twoPixels = this.manager.stage.getScaledPixels(2);
-        const radius = toolState.eraser.width / 2;
-
-        // The circle is scaled
-        this.konva.eraser.fillCircle.setAttrs({
-          x: alignedCursorPos.x,
-          y: alignedCursorPos.y,
-          radius,
-          fill: 'white',
-        });
-
-        // But the borders are in screen-pixels
-        this.konva.eraser.innerBorder.setAttrs({
-          x: cursorPos.x,
-          y: cursorPos.y,
-          innerRadius: radius,
-          outerRadius: radius + onePixel,
-        });
-        this.konva.eraser.outerBorder.setAttrs({
-          x: cursorPos.x,
-          y: cursorPos.y,
-          innerRadius: radius + onePixel,
-          outerRadius: radius + twoPixels,
-        });
+        this.renderEraserTool(cursorPos);
       } else if (cursorPos && tool === 'colorPicker') {
-        const colorUnderCursor = this.manager.stateApi.$colorUnderCursor.get();
-        const colorPickerInnerRadius = this.manager.stage.getScaledPixels(CanvasToolModule.COLOR_PICKER_RADIUS);
-        const colorPickerOuterRadius = this.manager.stage.getScaledPixels(
-          CanvasToolModule.COLOR_PICKER_RADIUS + CanvasToolModule.COLOR_PICKER_THICKNESS
-        );
-        const onePixel = this.manager.stage.getScaledPixels(1);
-        const twoPixels = this.manager.stage.getScaledPixels(2);
-
-        this.konva.colorPicker.newColor.setAttrs({
-          x: cursorPos.x,
-          y: cursorPos.y,
-          fill: rgbColorToString(colorUnderCursor),
-          innerRadius: colorPickerInnerRadius,
-          outerRadius: colorPickerOuterRadius,
-        });
-        this.konva.colorPicker.oldColor.setAttrs({
-          x: cursorPos.x,
-          y: cursorPos.y,
-          fill: rgbColorToString(toolState.fill),
-          innerRadius: colorPickerInnerRadius,
-          outerRadius: colorPickerOuterRadius,
-        });
-        this.konva.colorPicker.innerBorder.setAttrs({
-          x: cursorPos.x,
-          y: cursorPos.y,
-          innerRadius: colorPickerOuterRadius,
-          outerRadius: colorPickerOuterRadius + onePixel,
-        });
-        this.konva.colorPicker.outerBorder.setAttrs({
-          x: cursorPos.x,
-          y: cursorPos.y,
-          innerRadius: colorPickerOuterRadius + onePixel,
-          outerRadius: colorPickerOuterRadius + twoPixels,
-        });
-
-        const size = this.manager.stage.getScaledPixels(CanvasToolModule.COLOR_PICKER_CROSSHAIR_SIZE);
-        const space = this.manager.stage.getScaledPixels(CanvasToolModule.COLOR_PICKER_CROSSHAIR_SPACE);
-        const innerThickness = this.manager.stage.getScaledPixels(
-          CanvasToolModule.COLOR_PICKER_CROSSHAIR_INNER_THICKNESS
-        );
-        const outerThickness = this.manager.stage.getScaledPixels(
-          CanvasToolModule.COLOR_PICKER_CROSSHAIR_OUTER_THICKNESS
-        );
-        this.konva.colorPicker.crosshairNorthOuter.setAttrs({
-          strokeWidth: outerThickness,
-          points: [cursorPos.x, cursorPos.y - size, cursorPos.x, cursorPos.y - space],
-        });
-        this.konva.colorPicker.crosshairNorthInner.setAttrs({
-          strokeWidth: innerThickness,
-          points: [cursorPos.x, cursorPos.y - size, cursorPos.x, cursorPos.y - space],
-        });
-        this.konva.colorPicker.crosshairEastOuter.setAttrs({
-          strokeWidth: outerThickness,
-          points: [cursorPos.x + space, cursorPos.y, cursorPos.x + size, cursorPos.y],
-        });
-        this.konva.colorPicker.crosshairEastInner.setAttrs({
-          strokeWidth: innerThickness,
-          points: [cursorPos.x + space, cursorPos.y, cursorPos.x + size, cursorPos.y],
-        });
-        this.konva.colorPicker.crosshairSouthOuter.setAttrs({
-          strokeWidth: outerThickness,
-          points: [cursorPos.x, cursorPos.y + space, cursorPos.x, cursorPos.y + size],
-        });
-        this.konva.colorPicker.crosshairSouthInner.setAttrs({
-          strokeWidth: innerThickness,
-          points: [cursorPos.x, cursorPos.y + space, cursorPos.x, cursorPos.y + size],
-        });
-        this.konva.colorPicker.crosshairWestOuter.setAttrs({
-          strokeWidth: outerThickness,
-          points: [cursorPos.x - space, cursorPos.y, cursorPos.x - size, cursorPos.y],
-        });
-        this.konva.colorPicker.crosshairWestInner.setAttrs({
-          strokeWidth: innerThickness,
-          points: [cursorPos.x - space, cursorPos.y, cursorPos.x - size, cursorPos.y],
-        });
+        this.renderColorPicker(cursorPos);
       }
 
       this.setToolVisibility(tool, isDrawable);
@@ -864,6 +889,10 @@ export class CanvasToolModule extends CanvasModuleABC {
       this.manager.stateApi.$spaceKey.set(true);
       this.manager.stateApi.$lastCursorPos.set(null);
       this.manager.stateApi.$lastMouseDownPos.set(null);
+    } else if (e.key === 'Alt') {
+      // Select the color picker on alt key down
+      this.manager.stateApi.$toolBuffer.set(this.manager.stateApi.$tool.get());
+      this.manager.stateApi.$tool.set('colorPicker');
     }
   };
 
@@ -880,6 +909,11 @@ export class CanvasToolModule extends CanvasModuleABC {
       this.manager.stateApi.$tool.set(toolBuffer ?? 'move');
       this.manager.stateApi.$toolBuffer.set(null);
       this.manager.stateApi.$spaceKey.set(false);
+    } else if (e.key === 'Alt') {
+      // Revert the tool to the previous tool on alt key up
+      const toolBuffer = this.manager.stateApi.$toolBuffer.get();
+      this.manager.stateApi.$tool.set(toolBuffer ?? 'move');
+      this.manager.stateApi.$toolBuffer.set(null);
     }
   };
 

invokeai/frontend/web/src/features/controlLayers/store/canvasSessionSlice.ts

@@ -1,17 +1,17 @@
 import { createAction, createSelector, createSlice, type PayloadAction } from '@reduxjs/toolkit';
 import type { PersistConfig, RootState } from 'app/store/store';
 import { canvasSlice } from 'features/controlLayers/store/canvasSlice';
-import type { SessionMode, StagingAreaImage } from 'features/controlLayers/store/types';
+import type { StagingAreaImage } from 'features/controlLayers/store/types';
 
 export type CanvasSessionState = {
-  mode: SessionMode;
+  sendToCanvas: boolean;
   isStaging: boolean;
   stagedImages: StagingAreaImage[];
   selectedStagedImageIndex: number;
 };
 
 const initialState: CanvasSessionState = {
-  mode: 'generate',
+  sendToCanvas: false,
   isStaging: false,
   stagedImages: [],
   selectedStagedImageIndex: 0,
@@ -27,6 +27,7 @@ export const canvasSessionSlice = createSlice({
     },
     sessionImageStaged: (state, action: PayloadAction<{ stagingAreaImage: StagingAreaImage }>) => {
       const { stagingAreaImage } = action.payload;
+      state.isStaging = true;
       state.stagedImages.push(stagingAreaImage);
       state.selectedStagedImageIndex = state.stagedImages.length - 1;
     },
@@ -50,9 +51,8 @@ export const canvasSessionSlice = createSlice({
       state.stagedImages = [];
       state.selectedStagedImageIndex = 0;
     },
-    sessionModeChanged: (state, action: PayloadAction<{ mode: SessionMode }>) => {
-      const { mode } = action.payload;
-      state.mode = mode;
+    sessionSendToCanvasChanged: (state, action: PayloadAction<boolean>) => {
+      state.sendToCanvas = action.payload;
     },
   },
 });
@@ -64,7 +64,7 @@ export const {
   sessionStagingAreaReset,
   sessionNextStagedImageSelected,
   sessionPrevStagedImageSelected,
-  sessionModeChanged,
+  sessionSendToCanvasChanged,
 } = canvasSessionSlice.actions;
 
 /* eslint-disable-next-line @typescript-eslint/no-explicit-any */
@@ -85,3 +85,7 @@ export const sessionStagingAreaImageAccepted = createAction<{ index: number }>(
 export const selectCanvasSessionSlice = (s: RootState) => s.canvasSession;
 
 export const selectIsStaging = createSelector(selectCanvasSessionSlice, (canvasSession) => canvasSession.isStaging);
+export const selectIsComposing = createSelector(
+  selectCanvasSessionSlice,
+  (canvasSession) => canvasSession.sendToCanvas
+);

invokeai/frontend/web/src/features/controlLayers/store/canvasSettingsSlice.ts

@@ -35,10 +35,14 @@ export const canvasSettingsSlice = createSlice({
     settingsAutoSaveToggled: (state) => {
       state.autoSave = !state.autoSave;
     },
+    settingsShowHUDToggled: (state) => {
+      state.showHUD = !state.showHUD;
+    },
   },
 });
 
-export const { clipToBboxChanged, settingsAutoSaveToggled, settingsDynamicGridToggled } = canvasSettingsSlice.actions;
+export const { clipToBboxChanged, settingsAutoSaveToggled, settingsDynamicGridToggled, settingsShowHUDToggled } =
+  canvasSettingsSlice.actions;
 
 /* eslint-disable-next-line @typescript-eslint/no-explicit-any */
 const migrate = (state: any): any => {

invokeai/frontend/web/src/features/controlLayers/store/types.ts

@@ -685,8 +685,6 @@ export type StagingAreaImage = {
   offsetY: number;
 };
 
-export type SessionMode = 'generate' | 'compose';
-
 export type CanvasState = {
   _version: 3;
   selectedEntityIdentifier: CanvasEntityIdentifier | null;

invokeai/frontend/web/src/features/gallery/components/ImageViewer/ViewerToggleMenu.tsx

@@ -1,55 +1,61 @@
-import { ButtonGroup, Flex, IconButton, Text, Tooltip } from '@invoke-ai/ui-library';
+import { Flex, Text } from '@invoke-ai/ui-library';
+import { IconSwitch } from 'common/components/IconSwitch';
 import { useImageViewer } from 'features/gallery/components/ImageViewer/useImageViewer';
+import { memo, useCallback } from 'react';
 import { useHotkeys } from 'react-hotkeys-hook';
 import { useTranslation } from 'react-i18next';
 import { PiEyeBold, PiPencilBold } from 'react-icons/pi';
 
-export const ViewerToggleMenu = () => {
+const TooltipEdit = memo(() => {
   const { t } = useTranslation();
+
+  return (
+    <Flex flexDir="column">
+      <Text fontWeight="semibold">{t('common.edit')}</Text>
+      <Text fontWeight="normal">{t('common.editDesc')}</Text>
+    </Flex>
+  );
+});
+TooltipEdit.displayName = 'TooltipEdit';
+
+const TooltipView = memo(() => {
+  const { t } = useTranslation();
+
+  return (
+    <Flex flexDir="column">
+      <Text fontWeight="semibold">{t('common.view')}</Text>
+      <Text fontWeight="normal">{t('common.viewDesc')}</Text>
+    </Flex>
+  );
+});
+TooltipView.displayName = 'TooltipView';
+
+export const ViewerToggle = memo(() => {
   const imageViewer = useImageViewer();
   useHotkeys('z', imageViewer.onToggle, [imageViewer]);
   useHotkeys('esc', imageViewer.onClose, [imageViewer]);
+  const onChange = useCallback(
+    (isChecked: boolean) => {
+      if (isChecked) {
+        imageViewer.onClose();
+      } else {
+        imageViewer.onOpen();
+      }
+    },
+    [imageViewer]
+  );
 
   return (
-    <Flex gap={4} alignItems="center" justifyContent="center">
-      <ButtonGroup size="md">
-        <Tooltip
-          hasArrow
-          label={
-            <Flex flexDir="column">
-              <Text fontWeight="semibold">{t('common.viewing')}</Text>
-              <Text fontWeight="normal">{t('common.viewingDesc')}</Text>
-            </Flex>
-          }
-        >
-          <IconButton
-            icon={<PiEyeBold />}
-            onClick={imageViewer.onOpen}
-            variant={imageViewer.isOpen ? 'solid' : 'outline'}
-            colorScheme={imageViewer.isOpen ? 'invokeBlue' : 'base'}
-            aria-label={t('common.viewing')}
-            w={12}
-          />
-        </Tooltip>
-        <Tooltip
-          hasArrow
-          label={
-            <Flex flexDir="column">
-              <Text fontWeight="semibold">{t('common.editing')}</Text>
-              <Text fontWeight="normal">{t('common.editingDesc')}</Text>
-            </Flex>
-          }
-        >
-          <IconButton
-            icon={<PiPencilBold />}
-            onClick={imageViewer.onClose}
-            variant={!imageViewer.isOpen ? 'solid' : 'outline'}
-            colorScheme={!imageViewer.isOpen ? 'invokeBlue' : 'base'}
-            aria-label={t('common.editing')}
-            w={12}
-          />
-        </Tooltip>
-      </ButtonGroup>
-    </Flex>
+    <IconSwitch
+      isChecked={!imageViewer.isOpen}
+      onChange={onChange}
+      iconUnchecked={<PiEyeBold />}
+      tooltipUnchecked={<TooltipView />}
+      iconChecked={<PiPencilBold />}
+      tooltipChecked={<TooltipEdit />}
+      ariaLabel="Toggle viewer"
+    />
   );
-};
+});
+
+ViewerToggle.displayName = 'ViewerToggle';

invokeai/frontend/web/src/features/gallery/components/ImageViewer/ViewerToolbar.tsx

@@ -7,7 +7,7 @@ import { selectActiveTab } from 'features/ui/store/uiSelectors';
 import { memo } from 'react';
 
 import CurrentImageButtons from './CurrentImageButtons';
-import { ViewerToggleMenu } from './ViewerToggleMenu';
+import { ViewerToggle } from './ViewerToggleMenu';
 
 const selectShowToggle = createSelector(selectActiveTab, (tab) => {
   if (tab === 'upscaling' || tab === 'workflows') {
@@ -31,7 +31,7 @@ export const ViewerToolbar = memo(() => {
       </Flex>
       <Flex flex={1} justifyContent="center">
         <Flex gap={2} marginInlineStart="auto">
-          {showToggle && <ViewerToggleMenu />}
+          {showToggle && <ViewerToggle />}
         </Flex>
       </Flex>
     </Flex>

invokeai/frontend/web/src/features/nodes/components/flow/AddNodeCmdk/AddNodeCmdk.tsx

@@ -12,7 +12,7 @@ import {
   Text,
 } from '@invoke-ai/ui-library';
 import { useStore } from '@nanostores/react';
-import { useAppStore } from 'app/store/storeHooks';
+import { useAppSelector, useAppStore } from 'app/store/storeHooks';
 import { CommandEmpty, CommandItem, CommandList, CommandRoot } from 'cmdk';
 import { IAINoContentFallback } from 'common/components/IAIImageFallback';
 import ScrollableContent from 'common/components/OverlayScrollbars/ScrollableContent';
@@ -33,6 +33,7 @@ import { connectionToEdge } from 'features/nodes/store/util/reactFlowUtil';
 import { validateConnectionTypes } from 'features/nodes/store/util/validateConnectionTypes';
 import { isInvocationNode } from 'features/nodes/types/invocation';
 import { toast } from 'features/toast/toast';
+import { selectActiveTab } from 'features/ui/store/uiSelectors';
 import { memoize } from 'lodash-es';
 import { computed } from 'nanostores';
 import type { ChangeEvent } from 'react';
@@ -166,9 +167,10 @@ export const AddNodeCmdk = memo(() => {
   const inputRef = useRef<HTMLInputElement>(null);
   const [searchTerm, setSearchTerm] = useState('');
   const addNode = useAddNode();
+  const tab = useAppSelector(selectActiveTab);
   const throttledSearchTerm = useThrottle(searchTerm, 100);
 
-  useHotkeys(['shift+a', 'space'], addNodeCmdk.setTrue, { preventDefault: true });
+  useHotkeys(['shift+a', 'space'], addNodeCmdk.setTrue, { enabled: tab === 'workflows', preventDefault: true }, [tab]);
 
   const onChange = useCallback((e: ChangeEvent<HTMLInputElement>) => {
     setSearchTerm(e.target.value);

invokeai/frontend/web/src/features/nodes/components/sidePanel/NodeEditorPanelGroup.tsx

@@ -3,7 +3,6 @@ import 'reactflow/dist/style.css';
 import { Flex } from '@invoke-ai/ui-library';
 import { useAppSelector } from 'app/store/storeHooks';
 import { selectWorkflowMode } from 'features/nodes/store/workflowSlice';
-import QueueControls from 'features/queue/components/QueueControls';
 import ResizeHandle from 'features/ui/components/tabs/ResizeHandle';
 import { usePanelStorage } from 'features/ui/hooks/usePanelStorage';
 import WorkflowLibraryButton from 'features/workflowLibrary/components/WorkflowLibraryButton';
@@ -34,7 +33,6 @@ const NodeEditorPanelGroup = () => {
 
   return (
     <Flex w="full" h="full" gap={2} flexDir="column">
-      <QueueControls />
       <Flex w="full" justifyContent="space-between" alignItems="center" gap="4" padding={1}>
         <Flex justifyContent="space-between" alignItems="center" gap="4">
           <WorkflowLibraryButton />

invokeai/frontend/web/src/features/nodes/util/graph/buildLinearBatchConfig.ts

@@ -10,7 +10,9 @@ export const prepareLinearUIBatch = (
   g: Graph,
   prepend: boolean,
   noise: Invocation<'noise'>,
-  posCond: Invocation<'compel' | 'sdxl_compel_prompt'>
+  posCond: Invocation<'compel' | 'sdxl_compel_prompt'>,
+  origin: 'generation' | 'workflows' | 'upscaling',
+  destination: 'canvas' | 'gallery'
 ): BatchConfig => {
   const { iterations, model, shouldRandomizeSeed, seed, shouldConcatPrompts } = state.params;
   const { prompts, seedBehaviour } = state.dynamicPrompts;
@@ -103,7 +105,8 @@ export const prepareLinearUIBatch = (
       graph: g.getGraph(),
       runs: 1,
       data,
-      origin: 'canvas',
+      origin,
+      destination,
     },
   };
 

invokeai/frontend/web/src/features/nodes/util/graph/generation/addInpaint.ts

@@ -29,7 +29,7 @@ export const addInpaint = async (
   const canvas = selectCanvasSlice(state);
 
   const { bbox } = canvas;
-  const { mode } = canvasSession;
+  const { sendToCanvas: isComposing } = canvasSession;
 
   const initialImage = await manager.compositor.getCompositeRasterLayerImageDTO(bbox.rect);
   const maskImage = await manager.compositor.getCompositeInpaintMaskImageDTO(bbox.rect);
@@ -99,7 +99,7 @@ export const addInpaint = async (
     g.addEdge(resizeImageToOriginalSize, 'image', canvasPasteBack, 'generated_image');
     g.addEdge(resizeMaskToOriginalSize, 'image', canvasPasteBack, 'mask');
 
-    if (mode === 'generate') {
+    if (!isComposing) {
       canvasPasteBack.source_image = { image_name: initialImage.image_name };
     }
 
@@ -143,7 +143,7 @@ export const addInpaint = async (
 
     g.addEdge(l2i, 'image', canvasPasteBack, 'generated_image');
 
-    if (mode === 'generate') {
+    if (!isComposing) {
       canvasPasteBack.source_image = { image_name: initialImage.image_name };
     }
 

invokeai/frontend/web/src/features/nodes/util/graph/generation/addOutpaint.ts

@@ -30,7 +30,7 @@ export const addOutpaint = async (
   const canvas = selectCanvasSlice(state);
 
   const { bbox } = canvas;
-  const { mode } = canvasSession;
+  const { sendToCanvas: isComposing } = canvasSession;
 
   const initialImage = await manager.compositor.getCompositeRasterLayerImageDTO(bbox.rect);
   const maskImage = await manager.compositor.getCompositeInpaintMaskImageDTO(bbox.rect);
@@ -123,7 +123,7 @@ export const addOutpaint = async (
     g.addEdge(resizeOutputImageToOriginalSize, 'image', canvasPasteBack, 'generated_image');
     g.addEdge(resizeOutputMaskToOriginalSize, 'image', canvasPasteBack, 'mask');
 
-    if (mode === 'generate') {
+    if (!isComposing) {
       canvasPasteBack.source_image = { image_name: initialImage.image_name };
     }
 
@@ -173,7 +173,7 @@ export const addOutpaint = async (
     g.addEdge(createGradientMask, 'expanded_mask_area', canvasPasteBack, 'mask');
     g.addEdge(l2i, 'image', canvasPasteBack, 'generated_image');
 
-    if (mode === 'generate') {
+    if (!isComposing) {
       canvasPasteBack.source_image = { image_name: initialImage.image_name };
     }
 

invokeai/frontend/web/src/features/nodes/util/graph/generation/buildSD1Graph.ts

@@ -282,7 +282,7 @@ export const buildSD1Graph = async (
     canvasOutput = addWatermarker(g, canvasOutput);
   }
 
-  const shouldSaveToGallery = canvasSession.mode === 'generate' || canvasSettings.autoSave;
+  const shouldSaveToGallery = !canvasSession.sendToCanvas || canvasSettings.autoSave;
 
   g.updateNode(canvasOutput, {
     id: getPrefixedId('canvas_output'),

invokeai/frontend/web/src/features/nodes/util/graph/generation/buildSDXLGraph.ts

@@ -285,7 +285,7 @@ export const buildSDXLGraph = async (
     canvasOutput = addWatermarker(g, canvasOutput);
   }
 
-  const shouldSaveToGallery = canvasSession.mode === 'generate' || canvasSettings.autoSave;
+  const shouldSaveToGallery = !canvasSession.sendToCanvas || canvasSettings.autoSave;
 
   g.updateNode(canvasOutput, {
     id: getPrefixedId('canvas_output'),

invokeai/frontend/web/src/features/queue/components/ClearQueueButton.tsx

@@ -1,27 +1,26 @@
 import type { ButtonProps } from '@invoke-ai/ui-library';
 import { Button } from '@invoke-ai/ui-library';
-import { useClearQueueConfirmationAlertDialog } from 'features/queue/components/ClearQueueConfirmationAlertDialog';
-import { useClearQueue } from 'features/queue/hooks/useClearQueue';
 import { memo } from 'react';
 import { useTranslation } from 'react-i18next';
 import { PiTrashSimpleFill } from 'react-icons/pi';
 
+import { useClearQueue } from './ClearQueueConfirmationAlertDialog';
+
 type Props = ButtonProps;
 
 const ClearQueueButton = (props: Props) => {
   const { t } = useTranslation();
-  const dialogState = useClearQueueConfirmationAlertDialog();
-  const { isLoading, isDisabled } = useClearQueue();
+  const clearQueue = useClearQueue();
 
   return (
     <>
       <Button
-        isDisabled={isDisabled}
-        isLoading={isLoading}
+        isDisabled={clearQueue.isDisabled}
+        isLoading={clearQueue.isLoading}
         tooltip={t('queue.clearTooltip')}
         leftIcon={<PiTrashSimpleFill />}
         colorScheme="error"
-        onClick={dialogState.setTrue}
+        onClick={clearQueue.openDialog}
         data-testid={t('queue.clear')}
         {...props}
       >

invokeai/frontend/web/src/features/queue/components/ClearQueueConfirmationAlertDialog.tsx

@@ -1,26 +1,75 @@
 import { ConfirmationAlertDialog, Text } from '@invoke-ai/ui-library';
 import { useStore } from '@nanostores/react';
+import { $isConnected } from 'app/hooks/useSocketIO';
+import { useAppDispatch } from 'app/store/storeHooks';
 import { buildUseBoolean } from 'common/hooks/useBoolean';
-import { useClearQueue } from 'features/queue/hooks/useClearQueue';
+import { listCursorChanged, listPriorityChanged } from 'features/queue/store/queueSlice';
+import { toast } from 'features/toast/toast';
 import { atom } from 'nanostores';
-import { memo } from 'react';
+import { memo, useCallback, useMemo } from 'react';
 import { useTranslation } from 'react-i18next';
+import { useClearQueueMutation, useGetQueueStatusQuery } from 'services/api/endpoints/queue';
 
 const $boolean = atom(false);
-export const useClearQueueConfirmationAlertDialog = buildUseBoolean($boolean);
+const useClearQueueConfirmationAlertDialog = buildUseBoolean($boolean);
+
+export const useClearQueue = () => {
+  const { t } = useTranslation();
+  const dispatch = useAppDispatch();
+  const dialog = useClearQueueConfirmationAlertDialog();
+  const isOpen = useStore(dialog.$boolean);
+  const { data: queueStatus } = useGetQueueStatusQuery();
+  const isConnected = useStore($isConnected);
+  const [trigger, { isLoading }] = useClearQueueMutation({
+    fixedCacheKey: 'clearQueue',
+  });
+
+  const clearQueue = useCallback(async () => {
+    if (!queueStatus?.queue.total) {
+      return;
+    }
+
+    try {
+      await trigger().unwrap();
+      toast({
+        id: 'QUEUE_CLEAR_SUCCEEDED',
+        title: t('queue.clearSucceeded'),
+        status: 'success',
+      });
+      dispatch(listCursorChanged(undefined));
+      dispatch(listPriorityChanged(undefined));
+    } catch {
+      toast({
+        id: 'QUEUE_CLEAR_FAILED',
+        title: t('queue.clearFailed'),
+        status: 'error',
+      });
+    }
+  }, [queueStatus?.queue.total, trigger, dispatch, t]);
+
+  const isDisabled = useMemo(() => !isConnected || !queueStatus?.queue.total, [isConnected, queueStatus?.queue.total]);
+
+  return {
+    clearQueue,
+    isOpen,
+    openDialog: dialog.setTrue,
+    closeDialog: dialog.setFalse,
+    isLoading,
+    queueStatus,
+    isDisabled,
+  };
+};
 
 export const ClearQueueConfirmationsAlertDialog = memo(() => {
   const { t } = useTranslation();
-  const dialogState = useClearQueueConfirmationAlertDialog();
-  const isOpen = useStore(dialogState.$boolean);
-  const { clearQueue } = useClearQueue();
+  const clearQueue = useClearQueue();
 
   return (
     <ConfirmationAlertDialog
-      isOpen={isOpen}
-      onClose={dialogState.setFalse}
+      isOpen={clearQueue.isOpen}
+      onClose={clearQueue.closeDialog}
       title={t('queue.clearTooltip')}
-      acceptCallback={clearQueue}
+      acceptCallback={clearQueue.clearQueue}
       acceptButtonText={t('queue.clear')}
       useInert={false}
     >

invokeai/frontend/web/src/features/queue/components/ClearQueueIconButton.tsx

@@ -1,67 +1,40 @@
-import type { IconButtonProps } from '@invoke-ai/ui-library';
 import { IconButton, useShiftModifier } from '@invoke-ai/ui-library';
-import { useClearQueueConfirmationAlertDialog } from 'features/queue/components/ClearQueueConfirmationAlertDialog';
+import { QueueCountBadge } from 'features/queue/components/QueueCountBadge';
 import { useCancelCurrentQueueItem } from 'features/queue/hooks/useCancelCurrentQueueItem';
-import { useClearQueue } from 'features/queue/hooks/useClearQueue';
-import { memo } from 'react';
+import { memo, useRef } from 'react';
 import { useTranslation } from 'react-i18next';
 import { PiTrashSimpleBold, PiXBold } from 'react-icons/pi';
 
-type ClearQueueButtonProps = Omit<IconButtonProps, 'aria-label'>;
+import { useClearQueue } from './ClearQueueConfirmationAlertDialog';
 
-export const ClearAllQueueIconButton = memo((props: ClearQueueButtonProps) => {
+export const ClearQueueIconButton = memo((_) => {
+  const ref = useRef<HTMLDivElement>(null);
   const { t } = useTranslation();
-  const dialogState = useClearQueueConfirmationAlertDialog();
-  const { isLoading, isDisabled } = useClearQueue();
+  const clearQueue = useClearQueue();
+  const cancelCurrentQueueItem = useCancelCurrentQueueItem();
 
-  return (
-    <IconButton
-      isDisabled={isDisabled}
-      isLoading={isLoading}
-      aria-label={t('queue.clear')}
-      tooltip={t('queue.clearTooltip')}
-      icon={<PiTrashSimpleBold size="16px" />}
-      colorScheme="error"
-      onClick={dialogState.setTrue}
-      data-testid={t('queue.clear')}
-      {...props}
-    />
-  );
-});
-
-ClearAllQueueIconButton.displayName = 'ClearAllQueueIconButton';
-
-const ClearSingleQueueItemIconButton = memo((props: ClearQueueButtonProps) => {
-  const { t } = useTranslation();
-  const { cancelQueueItem, isLoading, isDisabled } = useCancelCurrentQueueItem();
-
-  return (
-    <IconButton
-      isDisabled={isDisabled}
-      isLoading={isLoading}
-      aria-label={t('queue.cancel')}
-      tooltip={t('queue.cancelTooltip')}
-      icon={<PiXBold size="16px" />}
-      colorScheme="error"
-      onClick={cancelQueueItem}
-      data-testid={t('queue.cancel')}
-      {...props}
-    />
-  );
-});
-
-ClearSingleQueueItemIconButton.displayName = 'ClearSingleQueueItemIconButton';
-
-export const ClearQueueIconButton = memo((props: ClearQueueButtonProps) => {
   // Show the single item clear button when shift is pressed
   // Otherwise show the clear queue button
   const shift = useShiftModifier();
 
-  if (shift) {
-    return <ClearAllQueueIconButton {...props} />;
-  }
-
-  return <ClearSingleQueueItemIconButton {...props} />;
+  return (
+    <>
+      <IconButton
+        ref={ref}
+        size="lg"
+        isDisabled={shift ? clearQueue.isDisabled : cancelCurrentQueueItem.isDisabled}
+        isLoading={shift ? clearQueue.isLoading : cancelCurrentQueueItem.isLoading}
+        aria-label={shift ? t('queue.clear') : t('queue.cancel')}
+        tooltip={shift ? t('queue.clearTooltip') : t('queue.cancelTooltip')}
+        icon={shift ? <PiTrashSimpleBold /> : <PiXBold />}
+        colorScheme="error"
+        onClick={shift ? clearQueue.openDialog : cancelCurrentQueueItem.cancelQueueItem}
+        data-testid={shift ? t('queue.clear') : t('queue.cancel')}
+      />
+      {/* The badge is dynamically positioned, needs a ref to the target element */}
+      <QueueCountBadge targetRef={ref} />
+    </>
+  );
 });
 
 ClearQueueIconButton.displayName = 'ClearQueueIconButton';

invokeai/frontend/web/src/features/queue/components/InvokeQueueBackButton.tsx

@@ -15,7 +15,7 @@ export const InvokeQueueBackButton = memo(() => {
   const isLoadingDynamicPrompts = useAppSelector(selectDynamicPromptsIsLoading);
 
   return (
-    <Flex pos="relative" flexGrow={1} minW="240px">
+    <Flex pos="relative" w="192px">
       <QueueIterationsNumberInput />
       <QueueButtonTooltip>
         <Button

invokeai/frontend/web/src/features/queue/components/QueueActionsMenuButton.tsx

@@ -1,120 +0,0 @@
-import {
-  Badge,
-  Box,
-  IconButton,
-  Menu,
-  MenuButton,
-  MenuDivider,
-  MenuItem,
-  MenuList,
-  Portal,
-  useDisclosure,
-} from '@invoke-ai/ui-library';
-import { useAppDispatch } from 'app/store/storeHooks';
-import type { Coordinate } from 'features/controlLayers/store/types';
-import { useClearQueueConfirmationAlertDialog } from 'features/queue/components/ClearQueueConfirmationAlertDialog';
-import { useClearQueue } from 'features/queue/hooks/useClearQueue';
-import { usePauseProcessor } from 'features/queue/hooks/usePauseProcessor';
-import { useResumeProcessor } from 'features/queue/hooks/useResumeProcessor';
-import { useFeatureStatus } from 'features/system/hooks/useFeatureStatus';
-import { setActiveTab } from 'features/ui/store/uiSlice';
-import { memo, useCallback, useEffect, useRef, useState } from 'react';
-import { useTranslation } from 'react-i18next';
-import { PiPauseFill, PiPlayFill, PiTrashSimpleBold } from 'react-icons/pi';
-import { RiListCheck, RiPlayList2Fill } from 'react-icons/ri';
-import { useGetQueueStatusQuery } from 'services/api/endpoints/queue';
-
-export const QueueActionsMenuButton = memo(() => {
-  const { isOpen, onOpen, onClose } = useDisclosure();
-  const dispatch = useAppDispatch();
-  const { t } = useTranslation();
-  const [badgePos, setBadgePos] = useState<Coordinate | null>(null);
-  const menuButtonRef = useRef<HTMLButtonElement>(null);
-  const dialogState = useClearQueueConfirmationAlertDialog();
-  const isPauseEnabled = useFeatureStatus('pauseQueue');
-  const isResumeEnabled = useFeatureStatus('resumeQueue');
-  const { queueSize } = useGetQueueStatusQuery(undefined, {
-    selectFromResult: (res) => ({
-      queueSize: res.data ? res.data.queue.pending + res.data.queue.in_progress : 0,
-    }),
-  });
-  const { isLoading: isLoadingClearQueue, isDisabled: isDisabledClearQueue } = useClearQueue();
-  const {
-    resumeProcessor,
-    isLoading: isLoadingResumeProcessor,
-    isDisabled: isDisabledResumeProcessor,
-  } = useResumeProcessor();
-  const {
-    pauseProcessor,
-    isLoading: isLoadingPauseProcessor,
-    isDisabled: isDisabledPauseProcessor,
-  } = usePauseProcessor();
-  const openQueue = useCallback(() => {
-    dispatch(setActiveTab('queue'));
-  }, [dispatch]);
-
-  useEffect(() => {
-    if (menuButtonRef.current) {
-      const { x, y } = menuButtonRef.current.getBoundingClientRect();
-      setBadgePos({ x: x - 10, y: y - 10 });
-    }
-  }, []);
-
-  return (
-    <Box pos="relative">
-      <Menu isOpen={isOpen} onOpen={onOpen} onClose={onClose} placement="bottom-end">
-        <MenuButton ref={menuButtonRef} as={IconButton} aria-label="Queue Actions Menu" icon={<RiListCheck />} />
-        <MenuList>
-          <MenuItem
-            isDestructive
-            icon={<PiTrashSimpleBold size="16px" />}
-            onClick={dialogState.setTrue}
-            isLoading={isLoadingClearQueue}
-            isDisabled={isDisabledClearQueue}
-          >
-            {t('queue.clearTooltip')}
-          </MenuItem>
-          {isResumeEnabled && (
-            <MenuItem
-              icon={<PiPlayFill size="14px" />}
-              onClick={resumeProcessor}
-              isLoading={isLoadingResumeProcessor}
-              isDisabled={isDisabledResumeProcessor}
-            >
-              {t('queue.resumeTooltip')}
-            </MenuItem>
-          )}
-          {isPauseEnabled && (
-            <MenuItem
-              icon={<PiPauseFill size="14px" />}
-              onClick={pauseProcessor}
-              isLoading={isLoadingPauseProcessor}
-              isDisabled={isDisabledPauseProcessor}
-            >
-              {t('queue.pauseTooltip')}
-            </MenuItem>
-          )}
-          <MenuDivider />
-          <MenuItem icon={<RiPlayList2Fill />} onClick={openQueue}>
-            {t('queue.openQueue')}
-          </MenuItem>
-        </MenuList>
-      </Menu>
-      {queueSize > 0 && badgePos !== null && (
-        <Portal>
-          <Badge
-            pos="absolute"
-            insetInlineStart={badgePos.x}
-            insetBlockStart={badgePos.y}
-            colorScheme="invokeYellow"
-            zIndex="docked"
-          >
-            {queueSize}
-          </Badge>
-        </Portal>
-      )}
-    </Box>
-  );
-});
-
-QueueActionsMenuButton.displayName = 'QueueActionsMenuButton';

invokeai/frontend/web/src/features/queue/components/QueueControls.tsx

@@ -1,24 +1,27 @@
-import { ButtonGroup, Flex, Spacer } from '@invoke-ai/ui-library';
+import { Flex, Spacer } from '@invoke-ai/ui-library';
+import { useAppSelector } from 'app/store/storeHooks';
+import { CanvasSendToToggle } from 'features/controlLayers/components/CanvasSendToToggle';
 import { ClearQueueIconButton } from 'features/queue/components/ClearQueueIconButton';
 import QueueFrontButton from 'features/queue/components/QueueFrontButton';
 import ProgressBar from 'features/system/components/ProgressBar';
 import { useFeatureStatus } from 'features/system/hooks/useFeatureStatus';
+import { selectActiveTab } from 'features/ui/store/uiSelectors';
 import { memo } from 'react';
 
 import { InvokeQueueBackButton } from './InvokeQueueBackButton';
-import { QueueActionsMenuButton } from './QueueActionsMenuButton';
 
 const QueueControls = () => {
   const isPrependEnabled = useFeatureStatus('prependQueue');
+  const tab = useAppSelector(selectActiveTab);
   return (
     <Flex w="full" position="relative" borderRadius="base" gap={2} flexDir="column">
-      <ButtonGroup size="lg" isAttached={false}>
+      <Flex gap={2}>
         {isPrependEnabled && <QueueFrontButton />}
         <InvokeQueueBackButton />
         <Spacer />
-        <QueueActionsMenuButton />
+        {tab === 'generation' && <CanvasSendToToggle />}
         <ClearQueueIconButton />
-      </ButtonGroup>
+      </Flex>
       <ProgressBar />
     </Flex>
   );

invokeai/frontend/web/src/features/queue/components/QueueCountBadge.tsx

@@ -0,0 +1,77 @@
+import { Badge, Portal } from '@invoke-ai/ui-library';
+import { useStore } from '@nanostores/react';
+import { $isParametersPanelOpen } from 'features/ui/store/uiSlice';
+import type { RefObject } from 'react';
+import { memo, useEffect, useState } from 'react';
+import { useGetQueueStatusQuery } from 'services/api/endpoints/queue';
+
+type Props = {
+  targetRef: RefObject<HTMLDivElement>;
+};
+
+export const QueueCountBadge = memo(({ targetRef }: Props) => {
+  const [badgePos, setBadgePos] = useState<{ x: string; y: string } | null>(null);
+  const isParametersPanelOpen = useStore($isParametersPanelOpen);
+  const { queueSize } = useGetQueueStatusQuery(undefined, {
+    selectFromResult: (res) => ({
+      queueSize: res.data ? res.data.queue.pending + res.data.queue.in_progress : 0,
+    }),
+  });
+
+  useEffect(() => {
+    if (!targetRef.current) {
+      return;
+    }
+
+    const target = targetRef.current;
+    const parent = target.parentElement;
+
+    if (!parent) {
+      return;
+    }
+
+    const cb = () => {
+      if (!$isParametersPanelOpen.get()) {
+        return;
+      }
+      const { x, y } = target.getBoundingClientRect();
+      setBadgePos({ x: `${x - 7}px`, y: `${y - 5}px` });
+    };
+
+    const resizeObserver = new ResizeObserver(cb);
+    resizeObserver.observe(parent);
+    cb();
+
+    return () => {
+      resizeObserver.disconnect();
+    };
+  }, [targetRef]);
+
+  if (queueSize === 0) {
+    return null;
+  }
+  if (!badgePos) {
+    return null;
+  }
+  if (!isParametersPanelOpen) {
+    return null;
+  }
+
+  return (
+    <Portal>
+      <Badge
+        pos="absolute"
+        insetInlineStart={badgePos.x}
+        insetBlockStart={badgePos.y}
+        colorScheme="invokeYellow"
+        zIndex="docked"
+        shadow="dark-lg"
+        userSelect="none"
+      >
+        {queueSize}
+      </Badge>
+    </Portal>
+  );
+});
+
+QueueCountBadge.displayName = 'QueueCountBadge';

invokeai/frontend/web/src/features/queue/components/QueueList/QueueItemComponent.tsx

@@ -1,6 +1,7 @@
 import type { ChakraProps, CollapseProps } from '@invoke-ai/ui-library';
 import { ButtonGroup, Collapse, Flex, IconButton, Text } from '@invoke-ai/ui-library';
 import QueueStatusBadge from 'features/queue/components/common/QueueStatusBadge';
+import { useDestinationText } from 'features/queue/components/QueueList/useDestinationText';
 import { useOriginText } from 'features/queue/components/QueueList/useOriginText';
 import { useCancelQueueItem } from 'features/queue/hooks/useCancelQueueItem';
 import { getSecondsFromTimestamps } from 'features/queue/util/getSecondsFromTimestamps';
@@ -52,6 +53,7 @@ const QueueItemComponent = ({ index, item, context }: InnerItemProps) => {
 
   const isCanceled = useMemo(() => ['canceled', 'completed', 'failed'].includes(item.status), [item.status]);
   const originText = useOriginText(item.origin);
+  const destinationText = useDestinationText(item.destination);
 
   const icon = useMemo(() => <PiXBold />, []);
   return (
@@ -76,6 +78,11 @@ const QueueItemComponent = ({ index, item, context }: InnerItemProps) => {
             {originText}
           </Text>
         </Flex>
+        <Flex w={COLUMN_WIDTHS.destination} flexShrink={0}>
+          <Text overflow="hidden" textOverflow="ellipsis" whiteSpace="nowrap" alignItems="center">
+            {destinationText}
+          </Text>
+        </Flex>
         <Flex w={COLUMN_WIDTHS.time} alignItems="center" flexShrink={0}>
           {executionTime || '-'}
         </Flex>

invokeai/frontend/web/src/features/queue/components/QueueList/QueueItemDetail.tsx

@@ -1,5 +1,6 @@
 import { Button, ButtonGroup, Flex, Heading, Spinner, Text } from '@invoke-ai/ui-library';
 import DataViewer from 'features/gallery/components/ImageMetadataViewer/DataViewer';
+import { useDestinationText } from 'features/queue/components/QueueList/useDestinationText';
 import { useOriginText } from 'features/queue/components/QueueList/useOriginText';
 import { useCancelBatch } from 'features/queue/hooks/useCancelBatch';
 import { useCancelQueueItem } from 'features/queue/hooks/useCancelQueueItem';
@@ -17,7 +18,7 @@ type Props = {
 };
 
 const QueueItemComponent = ({ queueItemDTO }: Props) => {
-  const { session_id, batch_id, item_id, origin } = queueItemDTO;
+  const { session_id, batch_id, item_id, origin, destination } = queueItemDTO;
   const { t } = useTranslation();
   const { cancelBatch, isLoading: isLoadingCancelBatch, isCanceled } = useCancelBatch(batch_id);
 
@@ -26,6 +27,7 @@ const QueueItemComponent = ({ queueItemDTO }: Props) => {
   const { data: queueItem } = useGetQueueItemQuery(item_id);
 
   const originText = useOriginText(origin);
+  const destinationText = useDestinationText(destination);
 
   const statusAndTiming = useMemo(() => {
     if (!queueItem) {
@@ -54,6 +56,7 @@ const QueueItemComponent = ({ queueItemDTO }: Props) => {
       >
         <QueueItemData label={t('queue.status')} data={statusAndTiming} />
         <QueueItemData label={t('queue.origin')} data={originText} />
+        <QueueItemData label={t('queue.destination')} data={destinationText} />
         <QueueItemData label={t('queue.item')} data={item_id} />
         <QueueItemData label={t('queue.batch')} data={batch_id} />
         <QueueItemData label={t('queue.session')} data={session_id} />

invokeai/frontend/web/src/features/queue/components/QueueList/QueueListHeader.tsx

@@ -25,6 +25,9 @@ const QueueListHeader = () => {
       <Flex ps={0.5} w={COLUMN_WIDTHS.origin} alignItems="center">
         <Text variant="subtext">{t('queue.origin')}</Text>
       </Flex>
+      <Flex ps={0.5} w={COLUMN_WIDTHS.destination} alignItems="center">
+        <Text variant="subtext">{t('queue.destination')}</Text>
+      </Flex>
       <Flex ps={0.5} w={COLUMN_WIDTHS.time} alignItems="center">
         <Text variant="subtext">{t('queue.time')}</Text>
       </Flex>

invokeai/frontend/web/src/features/queue/components/QueueList/constants.ts

@@ -4,7 +4,8 @@ export const COLUMN_WIDTHS = {
   statusDot: 2,
   time: '4rem',
   origin: '5rem',
+  destination: '6rem',
   batchId: '5rem',
   fieldValues: 'auto',
   actions: 'auto',
-};
+} as const;

invokeai/frontend/web/src/features/queue/components/QueueList/useDestinationText.ts

@@ -0,0 +1,16 @@
+import { useTranslation } from 'react-i18next';
+import type { SessionQueueItemDTO } from 'services/api/types';
+
+export const useDestinationText = (destination: SessionQueueItemDTO['destination']) => {
+  const { t } = useTranslation();
+
+  if (destination === 'canvas') {
+    return t('queue.canvas');
+  }
+
+  if (destination === 'gallery') {
+    return t('queue.gallery');
+  }
+
+  return t('queue.other');
+};

invokeai/frontend/web/src/features/queue/components/QueueList/useOriginText.ts

@@ -4,13 +4,13 @@ import type { SessionQueueItemDTO } from 'services/api/types';
 export const useOriginText = (origin: SessionQueueItemDTO['origin']) => {
   const { t } = useTranslation();
 
-  if (origin === 'canvas') {
-    return t('queue.originCanvas');
+  if (origin === 'generation') {
+    return t('queue.generation');
   }
 
   if (origin === 'workflows') {
-    return t('queue.originWorkflows');
+    return t('queue.workflows');
   }
 
-  return t('queue.originOther');
+  return t('queue.other');
 };

invokeai/frontend/web/src/features/queue/hooks/useClearQueue.ts

@@ -1,45 +0,0 @@
-import { useStore } from '@nanostores/react';
-import { $isConnected } from 'app/hooks/useSocketIO';
-import { useAppDispatch } from 'app/store/storeHooks';
-import { listCursorChanged, listPriorityChanged } from 'features/queue/store/queueSlice';
-import { toast } from 'features/toast/toast';
-import { useCallback, useMemo } from 'react';
-import { useTranslation } from 'react-i18next';
-import { useClearQueueMutation, useGetQueueStatusQuery } from 'services/api/endpoints/queue';
-
-export const useClearQueue = () => {
-  const { t } = useTranslation();
-  const dispatch = useAppDispatch();
-  const { data: queueStatus } = useGetQueueStatusQuery();
-  const isConnected = useStore($isConnected);
-  const [trigger, { isLoading }] = useClearQueueMutation({
-    fixedCacheKey: 'clearQueue',
-  });
-
-  const clearQueue = useCallback(async () => {
-    if (!queueStatus?.queue.total) {
-      return;
-    }
-
-    try {
-      await trigger().unwrap();
-      toast({
-        id: 'QUEUE_CLEAR_SUCCEEDED',
-        title: t('queue.clearSucceeded'),
-        status: 'success',
-      });
-      dispatch(listCursorChanged(undefined));
-      dispatch(listPriorityChanged(undefined));
-    } catch {
-      toast({
-        id: 'QUEUE_CLEAR_FAILED',
-        title: t('queue.clearFailed'),
-        status: 'error',
-      });
-    }
-  }, [queueStatus?.queue.total, trigger, dispatch, t]);
-
-  const isDisabled = useMemo(() => !isConnected || !queueStatus?.queue.total, [isConnected, queueStatus?.queue.total]);
-
-  return { clearQueue, isLoading, queueStatus, isDisabled };
-};

invokeai/frontend/web/src/features/ui/components/AppContent.tsx

@@ -1,4 +1,4 @@
-import { Flex } from '@invoke-ai/ui-library';
+import { Box, Flex } from '@invoke-ai/ui-library';
 import { createSelector } from '@reduxjs/toolkit';
 import { useAppSelector } from 'app/store/storeHooks';
 import { useScopeOnFocus } from 'common/hooks/interactionScopes';
@@ -7,6 +7,7 @@ import GalleryPanelContent from 'features/gallery/components/GalleryPanelContent
 import { ImageViewer } from 'features/gallery/components/ImageViewer/ImageViewer';
 import { useIsImageViewerOpen } from 'features/gallery/components/ImageViewer/useImageViewer';
 import NodeEditorPanelGroup from 'features/nodes/components/sidePanel/NodeEditorPanelGroup';
+import QueueControls from 'features/queue/components/QueueControls';
 import FloatingGalleryButton from 'features/ui/components/FloatingGalleryButton';
 import FloatingParametersPanelButtons from 'features/ui/components/FloatingParametersPanelButtons';
 import ParametersPanelTextToImage from 'features/ui/components/ParametersPanels/ParametersPanelTextToImage';
@@ -89,8 +90,14 @@ export const AppContent = memo(() => {
 
   const galleryPanel = usePanel(galleryPanelUsePanelOptions);
 
-  useHotkeys('g', galleryPanel.toggle, [galleryPanel.toggle]);
-  useHotkeys(['t', 'o'], optionsPanel.toggle, [optionsPanel.toggle]);
+  useHotkeys('g', galleryPanel.toggle, { enabled: shouldShowGalleryPanel }, [
+    galleryPanel.toggle,
+    shouldShowGalleryPanel,
+  ]);
+  useHotkeys(['t', 'o'], optionsPanel.toggle, { enabled: shouldShowOptionsPanel }, [
+    optionsPanel.toggle,
+    shouldShowOptionsPanel,
+  ]);
   useHotkeys(
     'shift+r',
     () => {
@@ -133,21 +140,26 @@ export const AppContent = memo(() => {
           storage={panelStorage}
         >
           <Panel order={0} collapsible style={panelStyles} {...optionsPanel.panelProps}>
-            <TabMountGate tab="generation">
-              <TabVisibilityGate tab="generation">
-                <ParametersPanelTextToImage />
-              </TabVisibilityGate>
-            </TabMountGate>
-            <TabMountGate tab="upscaling">
-              <TabVisibilityGate tab="upscaling">
-                <ParametersPanelUpscale />
-              </TabVisibilityGate>
-            </TabMountGate>
-            <TabMountGate tab="workflows">
-              <TabVisibilityGate tab="workflows">
-                <NodeEditorPanelGroup />
-              </TabVisibilityGate>
-            </TabMountGate>
+            <Flex flexDir="column" w="full" h="full" gap={2}>
+              <QueueControls />
+              <Box position="relative" w="full" h="full">
+                <TabMountGate tab="generation">
+                  <TabVisibilityGate tab="generation">
+                    <ParametersPanelTextToImage />
+                  </TabVisibilityGate>
+                </TabMountGate>
+                <TabMountGate tab="upscaling">
+                  <TabVisibilityGate tab="upscaling">
+                    <ParametersPanelUpscale />
+                  </TabVisibilityGate>
+                </TabMountGate>
+                <TabMountGate tab="workflows">
+                  <TabVisibilityGate tab="workflows">
+                    <NodeEditorPanelGroup />
+                  </TabVisibilityGate>
+                </TabMountGate>
+              </Box>
+            </Flex>
           </Panel>
           <ResizeHandle id="options-main-handle" orientation="vertical" {...optionsPanel.resizeHandleProps} />
           <Panel id="main-panel" order={1} minSize={20} style={panelStyles}>

invokeai/frontend/web/src/features/ui/components/FloatingParametersPanelButtons.tsx

@@ -1,13 +1,13 @@
 import type { SystemStyleObject } from '@invoke-ai/ui-library';
 import { ButtonGroup, Flex, Icon, IconButton, Portal, spinAnimation } from '@invoke-ai/ui-library';
 import CancelCurrentQueueItemIconButton from 'features/queue/components/CancelCurrentQueueItemIconButton';
-import { ClearAllQueueIconButton } from 'features/queue/components/ClearQueueIconButton';
+import { useClearQueue } from 'features/queue/components/ClearQueueConfirmationAlertDialog';
 import { QueueButtonTooltip } from 'features/queue/components/QueueButtonTooltip';
 import { useQueueBack } from 'features/queue/hooks/useQueueBack';
 import type { UsePanelReturn } from 'features/ui/hooks/usePanel';
 import { memo, useMemo } from 'react';
 import { useTranslation } from 'react-i18next';
-import { PiCircleNotchBold, PiSlidersHorizontalBold } from 'react-icons/pi';
+import { PiCircleNotchBold, PiSlidersHorizontalBold, PiTrashSimpleBold } from 'react-icons/pi';
 import { RiSparklingFill } from 'react-icons/ri';
 import { useGetQueueStatusQuery } from 'services/api/endpoints/queue';
 
@@ -23,17 +23,16 @@ type Props = {
 const FloatingSidePanelButtons = (props: Props) => {
   const { t } = useTranslation();
   const { queueBack, isLoading, isDisabled } = useQueueBack();
+  const clearQueue = useClearQueue();
   const { data: queueStatus } = useGetQueueStatusQuery();
 
-  const queueButtonIcon = useMemo(
-    () =>
-      !isDisabled && queueStatus?.processor.is_processing ? (
-        <Icon boxSize={6} as={PiCircleNotchBold} animation={spinAnimation} />
-      ) : (
-        <RiSparklingFill size="16px" />
-      ),
-    [isDisabled, queueStatus?.processor.is_processing]
-  );
+  const queueButtonIcon = useMemo(() => {
+    const isProcessing = (queueStatus?.queue.in_progress ?? 0) > 0;
+    if (!isDisabled && isProcessing) {
+      return <Icon boxSize={6} as={PiCircleNotchBold} animation={spinAnimation} />;
+    }
+    return <RiSparklingFill size="16px" />;
+  }, [isDisabled, queueStatus]);
 
   if (!props.panelApi.isCollapsed) {
     return null;
@@ -73,7 +72,17 @@ const FloatingSidePanelButtons = (props: Props) => {
           </QueueButtonTooltip>
           <CancelCurrentQueueItemIconButton sx={floatingButtonStyles} />
         </ButtonGroup>
-        <ClearAllQueueIconButton sx={floatingButtonStyles} />
+        <IconButton
+          isDisabled={clearQueue.isDisabled}
+          isLoading={clearQueue.isLoading}
+          aria-label={t('queue.clear')}
+          tooltip={t('queue.clearTooltip')}
+          icon={<PiTrashSimpleBold />}
+          colorScheme="error"
+          onClick={clearQueue.openDialog}
+          data-testid={t('queue.clear')}
+          sx={floatingButtonStyles}
+        />
       </Flex>
     </Portal>
   );

invokeai/frontend/web/src/features/ui/components/ParametersPanels/ParametersPanelTextToImage.tsx

@@ -8,7 +8,6 @@ import { selectIsSDXL } from 'features/controlLayers/store/paramsSlice';
 import { selectEntityCount } from 'features/controlLayers/store/selectors';
 import { isImageViewerOpenChanged } from 'features/gallery/store/gallerySlice';
 import { Prompts } from 'features/parameters/components/Prompts/Prompts';
-import QueueControls from 'features/queue/components/QueueControls';
 import { AdvancedSettingsAccordion } from 'features/settingsAccordions/components/AdvancedSettingsAccordion/AdvancedSettingsAccordion';
 import { CompositingSettingsAccordion } from 'features/settingsAccordions/components/CompositingSettingsAccordion/CompositingSettingsAccordion';
 import { GenerationSettingsAccordion } from 'features/settingsAccordions/components/GenerationSettingsAccordion/GenerationSettingsAccordion';
@@ -64,7 +63,6 @@ const ParametersPanelTextToImage = () => {
 
   return (
     <Flex w="full" h="full" flexDir="column" gap={2}>
-      <QueueControls />
       <StylePresetMenuTrigger />
       <Flex w="full" h="full" position="relative">
         <Box position="absolute" top={0} left={0} right={0} bottom={0} ref={ref}>

invokeai/frontend/web/src/features/ui/components/ParametersPanels/ParametersPanelUpscale.tsx

@@ -2,7 +2,6 @@ import { Box, Flex } from '@invoke-ai/ui-library';
 import { useStore } from '@nanostores/react';
 import { overlayScrollbarsParams } from 'common/components/OverlayScrollbars/constants';
 import { Prompts } from 'features/parameters/components/Prompts/Prompts';
-import QueueControls from 'features/queue/components/QueueControls';
 import { AdvancedSettingsAccordion } from 'features/settingsAccordions/components/AdvancedSettingsAccordion/AdvancedSettingsAccordion';
 import { GenerationSettingsAccordion } from 'features/settingsAccordions/components/GenerationSettingsAccordion/GenerationSettingsAccordion';
 import { UpscaleSettingsAccordion } from 'features/settingsAccordions/components/UpscaleSettingsAccordion/UpscaleSettingsAccordion';
@@ -23,7 +22,6 @@ const ParametersPanelUpscale = () => {
 
   return (
     <Flex w="full" h="full" flexDir="column" gap={2}>
-      <QueueControls />
       <StylePresetMenuTrigger />
       <Flex w="full" h="full" position="relative">
         <Box position="absolute" top={0} left={0} right={0} bottom={0}>

invokeai/frontend/web/src/features/ui/components/TabButton.tsx

@@ -3,30 +3,33 @@ import { useAppDispatch, useAppSelector } from 'app/store/storeHooks';
 import { selectActiveTab } from 'features/ui/store/uiSelectors';
 import { setActiveTab } from 'features/ui/store/uiSlice';
 import type { TabName } from 'features/ui/store/uiTypes';
-import { memo, type ReactElement, useCallback } from 'react';
+import { forwardRef, memo, type ReactElement, useCallback } from 'react';
 
-export const TabButton = memo(({ tab, icon, label }: { tab: TabName; icon: ReactElement; label: string }) => {
-  const dispatch = useAppDispatch();
-  const activeTabName = useAppSelector(selectActiveTab);
-  const onClick = useCallback(() => {
-    dispatch(setActiveTab(tab));
-  }, [dispatch, tab]);
+export const TabButton = memo(
+  forwardRef(({ tab, icon, label }: { tab: TabName; icon: ReactElement; label: string }, ref) => {
+    const dispatch = useAppDispatch();
+    const activeTabName = useAppSelector(selectActiveTab);
+    const onClick = useCallback(() => {
+      dispatch(setActiveTab(tab));
+    }, [dispatch, tab]);
 
-  return (
-    <Tooltip label={label} placement="end">
-      <IconButton
-        p={0}
-        onClick={onClick}
-        icon={icon}
-        size="md"
-        fontSize="24px"
-        variant="appTab"
-        data-selected={activeTabName === tab}
-        aria-label={label}
-        data-testid={label}
-      />
-    </Tooltip>
-  );
-});
+    return (
+      <Tooltip label={label} placement="end">
+        <IconButton
+          ref={ref}
+          p={0}
+          onClick={onClick}
+          icon={icon}
+          size="md"
+          fontSize="24px"
+          variant="appTab"
+          data-selected={activeTabName === tab}
+          aria-label={label}
+          data-testid={label}
+        />
+      </Tooltip>
+    );
+  })
+);
 
 TabButton.displayName = 'TabButton';

invokeai/frontend/web/src/features/ui/components/tabs/ModelManagerTab.tsx

@@ -5,7 +5,7 @@ import { memo } from 'react';
 
 const ModelManagerTab = () => {
   return (
-    <Flex w="full" h="full" gap="2">
+    <Flex layerStyle="body" w="full" h="full" gap="2">
       <ModelManager />
       <ModelPane />
     </Flex>

invokeai/frontend/web/src/features/ui/components/tabs/QueueTab.tsx

@@ -4,7 +4,7 @@ import { memo } from 'react';
 
 const QueueTab = () => {
   return (
-    <Flex w="full" h="full">
+    <Flex layerStyle="body" w="full" h="full">
       <QueueTabContent />
     </Flex>
   );

invokeai/frontend/web/src/services/api/schema.ts

@@ -1637,9 +1637,14 @@ export type components = {
             batch_id?: string;
             /**
              * Origin
-             * @description The origin of this batch.
+             * @description The origin of this queue item. This data is used by the frontend to determine how to handle results.
              */
             origin?: string | null;
+            /**
+             * Destination
+             * @description The origin of this queue item. This data is used by the frontend to determine how to handle results
+             */
+            destination?: string | null;
             /**
              * Data
              * @description The batch data collection.
@@ -1733,6 +1738,11 @@ export type components = {
              * @description The origin of the batch
              */
             origin: string | null;
+            /**
+             * Destination
+             * @description The destination of the batch
+             */
+            destination: string | null;
             /**
              * Pending
              * @description Number of queue items with status 'pending'
@@ -8649,10 +8659,16 @@ export type components = {
             batch_id: string;
             /**
              * Origin
-             * @description The origin of the batch
+             * @description The origin of the queue item
              * @default null
              */
             origin: string | null;
+            /**
+             * Destination
+             * @description The destination of the queue item
+             * @default null
+             */
+            destination: string | null;
             /**
              * Session Id
              * @description The ID of the session (aka graph execution state)
@@ -8701,10 +8717,16 @@ export type components = {
             batch_id: string;
             /**
              * Origin
-             * @description The origin of the batch
+             * @description The origin of the queue item
              * @default null
              */
             origin: string | null;
+            /**
+             * Destination
+             * @description The destination of the queue item
+             * @default null
+             */
+            destination: string | null;
             /**
              * Session Id
              * @description The ID of the session (aka graph execution state)
@@ -8770,10 +8792,16 @@ export type components = {
             batch_id: string;
             /**
              * Origin
-             * @description The origin of the batch
+             * @description The origin of the queue item
              * @default null
              */
             origin: string | null;
+            /**
+             * Destination
+             * @description The destination of the queue item
+             * @default null
+             */
+            destination: string | null;
             /**
              * Session Id
              * @description The ID of the session (aka graph execution state)
@@ -8995,10 +9023,16 @@ export type components = {
             batch_id: string;
             /**
              * Origin
-             * @description The origin of the batch
+             * @description The origin of the queue item
              * @default null
              */
             origin: string | null;
+            /**
+             * Destination
+             * @description The destination of the queue item
+             * @default null
+             */
+            destination: string | null;
             /**
              * Session Id
              * @description The ID of the session (aka graph execution state)
@@ -12069,10 +12103,16 @@ export type components = {
             batch_id: string;
             /**
              * Origin
-             * @description The origin of the batch
+             * @description The origin of the queue item
              * @default null
              */
             origin: string | null;
+            /**
+             * Destination
+             * @description The destination of the queue item
+             * @default null
+             */
+            destination: string | null;
             /**
              * Status
              * @description The new status of the queue item
@@ -13431,9 +13471,14 @@ export type components = {
             batch_id: string;
             /**
              * Origin
-             * @description The origin of this queue item.
+             * @description The origin of this queue item. This data is used by the frontend to determine how to handle results.
              */
             origin?: string | null;
+            /**
+             * Destination
+             * @description The origin of this queue item. This data is used by the frontend to determine how to handle results
+             */
+            destination?: string | null;
             /**
              * Session Id
              * @description The ID of the session associated with this queue item. The session doesn't exist in graph_executions until the queue item is executed.
@@ -13516,9 +13561,14 @@ export type components = {
             batch_id: string;
             /**
              * Origin
-             * @description The origin of this queue item.
+             * @description The origin of this queue item. This data is used by the frontend to determine how to handle results.
              */
             origin?: string | null;
+            /**
+             * Destination
+             * @description The origin of this queue item. This data is used by the frontend to determine how to handle results
+             */
+            destination?: string | null;
             /**
              * Session Id
              * @description The ID of the session associated with this queue item. The session doesn't exist in graph_executions until the queue item is executed.

invokeai/frontend/web/src/services/events/onInvocationComplete.ts

@@ -13,7 +13,7 @@ import { getCategories, getListImagesUrl } from 'services/api/util';
 
 const log = logger('events');
 
-const isCanvasOutput = (data: S['InvocationCompleteEvent']) => {
+const isCanvasOutputNode = (data: S['InvocationCompleteEvent']) => {
   return data.invocation_source_id.split(':')[0] === 'canvas_output';
 };
 
@@ -114,25 +114,19 @@ export const buildOnInvocationComplete = (
   };
 
   const handleOriginCanvas = async (data: S['InvocationCompleteEvent']) => {
-    const session = getState().canvasSession;
-
     const imageDTO = await getResultImageDTO(data);
 
     if (!imageDTO) {
       return;
     }
 
-    if (session.mode === 'compose') {
-      if (session.isStaging && isCanvasOutput(data)) {
+    if (data.destination === 'canvas') {
+      if (isCanvasOutputNode(data)) {
         if (data.result.type === 'canvas_v2_mask_and_crop_output') {
           const { offset_x, offset_y } = data.result;
-          if (session.isStaging) {
-            dispatch(sessionImageStaged({ stagingAreaImage: { imageDTO, offsetX: offset_x, offsetY: offset_y } }));
-          }
+          dispatch(sessionImageStaged({ stagingAreaImage: { imageDTO, offsetX: offset_x, offsetY: offset_y } }));
         } else if (data.result.type === 'image_output') {
-          if (session.isStaging) {
-            dispatch(sessionImageStaged({ stagingAreaImage: { imageDTO, offsetX: 0, offsetY: 0 } }));
-          }
+          dispatch(sessionImageStaged({ stagingAreaImage: { imageDTO, offsetX: 0, offsetY: 0 } }));
         }
       }
     } else {
@@ -160,7 +154,7 @@ export const buildOnInvocationComplete = (
     // Update the node execution states - the image output is handled below
     if (data.origin === 'workflows') {
       await handleOriginWorkflows(data);
-    } else if (data.origin === 'canvas') {
+    } else if (data.origin === 'generation') {
       await handleOriginCanvas(data);
     } else {
       await handleOriginOther(data);

invokeai/frontend/web/src/services/events/setEventListeners.tsx

@@ -96,8 +96,17 @@ export const setEventListeners = ({ socket, dispatch, getState, setIsConnected }
   });
 
   socket.on('invocation_denoise_progress', (data) => {
-    const { invocation_source_id, invocation, step, total_steps, progress_image, origin, percentage, session_id } =
-      data;
+    const {
+      invocation_source_id,
+      invocation,
+      step,
+      total_steps,
+      progress_image,
+      origin,
+      destination,
+      percentage,
+      session_id,
+    } = data;
 
     if (cancellations.has(session_id)) {
       // Do not update the progress if this session has been cancelled. This prevents a race condition where we get a
@@ -122,7 +131,7 @@ export const setEventListeners = ({ socket, dispatch, getState, setIsConnected }
       }
     }
 
-    if (origin === 'canvas') {
+    if (origin === 'generation' && destination === 'canvas') {
       $lastCanvasProgressEvent.set(data);
     }
   });

invokeai/version/invokeai_version.py

@@ -1 +1 @@
-__version__ = "4.2.9.dev7"
+__version__ = "4.2.9.dev8"