Skip to content
Draft
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 23 additions & 10 deletions src/layout/ComponentStructureWrapper.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -32,16 +32,29 @@ export function ComponentStructureWrapper({
const indexedId = useIndexedId(baseComponentId);

const componentWithValidations = (
<Flex
id={`form-content-${indexedId}`}
className={className}
size={{ xs: 12, ...grid?.innerGrid }}
style={style}
item
>
{children}
{showValidationMessages && <AllComponentValidations baseComponentId={baseComponentId} />}
</Flex>
<div style={{ display: 'flex', flexDirection: 'column' }}>
<Flex
id={`form-content-${indexedId}`}
className={className}
size={{ xs: 12, ...grid?.innerGrid }}
style={style}
item
>
{children}
</Flex>

{showValidationMessages && (
<Flex
id={`form-content-${indexedId}-validations`}
className={className}
size={{ xs: 12, ...grid?.labelGrid }}
style={style}
item
>
<AllComponentValidations baseComponentId={baseComponentId} />
</Flex>
)}
</div>
);

return label ? <Label {...label}>{componentWithValidations}</Label> : componentWithValidations;
Expand Down
Loading