Merge branch 'master' into master

mac-s-g · Jul 5, 2018 · 2616eee · 2616eee
2 parents cc4a901 + 8461ae1
commit 2616eee
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/package.json b/package.json
@@ -55,13 +55,17 @@
         "react-dom": "^16.0.0 || ^15.5.4"
     },
     "scripts": {
-        "build": "webpack --config webpack/webpack.config.js -p --display-error-details --progress --optimize-minimize",
+        "build":
+            "webpack --config webpack/webpack.config.js -p --display-error-details --progress --optimize-minimize",
         "prebuild": "npm run test:unit",
-        "build:demo": "webpack --config webpack/webpack.config-demo.js -p --display-error-details --progress --optimize-minimize",
-        "dev": "webpack-dev-server --config webpack/webpack.config-dev.js --open",
+        "build:demo":
+            "webpack --config webpack/webpack.config-demo.js -p --display-error-details --progress --optimize-minimize",
+        "dev":
+            "webpack-dev-server --config webpack/webpack.config-dev.js --open",
         "modules:debug": "./docker/debug.sh",
         "modules:tree": "webpack --config webpack/webpack.config.js --json ",
-        "modules:size-analyzer": "webpack --config webpack/webpack.config.js --json | webpack-bundle-size-analyzer",
+        "modules:size-analyzer":
+            "webpack --config webpack/webpack.config.js --json | webpack-bundle-size-analyzer",
         "test": "npm run test:unit && npm run test:coverage",
         "test:unit": "nyc mocha test/**/*-test.js",
         "test:coverage": "nyc report --reporter=text-lcov | coveralls",

diff --git a/src/js/index.js b/src/js/index.js
@@ -25,6 +25,7 @@ class ReactJsonView extends React.PureComponent {
             src: ReactJsonView.defaultProps.src,
             name: ReactJsonView.defaultProps.name,
             theme: ReactJsonView.defaultProps.theme,
+            validationMessage: ReactJsonView.defaultProps.validationMessage,
             // the state object also needs to remember the prev prop values, because we need to compare
             // old and new props in getDerivedStateFromProps().
             prevSrc: ReactJsonView.defaultProps.src,
@@ -71,6 +72,7 @@ class ReactJsonView extends React.PureComponent {
                 src: nextProps.src,
                 name: nextProps.name,
                 theme: nextProps.theme,
+                validationMessage: nextProps.validationMessage,
                 prevSrc: nextProps.src,
                 prevName: nextProps.name,
                 prevTheme: nextProps.theme