fix: Handling description for Combiners-STOP-95 (#289)

* fix: description for Combiners(allOf,anyOf,oneOf) * fix: handling description for Combiners * fix: have removed export keyword before function
stoplightio · Jan 8, 2025 · 0ea66e2 · 0ea66e2
1 parent 230134c
commit 0ea66e2
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/src/components/SchemaRow/SchemaRow.tsx b/src/components/SchemaRow/SchemaRow.tsx
@@ -175,7 +175,9 @@ export const SchemaRow: React.FunctionComponent<SchemaRowProps> = React.memo(
               {hasProperties && <Divider atom={isNodeHoveredAtom(schemaNode)} />}
               <Properties required={required} deprecated={deprecated} validations={validations} />
             </Flex>
-            {typeof description === 'string' && description.length > 0 && <Description value={description} />}
+            {typeof description === 'string' &&
+              (!combiner || schemaNode.parent?.fragment.description !== description) &&
+              description.length > 0 && <Description value={description} />}
             <Validations
               validations={isRegularNode(schemaNode) ? getValidationsFromSchema(schemaNode) : {}}
               hideExamples={hideExamples}

diff --git a/src/components/SchemaRow/TopLevelSchemaRow.tsx b/src/components/SchemaRow/TopLevelSchemaRow.tsx
@@ -66,7 +66,9 @@ export const TopLevelSchemaRow = ({
     return (
       <>
         <ScrollCheck />
-        <Description value={schemaNode.annotations.description} />
+        {schemaNode.annotations.description !== schemaNode.parent?.fragment.description && (
+          <Description value={schemaNode.annotations.description} />
+        )}
         <HStack spacing={3} pb={4}>
           <Menu
             aria-label="Pick a type"