From 681c18ad430c49c4fb12f32e77ac8a5083ad7800 Mon Sep 17 00:00:00 2001 From: jariwalabhavesh Date: Fri, 10 Mar 2017 14:38:30 +0530 Subject: [PATCH 01/14] Replace fieldset with div --- src/components/fields/ObjectField.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/fields/ObjectField.js b/src/components/fields/ObjectField.js index 1d63bb72aa..b75a62f713 100644 --- a/src/components/fields/ObjectField.js +++ b/src/components/fields/ObjectField.js @@ -63,7 +63,7 @@ class ObjectField extends Component { ); } return ( -
+
{title && ); })} -
+ ); } } From fdca7cfb96a7c6cbd5d6eb3341fccd029a63f829 Mon Sep 17 00:00:00 2001 From: jariwalabhavesh Date: Fri, 10 Mar 2017 14:40:45 +0530 Subject: [PATCH 02/14] Added field class to fieldset dic --- src/components/fields/ObjectField.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/fields/ObjectField.js b/src/components/fields/ObjectField.js index b75a62f713..0d4101efee 100644 --- a/src/components/fields/ObjectField.js +++ b/src/components/fields/ObjectField.js @@ -63,7 +63,7 @@ class ObjectField extends Component { ); } return ( -
+
{title && Date: Fri, 10 Mar 2017 15:01:40 +0530 Subject: [PATCH 03/14] Preinstall script --- package.json | 1 + 1 file changed, 1 insertion(+) diff --git a/package.json b/package.json index e0f9446359..9344a32703 100644 --- a/package.json +++ b/package.json @@ -10,6 +10,7 @@ "cs-check": "prettier-check --jsx-bracket-same-line '{playground,src,test}/**/*.js'", "cs-format": "prettier --jsx-bracket-same-line '{playground,src,test}/**/*.js' --write", "dist": "npm run build:lib && npm run build:dist", + "preinstall": "npm run build:lib && npm run build:dist", "lint": "eslint src test playground", "publish-to-gh-pages": "npm run build:playground && gh-pages --dist build/", "publish-to-npm": "npm run build:readme && npm run dist && npm publish", From 8741c09ef75c208fc1aaeb49a1c050c9042ae155 Mon Sep 17 00:00:00 2001 From: jariwalabhavesh Date: Fri, 10 Mar 2017 15:09:16 +0530 Subject: [PATCH 04/14] post script added --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 9344a32703..23f8098af8 100644 --- a/package.json +++ b/package.json @@ -10,7 +10,7 @@ "cs-check": "prettier-check --jsx-bracket-same-line '{playground,src,test}/**/*.js'", "cs-format": "prettier --jsx-bracket-same-line '{playground,src,test}/**/*.js' --write", "dist": "npm run build:lib && npm run build:dist", - "preinstall": "npm run build:lib && npm run build:dist", + "postinstall": "npm run dist", "lint": "eslint src test playground", "publish-to-gh-pages": "npm run build:playground && gh-pages --dist build/", "publish-to-npm": "npm run build:readme && npm run dist && npm publish", From 4e469c3be344cbab60838ad491a8aa655cc12cfa Mon Sep 17 00:00:00 2001 From: jariwalabhavesh Date: Fri, 10 Mar 2017 15:30:34 +0530 Subject: [PATCH 05/14] class to className --- src/components/fields/ObjectField.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/fields/ObjectField.js b/src/components/fields/ObjectField.js index 0d4101efee..bfdbf0e978 100644 --- a/src/components/fields/ObjectField.js +++ b/src/components/fields/ObjectField.js @@ -63,7 +63,7 @@ class ObjectField extends Component { ); } return ( -
+
{title && Date: Fri, 10 Mar 2017 15:52:13 +0530 Subject: [PATCH 06/14] Removed class for root element --- src/components/fields/ObjectField.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/fields/ObjectField.js b/src/components/fields/ObjectField.js index bfdbf0e978..1362eef8f0 100644 --- a/src/components/fields/ObjectField.js +++ b/src/components/fields/ObjectField.js @@ -63,7 +63,7 @@ class ObjectField extends Component { ); } return ( -
+
{title && Date: Fri, 10 Mar 2017 16:12:45 +0530 Subject: [PATCH 07/14] #439 reverted --- src/components/fields/SchemaField.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/fields/SchemaField.js b/src/components/fields/SchemaField.js index 7ecc96c41b..a9694c3075 100644 --- a/src/components/fields/SchemaField.js +++ b/src/components/fields/SchemaField.js @@ -170,7 +170,7 @@ function SchemaFieldRender(props) { Date: Fri, 10 Mar 2017 16:37:22 +0530 Subject: [PATCH 08/14] added class sent from frontend --- src/components/fields/ObjectField.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/components/fields/ObjectField.js b/src/components/fields/ObjectField.js index 1362eef8f0..61e23f4954 100644 --- a/src/components/fields/ObjectField.js +++ b/src/components/fields/ObjectField.js @@ -62,8 +62,9 @@ class ObjectField extends Component {
); } + const finalClass = (this.props.uiSchema && this.props.uiSchema.classNames)?this.props.uiSchema.classNames:""; return ( -
+
{title && Date: Fri, 10 Mar 2017 17:04:14 +0530 Subject: [PATCH 09/14] Removed class from object schema div --- src/components/fields/SchemaField.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/components/fields/SchemaField.js b/src/components/fields/SchemaField.js index a9694c3075..521fe95587 100644 --- a/src/components/fields/SchemaField.js +++ b/src/components/fields/SchemaField.js @@ -190,8 +190,7 @@ function SchemaFieldRender(props) { "form-group", "field", `field-${type}`, - errors && errors.length > 0 ? "field-error has-error has-danger" : "", - uiSchema.classNames + errors && errors.length > 0 ? "field-error has-error has-danger" : "" ] .join(" ") .trim(); From e15821b7adee7dfc5dd8c1556e9cf9dd43ec14b4 Mon Sep 17 00:00:00 2001 From: jariwalabhavesh Date: Sat, 11 Mar 2017 10:44:35 +0530 Subject: [PATCH 10/14] className accessing from schema className accessing from schema instead of uiSchema --- src/components/fields/ObjectField.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/fields/ObjectField.js b/src/components/fields/ObjectField.js index 61e23f4954..506d9a3045 100644 --- a/src/components/fields/ObjectField.js +++ b/src/components/fields/ObjectField.js @@ -62,7 +62,7 @@ class ObjectField extends Component {
); } - const finalClass = (this.props.uiSchema && this.props.uiSchema.classNames)?this.props.uiSchema.classNames:""; + const finalClass = (this.props.schema && this.props.schema.classNames)?this.props.schema.classNames:""; return (
{title && From fc5b4d227d09914285bfe01801f100eb9b05e483 Mon Sep 17 00:00:00 2001 From: jariwalabhavesh Date: Sat, 11 Mar 2017 11:19:59 +0530 Subject: [PATCH 11/14] Reverted some changes --- src/components/fields/SchemaField.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/components/fields/SchemaField.js b/src/components/fields/SchemaField.js index 521fe95587..7ecc96c41b 100644 --- a/src/components/fields/SchemaField.js +++ b/src/components/fields/SchemaField.js @@ -170,7 +170,7 @@ function SchemaFieldRender(props) { 0 ? "field-error has-error has-danger" : "" + errors && errors.length > 0 ? "field-error has-error has-danger" : "", + uiSchema.classNames ] .join(" ") .trim(); From 2f59ac177d029c10e67b585f6e9512542d1c0537 Mon Sep 17 00:00:00 2001 From: Nachiket Patel Date: Thu, 27 Apr 2017 14:13:32 +0530 Subject: [PATCH 12/14] package.json changes -url changes -postintstall script rmoved --- package.json | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index 23f8098af8..ecd1abb14c 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { - "name": "react-jsonschema-form", + "name": "jb-react-jsonschema-form", "version": "0.43.0", "description": "A simple React component capable of building HTML forms out of a JSON schema.", "scripts": { @@ -10,7 +10,6 @@ "cs-check": "prettier-check --jsx-bracket-same-line '{playground,src,test}/**/*.js'", "cs-format": "prettier --jsx-bracket-same-line '{playground,src,test}/**/*.js' --write", "dist": "npm run build:lib && npm run build:dist", - "postinstall": "npm run dist", "lint": "eslint src test playground", "publish-to-gh-pages": "npm run build:playground && gh-pages --dist build/", "publish-to-npm": "npm run build:readme && npm run dist && npm publish", @@ -29,7 +28,7 @@ "node": ">=6" }, "peerDependencies": { - "react": "^15.0.0" + "react": "^15.0.0""https://github.com/mozilla-services/react-jsonschema-form }, "dependencies": { "jsonschema": "^1.0.2", @@ -71,7 +70,7 @@ "react-transform-catch-errors": "^1.0.0", "react-transform-hmr": "^1.0.1", "redbox-react": "^1.3.3", - "rimraf": "^2.5.4", + "rimraf": "^2.5.4","https://github.com/mozilla-services/react-jsonschema-form "sinon": "^1.17.6", "style-loader": "^0.13.1", "toctoc": "^0.2.3", @@ -84,7 +83,7 @@ }, "repository": { "type": "git", - "url": "git+https://github.com/mozilla-services/react-jsonschema-form.git" + "url": "git+https://github.com/jumpbytehq/react-jsonschema-form.git" }, "author": "Nicolas Perriault ", "keywords": [ @@ -93,5 +92,5 @@ "json-schema" ], "license": "Apache-2.0", - "homepage": "https://github.com/mozilla-services/react-jsonschema-form#readme" + "homepage": "https://github.com/jumpbytehq/react-jsonschema-form#readme" } From 86f848abf2c2baa48eb1ad017165ab172bf08682 Mon Sep 17 00:00:00 2001 From: Nachiket Patel Date: Thu, 27 Apr 2017 14:24:06 +0530 Subject: [PATCH 13/14] Update package.json --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index ecd1abb14c..19c8df5813 100644 --- a/package.json +++ b/package.json @@ -28,7 +28,7 @@ "node": ">=6" }, "peerDependencies": { - "react": "^15.0.0""https://github.com/mozilla-services/react-jsonschema-form + "react": "^15.0.0" }, "dependencies": { "jsonschema": "^1.0.2", @@ -70,7 +70,7 @@ "react-transform-catch-errors": "^1.0.0", "react-transform-hmr": "^1.0.1", "redbox-react": "^1.3.3", - "rimraf": "^2.5.4","https://github.com/mozilla-services/react-jsonschema-form + "rimraf": "^2.5.4", "sinon": "^1.17.6", "style-loader": "^0.13.1", "toctoc": "^0.2.3", From 4b731c3a0b0167659f7667a1ad1d9157d3f2a04d Mon Sep 17 00:00:00 2001 From: Tanisha Date: Wed, 2 Aug 2017 12:12:29 +0530 Subject: [PATCH 14/14] remove validation on array element remove or reorder --- src/components/fields/ArrayField.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/fields/ArrayField.js b/src/components/fields/ArrayField.js index 67f7b44ba7..8009793bca 100644 --- a/src/components/fields/ArrayField.js +++ b/src/components/fields/ArrayField.js @@ -221,7 +221,7 @@ class ArrayField extends Component { } const { formData, onChange } = this.props; // refs #195: revalidate to ensure properly reindexing errors - onChange(formData.filter((_, i) => i !== index), { validate: true }); + onChange(formData.filter((_, i) => i !== index), { validate: false }); }; }; @@ -242,7 +242,7 @@ class ArrayField extends Component { return item; } }), - { validate: true } + { validate: false } ); }; };