diff --git a/packages/vulcan-forms/lib/components/Form.jsx b/packages/vulcan-forms/lib/components/Form.jsx index dbf463de2..c4e4b0ce3 100644 --- a/packages/vulcan-forms/lib/components/Form.jsx +++ b/packages/vulcan-forms/lib/components/Form.jsx @@ -35,7 +35,7 @@ import { import React, { Component } from 'react'; import PropTypes from 'prop-types'; import { intlShape } from 'meteor/vulcan:i18n'; -import { Form } from 'formsy-react-components'; +import Formsy from 'formsy-react'; import { getEditableFields, getInsertableFields } from '../modules/utils.js'; import cloneDeep from 'lodash/cloneDeep'; import set from 'lodash/set'; @@ -431,7 +431,7 @@ class SmartForm extends Component { ...newValues, }, // Submit form after setState update completed }), - () => this.submitForm(this.refs.form.formsyForm.getModel()) + () => this.submitForm(this.refs.form.getModel()) ); }; @@ -612,7 +612,7 @@ class SmartForm extends Component { */ formKeyDown = event => { if ((event.ctrlKey || event.metaKey) && event.keyCode === 13) { - this.submitForm(this.refs.form.formsyForm.getModel()); + this.submitForm(this.refs.form.getModel()); } }; @@ -782,7 +782,7 @@ class SmartForm extends Component { return (
-
+ {fieldGroups.map(group => ( @@ -813,7 +813,7 @@ class SmartForm extends Component { deleteDocument={(this.getFormType() === 'edit' && this.props.showRemove && this.deleteDocument) || null} collectionName={collectionName} /> - +
); } diff --git a/packages/vulcan-ui-bootstrap/lib/components/forms/Select.jsx b/packages/vulcan-ui-bootstrap/lib/components/forms/Select.jsx index 1f39f7a49..4b01b8dfa 100644 --- a/packages/vulcan-ui-bootstrap/lib/components/forms/Select.jsx +++ b/packages/vulcan-ui-bootstrap/lib/components/forms/Select.jsx @@ -9,8 +9,10 @@ const SelectComponent = ({refFunction, inputProperties, ...properties}, { intl } value: '', disabled: true, }; - - const options = [noneOption, ...inputProperties.options.map(({ label, value }) => ({ label, value: value.toString()}))]; + let otherOptions = inputProperties.options; + // uncomment following to convert options values to strings + // otherOptions = otherOptions.map(({ label, value }) => ({ label, value: value.toString()})); + const options = [noneOption, ...otherOptions]; return