Merge pull request #138 from mittwald/bugfix/schema-array-items

Fix display of array items in Schema component
mittwald · Jul 2, 2024 · 2e6b7d3 · 2e6b7d3
2 parents d706cb6 + 69c5ce2
commit 2e6b7d3
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/src/components/openapi/OperationInputValue.tsx b/src/components/openapi/OperationInputValue.tsx
@@ -34,7 +34,7 @@ export function ArrayValue({ schema }: { schema: OpenAPIV3.SchemaObject }) {
         <span className={styles.parameterAlternative}>Array[</span>
       </div>
       <div className={styles.parameterListBody}>{body}</div>
-      <Schema schema={schema} />
+      <PropertyValue name="*" schema={schema} required={false} />
       <div className={styles.parameterListHeader}>
         <span className={styles.parameterAlternative}>]</span>
       </div>
@@ -58,6 +58,8 @@ export function PropertyValue({
     body = <Markdown>{schema.description}</Markdown>;
   }
 
+  const hasSubSchema = schema.properties || schema.additionalProperties || schema.items;
+
   return (
     <li key={name}>
       <div className={styles.parameterListHeader}>
@@ -67,7 +69,7 @@ export function PropertyValue({
         {requiredOrOptional}
       </div>
       <div className={styles.parameterListBody}>{body}</div>
-      <Schema schema={schema} />
+      {hasSubSchema && <Schema schema={schema} />}
     </li>
   );
 }

diff --git a/src/components/openapi/Schema.tsx b/src/components/openapi/Schema.tsx
@@ -92,4 +92,6 @@ export default function Schema({ schema }: Props) {
   if (schema.type === "array") {
     return <ArraySchema schema={schema} />;
   }
+
+  return <PropertyValue name="*" schema={schema} required={false} />;
 }