From b5e8081115e40868723a2430e319452abefeff40 Mon Sep 17 00:00:00 2001 From: Adrien Becchis Date: Fri, 2 Oct 2020 23:44:46 +0200 Subject: [PATCH] fix(syntax-highlighter): configuration for Examples (#6455) * Complement #5259, getConfigs was not correctly forwarded to Examples. As a result, syntax highlight could not be disabled be disabled or configured in that elements --- src/core/components/example.jsx | 5 +++-- src/core/components/model-example.jsx | 2 +- src/core/components/parameter-row.jsx | 1 + src/core/components/parameters/parameters.jsx | 2 ++ src/core/components/response.jsx | 1 + src/core/plugins/oas3/components/request-body.jsx | 2 ++ 6 files changed, 10 insertions(+), 3 deletions(-) diff --git a/src/core/components/example.jsx b/src/core/components/example.jsx index 839bcea3..ad6ad8cf 100644 --- a/src/core/components/example.jsx +++ b/src/core/components/example.jsx @@ -8,7 +8,7 @@ import ImPropTypes from "react-immutable-proptypes" import { stringify } from "core/utils" export default function Example(props) { - const { example, showValue, getComponent } = props + const { example, showValue, getComponent, getConfigs } = props const Markdown = getComponent("Markdown", true) const HighlightCode = getComponent("highlightCode") @@ -28,7 +28,7 @@ export default function Example(props) { {showValue && example.has("value") ? (
Example Value
- +
) : null} @@ -39,4 +39,5 @@ Example.propTypes = { example: ImPropTypes.map.isRequired, showValue: PropTypes.bool, getComponent: PropTypes.func.isRequired, + getConfigs: PropTypes.func.getConfigs, } diff --git a/src/core/components/model-example.jsx b/src/core/components/model-example.jsx index b7498ebd..3974bdd5 100644 --- a/src/core/components/model-example.jsx +++ b/src/core/components/model-example.jsx @@ -76,7 +76,7 @@ export default class ModelExample extends React.Component { { this.state.activeTab === "example" ? ( example ? example : ( - + ) ) : null } diff --git a/src/core/components/parameter-row.jsx b/src/core/components/parameter-row.jsx index 66c2d1ce..514a390d 100644 --- a/src/core/components/parameter-row.jsx +++ b/src/core/components/parameter-row.jsx @@ -369,6 +369,7 @@ export default class ParameterRow extends Component { oas3Selectors.activeExamplesMember(...pathMethod, "parameters", this.getParamKey()) ])} getComponent={getComponent} + getConfigs={getConfigs} /> ) : null } diff --git a/src/core/components/parameters/parameters.jsx b/src/core/components/parameters/parameters.jsx index 49929e81..916e8471 100644 --- a/src/core/components/parameters/parameters.jsx +++ b/src/core/components/parameters/parameters.jsx @@ -107,6 +107,7 @@ export default class Parameters extends Component { const isExecute = tryItOutEnabled && allowTryItOut const isOAS3 = specSelectors.isOAS3() + const requestBody = operation.get("requestBody") return (
@@ -200,6 +201,7 @@ export default class Parameters extends Component { requestBodyInclusionSetting={oas3Selectors.requestBodyInclusionSetting(...pathMethod)} requestBodyErrors={oas3Selectors.requestBodyErrors(...pathMethod)} isExecute={isExecute} + getConfigs={getConfigs} activeExamplesKey={oas3Selectors.activeExamplesMember( ...pathMethod, "requestBody", diff --git a/src/core/components/response.jsx b/src/core/components/response.jsx index 2e078c99..3ed208b7 100644 --- a/src/core/components/response.jsx +++ b/src/core/components/response.jsx @@ -226,6 +226,7 @@ export default class Response extends React.Component { ) : null} diff --git a/src/core/plugins/oas3/components/request-body.jsx b/src/core/plugins/oas3/components/request-body.jsx index 4d1648d6..75be138b 100644 --- a/src/core/plugins/oas3/components/request-body.jsx +++ b/src/core/plugins/oas3/components/request-body.jsx @@ -250,6 +250,7 @@ const RequestBody = ({ example={ ) : null }