@firecms/core 3.0.0-alpha.50 → 3.0.0-alpha.51

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@firecms/core",
-  "version": "3.0.0-alpha.50",
+  "version": "3.0.0-alpha.51",
   "description": "Awesome Firebase/Firestore-based headless open-source CMS",
   "funding": {
     "url": "https://github.com/sponsors/firecmsco"
@@ -46,7 +46,7 @@
   },
   "dependencies": {
     "@date-io/date-fns": "^2.17.0",
-    "@firecms/ui": "^3.0.0-alpha.50",
+    "@firecms/ui": "^3.0.0-alpha.51",
     "@fontsource/ibm-plex-mono": "^5.0.8",
     "@fontsource/roboto": "^5.0.8",
     "@hello-pangea/dnd": "^16.5.0",
@@ -116,7 +116,7 @@
     "dist",
     "src"
   ],
-  "gitHead": "2e2d454587689100ef33374e2340fc0df62481cb",
+  "gitHead": "d47d8dad9356b48398b65559b7a59926f3d50373",
   "publishConfig": {
     "access": "public"
   }

package/src/components/FieldConfigBadge.tsx

@@ -1,14 +1,17 @@
 import { getIconForWidget } from "../util";
 import { PropertyConfig } from "../types";
+import { getDefaultFieldConfig } from "../core";
 
 export function FieldConfigBadge({ propertyConfig }: { propertyConfig: PropertyConfig | undefined }): React.ReactNode {
     const classes = "h-8 w-8 p-1 rounded-full shadow text-white";
 
+    const defaultPropertyConfig = typeof propertyConfig?.property === "object" ? getDefaultFieldConfig(propertyConfig.property) : undefined;
+
     return <div
         className={classes}
         style={{
-            background: propertyConfig?.color ?? "#888"
+            background: propertyConfig?.color ?? defaultPropertyConfig?.color ?? "#888"
         }}>
-        {getIconForWidget(propertyConfig, "medium")}
+        {propertyConfig?.Icon ? getIconForWidget(propertyConfig, "medium") : getIconForWidget(defaultPropertyConfig, "medium")}
     </div>
 }

package/src/{form/form_field_configs.tsx → core/field_configs.tsx}

@@ -313,10 +313,18 @@ export const DEFAULT_FIELD_CONFIGS: Record<string, PropertyConfig<any>> = {
     }
 };
 
+export function getDefaultFieldConfig(property: Property | ResolvedProperty): PropertyConfig | undefined {
+    const fieldId = getDefaultFieldId(property);
+    if (!fieldId) {
+        console.error("No field id found for property", property);
+        return undefined;
+    }
+    return DEFAULT_FIELD_CONFIGS[fieldId];
+}
+
 export function getFieldConfig(property: Property | ResolvedProperty, propertyConfigs: Record<string, PropertyConfig<any>>): PropertyConfig | undefined {
     const fieldId = getFieldId(property);
     const defaultFieldId = getDefaultFieldId(property);
-    // console.log("fieldId", { fieldId });
     if (!defaultFieldId) {
         console.error("No field id found for property", property);
         return undefined;

package/src/core/index.tsx

@@ -6,6 +6,8 @@ export { Scaffold } from "./Scaffold";
 export type { DrawerProps } from "./Drawer";
 export { Drawer, DrawerNavigationItem } from "./Drawer";
 
+export * from "./field_configs";
+
 export * from "./SideDialogs";
 export * from "./NavigationRoutes";
 export * from "./useBuildModeController";

package/src/form/PropertyFieldBinding.tsx

@@ -19,7 +19,7 @@ import { ReadOnlyFieldBinding } from "./field_bindings/ReadOnlyFieldBinding";
 import { isHidden, isPropertyBuilder, isReadOnly, resolveProperty } from "../util";
 import { useFireCMSContext } from "../hooks";
 import { Typography } from "@firecms/ui";
-import { getFieldConfig, getFieldId } from "../form/form_field_configs";
+import { getFieldConfig, getFieldId } from "../core";
 import { ErrorBoundary } from "../components";
 
 /**

package/src/form/index.tsx

@@ -34,8 +34,6 @@ export {
 
 export * from "./components";
 
-export * from "./form_field_configs";
-
 export type { EntityFormProps } from "./EntityForm";
 export {
     EntityForm

package/src/util/property_utils.tsx

@@ -4,7 +4,7 @@ import { EntityCollection, PropertiesOrBuilders, PropertyConfig, PropertyOrBuild
 import { isPropertyBuilder } from "./entities";
 import { resolveProperty } from "./resolutions";
 import { CircleIcon, FunctionsIcon } from "@firecms/ui";
-import { getFieldConfig } from "../form";
+import { getFieldConfig } from "../core";
 
 export function isReferenceProperty(propertyOrBuilder: PropertyOrBuilder,
                                     fields: Record<string, PropertyConfig>) {

package/src/util/resolutions.ts

@@ -26,7 +26,7 @@ import { getDefaultValuesFor, isPropertyBuilder } from "./entities";
 import { DEFAULT_ONE_OF_TYPE } from "./common";
 import { getIn } from "formik";
 import { enumToObjectEntries } from "./enums";
-import { isDefaultFieldConfigId } from "../form/form_field_configs";
+import { isDefaultFieldConfigId } from "../core";
 
 export const resolveCollection = <M extends Record<string, any>, >
 ({