@firecms/core 3.0.1 → 3.1.0-canary.02232f4

package/src/form/field_bindings/MapFieldBinding.tsx

@@ -4,8 +4,10 @@ import { FieldProps, MapProperty, Properties, PropertyFieldBindingProps, Resolve
 import { ErrorBoundary } from "../../components";
 import { getIconForProperty, isHidden, isReadOnly, pick } from "../../util";
 import { FieldHelperText, LabelWithIconAndTooltip } from "../components";
+import { FormEntry } from "../components/FormEntry";
 import { PropertyFieldBinding } from "../PropertyFieldBinding";
-import { cls, ExpandablePanel, InputLabel, Select, SelectItem } from "@firecms/ui";
+import { cls, ExpandablePanel, InputLabel, Select, SelectItem, IconButton, CloseIcon } from "@firecms/ui";
+import { useTranslation } from "../../hooks";
 
 /**
  * Field that renders the children property fields
@@ -15,19 +17,20 @@ import { cls, ExpandablePanel, InputLabel, Select, SelectItem } from "@firecms/u
  * @group Form fields
  */
 export function MapFieldBinding({
-                                    propertyKey,
-                                    value,
-                                    showError,
-                                    error,
-                                    disabled,
-                                    property,
-                                    partOfArray,
-                                    minimalistView: minimalistViewProp,
-                                    includeDescription,
-                                    autoFocus,
-                                    context,
-                                    onPropertyChange
-                                }: FieldProps<Record<string, any>>) {
+    propertyKey,
+    value,
+    showError,
+    error,
+    disabled,
+    property,
+    partOfArray,
+    minimalistView: minimalistViewProp,
+    includeDescription,
+    autoFocus,
+    context,
+    onPropertyChange,
+    setValue
+}: FieldProps<Record<string, any>>) {
 
     const pickOnlySomeKeys = property.pickOnlySomeKeys || false;
     const expanded = property.expanded === undefined ? true : property.expanded;
@@ -52,81 +55,96 @@ export function MapFieldBinding({
     }
 
     const mapFormView = <>
-            <div
-                className={cls("py-1 flex flex-col space-y-2", minimalistView && property.widthPercentage !== undefined ? "mt-8" : undefined)}>
-                {Object.entries(mapProperties)
-                    .filter(([_, property]) => !isHidden(property))
-                    .map(([entryKey, childProperty], index) => {
-                            const thisDisabled = isReadOnly(childProperty) || Boolean(childProperty.disabled);
-                            const fieldBindingProps: PropertyFieldBindingProps<any> = {
-                                propertyKey: `${propertyKey}.${entryKey}`,
-                                disabled: disabled || thisDisabled,
-                                property: childProperty,
-                                includeDescription,
-                                context,
-                                partOfArray: false,
-                                minimalistView: false,
-                                autoFocus: autoFocus && index === 0,
-                                onPropertyChange: function (updatedProperty) {
-                                    onPropertyChange?.({
-                                        properties: {
-                                            [entryKey]: updatedProperty
-                                        }
-                                    } as Partial<MapProperty>);
+        <div
+            className={cls("py-1 flex flex-wrap gap-x-4 w-full space-y-2", minimalistView && property.widthPercentage !== undefined ? "mt-8" : undefined)}>
+            {Object.entries(mapProperties)
+                .filter(([_, property]) => !isHidden(property))
+                .map(([entryKey, childProperty], index) => {
+                    const thisDisabled = isReadOnly(childProperty) || Boolean(childProperty.disabled);
+                    const fieldBindingProps: PropertyFieldBindingProps<any> = {
+                        propertyKey: `${propertyKey}.${entryKey}`,
+                        disabled: disabled || thisDisabled,
+                        property: childProperty,
+                        includeDescription,
+                        context,
+                        partOfArray: false,
+                        minimalistView: false,
+                        autoFocus: autoFocus && index === 0,
+                        onPropertyChange: function (updatedProperty) {
+                            onPropertyChange?.({
+                                properties: {
+                                    [entryKey]: updatedProperty
                                 }
-                            };
-
-                            return (
-                                <div key={`map-${propertyKey}-${index}`} className={"relative"}>
-                                    <ErrorBoundary>
-                                        <PropertyFieldBinding
-                                            {...fieldBindingProps}/>
-                                    </ErrorBoundary>
-                                </div>
-                            )                                ;
+                            } as Partial<MapProperty>);
                         }
-                    )
+                    };
+
+                    const widthPercentage = childProperty.widthPercentage ?? 100;
+                    return (
+                        <FormEntry propertyKey={`${propertyKey}.${entryKey}`}
+                            widthPercentage={widthPercentage}
+                            key={`map-${propertyKey}-${index}`}>
+                            <PropertyFieldBinding
+                                {...fieldBindingProps} />
+                        </FormEntry>
+                    );
                 }
-            </div>
+                )
+            }
+        </div>
 
-            {/*{pickOnlySomeKeys && buildPickKeysSelect(disabled, property.properties, setValue, value)}*/}
+        {/*{pickOnlySomeKeys && buildPickKeysSelect(disabled, property.properties, setValue, value, t)}*/}
 
-        </>
-    ;
+    </>
+        ;
 
     return (
         <ErrorBoundary>
 
             {!minimalistView && <ExpandablePanel initiallyExpanded={expanded}
-                                                 onExpandedChange={(expanded) => {
-                                                     onPropertyChange?.({
-                                                         expanded
-                                                     });
-                                                 }}
-                                                 className={property.widthPercentage !== undefined ? "mt-8" : undefined}
-                                                 innerClassName={"px-2 md:px-4 pb-2 md:pb-4 pt-1 md:pt-2 bg-white dark:bg-surface-900"}
-                                                 title={<LabelWithIconAndTooltip
-                                                     propertyKey={propertyKey}
-                                                     icon={getIconForProperty(property, "small")}
-                                                     required={property.validation?.required}
-                                                     title={property.name}
-                                                     className={"text-text-secondary dark:text-text-secondary-dark"}/>}>
+                onExpandedChange={(expanded) => {
+                    onPropertyChange?.({
+                        expanded
+                    });
+                }}
+                className={property.widthPercentage !== undefined ? "mt-8" : undefined}
+                innerClassName={"px-2 md:px-4 pb-2 md:pb-4 pt-1 md:pt-2 bg-white dark:bg-surface-900"}
+                title={<div className="flex items-center w-full">
+                    <LabelWithIconAndTooltip
+                        propertyKey={propertyKey}
+                        icon={getIconForProperty(property, "small")}
+                        required={property.validation?.required}
+                        title={property.name}
+                        className={"text-text-secondary dark:text-text-secondary-dark flex-grow"} />
+                    {(property.nullable || property.clearable) && !disabled && (
+                        <IconButton
+                            size="small"
+                            onClick={(e) => {
+                                e.stopPropagation();
+                                e.preventDefault();
+                                setValue(null);
+                            }}
+                        >
+                            <CloseIcon size={"small"}/>
+                        </IconButton>
+                    )}
+                </div>}>
                 {mapFormView}
             </ExpandablePanel>}
 
             {minimalistView && mapFormView}
 
             <FieldHelperText includeDescription={includeDescription}
-                             showError={showError ?? false}
-                             error={error && !partOfArray ? (typeof error === "string" ? error : "A property of this map has an error") : undefined}
-                             disabled={disabled}
-                             property={property}/>
+                showError={showError ?? false}
+                error={error && !partOfArray ? (typeof error === "string" ? error : "A property of this map has an error") : undefined}
+                disabled={disabled}
+                property={property} />
 
         </ErrorBoundary>
     );
 }
 
-const buildPickKeysSelect = (disabled: boolean, properties: Properties, setValue: (value: any) => void, value: any) => {
+const buildPickKeysSelect = (disabled: boolean, properties: Properties, setValue: (value: any) => void, value: any, t: any) => {
 
     const keys = Object.keys(properties)
         .filter((key) => !value || !(key in value));
@@ -141,7 +159,7 @@ const buildPickKeysSelect = (disabled: boolean, properties: Properties, setValue
     if (!keys.length) return <></>;
 
     return <div className={"m-4"}>
-        <InputLabel>Add property</InputLabel>
+        <InputLabel>{t("add_property")}</InputLabel>
         <Select
             value={""}
             size={"large"}
@@ -150,7 +168,7 @@ const buildPickKeysSelect = (disabled: boolean, properties: Properties, setValue
             onValueChange={handleAddProperty}
             renderValue={(key) => (properties as Properties)[key].name || key}>
             {keys.map((key) => <SelectItem key={key}
-                                           value={key}>{(properties as Properties)[key].name || key}</SelectItem>)}
+                value={key}>{(properties as Properties)[key].name || key}</SelectItem>)}
         </Select>
     </div>;
 };

package/src/form/field_bindings/MarkdownEditorFieldBinding.tsx

@@ -11,9 +11,14 @@ import {
     useAuthController,
     useStorageSource
 } from "../../index";
-import { cls, fieldBackgroundDisabledMixin, fieldBackgroundHoverMixin, fieldBackgroundMixin } from "@firecms/ui";
-import { FireCMSEditor, FireCMSEditorProps } from "@firecms/editor";
+import { cls, fieldBackgroundDisabledMixin, fieldBackgroundHoverMixin, fieldBackgroundMixin, IconButton, CloseIcon } from "@firecms/ui";
+import type { FireCMSEditorProps } from "../../editor";
 import { resolveProperty, resolveStorageFilenameString, resolveStoragePathString } from "../../util";
+import { isImageFile, resizeImage } from "../../util/useStorageUploadController";
+import { lazyEager } from "../../util/lazy_eager";
+import { CircularProgressCenter } from "../../components/CircularProgressCenter";
+
+const FireCMSEditor = lazyEager<typeof import("../../editor/editor")["FireCMSEditor"]>(() => import("../../editor/editor"), "FireCMSEditor");
 
 interface MarkdownEditorFieldProps {
     highlight?: { from: number, to: number };
@@ -21,19 +26,19 @@ interface MarkdownEditorFieldProps {
 }
 
 export function MarkdownEditorFieldBinding({
-                                               property,
-                                               propertyKey,
-                                               value,
-                                               setValue,
-                                               includeDescription,
-                                               showError,
-                                               error,
-                                               minimalistView,
-                                               disabled: disabledProp,
-                                               isSubmitting,
-                                               context,
-                                               customProps,
-                                           }: FieldProps<string, MarkdownEditorFieldProps>) {
+    property,
+    propertyKey,
+    value,
+    setValue,
+    includeDescription,
+    showError,
+    error,
+    minimalistView,
+    disabled: disabledProp,
+    isSubmitting,
+    context,
+    customProps,
+}: FieldProps<string, MarkdownEditorFieldProps>) {
 
     const authController = useAuthController();
     const disabled = disabledProp || isSubmitting;
@@ -50,22 +55,22 @@ export function MarkdownEditorFieldBinding({
     const internalValue = useRef<string | null>(value);
 
     const onContentChange = useCallback((content: string) => {
-        if (content === value || (value === null && content === "")) {
+        if (content === value || ((value === null || value === undefined) && content === "")) {
             return;
         }
         internalValue.current = content;
         setValue(content);
-    }, [setValue]);
+    }, [setValue, value]);
 
     useEffect(() => {
         if (internalValue.current !== value) {
             internalValue.current = value;
-            setFieldVersion(fieldVersion + 1);
+            setFieldVersion(v => v + 1);
         }
     }, [value]);
 
     const resolvedProperty = resolveProperty({
-        propertyOrBuilder: property as PropertyOrBuilder,
+        propertyOrBuilder: property as PropertyOrBuilder<string>,
         values: entityValues,
         authController
     }) as ResolvedStringProperty | ResolvedArrayProperty<string[]>;
@@ -109,49 +114,85 @@ export function MarkdownEditorFieldBinding({
         }) ?? "/";
     }, [entityId, entityValues, path, property, propertyKey, storage]);
 
-    const editor = <FireCMSEditor
-        content={value}
-        onMarkdownContentChange={onContentChange}
-        version={context.formex.version + fieldVersion}
-        highlight={highlight}
-        disabled={disabled}
-        handleImageUpload={async (file: File) => {
-            const storagePath = storagePathBuilder(file);
-            const fileName = await fileNameBuilder(file);
-            const result = await storageSource.uploadFile({
-                file,
-                fileName,
-                path: storagePath,
-            });
-            const downloadConfig = await storageSource.getDownloadURL(result.path);
-            const url = downloadConfig.url;
-            if (!url) {
-                throw new Error("Error uploading image");
-            }
-            return url;
-        }}
-        {...editorProps}
-    />;
+    // Extract markdown config from property - can be boolean or object
+    const markdownConfig = typeof property.markdown === 'object' ? property.markdown : undefined;
+
+    const handleImageUpload = async (file: File) => {
+        const imageResize = storage?.imageResize;
+        const legacyCompression = storage?.imageCompression;
+        if ((imageResize || legacyCompression) && isImageFile(file)) {
+            file = await resizeImage(file, imageResize, legacyCompression);
+        }
+
+        const storagePath = storagePathBuilder(file);
+        const fileName = await fileNameBuilder(file);
+        const result = await storageSource.uploadFile({
+            file,
+            fileName,
+            path: storagePath,
+        });
+        const downloadConfig = await storageSource.getDownloadURL(result.path);
+        const url = downloadConfig.url;
+        if (!url) {
+            throw new Error("Error uploading image");
+        }
+        return url;
+    };
+
+    const editor = (
+        <React.Suspense fallback={<CircularProgressCenter />}>
+            <FireCMSEditor
+                key={context.formex.version + fieldVersion}
+                content={value}
+                onMarkdownContentChange={onContentChange}
+                version={context.formex.version + fieldVersion}
+                highlight={highlight}
+                disabled={disabled}
+                markdownConfig={markdownConfig}
+                handleImageUpload={handleImageUpload}
+                {...editorProps}
+            />
+        </React.Suspense>
+    );
 
     if (minimalistView)
-        return editor;
+        return (
+            <>
+                {editor}
+            </>
+        );
 
     return (
         <>
-            <LabelWithIconAndTooltip
-                propertyKey={propertyKey}
-                icon={getIconForProperty(property, "small")}
-                required={property.validation?.required}
-                title={property.name}
-                className={"h-8 text-text-secondary dark:text-text-secondary-dark ml-3.5"}/>
+            <div className="flex items-center w-full">
+                <LabelWithIconAndTooltip
+                    propertyKey={propertyKey}
+                    icon={getIconForProperty(property, "small")}
+                    required={property.validation?.required}
+                    title={property.name}
+                    className={"h-8 text-text-secondary dark:text-text-secondary-dark ml-3.5"} />
+                <div className="flex-grow"/>
+                {(property.nullable || property.clearable) && !disabled && (
+                    <IconButton
+                        size="small"
+                        onClick={(e) => {
+                            e.stopPropagation();
+                            e.preventDefault();
+                            setValue(null);
+                        }}
+                    >
+                        <CloseIcon size={"small"}/>
+                    </IconButton>
+                )}
+            </div>
             <div
                 className={cls("rounded-md", fieldBackgroundMixin, disabled ? fieldBackgroundDisabledMixin : fieldBackgroundHoverMixin)}>
                 {editor}
             </div>
             <FieldHelperText includeDescription={includeDescription}
-                             showError={showError}
-                             error={error}
-                             property={property}/>
+                showError={showError}
+                error={error}
+                property={property} />
         </>
 
     );

package/src/form/field_bindings/MultiSelectFieldBinding.tsx

@@ -4,7 +4,7 @@ import { EnumType, FieldProps, ResolvedProperty } from "../../types";
 import { FieldHelperText, LabelWithIconAndTooltip } from "../components";
 import { EnumValuesChip } from "../../preview";
 import { enumToObjectEntries, getIconForProperty, getLabelOrConfigFrom } from "../../util";
-import { CloseIcon, MultiSelect, MultiSelectItem } from "@firecms/ui";
+import { CloseIcon, MultiSelect, MultiSelectItem, IconButton } from "@firecms/ui";
 import { useClearRestoreValue } from "../useClearRestoreValue";
 
 /**
@@ -93,6 +93,20 @@ export function MultiSelectFieldBinding({
                     required={property.validation?.required}
                     title={property.name}
                     className={"h-8 text-text-secondary dark:text-text-secondary-dark ml-3.5"}/>}
+                endAdornment={
+                    (property.nullable || property.clearable) && !disabled && value !== null && value !== undefined ? (
+                        <IconButton
+                            size="small"
+                            onClick={(e) => {
+                                e.stopPropagation();
+                                e.preventDefault();
+                                setValue(null);
+                            }}
+                        >
+                            <CloseIcon size={"small"}/>
+                        </IconButton>
+                    ) : undefined
+                }
                 onValueChange={(updatedValue: string[]) => {
                     let newValue: EnumType[] | null;
                     if (of && (of as ResolvedProperty)?.dataType === "number") {

package/src/form/field_bindings/ReferenceAsStringFieldBinding.tsx

@@ -8,7 +8,7 @@ import { ReferencePreview } from "../../preview";
 import { getIconForProperty, IconForView } from "../../util";
 import { useClearRestoreValue } from "../useClearRestoreValue";
 import { EntityPreviewContainer } from "../../components/EntityPreview";
-import { cls } from "@firecms/ui";
+import { cls, IconButton, CloseIcon } from "@firecms/ui";
 
 /**
  * Field that opens a reference selection dialog and stores the entity ID as a string.
@@ -98,16 +98,30 @@ function ReferenceAsStringFieldBindingInternal({
 
             {collection && <>
 
-                {referenceValue && <ReferencePreview
-                    disabled={!path}
-                    previewProperties={property.reference?.previewProperties}
-                    hover={!disabled}
-                    size={size}
-                    onClick={disabled || isSubmitting ? undefined : onEntryClick}
-                    reference={referenceValue}
-                    includeEntityLink={property.reference?.includeEntityLink}
-                    includeId={property.reference?.includeId}
-                />}
+                {referenceValue && <div className="flex items-center gap-2">
+                    <ReferencePreview
+                        disabled={!path}
+                        previewProperties={property.reference?.previewProperties}
+                        hover={!disabled}
+                        size={size}
+                        onClick={disabled || isSubmitting ? undefined : onEntryClick}
+                        reference={referenceValue}
+                        includeEntityLink={property.reference?.includeEntityLink}
+                        includeId={property.reference?.includeId}
+                    />
+                    {(property.nullable || property.clearable) && !disabled && (
+                        <IconButton
+                            size="small"
+                            onClick={(e) => {
+                                e.stopPropagation();
+                                e.preventDefault();
+                                setValue(null);
+                            }}
+                        >
+                            <CloseIcon size={"small"}/>
+                        </IconButton>
+                    )}
+                </div>}
 
                 {!value && <div className="justify-center text-left">
                     <EntityPreviewContainer

package/src/form/field_bindings/ReferenceFieldBinding.tsx

@@ -9,7 +9,7 @@ import { EmptyValue, ReferencePreview } from "../../preview";
 import { getIconForProperty, getReferenceFrom, IconForView } from "../../util";
 import { useClearRestoreValue } from "../useClearRestoreValue";
 import { EntityPreviewContainer } from "../../components/EntityPreview";
-import { cls } from "@firecms/ui";
+import { cls, IconButton, CloseIcon } from "@firecms/ui";
 
 /**
  * Field that opens a reference selection dialog.
@@ -97,16 +97,30 @@ function ReferenceFieldBindingInternal({
 
             {collection && <>
 
-                {value && <ReferencePreview
-                    disabled={!property.path}
-                    previewProperties={property.previewProperties}
-                    hover={!disabled}
-                    size={size}
-                    onClick={disabled || isSubmitting ? undefined : onEntryClick}
-                    reference={value}
-                    includeEntityLink={property.includeEntityLink}
-                    includeId={property.includeId}
-                />}
+                {value && <div className="flex items-center gap-2">
+                    <ReferencePreview
+                        disabled={!property.path}
+                        previewProperties={property.previewProperties}
+                        hover={!disabled}
+                        size={size}
+                        onClick={disabled || isSubmitting ? undefined : onEntryClick}
+                        reference={value}
+                        includeEntityLink={property.includeEntityLink}
+                        includeId={property.includeId}
+                    />
+                    {(property.nullable || property.clearable) && !disabled && (
+                        <IconButton
+                            size="small"
+                            onClick={(e) => {
+                                e.stopPropagation();
+                                e.preventDefault();
+                                setValue(null);
+                            }}
+                        >
+                            <CloseIcon size={"small"}/>
+                        </IconButton>
+                    )}
+                </div>}
 
                 {!value && <div className="justify-center text-left">
                     <EntityPreviewContainer className={cls("px-6 h-16 text-sm font-medium flex items-center gap-6",

package/src/form/field_bindings/RepeatFieldBinding.tsx

@@ -4,9 +4,10 @@ import { FieldHelperText, LabelWithIconAndTooltip } from "../components";
 import { ArrayContainer, ArrayEntryParams, ErrorBoundary } from "../../components";
 import { getArrayResolvedProperties, getDefaultValueFor, getIconForProperty, mergeDeep } from "../../util";
 import { PropertyFieldBinding } from "../PropertyFieldBinding";
-import { ExpandablePanel, Typography } from "@firecms/ui";
+import { ExpandablePanel, Typography, IconButton, CloseIcon } from "@firecms/ui";
 import { useClearRestoreValue } from "../useClearRestoreValue";
 import { useAuthController } from "../../hooks";
+import { useTranslation } from "../../hooks/useTranslation";
 
 /**
  * Generic array field that allows reordering and renders the child property
@@ -34,6 +35,7 @@ export function RepeatFieldBinding<T extends Array<any>>({
 
     const authController = useAuthController();
     const minimalistView = minimalistViewProp || property.minimalistView;
+    const { t } = useTranslation();
 
     if (!property.of)
         throw Error("RepeatFieldBinding misconfiguration. Property `of` not set");
@@ -87,7 +89,7 @@ export function RepeatFieldBinding<T extends Array<any>>({
     const canAddElements = !property.disabled && !isSubmitting && !disabled && (property.canAddElements || property.canAddElements === undefined);
     const sortable = property.sortable === undefined ? true : property.sortable;
     const arrayContainer = <ArrayContainer droppableId={propertyKey}
-                                           addLabel={property.name ? "Add entry to " + property.name : "Add entry"}
+                                           addLabel={property.name ? t("add_to_field", { fieldName: property.name }) : t("add_entry")}
                                            value={value}
                                            buildEntry={buildEntry}
                                            onInternalIdAdded={setLastAddedId}
@@ -99,15 +101,28 @@ export function RepeatFieldBinding<T extends Array<any>>({
                                            className={property.widthPercentage !== undefined ? "mt-8" : undefined}
     />;
 
-    const title = (<>
+    const title = (<div className="flex items-center w-full">
         <LabelWithIconAndTooltip
             propertyKey={propertyKey}
             icon={getIconForProperty(property, "small")}
             required={property.validation?.required}
             title={property.name}
-            className={"h-8 flex flex-grow text-text-secondary dark:text-text-secondary-dark"}/>
-        {Array.isArray(value) && <Typography variant={"caption"} className={"px-4"}>({value.length})</Typography>}
-    </>);
+            className={"text-text-secondary dark:text-text-secondary-dark"}/>
+        {Array.isArray(value) && <span className={"text-sm text-text-secondary dark:text-text-secondary-dark ml-1"}>({value.length})</span>}
+        <div className="flex-grow"/>
+        {(property.nullable || property.clearable) && !disabled && (
+            <IconButton
+                size="small"
+                onClick={(e) => {
+                    e.stopPropagation();
+                    e.preventDefault();
+                    setValue(null);
+                }}
+            >
+                <CloseIcon size={"small"}/>
+            </IconButton>
+        )}
+    </div>);
 
     return (
 

package/src/form/field_bindings/SelectFieldBinding.tsx

@@ -66,11 +66,13 @@ export function SelectFieldBinding<T extends EnumType>({
                         />
                     </PropertyIdCopyTooltip>}
                 endAdornment={
-                    property.clearable && !disabled && <IconButton
-                        size="small"
-                        onClick={handleClearClick}>
-                        <CloseIcon size={"small"}/>
-                    </IconButton>
+                    (property.nullable || property.clearable) && !disabled && value !== null && value !== undefined ? (
+                        <IconButton
+                            size="small"
+                            onClick={handleClearClick}>
+                            <CloseIcon size={"small"}/>
+                        </IconButton>
+                    ) : undefined
                 }
                 onValueChange={(updatedValue: string) => {
                     const newValue = updatedValue