github/InvokeAI
1
1
Fork 0
mirror of https://github.com/invoke-ai/InvokeAI.git synced 2026-02-13 22:14:59 -05:00
Code Issues Packages Projects Releases Wiki Activity

fix(ui): rebase conflicts

Browse Source
This commit is contained in:
psychedelicious
2025-07-01 16:39:13 +10:00
parent 735fc276e5
commit f13ced7ed4
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
invokeai/frontend/web/src/features/ui/layouts/TabWithLaunchpadIcon.tsx
View File

@@ -1,5 +1,6 @@
import { Flex, Icon, Text } from '@invoke-ai/ui-library';
import { useAppSelector } from 'app/store/storeHooks';
import { setFocusedRegion } from 'common/hooks/focus';
import { useCallbackOnDragEnter } from 'common/hooks/useCallbackOnDragEnter';
import type { IDockviewPanelHeaderProps } from 'dockview';
import { selectActiveTab } from 'features/ui/store/uiSelectors';
@@ -36,8 +37,12 @@ export const TabWithLaunchpadIcon = memo((props: IDockviewPanelHeaderProps) => {
useCallbackOnDragEnter(setActive, ref, 300);
const onPointerDown = useCallback(() => {
setFocusedRegion(props.params.focusRegion);
}, [props.params.focusRegion]);
return (
<Flex ref={ref} alignItems="center" h="full" px={4} gap={3}>
<Flex ref={ref} alignItems="center" h="full" px={4} gap={3} onPointerDown={onPointerDown}>
<Icon as={TAB_ICONS[activeTab]} color="invokeYellow.300" boxSize={5} />
<Text userSelect="none">{props.api.title ?? props.api.id}</Text>
</Flex>

2
invokeai/frontend/web/src/features/ui/layouts/auto-layout-context.tsx
View File

@@ -1,6 +1,5 @@
import { createSelector } from '@reduxjs/toolkit';
import { useAppSelector } from 'app/store/storeHooks';
import { AutoLayoutPanelContainer } from 'common/components/FocusRegionWrapper';
import type { FocusRegionName } from 'common/hooks/focus';
import type { DockviewApi, GridviewApi, IDockviewPanelProps, IGridviewPanelProps } from 'dockview';
import { useRegisteredHotkeys } from 'features/system/components/HotkeysModal/useHotkeyData';
@@ -11,6 +10,7 @@ import { atom } from 'nanostores';
import type { FunctionComponent, PropsWithChildren, RefObject } from 'react';
import { createContext, memo, useCallback, useContext, useMemo, useState } from 'react';
import { AutoLayoutPanelContainer } from './AutoLayoutPanelContainer';
import { LEFT_PANEL_ID, LEFT_PANEL_MIN_SIZE_PX, RIGHT_PANEL_ID, RIGHT_PANEL_MIN_SIZE_PX } from './shared';
type AutoLayoutContextValue = {