Don't crash when non-object formData is passed in to a schema item with additionalProperties (rjsf-team#2595)

* handle null formData when stubbing existing additional properties * added Form test * improved non-object formData handling and added corresponding test * fixed formatting

Author: olensmar

packages/core/src/utils.js

@@ -634,6 +634,9 @@ export function stubExistingAdditionalProperties(
  properties: { ...schema.properties },
  };
 
+ // make sure formData is an object
+ formData = isObject(formData) ? formData : {};
+
  Object.keys(formData).forEach(key => {
  if (schema.properties.hasOwnProperty(key)) {
  // No need to stub, our schema already has the property

packages/core/test/Form_test.js

@@ -506,6 +506,59 @@ describeRepeated("Form common", createFormComponent => {
  expect(node.querySelectorAll("input[type=text]")).to.have.length.of(1);
  });
 
+ it("should not crash with null values for property with additionalProperties", () => {
+ const schema = {
+ type: "object",
+ properties: {
+ data: {
+ additionalProperties: {
+ type: "string",
+ },
+ type: "object",
+ },
+ },
+ };
+
+ const { node } = createFormComponent({
+ schema,
+ formData: {
+ data: null,
+ },
+ });
+
+ expect(node).to.not.be.null;
+ });
+
+ it("should not crash with non-object values for property with additionalProperties", () => {
+ const schema = {
+ type: "object",
+ properties: {
+ data1: {
+ additionalProperties: {
+ type: "string",
+ },
+ type: "object",
+ },
+ data2: {
+ additionalProperties: {
+ type: "string",
+ },
+ type: "object",
+ },
+ },
+ };
+
+ const { node } = createFormComponent({
+ schema,
+ formData: {
+ data1: 123,
+ data2: ["one", "two", "three"],
+ },
+ });
+
+ expect(node).to.not.be.null;
+ });
+
  it("should raise for non-existent definitions referenced", () => {
  const schema = {
  type: "object",

packages/core/test/utils_test.js

@@ -1770,6 +1770,21 @@ describe("utils", () => {
  });
  });
 
+ it("should handle null formData for schema which contains additionalProperties", () => {
+ const schema = {
+ additionalProperties: {
+ type: "string",
+ },
+ type: "object",
+ };
+
+ const formData = null;
+ expect(retrieveSchema(schema, {}, formData)).eql({
+ ...schema,
+ properties: {},
+ });
+ });
+
  it("should priorize local definitions over foreign ones", () => {
  const schema = {
  $ref: "#/definitions/address",