From 1d9d906b6db2b406997bd3d03aa4b780f7fd3890 Mon Sep 17 00:00:00 2001 From: semantic-release-bot Date: Thu, 20 Feb 2025 18:17:21 +0000 Subject: [PATCH] chore(release): 3.113.0 [skip ci] # [3.113.0](https://github.com/ClearC2/grid-form-builder/compare/v3.112.0...v3.113.0) (2025-02-20) ### Bug Fixes * **react:** pre-defined defaults to prevent infinite loops ([824086b](https://github.com/ClearC2/grid-form-builder/commit/824086bae3a8d157bdf35225845add419dfe3d63)) ### Features * **react:** removes default prop declarations for react 18+ support ([f0aef3a](https://github.com/ClearC2/grid-form-builder/commit/f0aef3a1910351f797dac6a754d2829250983e8d)) --- CHANGELOG.md | 12 ++ dist/cjs/FormBuilder.js | 166 ++++++++++++++-------------- dist/cjs/Inputs/ConditionalInput.js | 51 ++++++--- dist/cjs/Inputs/Date/DateInput.js | 14 ++- dist/cjs/Inputs/Typeahead.js | 31 +++--- dist/es/FormBuilder.js | 129 +++++++++++---------- dist/es/Inputs/ConditionalInput.js | 48 +++++--- dist/es/Inputs/Date/DateInput.js | 13 ++- dist/es/Inputs/Typeahead.js | 32 +++--- package.json | 2 +- 10 files changed, 271 insertions(+), 227 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f88abb44..7f366870 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,15 @@ +# [3.113.0](https://github.com/ClearC2/grid-form-builder/compare/v3.112.0...v3.113.0) (2025-02-20) + + +### Bug Fixes + +* **react:** pre-defined defaults to prevent infinite loops ([824086b](https://github.com/ClearC2/grid-form-builder/commit/824086bae3a8d157bdf35225845add419dfe3d63)) + + +### Features + +* **react:** removes default prop declarations for react 18+ support ([f0aef3a](https://github.com/ClearC2/grid-form-builder/commit/f0aef3a1910351f797dac6a754d2829250983e8d)) + # [3.112.0](https://github.com/ClearC2/grid-form-builder/compare/v3.111.1...v3.112.0) (2025-02-17) diff --git a/dist/cjs/FormBuilder.js b/dist/cjs/FormBuilder.js index 41c47d51..0f72b280 100644 --- a/dist/cjs/FormBuilder.js +++ b/dist/cjs/FormBuilder.js @@ -34,24 +34,6 @@ var _extends2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/e var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/objectWithoutProperties")); -var _setTimeout2 = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/set-timeout")); - -var _forEach = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/for-each")); - -var _splice = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/splice")); - -var _concat = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/concat")); - -var _some = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/some")); - -var _trim = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/trim")); - -var _parseFloat2 = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/parse-float")); - -var _isArray = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/array/is-array")); - -var _keys = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/object/keys")); - var _createClass2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/createClass")); var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/classCallCheck")); @@ -70,6 +52,26 @@ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime-corejs3/he var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/slicedToArray")); +var _map = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/map")); + +var _setTimeout2 = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/set-timeout")); + +var _forEach = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/for-each")); + +var _splice = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/splice")); + +var _concat = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/concat")); + +var _some = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/some")); + +var _trim = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/trim")); + +var _parseFloat2 = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/parse-float")); + +var _isArray = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/array/is-array")); + +var _keys = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/object/keys")); + var _react = _interopRequireWildcard(require("react")); var _propTypes = _interopRequireDefault(require("prop-types")); @@ -118,28 +120,64 @@ var debugLog = function debugLog() { if (debug) (_console = console).log.apply(_console, arguments); //eslint-disable-line }; +var defaults = { + object: {}, + map: (0, _immutable.Map)(), + nullFunction: function nullFunction() { + return null; + }, + dropItemDimensions: { + h: 1, + w: 6 + }, + dropItemConfig: { + name: 'new-input', + label: 'New Field', + type: 'input' + }, + device: { + cordova: false, + model: 'browser', + platform: 'browser', + uuid: 'browser', + version: 'browser' + } +}; + var FormBuilder = function FormBuilder(props) { var rowHeight = props.rowHeight, - columns = props.columns, - formSchema = props.formSchema, + _props$columns = props.columns, + columns = _props$columns === void 0 ? 12 : _props$columns, + _props$formSchema = props.formSchema, + formSchema = _props$formSchema === void 0 ? defaults.object : _props$formSchema, width = props.width, handleOnDimensionChange = props.handleOnDimensionChange, - dropItemDimensions = props.dropItemDimensions, - dropItemConfig = props.dropItemConfig, + _props$dropItemDimens = props.dropItemDimensions, + dropItemDimensions = _props$dropItemDimens === void 0 ? defaults.dropItemDimensions : _props$dropItemDimens, + _props$dropItemConfig = props.dropItemConfig, + dropItemConfig = _props$dropItemConfig === void 0 ? defaults.dropItemConfig : _props$dropItemConfig, validate = props.validate, requiredFlag = props.requiredFlag, setContainerRef = props.setContainerRef, - onClick = props.onClick, - handleOnDrop = props.handleOnDrop, - handleCascade = props.handleCascade, - onRTEImageClick = props.handleRTEImageClick, - handleLinkClick = props.handleLinkClick, + _props$onClick = props.onClick, + onClick = _props$onClick === void 0 ? defaults.nullFunction : _props$onClick, + _props$handleOnDrop = props.handleOnDrop, + handleOnDrop = _props$handleOnDrop === void 0 ? defaults.nullFunction : _props$handleOnDrop, + _props$handleCascade = props.handleCascade, + handleCascade = _props$handleCascade === void 0 ? defaults.nullFunction : _props$handleCascade, + _props$handleRTEImage = props.handleRTEImageClick, + onRTEImageClick = _props$handleRTEImage === void 0 ? defaults.nullFunction : _props$handleRTEImage, + _props$handleLinkClic = props.handleLinkClick, + handleLinkClick = _props$handleLinkClic === void 0 ? defaults.nullFunction : _props$handleLinkClic, conditionalFieldValues = props.conditionalFieldValues, conditionalSearch = props.conditionalSearch, inline = props.inline, - handleOnChange = props.handleOnChange, - interactive = props.interactive, - draggable = props.draggable, + _props$handleOnChange = props.handleOnChange, + handleOnChange = _props$handleOnChange === void 0 ? defaults.nullFunction : _props$handleOnChange, + _props$interactive = props.interactive, + interactive = _props$interactive === void 0 ? true : _props$interactive, + _props$draggable = props.draggable, + draggable = _props$draggable === void 0 ? false : _props$draggable, readonly = props.readonly, droppable = props.droppable, activeItem = props.activeItem, @@ -149,20 +187,20 @@ var FormBuilder = function FormBuilder(props) { _props$verticalCompac = props.verticalCompact, verticalCompact = _props$verticalCompac === void 0 ? false : _props$verticalCompac, compactType = props.compactType, - dateFormat = props.dateFormat, - dateTimeFormat = props.dateTimeFormat, - timeFormat = props.timeFormat, - autoComplete = props.autoComplete, - style = props.style, + _props$dateFormat = props.dateFormat, + dateFormat = _props$dateFormat === void 0 ? 'MM/DD/YYYY' : _props$dateFormat, + _props$dateTimeFormat = props.dateTimeFormat, + dateTimeFormat = _props$dateTimeFormat === void 0 ? 'MM/DD/YYYY h:mm a' : _props$dateTimeFormat, + _props$timeFormat = props.timeFormat, + timeFormat = _props$timeFormat === void 0 ? 'h:mm a' : _props$timeFormat, + _props$autoComplete = props.autoComplete, + autoComplete = _props$autoComplete === void 0 ? 'ac_off' : _props$autoComplete, + _props$style = props.style, + style = _props$style === void 0 ? {} : _props$style, _props$device = props.device, - device = _props$device === void 0 ? { - cordova: false, - model: 'browser', - platform: 'browser', - uuid: 'browser', - version: 'browser' - } : _props$device, - fieldDefinitions = props.fieldDefinitions, + device = _props$device === void 0 ? defaults.device : _props$device, + _props$fieldDefinitio = props.fieldDefinitions, + fieldDefinitions = _props$fieldDefinitio === void 0 ? (0, _map.default)(defaults) : _props$fieldDefinitio, c2class = props.c2class; var _useState = (0, _react.useState)({ @@ -522,48 +560,6 @@ FormBuilder.propTypes = { fieldDefinitions: _propTypes.default.instanceOf(_immutable.Map), c2class: _propTypes.default.string }; -FormBuilder.defaultProps = { - columns: 12, - formSchema: {}, - dropItemDimensions: { - h: 1, - w: 6 - }, - dropItemConfig: { - name: 'new-input', - label: 'New Field', - type: 'input' - }, - handleSubmit: function handleSubmit() { - console.warn('onSubmit was called but no handleSubmit function was provided.'); // eslint-disable-line - }, - handleOnChange: function handleOnChange() { - return null; - }, - onClick: function onClick() { - return null; - }, - handleOnDrop: function handleOnDrop() { - return null; - }, - handleCascade: function handleCascade() { - return null; - }, - handleRTEImageClick: function handleRTEImageClick() { - return null; - }, - handleLinkClick: function handleLinkClick() { - return null; - }, - draggable: false, - interactive: true, - dateFormat: 'MM/DD/YYYY', - dateTimeFormat: 'MM/DD/YYYY h:mm a', - timeFormat: 'h:mm a', - autoComplete: 'ac_off', - style: {}, - fieldDefinitions: (0, _immutable.Map)() -}; FormBuilder.count = 1; var PureFormBuilder = /*#__PURE__*/function (_PureComponent) { diff --git a/dist/cjs/Inputs/ConditionalInput.js b/dist/cjs/Inputs/ConditionalInput.js index f465f27a..abd3dcbf 100644 --- a/dist/cjs/Inputs/ConditionalInput.js +++ b/dist/cjs/Inputs/ConditionalInput.js @@ -34,6 +34,8 @@ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime-corejs3/he var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/slicedToArray")); +var _map = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/map")); + var _values = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/values")); var _isArray = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/array/is-array")); @@ -56,12 +58,26 @@ function ownKeys(object, enumerableOnly) { var keys = _Object$keys(object); if ( function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var _context, _context2; var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? _forEachInstanceProperty(_context = ownKeys(Object(source), !0)).call(_context, function (key) { (0, _defineProperty2.default)(target, key, source[key]); }) : _Object$getOwnPropertyDescriptors ? _Object$defineProperties(target, _Object$getOwnPropertyDescriptors(source)) : _forEachInstanceProperty(_context2 = ownKeys(Object(source))).call(_context2, function (key) { _Object$defineProperty(target, key, _Object$getOwnPropertyDescriptor(source, key)); }); } return target; } +var defaults = { + object: {}, + map: (0, _immutable.Map)(), + nullFunction: function nullFunction() { + return null; + } +}; + var ConditionalInput = function ConditionalInput(props) { - var style = props.style, - name = props.name, - value = props.value, - values = (0, _values.default)(props), - onChange = props.onChange; + var _props$style = props.style, + style = _props$style === void 0 ? defaults.object : _props$style, + _props$name = props.name, + name = _props$name === void 0 ? '' : _props$name, + _props$value = props.value, + value = _props$value === void 0 ? (0, _map.default)(defaults) : _props$value, + _props$values = (0, _values.default)(props), + values = _props$values === void 0 ? (0, _map.default)(defaults) : _props$values, + _props$onChange = props.onChange, + onChange = _props$onChange === void 0 ? defaults.nullFunction : _props$onChange; + var _style$value = style.value, valueStyle = _style$value === void 0 ? {} : _style$value, _style$inputOuter = style.inputOuter, @@ -92,25 +108,25 @@ var ConditionalInput = function ConditionalInput(props) { } if (name && setDefaults) { - var defaults = (0, _immutable.Map)({ + var _defaults = (0, _immutable.Map)({ condition: 'contains', values: (0, _immutable.List)() }); if (typeof value === 'string') { if (value !== '') { - defaults = defaults.set('values', (0, _immutable.List)([value])); + _defaults = _defaults.set('values', (0, _immutable.List)([value])); } else { - defaults = defaults.set('values', (0, _immutable.List)()); + _defaults = _defaults.set('values', (0, _immutable.List)()); } } else if (value instanceof _immutable.List || (0, _isArray.default)(value)) { - defaults = defaults.set('values', (0, _immutable.fromJS)(value)); + _defaults = _defaults.set('values', (0, _immutable.fromJS)(value)); } onChange({ target: { name: name, - value: defaults + value: _defaults } }); } @@ -139,18 +155,17 @@ var ConditionalInput = function ConditionalInput(props) { }) }, hasValue ? 'Values...' : ''), showDialog && /*#__PURE__*/_react.default.createElement(_ConditionalDialog.default, (0, _extends2.default)({ handleClose: handleClose - }, props))))); + }, props, { + style: style, + name: name, + value: value, + values: values, + onChange: onChange + }))))); }; var _default = ConditionalInput; exports.default = _default; -ConditionalInput.defaultProps = { - style: {}, - name: '', - value: (0, _immutable.Map)(), - values: (0, _immutable.Map)(), - onChange: function onChange() {} -}; ConditionalInput.propTypes = { onChange: _propTypes.default.func, name: _propTypes.default.string, diff --git a/dist/cjs/Inputs/Date/DateInput.js b/dist/cjs/Inputs/Date/DateInput.js index f7752053..6427ea4c 100644 --- a/dist/cjs/Inputs/Date/DateInput.js +++ b/dist/cjs/Inputs/Date/DateInput.js @@ -52,6 +52,12 @@ function ownKeys(object, enumerableOnly) { var keys = _Object$keys(object); if ( function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var _context2, _context3; var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? _forEachInstanceProperty(_context2 = ownKeys(Object(source), !0)).call(_context2, function (key) { (0, _defineProperty2.default)(target, key, source[key]); }) : _Object$getOwnPropertyDescriptors ? _Object$defineProperties(target, _Object$getOwnPropertyDescriptors(source)) : _forEachInstanceProperty(_context3 = ownKeys(Object(source))).call(_context3, function (key) { _Object$defineProperty(target, key, _Object$getOwnPropertyDescriptor(source, key)); }); } return target; } +var defaults = { + trueFunction: function trueFunction() { + return true; + } +}; + var DateInput = function DateInput(props) { var _context; @@ -91,7 +97,8 @@ var DateInput = function DateInput(props) { futureYears = _props$futureYears === void 0 ? 12 : _props$futureYears, minDate = props.minDate, maxDate = props.maxDate, - onChangeValidator = props.onChangeValidator, + _props$onChangeValida = props.onChangeValidator, + onChangeValidator = _props$onChangeValida === void 0 ? defaults.trueFunction : _props$onChangeValida, warning = props.warning; var _style$value = style.value, valueStyle = _style$value === void 0 ? {} : _style$value, @@ -483,9 +490,4 @@ DateInput.propTypes = { maxDate: _propTypes.default.string, onChangeValidator: _propTypes.default.func, warning: _propTypes.default.string -}; -DateInput.defaultProps = { - onChangeValidator: function onChangeValidator() { - return true; - } }; \ No newline at end of file diff --git a/dist/cjs/Inputs/Typeahead.js b/dist/cjs/Inputs/Typeahead.js index 994231dc..05aff8a2 100644 --- a/dist/cjs/Inputs/Typeahead.js +++ b/dist/cjs/Inputs/Typeahead.js @@ -140,7 +140,10 @@ var TypeaheadPerformanceOptimizer = /*#__PURE__*/function (_PureComponent) { inputValue = _this$props.inputValue, menuIsOpen = _this$props.menuIsOpen, menuPlacement = _this$props.menuPlacement, - onKeyDown = _this$props.onKeyDown, + _this$props$onKeyDown = _this$props.onKeyDown, + onKeyDown = _this$props$onKeyDown === void 0 ? function () { + return null; + } : _this$props$onKeyDown, onMouseDown = _this$props.onMouseDown, onFocus = _this$props.onFocus, onBlur = _this$props.onBlur, @@ -225,6 +228,12 @@ var TypeaheadPerformanceOptimizer = /*#__PURE__*/function (_PureComponent) { defaultOptions: _propTypes.default.any, styles: _propTypes.default.object }); +var defaults = { + nullFunction: function nullFunction() { + return null; + }, + object: {} +}; var Typeahead = function Typeahead(props) { var _context13; @@ -244,24 +253,28 @@ var Typeahead = function Typeahead(props) { requiredWarning = props.requiredWarning, required = props.required, tabIndex = props.tabIndex, - onKeyDown = props.onKeyDown, + _props$onKeyDown = props.onKeyDown, + onKeyDown = _props$onKeyDown === void 0 ? defaults.nullFunction : _props$onKeyDown, draggable = props.draggable, _props$persist = props.persist, persist = _props$persist === void 0 ? true : _props$persist, - typeahead = props.typeahead, + _props$typeahead = props.typeahead, + typeahead = _props$typeahead === void 0 ? defaults.object : _props$typeahead, _props$minChars = props.minChars, minChars = _props$minChars === void 0 ? 1 : _props$minChars, stringify = props.stringify, autoComplete = props.autoComplete, _props$interactive = props.interactive, interactive = _props$interactive === void 0 ? true : _props$interactive, - style = props.style, + _props$style = props.style, + style = _props$style === void 0 ? {} : _props$style, delimit = props.delimit, delimiter = props.delimiter, _props$isClearable = props.isClearable, isClearable = _props$isClearable === void 0 ? true : _props$isClearable, createlabel = props.createlabel, - typeaheadOptions = props.options, + _props$options = props.options, + typeaheadOptions = _props$options === void 0 ? defaults.object : _props$options, warning = props.warning; var _style$value = style.value, @@ -1120,14 +1133,6 @@ var Typeahead = function Typeahead(props) { var _default = Typeahead; exports.default = _default; -Typeahead.defaultProps = { - onKeyDown: function onKeyDown() { - return null; - }, - typeahead: {}, - style: {}, - options: {} -}; Typeahead.propTypes = { onChange: _propTypes.default.func, name: _propTypes.default.string, diff --git a/dist/es/FormBuilder.js b/dist/es/FormBuilder.js index 33799584..b586e94f 100644 --- a/dist/es/FormBuilder.js +++ b/dist/es/FormBuilder.js @@ -27,6 +27,7 @@ function ownKeys(object, enumerableOnly) { var keys = _Object$keys(object); if ( function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var _context6, _context7; var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? _forEachInstanceProperty(_context6 = ownKeys(Object(source), !0)).call(_context6, function (key) { _defineProperty(target, key, source[key]); }) : _Object$getOwnPropertyDescriptors ? _Object$defineProperties(target, _Object$getOwnPropertyDescriptors(source)) : _forEachInstanceProperty(_context7 = ownKeys(Object(source))).call(_context7, function (key) { _Object$defineProperty(target, key, _Object$getOwnPropertyDescriptor(source, key)); }); } return target; } +import _mapInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/map"; import _setTimeout from "@babel/runtime-corejs3/core-js-stable/set-timeout"; import _forEachInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/for-each"; import _spliceInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/splice"; @@ -57,28 +58,64 @@ var debugLog = function debugLog() { if (debug) (_console = console).log.apply(_console, arguments); //eslint-disable-line }; +var defaults = { + object: {}, + map: Map(), + nullFunction: function nullFunction() { + return null; + }, + dropItemDimensions: { + h: 1, + w: 6 + }, + dropItemConfig: { + name: 'new-input', + label: 'New Field', + type: 'input' + }, + device: { + cordova: false, + model: 'browser', + platform: 'browser', + uuid: 'browser', + version: 'browser' + } +}; + var FormBuilder = function FormBuilder(props) { var rowHeight = props.rowHeight, - columns = props.columns, - formSchema = props.formSchema, + _props$columns = props.columns, + columns = _props$columns === void 0 ? 12 : _props$columns, + _props$formSchema = props.formSchema, + formSchema = _props$formSchema === void 0 ? defaults.object : _props$formSchema, width = props.width, handleOnDimensionChange = props.handleOnDimensionChange, - dropItemDimensions = props.dropItemDimensions, - dropItemConfig = props.dropItemConfig, + _props$dropItemDimens = props.dropItemDimensions, + dropItemDimensions = _props$dropItemDimens === void 0 ? defaults.dropItemDimensions : _props$dropItemDimens, + _props$dropItemConfig = props.dropItemConfig, + dropItemConfig = _props$dropItemConfig === void 0 ? defaults.dropItemConfig : _props$dropItemConfig, validate = props.validate, requiredFlag = props.requiredFlag, setContainerRef = props.setContainerRef, - onClick = props.onClick, - handleOnDrop = props.handleOnDrop, - handleCascade = props.handleCascade, - onRTEImageClick = props.handleRTEImageClick, - handleLinkClick = props.handleLinkClick, + _props$onClick = props.onClick, + onClick = _props$onClick === void 0 ? defaults.nullFunction : _props$onClick, + _props$handleOnDrop = props.handleOnDrop, + handleOnDrop = _props$handleOnDrop === void 0 ? defaults.nullFunction : _props$handleOnDrop, + _props$handleCascade = props.handleCascade, + handleCascade = _props$handleCascade === void 0 ? defaults.nullFunction : _props$handleCascade, + _props$handleRTEImage = props.handleRTEImageClick, + onRTEImageClick = _props$handleRTEImage === void 0 ? defaults.nullFunction : _props$handleRTEImage, + _props$handleLinkClic = props.handleLinkClick, + handleLinkClick = _props$handleLinkClic === void 0 ? defaults.nullFunction : _props$handleLinkClic, conditionalFieldValues = props.conditionalFieldValues, conditionalSearch = props.conditionalSearch, inline = props.inline, - handleOnChange = props.handleOnChange, - interactive = props.interactive, - draggable = props.draggable, + _props$handleOnChange = props.handleOnChange, + handleOnChange = _props$handleOnChange === void 0 ? defaults.nullFunction : _props$handleOnChange, + _props$interactive = props.interactive, + interactive = _props$interactive === void 0 ? true : _props$interactive, + _props$draggable = props.draggable, + draggable = _props$draggable === void 0 ? false : _props$draggable, readonly = props.readonly, droppable = props.droppable, activeItem = props.activeItem, @@ -88,20 +125,20 @@ var FormBuilder = function FormBuilder(props) { _props$verticalCompac = props.verticalCompact, verticalCompact = _props$verticalCompac === void 0 ? false : _props$verticalCompac, compactType = props.compactType, - dateFormat = props.dateFormat, - dateTimeFormat = props.dateTimeFormat, - timeFormat = props.timeFormat, - autoComplete = props.autoComplete, - style = props.style, + _props$dateFormat = props.dateFormat, + dateFormat = _props$dateFormat === void 0 ? 'MM/DD/YYYY' : _props$dateFormat, + _props$dateTimeFormat = props.dateTimeFormat, + dateTimeFormat = _props$dateTimeFormat === void 0 ? 'MM/DD/YYYY h:mm a' : _props$dateTimeFormat, + _props$timeFormat = props.timeFormat, + timeFormat = _props$timeFormat === void 0 ? 'h:mm a' : _props$timeFormat, + _props$autoComplete = props.autoComplete, + autoComplete = _props$autoComplete === void 0 ? 'ac_off' : _props$autoComplete, + _props$style = props.style, + style = _props$style === void 0 ? {} : _props$style, _props$device = props.device, - device = _props$device === void 0 ? { - cordova: false, - model: 'browser', - platform: 'browser', - uuid: 'browser', - version: 'browser' - } : _props$device, - fieldDefinitions = props.fieldDefinitions, + device = _props$device === void 0 ? defaults.device : _props$device, + _props$fieldDefinitio = props.fieldDefinitions, + fieldDefinitions = _props$fieldDefinitio === void 0 ? _mapInstanceProperty(defaults) : _props$fieldDefinitio, c2class = props.c2class; var _useState = useState({ @@ -471,48 +508,6 @@ FormBuilder.propTypes = { fieldDefinitions: PropTypes.instanceOf(Map), c2class: PropTypes.string }; -FormBuilder.defaultProps = { - columns: 12, - formSchema: {}, - dropItemDimensions: { - h: 1, - w: 6 - }, - dropItemConfig: { - name: 'new-input', - label: 'New Field', - type: 'input' - }, - handleSubmit: function handleSubmit() { - console.warn('onSubmit was called but no handleSubmit function was provided.'); // eslint-disable-line - }, - handleOnChange: function handleOnChange() { - return null; - }, - onClick: function onClick() { - return null; - }, - handleOnDrop: function handleOnDrop() { - return null; - }, - handleCascade: function handleCascade() { - return null; - }, - handleRTEImageClick: function handleRTEImageClick() { - return null; - }, - handleLinkClick: function handleLinkClick() { - return null; - }, - draggable: false, - interactive: true, - dateFormat: 'MM/DD/YYYY', - dateTimeFormat: 'MM/DD/YYYY h:mm a', - timeFormat: 'h:mm a', - autoComplete: 'ac_off', - style: {}, - fieldDefinitions: Map() -}; FormBuilder.count = 1; var PureFormBuilder = /*#__PURE__*/function (_PureComponent) { diff --git a/dist/es/Inputs/ConditionalInput.js b/dist/es/Inputs/ConditionalInput.js index 4a2f3395..8b8edb21 100644 --- a/dist/es/Inputs/ConditionalInput.js +++ b/dist/es/Inputs/ConditionalInput.js @@ -6,6 +6,7 @@ function ownKeys(object, enumerableOnly) { var keys = _Object$keys(object); if ( function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var _context, _context2; var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? _forEachInstanceProperty(_context = ownKeys(Object(source), !0)).call(_context, function (key) { _defineProperty(target, key, source[key]); }) : _Object$getOwnPropertyDescriptors ? _Object$defineProperties(target, _Object$getOwnPropertyDescriptors(source)) : _forEachInstanceProperty(_context2 = ownKeys(Object(source))).call(_context2, function (key) { _Object$defineProperty(target, key, _Object$getOwnPropertyDescriptor(source, key)); }); } return target; } +import _mapInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/map"; import _valuesInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/values"; import _Array$isArray from "@babel/runtime-corejs3/core-js-stable/array/is-array"; import _includesInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/includes"; @@ -21,13 +22,25 @@ import React, { useCallback, useState, useEffect } from 'react'; import PropTypes from 'prop-types'; import ConditionalDialog from './ConditionalDialog'; import { Map, List, fromJS } from 'immutable'; +var defaults = { + object: {}, + map: Map(), + nullFunction: function nullFunction() { + return null; + } +}; var ConditionalInput = function ConditionalInput(props) { - var style = props.style, - name = props.name, - value = props.value, - values = _valuesInstanceProperty(props), - onChange = props.onChange; + var _props$style = props.style, + style = _props$style === void 0 ? defaults.object : _props$style, + _props$name = props.name, + name = _props$name === void 0 ? '' : _props$name, + _props$value = props.value, + value = _props$value === void 0 ? _mapInstanceProperty(defaults) : _props$value, + _props$values = _valuesInstanceProperty(props), + values = _props$values === void 0 ? _mapInstanceProperty(defaults) : _props$values, + _props$onChange = props.onChange, + onChange = _props$onChange === void 0 ? defaults.nullFunction : _props$onChange; var _style$value = style.value, valueStyle = _style$value === void 0 ? {} : _style$value, @@ -59,25 +72,25 @@ var ConditionalInput = function ConditionalInput(props) { } if (name && setDefaults) { - var defaults = Map({ + var _defaults = Map({ condition: 'contains', values: List() }); if (typeof value === 'string') { if (value !== '') { - defaults = defaults.set('values', List([value])); + _defaults = _defaults.set('values', List([value])); } else { - defaults = defaults.set('values', List()); + _defaults = _defaults.set('values', List()); } } else if (value instanceof List || _Array$isArray(value)) { - defaults = defaults.set('values', fromJS(value)); + _defaults = _defaults.set('values', fromJS(value)); } onChange({ target: { name: name, - value: defaults + value: _defaults } }); } @@ -106,17 +119,16 @@ var ConditionalInput = function ConditionalInput(props) { }) }, hasValue ? 'Values...' : ''), showDialog && /*#__PURE__*/React.createElement(ConditionalDialog, _extends({ handleClose: handleClose - }, props))))); + }, props, { + style: style, + name: name, + value: value, + values: values, + onChange: onChange + }))))); }; export default ConditionalInput; -ConditionalInput.defaultProps = { - style: {}, - name: '', - value: Map(), - values: Map(), - onChange: function onChange() {} -}; ConditionalInput.propTypes = { onChange: PropTypes.func, name: PropTypes.string, diff --git a/dist/es/Inputs/Date/DateInput.js b/dist/es/Inputs/Date/DateInput.js index f498ccd9..6ae1942b 100644 --- a/dist/es/Inputs/Date/DateInput.js +++ b/dist/es/Inputs/Date/DateInput.js @@ -25,6 +25,11 @@ import moment from 'moment'; import { randomId } from '../../utils'; import ValidationErrorIcon from '../../ValidationErrorIcon'; import useTheme from '../../theme/useTheme'; +var defaults = { + trueFunction: function trueFunction() { + return true; + } +}; var DateInput = function DateInput(props) { var _context; @@ -65,7 +70,8 @@ var DateInput = function DateInput(props) { futureYears = _props$futureYears === void 0 ? 12 : _props$futureYears, minDate = props.minDate, maxDate = props.maxDate, - onChangeValidator = props.onChangeValidator, + _props$onChangeValida = props.onChangeValidator, + onChangeValidator = _props$onChangeValida === void 0 ? defaults.trueFunction : _props$onChangeValida, warning = props.warning; var _style$value = style.value, valueStyle = _style$value === void 0 ? {} : _style$value, @@ -456,9 +462,4 @@ DateInput.propTypes = { maxDate: PropTypes.string, onChangeValidator: PropTypes.func, warning: PropTypes.string -}; -DateInput.defaultProps = { - onChangeValidator: function onChangeValidator() { - return true; - } }; \ No newline at end of file diff --git a/dist/es/Inputs/Typeahead.js b/dist/es/Inputs/Typeahead.js index bcb49cc3..432b7514 100644 --- a/dist/es/Inputs/Typeahead.js +++ b/dist/es/Inputs/Typeahead.js @@ -88,7 +88,10 @@ var TypeaheadPerformanceOptimizer = /*#__PURE__*/function (_PureComponent) { inputValue = _this$props.inputValue, menuIsOpen = _this$props.menuIsOpen, menuPlacement = _this$props.menuPlacement, - onKeyDown = _this$props.onKeyDown, + _this$props$onKeyDown = _this$props.onKeyDown, + onKeyDown = _this$props$onKeyDown === void 0 ? function () { + return null; + } : _this$props$onKeyDown, onMouseDown = _this$props.onMouseDown, onFocus = _this$props.onFocus, onBlur = _this$props.onBlur, @@ -175,6 +178,13 @@ _defineProperty(TypeaheadPerformanceOptimizer, "propTypes", { styles: PropTypes.object }); +var defaults = { + nullFunction: function nullFunction() { + return null; + }, + object: {} +}; + var Typeahead = function Typeahead(props) { var _context13; @@ -193,24 +203,28 @@ var Typeahead = function Typeahead(props) { requiredWarning = props.requiredWarning, required = props.required, tabIndex = props.tabIndex, - onKeyDown = props.onKeyDown, + _props$onKeyDown = props.onKeyDown, + onKeyDown = _props$onKeyDown === void 0 ? defaults.nullFunction : _props$onKeyDown, draggable = props.draggable, _props$persist = props.persist, persist = _props$persist === void 0 ? true : _props$persist, - typeahead = props.typeahead, + _props$typeahead = props.typeahead, + typeahead = _props$typeahead === void 0 ? defaults.object : _props$typeahead, _props$minChars = props.minChars, minChars = _props$minChars === void 0 ? 1 : _props$minChars, stringify = props.stringify, autoComplete = props.autoComplete, _props$interactive = props.interactive, interactive = _props$interactive === void 0 ? true : _props$interactive, - style = props.style, + _props$style = props.style, + style = _props$style === void 0 ? {} : _props$style, delimit = props.delimit, delimiter = props.delimiter, _props$isClearable = props.isClearable, isClearable = _props$isClearable === void 0 ? true : _props$isClearable, createlabel = props.createlabel, - typeaheadOptions = props.options, + _props$options = props.options, + typeaheadOptions = _props$options === void 0 ? defaults.object : _props$options, warning = props.warning; var _style$value = style.value, @@ -1080,14 +1094,6 @@ var Typeahead = function Typeahead(props) { }; export default Typeahead; -Typeahead.defaultProps = { - onKeyDown: function onKeyDown() { - return null; - }, - typeahead: {}, - style: {}, - options: {} -}; Typeahead.propTypes = { onChange: PropTypes.func, name: PropTypes.string, diff --git a/package.json b/package.json index 781d28a8..2ec2cb7b 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "grid-form-builder", - "version": "3.112.0", + "version": "3.113.0", "description": "Form Builder built on top of React Grid Layout", "repository": { "type": "git",