@@ -31,7 +31,12 @@ import {
3131 BaseSubHeader ,
3232 BaseTextContainer ,
3333} from './BaseNode.styles' ;
34- import type { BaseNodeComponentProps , FooterVariant , NodeStatusContext } from './BaseNode.types' ;
34+ import type {
35+ BaseNodeComponentProps ,
36+ FooterVariant ,
37+ NodeAdornments ,
38+ NodeStatusContext ,
39+ } from './BaseNode.types' ;
3540import { NodeLabel } from './NodeLabel' ;
3641
3742const selectIsConnecting = ( state : ReactFlowState ) => ! ! state . connectionClickStartHandle ;
@@ -169,15 +174,15 @@ const BaseNodeComponent = (props: BaseNodeComponentProps) => {
169174 return manifest ? resolveToolbar ( manifest , statusContext ) : undefined ;
170175 } , [ toolbarConfigProp , manifest , statusContext ] ) ;
171176
172- // Adornments resolution: props take precedence, then default resolver
173- const adornments = useMemo ( ( ) => {
174- // Priority 1: Prop override (ReactNode adornments)
175- if ( adornmentsProp ) {
176- return adornmentsProp ;
177- }
177+ // Adornments resolution: use default resolver, then override with props if provided
178+ const adornments : NodeAdornments = useMemo ( ( ) => {
179+ const adornmentsFromProps = adornmentsProp ?? { } ;
180+ const adornmentsFromResolver = resolveAdornments ( statusContext ) ;
178181
179- // Priority 2: Default resolver (manifest/execution state based)
180- return resolveAdornments ( statusContext ) ;
182+ return {
183+ ...adornmentsFromResolver ,
184+ ...adornmentsFromProps ,
185+ } ;
181186 } , [ adornmentsProp , statusContext ] ) ;
182187
183188 // Compute height based on handleConfigurations
0 commit comments