Fix rjsf-team#1233 : Exclude File object from isObject detection

oterral · Mar 26, 2019 · 309fa46 · 309fa46
1 parent 9104a71
commit 309fa46
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 1 deletion.
diff --git a/src/utils.js b/src/utils.js
@@ -229,7 +229,9 @@ export function getUiOptions(uiSchema) {
 }
 
 export function isObject(thing) {
-  return typeof thing === "object" && thing !== null && !Array.isArray(thing);
+  return thing instanceof File
+    ? false
+    : typeof thing === "object" && thing !== null && !Array.isArray(thing);
 }
 
 export function mergeObjects(obj1, obj2, concatArrays = false) {

diff --git a/test/setup-jsdom.js b/test/setup-jsdom.js
@@ -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

diff --git a/test/utils_test.js b/test/utils_test.js
@@ -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] };