oterral
diff --git a/‎src/utils.js‎
Lines changed: 3 additions & 0 deletions b/‎src/utils.js‎
Lines changed: 3 additions & 0 deletions
diff --git a/‎test/setup-jsdom.js‎
Lines changed: 1 addition & 0 deletions b/‎test/setup-jsdom.js‎
Lines changed: 1 addition & 0 deletions
diff --git a/‎test/utils_test.js‎
Lines changed: 11 additions & 0 deletions b/‎test/utils_test.js‎
Lines changed: 11 additions & 0 deletions
@@ -229,6 +229,9 @@ export function getUiOptions(uiSchema) {
 }
 
 export function isObject(thing) {
+ if (thing instanceof File) {
+ return false;
+ }
  return typeof thing === "object" && thing !== null && !Array.isArray(thing);
 }
 
 
@@ -6,6 +6,7 @@ if (!global.hasOwnProperty("window")) {
  global.document = jsdom.jsdom("<!doctype html><html><body></body></html>");
  global.window = document.defaultView;
  global.navigator = global.window.navigator;
+ global.File = global.window.File;
 }
 
 // atob
 
@@ -517,6 +517,17 @@ describe("utils", () => {
  expect(mergeObjects(obj1, obj2)).eql(expected);
  });
 
+ it("shouldn't recursively merge File object", () => {
+ const file = new File(["test"], "test.txt");
+ const obj1 = {
+ a: {},
+ };
+ const obj2 = {
+ a: file,
+ };
+ expect(mergeObjects(obj1, obj2).a).instanceOf(File);
+ });
+
  describe("concatArrays option", () => {
  it("should not concat arrays by default", () => {
  const obj1 = { a: [1] };
Original file line number	Diff line number	Diff line change
`@@ -229,6 +229,9 @@ export function getUiOptions(uiSchema) {`
`229`	`229`	`}`
`230`	`230`
`231`	`231`	`export function isObject(thing) {`
	`232`	`+ if (thing instanceof File) {`
	`233`	`+ return false;`
	`234`	`+ }`
`232`	`235`	`return typeof thing === "object" && thing !== null && !Array.isArray(thing);`
`233`	`236`	`}`
`234`	`237`
Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,7 @@ if (!global.hasOwnProperty("window")) {`
`6`	`6`	`global.document = jsdom.jsdom("<!doctype html><html><body></body></html>");`
`7`	`7`	`global.window = document.defaultView;`
`8`	`8`	`global.navigator = global.window.navigator;`
	`9`	`+ global.File = global.window.File;`
`9`	`10`	`}`
`10`	`11`
`11`	`12`	`// atob`