@@ -6,6 +6,7 @@ import { BlockFrame_Header } from "@/app/block/blockframe-header";
66import { blockViewToIcon , getViewIconElem , useTabBackground } from "@/app/block/blockutil" ;
77import { ConnStatusOverlay } from "@/app/block/connstatusoverlay" ;
88import { ChangeConnectionBlockModal } from "@/app/modals/conntypeahead" ;
9+ import { getBlockBorderAtom } from "@/app/store/badge" ;
910import { getBlockComponentModel , globalStore , useBlockAtom } from "@/app/store/global" ;
1011import { useTabModel } from "@/app/store/tab-model" ;
1112import { TabRpcClient } from "@/app/store/wshrpcutil" ;
@@ -32,6 +33,7 @@ const BlockMask = React.memo(({ nodeModel }: { nodeModel: NodeModel }) => {
3233 const isLayoutMode = jotai . useAtomValue ( waveEnv . atoms . controlShiftDelayAtom ) ;
3334 const showOverlayBlockNums = jotai . useAtomValue ( waveEnv . getSettingsKeyAtom ( "app:showoverlayblocknums" ) ) ?? true ;
3435 const blockHighlight = jotai . useAtomValue ( BlockModel . getInstance ( ) . getBlockHighlightAtom ( nodeModel . blockId ) ) ;
36+ const badgeBorder = jotai . useAtomValue ( getBlockBorderAtom ( nodeModel . blockId ) ) ;
3537 const frameActiveBorderColor = jotai . useAtomValue (
3638 waveEnv . getBlockMetaKeyAtom ( nodeModel . blockId , "frame:activebordercolor" )
3739 ) ;
@@ -63,6 +65,10 @@ const BlockMask = React.memo(({ nodeModel }: { nodeModel: NodeModel }) => {
6365 style . borderColor = "rgb(59, 130, 246)" ;
6466 }
6567
68+ if ( badgeBorder ) {
69+ style [ "--badge-border-color" as any ] = badgeBorder . color ;
70+ }
71+
6672 let innerElem = null ;
6773 if ( isLayoutMode && showOverlayBlockNums ) {
6874 showBlockMask = true ;
@@ -83,7 +89,11 @@ const BlockMask = React.memo(({ nodeModel }: { nodeModel: NodeModel }) => {
8389
8490 return (
8591 < div
86- className = { clsx ( "block-mask" , { "show-block-mask" : showBlockMask , "bg-blue-500/10" : blockHighlight } ) }
92+ className = { clsx ( "block-mask" , {
93+ "show-block-mask" : showBlockMask ,
94+ "bg-blue-500/10" : blockHighlight ,
95+ "badge-border-highlight" : ! ! badgeBorder ,
96+ } ) }
8797 style = { style }
8898 >
8999 { innerElem }
0 commit comments