Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/66396/group-height' into alpha
Browse files Browse the repository at this point in the history
  • Loading branch information
mguellsegarra committed Dec 13, 2024
2 parents 6c3a840 + c3aeeda commit c3cfe82
Showing 1 changed file with 8 additions and 2 deletions.
10 changes: 8 additions & 2 deletions src/widgets/containers/Group.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,13 @@ function Group(props: Props): React.ReactElement {
const icon: React.ElementType | undefined = iconMapper(ooui.icon || "");
const { t } = useLocale();
return (
<>
<div
style={{
height: ooui.height ? ooui.height + "px" : "100%",
overflowX: "hidden",
overflowY: "auto",
}}
>
{(ooui.label || icon) && showLabel ? (
<FieldSet label={ooui.label} icon={icon}>
<Spinner
Expand All @@ -31,7 +37,7 @@ function Group(props: Props): React.ReactElement {
responsiveBehaviour={responsiveBehaviour}
/>
)}
</>
</div>
);
}

Expand Down

0 comments on commit c3cfe82

Please sign in to comment.