react-jsonschema-form-extras 0.9.65 → 0.9.69

package/lib/table/index.js

@@ -92,32 +92,6 @@ function getFieldValue(cellValue, type, format, dataFormat) {
   }
   return cellValue;
 }
-function isEquivalentObject(a, b) {
-  // Create arrays of property names
-  var aProps = Object.getOwnPropertyNames(a);
-  var bProps = Object.getOwnPropertyNames(b);
-
-  // If number of properties is different,
-  // objects are not equivalent
-  if (aProps.length != bProps.length) {
-    return false;
-  }
-
-  for (var i = 0; i < aProps.length; i++) {
-    var propName = aProps[i];
-
-    // If values of same property are not equal,
-    // objects are not equivalent
-    if (a[propName] !== b[propName]) {
-      return false;
-    }
-  }
-
-  // If we made it this far, objects
-  // are considered equivalent
-
-  return true;
-}
 
 var TableField = function (_Component) {
   _inherits(TableField, _Component);
@@ -255,31 +229,35 @@ var TableField = function (_Component) {
   }, {
     key: "handleRowSelect",
     value: function handleRowSelect(row, isSelected, e) {
+      var onChange = this.props.onChange;
       var _tableConf3 = this.tableConf,
-          data = _tableConf3.data,
+          _tableConf3$data = _tableConf3.data,
+          data = _tableConf3$data === undefined ? [] : _tableConf3$data,
           _tableConf3$selectRow = _tableConf3.selectRow.onSelectRow.fieldToUpdate,
           fieldToUpdate = _tableConf3$selectRow === undefined ? "picked" : _tableConf3$selectRow;
 
-      var filteredRows = (data || []).map(function (item) {
-        if (!isSelected && item[fieldToUpdate] !== undefined) {
-          if (isEquivalentObject(item, row)) {
-            delete item[fieldToUpdate];
-          }
-        } else if (isEquivalentObject(item, row)) {
-          item[fieldToUpdate] = isSelected;
-        }
-        return item;
-      });
-      this.props.onChange(filteredRows);
+
+      row.isRowSelected = isSelected;
+
+      if (!isSelected) {
+        delete row[fieldToUpdate];
+      } else {
+        row[fieldToUpdate] = isSelected;
+      }
+
+      onChange(data);
     }
   }, {
     key: "handleAllRowSelect",
     value: function handleAllRowSelect(isSelected, rows, e) {
-      var _tableConf$selectRow$ = this.tableConf.selectRow.onSelectAllRow.fieldToUpdate,
-          fieldToUpdate = _tableConf$selectRow$ === undefined ? "picked" : _tableConf$selectRow$;
+      var _tableConf4 = this.tableConf,
+          data = _tableConf4.data,
+          _tableConf4$selectRow = _tableConf4.selectRow.onSelectAllRow.fieldToUpdate,
+          fieldToUpdate = _tableConf4$selectRow === undefined ? "picked" : _tableConf4$selectRow;
 
 
-      var filteredRows = (rows || []).map(function (item) {
+      var filteredRows = data.map(function (item) {
+        item.isRowSelected = isSelected;
         if (!isSelected && item[fieldToUpdate] !== undefined) {
           delete item[fieldToUpdate];
         } else {
@@ -487,12 +465,14 @@ var TableField = function (_Component) {
           _props2$idSchema = _props2.idSchema;
       _props2$idSchema = _props2$idSchema === undefined ? {} : _props2$idSchema;
       var $id = _props2$idSchema.$id,
-          onChange = _props2.onChange;
+          onChange = _props2.onChange,
+          selectedItems = _props2.selectedItems;
 
 
       var forceReRenderTable = this.forceReRenderTable;
 
-      this.tableConf = (0, _tableConfFactory2.default)(uiSchema, formData, this.handleCellSave, this.handleRowsDelete, this.handleDeletedRow, this.handleRowSelect, this.handleAllRowSelect, this.myRowExpand, this.isRowExpandable, this.expandColumnComponent);
+      this.tableConf = (0, _tableConfFactory2.default)(uiSchema, formData, this.handleCellSave, this.handleRowsDelete, this.handleDeletedRow, this.handleRowSelect, this.handleAllRowSelect, this.myRowExpand, this.isRowExpandable, this.expandColumnComponent, selectedItems);
+
       var expandableTableOptions = this.getExpandableTableOptions();
       this.tableConf.options.insertModal = this.createCustomModal;
       var boostrapTableOptions = _extends({
@@ -508,7 +488,10 @@ var TableField = function (_Component) {
         { id: $id },
         _react2.default.createElement(
           _reactBootstrapTable.BootstrapTable,
-          _extends({}, this.tableConf, { trClassName: this.handleRowColorChange, ref: "table" }),
+          _extends({}, this.tableConf, {
+            trClassName: this.handleRowColorChange,
+            ref: "table"
+          }),
           columns.map(function (column, i) {
             return _react2.default.createElement(
               _reactBootstrapTable.TableHeaderColumn,

package/lib/table/tableConfFactory.js

@@ -54,6 +54,7 @@ function tableConfFrom(_ref) {
   var myRowExpand = arguments[7];
   var isRowExpandable = arguments[8];
   var expandColumnComponent = arguments[9];
+  var selectedItems = arguments[10];
   var _table$keyField = table.keyField,
       keyField = _table$keyField === undefined ? POSITION_KEY : _table$keyField;
 
@@ -61,16 +62,31 @@ function tableConfFrom(_ref) {
     formData = addPosition(formData);
   }
 
+  if (!table.selectRow && selectedItems) {
+    table.selectRow = {
+      mode: "checkbox"
+    };
+  }
+
+  if (selectedItems) {
+    table.selectRow.onSelectRow = true, table.selectRow.onSelectAllRow = true;
+  }
+
+  table.selectRow.selected = selectedItems;
+
   var tableConf = Object.assign({ data: formData }, (0, _utils.deepCopy)(DEFAULT_TABLE_CONF), table, { keyField: keyField });
   tableConf.cellEdit.afterSaveCell = afterSaveCell;
   tableConf.options.afterDeleteRow = afterDeleteRow;
   tableConf.trClassName = highlightAfterDelete;
-  if (tableConf.selectRow !== undefined && tableConf.selectRow.onSelectRow !== undefined) {
+
+  if (tableConf.selectRow && tableConf.selectRow.onSelectRow) {
     tableConf.selectRow.onSelect = handleRowSelect;
   }
-  if (tableConf.selectRow !== undefined && tableConf.selectRow.onSelectAllRow !== undefined) {
+
+  if (tableConf.selectRow && tableConf.selectRow.onSelectAllRow) {
     tableConf.selectRow.onSelectAll = handleAllRowSelect;
   }
+
   var _table$isTableExpanda = table.isTableExpandable,
       isTableExpandable = _table$isTableExpanda === undefined ? false : _table$isTableExpanda,
       _table$allowOneRowExp = table.allowOneRowExpanding,

package/lib/utils.js

@@ -9,6 +9,7 @@ exports.isArraySchema = isArraySchema;
 exports.isStringSchema = isStringSchema;
 exports.isNumberSchema = isNumberSchema;
 exports.getDefaultValueForSchema = getDefaultValueForSchema;
+exports.getFieldName = getFieldName;
 exports.deepCopy = deepCopy;
 function toArray(el) {
   if (Array.isArray(el)) {
@@ -53,6 +54,19 @@ function getDefaultValueForSchema(schema) {
   return "";
 }
 
+function getFieldName(name) {
+  var DEFAULT_COMPONENT_TYPES = {
+    array: "ArrayField",
+    boolean: "BooleanField",
+    integer: "NumberField",
+    number: "NumberField",
+    object: "ObjectField",
+    string: "StringField"
+  };
+
+  return DEFAULT_COMPONENT_TYPES["" + name] || name;
+}
+
 function deepCopy(obj) {
   return JSON.parse(JSON.stringify(obj));
 }

package/package.json

@@ -1,136 +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.65",
-  "scripts": {
-    "build:lib": "rimraf lib && cross-env NODE_ENV=production babel -d lib/ src/",
-    "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",
-    "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",
-    "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-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.69",
+  "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"
+}