@firecms/core 3.0.0-beta.1 → 3.0.0-beta.11

package/src/components/ArrayContainer.tsx

@@ -3,31 +3,44 @@ import React, { useCallback, useEffect, useRef, useState } from "react";
 import { DragDropContext, Draggable, DraggableProvided, Droppable } from "@hello-pangea/dnd";
 
 import { getHashValue } from "../util";
-import useMeasure from "react-use-measure";
 import {
     AddIcon,
     Button,
+    cls,
     ContentCopyIcon,
-    fieldBackgroundHoverMixin,
+    HandleIcon,
     IconButton,
+    KeyboardArrowDownIcon,
+    KeyboardArrowUpIcon,
     Menu,
     MenuItem,
-    MoreVertIcon,
     RemoveIcon,
-    Tooltip
+    Tooltip,
+    useOutsideAlerter
 } from "@firecms/ui";
 
-interface ArrayContainerProps<T> {
+export type ArrayEntryParams = {
+    index: number,
+    internalId: number,
+    isDragging: boolean,
+    storedProps?: object,
+    storeProps: (props: object) => void
+};
+
+export type ArrayEntryBuilder = (params: ArrayEntryParams) => React.ReactNode;
+
+export interface ArrayContainerProps<T> {
     droppableId: string;
     value: T[];
     addLabel: string;
-    buildEntry: (index: number, internalId: number) => React.ReactNode;
+    buildEntry: ArrayEntryBuilder;
     disabled?: boolean;
     size?: "small" | "medium";
     onInternalIdAdded?: (id: number) => void;
     includeAddButton?: boolean;
     newDefaultEntry: T;
-    onValueChange: (value: T[]) => void
+    onValueChange: (value: T[]) => void,
+    className?: string;
 }
 
 const buildIdsMap = (value: any[]) =>
@@ -49,11 +62,12 @@ export function ArrayContainer<T>({
                                       value,
                                       disabled = false,
                                       buildEntry,
-                                      size,
+                                      size = "medium",
                                       onInternalIdAdded,
                                       includeAddButton,
                                       newDefaultEntry,
-                                      onValueChange
+                                      onValueChange,
+                                      className
                                   }: ArrayContainerProps<T>) {
 
     const hasValue = value && Array.isArray(value) && value.length > 0;
@@ -66,6 +80,12 @@ export function ArrayContainer<T>({
             ? Object.values(internalIdsRef.current)
             : []);
 
+    const itemCustomPropsRef = useRef<Record<number, object>>({});
+
+    const updateItemCustomProps = useCallback((internalId: number, customProps: object) => {
+        itemCustomPropsRef.current[internalId] = customProps;
+    }, []);
+
     useEffect(() => {
         if (hasValue && value && value.length !== internalIds.length) {
             const newInternalIds = value.map((v, index) => {
@@ -114,6 +134,18 @@ export function ArrayContainer<T>({
         onValueChange([...value.slice(0, index + 1), copyingItem, ...value.slice(index + 1)]);
     };
 
+    const addInIndex = (index: number) => {
+        const id = getRandomId();
+        const newIds: number[] = [
+            ...internalIds.splice(0, index),
+            id,
+            ...internalIds.slice(index)];
+        if (onInternalIdAdded)
+            onInternalIdAdded(id);
+        setInternalIds(newIds);
+        onValueChange([...value.slice(0, index), newDefaultEntry, ...value.slice(index)]);
+    }
+
     const onDragEnd = (result: any) => {
         // dropped outside the list
         if (!result.destination) {
@@ -148,12 +180,16 @@ export function ArrayContainer<T>({
                                    remove={remove}
                                    copy={copy}
                                    isDragging={snapshot.isDragging}
+                                   storedProps={itemCustomPropsRef.current[internalId]}
+                                   updateItemCustomProps={updateItemCustomProps}
+                                   addInIndex={addInIndex}
                                />
                            );
                        }}
             >
                 {(droppableProvided, droppableSnapshot) => (
                     <div
+                        className={cls("space-y-1", className)}
                         {...droppableProvided.droppableProps}
                         ref={droppableProvided.innerRef}>
                         {hasValue && internalIds.map((internalId: number, index: number) => {
@@ -174,6 +210,9 @@ export function ArrayContainer<T>({
                                             remove={remove}
                                             copy={copy}
                                             isDragging={snapshot.isDragging}
+                                            storedProps={itemCustomPropsRef.current[internalId]}
+                                            updateItemCustomProps={updateItemCustomProps}
+                                            addInIndex={addInIndex}
                                         />
                                     )}
                                 </Draggable>
@@ -206,10 +245,13 @@ type ArrayContainerItemProps = {
     internalId: number,
     size?: "small" | "medium",
     disabled: boolean,
-    buildEntry: (index: number, internalId: number) => React.ReactNode,
+    buildEntry: ArrayEntryBuilder,
     remove: (index: number) => void,
     copy: (index: number) => void,
+    addInIndex?: (index: number) => void,
     isDragging: boolean,
+    storedProps?: object,
+    updateItemCustomProps: (internalId: number, props: object) => void
 };
 
 export function ArrayContainerItem({
@@ -220,44 +262,39 @@ export function ArrayContainerItem({
                                        disabled,
                                        buildEntry,
                                        remove,
+                                       addInIndex,
                                        copy,
-                                       isDragging
+                                       isDragging,
+                                       storedProps,
+                                       updateItemCustomProps
                                    }: ArrayContainerItemProps) {
 
-    const [measureRef, bounds] = useMeasure();
-
-    const measuring = size !== "small" && bounds.height === 0;
-    const menuOverflow = size !== "small" && bounds.height < 100;
-
-    const [onHover, setOnHover] = React.useState(false);
-    const setOnHoverTrue = useCallback(() => setOnHover(true), []);
-    const setOnHoverFalse = useCallback(() => setOnHover(false), []);
-
     return <div
-        onMouseEnter={setOnHoverTrue}
-        onMouseMove={setOnHoverTrue}
-        onMouseLeave={setOnHoverFalse}
         ref={provided.innerRef}
         {...provided.draggableProps}
         style={provided.draggableProps.style}
         className={`${
-            (isDragging || onHover) ? fieldBackgroundHoverMixin : ""
-        } mb-1 rounded-md opacity-100`}
+            !isDragging ? "hover:bg-surface-accent-50 dark:hover:bg-surface-800 dark:hover:bg-opacity-20" : ""
+        } rounded-md opacity-100`}
     >
         <div
             className="flex items-start">
-            <div ref={measureRef}
-                 className="flex-grow w-[calc(100%-48px)] text-text-primary dark:text-text-primary-dark"
-            >
-                {buildEntry(index, internalId)}
+            <div
+                className="flex-grow w-[calc(100%-48px)] text-text-primary dark:text-text-primary-dark">
+                {buildEntry({
+                    index,
+                    internalId,
+                    isDragging,
+                    storedProps,
+                    storeProps: (props: object) => updateItemCustomProps(internalId, props)
+                })}
             </div>
             <ArrayItemOptions direction={size === "small" ? "row" : "column"}
                               disabled={disabled}
                               remove={remove}
                               index={index}
                               provided={provided}
-                              measuring={measuring}
-                              contentOverflow={menuOverflow}
+                              addInIndex={addInIndex}
                               copy={copy}/>
         </div>
     </div>;
@@ -270,90 +307,85 @@ export function ArrayItemOptions({
                                      index,
                                      provided,
                                      copy,
-                                     contentOverflow,
-                                     measuring
+                                     addInIndex
                                  }: {
     direction?: "row" | "column",
-    contentOverflow: boolean,
-    measuring: boolean,
     disabled: boolean,
     remove: (index: number) => void,
     index: number,
     provided: any,
-    copy: (index: number) => void
+    copy: (index: number) => void,
+    addInIndex?: (index: number) => void
 }) {
 
-    return <div className={`p-1 flex ${direction === "row" ? "flex-row-reverse" : "flex-col"} items-center`}
-                {...provided.dragHandleProps}
-    >
+    const [menuOpen, setMenuOpen] = useState(false);
+
+    const iconRef = React.useRef<HTMLDivElement>(null);
+    useOutsideAlerter(iconRef, () => setMenuOpen(false));
+
+    return <div className={`pl-2 pt-1 pb-1 flex ${direction === "row" ? "flex-row-reverse" : "flex-col"} items-center`}
+                ref={iconRef}
+                {...provided.dragHandleProps}>
         <Tooltip
+            delayDuration={400}
+            open={menuOpen ? false : undefined}
             side={direction === "column" ? "left" : undefined}
-            title="Move">
+            title="Drag to move. Click for more options">
             <IconButton
                 size="small"
                 disabled={disabled}
+                onClick={(e) => {
+                    e.preventDefault();
+                    setMenuOpen(true);
+                }}
+                onDragStart={(e: any) => {
+                    setMenuOpen(false);
+                }}
                 className={`cursor-${disabled ? "inherit" : "grab"}`}>
-                {/* TODO: for some reason, the icon as a span does not work with Drag and Drop
-                */}
-                <svg focusable="false"
-                     fill={"currentColor"}
-                     aria-hidden="true" viewBox="0 0 24 24">
-                    <path d="M20 9H4v2h16V9zM4 15h16v-2H4v2z"></path>
-                </svg>
-                {/*<DragHandleIcon*/}
-                {/*    size={"small"}*/}
-                {/*    color={disabled ? "disabled" : "inherit"}/>*/}
+                <HandleIcon/>
             </IconButton>
-        </Tooltip>
-
-        {!measuring && !contentOverflow && <>
-            <Tooltip
-                title="Remove"
-                side={direction === "column" ? "left" : undefined}>
-                <IconButton
-                    size="small"
-                    aria-label="remove"
-                    disabled={disabled}
-                    onClick={() => remove(index)}>
-                    <RemoveIcon
-                        size={"small"}/>
-                </IconButton>
-            </Tooltip>
-
-            <Tooltip
-                side={direction === "column" ? "left" : undefined}
-                title="Copy in this position">
-                <IconButton
-                    size="small"
-                    aria-label="copy"
-                    disabled={disabled}
-                    onClick={() => copy(index)}>
-                    <ContentCopyIcon
-                        size={"small"}/>
-                </IconButton>
-            </Tooltip>
-        </>}
-
-        {!measuring && contentOverflow && <>
 
             <Menu
-                trigger={<IconButton size={"small"}>
-                    <MoreVertIcon
-                        size={"small"}/>
-                </IconButton>}
-            >
-
-                <MenuItem dense onClick={() => remove(index)}>
+                portalContainer={iconRef.current}
+                open={menuOpen}
+                trigger={<div tabIndex={-1}/>}>
+
+                <MenuItem dense onClick={(e) => {
+                    setMenuOpen(false);
+                    remove(index);
+                }}>
                     <RemoveIcon size={"small"}/>
                     Remove
                 </MenuItem>
-                <MenuItem dense onClick={() => copy(index)}>
+                <MenuItem dense onClick={() => {
+                    setMenuOpen(false);
+                    copy(index);
+                }}>
                     <ContentCopyIcon size={"small"}/>
                     Copy
                 </MenuItem>
 
+                {addInIndex && <MenuItem dense
+                                         onClick={() => {
+                                             setMenuOpen(false);
+                                             addInIndex(index);
+                                         }}>
+                    <KeyboardArrowUpIcon size={"small"}/>
+                    Add on top
+                </MenuItem>}
+
+                {addInIndex && <MenuItem dense
+                                         onClick={() => {
+                                             setMenuOpen(false);
+                                             addInIndex(index + 1);
+                                         }}>
+                    <KeyboardArrowDownIcon size={"small"}/>
+                    Add below
+                </MenuItem>}
+
             </Menu>
-        </>}
+        </Tooltip>
+
     </div>;
 }
 

package/src/components/CircularProgressCenter.tsx

@@ -5,7 +5,7 @@ import { CircularProgress, CircularProgressProps, Typography } from "@firecms/ui
  *
  * @param text
  * @param props
- * @constructor
+
  * @ignore
  */
 export function CircularProgressCenter({ text, ...props }: CircularProgressProps & {
@@ -13,7 +13,7 @@ export function CircularProgressCenter({ text, ...props }: CircularProgressProps
 }) {
     return (
         <div
-            className="flex w-full h-screen max-h-full max-w-full bg-gray-50 dark:bg-gray-900 gap-4">
+            className="flex w-full h-screen max-h-full max-w-full bg-surface-50 dark:bg-surface-900 gap-4">
             <div className="m-auto flex flex-col gap-2 items-center">
                 <CircularProgress {...props}/>
                 {text && <Typography

package/src/components/ClearFilterSortButton.tsx

@@ -0,0 +1,41 @@
+import { Button, FilterListOffIcon } from "@firecms/ui";
+import { EntityTableController } from "../types";
+
+export function ClearFilterSortButton({
+                                          tableController,
+                                          enabled
+                                      }: {
+    enabled: boolean;
+    tableController: EntityTableController
+}) {
+    if (!enabled) {
+        return null;
+    }
+
+    const filterIsSet = !!tableController.filterValues && Object.keys(tableController.filterValues).length > 0;
+    const sortIsSet = !!tableController.sortBy && tableController.sortBy.length > 0;
+
+    if ((filterIsSet || sortIsSet) && (tableController.clearFilter || tableController.setSortBy)) {
+        let label;
+        if (filterIsSet && sortIsSet) {
+            label = "Clear filter and sort";
+        } else if (filterIsSet) {
+            label = "Clear filter";
+        } else {
+            label = "Clear sort";
+        }
+        return <Button
+            variant={"outlined"}
+            className="h-fit-content"
+            aria-label="filter clear"
+            onClick={() => {
+                tableController.clearFilter?.();
+                tableController.setSortBy?.(undefined);
+            }}
+            size={"small"}>
+            <FilterListOffIcon/>
+            {label}
+        </Button>
+    }
+    return null;
+}

package/src/components/{DeleteConfirmationDialog.tsx → ConfirmationDialog.tsx}

@@ -1,8 +1,8 @@
 import React from "react";
 
-import { Button, Dialog, DialogActions, DialogContent, LoadingButton, Typography } from "@firecms/ui";
+import { Button, Dialog, DialogActions, DialogContent, DialogTitle, LoadingButton, Typography } from "@firecms/ui";
 
-export function DeleteConfirmationDialog({
+export function ConfirmationDialog({
                                              open,
                                              onAccept,
                                              onCancel,
@@ -22,8 +22,8 @@ export function DeleteConfirmationDialog({
             open={open}
             onOpenChange={(open) => !open ? onCancel() : undefined}
         >
+            <DialogTitle variant={"h6"} className={"mb-2"}>{title}</DialogTitle>
             <DialogContent>
-                <Typography variant={"h6"} className={"mb-2"}>{title}</Typography>
                 {body}
             </DialogContent>
 

package/src/components/DeleteEntityDialog.tsx

@@ -1,6 +1,6 @@
 import { Entity, EntityCallbacks, EntityCollection } from "../types";
 import React, { useCallback, useMemo, useState } from "react";
-import { Button, CircularProgress, Dialog, DialogActions, DialogContent, Typography } from "@firecms/ui";
+import { Button, CircularProgress, Dialog, DialogActions, DialogContent, DialogTitle } from "@firecms/ui";
 import {
     deleteEntityWithCallbacks,
     useCustomizationController,
@@ -9,7 +9,7 @@ import {
     useSnackbarController
 } from "../hooks";
 import { resolveCollection } from "../util";
-import { EntityPreview } from "./EntityPreview";
+import { EntityView } from "./EntityView";
 
 export interface DeleteEntityDialogProps<M extends Record<string, any>> {
     entityOrEntitiesToDelete?: Entity<M> | Entity<M>[],
@@ -35,30 +35,22 @@ export function DeleteEntityDialog<M extends Record<string, any>>({
                                                                       path
                                                                   }: DeleteEntityDialogProps<M>) {
 
-    const dataSource = useDataSource();
+    const dataSource = useDataSource(collection);
     const customizationController = useCustomizationController();
     const snackbarController = useSnackbarController();
     const [loading, setLoading] = useState(false);
 
-    const [entityOrEntities, setUsedEntityOrEntities] = React.useState<Entity<M> | Entity<M>[]>();
-
-    const [multipleEntities, setMultipleEntities] = React.useState<boolean>();
     const context = useFireCMSContext();
+    const entityOrEntities = Array.isArray(entityOrEntitiesToDelete) && entityOrEntitiesToDelete.length === 1
+        ? entityOrEntitiesToDelete[0]
+        : entityOrEntitiesToDelete;
 
-    React.useEffect(() => {
-        if (entityOrEntitiesToDelete) {
-            const revisedEntityOrEntities = Array.isArray(entityOrEntitiesToDelete) && entityOrEntitiesToDelete.length === 1
-                ? entityOrEntitiesToDelete[0]
-                : entityOrEntitiesToDelete;
-            setUsedEntityOrEntities(revisedEntityOrEntities);
-            setMultipleEntities(Array.isArray(revisedEntityOrEntities));
-        }
-    }, [entityOrEntitiesToDelete]);
+    const multipleEntities = Array.isArray(entityOrEntities);
 
     const resolvedCollection = useMemo(() => resolveCollection<M>({
         collection,
         path,
-        fields: customizationController.propertyConfigs
+        propertyConfigs: customizationController.propertyConfigs
     }), [collection, path]);
 
     const handleCancel = useCallback(() => {
@@ -163,7 +155,7 @@ export function DeleteEntityDialog<M extends Record<string, any>>({
     } else {
         const entity = entityOrEntities as Entity<M> | undefined;
         content = entity
-            ? <EntityPreview
+            ? <EntityView
                 entity={entity}
                 collection={collection}
                 path={path}/>
@@ -176,16 +168,15 @@ export function DeleteEntityDialog<M extends Record<string, any>>({
 
     return (
         <Dialog
-            maxWidth={"2xl"}
+            maxWidth={multipleEntities ? "lg" : "2xl"}
             aria-labelledby="delete-dialog"
             open={open}
             onOpenChange={(open) => !open ? onClose() : undefined}
         >
+            <DialogTitle id="delete-dialog-title">
+                {dialogTitle}
+            </DialogTitle>
             <DialogContent fullHeight={true}>
-                <Typography variant={"subtitle2"} className={"p-4"}>
-                    {dialogTitle}
-                </Typography>
-
                 {!multipleEntities && <div className={"p-4"}>{content}</div>}
             </DialogContent>
             <DialogActions>