Fix description for allOf-inheriting child schemas

demo/package.json

@@ -11,7 +11,7 @@
   },
   "dependencies": {
     "@stoplight/mosaic": "^1.53.4",
-    "@stoplight/elements": "^9.0.0",
+    "@stoplight/elements": "^9.0.601",
     "@stoplight/elements-dev-portal": "^3.0.0",
     "history": "^5.0.0",
     "react": "16.14.0",

package.json

@@ -82,7 +82,7 @@
     "postbuild": "yarn workspace @stoplight/elements test.packaging && yarn workspace @stoplight/elements-core test.packaging && yarn workspace @stoplight/elements-dev-portal test.packaging",
     "lint": "eslint '{packages,examples}/*/src/**/*.{ts,tsx}'",
     "version": "lerna version --no-push",
-    "release": "lerna publish from-package --yes --registry https://registry.npmjs.org --loglevel silly",
+    "release": "lerna publish from-package --yes --registry https://bin.ti8m.ch/artifactory/api/npm/channelsuite-npm-release/ --loglevel silly",
     "release.docs": "yarn workspace @stoplight/elements release.docs",
     "type-check": "yarn workspaces run type-check",
     "test": "yarn workspace @stoplight/elements test && yarn workspace @stoplight/elements-core test && yarn workspace @stoplight/elements-dev-portal test --passWithNoTests",

packages/elements-core/package.json

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

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

@@ -135,6 +135,21 @@ describe('Model', () => {
     expect(textboxDescription).toHaveTextContent('example schema description');
   });
 
+  it('displays child description at top of doc for allOf-inheriting objects', async () => {
+    const desc = 'child schema description';
+    // allOf-inheriting properties from parent but having its own description
+    const allOfSchema: JSONSchema7 = {
+      allOf: [exampleSchema],
+      description: desc,
+    };
+    render(<Model data={allOfSchema} />);
+    const description = screen.queryAllByText(desc);
+    const textboxDescription = screen.getByRole('textbox');
+
+    expect(description).toHaveLength(1);
+    expect(textboxDescription).toHaveTextContent(desc);
+  });
+
   it('does not display description at top of doc for non-objects', async () => {
     render(<Model data={exampleStringSchema} />);
     const description = screen.queryByRole('textbox');

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

@@ -93,12 +93,13 @@ const ModelComponent: React.FC<ModelProps> = ({
 
   const description = (
     <VStack spacing={10}>
-      {data.description && data.type === 'object' && (
-        <Box pos="relative">
-          <MarkdownViewer role="textbox" markdown={data.description} />
-          <NodeAnnotation change={descriptionChanged} />
-        </Box>
-      )}
+      {data.description &&
+        (data.type === 'object' || (data.allOf || []).some(s => (s as JSONSchema7).type === 'object')) && (
+          <Box pos="relative">
+            <MarkdownViewer role="textbox" markdown={data.description} />
+            <NodeAnnotation change={descriptionChanged} />
+          </Box>
+        )}
 
       <NodeVendorExtensions data={data} />
 

packages/elements-dev-portal/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@stoplight/elements-dev-portal",
-  "version": "3.0.7",
+  "version": "3.0.701",
   "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": "~9.0.6",
+    "@stoplight/elements-core": "~9.0.601",
     "@stoplight/path": "^1.3.2",
     "@stoplight/types": "^14.0.0",
     "classnames": "^2.2.6",

packages/elements-dev-portal/src/version.ts

@@ -1,2 +1,2 @@
 // auto-updated during build
-export const appVersion = '3.0.4';
+export const appVersion = '3.0.701';

packages/elements/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@stoplight/elements",
-  "version": "9.0.6",
+  "version": "9.0.601",
   "description": "UI components for composing beautiful developer documentation.",
   "keywords": [],
   "sideEffects": [
@@ -63,7 +63,7 @@
     ]
   },
   "dependencies": {
-    "@stoplight/elements-core": "~9.0.4",
+    "@stoplight/elements-core": "~9.0.601",
     "@stoplight/http-spec": "^7.1.0",
     "@stoplight/json": "^3.18.1",
     "@stoplight/mosaic": "^1.53.4",
@@ -109,4 +109,4 @@
   "release": {
     "extends": "@stoplight/scripts/release"
   }
-}
+}