@firecms/core 3.0.0-rc.3 → 3.0.0-rc.4

package/dist/types/fields.d.ts

@@ -67,6 +67,10 @@ export interface FieldProps<T extends CMSType = any, CustomProps = any, M extend
      * Is this field part of an array
      */
     partOfArray?: boolean;
+    /**
+     * Is this field part of a block
+     */
+    partOfBlock?: boolean;
     /**
      * Display the child properties directly, without being wrapped in an
      * extendable panel. Note that this will also hide the title of this property.
@@ -178,6 +182,10 @@ export interface PropertyFieldBindingProps<T extends CMSType, M extends Record<s
      * Is this field part of an array
      */
     partOfArray?: boolean;
+    /**
+     * Is this field part of a block
+     */
+    partOfBlock?: boolean;
     /**
      * Display the child properties directly, without being wrapped in an
      * extendable panel. Note that this will also hide the title of this property.

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@firecms/core",
   "type": "module",
-  "version": "3.0.0-rc.3",
+  "version": "3.0.0-rc.4",
   "description": "Awesome Firebase/Firestore-based headless open-source CMS",
   "funding": {
     "url": "https://github.com/sponsors/firecmsco"
@@ -53,9 +53,9 @@
     "@dnd-kit/core": "^6.3.1",
     "@dnd-kit/modifiers": "^9.0.0",
     "@dnd-kit/sortable": "^10.0.0",
-    "@firecms/editor": "^3.0.0-rc.3",
-    "@firecms/formex": "^3.0.0-rc.3",
-    "@firecms/ui": "^3.0.0-rc.3",
+    "@firecms/editor": "^3.0.0-rc.4",
+    "@firecms/formex": "^3.0.0-rc.4",
+    "@firecms/ui": "^3.0.0-rc.4",
     "@radix-ui/react-portal": "^1.1.9",
     "clsx": "^2.1.1",
     "compressorjs": "^1.2.1",
@@ -108,7 +108,7 @@
     "dist",
     "src"
   ],
-  "gitHead": "213f4c106eb3e6639eb1ad23c7d94282ef54d444",
+  "gitHead": "5fab14c8d1fff7dd606512b5d9b3f1842e601f8c",
   "publishConfig": {
     "access": "public"
   },

package/src/components/SelectableTable/SelectableTable.tsx

@@ -327,15 +327,3 @@ function createFilterField({
     );
 }
 
-function filterableProperty(property: ResolvedProperty, partOfArray = false): boolean {
-    if (partOfArray) {
-        return ["string", "number", "date", "reference"].includes(property.dataType);
-    }
-    if (property.dataType === "array") {
-        if (property.of)
-            return filterableProperty(property.of, true);
-        else
-            return false;
-    }
-    return ["string", "number", "boolean", "date", "reference", "array"].includes(property.dataType);
-}

package/src/form/EntityForm.tsx

@@ -857,7 +857,7 @@ export function EntityForm<M extends Record<string, any>>({
                                 />}
 
                             {formex.dirty
-                                ? <Tooltip title={"There are local unsaved changes"}>
+                                ? <Tooltip title={"This form has been modified"}>
                                     <Chip size={"small"} className={"py-1"} colorScheme={"orangeDarker"}>
                                         <EditIcon size={"smallest"}/>
                                     </Chip>

package/src/form/PropertyFieldBinding.tsx

@@ -83,6 +83,7 @@ function PropertyFieldBindingInternal<T extends CMSType = CMSType, M extends Rec
      underlyingValueHasChanged,
      disabled: disabledProp,
      partOfArray,
+     partOfBlock,
      minimalistView,
      autoFocus,
      index,
@@ -93,10 +94,6 @@ function PropertyFieldBindingInternal<T extends CMSType = CMSType, M extends Rec
     const authController = useAuthController();
     const customizationController = useCustomizationController();
 
-    if(propertyKey === "created_by"){
-        console.log("Rendering field for created_by", {propertyKey, property, context});
-    }
-
     return (
         <Field
             key={propertyKey}
@@ -168,6 +165,7 @@ function PropertyFieldBindingInternal<T extends CMSType = CMSType, M extends Rec
                     context,
                     disabled,
                     partOfArray,
+                    partOfBlock,
                     minimalistView,
                     autoFocus,
                     size,
@@ -199,6 +197,7 @@ function FieldInternal<T extends CMSType, CustomProps, M extends Record<string,
          includeDescription,
          underlyingValueHasChanged,
          partOfArray,
+         partOfBlock,
          minimalistView,
          autoFocus,
          context,
@@ -261,6 +260,7 @@ function FieldInternal<T extends CMSType, CustomProps, M extends Record<string,
         disabled: disabled ?? false,
         underlyingValueHasChanged: underlyingValueHasChanged ?? false,
         partOfArray: partOfArray ?? false,
+        partOfBlock: partOfBlock ?? false,
         minimalistView: minimalistView ?? false,
         autoFocus: autoFocus ?? false,
         customProps: customFieldProps,

package/src/form/field_bindings/BlockFieldBinding.tsx

@@ -200,6 +200,7 @@ function BlockEntry({
             context,
             autoFocus,
             partOfArray: false,
+            partOfBlock: true,
             minimalistView: true,
             onPropertyChange: storeProps,
         }

package/src/types/fields.tsx

@@ -81,6 +81,11 @@ export interface FieldProps<T extends CMSType = any, CustomProps = any, M extend
      */
     partOfArray?: boolean;
 
+    /**
+     * Is this field part of a block
+     */
+    partOfBlock?: boolean;
+
     /**
      * Display the child properties directly, without being wrapped in an
      * extendable panel. Note that this will also hide the title of this property.
@@ -220,6 +225,11 @@ export interface PropertyFieldBindingProps<T extends CMSType, M extends Record<s
      */
     partOfArray?: boolean;
 
+    /**
+     * Is this field part of a block
+     */
+    partOfBlock?: boolean;
+
     /**
      * Display the child properties directly, without being wrapped in an
      * extendable panel. Note that this will also hide the title of this property.