[Bug] Add condition for handling arrays of discriminators (#344)

* Add condition for handling arrays of discriminators and add missing return statement to createProperties

* Add missing --openapi-input-background var

* Match discriminator tab styles to schema tab styles

Author: sserrata

packages/docusaurus-plugin-openapi-docs/src/markdown/createRequestSchema.ts

@@ -104,16 +104,16 @@ function createAnyOneOf(schema: SchemaObject): any {
 
 function createProperties(schema: SchemaObject) {
   const discriminator = schema.discriminator;
-  return Object.entries(schema.properties!).map(([key, val]) =>
-    createEdges({
+  return Object.entries(schema.properties!).map(([key, val]) => {
+    return createEdges({
       name: key,
       schema: val,
       required: Array.isArray(schema.required)
         ? schema.required.includes(key)
         : false,
       discriminator,
-    })
-  );
+    });
+  });
 }
 
 function createAdditionalProperties(schema: SchemaObject) {
@@ -613,6 +613,10 @@ function createEdges({
     return createDetailsNode(name, schemaName, schema, required);
   }
 
+  if (schema.items?.anyOf !== undefined || schema.items?.oneOf !== undefined) {
+    return createDetailsNode(name, schemaName, schema, required);
+  }
+
   if (schema.readOnly && schema.readOnly === true) {
     return undefined;
   }

packages/docusaurus-plugin-openapi-docs/src/markdown/createResponseSchema.ts

@@ -109,16 +109,16 @@ function createAnyOneOf(schema: SchemaObject): any {
 
 function createProperties(schema: SchemaObject) {
   const discriminator = schema.discriminator;
-  return Object.entries(schema.properties!).map(([key, val]) =>
-    createEdges({
+  return Object.entries(schema.properties!).map(([key, val]) => {
+    return createEdges({
       name: key,
       schema: val,
       required: Array.isArray(schema.required)
         ? schema.required.includes(key)
         : false,
       discriminator,
-    })
-  );
+    });
+  });
 }
 
 function createAdditionalProperties(schema: SchemaObject) {
@@ -613,6 +613,10 @@ function createEdges({
     return createDetailsNode(name, schemaName, schema, required);
   }
 
+  if (schema.items?.anyOf !== undefined || schema.items?.oneOf !== undefined) {
+    return createDetailsNode(name, schemaName, schema, required);
+  }
+
   if (schema.writeOnly && schema.writeOnly === true) {
     return undefined;
   }

packages/docusaurus-theme-openapi-docs/src/theme/DiscriminatorTabs/styles.module.css

@@ -12,14 +12,19 @@
   height: 1.8rem;
   margin-top: 0 !important;
   margin-right: 0.5rem;
-  border: 1px solid var(--openapi-code-dim-dark);
+  border: 1px solid var(--ifm-color-primary);
   border-radius: var(--ifm-global-radius);
-  color: var(--openapi-code-dim-dark);
+  color: var(--ifm-color-primary);
   font-size: 12px;
 }
 
+.tabItem:not(.discriminatorTabActive) {
+  opacity: 0.65;
+}
+
 .tabItem:hover {
-  color: var(--ifm-color-emphasis-500) !important;
+  opacity: 1;
+  background-color: var(--ifm-color-emphasis-100);
 }
 
 .tabItem:last-child {
@@ -59,8 +64,7 @@
 }
 
 .tabItem.discriminatorTabActive {
-  border: 1px solid var(--ifm-color-primary);
-  color: var(--ifm-color-primary);
+  background-color: var(--ifm-color-emphasis-100);
 }
 
 .discriminatorTabLabel {

packages/docusaurus-theme-openapi-docs/src/theme/styles.css

@@ -14,6 +14,7 @@
   --openapi-card-background-color: var(--ifm-color-gray-100);
   --openapi-card-border-radius: var(--ifm-pre-border-radius);
   --openapi-input-border: var(--ifm-color-primary);
+  --openapi-input-background: var(--openapi-card-background-color);
 }
 
 [data-theme="dark"] {