Skip to content

Commit 5655b40

Browse files
authored
Fix isMultiSelect and isFilesArray after merging
1 parent b1e7bc6 commit 5655b40

File tree

1 file changed

+9
-7
lines changed

1 file changed

+9
-7
lines changed

src/utils.js

+9-7
Original file line numberDiff line numberDiff line change
@@ -304,21 +304,23 @@ export function isSelect(_schema, definitions = {}) {
304304
}
305305
return false;
306306
}
307-
307+
308308
export function isMultiSelect(schema, definitions = {}) {
309+
if (!schema.uniqueItems || !schema.items) {
310+
return false;
311+
}
309312
const itemsSchema = retrieveSchema(schema.items, definitions);
310-
return schema.items
311-
? schema.uniqueItems && isSelect(itemsSchema, definitions)
312-
: false;
313+
return isSelect(itemsSchema, definitions);
313314
}
314315

315316
export function isFilesArray(schema, uiSchema, definitions = {}) {
316317
if (uiSchema["ui:widget"] === "files") {
317318
return true;
318-
} else if (schema.items) {
319-
const itemsSchema = retrieveSchema(schema.items, definitions);
320-
return (itemsSchema.type === "string" && itemsSchema.format === "data-url")
319+
} else if (!schema.items) {
320+
return false;
321321
}
322+
const itemsSchema = retrieveSchema(schema.items, definitions);
323+
return (itemsSchema.type === "string" && itemsSchema.format === "data-url");
322324
}
323325

324326
export function isFixedItems(schema) {

0 commit comments

Comments
 (0)