@firecms/core 3.0.0-canary.6 → 3.0.0-canary.61

package/src/form/PropertyFieldBinding.tsx

@@ -92,7 +92,6 @@ function PropertyFieldBindingInternal<T extends CMSType = CMSType, M extends Rec
                 let Component: ComponentType<FieldProps<T>> | undefined;
                 const resolvedProperty: ResolvedProperty<T> | null = resolveProperty({
                     propertyKey,
-                    propertyValue: fieldProps.field.value,
                     propertyOrBuilder: property,
                     values: fieldProps.form.values,
                     path: context.path,
@@ -116,7 +115,6 @@ function PropertyFieldBindingInternal<T extends CMSType = CMSType, M extends Rec
                     }
                     const configProperty = resolveProperty({
                         propertyOrBuilder: propertyConfig.property,
-                        propertyValue: fieldProps.field.value,
                         values: fieldProps.form.values,
                         path: context.path,
                         entityId: context.entityId,

package/src/form/components/StorageItemPreview.tsx

@@ -1,9 +1,9 @@
 import React from "react";
 
-import { Entity, ResolvedStringProperty } from "../../types";
+import { Entity, EntityCollection, ResolvedStringProperty } from "../../types";
 import { PreviewSize, PropertyPreview } from "../../preview";
 
-import { cn, IconButton, paperMixin, RemoveIcon, Tooltip } from "@firecms/ui";
+import { cls, IconButton, paperMixin, RemoveIcon, Tooltip } from "@firecms/ui";
 import { ErrorBoundary } from "../../components";
 
 interface StorageItemPreviewProps {
@@ -14,6 +14,7 @@ interface StorageItemPreviewProps {
     onRemove: (value: string) => void;
     size: PreviewSize;
     disabled: boolean;
+    collection: EntityCollection;
 }
 
 export function StorageItemPreview({
@@ -23,11 +24,12 @@ export function StorageItemPreview({
                                        entity,
                                        onRemove,
                                        disabled,
-                                       size
+                                       size,
+                                       collection
                                    }: StorageItemPreviewProps) {
 
     return (
-        <div className={cn(paperMixin,
+        <div className={cls(paperMixin,
             "relative m-4 border-box flex items-center justify-center",
             size === "medium" ? "min-w-[220px] min-h-[220px] max-w-[220px]" : "min-w-[118px] min-h-[118px] max-w-[118px]")}>
 
@@ -54,7 +56,7 @@ export function StorageItemPreview({
                     <PropertyPreview propertyKey={name}
                                      value={value}
                                      property={property}
-                                     // entity={entity}
+                        // entity={entity}
                                      size={size}/>
                 </ErrorBoundary>
             }

package/src/form/components/StorageUploadProgress.tsx

@@ -3,7 +3,8 @@ import React, { useCallback } from "react";
 import { useSnackbarController, useStorageSource } from "../../hooks";
 import { StorageFieldItem } from "../../util/useStorageUploadController";
 import { ErrorView } from "../../components";
-import { cn, paperMixin, Skeleton } from "@firecms/ui";
+import { cls, paperMixin, Skeleton } from "@firecms/ui";
+import { EntityCollection, StorageSource } from "../../types";
 
 export interface StorageUploadItemProps {
     storagePath: string;
@@ -22,10 +23,10 @@ export function StorageUploadProgress({
                                           metadata,
                                           onFileUploadComplete,
                                           imageSize,
-                                          simple
+                                          simple,
                                       }: StorageUploadItemProps) {
 
-    const storage = useStorageSource();
+    const storageSource = useStorageSource();
 
     const snackbarController = useSnackbarController();
 
@@ -41,14 +42,14 @@ export function StorageUploadProgress({
         setError(undefined);
         setLoading(true);
 
-        storage.uploadFile({
+        storageSource.uploadFile({
             file,
             fileName,
             path: storagePath,
             metadata
         })
             .then(async ({ path }) => {
-                console.debug("Upload successful");
+                console.debug("Upload successful", path);
                 await onFileUploadComplete(path, entry, metadata);
                 if (mounted.current)
                     setLoading(false);
@@ -67,7 +68,7 @@ export function StorageUploadProgress({
             .finally(() => {
                 uploading.current = false;
             });
-    }, [entry, metadata, onFileUploadComplete, storage, storagePath]);
+    }, [entry, metadata, onFileUploadComplete, storageSource, storagePath]);
 
     React.useEffect(() => {
         mounted.current = true;
@@ -87,9 +88,9 @@ export function StorageUploadProgress({
     }
     return (
 
-        <div className={cn(paperMixin,
+        <div className={cls(paperMixin,
             "relative m-4 border-box flex items-center justify-center",
-             `min-w-[${imageSize}px] min-h-[${imageSize}px]`)}>
+            `min-w-[${imageSize}px] min-h-[${imageSize}px]`)}>
 
             {loading &&
                 <Skeleton className="w-full h-full"/>}

package/src/form/field_bindings/ArrayOfReferencesFieldBinding.tsx

@@ -6,7 +6,7 @@ import { ErrorView } from "../../components";
 import { getIconForProperty, getReferenceFrom } from "../../util";
 
 import { useNavigationController, useReferenceDialog } from "../../hooks";
-import { Button, ExpandablePanel } from "@firecms/ui";
+import { Button, cls, ExpandablePanel, fieldBackgroundMixin } from "@firecms/ui";
 import { useClearRestoreValue } from "../useClearRestoreValue";
 
 type ArrayOfReferencesFieldProps = FieldProps<EntityReference[]>;
@@ -38,7 +38,6 @@ export function ArrayOfReferencesFieldBinding({
     }
 
     const expanded = property.expanded === undefined ? true : property.expanded;
-    const [onHover, setOnHover] = React.useState(false);
     const selectedEntityIds = value && Array.isArray(value) ? value.map((ref) => ref.id) : [];
 
     useClearRestoreValue({
@@ -81,21 +80,19 @@ export function ArrayOfReferencesFieldBinding({
         if (!entryValue)
             return <div>Internal ERROR</div>;
         return (
-            <div
-                onMouseEnter={() => setOnHover(true)}
-                onMouseMove={() => setOnHover(true)}
-                onMouseLeave={() => setOnHover(false)}>
                 <ReferencePreview
+                    key={internalId}
                     disabled={!ofProperty.path}
                     previewProperties={ofProperty.previewProperties}
                     size={"medium"}
                     onClick={onEntryClick}
+                    hover={!disabled}
                     reference={entryValue}
-                    onHover={onHover}
+                    includeId={ofProperty.includeId}
+                    includeEntityLink={ofProperty.includeEntityLink}
                 />
-            </div>
         );
-    }, [ofProperty.path, ofProperty.previewProperties, onHover, value]);
+    }, [ofProperty.path, ofProperty.previewProperties, value]);
 
     const title = (
         <LabelWithIcon icon={getIconForProperty(property, "small")}
@@ -108,7 +105,7 @@ export function ArrayOfReferencesFieldBinding({
         {!collection && <ErrorView
             error={"The specified collection does not exist. Check console"}/>}
 
-        {collection && <>
+        {collection && <div className={"group"}>
 
             <FormikArrayContainer value={value}
                                   addLabel={property.name ? "Add reference to " + property.name : "Add reference"}
@@ -126,7 +123,7 @@ export function ArrayOfReferencesFieldBinding({
                 onClick={onEntryClick}>
                 Edit {property.name}
             </Button>
-        </>}
+        </div>}
     </>;
 
     return (
@@ -134,7 +131,8 @@ export function ArrayOfReferencesFieldBinding({
 
             {!tableMode &&
                 <ExpandablePanel
-                    className={"px-2 md:px-4 pb-2 md:pb-4 pt-1 md:pt-2"}
+                    titleClassName={fieldBackgroundMixin}
+                    className={cls("px-2 md:px-4 pb-2 md:pb-4 pt-1 md:pt-2", fieldBackgroundMixin)}
                     initiallyExpanded={expanded}
                     title={title}>
                     {body}

package/src/form/field_bindings/BlockFieldBinding.tsx

@@ -8,7 +8,7 @@ import { EnumValuesChip } from "../../preview";
 import { FieldProps, FormContext, PropertyFieldBindingProps, PropertyOrBuilder } from "../../types";
 import { getDefaultValueFor, getIconForProperty, } from "../../util";
 import { DEFAULT_ONE_OF_TYPE, DEFAULT_ONE_OF_VALUE } from "../../util/common";
-import { cn, ExpandablePanel, paperMixin, Select, SelectItem, Typography } from "@firecms/ui";
+import { cls, ExpandablePanel, paperMixin, Select, SelectItem, Typography } from "@firecms/ui";
 import { useClearRestoreValue } from "../useClearRestoreValue";
 
 /**
@@ -193,7 +193,7 @@ function BlockEntry({
     };
 
     return (
-        <div className={cn(paperMixin, "bg-transparent p-4 my-4 py-8")}>
+        <div className={cls(paperMixin, "bg-transparent p-4 my-4 py-8")}>
 
             <Field
                 name={typeFieldName}

package/src/form/field_bindings/DateTimeFieldBinding.tsx

@@ -43,7 +43,7 @@ export function DateTimeFieldBinding({
         <>
             <DateTimeField
                 value={internalValue}
-                onChange={(dateValue) => setValue(dateValue)}
+                onChange={(dateValue) => setValue(dateValue ?? null)}
                 size={"medium"}
                 mode={property.mode}
                 clearable={property.clearable}

package/src/form/field_bindings/KeyValueFieldBinding.tsx

@@ -8,7 +8,7 @@ import {
     ArrowDropDownIcon,
     BooleanSwitchWithLabel,
     Button,
-    cn,
+    cls,
     DateTimeField,
     defaultBorderMixin,
     ExpandablePanel,
@@ -32,20 +32,20 @@ type MapEditViewRowState = [number, {
  *
  * @group Form fields
  */
-export function KeyValueFieldBinding<T extends Record<string, any>>({
-                                                                        propertyKey,
-                                                                        value,
-                                                                        showError,
-                                                                        error,
-                                                                        disabled,
-                                                                        property,
-                                                                        setValue,
-                                                                        tableMode,
-                                                                        includeDescription,
-                                                                        underlyingValueHasChanged,
-                                                                        autoFocus,
-                                                                        context
-                                                                    }: FieldProps<T>) {
+export function KeyValueFieldBinding({
+                                         propertyKey,
+                                         value,
+                                         showError,
+                                         error,
+                                         disabled,
+                                         property,
+                                         setValue,
+                                         tableMode,
+                                         includeDescription,
+                                         underlyingValueHasChanged,
+                                         autoFocus,
+                                         context
+                                     }: FieldProps<Record<string, any>>) {
 
     const expanded = (property.expanded === undefined ? true : property.expanded) || autoFocus;
 
@@ -316,7 +316,7 @@ function MapKeyValueRow<T extends Record<string, any>>({
                                            }}/>;
         } else if (dataType === "array") {
             return <div
-                className={cn(defaultBorderMixin, "ml-2 pl-2 border-l border-solid")}>
+                className={cls(defaultBorderMixin, "ml-2 pl-2 border-l border-solid")}>
                 <ArrayContainer value={entryValue}
                                 newDefaultEntry={""}
                                 droppableId={rowId.toString()}
@@ -349,7 +349,7 @@ function MapKeyValueRow<T extends Record<string, any>>({
             </div>;
         } else if (dataType === "map") {
             return <div
-                className={cn(defaultBorderMixin, "ml-2 pl-2 border-l border-solid")}>
+                className={cls(defaultBorderMixin, "ml-2 pl-2 border-l border-solid")}>
                 <MapEditView value={entryValue}
                              fieldName={fieldKey}
                              setValue={(updatedValue) => {
@@ -482,7 +482,7 @@ function ArrayKeyValueRow<T>({
                 Arrays of arrays are not supported.
             </Typography>;
         } else if (dataType === "map") {
-            return <div className={cn(defaultBorderMixin, "ml-2 pl-2 border-l border-solid")}>
+            return <div className={cls(defaultBorderMixin, "ml-2 pl-2 border-l border-solid")}>
                 <MapEditView value={entryValue}
                              setValue={(updatedValue) => {
                                  setValue(updatedValue);
@@ -546,7 +546,7 @@ function getDataType(value: any): DataType | undefined {
         return "array";
     } else if (value instanceof Date) {
         return "date";
-    } else if (value.isEntityReference && value.isEntityReference()) {
+    } else if (value?.isEntityReference && value?.isEntityReference()) {
         return "reference";
     } else if (value instanceof GeoPoint) {
         return "geopoint";

package/src/form/field_bindings/MapFieldBinding.tsx

@@ -14,21 +14,21 @@ import { ExpandablePanel, InputLabel, Select, SelectItem } from "@firecms/ui";
  * and tables to the specified properties.
  * @group Form fields
  */
-export function MapFieldBinding<T extends Record<string, any>>({
-                                                                   propertyKey,
-                                                                   value,
-                                                                   showError,
-                                                                   error,
-                                                                   disabled,
-                                                                   property,
-                                                                   setValue,
-                                                                   partOfBlock,
-                                                                   tableMode,
-                                                                   includeDescription,
-                                                                   underlyingValueHasChanged,
-                                                                   autoFocus,
-                                                                   context
-                                                               }: FieldProps<T>) {
+export function MapFieldBinding({
+                                    propertyKey,
+                                    value,
+                                    showError,
+                                    error,
+                                    disabled,
+                                    property,
+                                    setValue,
+                                    partOfBlock,
+                                    tableMode,
+                                    includeDescription,
+                                    underlyingValueHasChanged,
+                                    autoFocus,
+                                    context
+                                }: FieldProps<Record<string, any>>) {
 
     const pickOnlySomeKeys = property.pickOnlySomeKeys || false;
     const expanded = (property.expanded === undefined ? true : property.expanded) || autoFocus;

package/src/form/field_bindings/MarkdownFieldBinding.tsx

@@ -8,7 +8,7 @@ import { FieldHelperText, LabelWithIcon } from "../components";
 import { FieldProps } from "../../types";
 import { getIconForProperty } from "../../util";
 import {
-    cn,
+    cls,
     fieldBackgroundDisabledMixin,
     fieldBackgroundHoverMixin,
     fieldBackgroundMixin,
@@ -81,7 +81,7 @@ export function MarkdownFieldBinding({
             </Typography>}
 
             <MdEditor value={internalValue ?? ""}
-                      className={cn(fieldBackgroundMixin,
+                      className={cls(fieldBackgroundMixin,
                           disabled ? fieldBackgroundDisabledMixin : fieldBackgroundHoverMixin,
                           "text-base")}
                       readOnly={disabled}

package/src/form/field_bindings/ReadOnlyFieldBinding.tsx

@@ -6,7 +6,7 @@ import { PropertyPreview } from "../../preview";
 import { FieldHelperText, LabelWithIcon } from "../components";
 import { ErrorBoundary } from "../../components";
 import { getIconForProperty } from "../../util";
-import { cn, paperMixin } from "@firecms/ui";
+import { cls, paperMixin } from "@firecms/ui";
 
 /**
  *
@@ -47,13 +47,13 @@ export function ReadOnlyFieldBinding({
             }
 
             <div
-                className={cn(paperMixin, "min-h-14 p-4 md:p-6 overflow-x-scroll no-scrollbar")}>
+                className={cls(paperMixin, "min-h-14 p-4 md:p-6 overflow-x-scroll no-scrollbar")}>
 
                 <ErrorBoundary>
                     <PropertyPreview propertyKey={propertyKey}
                                      value={value}
                                      property={property}
-                                     // entity={entity}
+                        // entity={entity}
                                      size={"medium"}/>
                 </ErrorBoundary>
 

package/src/form/field_bindings/ReferenceFieldBinding.tsx

@@ -27,19 +27,19 @@ export function ReferenceFieldBinding<M extends Record<string, any>>(props: Fiel
 
 }
 
-function ReferenceFieldBindingInternal<M extends Record<string, any>>({
-                                                                          value,
-                                                                          setValue,
-                                                                          error,
-                                                                          showError,
-                                                                          isSubmitting,
-                                                                          disabled,
-                                                                          touched,
-                                                                          autoFocus,
-                                                                          property,
-                                                                          includeDescription,
-                                                                          context
-                                                                      }: FieldProps<EntityReference>) {
+function ReferenceFieldBindingInternal({
+                                           value,
+                                           setValue,
+                                           error,
+                                           showError,
+                                           isSubmitting,
+                                           disabled,
+                                           touched,
+                                           autoFocus,
+                                           property,
+                                           includeDescription,
+                                           context
+                                       }: FieldProps<EntityReference>) {
     if (!property.path) {
         throw new Error("Property path is required for ReferenceFieldBinding");
     }
@@ -95,9 +95,12 @@ function ReferenceFieldBindingInternal<M extends Record<string, any>>({
                 {value && <ReferencePreview
                     disabled={!property.path}
                     previewProperties={property.previewProperties}
+                    hover={!disabled}
                     size={"medium"}
                     onClick={disabled || isSubmitting ? undefined : onEntryClick}
                     reference={value}
+                    includeEntityLink={property.includeEntityLink}
+                    includeId={property.includeId}
                 />}
 
                 {!value && <div className="justify-center text-left">

package/src/form/field_bindings/SelectFieldBinding.tsx

@@ -4,7 +4,7 @@ import { EnumType, FieldProps } from "../../types";
 import { FieldHelperText, LabelWithIcon } from "../components";
 import { EnumValuesChip } from "../../preview";
 import { getIconForProperty } from "../../util";
-import { ClearIcon, cn, IconButton, Select, SelectItem } from "@firecms/ui";
+import { ClearIcon, cls, IconButton, Select, SelectItem } from "@firecms/ui";
 import { useClearRestoreValue } from "../useClearRestoreValue";
 
 type SelectProps<T extends EnumType> = FieldProps<T>;
@@ -48,10 +48,10 @@ export function SelectFieldBinding<T extends EnumType>({
         <>
 
             <Select
-                value={value ? value.toString() : ""}
+                value={value !== undefined && value != null ? value.toString() : ""}
                 disabled={disabled}
                 position="item-aligned"
-                inputClassName={cn("w-full")}
+                inputClassName={cls("w-full")}
                 label={<LabelWithIcon icon={getIconForProperty(property, "small")}
                                       required={property.validation?.required}
                                       title={property.name}

package/src/form/field_bindings/StorageUploadFieldBinding.tsx

@@ -3,6 +3,7 @@ import React, { useCallback } from "react";
 import {
     ArrayProperty,
     Entity,
+    EntityCollection,
     FieldProps,
     ResolvedArrayProperty,
     ResolvedStringProperty,
@@ -10,16 +11,16 @@ import {
 } from "../../types";
 import { useDropzone } from "react-dropzone";
 import { PreviewSize } from "../../preview";
-import { FieldHelperText,LabelWithIcon } from "../components";
+import { FieldHelperText, LabelWithIcon } from "../components";
 
 import { getIconForProperty, isReadOnly } from "../../util";
-import {  useSnackbarController, useStorageSource } from "../../hooks";
+import { useSnackbarController, useStorageSource } from "../../hooks";
 import { DragDropContext, Draggable, Droppable } from "@hello-pangea/dnd";
 import { StorageFieldItem, useStorageUploadController } from "../../util/useStorageUploadController";
 import { StorageUploadProgress } from "../components/StorageUploadProgress";
 import { StorageItemPreview } from "../components/StorageItemPreview";
 import {
-    cn,
+    cls,
     fieldBackgroundDisabledMixin,
     fieldBackgroundHoverMixin,
     fieldBackgroundMixin,
@@ -55,13 +56,13 @@ export function StorageUploadFieldBinding({
                                               property,
                                               includeDescription,
                                               context,
-                                              isSubmitting
+                                              isSubmitting,
                                           }: StorageUploadFieldProps) {
 
     if (!context.entityId)
         throw new Error("StorageUploadFieldBinding: Entity id is null");
 
-    const storageSource = useStorageSource();
+    const storageSource = useStorageSource(context.collection);
     const disabled = isReadOnly(property) || !!property.disabled || isSubmitting;
 
     const {
@@ -108,6 +109,7 @@ export function StorageUploadFieldBinding({
 
             <StorageUpload
                 value={internalValue}
+                collection={context.collection}
                 name={propertyKey}
                 disabled={disabled}
                 autoFocus={autoFocus}
@@ -133,6 +135,7 @@ export function StorageUploadFieldBinding({
 
 function FileDropComponent({
                                storage,
+                               collection,
                                disabled,
                                isDraggingOver,
                                onFilesAdded,
@@ -151,6 +154,7 @@ function FileDropComponent({
                                helpText
                            }: {
     storage: StorageConfig,
+    collection: EntityCollection,
     disabled: boolean,
     isDraggingOver: boolean,
     droppableProvided: any,
@@ -199,7 +203,7 @@ function FileDropComponent({
     return (
         <div
             {...getRootProps()}
-            className={cn(
+            className={cls(
                 fieldBackgroundMixin,
                 disabled ? fieldBackgroundDisabledMixin : fieldBackgroundHoverMixin,
                 dropZoneClasses,
@@ -216,7 +220,7 @@ function FileDropComponent({
             <div
                 {...droppableProvided.droppableProps}
                 ref={droppableProvided.innerRef}
-                className={cn("flex items-center p-1 no-scrollbar",
+                className={cls("flex items-center p-1 no-scrollbar",
                     multipleFilesSupported && internalValue.length ? "overflow-auto" : "",
                     multipleFilesSupported && internalValue.length ? "min-h-[180px]" : "min-h-[250px]"
                 )}
@@ -231,6 +235,7 @@ function FileDropComponent({
                     if (entry.storagePathOrDownloadUrl) {
                         child = (
                             <StorageItemPreview
+                                collection={collection}
                                 name={`storage_preview_${entry.storagePathOrDownloadUrl}`}
                                 property={property}
                                 disabled={disabled}
@@ -263,7 +268,7 @@ function FileDropComponent({
                                     ref={provided.innerRef}
                                     {...provided.draggableProps}
                                     {...provided.dragHandleProps}
-                                    className={cn(focusedMixin, "rounded-md")}
+                                    className={cls(focusedMixin, "rounded-md")}
                                     style={{
                                         ...provided.draggableProps.style
                                     }}
@@ -294,6 +299,7 @@ function FileDropComponent({
 
 export interface StorageUploadProps {
     value: StorageFieldItem[];
+    collection: EntityCollection;
     setInternalValue: (v: StorageFieldItem[]) => void;
     name: string;
     property: ResolvedStringProperty | ResolvedArrayProperty<string[]>;
@@ -309,6 +315,7 @@ export interface StorageUploadProps {
 }
 
 export function StorageUpload({
+                                  collection,
                                   property,
                                   name,
                                   value,
@@ -321,7 +328,7 @@ export function StorageUpload({
                                   autoFocus,
                                   storage,
                                   entity,
-                                  storagePathBuilder
+                                  storagePathBuilder,
                               }: StorageUploadProps) {
 
     if (multipleFilesSupported) {
@@ -401,6 +408,7 @@ export function StorageUpload({
                             className="rounded"
                         >
                             <StorageItemPreview
+                                collection={collection}
                                 name={`storage_preview_${entry.storagePathOrDownloadUrl}`}
                                 property={renderProperty}
                                 disabled={true}
@@ -414,6 +422,7 @@ export function StorageUpload({
             >
                 {(provided, snapshot) => {
                     return <FileDropComponent storage={storage}
+                                              collection={collection}
                                               disabled={disabled}
                                               isDraggingOver={snapshot.isDraggingOver}
                                               droppableProvided={provided}

package/src/form/field_bindings/TextFieldBinding.tsx

@@ -7,7 +7,7 @@ import { getIconForProperty } from "../../util";
 import { PropertyPreview } from "../../preview";
 import { useClearRestoreValue } from "../useClearRestoreValue";
 
-interface TextFieldProps<T extends string | number> extends FieldProps<T> {
+interface TextFieldBindingProps<T extends string | number> extends FieldProps<T> {
     allowInfinity?: boolean
 }
 
@@ -18,6 +18,7 @@ interface TextFieldProps<T extends string | number> extends FieldProps<T> {
  * @group Form fields
  */
 export function TextFieldBinding<T extends string | number>({
+                                                                context,
                                                                 propertyKey,
                                                                 value,
                                                                 setValue,
@@ -27,7 +28,7 @@ export function TextFieldBinding<T extends string | number>({
                                                                 autoFocus,
                                                                 property,
                                                                 includeDescription,
-                                                            }: TextFieldProps<T>) {
+                                                            }: TextFieldBindingProps<T>) {
 
     let multiline: boolean | undefined;
     let url: boolean | PreviewType | undefined;
@@ -96,9 +97,10 @@ export function TextFieldBinding<T extends string | number>({
             {url && <Collapse
                 className="mt-1 ml-1"
                 in={Boolean(value)}>
-                <PropertyPreview value={value}
-                                 property={property}
-                                 size={"medium"}/>
+                <PropertyPreview
+                    value={value}
+                    property={property}
+                    size={"medium"}/>
             </Collapse>}
 
         </>