Skip to content

uses ReactIs.isValidElementType to check widget types #1737

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
jonathanhawleypeters wants to merge 1 commit into from
Closed

uses ReactIs.isValidElementType to check widget types #1737

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion packages/core/src/components/fields/SchemaField.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import { ADDITIONAL_PROPERTY_FLAG } from "../../utils";
import IconButton from "../IconButton";
import React from "react";
import PropTypes from "prop-types";
import * as ReactIs from "react-is";
import * as types from "../../types";

import {
Expand Down Expand Up @@ -30,7 +31,7 @@ const COMPONENT_TYPES = {

function getFieldComponent(schema, uiSchema, idSchema, fields) {
const field = uiSchema["ui:field"];
if (typeof field === "function") {
if (typeof field !== "string" && ReactIs.isValidElementType(field)) {
return field;
}
if (typeof field === "string" && field in fields) {
Expand Down
6 changes: 1 addition & 5 deletions packages/core/src/utils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,11 +108,7 @@ export function getWidget(schema, widget, registeredWidgets = {}) {
return Widget.MergedWidget;
}

if (
typeof widget === "function" ||
ReactIs.isForwardRef(React.createElement(widget)) ||
ReactIs.isMemo(widget)
) {
if (typeof widget !== "string" && ReactIs.isValidElementType(widget)) {
return mergeOptions(widget);
Copy link
Copy Markdown
Member

@epicfaace epicfaace May 18, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Since our old tests didn't catch this issue, would it be possible to update them so that we don't regress again?

Copy link
Copy Markdown
Author

@jonathanhawleypeters jonathanhawleypeters May 18, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, I'll do that soon. Thanks for the reminder

}

Expand Down