- {Object.keys(props.schema.items).length == 0 ? (
+ {Object.keys(schema.items).length == 0 ? (
) : (
<>
- {!props.schema.items.properties && }
+ {!schema.items.properties && }
)}
@@ -73,7 +76,7 @@ const ArrayFieldTemplate = (props) => {
ArrayFieldTemplate.propTypes = {
rawErrors: PropTypes.array,
- formContext: PropTypes.object,
+ registry: PropTypes.object,
addProperty: PropTypes.func,
schema: PropTypes.object,
uiSchema: PropTypes.object,
diff --git a/src/admin/formComponents/FieldTemplate.jsx b/src/admin/formComponents/FieldTemplate.jsx
index d761a0c..95972c1 100644
--- a/src/admin/formComponents/FieldTemplate.jsx
+++ b/src/admin/formComponents/FieldTemplate.jsx
@@ -16,10 +16,12 @@ const FieldTemplate = (props) => {
uiSchema = {},
rawErrors = [],
children,
- formContext,
+ registry,
id,
} = props;
+ const { formContext } = registry;
+
const dispatch = useDispatch();
const [display, setDisplay] = useState(false);
@@ -27,11 +29,11 @@ const FieldTemplate = (props) => {
let path = {
schema: [
...formContext.schema,
- ...(rawErrors.find((e) => typeof e === "object").schema || []),
+ ...(rawErrors.find((e) => typeof e === "object")?.schema || []),
],
uiSchema: [
...formContext.uiSchema,
- ...(rawErrors.find((e) => typeof e === "object").uiSchema || []),
+ ...(rawErrors.find((e) => typeof e === "object")?.uiSchema || []),
],
};
@@ -127,7 +129,7 @@ const FieldTemplate = (props) => {
FieldTemplate.propTypes = {
id: PropTypes.string,
children: PropTypes.element,
- formContext: PropTypes.object,
+ registry: PropTypes.object,
rawErrors: PropTypes.array,
uiSchema: PropTypes.object,
schema: PropTypes.object,
diff --git a/src/admin/formComponents/ObjectFieldTemplate.jsx b/src/admin/formComponents/ObjectFieldTemplate.jsx
index ade4bd5..4c4186b 100644
--- a/src/admin/formComponents/ObjectFieldTemplate.jsx
+++ b/src/admin/formComponents/ObjectFieldTemplate.jsx
@@ -8,9 +8,11 @@ import { theme } from "antd";
const ObjectFieldTemplate = ({
properties,
uiSchema,
- formContext,
- idSchema,
+ registry,
+ fieldPathId,
}) => {
+ const { formContext } = registry;
+
const [visualItems, setVisualItems] = useState(null);
const [isDragging, setIsDragging] = useState(false);
@@ -53,7 +55,7 @@ const ObjectFieldTemplate = ({
setVisualItems(null);
}, [dispatch, displayedItems, formContext.uiSchema, uiSchema]);
- if (idSchema.$id === "root") {
+ if (fieldPathId.$id === "root") {
return (
{
+ const { formContext } = registry;
const { readonlyAsDisabled = true } = formContext;
const isDisabled = disabled || (readonlyAsDisabled && readonly);
const [previewOpen, setPreviewOpen] = useState(false);
@@ -201,8 +202,8 @@ const FileField = ({
{files.length === 0 && isDisabled && (
)}
diff --git a/src/forms/fields/internal/TitleField.jsx b/src/forms/fields/internal/TitleField.jsx
index f2df540..711ec1d 100644
--- a/src/forms/fields/internal/TitleField.jsx
+++ b/src/forms/fields/internal/TitleField.jsx
@@ -9,7 +9,6 @@ import {
import Markdown from "../../../partials/Markdown/Markdown";
const TitleField = ({
- formContext = {},
id,
fieldId,
prefixCls,
@@ -26,16 +25,10 @@ const TitleField = ({
isObject,
hideAnchors,
}) => {
- const { colon = true } = formContext;
-
let labelChildren = title;
- if (colon && typeof title === "string" && title.trim() !== "") {
- labelChildren = title.replace(/[：:]\s*$/, "");
- }
const labelClassName = classNames({
[`${prefixCls}-item-required`]: required,
- [`${prefixCls}-item-no-colon`]: !colon,
formItemTitle: true,
});
@@ -117,7 +110,6 @@ const TitleField = ({
};
TitleField.propTypes = {
- formContext: PropTypes.object,
id: PropTypes.string,
prefixCls: PropTypes.string,
required: PropTypes.bool,
diff --git a/src/forms/templates/ArrayFieldTemplates/AccordionArrayFieldTemplate.jsx b/src/forms/templates/ArrayFieldTemplates/AccordionArrayFieldTemplate.jsx
index 047c164..b0cb5da 100644
--- a/src/forms/templates/ArrayFieldTemplates/AccordionArrayFieldTemplate.jsx
+++ b/src/forms/templates/ArrayFieldTemplates/AccordionArrayFieldTemplate.jsx
@@ -3,7 +3,7 @@ import { Collapse } from "antd";
import ArrayFieldTemplateItem from "./ArrayFieldTemplateItem";
import { isFieldContainsError } from "../utils";
-const AccordionArrayFieldTemplate = ({ items = [], formContext, id }) => {
+const AccordionArrayFieldTemplate = ({ items = [], id }) => {
if (items.length < 1) return null;
return (
@@ -12,13 +12,7 @@ const AccordionArrayFieldTemplate = ({ items = [], formContext, id }) => {
items={items.map((item, index) => ({
key: index,
label: `Item #${index + 1}`,
- children: (
-
- ),
+ children:
,
className: isFieldContainsError(item) && "collapseItemError",
}))}
/>
@@ -27,7 +21,6 @@ const AccordionArrayFieldTemplate = ({ items = [], formContext, id }) => {
AccordionArrayFieldTemplate.propTypes = {
items: PropTypes.array,
- formContext: PropTypes.object,
id: PropTypes.string,
};
diff --git a/src/forms/templates/ArrayFieldTemplates/ArrayFieldTemplate.jsx b/src/forms/templates/ArrayFieldTemplates/ArrayFieldTemplate.jsx
index 67194aa..6030512 100644
--- a/src/forms/templates/ArrayFieldTemplates/ArrayFieldTemplate.jsx
+++ b/src/forms/templates/ArrayFieldTemplates/ArrayFieldTemplate.jsx
@@ -24,8 +24,8 @@ const ArrayFieldTemplate = ({
canAdd,
className,
disabled,
- formContext,
- idSchema,
+ registry,
+ fieldPathId,
items,
options,
onAddClick,
@@ -37,6 +37,7 @@ const ArrayFieldTemplate = ({
formData,
}) => {
const { useToken } = theme;
+ const { formContext } = registry;
const { rowGutter = 24, hideAnchors } = formContext;
const [latexData, setLatexData] = useState(null);
@@ -71,21 +72,21 @@ const ArrayFieldTemplate = ({
),
accordion: (
),
default: items.map((itemProps, index) => (
)),
};
@@ -140,7 +141,7 @@ const ArrayFieldTemplate = ({
}, [emailModal]);
return (
-