Revert changes in Disclosure group

Author: nolannbiron

packages/react-openapi/src/OpenAPIDisclosureGroup.tsx

@@ -17,18 +17,12 @@ interface Props {
 type TDisclosureGroup = {
     id: string;
     label: string | React.ReactNode;
-} & (
-    | {
-          tabs?: {
-              id: string;
-              label: string | React.ReactNode;
-              body?: React.ReactNode;
-          }[];
-      }
-    | {
-          body?: React.ReactNode;
-      }
-);
+    tabs?: {
+        id: string;
+        label?: string | React.ReactNode;
+        body?: React.ReactNode;
+    }[];
+};
 
 const DisclosureGroupStateContext = createContext<DisclosureGroupState | null>(null);
 
@@ -67,7 +61,7 @@ function DisclosureItem(props: { group: TDisclosureGroup; icon?: React.ReactNode
 
     const panelRef = useRef<HTMLDivElement | null>(null);
     const triggerRef = useRef<HTMLButtonElement | null>(null);
-    const isDisabled = groupState?.isDisabled || ('tabs' in group && !group.tabs?.length) || false;
+    const isDisabled = groupState?.isDisabled || !group.tabs?.length || false;
     const { buttonProps: triggerProps, panelProps } = useDisclosure(
         {
             ...props,
@@ -80,19 +74,9 @@ function DisclosureItem(props: { group: TDisclosureGroup; icon?: React.ReactNode
     const { buttonProps } = useButton(triggerProps, triggerRef);
     const { isFocusVisible, focusProps } = useFocusRing();
 
-    const defaultTab =
-        'tabs' in group && group.tabs?.[0]
-            ? (group.tabs[0]?.id ?? '')
-            : 'body' in group
-              ? 'body'
-              : '';
+    const defaultTab = group.tabs?.[0]?.id || '';
     const [selectedTabKey, setSelectedTabKey] = useState(defaultTab);
-    const selectedTab =
-        'tabs' in group
-            ? group.tabs?.find((tab) => tab.id === selectedTabKey)
-            : 'body' in group
-              ? { id: 'body', body: group.body }
-              : null;
+    const selectedTab = group.tabs?.find((tab) => tab.id === selectedTabKey);
 
     return (
         <div className="openapi-disclosure-group" aria-expanded={state.isExpanded}>
@@ -119,7 +103,7 @@ function DisclosureItem(props: { group: TDisclosureGroup; icon?: React.ReactNode
 
                     {group.label}
                 </button>
-                {'tabs' in group && group.tabs ? (
+                {group.tabs ? (
                     <div className="openapi-disclosure-group-mediatype">
                         {group.tabs?.length > 1 ? (
                             <select

packages/react-openapi/src/models/OpenAPIModels.tsx

@@ -73,13 +73,18 @@ function OpenAPIRootModelsSchema(props: {
                         <span className="openapi-response-statuscode">{name}</span>
                     </div>
                 ),
-                body: (
-                    <Section className="openapi-section-models">
-                        <SectionBody>
-                            <OpenAPIRootSchema schema={schema} context={context} />
-                        </SectionBody>
-                    </Section>
-                ),
+                tabs: [
+                    {
+                        id: 'model',
+                        body: (
+                            <Section className="openapi-section-models">
+                                <SectionBody>
+                                    <OpenAPIRootSchema schema={schema} context={context} />
+                                </SectionBody>
+                            </Section>
+                        ),
+                    },
+                ],
             }))}
         />
     );