Allow non-full-width fields in FieldSet (#3097)

Co-authored-by: Johannes Obermair <48853629+johnnyomair@users.noreply.github.com>
vivid-planet · Jan 16, 2025 · eeb21ce · eeb21ce
1 parent 97fafac
commit eeb21ce
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/.changeset/sharp-dryers-happen.md b/.changeset/sharp-dryers-happen.md
@@ -0,0 +1,5 @@
+---
+"@comet/admin": patch
+---
+
+Allow non-full-width fields in `FieldSet`
diff --git a/packages/admin/admin/src/common/FieldSet.tsx b/packages/admin/admin/src/common/FieldSet.tsx
@@ -190,8 +190,6 @@ const Children = createComponentSlot(MuiAccordionDetails)<FieldSetClassKey, Owne
     },
 })(
     ({ theme, ownerState }) => css`
-        display: flex;
-        flex-direction: column;
         padding: 20px;
 
         ${!ownerState.hiddenSummary &&

diff --git a/storybook/src/admin/form/FieldContainer.stories.tsx b/storybook/src/admin/form/FieldContainer.stories.tsx
@@ -28,10 +28,7 @@ export const FieldContainer = () => {
                         <TextField name="textFieldWithLabelTwo" label="TextField label" variant="horizontal" />
                         <TextField name="testWithoutLabel" variant="horizontal" placeholder="TextField without label" />
                     </FieldSet>
-                    <FieldSet
-                        title="VERTICAL (auto-width)"
-                        slotProps={{ children: { sx: { display: "block" } } }} // TODO: Use `FieldSet` here once it supports non-full-width fields (https://vivid-planet.atlassian.net/browse/COM-1430)
-                    >
+                    <FieldSet title="VERTICAL (auto-width)">
                         <TextField name="textFieldWithLabelOne" label="TextField label" variant="vertical" />
                         <TextField name="textFieldWithLabelTwo" label="TextField label" variant="vertical" />
                         <TextField name="testWithoutLabel" variant="vertical" placeholder="TextField without label" />