@rjsf/core 5.0.0-beta.16 → 5.0.0-beta.17

package/dist/core.cjs.development.js

@@ -10,8 +10,8 @@ var _pick = require('lodash/pick');
 var isObject = require('lodash/isObject');
 var set = require('lodash/set');
 var nanoid = require('nanoid');
-var unset = require('lodash/unset');
 var has = require('lodash/has');
+var unset = require('lodash/unset');
 var omit = require('lodash/omit');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
@@ -22,8 +22,8 @@ var _isEmpty__default = /*#__PURE__*/_interopDefaultLegacy(_isEmpty);
 var _pick__default = /*#__PURE__*/_interopDefaultLegacy(_pick);
 var isObject__default = /*#__PURE__*/_interopDefaultLegacy(isObject);
 var set__default = /*#__PURE__*/_interopDefaultLegacy(set);
-var unset__default = /*#__PURE__*/_interopDefaultLegacy(unset);
 var has__default = /*#__PURE__*/_interopDefaultLegacy(has);
+var unset__default = /*#__PURE__*/_interopDefaultLegacy(unset);
 var omit__default = /*#__PURE__*/_interopDefaultLegacy(omit);
 
 function _defineProperties(target, props) {
@@ -32,7 +32,7 @@ function _defineProperties(target, props) {
     descriptor.enumerable = descriptor.enumerable || false;
     descriptor.configurable = true;
     if ("value" in descriptor) descriptor.writable = true;
-    Object.defineProperty(target, descriptor.key, descriptor);
+    Object.defineProperty(target, _toPropertyKey(descriptor.key), descriptor);
   }
 }
 function _createClass(Constructor, protoProps, staticProps) {
@@ -112,6 +112,20 @@ function _createForOfIteratorHelperLoose(o, allowArrayLike) {
   }
   throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
 }
+function _toPrimitive(input, hint) {
+  if (typeof input !== "object" || input === null) return input;
+  var prim = input[Symbol.toPrimitive];
+  if (prim !== undefined) {
+    var res = prim.call(input, hint || "default");
+    if (typeof res !== "object") return res;
+    throw new TypeError("@@toPrimitive must return a primitive value.");
+  }
+  return (hint === "string" ? String : Number)(input);
+}
+function _toPropertyKey(arg) {
+  var key = _toPrimitive(arg, "string");
+  return typeof key === "symbol" ? key : String(key);
+}
 
 var _excluded$9 = ["widget"],
   _excluded2 = ["widget"],
@@ -538,7 +552,7 @@ var ArrayField = /*#__PURE__*/function (_Component) {
       options = _objectWithoutPropertiesLoose(_getUiOptions2, _excluded$9);
     var Widget = utils.getWidget(schema, widget, widgets);
     return /*#__PURE__*/React__default["default"].createElement(Widget, {
-      id: idSchema && idSchema.$id,
+      id: idSchema.$id,
       multiple: true,
       onChange: this.onSelectChange,
       onBlur: onBlur,
@@ -594,7 +608,7 @@ var ArrayField = /*#__PURE__*/function (_Component) {
       options = _objectWithoutPropertiesLoose(_getUiOptions3, _excluded2);
     var Widget = utils.getWidget(schema, widget, widgets);
     return /*#__PURE__*/React__default["default"].createElement(Widget, {
-      id: idSchema && idSchema.$id,
+      id: idSchema.$id,
       multiple: true,
       onChange: this.onSelectChange,
       onBlur: onBlur,
@@ -648,7 +662,7 @@ var ArrayField = /*#__PURE__*/function (_Component) {
     var Widget = utils.getWidget(schema, widget, widgets);
     return /*#__PURE__*/React__default["default"].createElement(Widget, {
       options: options,
-      id: idSchema && idSchema.$id,
+      id: idSchema.$id,
       multiple: true,
       onChange: this.onSelectChange,
       onBlur: onBlur,
@@ -941,7 +955,7 @@ function BooleanField(props) {
     }),
     schema: schema,
     uiSchema: uiSchema,
-    id: idSchema && idSchema.$id,
+    id: idSchema.$id,
     onChange: onChange,
     onFocus: onFocus,
     onBlur: onBlur,
@@ -993,7 +1007,7 @@ var AnyOfField = /*#__PURE__*/function (_Component) {
           var _option = _step.value;
           if (_option.properties) {
             for (var key in _option.properties) {
-              if (key in newFormData) {
+              if (has__default["default"](newFormData, key)) {
                 unset__default["default"](newFormData, key);
               }
             }
@@ -1291,7 +1305,7 @@ var ObjectField = /*#__PURE__*/function (_Component) {
         duplicateKeySuffixSeparator = _getUiOptions$duplica === void 0 ? "-" : _getUiOptions$duplica;
       var index = 0;
       var newKey = preferredKey;
-      while (newKey in formData) {
+      while (has__default["default"](formData, newKey)) {
         newKey = "" + preferredKey + duplicateKeySuffixSeparator + ++index;
       }
       return newKey;
@@ -1602,10 +1616,10 @@ function SchemaFieldRender(props) {
   var _ref = errorSchema || {},
     __errors = _ref.__errors,
     fieldErrorSchema = _objectWithoutPropertiesLoose(_ref, _excluded$6);
-  // See #439: uiSchema: Don't pass consumed class names to child components
-  var fieldUiSchema = omit__default["default"](uiSchema, ["ui:classNames", "classNames"]);
-  if ("ui:options" in fieldUiSchema) {
-    fieldUiSchema["ui:options"] = omit__default["default"](fieldUiSchema["ui:options"], ["classNames"]);
+  // See #439: uiSchema: Don't pass consumed class names or style to child components
+  var fieldUiSchema = omit__default["default"](uiSchema, ["ui:classNames", "classNames", "ui:style"]);
+  if (utils.UI_OPTIONS_KEY in fieldUiSchema) {
+    fieldUiSchema[utils.UI_OPTIONS_KEY] = omit__default["default"](fieldUiSchema[utils.UI_OPTIONS_KEY], ["classNames", "style"]);
   }
   var field = /*#__PURE__*/React__default["default"].createElement(FieldComponent, _extends({}, props, {
     onChange: handleFieldComponentChange,
@@ -1662,7 +1676,7 @@ function SchemaFieldRender(props) {
   });
   var fieldProps = {
     description: /*#__PURE__*/React__default["default"].createElement(DescriptionFieldTemplate, {
-      id: id + "__description",
+      id: utils.descriptionId(id),
       description: description,
       schema: schema,
       uiSchema: uiSchema,
@@ -1685,6 +1699,7 @@ function SchemaFieldRender(props) {
     hideError: hideError,
     displayLabel: displayLabel,
     classNames: classNames.join(" ").trim(),
+    style: uiOptions.style,
     formContext: formContext,
     formData: formData,
     schema: schema,
@@ -1801,7 +1816,7 @@ function StringField(props) {
     }),
     schema: schema,
     uiSchema: uiSchema,
-    id: idSchema && idSchema.$id,
+    id: idSchema.$id,
     label: title === undefined ? name : title,
     value: formData,
     onChange: onChange,
@@ -1867,9 +1882,8 @@ function ArrayFieldDescriptionTemplate(props) {
     return null;
   }
   var DescriptionFieldTemplate = utils.getTemplate("DescriptionFieldTemplate", registry, options);
-  var id = idSchema.$id + "__description";
   return /*#__PURE__*/React__default["default"].createElement(DescriptionFieldTemplate, {
-    id: id,
+    id: utils.descriptionId(idSchema),
     description: description,
     schema: schema,
     uiSchema: uiSchema,
@@ -2014,9 +2028,8 @@ function ArrayFieldTitleTemplate(props) {
     return null;
   }
   var TitleFieldTemplate = utils.getTemplate("TitleFieldTemplate", registry, options);
-  var id = idSchema.$id + "__title";
   return /*#__PURE__*/React__default["default"].createElement(TitleFieldTemplate, {
-    id: id,
+    id: utils.titleId(idSchema),
     title: title,
     required: required,
     schema: schema,
@@ -2079,13 +2092,14 @@ function BaseInputTemplate(props) {
     autoFocus: autofocus,
     value: inputValue
   }, inputProps, {
-    list: schema.examples ? "examples_" + id : undefined,
+    list: schema.examples ? utils.examplesId(id) : undefined,
     onChange: _onChange,
     onBlur: _onBlur,
-    onFocus: _onFocus
+    onFocus: _onFocus,
+    "aria-describedby": utils.ariaDescribedByIds(id, !!schema.examples)
   })), Array.isArray(schema.examples) && /*#__PURE__*/React__default["default"].createElement("datalist", {
     key: "datalist_" + id,
-    id: "examples_" + id
+    id: utils.examplesId(id)
   }, [].concat(new Set(schema.examples.concat(schema["default"] ? [schema["default"]] : []))).map(function (example) {
     return /*#__PURE__*/React__default["default"].createElement("option", {
       key: example,
@@ -2292,7 +2306,7 @@ function FieldErrorTemplate(props) {
   if (errors.length === 0) {
     return null;
   }
-  var id = idSchema.$id + "__error";
+  var id = utils.errorId(idSchema);
   return /*#__PURE__*/React__default["default"].createElement("div", null, /*#__PURE__*/React__default["default"].createElement("ul", {
     id: id,
     className: "error-detail bs-callout bs-callout-info"
@@ -2316,7 +2330,7 @@ function FieldHelpTemplate(props) {
   if (!help) {
     return null;
   }
-  var id = idSchema.$id + "__help";
+  var id = utils.helpId(idSchema);
   if (typeof help === "string") {
     return /*#__PURE__*/React__default["default"].createElement("p", {
       id: id,
@@ -2356,14 +2370,14 @@ function ObjectFieldTemplate(props) {
   return /*#__PURE__*/React__default["default"].createElement("fieldset", {
     id: idSchema.$id
   }, (options.title || title) && /*#__PURE__*/React__default["default"].createElement(TitleFieldTemplate, {
-    id: idSchema.$id + "__title",
+    id: utils.titleId(idSchema),
     title: options.title || title,
     required: required,
     schema: schema,
     uiSchema: uiSchema,
     registry: registry
   }), (options.description || description) && /*#__PURE__*/React__default["default"].createElement(DescriptionFieldTemplate, {
-    id: idSchema.$id + "__description",
+    id: utils.descriptionId(idSchema),
     description: options.description || description,
     schema: schema,
     uiSchema: uiSchema,
@@ -2417,6 +2431,7 @@ function UnsupportedField(props) {
 function WrapIfAdditionalTemplate(props) {
   var id = props.id,
     classNames = props.classNames,
+    style = props.style,
     disabled = props.disabled,
     label = props.label,
     onKeyChange = props.onKeyChange,
@@ -2433,11 +2448,13 @@ function WrapIfAdditionalTemplate(props) {
   var additional = (utils.ADDITIONAL_PROPERTY_FLAG in schema);
   if (!additional) {
     return /*#__PURE__*/React__default["default"].createElement("div", {
-      className: classNames
+      className: classNames,
+      style: style
     }, children);
   }
   return /*#__PURE__*/React__default["default"].createElement("div", {
-    className: classNames
+    className: classNames,
+    style: style
   }, /*#__PURE__*/React__default["default"].createElement("div", {
     className: "row"
   }, /*#__PURE__*/React__default["default"].createElement("div", {
@@ -2581,7 +2598,8 @@ function DateElement(_ref) {
     onBlur: onBlur,
     onFocus: onFocus,
     registry: registry,
-    label: ""
+    label: "",
+    "aria-describedby": utils.ariaDescribedByIds(rootId)
   });
 }
 /** The `AltDateWidget` is an alternative widget for rendering date properties.
@@ -2719,7 +2737,7 @@ function CheckboxWidget(_ref) {
   return /*#__PURE__*/React__default["default"].createElement("div", {
     className: "checkbox " + (disabled || readonly ? "disabled" : "")
   }, schema.description && /*#__PURE__*/React__default["default"].createElement(DescriptionFieldTemplate, {
-    id: id + "__description",
+    id: utils.descriptionId(id),
     description: schema.description,
     schema: schema,
     uiSchema: uiSchema,
@@ -2734,24 +2752,11 @@ function CheckboxWidget(_ref) {
     autoFocus: autofocus,
     onChange: handleChange,
     onBlur: handleBlur,
-    onFocus: handleFocus
+    onFocus: handleFocus,
+    "aria-describedby": utils.ariaDescribedByIds(id)
   }), /*#__PURE__*/React__default["default"].createElement("span", null, label)));
 }
 
-function selectValue(value, selected, all) {
-  var at = all.indexOf(value);
-  var updated = selected.slice(0, at).concat(value, selected.slice(at));
-  // As inserting values at predefined index positions doesn't work with empty
-  // arrays, we need to reorder the updated selection to match the initial order
-  return updated.sort(function (a, b) {
-    return Number(all.indexOf(a) > all.indexOf(b));
-  });
-}
-function deselectValue(value, selected) {
-  return selected.filter(function (v) {
-    return v !== value;
-  });
-}
 /** The `CheckboxesWidget` is a widget for rendering checkbox groups.
  *  It is typically used to represent an array of enums.
  *
@@ -2770,32 +2775,30 @@ function CheckboxesWidget(_ref) {
     autofocus = _ref$autofocus === void 0 ? false : _ref$autofocus,
     readonly = _ref.readonly,
     onChange = _ref.onChange;
+  var checkboxesValues = Array.isArray(value) ? value : [value];
   return /*#__PURE__*/React__default["default"].createElement("div", {
     className: "checkboxes",
     id: id
   }, Array.isArray(enumOptions) && enumOptions.map(function (option, index) {
-    var checked = value.indexOf(option.value) !== -1;
+    var checked = checkboxesValues.includes(option.value);
     var itemDisabled = Array.isArray(enumDisabled) && enumDisabled.indexOf(option.value) != -1;
     var disabledCls = disabled || itemDisabled || readonly ? "disabled" : "";
     var handleChange = function handleChange(event) {
-      var all = enumOptions.map(function (_ref2) {
-        var value = _ref2.value;
-        return value;
-      });
       if (event.target.checked) {
-        onChange(selectValue(option.value, value, all));
+        onChange(utils.enumOptionsSelectValue(option.value, checkboxesValues, enumOptions));
       } else {
-        onChange(deselectValue(option.value, value));
+        onChange(utils.enumOptionsDeselectValue(option.value, checkboxesValues));
       }
     };
     var checkbox = /*#__PURE__*/React__default["default"].createElement("span", null, /*#__PURE__*/React__default["default"].createElement("input", {
       type: "checkbox",
-      id: id + "-" + option.value,
+      id: utils.optionId(id, option),
       name: id,
       checked: checked,
       disabled: disabled || itemDisabled || readonly,
       autoFocus: autofocus && index === 0,
-      onChange: handleChange
+      onChange: handleChange,
+      "aria-describedby": utils.ariaDescribedByIds(id)
     }), /*#__PURE__*/React__default["default"].createElement("span", null, option.label));
     return inline ? /*#__PURE__*/React__default["default"].createElement("label", {
       key: option.value,
@@ -2991,7 +2994,8 @@ function FileWidget(_ref2) {
     defaultValue: "",
     autoFocus: autofocus,
     multiple: multiple,
-    accept: options.accept ? String(options.accept) : undefined
+    accept: options.accept ? String(options.accept) : undefined,
+    "aria-describedby": utils.ariaDescribedByIds(id)
   })), /*#__PURE__*/React__default["default"].createElement(FilesInfo, {
     filesInfo: filesInfo
   }));
@@ -3068,7 +3072,7 @@ function RadioWidget(_ref) {
     };
     var radio = /*#__PURE__*/React__default["default"].createElement("span", null, /*#__PURE__*/React__default["default"].createElement("input", {
       type: "radio",
-      id: id + "-" + option.value,
+      id: utils.optionId(id, option),
       checked: checked,
       name: name,
       required: required,
@@ -3077,7 +3081,8 @@ function RadioWidget(_ref) {
       autoFocus: autofocus && i === 0,
       onChange: handleChange,
       onBlur: handleBlur,
-      onFocus: handleFocus
+      onFocus: handleFocus,
+      "aria-describedby": utils.ariaDescribedByIds(id)
     }), /*#__PURE__*/React__default["default"].createElement("span", null, option.label));
     return inline ? /*#__PURE__*/React__default["default"].createElement("label", {
       key: option.value,
@@ -3163,7 +3168,8 @@ function SelectWidget(_ref) {
     autoFocus: autofocus,
     onBlur: handleBlur,
     onFocus: handleFocus,
-    onChange: handleChange
+    onChange: handleChange,
+    "aria-describedby": utils.ariaDescribedByIds(id)
   }, !multiple && schema["default"] === undefined && /*#__PURE__*/React__default["default"].createElement("option", {
     value: ""
   }, placeholder), Array.isArray(enumOptions) && enumOptions.map(function (_ref2, i) {
@@ -3221,7 +3227,8 @@ function TextareaWidget(_ref) {
     rows: options.rows,
     onBlur: handleBlur,
     onFocus: handleFocus,
-    onChange: handleChange
+    onChange: handleChange,
+    "aria-describedby": utils.ariaDescribedByIds(id)
   });
 }
 TextareaWidget.defaultProps = {