react-jsonschema-form-extras 0.9.70 → 0.9.73

package/lib/CollapsibleField.js

@@ -475,9 +475,17 @@ var CollapsibleField = function (_Component5) {
       //remove header elements from the schema
       var headerElementsSchemas = {};
       var propertiesNoHeader = _extends({}, properties);
-      var orderNoHeader = uiSchema["ui:order"] ? uiSchema["ui:order"].filter(function (x) {
-        return elements.indexOf(x) < 0;
-      }) : uiSchema["ui:order"];
+      var orderNoHeader = uiSchema["ui:order"];
+
+      if (orderNoHeader && orderNoHeader.filter) {
+        orderNoHeader = orderNoHeader.filter(function (x) {
+          return elements.indexOf(x) < 0;
+        });
+      } else if (orderNoHeader) {
+        orderNoHeader = [orderNoHeader].filter(function (x) {
+          return elements.indexOf(x) < 0;
+        });
+      }
 
       elements.forEach(function (key) {
         if (propertiesNoHeader[key]) {

package/lib/DraftRte.js

@@ -74,15 +74,15 @@ function mapFromObject(data, mapping, defVal) {
     return agg;
   }, defVal);
 }
-/**
- *
- * @param {*} data
- * @param {*} mapping
- * Mapped object is converted to the object mapping takes
+/**
+ *
+ * @param {*} data
+ * @param {*} mapping
+ * Mapped object is converted to the object mapping takes
  */
 function mapFromSchema(data, mapping) {
-  /* if (isEmpty(data)) {
-    return;
+  /* if (isEmpty(data)) {
+    return;
   } */
   if (!mapping || mapping === null) {
     return data;
@@ -95,11 +95,11 @@ function mapFromSchema(data, mapping) {
   }
 }
 
-/**
- *
- * @param {*} data
- * @param {*} mapping
- * prepare the String to display
+/**
+ *
+ * @param {*} data
+ * @param {*} mapping
+ * prepare the String to display
  */
 function optionToString(fields, separator) {
   return function (option) {
@@ -119,11 +119,11 @@ function optionToString(fields, separator) {
     }, "");
   };
 }
-/**
- *
- * @param {*} data
- * @param {*} mapping
- * maping the label
+/**
+ *
+ * @param {*} data
+ * @param {*} mapping
+ * maping the label
  */
 function mapLabelKey(labelKey) {
   if (Array.isArray(labelKey)) {
@@ -140,10 +140,10 @@ function mapLabelKey(labelKey) {
 var DraftRTE = function (_Component) {
   _inherits(DraftRTE, _Component);
 
-  /**
-   *
-   * @param {*} props
-   * Currently only supports HTML
+  /**
+   *
+   * @param {*} props
+   * Currently only supports HTML
    */
   function DraftRTE(props) {
     _classCallCheck(this, DraftRTE);
@@ -183,24 +183,24 @@ var DraftRTE = function (_Component) {
     };
     return _this;
   }
-  /**
-   * updates formData by calling parent's onChange function with current html content
+  /**
+   * updates formData by calling parent's onChange function with current html content
    */
 
 
-  /**
-   * handles editor's onChange
-   * handles logic to update form data based on props supplied to the component
+  /**
+   * handles editor's onChange
+   * handles logic to update form data based on props supplied to the component
    */
   //will only be executed if debounce is present
 
-  /**
-   * handles the logic to update formData on blur
+  /**
+   * handles the logic to update formData on blur
    */
 
 
-  /**
-   * handles the logic to load the suggestions on the time of focus
+  /**
+   * handles the logic to load the suggestions on the time of focus
    */
 
 
@@ -208,8 +208,8 @@ var DraftRTE = function (_Component) {
     key: "render",
 
 
-    /**
-     * react render function
+    /**
+     * react render function
      */
     value: function render() {
       var _this2 = this;

package/lib/TypeaheadField.js

@@ -154,11 +154,11 @@ function mapFromObject(data, mapping, defVal) {
     return agg;
   }, defVal);
 }
-/**
- *
- * @param {*} data
- * @param {*} mapping
- * Mapped object is converted to the object mapping takes
+/**
+ *
+ * @param {*} data
+ * @param {*} mapping
+ * Mapped object is converted to the object mapping takes
  */
 function mapFromSchema(data, mapping) {
   if (isEmpty(data)) {
@@ -223,9 +223,9 @@ function isFunction(functionToCheck) {
   return functionToCheck instanceof Function;
 }
 
-/*
- this is done to prevent an edge case with a typeahead wrapped inside a table that has an item selected & uses a function as a labelKey
- TODO: Need to find a better solution for this
+/*
+ this is done to prevent an edge case with a typeahead wrapped inside a table that has an item selected & uses a function as a labelKey
+ TODO: Need to find a better solution for this
  */
 function transformLabelKey(labelKey, schema, selected) {
   if (isFunction(labelKey) && selected && selected.length > 0 && schema.type === "string" && selected.every(function (x) {

package/lib/css/form-extras.css

@@ -1,10 +1,10 @@
-/*Collapsible header items*/
-.header-elements-wrapper {
-    align-items: center;
-    color: #fff;
-    display: inline-flex;
-    flex-direction: row;
-    justify-content: flex-start;
-    padding-left: 20px;
-    white-space: nowrap;
+/*Collapsible header items*/
+.header-elements-wrapper {
+    align-items: center;
+    color: #fff;
+    display: inline-flex;
+    flex-direction: row;
+    justify-content: flex-start;
+    padding-left: 20px;
+    white-space: nowrap;
   }

package/lib/table/index.js

@@ -283,9 +283,14 @@ var TableField = function (_Component) {
     key: "componentDidUpdate",
     value: function componentDidUpdate() {
       if (this.adding) {
-        var _props$uiSchema$table = this.props.uiSchema.table,
+        var _props = this.props,
+            _props$uiSchema$table = _props.uiSchema.table,
             focusOnAdd = _props$uiSchema$table.focusOnAdd,
-            focusRowIndex = _props$uiSchema$table.focusRowIndex;
+            focusRowIndex = _props$uiSchema$table.focusRowIndex,
+            _props$uiSchema$table2 = _props$uiSchema$table.tableCols,
+            tableCols = _props$uiSchema$table2 === undefined ? [] : _props$uiSchema$table2,
+            _props$formData = _props.formData,
+            formData = _props$formData === undefined ? [] : _props$formData;
 
 
         var body = this.refs.table.refs.body ? this.refs.table.refs.body : this.refs.table.body;
@@ -293,7 +298,19 @@ var TableField = function (_Component) {
           console.error("Can't find body in the table");
           return;
         }
-        body.handleEditCell(focusRowIndex ? focusRowIndex : this.props.formData.length, focusOnAdd);
+        var allowToFocusField = true;
+        if (focusOnAdd) {
+          var _ref2 = tableCols[focusOnAdd] || {},
+              _ref2$dataField = _ref2.dataField,
+              dataField = _ref2$dataField === undefined ? "" : _ref2$dataField;
+
+          var addedRowIndex = focusRowIndex ? focusRowIndex : this.props.formData.length;
+          var addedRow = formData[addedRowIndex - 1];
+          if (dataField !== "" && addedRow[dataField]) {
+            allowToFocusField = false;
+          }
+        }
+        body.handleEditCell(focusRowIndex ? focusRowIndex : this.props.formData.length, allowToFocusField ? focusOnAdd : undefined);
       }
     }
   }, {
@@ -304,11 +321,11 @@ var TableField = function (_Component) {
   }, {
     key: "myRowExpand",
     value: function myRowExpand(currentTableData) {
-      var _props = this.props,
-          _props$schema$items$p = _props.schema.items.properties,
-          properties = _props$schema$items$p === undefined ? [] : _props$schema$items$p,
-          _props$uiSchema$table2 = _props.uiSchema.table.tableCols,
-          tableCols = _props$uiSchema$table2 === undefined ? [] : _props$uiSchema$table2;
+      var _props2 = this.props,
+          _props2$schema$items$ = _props2.schema.items.properties,
+          properties = _props2$schema$items$ === undefined ? [] : _props2$schema$items$,
+          _props2$uiSchema$tabl = _props2.uiSchema.table.tableCols,
+          tableCols = _props2$uiSchema$tabl === undefined ? [] : _props2$uiSchema$tabl;
 
 
       var tableList = tableCols.map(function (item) {
@@ -428,9 +445,9 @@ var TableField = function (_Component) {
     }
   }, {
     key: "expandColumnComponent",
-    value: function expandColumnComponent(_ref2) {
-      var isExpandableRow = _ref2.isExpandableRow,
-          isExpanded = _ref2.isExpanded;
+    value: function expandColumnComponent(_ref3) {
+      var isExpandableRow = _ref3.isExpandableRow,
+          isExpanded = _ref3.isExpanded;
 
       var icon = _react2.default.createElement("span", { className: "fa fa-plus glyphicon" });
 
@@ -445,10 +462,10 @@ var TableField = function (_Component) {
     key: "getExpandableTableOptions",
     value: function getExpandableTableOptions() {
       if (this.props.uiSchema.table && (this.props.uiSchema.table.isTableExpandable || this.props.uiSchema.table.isTableExpandable !== undefined)) {
-        var _ref3 = this.props.uiSchema.table.expandableTableOptions || {},
-            _ref3$expandBy = _ref3.expandBy,
-            expandBy = _ref3$expandBy === undefined ? "column" : _ref3$expandBy,
-            otherTableOptions = _objectWithoutProperties(_ref3, ["expandBy"]); // expandableTableOptions is option from the uischema
+        var _ref4 = this.props.uiSchema.table.expandableTableOptions || {},
+            _ref4$expandBy = _ref4.expandBy,
+            expandBy = _ref4$expandBy === undefined ? "column" : _ref4$expandBy,
+            otherTableOptions = _objectWithoutProperties(_ref4, ["expandBy"]); // expandableTableOptions is option from the uischema
 
 
         return _extends({ expandBy: expandBy }, otherTableOptions);
@@ -457,16 +474,16 @@ var TableField = function (_Component) {
   }, {
     key: "render",
     value: function render() {
-      var _props2 = this.props,
-          uiSchema = _props2.uiSchema,
-          schema = _props2.schema,
-          formData = _props2.formData,
-          fields = _props2.registry.fields,
-          _props2$idSchema = _props2.idSchema;
-      _props2$idSchema = _props2$idSchema === undefined ? {} : _props2$idSchema;
-      var $id = _props2$idSchema.$id,
-          onChange = _props2.onChange,
-          selectedItems = _props2.selectedItems;
+      var _props3 = this.props,
+          uiSchema = _props3.uiSchema,
+          schema = _props3.schema,
+          formData = _props3.formData,
+          fields = _props3.registry.fields,
+          _props3$idSchema = _props3.idSchema;
+      _props3$idSchema = _props3$idSchema === undefined ? {} : _props3$idSchema;
+      var $id = _props3$idSchema.$id,
+          onChange = _props3.onChange,
+          selectedItems = _props3.selectedItems;
 
 
       var forceReRenderTable = this.forceReRenderTable;

package/lib/table/tableConfFactory.js

@@ -70,7 +70,9 @@ function tableConfFrom(_ref) {
       mode: "checkbox",
       selected: selectedItems,
       onSelect: handleRowSelect,
-      onSelectAll: handleAllRowSelect
+      onSelectAll: handleAllRowSelect,
+      onSelectRow: { fieldToUpdate: "picked" },
+      onSelectAllRow: { fieldToUpdate: "picked" }
     });
   }
 

package/package.json

@@ -1,138 +1,138 @@
-{
-  "name": "react-jsonschema-form-extras",
-  "description": "Extra widgets for Mozilla's react-jsonschema-form",
-  "private": false,
-  "author": "mavarazy@gmail.com",
-  "version": "0.9.70",
-  "scripts": {
-    "build:lib": "rimraf lib && cross-env NODE_ENV=production babel -d lib/ src/ --copy-files",
-    "build:dist": "rimraf dist && cross-env NODE_ENV=production webpack --config webpack.config.dist.js --optimize-minimize",
-    "build:playground": "rimraf build && cross-env NODE_ENV=production webpack --config webpack.config.prod.js --optimize-minimize && cp playground/index.prod.html build/index.html",
-    "cs-check": "prettier -l $npm_package_prettierOptions '{playground,src,test}/**/*.js'",
-    "cs-format": "prettier $npm_package_prettierOptions '{playground,src,test}/**/*.js' --write",
-    "dist": "npm run build:lib && npm run build:dist",
-    "lint": "eslint src test playground --fix",
-    "precommit": "lint-staged",
-    "publish-to-gh-pages": "npm run build:playground && gh-pages --dist build/",
-    "publish-to-npm": "npm run dist &&  npm publish && npm version patch",
-    "start": "webpack-dev-server",
-    "tdd": "jest --watchAll",
-    "test": "jest"
-  },
-  "jest": {
-    "verbose": true,
-    "collectCoverage": true
-  },
-  "prettierOptions": "--jsx-bracket-same-line --trailing-comma es5 --semi",
-  "lint-staged": {
-    "{playground,src,test}/**/*.js": [
-      "npm run lint",
-      "npm run cs-format",
-      "git add"
-    ]
-  },
-  "main": "lib/index.js",
-  "files": [
-    "lib",
-    "dist"
-  ],
-  "engineStrict": false,
-  "engines": {
-    "npm": "^5.0.4",
-    "node": ">=8.0.0"
-  },
-  "peerDependencies": {
-    "moment": "^2.20.0",
-    "prop-types": "^15.x",
-    "react": "^16.x",
-    "react-bootstrap-table": "^4.x",
-    "react-bootstrap-typeahead": "^3.3.2",
-    "react-day-picker": "^7.x",
-    "react-rte": "^0.15.0"
-  },
-  "dependencies": {
-    "classnames": "^2.2.6",
-    "draftjs-to-html": "^0.8.4",
-    "es6-shim": "^0.35.5",
-    "html-to-draftjs": "^1.4.0",
-    "lodash.debounce": "^4.0.8",
-    "react-draft-wysiwyg": "^1.12.13",
-    "react-render-html": "^0.6.0",
-    "selectn": "^1.1.2"
-  },
-  "devDependencies": {
-    "atob": "^2.1.1",
-    "babel-cli": "^6.0.0",
-    "babel-core": "^6.26.3",
-    "babel-eslint": "^8.0.1",
-    "babel-jest": "^21.2.0",
-    "babel-loader": "^7.1.2",
-    "babel-plugin-add-module-exports": "^0.2.1",
-    "babel-plugin-transform-class-properties": "^6.24.1",
-    "babel-plugin-transform-object-rest-spread": "^6.26.0",
-    "babel-polyfill": "^6.26.0",
-    "babel-preset-env": "^1.7.0",
-    "babel-preset-es2015": "^6.24.1",
-    "babel-preset-react": "^6.24.1",
-    "babel-preset-stage-2": "^6.24.1",
-    "babel-register": "^6.26.0",
-    "bootstrap": "^3.3.7",
-    "coveralls": "^3.0.0",
-    "cross-env": "^5.1.0",
-    "css-loader": "^0.28.7",
-    "eslint": "^4.9.0",
-    "eslint-plugin-jest": "^21.2.0",
-    "eslint-plugin-react": "^7.4.0",
-    "eslint-plugin-standard": "^3.0.1",
-    "exit-hook": "^1.1.1",
-    "express": "^4.16.2",
-    "extract-text-webpack-plugin": "^3.0.1",
-    "gh-pages": "^1.2.0",
-    "has-flag": "^2.0.0",
-    "html": "1.0.0",
-    "husky": "^0.14.3",
-    "istanbul-api": "1.2.2",
-    "istanbul-reports": "1.1.4",
-    "jest": "^23.6.0",
-    "jsdom": "^11.12.0",
-    "json-rules-engine-simplified": "^0.1.17",
-    "lint-staged": "^6.0.0",
-    "moment": "^2.20.1",
-    "prettier": "^1.7.4",
-    "react": "^16.0.0",
-    "react-bootstrap-table": "^4.3.0",
-    "react-bootstrap-typeahead": "^3.2.4",
-    "react-day-picker": "^7.0.5",
-    "react-dom": "^16.0.0",
-    "react-jsonschema-form": "^1.0.0",
-    "react-jsonschema-form-conditionals": "^0.3.15",
-    "react-rte": "^0.15.0",
-    "react-test-renderer": "^16.0.0",
-    "react-transform-catch-errors": "^1.0.2",
-    "react-transform-hmr": "^1.0.4",
-    "regenerator-runtime": "^0.11.0",
-    "rimraf": "^2.6.2",
-    "selectn": "^1.1.2",
-    "sinon": "^4.1.1",
-    "style-loader": "^0.19.0",
-    "webpack": "^3.9.1",
-    "webpack-dev-server": "^2.9.3",
-    "webpack-hot-middleware": "^2.20.0"
-  },
-  "directories": {
-    "test": "test"
-  },
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/RxNT/react-jsonschema-form-extras.git"
-  },
-  "keywords": [
-    "react",
-    "form",
-    "json-schema",
-    "conditional",
-    "predicate"
-  ],
-  "license": "Apache-2.0",
-  "homepage": "https://github.com/RxNT/react-jsonschema-form-extras#readme"
-}
+{
+  "name": "react-jsonschema-form-extras",
+  "description": "Extra widgets for Mozilla's react-jsonschema-form",
+  "private": false,
+  "author": "mavarazy@gmail.com",
+  "version": "0.9.73",
+  "scripts": {
+    "build:lib": "rimraf lib && cross-env NODE_ENV=production babel -d lib/ src/ --copy-files",
+    "build:dist": "rimraf dist && cross-env NODE_ENV=production webpack --config webpack.config.dist.js --optimize-minimize",
+    "build:playground": "rimraf build && cross-env NODE_ENV=production webpack --config webpack.config.prod.js --optimize-minimize && cp playground/index.prod.html build/index.html",
+    "cs-check": "prettier -l $npm_package_prettierOptions '{playground,src,test}/**/*.js'",
+    "cs-format": "prettier $npm_package_prettierOptions '{playground,src,test}/**/*.js' --write",
+    "dist": "npm run build:lib && npm run build:dist",
+    "lint": "eslint src test playground --fix",
+    "precommit": "lint-staged",
+    "publish-to-gh-pages": "npm run build:playground && gh-pages --dist build/",
+    "publish-to-npm": "npm run dist &&  npm publish && npm version patch",
+    "start": "webpack-dev-server",
+    "tdd": "jest --watchAll",
+    "test": "jest"
+  },
+  "jest": {
+    "verbose": true,
+    "collectCoverage": true
+  },
+  "prettierOptions": "--jsx-bracket-same-line --trailing-comma es5 --semi",
+  "lint-staged": {
+    "{playground,src,test}/**/*.js": [
+      "npm run lint",
+      "npm run cs-format",
+      "git add"
+    ]
+  },
+  "main": "lib/index.js",
+  "files": [
+    "lib",
+    "dist"
+  ],
+  "engineStrict": false,
+  "engines": {
+    "npm": "^5.0.4",
+    "node": ">=8.0.0"
+  },
+  "peerDependencies": {
+    "moment": "^2.20.0",
+    "prop-types": "^15.x",
+    "react": "^16.x",
+    "react-bootstrap-table": "^4.x",
+    "react-bootstrap-typeahead": "^3.3.2",
+    "react-day-picker": "^7.x",
+    "react-rte": "^0.15.0"
+  },
+  "dependencies": {
+    "classnames": "^2.2.6",
+    "draftjs-to-html": "^0.8.4",
+    "es6-shim": "^0.35.5",
+    "html-to-draftjs": "^1.4.0",
+    "lodash.debounce": "^4.0.8",
+    "react-draft-wysiwyg": "^1.12.13",
+    "react-render-html": "^0.6.0",
+    "selectn": "^1.1.2"
+  },
+  "devDependencies": {
+    "atob": "^2.1.1",
+    "babel-cli": "^6.0.0",
+    "babel-core": "^6.26.3",
+    "babel-eslint": "^8.0.1",
+    "babel-jest": "^21.2.0",
+    "babel-loader": "^7.1.2",
+    "babel-plugin-add-module-exports": "^0.2.1",
+    "babel-plugin-transform-class-properties": "^6.24.1",
+    "babel-plugin-transform-object-rest-spread": "^6.26.0",
+    "babel-polyfill": "^6.26.0",
+    "babel-preset-env": "^1.7.0",
+    "babel-preset-es2015": "^6.24.1",
+    "babel-preset-react": "^6.24.1",
+    "babel-preset-stage-2": "^6.24.1",
+    "babel-register": "^6.26.0",
+    "bootstrap": "^3.3.7",
+    "coveralls": "^3.0.0",
+    "cross-env": "^5.1.0",
+    "css-loader": "^0.28.7",
+    "eslint": "^4.9.0",
+    "eslint-plugin-jest": "^21.2.0",
+    "eslint-plugin-react": "^7.4.0",
+    "eslint-plugin-standard": "^3.0.1",
+    "exit-hook": "^1.1.1",
+    "express": "^4.16.2",
+    "extract-text-webpack-plugin": "^3.0.1",
+    "gh-pages": "^1.2.0",
+    "has-flag": "^2.0.0",
+    "html": "1.0.0",
+    "husky": "^0.14.3",
+    "istanbul-api": "1.2.2",
+    "istanbul-reports": "1.1.4",
+    "jest": "^23.6.0",
+    "jsdom": "^11.12.0",
+    "json-rules-engine-simplified": "^0.1.17",
+    "lint-staged": "^6.0.0",
+    "moment": "^2.20.1",
+    "prettier": "^1.7.4",
+    "react": "^16.0.0",
+    "react-bootstrap-table": "^4.3.0",
+    "react-bootstrap-typeahead": "^3.2.4",
+    "react-day-picker": "^7.0.5",
+    "react-dom": "^16.0.0",
+    "react-jsonschema-form": "^1.0.0",
+    "react-jsonschema-form-conditionals": "^0.3.15",
+    "react-rte": "^0.15.0",
+    "react-test-renderer": "^16.0.0",
+    "react-transform-catch-errors": "^1.0.2",
+    "react-transform-hmr": "^1.0.4",
+    "regenerator-runtime": "^0.11.0",
+    "rimraf": "^2.6.2",
+    "selectn": "^1.1.2",
+    "sinon": "^4.1.1",
+    "style-loader": "^0.19.0",
+    "webpack": "^3.9.1",
+    "webpack-dev-server": "^2.9.3",
+    "webpack-hot-middleware": "^2.20.0"
+  },
+  "directories": {
+    "test": "test"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/RxNT/react-jsonschema-form-extras.git"
+  },
+  "keywords": [
+    "react",
+    "form",
+    "json-schema",
+    "conditional",
+    "predicate"
+  ],
+  "license": "Apache-2.0",
+  "homepage": "https://github.com/RxNT/react-jsonschema-form-extras#readme"
+}