docusaurus-theme-openapi-docs 0.0.0-1069 → 0.0.0-1073

package/lib/theme/Schema/index.js

@@ -797,6 +797,47 @@ const SchemaNode = ({ schema, schemaType }) => {
   }
   // Handle allOf, oneOf, anyOf without discriminators
   if (schema.allOf) {
+    // Check if allOf contains multiple oneOf/anyOf items that should be rendered separately
+    const oneOfItems = schema.allOf.filter((item) => item.oneOf || item.anyOf);
+    const hasMultipleChoices = oneOfItems.length > 1;
+    if (hasMultipleChoices) {
+      // Render each oneOf/anyOf constraint first, then shared properties
+      const mergedSchemas = mergeAllOf(schema);
+      if (
+        (schemaType === "request" && mergedSchemas.readOnly) ||
+        (schemaType === "response" && mergedSchemas.writeOnly)
+      ) {
+        return null;
+      }
+      return react_1.default.createElement(
+        "div",
+        null,
+        schema.allOf.map((item, index) => {
+          if (item.oneOf || item.anyOf) {
+            return react_1.default.createElement(
+              "div",
+              { key: index },
+              react_1.default.createElement(AnyOneOf, {
+                schema: item,
+                schemaType: schemaType,
+              })
+            );
+          }
+          return null;
+        }),
+        mergedSchemas.properties &&
+          react_1.default.createElement(Properties, {
+            schema: mergedSchemas,
+            schemaType: schemaType,
+          }),
+        mergedSchemas.items &&
+          react_1.default.createElement(Items, {
+            schema: mergedSchemas,
+            schemaType: schemaType,
+          })
+      );
+    }
+    // For other allOf cases, use standard merge behavior
     const mergedSchemas = mergeAllOf(schema);
     if (
       (schemaType === "request" && mergedSchemas.readOnly) ||

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "docusaurus-theme-openapi-docs",
   "description": "OpenAPI theme for Docusaurus.",
-  "version": "0.0.0-1069",
+  "version": "0.0.0-1073",
   "license": "MIT",
   "keywords": [
     "openapi",
@@ -38,7 +38,7 @@
     "@types/postman-collection": "^3.5.11",
     "@types/react-modal": "^3.16.3",
     "concurrently": "^9.2.0",
-    "docusaurus-plugin-openapi-docs": "0.0.0-1069",
+    "docusaurus-plugin-openapi-docs": "0.0.0-1073",
     "docusaurus-plugin-sass": "^0.2.6",
     "eslint-plugin-prettier": "^5.5.1"
   },
@@ -81,5 +81,5 @@
   "engines": {
     "node": ">=14"
   },
-  "gitHead": "68650d41c8460a20c228d851f869e495c5608796"
+  "gitHead": "d6c29401ee71e04536c4ece3054c414a79e750da"
 }

package/src/theme/Schema/index.tsx

@@ -885,6 +885,48 @@ const SchemaNode: React.FC<SchemaProps> = ({ schema, schemaType }) => {
 
   // Handle allOf, oneOf, anyOf without discriminators
   if (schema.allOf) {
+    // Check if allOf contains multiple oneOf/anyOf items that should be rendered separately
+    const oneOfItems = schema.allOf.filter(
+      (item: any) => item.oneOf || item.anyOf
+    );
+    const hasMultipleChoices = oneOfItems.length > 1;
+
+    if (hasMultipleChoices) {
+      // Render each oneOf/anyOf constraint first, then shared properties
+      const mergedSchemas = mergeAllOf(schema) as SchemaObject;
+
+      if (
+        (schemaType === "request" && mergedSchemas.readOnly) ||
+        (schemaType === "response" && mergedSchemas.writeOnly)
+      ) {
+        return null;
+      }
+
+      return (
+        <div>
+          {/* Render all oneOf/anyOf constraints first */}
+          {schema.allOf.map((item: any, index: number) => {
+            if (item.oneOf || item.anyOf) {
+              return (
+                <div key={index}>
+                  <AnyOneOf schema={item} schemaType={schemaType} />
+                </div>
+              );
+            }
+            return null;
+          })}
+          {/* Then render shared properties from the merge */}
+          {mergedSchemas.properties && (
+            <Properties schema={mergedSchemas} schemaType={schemaType} />
+          )}
+          {mergedSchemas.items && (
+            <Items schema={mergedSchemas} schemaType={schemaType} />
+          )}
+        </div>
+      );
+    }
+
+    // For other allOf cases, use standard merge behavior
     const mergedSchemas = mergeAllOf(schema) as SchemaObject;
 
     if (