@firecms/core 3.0.0-canary.80 → 3.0.0-canary.82

package/dist/types/collections.d.ts

@@ -313,14 +313,13 @@ export interface CollectionActionsProps<M extends Record<string, any> = any, Use
 /**
  * Use this controller to retrieve the selected entities or modify them in
  * an {@link EntityCollection}
- * If you want to pass a `SelectionController` to
  * @group Models
  */
 export type SelectionController<M extends Record<string, any> = any> = {
     selectedEntities: Entity<M>[];
     setSelectedEntities: Dispatch<SetStateAction<Entity<M>[]>>;
     isEntitySelected: (entity: Entity<M>) => boolean;
-    toggleEntitySelection: (entity: Entity<M>) => void;
+    toggleEntitySelection: (entity: Entity<M>, newSelectedState?: boolean) => void;
 };
 /**
  * Filter conditions in a `Query.where()` clause are specified using the

package/dist/util/plurals.d.ts

@@ -1,7 +1,6 @@
 /**
  * Returns the plural of an English word.
  *
- * @export
  * @param {string} word
  * @param {number} [amount]
  * @returns {string}
@@ -10,7 +9,6 @@ export declare function plural(word: string, amount?: number): string;
 /**
  * Returns the singular of an English word.
  *
- * @export
  * @param {string} word
  * @param {number} [amount]
  * @returns {string}

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@firecms/core",
     "type": "module",
-    "version": "3.0.0-canary.80",
+    "version": "3.0.0-canary.82",
     "description": "Awesome Firebase/Firestore-based headless open-source CMS",
     "funding": {
         "url": "https://github.com/sponsors/firecmsco"
@@ -46,8 +46,8 @@
         "./package.json": "./package.json"
     },
     "dependencies": {
-        "@firecms/formex": "^3.0.0-canary.80",
-        "@firecms/ui": "^3.0.0-canary.80",
+        "@firecms/formex": "^3.0.0-canary.82",
+        "@firecms/ui": "^3.0.0-canary.82",
         "@fontsource/jetbrains-mono": "^5.0.20",
         "@hello-pangea/dnd": "^16.6.0",
         "@radix-ui/react-portal": "^1.1.1",
@@ -102,7 +102,7 @@
         "dist",
         "src"
     ],
-    "gitHead": "e41e7401fda1929c44300ada0b993e5b0703b7a1",
+    "gitHead": "5bd98b85c3f5c0c9a08860188e15e2687f1d0542",
     "publishConfig": {
         "access": "public"
     },

package/src/app/Drawer.tsx

@@ -7,7 +7,7 @@ import { DefaultDrawer } from "../core";
  * If you want to customise the drawer, you can create your own component and pass it as a child.
  * For custom drawers, you can use the {@link useApp} to open and close the drawer.
  *
- * @constructor
+
  */
 export function Drawer({
                            children,

package/src/app/Scaffold.tsx

@@ -36,7 +36,7 @@ export interface ScaffoldProps {
  * This component needs a parent {@link FireCMS}
  *
  * @param props
- * @constructor
+
  * @group Core
  */
 export const Scaffold = React.memo<PropsWithChildren<ScaffoldProps>>(

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 & {

package/src/components/EntityCollectionTable/EntityCollectionRowActions.tsx

@@ -14,7 +14,6 @@ import { useFireCMSContext, useLargeLayout } from "../../hooks";
  * @param size
  * @param toggleEntitySelection
  * @param hideId
- * @constructor
  *
  * @group Collection components
  */
@@ -56,12 +55,7 @@ export const EntityCollectionRowActions = function EntityCollectionRowActions({
     const context = useFireCMSContext();
 
     const onCheckedChange = useCallback((checked: boolean) => {
-        selectionController?.toggleEntitySelection(entity);
-    }, [entity, selectionController?.toggleEntitySelection]);
-
-    const onClick = useCallback((event: MouseEvent) => {
-        event.stopPropagation();
-        selectionController?.toggleEntitySelection(entity);
+        selectionController?.toggleEntitySelection(entity, checked);
     }, [entity, selectionController?.toggleEntitySelection]);
 
     const hasActions = actions.length > 0;
@@ -71,7 +65,6 @@ export const EntityCollectionRowActions = function EntityCollectionRowActions({
     const uncollapsedActions = actions.filter(a => a.collapsed === false);
     return (
         <div
-            onClick={onClick}
             className={cls(
                 "h-full flex items-center justify-center flex-col bg-gray-50 dark:bg-gray-900 bg-opacity-90 dark:bg-opacity-90 z-10",
                 frozen ? "sticky left-0" : ""

package/src/components/EntityCollectionTable/EntityCollectionTable.tsx

@@ -246,7 +246,7 @@ export const EntityCollectionTable = function EntityCollectionTable<M extends Re
             : collectionColumns) as VirtualTableColumn[]
     ];
 
-    const cellRenderer = (props: CellRendererParams<any>) => {
+    const cellRenderer = useCallback((props: CellRendererParams<any>) => {
         const column = props.column;
         const columns = props.columns;
         const columnKey = column.key;
@@ -286,7 +286,7 @@ export const EntityCollectionTable = function EntityCollectionTable<M extends Re
                 <ErrorView error={e}/>
             </EntityTableCell>;
         }
-    }
+    }, [tableRowActionsBuilder, additionalCellRenderer, propertyCellRenderer, size]);
 
     return (
 

package/src/components/EntityCollectionTable/fields/TableStorageUpload.tsx

@@ -179,10 +179,18 @@ function StorageUpload({
             onDropRejected: (fileRejections, event) => {
                 for (const fileRejection of fileRejections) {
                     for (const error of fileRejection.errors) {
-                        snackbarContext.open({
-                            type: "error",
-                            message: `Error uploading file: File is larger than ${storage.maxSize} bytes`
-                        });
+                        console.log("Error uploading file: ", error);
+                        if (error.code === "file-too-large") {
+                            snackbarContext.open({
+                                type: "error",
+                                message: `Error uploading file: File is larger than ${storage.maxSize} bytes`
+                            });
+                        } else if (error.code === "file-invalid-type") {
+                            snackbarContext.open({
+                                type: "error",
+                                message: "Error uploading file: File type is not supported"
+                            });
+                        }
                     }
                 }
             }

package/src/components/EntityCollectionView/EntityCollectionView.tsx

@@ -117,7 +117,7 @@ export type EntityCollectionViewProps<M extends Record<string, any>> = {
  *
  * @param fullPath
  * @param collection
- * @constructor
+
  * @group Components
  */
 export const EntityCollectionView = React.memo(
@@ -153,7 +153,7 @@ export const EntityCollectionView = React.memo(
         }, [collection]);
 
         const canCreateEntities = canCreateEntity(collection, authController, fullPath, null);
-        const [selectedNavigationEntity, setSelectedNavigationEntity] = useState<Entity<M> | undefined>(undefined);
+        const [highlightedEntity, setHighlightedEntity] = useState<Entity<M> | undefined>(undefined);
         const [deleteEntityClicked, setDeleteEntityClicked] = React.useState<Entity<M> | Entity<M>[] | undefined>(undefined);
 
         const [lastDeleteTimestamp, setLastDeleteTimestamp] = React.useState<number>(0);
@@ -162,12 +162,12 @@ export const EntityCollectionView = React.memo(
         const [docsCount, setDocsCount] = useState<number>(0);
 
         const unselectNavigatedEntity = useCallback(() => {
-            const currentSelection = selectedNavigationEntity;
+            const currentSelection = highlightedEntity;
             setTimeout(() => {
-                if (currentSelection === selectedNavigationEntity)
-                    setSelectedNavigationEntity(undefined);
+                if (currentSelection === highlightedEntity)
+                    setHighlightedEntity(undefined);
             }, 2400);
-        }, [selectedNavigationEntity]);
+        }, [highlightedEntity]);
 
         const checkInlineEditing = useCallback((entity?: Entity<any>): boolean => {
             const collection = collectionRef.current;
@@ -186,13 +186,12 @@ export const EntityCollectionView = React.memo(
         const usedSelectionController = collection.selectionController ?? selectionController;
         const {
             selectedEntities,
-            isEntitySelected,
             setSelectedEntities
         } = usedSelectionController;
 
-        useEffect(() => {
-            setDeleteEntityClicked(undefined);
-        }, [selectedEntities]);
+        // useEffect(() => {
+        //     setDeleteEntityClicked(undefined);
+        // }, [selectedEntities]);
 
         const tableController = useDataSourceEntityCollectionTableController<M>({
             fullPath,
@@ -210,7 +209,7 @@ export const EntityCollectionView = React.memo(
         const onEntityClick = useCallback((clickedEntity: Entity<M>) => {
             console.log("Entity clicked", clickedEntity)
             const collection = collectionRef.current;
-            setSelectedNavigationEntity(clickedEntity);
+            setHighlightedEntity(clickedEntity);
             analyticsController.onAnalyticsEvent?.("edit_entity_clicked", {
                 path: clickedEntity.path,
                 entityId: clickedEntity.id
@@ -468,7 +467,7 @@ export const EntityCollectionView = React.memo(
             return (largeLayout ? (80 + actionsWidth) : (70 + actionsWidth)) + (collapsedActions.length > 0 ? (largeLayout ? 40 : 30) : 0);
         };
 
-        const tableRowActionsBuilder = ({
+        const tableRowActionsBuilder = useCallback(({
                                             entity,
                                             size,
                                             width,
@@ -480,7 +479,7 @@ export const EntityCollectionView = React.memo(
             frozen?: boolean
         }) => {
 
-            const isSelected = isEntitySelected(entity);
+            const isSelected = usedSelectionController.selectedEntities.map(e => e.id).includes(entity.id);
 
             const actions = getActionsForEntity({
                 entity,
@@ -495,7 +494,7 @@ export const EntityCollectionView = React.memo(
                     isSelected={isSelected}
                     selectionEnabled={selectionEnabled}
                     size={size}
-                    highlightEntity={setSelectedNavigationEntity}
+                    highlightEntity={setHighlightedEntity}
                     unhighlightEntity={unselectNavigatedEntity}
                     collection={collection}
                     fullPath={fullPath}
@@ -506,7 +505,7 @@ export const EntityCollectionView = React.memo(
                 />
             );
 
-        };
+        }, [updateLastDeleteTimestamp, usedSelectionController]);
 
         const title = <Popover
             open={popOverOpen}
@@ -610,7 +609,7 @@ export const EntityCollectionView = React.memo(
                     uniqueFieldValidator={uniqueFieldValidator}
                     title={title}
                     selectionController={usedSelectionController}
-                    highlightedEntities={selectedNavigationEntity ? [selectedNavigationEntity] : []}
+                    highlightedEntities={highlightedEntity ? [highlightedEntity] : []}
                     defaultSize={collection.defaultSize}
                     properties={resolvedCollection.properties}
                     getPropertyFor={getPropertyFor}

package/src/components/EntityCollectionView/useSelectionController.tsx

@@ -7,19 +7,31 @@ export function useSelectionController<M extends Record<string, any> = any>(
 
     const [selectedEntities, setSelectedEntities] = useState<Entity<M>[]>([]);
 
-    const toggleEntitySelection = useCallback((entity: Entity<M>) => {
+    const toggleEntitySelection = useCallback((entity: Entity<M>, newSelectedState?: boolean) => {
         let newValue;
-        if (selectedEntities.map(e => e.id).includes(entity.id)) {
-            onSelectionChange?.(entity, false);
-            newValue = selectedEntities.filter((item: Entity<M>) => item.id !== entity.id);
+        if (newSelectedState === undefined) {
+            if (selectedEntities.map(e => e.id).includes(entity.id)) {
+                onSelectionChange?.(entity, false);
+                newValue = selectedEntities.filter((item: Entity<M>) => item.id !== entity.id);
+            } else {
+                onSelectionChange?.(entity, true);
+                newValue = [...selectedEntities, entity];
+            }
         } else {
-            onSelectionChange?.(entity, true);
-            newValue = [...selectedEntities, entity];
+            if (newSelectedState) {
+                onSelectionChange?.(entity, true);
+                newValue = [...selectedEntities, entity];
+            } else {
+                onSelectionChange?.(entity, false);
+                newValue = selectedEntities.filter((item: Entity<M>) => item.id !== entity.id);
+            }
         }
         setSelectedEntities(newValue);
     }, [selectedEntities]);
 
-    const isEntitySelected = useCallback((entity: Entity<M>) => selectedEntities.map(e => e.id).includes(entity.id), [selectedEntities]);
+    const isEntitySelected = useCallback((entity: Entity<M>) => {
+        return selectedEntities.map(e => e.id).includes(entity.id);
+    }, [selectedEntities]);
 
     return {
         selectedEntities,

package/src/components/ErrorView.tsx

@@ -17,7 +17,7 @@ export interface ErrorViewProps {
  * @param title
  * @param error
  * @param tooltip
- * @constructor
+
  * @group Components
  */
 export function ErrorView({

package/src/components/HomePage/DefaultHomePage.tsx

@@ -23,7 +23,7 @@ search.addIndex("path");
 /**
  * Default entry view for the CMS. This component renders navigation cards
  * for each collection defined in the navigation.
- * @constructor
+
  * @group Components
  */
 export function DefaultHomePage({

package/src/components/HomePage/NavigationCardBinding.tsx

@@ -19,7 +19,7 @@ import { SmallNavigationCard } from "./SmallNavigationCard";
  * @param name
  * @param description
  * @param onClick
- * @constructor
+
  */
 export function NavigationCardBinding({
                                           path,

package/src/components/SelectableTable/SelectableTable.tsx

@@ -128,8 +128,6 @@ export const SelectableTable = React.memo<SelectableTableProps<any>>(
                  setFilterValues,
                  sortBy,
                  setSortBy,
-                 setSearchString,
-                 clearFilter,
                  itemCount,
                  setItemCount,
                  pageSize = 50,
@@ -248,7 +246,8 @@ export const SelectableTable = React.memo<SelectableTableProps<any>>(
         );
 
     },
-    equal
+    () => false,
+    // equal
 );
 
 function createFilterField({

package/src/components/VirtualTable/VirtualTableCell.tsx

@@ -16,7 +16,7 @@ type VirtualTableCellProps<T extends any> = {
 };
 
 export const VirtualTableCell = React.memo<VirtualTableCellProps<any>>(
-    function VirtualTableCell<T extends any>(props: VirtualTableCellProps<T>) {
+    function VirtualTableCell<T>(props: VirtualTableCellProps<T>) {
         // @ts-ignore
         return props.rowData && props.cellRenderer(
             {

package/src/core/DefaultAppBar.tsx

@@ -45,7 +45,7 @@ export type DefaultAppBarProps<ADDITIONAL_PROPS = object> = {
  * This component renders the main app bar of FireCMS.
  * You will likely not need to use this component directly.
  *
- * @constructor
+
  */
 export const DefaultAppBar = function DefaultAppBar({
                                                         title,
@@ -95,7 +95,7 @@ export const DefaultAppBar = function DefaultAppBar({
     return (
         <div
             style={style}
-            className={cls("pr-2 w-full h-16 transition-all ease-in duration-75 fixed",
+            className={cls("w-full h-16 transition-all ease-in duration-75 fixed",
                 {
                     "pl-[17rem]": drawerOpen && largeLayout,
                     "pl-20": hasDrawer && !(drawerOpen && largeLayout),

package/src/core/DefaultDrawer.tsx

@@ -144,7 +144,7 @@ export function DefaultDrawer({
  * It expands when the drawer is open.
  *
  * @param logo
- * @constructor
+
  */
 export function DrawerLogo({ logo }: {
     logo?: string;

package/src/core/EntityEditView.tsx

@@ -95,7 +95,7 @@ export interface EntityEditViewProps<M extends Record<string, any>> {
  * side panel. Instead, you might want to use {@link EntityForm} or {@link EntityCollectionView}
  */
 export function EntityEditView<M extends Record<string, any>, UserType extends User>({
-                                                                                         entityId: entityIdProp,
+                                                                                         entityId,
                                                                                          ...props
                                                                                      }: EntityEditViewProps<M>) {
     const {
@@ -105,7 +105,7 @@ export function EntityEditView<M extends Record<string, any>, UserType extends U
         dataLoadingError
     } = useEntityFetch<M, UserType>({
         path: props.path,
-        entityId: entityIdProp,
+        entityId: entityId,
         collection: props.collection,
         useCache: false
     });
@@ -114,8 +114,12 @@ export function EntityEditView<M extends Record<string, any>, UserType extends U
         return <CircularProgressCenter/>
     }
 
+    if (entityId && !entity) {
+        console.error(`Entity with id ${entityId} not found in collection ${props.collection.path}`);
+    }
+
     return <EntityEditViewInner<M> {...props}
-                                   entityId={entityIdProp}
+                                   entityId={entityId}
                                    entity={entity}
                                    dataLoading={dataLoading}/>;
 }

package/src/core/FireCMS.tsx

@@ -28,7 +28,7 @@ import { useProjectLog } from "../hooks/useProjectLog";
  *
  * You only need to use this component if you are building a custom app.
  *
- * @constructor
+
  * @group Core
  */
 export function FireCMS<UserType extends User, EC extends EntityCollection>(props: FireCMSProps<UserType, EC>) {

package/src/core/NavigationRoutes.tsx

@@ -25,7 +25,7 @@ export type NavigationRoutesProps = {
  * or the home route) related to a {@link NavigationController}.
  * This component needs a parent {@link FireCMS}
  *
- * @constructor
+
  * @group Components
  */
 export const NavigationRoutes = React.memo<NavigationRoutesProps>(

package/src/form/field_bindings/StorageUploadFieldBinding.tsx

@@ -170,10 +170,18 @@ function FileDropComponent({
             onDropRejected: (fileRejections, event) => {
                 for (const fileRejection of fileRejections) {
                     for (const error of fileRejection.errors) {
-                        snackbarContext.open({
-                            type: "error",
-                            message: `Error uploading file: File is larger than ${storage.maxSize} bytes`
-                        });
+                        console.log("Error uploading file: ", error);
+                        if (error.code === "file-too-large") {
+                            snackbarContext.open({
+                                type: "error",
+                                message: `Error uploading file: File is larger than ${storage.maxSize} bytes`
+                            });
+                        } else if (error.code === "file-invalid-type") {
+                            snackbarContext.open({
+                                type: "error",
+                                message: "Error uploading file: File type is not supported"
+                            });
+                        }
                     }
                 }
             }

package/src/types/collections.ts

@@ -362,14 +362,13 @@ export interface CollectionActionsProps<M extends Record<string, any> = any, Use
 /**
  * Use this controller to retrieve the selected entities or modify them in
  * an {@link EntityCollection}
- * If you want to pass a `SelectionController` to
  * @group Models
  */
 export type SelectionController<M extends Record<string, any> = any> = {
     selectedEntities: Entity<M>[];
     setSelectedEntities: Dispatch<SetStateAction<Entity<M>[]>>;
     isEntitySelected: (entity: Entity<M>) => boolean;
-    toggleEntitySelection: (entity: Entity<M>) => void;
+    toggleEntitySelection: (entity: Entity<M>, newSelectedState?: boolean) => void;
 }
 
 /**

package/src/util/plurals.ts

@@ -1,7 +1,6 @@
 /**
  * Returns the plural of an English word.
  *
- * @export
  * @param {string} word
  * @param {number} [amount]
  * @returns {string}
@@ -92,7 +91,6 @@ export function plural(word: string, amount?: number): string {
 /**
  * Returns the singular of an English word.
  *
- * @export
  * @param {string} word
  * @param {number} [amount]
  * @returns {string}