diff --git a/src/modules/beam/BeamView.tsx b/src/modules/beam/BeamView.tsx index f880ca42f..536075f44 100644 --- a/src/modules/beam/BeamView.tsx +++ b/src/modules/beam/BeamView.tsx @@ -1,7 +1,9 @@ import * as React from 'react'; import { useShallow } from 'zustand/react/shallow'; -import { Alert, Box, CircularProgress } from '@mui/joy'; +import { Alert, Box, Button, CircularProgress } from '@mui/joy'; +import ContentCopyIcon from '@mui/icons-material/ContentCopy'; +import TelegramIcon from '@mui/icons-material/Telegram'; import { ConfirmationModal } from '~/common/components/modals/ConfirmationModal'; import { ShortcutKey, useGlobalShortcuts } from '~/common/components/shortcuts/useGlobalShortcuts'; @@ -204,13 +206,30 @@ export function BeamView(props: { isMobile={props.isMobile} rayIds={rayIds} showRayAdd={cardAdd} - showRaysOps={(isScattering || raysReady < 2) ? undefined : raysReady} hadImportedRays={hadImportedRays} onIncreaseRayCount={handleRayIncreaseCount} - onRaysOperation={handleRaysOperation} // linkedLlmId={currentGatherLlmId} /> + {/* Rays Action Bar (2+ ready beams) - sibling of the grid (NOT a grid child); an in-grid spanning element with gridColumn:'1/-1' pins all auto-fit tracks open and leaves dead whitespace when raysCount < tracksCount. Fixes #1073. */} + {(!isScattering && raysReady >= 2) && ( + + + + + )} + {/* Gapper between Rays and Merge, without compromising the auto margin of the Ray Grid */} diff --git a/src/modules/beam/scatter/BeamRayGrid.tsx b/src/modules/beam/scatter/BeamRayGrid.tsx index db828e2c3..280d9fc1f 100644 --- a/src/modules/beam/scatter/BeamRayGrid.tsx +++ b/src/modules/beam/scatter/BeamRayGrid.tsx @@ -3,8 +3,6 @@ import * as React from 'react'; import type { SxProps } from '@mui/joy/styles/types'; import { Box, Button } from '@mui/joy'; import AddCircleOutlineRoundedIcon from '@mui/icons-material/AddCircleOutlineRounded'; -import ContentCopyIcon from '@mui/icons-material/ContentCopy'; -import TelegramIcon from '@mui/icons-material/Telegram'; import type { BeamStoreApi } from '../store-beam.hooks'; import { BeamCard } from '../BeamCard'; @@ -32,10 +30,8 @@ export function BeamRayGrid(props: { hadImportedRays: boolean, isMobile: boolean, onIncreaseRayCount: () => void, - onRaysOperation: (operation: 'copy' | 'use') => void, rayIds: string[], showRayAdd: boolean, - showRaysOps: undefined | number, }) { const raysCount = props.rayIds.length; @@ -71,25 +67,6 @@ export function BeamRayGrid(props: { )} - {/* Multi-Use and Copy Buttons */} - {!!props.showRaysOps && ( - - - - - )} - {/*/!* Takes a full row *!/*/} {/*