Skip to content

Commit dbd60a3

Browse files
committed
fix single block case for ctrl:shift:arrowleft
1 parent 7320e18 commit dbd60a3

2 files changed

Lines changed: 4 additions & 1 deletion

File tree

frontend/app/block/blockframe.tsx

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ import {
1616
useBlockAtom,
1717
WOS,
1818
} from "@/app/store/global";
19+
import { workspaceLayoutModel } from "@/app/workspace/workspace-layout-model";
1920
import { RpcApi } from "@/app/store/wshclientapi";
2021
import { TabRpcClient } from "@/app/store/wshrpcutil";
2122
import { ErrorBoundary } from "@/element/errorboundary";
@@ -524,6 +525,7 @@ const BlockFrame_Default_Component = (props: BlockFrameProps) => {
524525
const { nodeModel, viewModel, blockModel, preview, numBlocksInTab, children } = props;
525526
const [blockData] = WOS.useWaveObjectValue<Block>(WOS.makeORef("block", nodeModel.blockId));
526527
const isFocused = jotai.useAtomValue(nodeModel.isFocused);
528+
const aiPanelVisible = jotai.useAtomValue(workspaceLayoutModel.panelVisibleAtom);
527529
const viewIconUnion = util.useAtomValueSafe(viewModel?.viewIcon) ?? blockViewToIcon(blockData?.meta?.view);
528530
const customBg = util.useAtomValueSafe(viewModel?.blockBg);
529531
const manageConnection = util.useAtomValueSafe(viewModel?.manageConnection);
@@ -590,7 +592,7 @@ const BlockFrame_Default_Component = (props: BlockFrameProps) => {
590592
className={clsx("block", "block-frame-default", "block-" + nodeModel.blockId, {
591593
"block-focused": isFocused || preview,
592594
"block-preview": preview,
593-
"block-no-highlight": numBlocksInTab === 1,
595+
"block-no-highlight": numBlocksInTab === 1 && !aiPanelVisible,
594596
ephemeral: isEphemeral,
595597
magnified: isMagnified,
596598
})}

frontend/layout/lib/layoutModel.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -750,6 +750,7 @@ export class LayoutModel {
750750

751751
additionalPropsMap[node.id] = {
752752
...additionalProps,
753+
...(node.data?.blockId ? { rect: nodeRect } : {}),
753754
pixelToSizeRatio,
754755
resizeHandles,
755756
};

0 commit comments

Comments
 (0)