Skip to content

Commit c9a0400

Browse files
committed
add border to ephemeral blocks even when not focused...
1 parent 9b3e732 commit c9a0400

File tree

1 file changed

+13
-6
lines changed

1 file changed

+13
-6
lines changed

frontend/app/block/blockframe.tsx

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@ import {
1818
WOS,
1919
} from "@/app/store/global";
2020
import { uxCloseBlock } from "@/app/store/keymodel";
21-
import { WorkspaceLayoutModel } from "@/app/workspace/workspace-layout-model";
2221
import { RpcApi } from "@/app/store/wshclientapi";
2322
import { TabRpcClient } from "@/app/store/wshrpcutil";
23+
import { WorkspaceLayoutModel } from "@/app/workspace/workspace-layout-model";
2424
import { ErrorBoundary } from "@/element/errorboundary";
2525
import { IconButton, ToggleIconButton } from "@/element/iconbutton";
2626
import { MagnifyIcon } from "@/element/magnify";
@@ -482,14 +482,15 @@ const ConnStatusOverlay = React.memo(
482482

483483
const BlockMask = React.memo(({ nodeModel }: { nodeModel: NodeModel }) => {
484484
const isFocused = jotai.useAtomValue(nodeModel.isFocused);
485+
const isEphemeral = jotai.useAtomValue(nodeModel.isEphemeral);
485486
const blockNum = jotai.useAtomValue(nodeModel.blockNum);
486487
const isLayoutMode = jotai.useAtomValue(atoms.controlShiftDelayAtom);
487488
const showOverlayBlockNums = jotai.useAtomValue(getSettingsKeyAtom("app:showoverlayblocknums")) ?? true;
488489
const blockHighlight = jotai.useAtomValue(BlockModel.getInstance().getBlockHighlightAtom(nodeModel.blockId));
489490
const [blockData] = WOS.useWaveObjectValue<Block>(WOS.makeORef("block", nodeModel.blockId));
490491
const style: React.CSSProperties = {};
491492
let showBlockMask = false;
492-
493+
493494
if (isFocused) {
494495
const tabData = jotai.useAtomValue(atoms.tabAtom);
495496
const tabActiveBorderColor = tabData?.meta?.["bg:activebordercolor"];
@@ -508,12 +509,15 @@ const BlockMask = React.memo(({ nodeModel }: { nodeModel: NodeModel }) => {
508509
if (blockData?.meta?.["frame:bordercolor"]) {
509510
style.borderColor = blockData.meta["frame:bordercolor"];
510511
}
512+
if (isEphemeral && !style.borderColor) {
513+
style.borderColor = "rgba(255, 255, 255, 0.7)";
514+
}
511515
}
512-
516+
513517
if (blockHighlight && !style.borderColor) {
514518
style.borderColor = "rgb(59, 130, 246)";
515519
}
516-
520+
517521
let innerElem = null;
518522
if (isLayoutMode && showOverlayBlockNums) {
519523
showBlockMask = true;
@@ -531,9 +535,12 @@ const BlockMask = React.memo(({ nodeModel }: { nodeModel: NodeModel }) => {
531535
</div>
532536
);
533537
}
534-
538+
535539
return (
536-
<div className={clsx("block-mask", { "show-block-mask": showBlockMask, "bg-blue-500/10": blockHighlight })} style={style}>
540+
<div
541+
className={clsx("block-mask", { "show-block-mask": showBlockMask, "bg-blue-500/10": blockHighlight })}
542+
style={style}
543+
>
537544
{innerElem}
538545
</div>
539546
);

0 commit comments

Comments
 (0)