fix: Ref added under anyOf/oneOf/allOf remove the model description -STOP-95

examples/react-cra/package.json

@@ -25,7 +25,8 @@
     "typescript": "^4.3.5"
   },
   "resolutions": {
-    "@babel/core": "^7.16.0"
+    "@babel/core": "^7.16.0",
+    "@types/react": "17.0.11"
   },
   "browserslist": {
     "production": [

packages/elements-core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@stoplight/elements-core",
-  "version": "8.5.2",
+  "version": "8.5.3",
   "sideEffects": [
     "web-components.min.js",
     "src/web-components/**",

packages/elements-core/src/components/Docs/Model/Model.spec.tsx

@@ -26,9 +26,52 @@ const exampleSchema: JSONSchema7 = {
   },
 };
 
-const exampleStringSchema: JSONSchema7 = {
-  type: 'string',
-  description: 'example schema description that should only show once :)',
+const model_data: JSONSchema7 = {
+  title: 'operator_reference',
+  description: 'description from allOf Operator',
+  allOf: [
+    {
+      $ref: '#/%24defs/bird',
+    },
+    {
+      $ref: '#/%24defs/animal',
+    },
+  ],
+
+  $defs: {
+    bird: {
+      type: 'object',
+      title: 'bird',
+      description: 'this is bird model',
+      properties: {
+        id: {
+          type: 'string',
+        },
+        bird_type: {
+          type: 'string',
+        },
+      },
+    },
+    animal: {
+      $ref: '#/%24defs/bird',
+      title: 'animal',
+      description: 'This is from Animal model',
+    },
+  },
+};
+const props = {
+  nodeTitle: 'operator_reference',
+  layoutOptions: {
+    hideExport: false,
+  },
+  exportProps: {
+    original: {
+      href: 'https://stoplight-local.com:8443/api/v1/projects/venkat/stop-95/nodes/models/operator_reference.yaml?fromExportButton=true&snapshotType=model',
+    },
+    bundled: {
+      href: 'https://api.stoplight-local.com:8443/projects/cHJqOjE2NA/branches/main/export/models/operator_reference.yaml',
+    },
+  },
 };
 
 describe('Model', () => {
@@ -135,13 +178,6 @@ describe('Model', () => {
     expect(textboxDescription).toHaveTextContent('example schema description');
   });
 
-  it('does not display description at top of doc for non-objects', async () => {
-    render(<Model data={exampleStringSchema} />);
-    const description = screen.queryByRole('textbox');
-
-    expect(description).not.toBeInTheDocument();
-  });
-
   describe('export button', () => {
     it('should render correctly', () => {
       const wrapper = render(
@@ -150,7 +186,6 @@ describe('Model', () => {
             data={exampleSchema}
             exportProps={{ original: { onPress: jest.fn() }, bundled: { onPress: jest.fn() } }}
           />
-          ,
         </MosaicProvider>,
       );
 
@@ -237,5 +272,9 @@ describe('Model', () => {
 
       unmount();
     });
+    it('CombineSchema must have description', () => {
+      const { container } = render(<Model data={model_data} {...props} />);
+      expect(container).toHaveTextContent(`description from allOf Operator`);
+    });
   });
 });

packages/elements-core/src/components/Docs/Model/Model.tsx

@@ -71,7 +71,7 @@ const ModelComponent: React.FC<ModelProps> = ({
   const descriptionChanged = nodeHasChanged?.({ nodeId, attr: 'description' });
   const description = (
     <VStack spacing={10}>
-      {data.description && data.type === 'object' && (
+      {data.description && (
         <Box pos="relative">
           <MarkdownViewer role="textbox" markdown={data.description} />
           <NodeAnnotation change={descriptionChanged} />

packages/elements-dev-portal/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@stoplight/elements-dev-portal",
-  "version": "2.5.2",
+  "version": "2.5.3",
   "description": "UI components for composing beautiful developer documentation.",
   "keywords": [],
   "sideEffects": [
@@ -66,7 +66,7 @@
   "dependencies": {
     "@stoplight/markdown-viewer": "^5.7.1",
     "@stoplight/mosaic": "^1.53.4",
-    "@stoplight/elements-core": "^8.5.2",
+    "@stoplight/elements-core": "^8.5.3",
     "@stoplight/path": "^1.3.2",
     "@stoplight/types": "^14.0.0",
     "classnames": "^2.2.6",

packages/elements/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@stoplight/elements",
-  "version": "8.5.2",
+  "version": "8.5.3",
   "description": "UI components for composing beautiful developer documentation.",
   "keywords": [],
   "sideEffects": [
@@ -63,7 +63,7 @@
     ]
   },
   "dependencies": {
-    "@stoplight/elements-core": "^8.5.2",
+    "@stoplight/elements-core": "^8.5.3",
     "@stoplight/http-spec": "^7.1.0",
     "@stoplight/json": "^3.18.1",
     "@stoplight/mosaic": "^1.53.4",