@rjsf/core 2.2.1 → 2.4.1

package/dist/cjs/components/fields/ObjectField.js

@@ -50,31 +50,6 @@ function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || func
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 
 function DefaultObjectFieldTemplate(props) {
-  var canExpand = function canExpand() {
-    var formData = props.formData,
-        schema = props.schema,
-        uiSchema = props.uiSchema;
-
-    if (!schema.additionalProperties) {
-      return false;
-    }
-
-    var _getUiOptions = (0, _utils.getUiOptions)(uiSchema),
-        expandable = _getUiOptions.expandable;
-
-    if (expandable === false) {
-      return expandable;
-    } // if ui:options.expandable was not explicitly set to false, we can add
-    // another property if we have not exceeded maxProperties yet
-
-
-    if (schema.maxProperties !== undefined) {
-      return Object.keys(formData).length < schema.maxProperties;
-    }
-
-    return true;
-  };
-
   var TitleField = props.TitleField,
       DescriptionField = props.DescriptionField;
   return _react["default"].createElement("fieldset", {
@@ -90,7 +65,7 @@ function DefaultObjectFieldTemplate(props) {
     formContext: props.formContext
   }), props.properties.map(function (prop) {
     return prop.content;
-  }), canExpand() && _react["default"].createElement(_AddButton["default"], {
+  }), (0, _utils.canExpand)(props.schema, props.uiSchema, props.formData) && _react["default"].createElement(_AddButton["default"], {
     className: "object-property-expand",
     onClick: props.onAddClick(props.schema),
     disabled: props.disabled || props.readonly

package/dist/cjs/components/fields/SchemaField.js

@@ -314,7 +314,6 @@ function SchemaFieldRender(props) {
     rawErrors: __errors
   }));
 
-  var type = schema.type;
   var id = idSchema.$id; // If this schema has a title defined, but the user has set a new key/label, retain their input.
 
   var label;
@@ -329,7 +328,7 @@ function SchemaFieldRender(props) {
   var errors = __errors;
   var help = uiSchema["ui:help"];
   var hidden = uiSchema["ui:widget"] === "hidden";
-  var classNames = ["form-group", "field", "field-".concat(type), errors && errors.length > 0 ? "field-error has-error has-danger" : "", uiSchema.classNames].join(" ").trim();
+  var classNames = ["form-group", "field", "field-".concat(schema.type), errors && errors.length > 0 ? "field-error has-error has-danger" : "", uiSchema.classNames].join(" ").trim();
   var fieldProps = {
     description: _react["default"].createElement(DescriptionField, {
       id: id + "__description",

package/dist/cjs/components/widgets/CheckboxWidget.js

@@ -9,36 +9,9 @@ var _react = _interopRequireDefault(require("react"));
 
 var _propTypes = _interopRequireDefault(require("prop-types"));
 
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
-
-// Check to see if a schema specifies that a value must be true
-function schemaRequiresTrueValue(schema) {
-  // Check if const is a truthy value
-  if (schema["const"]) {
-    return true;
-  } // Check if an enum has a single value of true
-
-
-  if (schema["enum"] && schema["enum"].length === 1 && schema["enum"][0] === true) {
-    return true;
-  } // If anyOf has a single value, evaluate the subschema
-
-
-  if (schema.anyOf && schema.anyOf.length === 1) {
-    return schemaRequiresTrueValue(schema.anyOf[0]);
-  } // If oneOf has a single value, evaluate the subschema
+var _utils = require("../../utils");
 
-
-  if (schema.oneOf && schema.oneOf.length === 1) {
-    return schemaRequiresTrueValue(schema.oneOf[0]);
-  } // Evaluate each subschema in allOf, to see if one of them requires a true
-  // value
-
-
-  if (schema.allOf) {
-    return schema.allOf.some(schemaRequiresTrueValue);
-  }
-}
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
 function CheckboxWidget(props) {
   var schema = props.schema,
@@ -55,7 +28,7 @@ function CheckboxWidget(props) {
   // the "required" attribute if the field value must be "true", due to the
   // "const" or "enum" keywords
 
-  var required = schemaRequiresTrueValue(schema);
+  var required = (0, _utils.schemaRequiresTrueValue)(schema);
   return _react["default"].createElement("div", {
     className: "checkbox ".concat(disabled || readonly ? "disabled" : "")
   }, schema.description && _react["default"].createElement(DescriptionField, {

package/dist/cjs/utils.js

@@ -3,6 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+exports.canExpand = canExpand;
 exports.getDefaultRegistry = getDefaultRegistry;
 exports.getSchemaType = getSchemaType;
 exports.getWidget = getWidget;
@@ -40,6 +41,7 @@ exports.pad = pad;
 exports.dataURItoBlob = dataURItoBlob;
 exports.rangeSpec = rangeSpec;
 exports.getMatchingOption = getMatchingOption;
+exports.schemaRequiresTrueValue = schemaRequiresTrueValue;
 exports.guessType = exports.ADDITIONAL_PROPERTY_FLAG = void 0;
 
 var _react = _interopRequireDefault(require("react"));
@@ -50,12 +52,16 @@ var _jsonSchemaMergeAllof = _interopRequireDefault(require("json-schema-merge-al
 
 var _fill = _interopRequireDefault(require("core-js/library/fn/array/fill"));
 
-var _validate = _interopRequireWildcard(require("./validate"));
-
 var _union = _interopRequireDefault(require("lodash/union"));
 
 var _jsonpointer = _interopRequireDefault(require("jsonpointer"));
 
+var _fields = _interopRequireDefault(require("./components/fields"));
+
+var _widgets = _interopRequireDefault(require("./components/widgets"));
+
+var _validate = _interopRequireWildcard(require("./validate"));
+
 function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) { var desc = Object.defineProperty && Object.getOwnPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : {}; if (desc.get || desc.set) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } } newObj["default"] = obj; return newObj; } }
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
@@ -138,10 +144,31 @@ var widgetMap = {
   }
 };
 
+function canExpand(schema, uiSchema, formData) {
+  if (!schema.additionalProperties) {
+    return false;
+  }
+
+  var _getUiOptions = getUiOptions(uiSchema),
+      expandable = _getUiOptions.expandable;
+
+  if (expandable === false) {
+    return expandable;
+  } // if ui:options.expandable was not explicitly set to false, we can add
+  // another property if we have not exceeded maxProperties yet
+
+
+  if (schema.maxProperties !== undefined) {
+    return Object.keys(formData).length < schema.maxProperties;
+  }
+
+  return true;
+}
+
 function getDefaultRegistry() {
   return {
-    fields: require("./components/fields")["default"],
-    widgets: require("./components/widgets")["default"],
+    fields: _fields["default"],
+    widgets: _widgets["default"],
     definitions: {},
     rootSchema: {},
     formContext: {}
@@ -1275,4 +1302,35 @@ function getMatchingOption(formData, options, rootSchema) {
   }
 
   return 0;
+} // Check to see if a schema specifies that a value must be true
+
+
+function schemaRequiresTrueValue(schema) {
+  // Check if const is a truthy value
+  if (schema["const"]) {
+    return true;
+  } // Check if an enum has a single value of true
+
+
+  if (schema["enum"] && schema["enum"].length === 1 && schema["enum"][0] === true) {
+    return true;
+  } // If anyOf has a single value, evaluate the subschema
+
+
+  if (schema.anyOf && schema.anyOf.length === 1) {
+    return schemaRequiresTrueValue(schema.anyOf[0]);
+  } // If oneOf has a single value, evaluate the subschema
+
+
+  if (schema.oneOf && schema.oneOf.length === 1) {
+    return schemaRequiresTrueValue(schema.oneOf[0]);
+  } // Evaluate each subschema in allOf, to see if one of them requires a true
+  // value
+
+
+  if (schema.allOf) {
+    return schema.allOf.some(schemaRequiresTrueValue);
+  }
+
+  return false;
 }

package/dist/es/components/fields/ObjectField.js

@@ -2,6 +2,7 @@ import _JSON$stringify from "@babel/runtime-corejs2/core-js/json/stringify";
 import _Array$isArray from "@babel/runtime-corejs2/core-js/array/is-array";
 import _toConsumableArray from "@babel/runtime-corejs2/helpers/esm/toConsumableArray";
 import _extends from "@babel/runtime-corejs2/helpers/esm/extends";
+import _Object$keys from "@babel/runtime-corejs2/core-js/object/keys";
 import _objectSpread from "@babel/runtime-corejs2/helpers/esm/objectSpread";
 import _classCallCheck from "@babel/runtime-corejs2/helpers/esm/classCallCheck";
 import _createClass from "@babel/runtime-corejs2/helpers/esm/createClass";
@@ -10,38 +11,12 @@ import _getPrototypeOf from "@babel/runtime-corejs2/helpers/esm/getPrototypeOf";
 import _assertThisInitialized from "@babel/runtime-corejs2/helpers/esm/assertThisInitialized";
 import _inherits from "@babel/runtime-corejs2/helpers/esm/inherits";
 import _defineProperty from "@babel/runtime-corejs2/helpers/esm/defineProperty";
-import _Object$keys from "@babel/runtime-corejs2/core-js/object/keys";
 import AddButton from "../AddButton";
 import React, { Component } from "react";
 import * as types from "../../types";
-import { orderProperties, retrieveSchema, getDefaultRegistry, getUiOptions, ADDITIONAL_PROPERTY_FLAG } from "../../utils";
+import { orderProperties, retrieveSchema, getDefaultRegistry, canExpand, ADDITIONAL_PROPERTY_FLAG } from "../../utils";
 
 function DefaultObjectFieldTemplate(props) {
-  var canExpand = function canExpand() {
-    var formData = props.formData,
-        schema = props.schema,
-        uiSchema = props.uiSchema;
-
-    if (!schema.additionalProperties) {
-      return false;
-    }
-
-    var _getUiOptions = getUiOptions(uiSchema),
-        expandable = _getUiOptions.expandable;
-
-    if (expandable === false) {
-      return expandable;
-    } // if ui:options.expandable was not explicitly set to false, we can add
-    // another property if we have not exceeded maxProperties yet
-
-
-    if (schema.maxProperties !== undefined) {
-      return _Object$keys(formData).length < schema.maxProperties;
-    }
-
-    return true;
-  };
-
   var TitleField = props.TitleField,
       DescriptionField = props.DescriptionField;
   return React.createElement("fieldset", {
@@ -57,7 +32,7 @@ function DefaultObjectFieldTemplate(props) {
     formContext: props.formContext
   }), props.properties.map(function (prop) {
     return prop.content;
-  }), canExpand() && React.createElement(AddButton, {
+  }), canExpand(props.schema, props.uiSchema, props.formData) && React.createElement(AddButton, {
     className: "object-property-expand",
     onClick: props.onAddClick(props.schema),
     disabled: props.disabled || props.readonly

package/dist/es/components/fields/SchemaField.js

@@ -278,7 +278,6 @@ function SchemaFieldRender(props) {
     formContext: formContext,
     rawErrors: __errors
   }));
-  var type = schema.type;
   var id = idSchema.$id; // If this schema has a title defined, but the user has set a new key/label, retain their input.
 
   var label;
@@ -293,7 +292,7 @@ function SchemaFieldRender(props) {
   var errors = __errors;
   var help = uiSchema["ui:help"];
   var hidden = uiSchema["ui:widget"] === "hidden";
-  var classNames = ["form-group", "field", "field-".concat(type), errors && errors.length > 0 ? "field-error has-error has-danger" : "", uiSchema.classNames].join(" ").trim();
+  var classNames = ["form-group", "field", "field-".concat(schema.type), errors && errors.length > 0 ? "field-error has-error has-danger" : "", uiSchema.classNames].join(" ").trim();
   var fieldProps = {
     description: React.createElement(DescriptionField, {
       id: id + "__description",

package/dist/es/components/widgets/CheckboxWidget.js

@@ -1,33 +1,6 @@
 import React from "react";
-import PropTypes from "prop-types"; // Check to see if a schema specifies that a value must be true
-
-function schemaRequiresTrueValue(schema) {
-  // Check if const is a truthy value
-  if (schema["const"]) {
-    return true;
-  } // Check if an enum has a single value of true
-
-
-  if (schema["enum"] && schema["enum"].length === 1 && schema["enum"][0] === true) {
-    return true;
-  } // If anyOf has a single value, evaluate the subschema
-
-
-  if (schema.anyOf && schema.anyOf.length === 1) {
-    return schemaRequiresTrueValue(schema.anyOf[0]);
-  } // If oneOf has a single value, evaluate the subschema
-
-
-  if (schema.oneOf && schema.oneOf.length === 1) {
-    return schemaRequiresTrueValue(schema.oneOf[0]);
-  } // Evaluate each subschema in allOf, to see if one of them requires a true
-  // value
-
-
-  if (schema.allOf) {
-    return schema.allOf.some(schemaRequiresTrueValue);
-  }
-}
+import PropTypes from "prop-types";
+import { schemaRequiresTrueValue } from "../../utils";
 
 function CheckboxWidget(props) {
   var schema = props.schema,

package/dist/es/utils.js

@@ -4,12 +4,12 @@ import _Array$from from "@babel/runtime-corejs2/core-js/array/from";
 import _toConsumableArray from "@babel/runtime-corejs2/helpers/esm/toConsumableArray";
 import _Number$isNaN from "@babel/runtime-corejs2/core-js/number/is-nan";
 import _defineProperty from "@babel/runtime-corejs2/helpers/esm/defineProperty";
-import _Object$keys from "@babel/runtime-corejs2/core-js/object/keys";
 import _Array$isArray from "@babel/runtime-corejs2/core-js/array/is-array";
 import _typeof from "@babel/runtime-corejs2/helpers/esm/typeof";
 import _extends from "@babel/runtime-corejs2/helpers/esm/extends";
 import _objectSpread from "@babel/runtime-corejs2/helpers/esm/objectSpread";
 import _objectWithoutProperties from "@babel/runtime-corejs2/helpers/esm/objectWithoutProperties";
+import _Object$keys from "@babel/runtime-corejs2/core-js/object/keys";
 
 function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
 
@@ -19,9 +19,11 @@ import React from "react";
 import * as ReactIs from "react-is";
 import mergeAllOf from "json-schema-merge-allof";
 import fill from "core-js/library/fn/array/fill";
-import validateFormData, { isValid } from "./validate";
 import union from "lodash/union";
 import jsonpointer from "jsonpointer";
+import fields from "./components/fields";
+import widgets from "./components/widgets";
+import validateFormData, { isValid } from "./validate";
 export var ADDITIONAL_PROPERTY_FLAG = "__additional_property";
 var widgetMap = {
   "boolean": {
@@ -74,10 +76,30 @@ var widgetMap = {
     hidden: "HiddenWidget"
   }
 };
+export function canExpand(schema, uiSchema, formData) {
+  if (!schema.additionalProperties) {
+    return false;
+  }
+
+  var _getUiOptions = getUiOptions(uiSchema),
+      expandable = _getUiOptions.expandable;
+
+  if (expandable === false) {
+    return expandable;
+  } // if ui:options.expandable was not explicitly set to false, we can add
+  // another property if we have not exceeded maxProperties yet
+
+
+  if (schema.maxProperties !== undefined) {
+    return _Object$keys(formData).length < schema.maxProperties;
+  }
+
+  return true;
+}
 export function getDefaultRegistry() {
   return {
-    fields: require("./components/fields")["default"],
-    widgets: require("./components/widgets")["default"],
+    fields: fields,
+    widgets: widgets,
     definitions: {},
     rootSchema: {},
     formContext: {}
@@ -1180,4 +1202,34 @@ export function getMatchingOption(formData, options, rootSchema) {
   }
 
   return 0;
+} // Check to see if a schema specifies that a value must be true
+
+export function schemaRequiresTrueValue(schema) {
+  // Check if const is a truthy value
+  if (schema["const"]) {
+    return true;
+  } // Check if an enum has a single value of true
+
+
+  if (schema["enum"] && schema["enum"].length === 1 && schema["enum"][0] === true) {
+    return true;
+  } // If anyOf has a single value, evaluate the subschema
+
+
+  if (schema.anyOf && schema.anyOf.length === 1) {
+    return schemaRequiresTrueValue(schema.anyOf[0]);
+  } // If oneOf has a single value, evaluate the subschema
+
+
+  if (schema.oneOf && schema.oneOf.length === 1) {
+    return schemaRequiresTrueValue(schema.oneOf[0]);
+  } // Evaluate each subschema in allOf, to see if one of them requires a true
+  // value
+
+
+  if (schema.allOf) {
+    return schema.allOf.some(schemaRequiresTrueValue);
+  }
+
+  return false;
 }