Skip to content

Commit f112590

Browse files
committed
refactor(apollo-react): make adornment props override per slot
1 parent 9ae3696 commit f112590

2 files changed

Lines changed: 15 additions & 10 deletions

File tree

packages/apollo-react/src/canvas/components/BaseNode/BaseNode.tsx

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -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';
3540
import { NodeLabel } from './NodeLabel';
3641

3742
const 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

packages/apollo-react/src/canvas/components/StageNode/TaskMenu.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ const TaskMenuComponent = (
129129
className: 'task-menu-paper',
130130
sx: {
131131
'&.task-menu-paper .MuiList-padding': {
132-
paddingTop: token.Padding.PadL ,
132+
paddingTop: token.Padding.PadL,
133133
paddingBottom: token.Padding.PadL,
134134
},
135135
},

0 commit comments

Comments
 (0)