@@ -110,6 +110,7 @@ export default class LiveResponse extends React.Component {
contentType={ contentType }
url={ url }
headers={ headers }
+ getConfigs={ getConfigs }
getComponent={ getComponent }/>
: null
}
diff --git a/src/core/components/param-body.jsx b/src/core/components/param-body.jsx
index 95360315dc1..c2b02ed0261 100644
--- a/src/core/components/param-body.jsx
+++ b/src/core/components/param-body.jsx
@@ -14,6 +14,7 @@ export default class ParamBody extends PureComponent {
consumes: PropTypes.object,
consumesValue: PropTypes.string,
fn: PropTypes.object.isRequired,
+ getConfigs: PropTypes.func.isRequired,
getComponent: PropTypes.func.isRequired,
isExecute: PropTypes.bool,
specSelectors: PropTypes.object.isRequired,
@@ -96,7 +97,7 @@ export default class ParamBody extends PureComponent {
isExecute,
specSelectors,
pathMethod,
-
+ getConfigs,
getComponent,
} = this.props
@@ -118,6 +119,7 @@ export default class ParamBody extends PureComponent {
isEditBox && isExecute
?
: (value &&
)
}
diff --git a/src/core/components/parameter-row.jsx b/src/core/components/parameter-row.jsx
index 9c49dedb808..b44f1004141 100644
--- a/src/core/components/parameter-row.jsx
+++ b/src/core/components/parameter-row.jsx
@@ -191,6 +191,7 @@ export default class ParameterRow extends Component {
let inType = param.get("in")
let bodyParam = inType !== "body" ? null
:
+ bodyEl =
// XML
} else if (/xml/i.test(contentType)) {
@@ -107,11 +108,11 @@ export default class ResponseBody extends React.PureComponent {
textNodesOnSameLine: true,
indentor: " "
})
- bodyEl =
+ bodyEl =
// HTML or Plain Text
} else if (toLower(contentType) === "text/html" || /text\/plain/.test(contentType)) {
- bodyEl =
+ bodyEl =
// Image
} else if (/^image\//i.test(contentType)) {
@@ -125,7 +126,7 @@ export default class ResponseBody extends React.PureComponent {
} else if (/^audio\//i.test(contentType)) {
bodyEl =
} else if (typeof content === "string") {
- bodyEl =
+ bodyEl =
} else if ( content.size > 0 ) {
// We don't know the contentType, but there was some content returned
if(parsedContent) {
@@ -135,7 +136,7 @@ export default class ResponseBody extends React.PureComponent {
Unrecognized response type; displaying content as text.
-
+
} else {
diff --git a/src/core/components/response.jsx b/src/core/components/response.jsx
index afdef9fd7cc..2e078c99dd6 100644
--- a/src/core/components/response.jsx
+++ b/src/core/components/response.jsx
@@ -5,12 +5,12 @@ import cx from "classnames"
import { fromJS, Seq, Iterable, List, Map } from "immutable"
import { getSampleSchema, fromJSOrdered, stringify } from "core/utils"
-const getExampleComponent = ( sampleResponse, HighlightCode ) => {
+const getExampleComponent = ( sampleResponse, HighlightCode, getConfigs ) => {
if (
sampleResponse !== undefined &&
sampleResponse !== null
) { return
-
+
}
return null
@@ -150,7 +150,7 @@ export default class Response extends React.Component {
}
}
- let example = getExampleComponent( sampleResponse, HighlightCode )
+ let example = getExampleComponent( sampleResponse, HighlightCode, getConfigs )
return (
diff --git a/src/core/index.js b/src/core/index.js
index c0aaae00fcd..057586216d9 100644
--- a/src/core/index.js
+++ b/src/core/index.js
@@ -78,6 +78,11 @@ export default function SwaggerUI(opts) {
// Inline Plugin
fn: { },
components: { },
+
+ syntaxHighlight: {
+ activated: true,
+ theme: "agate"
+ }
}
let queryConfig = parseSearch()
diff --git a/src/core/syntax-highlighting.js b/src/core/syntax-highlighting.js
new file mode 100644
index 00000000000..236df2ae634
--- /dev/null
+++ b/src/core/syntax-highlighting.js
@@ -0,0 +1,35 @@
+import { Light as SyntaxHighlighter } from "react-syntax-highlighter"
+
+import js from "react-syntax-highlighter/dist/cjs/languages/hljs/javascript"
+import json from "react-syntax-highlighter/dist/cjs/languages/hljs/json"
+import xml from "react-syntax-highlighter/dist/cjs/languages/hljs/xml"
+import bash from "react-syntax-highlighter/dist/cjs/languages/hljs/bash"
+import yaml from "react-syntax-highlighter/dist/cjs/languages/hljs/yaml"
+import http from "react-syntax-highlighter/dist/cjs/languages/hljs/http"
+
+import agate from "react-syntax-highlighter/dist/cjs/styles/hljs/agate"
+import arta from "react-syntax-highlighter/dist/cjs/styles/hljs/arta"
+import monokai from "react-syntax-highlighter/dist/cjs/styles/hljs/monokai"
+import nord from "react-syntax-highlighter/dist/cjs/styles/hljs/nord"
+import obsidian from "react-syntax-highlighter/dist/cjs/styles/hljs/obsidian"
+import tomorrowNight from "react-syntax-highlighter/dist/cjs/styles/hljs/tomorrow-night"
+
+SyntaxHighlighter.registerLanguage("json", json)
+SyntaxHighlighter.registerLanguage("js", js)
+SyntaxHighlighter.registerLanguage("xml", xml)
+SyntaxHighlighter.registerLanguage("yaml", yaml)
+SyntaxHighlighter.registerLanguage("http", http)
+SyntaxHighlighter.registerLanguage("bash", bash)
+
+const styles = {agate, arta, monokai, nord, obsidian, "tomorrow-night": tomorrowNight}
+export const availableStyles = Object.keys(styles)
+
+export const getStyle = name => {
+ if (!availableStyles.includes(name)) {
+ console.warn(`Request style '${name}' is not available, returning default instead`)
+ return agate
+ }
+ return styles[name]
+}
+
+export {SyntaxHighlighter, styles}
diff --git a/src/core/utils.js b/src/core/utils.js
index f83f433bcff..772cce18d21 100644
--- a/src/core/utils.js
+++ b/src/core/utils.js
@@ -220,166 +220,6 @@ export function getList(iterable, keys) {
return Im.List.isList(val) ? val : Im.List()
}
-/**
- * Adapted from http://github.com/asvd/microlight
- * @copyright 2016 asvd
- */
-export function highlight (el) {
- const MAX_LENGTH = 5000
- var
- _document = document,
- appendChild = "appendChild",
- test = "test"
-
- if (!el) return ""
- if (el.textContent.length > MAX_LENGTH) { return el.textContent }
-
- var reset = function(el) {
- var text = el.textContent,
- pos = 0, // current position
- next1 = text[0], // next character
- chr = 1, // current character
- prev1, // previous character
- prev2, // the one before the previous
- token = // current token content
- el.innerHTML = "", // (and cleaning the node)
-
- // current token type:
- // 0: anything else (whitespaces / newlines)
- // 1: operator or brace
- // 2: closing braces (after which '/' is division not regex)
- // 3: (key)word
- // 4: regex
- // 5: string starting with "
- // 6: string starting with '
- // 7: xml comment
- // 8: multiline comment /* */
- // 9: single-line comment starting with two slashes //
- // 10: single-line comment starting with hash #
- tokenType = 0,
-
- // kept to determine between regex and division
- lastTokenType,
- // flag determining if token is multi-character
- multichar,
- node
-
- // running through characters and highlighting
- while (prev2 = prev1,
- // escaping if needed (with except for comments)
- // previous character will not be therefore
- // recognized as a token finalize condition
- prev1 = tokenType < 7 && prev1 == "\\" ? 1 : chr
- ) {
- chr = next1
- next1=text[++pos]
- multichar = token.length > 1
-
- // checking if current token should be finalized
- if (!chr || // end of content
- // types 9-10 (single-line comments) end with a
- // newline
- (tokenType > 8 && chr == "\n") ||
- [ // finalize conditions for other token types
- // 0: whitespaces
- /\S/[test](chr), // merged together
- // 1: operators
- 1, // consist of a single character
- // 2: braces
- 1, // consist of a single character
- // 3: (key)word
- !/[$\w]/[test](chr),
- // 4: regex
- (prev1 == "/" || prev1 == "\n") && multichar,
- // 5: string with "
- prev1 == "\"" && multichar,
- // 6: string with '
- prev1 == "'" && multichar,
- // 7: xml comment
- text[pos-4]+prev2+prev1 == "-->",
- // 8: multiline comment
- prev2+prev1 == "*/"
- ][tokenType]
- ) {
- // appending the token to the result
- if (token) {
- // remapping token type into style
- // (some types are highlighted similarly)
- el[appendChild](
- node = _document.createElement("span")
- ).setAttribute("class", [
- // 0: not formatted
- "token-not-formatted",
- // 1: keywords
- "",
- // 2: punctuation
- "",
- // 3: strings and regexps
- "token-string",
- // 4: comments
- ""
- ][
- // not formatted
- !tokenType ? 0 :
- // punctuation
- tokenType < 3 ? 2 :
- // comments
- tokenType > 6 ? 4 :
- // regex and strings
- tokenType > 3 ? 3 :
- // otherwise tokenType == 3, (key)word
- // (1 if regexp matches, 0 otherwise)
- + /^(a(bstract|lias|nd|rguments|rray|s(m|sert)?|uto)|b(ase|egin|ool(ean)?|reak|yte)|c(ase|atch|har|hecked|lass|lone|ompl|onst|ontinue)|de(bugger|cimal|clare|f(ault|er)?|init|l(egate|ete)?)|do|double|e(cho|ls?if|lse(if)?|nd|nsure|num|vent|x(cept|ec|p(licit|ort)|te(nds|nsion|rn)))|f(allthrough|alse|inal(ly)?|ixed|loat|or(each)?|riend|rom|unc(tion)?)|global|goto|guard|i(f|mp(lements|licit|ort)|n(it|clude(_once)?|line|out|stanceof|t(erface|ernal)?)?|s)|l(ambda|et|ock|ong)|m(icrolight|odule|utable)|NaN|n(amespace|ative|ext|ew|il|ot|ull)|o(bject|perator|r|ut|verride)|p(ackage|arams|rivate|rotected|rotocol|ublic)|r(aise|e(adonly|do|f|gister|peat|quire(_once)?|scue|strict|try|turn))|s(byte|ealed|elf|hort|igned|izeof|tatic|tring|truct|ubscript|uper|ynchronized|witch)|t(emplate|hen|his|hrows?|ransient|rue|ry|ype(alias|def|id|name|of))|u(n(checked|def(ined)?|ion|less|signed|til)|se|sing)|v(ar|irtual|oid|olatile)|w(char_t|hen|here|hile|ith)|xor|yield)$/[test](token)
- ])
-
- node[appendChild](_document.createTextNode(token))
- }
-
- // saving the previous token type
- // (skipping whitespaces and comments)
- lastTokenType =
- (tokenType && tokenType < 7) ?
- tokenType : lastTokenType
-
- // initializing a new token
- token = ""
-
- // determining the new token type (going up the
- // list until matching a token type start
- // condition)
- tokenType = 11
- while (![
- 1, // 0: whitespace
- // 1: operator or braces
- /[\/{}[(\-+*=<>:;|\\.,?!&@~]/[test](chr), // eslint-disable-line no-useless-escape
- /[\])]/[test](chr), // 2: closing brace
- /[$\w]/[test](chr), // 3: (key)word
- chr == "/" && // 4: regex
- // previous token was an
- // opening brace or an
- // operator (otherwise
- // division, not a regex)
- (lastTokenType < 2) &&
- // workaround for xml
- // closing tags
- prev1 != "<",
- chr == "\"", // 5: string with "
- chr == "'", // 6: string with '
- // 7: xml comment
- chr+next1+text[pos+1]+text[pos+2] == "