formio · Jan 23, 2020 · Jan 24, 2020 · Jan 24, 2020 · Apr 27, 2020 · Apr 27, 2020
diff --git a/.gitignore b/.gitignore
@@ -2,5 +2,4 @@
 *.log
 node_modules
 bower_components
-lib
 .idea
diff --git a/Changelog.md b/Changelog.md
@@ -4,27 +4,6 @@ All notable changes to this project will be documented in this file
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
-## 5.0.0-alpha.1
-### Changed
- - Refactored to work with latest React version.
-
-## 4.3.0
-### Changed
- - Upgrade formio.js to 4.9.0.
-
-## 4.2.6
-### Changed
- - Update dependencies for security updates.
-
-## 4.2.5
-### Fixed
- - Check validity return correct value.
-
-## 4.2.4
-### Fixed
- - Empty wizard change event.
- - Project access not setting correctly in auth state.
-
 ## 4.2.3
 ### Fixed
  - Change event on builder.

diff --git a/README.md b/README.md
@@ -15,7 +15,6 @@ npm-compatible packaging system such as [Browserify](http://browserify.org/) or
 
 ```
 npm install react-formio --save
-npm install formiojs --save // Install formiojs since it is a peerDependency
 ```
 
 ## Components
@@ -87,7 +86,7 @@ Please note that the FormBuilder component does not load and save from/to a url.
 | ```onSaveComponent``` | ```component```: object | Triggered when the component settings dialog is saved and closed |
 | ```onCancelComponent``` | ```component```: object | Triggered when the component settings dialog is cancelled |
 | ```onDeleteComponent``` | ```component```: object | Triggered when a component is removed from the form |
-| ```onUpdateComponent``` | ```component```: object | Triggered when a component is added or moved in the form |
+| ```updateComponent``` | ```component```: object | Triggered when a component is added or moved in the form |
 
 
 #### Example

diff --git a/lib/components/Errors.js b/lib/components/Errors.js
@@ -0,0 +1,125 @@
+'use strict';
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+
+var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }();
+
+var _react = require('react');
+
+var _react2 = _interopRequireDefault(_react);
+
+var _propTypes = require('prop-types');
+
+var _propTypes2 = _interopRequireDefault(_propTypes);
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
+
+function _possibleConstructorReturn(self, call) { if (!self) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return call && (typeof call === "object" || typeof call === "function") ? call : self; }
+
+function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function, not " + typeof superClass); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, enumerable: false, writable: true, configurable: true } }); if (superClass) Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : subClass.__proto__ = superClass; }
+
+var Errors = function (_Component) {
+  _inherits(Errors, _Component);
+
+  function Errors() {
+    _classCallCheck(this, Errors);
+
+    return _possibleConstructorReturn(this, (Errors.__proto__ || Object.getPrototypeOf(Errors)).apply(this, arguments));
+  }
+
+  _createClass(Errors, [{
+    key: 'hasErrors',
+    value: function hasErrors(error) {
+      if (Array.isArray(error)) {
+        return error.filter(function (item) {
+          return !!item;
+        }).length !== 0;
+      }
+
+      return !!error;
+    }
+  }, {
+    key: 'formatError',
+    value: function formatError(error) {
+      if (typeof error === 'string') {
+        return error;
+      }
+
+      if (Array.isArray(error)) {
+        return error.map(this.formatError);
+      }
+
+      if (error.hasOwnProperty('errors')) {
+        return Object.keys(error.errors).map(function (key, index) {
+          var item = error.errors[key];
+          return _react2.default.createElement(
+            'div',
+            { key: index },
+            _react2.default.createElement(
+              'strong',
+              null,
+              item.name,
+              ' (',
+              item.path,
+              ')'
+            ),
+            ' - ',
+            item.message
+          );
+        });
+      }
+
+      // If this is a standard error.
+      if (error.hasOwnProperty('message')) {
+        return error.message;
+      }
+
+      // If this is a joy validation error.
+      if (error.hasOwnProperty('name') && error.name === 'ValidationError') {
+        return error.details.map(function (item, index) {
+          return _react2.default.createElement(
+            'div',
+            { key: index },
+            item.message
+          );
+        });
+      }
+
+      // If a conflict error occurs on a form, the form is returned.
+      if (error.hasOwnProperty('_id') && error.hasOwnProperty('display')) {
+        return 'Another user has saved this form already. Please reload and re-apply your changes.';
+      }
+
+      return 'An error occurred. See console logs for details.';
+    }
+  }, {
+    key: 'render',
+    value: function render() {
+      // If there are no errors, don't render anything.
+      if (!this.hasErrors(this.props.errors)) {
+        return null;
+      }
+
+      return _react2.default.createElement(
+        'div',
+        { className: 'alert alert-' + this.props.type, role: 'alert' },
+        this.formatError(this.props.errors)
+      );
+    }
+  }]);
+
+  return Errors;
+}(_react.Component);
+
+Errors.propTypes = {
+  errors: _propTypes2.default.any,
+  type: _propTypes2.default.string
+};
+Errors.defaultProps = {
+  type: 'danger'
+};
+exports.default = Errors;
diff --git a/lib/components/Form.js b/lib/components/Form.js
@@ -0,0 +1,215 @@
+'use strict';
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+
+var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }();
+
+var _react = require('react');
+
+var _react2 = _interopRequireDefault(_react);
+
+var _propTypes = require('prop-types');
+
+var _propTypes2 = _interopRequireDefault(_propTypes);
+
+var _eventemitter = require('eventemitter2');
+
+var _eventemitter2 = _interopRequireDefault(_eventemitter);
+
+var _components = require('formiojs/lib/components');
+
+var _components2 = _interopRequireDefault(_components);
+
+var _Components = require('formiojs/lib/components/Components');
+
+var _Components2 = _interopRequireDefault(_Components);
+
+var _Form = require('formiojs/lib/Form');
+
+var _Form2 = _interopRequireDefault(_Form);
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
+
+function _possibleConstructorReturn(self, call) { if (!self) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return call && (typeof call === "object" || typeof call === "function") ? call : self; }
+
+function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function, not " + typeof superClass); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, enumerable: false, writable: true, configurable: true } }); if (superClass) Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : subClass.__proto__ = superClass; }
+
+_Components2.default.setComponents(_components2.default);
+
+var Form = function (_Component) {
+  _inherits(Form, _Component);
+
+  function Form() {
+    var _ref;
+
+    var _temp, _this, _ret;
+
+    _classCallCheck(this, Form);
+
+    for (var _len = arguments.length, args = Array(_len), _key = 0; _key < _len; _key++) {
+      args[_key] = arguments[_key];
+    }
+
+    return _ret = (_temp = (_this = _possibleConstructorReturn(this, (_ref = Form.__proto__ || Object.getPrototypeOf(Form)).call.apply(_ref, [this].concat(args))), _this), _initialiseProps.call(_this), _temp), _possibleConstructorReturn(_this, _ret);
+  }
+
+  _createClass(Form, null, [{
+    key: 'getDefaultEmitter',
+    value: function getDefaultEmitter() {
+      return new _eventemitter2.default({
+        wildcard: false,
+        maxListeners: 0
+      });
+    }
+  }]);
+
+  return Form;
+}(_react.Component);
+
+Form.propTypes = {
+  src: _propTypes2.default.string,
+  url: _propTypes2.default.string,
+  form: _propTypes2.default.object,
+  submission: _propTypes2.default.object,
+  options: _propTypes2.default.shape({
+    readOnly: _propTypes2.default.boolean,
+    noAlerts: _propTypes2.default.boolean,
+    i18n: _propTypes2.default.object,
+    template: _propTypes2.default.string,
+    saveDraft: _propTypes2.default.boolean
+  }),
+  onPrevPage: _propTypes2.default.func,
+  onNextPage: _propTypes2.default.func,
+  onCancel: _propTypes2.default.func,
+  onChange: _propTypes2.default.func,
+  onCustomEvent: _propTypes2.default.func,
+  onComponentChange: _propTypes2.default.func,
+  onSubmit: _propTypes2.default.func,
+  onSubmitDone: _propTypes2.default.func,
+  onFormLoad: _propTypes2.default.func,
+  onError: _propTypes2.default.func,
+  onRender: _propTypes2.default.func,
+  onAttach: _propTypes2.default.func,
+  onBuild: _propTypes2.default.func,
+  onFocus: _propTypes2.default.func,
+  onBlur: _propTypes2.default.func,
+  onInitialized: _propTypes2.default.func,
+  formioform: _propTypes2.default.any
+};
+
+var _initialiseProps = function _initialiseProps() {
+  var _this2 = this;
+
+  this.componentDidMount = function () {
+    var _props = _this2.props,
+        _props$options = _props.options,
+        options = _props$options === undefined ? {} : _props$options,
+        src = _props.src,
+        url = _props.url,
+        form = _props.form;
+
+
+    if (!options.events) {
+      options.events = Form.getDefaultEmitter();
+    }
+
+    if (src) {
+      _this2.instance = new (_this2.props.formioform || _Form2.default)(_this2.element, src, options);
+      _this2.createPromise = _this2.instance.ready.then(function (formio) {
+        _this2.formio = formio;
+        _this2.formio.src = src;
+      });
+    }
+    if (form) {
+      _this2.instance = new (_this2.props.formioform || _Form2.default)(_this2.element, form, options);
+      _this2.createPromise = _this2.instance.ready.then(function (formio) {
+        _this2.formio = formio;
+        _this2.formio.form = form;
+        if (url) {
+          _this2.formio.url = url;
+        }
+
+        return _this2.formio;
+      });
+    }
+
+    _this2.initializeFormio();
+  };
+
+  this.componentWillUnmount = function () {
+    if (_this2.formio !== undefined) {
+      _this2.formio.destroy(true);
+    }
+  };
+
+  this.initializeFormio = function () {
+    if (_this2.createPromise) {
+      _this2.instance.onAny(function (event) {
+        for (var _len2 = arguments.length, args = Array(_len2 > 1 ? _len2 - 1 : 0), _key2 = 1; _key2 < _len2; _key2++) {
+          args[_key2 - 1] = arguments[_key2];
+        }
+
+        if (event.startsWith('formio.')) {
+          var funcName = 'on' + event.charAt(7).toUpperCase() + event.slice(8);
+          if (_this2.props.hasOwnProperty(funcName) && typeof _this2.props[funcName] === 'function') {
+            var _props2;
+
+            (_props2 = _this2.props)[funcName].apply(_props2, args);
+          }
+        }
+      });
+      _this2.createPromise.then(function () {
+        if (_this2.props.submission) {
+          _this2.formio.submission = _this2.props.submission;
+        }
+      });
+    }
+  };
+
+  this.componentWillReceiveProps = function (nextProps) {
+    var _props3 = _this2.props,
+        _props3$options = _props3.options,
+        options = _props3$options === undefined ? {} : _props3$options,
+        src = _props3.src,
+        form = _props3.form,
+        submission = _props3.submission;
+
+
+    if (!options.events) {
+      options.events = Form.getDefaultEmitter();
+    }
+
+    if (src !== nextProps.src) {
+      _this2.instance = new (_this2.props.formioform || _Form2.default)(_this2.element, nextProps.src, options);
+      _this2.createPromise = _this2.instance.ready.then(function (formio) {
+        _this2.formio = formio;
+        _this2.formio.src = nextProps.src;
+      });
+      _this2.initializeFormio();
+    }
+    if (form !== nextProps.form) {
+      _this2.instance = new (_this2.props.formioform || _Form2.default)(_this2.element, nextProps.form, options);
+      _this2.createPromise = _this2.instance.ready.then(function (formio) {
+        _this2.formio = formio;
+        _this2.formio.form = nextProps.form;
+      });
+      _this2.initializeFormio();
+    }
+
+    if (submission !== nextProps.submission && _this2.formio) {
+      _this2.formio.submission = nextProps.submission;
+    }
+  };
+
+  this.render = function () {
+    return _react2.default.createElement('div', { ref: function ref(element) {
+        return _this2.element = element;
+      } });
+  };
+};
+
+exports.default = Form;
-Original file line number
+Diff line change
@@ @@ -2,5 +2,4 @@ @@
     *.log
     node_modules
     bower_components
-    lib
     .idea