Merge commit '5411b0b93178168c48ccc96417a7790d24635aec'

Author: aleung

.travis.yml

@@ -30,8 +30,3 @@ deploy:
   api_key: "$NPM_TOKEN"
   on:
     tags: true
-- provider: script
-  skip_cleanup: true
-  script: npm run deploy:demo
-  on:
-    tags: true

CHANGELOG.md

@@ -1,3 +1,14 @@
+# [2.0.0-rc.50](https://github.com/Redocly/redoc/compare/v2.0.0-rc.49...v2.0.0-rc.50) (2021-02-15)
+
+
+### Bug Fixes
+
+* add includes polyfill ([3ba622f](https://github.com/Redocly/redoc/commit/3ba622f3ab9e28c954fe05f42e7b90862fc3d544)), closes [#1530](https://github.com/Redocly/redoc/issues/1530)
+* background-color in search results ([#1531](https://github.com/Redocly/redoc/issues/1531)) ([d288165](https://github.com/Redocly/redoc/commit/d288165a4ea04aedc23dba12020a73e86f20755b))
+* false-positive recursive tag case when using oneOf + allOf ([#1534](https://github.com/Redocly/redoc/issues/1534)) ([8270481](https://github.com/Redocly/redoc/commit/8270481e9f0f381b392f7921d21cb06e0e673b6d))
+
+
+
 # [2.0.0-rc.49](https://github.com/Redocly/redoc/compare/v2.0.0-rc.48...v2.0.0-rc.49) (2021-01-30)
 
 

README.md

@@ -238,7 +238,7 @@ You can use all of the following options with standalone version on <redoc> tag
 * `hideSchemaPattern` - if set, the pattern is not shown in the schema.
 * `hideSingleRequestSampleTab` - do not show the request sample tab for requests with only one sample.
 * `expandSingleSchemaField` - automatically expand single field in a schema
-* `jsonSampleExpandLevel` - set the default expand level for JSON payload samples (responses and request body). Special value 'all' expands all levels. The default value is `2`.
+* `jsonSampleExpandLevel` - set the default expand level for JSON payload samples (responses and request body). Special value `"all"` expands all levels. The default value is `2`.
 * `hideSchemaTitles` - do not display schema `title` next to to the type
 * `simpleOneOfTypeLabel` - show only unique oneOf types in the label without titles
 * `lazyRendering` - _Not implemented yet_ ~~if set, enables lazy rendering mode in ReDoc. This mode is useful for APIs with big number of operations (e.g. > 50). In this mode ReDoc shows initial screen ASAP and then renders the rest operations asynchronously while showing progress bar on the top. Check out the [demo](\\redocly.github.io/redoc) for the example.~~
@@ -255,7 +255,6 @@ You can use all of the following options with standalone version on <redoc> tag
   * **function**: A getter function. Must return a number representing the offset (in pixels).
 * `showExtensions` - show vendor extensions ("x-" fields). Extensions used by ReDoc are ignored. Can be boolean or an array of `string` with names of extensions to display.
 * `sortPropsAlphabetically` - sort properties alphabetically.
-* `suppressWarnings` - if set, warnings are not rendered at the top of documentation (they still are logged to the console).
 * `payloadSampleIdx` - if set, payload sample will be inserted at this index or last. Indexes start from 0.
 * `theme` - ReDoc theme. For details check [theme docs](#redoc-theme-object).
 * `untrustedSpec` - if set, the spec is considered untrusted and all HTML/markdown is sanitized to prevent XSS. **Disabled by default** for performance reasons. **Enable this option if you work with untrusted user data!**

cli/npm-shrinkwrap.json

@@ -1,6 +1,6 @@
 {
   "name": "redoc-cli",
-  "version": "0.10.2",
+  "version": "0.10.4",
   "description": "ReDoc's Command Line Interface",
   "main": "index.js",
   "bin": "index.js",
@@ -19,7 +19,7 @@
     "node-libs-browser": "^2.2.1",
     "react": "^16.13.1",
     "react-dom": "^16.13.1",
-    "redoc": "2.0.0-rc.48",
+    "redoc": "2.0.0-rc.50",
     "styled-components": "^5.1.1",
     "tslib": "^2.0.0",
     "yargs": "^15.4.1"

cli/package.json

@@ -1,6 +1,6 @@
 {
   "name": "redoc",
-  "version": "2.0.0-rc.49",
+  "version": "2.0.0-rc.50",
   "description": "ReDoc",
   "repository": {
     "type": "git",

package-lock.json

@@ -66,6 +66,10 @@ export const SearchResultsBox = styled.div`
   margin-top: 10px;
   line-height: 1.4;
   font-size: 0.9em;
+  
+  li {
+    background-color: inherit;
+  }
 
   ${MenuItemLabel} {
     padding-top: 6px;

package.json

@@ -1,6 +1,7 @@
 import 'core-js/es/promise';
 
 import 'core-js/es/array/find';
+import 'core-js/es/array/includes';
 import 'core-js/es/object/assign';
 import 'core-js/es/object/entries';
 import 'core-js/es/object/is';

src/components/SearchBox/styled.elements.tsx

@@ -261,10 +261,12 @@ export class OpenAPIParser {
             receiver.properties[prop] = subSchema.properties[prop];
           } else {
             // merge inner properties
-            receiver.properties[prop] = this.mergeAllOf(
+            const mergedProp = this.mergeAllOf(
               { allOf: [receiver.properties[prop], subSchema.properties[prop]] },
               $ref + '/properties/' + prop,
             );
+            receiver.properties[prop] = mergedProp
+            this.exitParents(mergedProp); // every prop resolution should have separate recursive stack
           }
         }
       }