@firecms/collection_editor 3.0.0-beta.1 → 3.0.0-beta.2-pre.2

package/package.json

@@ -1,17 +1,17 @@
 {
   "name": "@firecms/collection_editor",
   "type": "module",
-  "version": "3.0.0-beta.1",
+  "version": "3.0.0-beta.2-pre.2",
   "main": "./dist/index.umd.js",
   "module": "./dist/index.es.js",
   "types": "dist/index.d.ts",
   "source": "src/index.ts",
   "dependencies": {
-    "@firecms/data_import_export": "^3.0.0-beta.1",
-    "@firecms/schema_inference": "^3.0.0-beta.1",
-    "@firecms/ui": "^3.0.0-beta.1",
+    "@firecms/data_import_export": "^3.0.0-beta.2-pre.2",
+    "@firecms/schema_inference": "^3.0.0-beta.2-pre.2",
+    "@firecms/ui": "^3.0.0-beta.2-pre.2",
     "json5": "^2.2.3",
-    "prism-react-renderer": "^2.3.0"
+    "prism-react-renderer": "^2.3.1"
   },
   "peerDependencies": {
     "react": "^18.2.0",
@@ -45,12 +45,12 @@
   },
   "devDependencies": {
     "@jest/globals": "^29.7.0",
-    "@types/react": "^18.2.45",
-    "@types/react-dom": "^18.2.17",
+    "@types/react": "^18.2.54",
+    "@types/react-dom": "^18.2.18",
     "@typescript-eslint/eslint-plugin": "^5.62.0",
     "@typescript-eslint/parser": "^5.62.0",
     "@vitejs/plugin-react": "^4.2.1",
-    "eslint": "^8.55.0",
+    "eslint": "^8.56.0",
     "eslint-config-standard": "^17.1.0",
     "eslint-plugin-import": "^2.29.1",
     "eslint-plugin-n": "^15.7.0",
@@ -58,11 +58,11 @@
     "eslint-plugin-react": "^7.33.2",
     "eslint-plugin-react-hooks": "^4.6.0",
     "jest": "^29.7.0",
-    "react-router": "^6.21.0",
-    "react-router-dom": "^6.21.0",
-    "ts-jest": "^29.1.1",
+    "react-router": "^6.22.0",
+    "react-router-dom": "^6.22.0",
+    "ts-jest": "^29.1.2",
     "typescript": "^5.3.3",
-    "vite": "^4.5.1",
+    "vite": "^4.5.2",
     "vite-plugin-fonts": "^0.7.0"
   },
   "files": [
@@ -72,5 +72,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "71db60591860441e5c0d2b6cbc11198870257c7e"
+  "gitHead": "f3f62fc3cbc4f0d9d1a26817a14cff06393b7c2b"
 }

package/src/ui/collection_editor/EnumForm.tsx

@@ -1,11 +1,7 @@
 import React, { useEffect } from "react";
 
 import { FastField, Formik, getIn, useFormikContext } from "formik";
-import {
-    EnumValueConfig,
-    EnumValues,
-    FormikArrayContainer,
-} from "@firecms/core";
+import { EnumValueConfig, EnumValues, FormikArrayContainer, } from "@firecms/core";
 import {
     AutoAwesomeIcon,
     Button,

package/src/ui/collection_editor/GetCodeDialog.tsx

@@ -1,15 +1,5 @@
-import {
-    EntityCollection,
-    useSnackbarController
-} from "@firecms/core";
-import {
-    Button,
-    ContentCopyIcon,
-    Dialog,
-    DialogActions,
-    DialogContent,
-    Typography,
-} from "@firecms/ui";
+import { EntityCollection, useSnackbarController } from "@firecms/core";
+import { Button, ContentCopyIcon, Dialog, DialogActions, DialogContent, Typography, } from "@firecms/ui";
 import React from "react";
 import JSON5 from "json5";
 import { Highlight, themes } from "prism-react-renderer"

package/src/ui/collection_editor/PropertyEditView.tsx

@@ -5,7 +5,7 @@ import { Formik, FormikErrors, FormikProps, getIn } from "formik";
 import {
     DEFAULT_FIELD_CONFIGS,
     DeleteConfirmationDialog,
-    FieldConfigBadge,
+    PropertyConfigBadge,
     FieldConfigId,
     getFieldConfig,
     getFieldId,
@@ -479,7 +479,7 @@ function PropertyEditView({
                                     "flex items-center",
                                     optionDisabled ? "w-full pointer-events-none opacity-50" : "")}>
                                 <div className={"mr-8"}>
-                                    <FieldConfigBadge propertyConfig={computedFieldConfig}/>
+                                    <PropertyConfigBadge propertyConfig={computedFieldConfig}/>
                                 </div>
                                 <div className={"flex flex-col items-start text-base text-left"}>
                                     <div>{computedFieldConfig.name}</div>

package/src/ui/collection_editor/PropertyFieldPreview.tsx

@@ -1,6 +1,6 @@
 import {
     ErrorBoundary,
-    FieldConfigBadge,
+    PropertyConfigBadge,
     getFieldConfig,
     isPropertyBuilder,
     Property,
@@ -43,14 +43,14 @@ export function PropertyFieldPreview({
 
     const borderColorClass = hasError
         ? "border-red-500"
-        : (selected ? "border-blue-500" : "border-transparent");
+        : (selected ? "border-primary" : "border-transparent");
 
     return <ErrorBoundary>
         <div
             onClick={onClick}
             className="flex flex-row w-full cursor-pointer">
             <div className={"m-4"}>
-                <FieldConfigBadge propertyConfig={propertyConfig}/>
+                <PropertyConfigBadge propertyConfig={propertyConfig}/>
             </div>
             <Paper
                 className={cn(
@@ -127,7 +127,7 @@ export function NonEditablePropertyPreview({
             onClick={onClick}
             className="flex flex-row w-full cursor-pointer">
             <div className={"relative m-4"}>
-                {propertyConfig && <FieldConfigBadge propertyConfig={propertyConfig}/>}
+                {propertyConfig && <PropertyConfigBadge propertyConfig={propertyConfig}/>}
                 {!propertyConfig && <div
                     className={"h-8 w-8 p-1 rounded-full shadow text-white bg-gray-500"}>
                     <FunctionsIcon color={"inherit"} size={"medium"}/>
@@ -141,7 +141,7 @@ export function NonEditablePropertyPreview({
                     onClick ? cardClickableMixin : "",
                     selected ? cardSelectedMixin : "",
                     "flex-grow p-4 border transition-colors duration-200",
-                    selected ? "border-blue-500" : "border-transparent")}
+                    selected ? "border-primary" : "border-transparent")}
             >
 
                 <div className="w-full flex flex-col">

package/src/ui/collection_editor/PropertySelectItem.tsx

@@ -1,4 +1,4 @@
-import { FieldConfigBadge, PropertyConfig } from "@firecms/core";
+import { PropertyConfigBadge, PropertyConfig } from "@firecms/core";
 import { cn, SelectItem, Typography } from "@firecms/ui";
 
 export interface PropertySelectItemProps {
@@ -17,7 +17,7 @@ export function PropertySelectItem({ value, optionDisabled, propertyConfig, exis
                 "flex flex-row items-center text-base min-h-[52px]",
                 optionDisabled ? "w-full" : "")}>
             <div className={"mr-8"}>
-                <FieldConfigBadge propertyConfig={propertyConfig}/>
+                <PropertyConfigBadge propertyConfig={propertyConfig}/>
             </div>
             <div>
                 <div>{propertyConfig.name}</div>

package/src/ui/collection_editor/import/CollectionEditorImportMapping.tsx

@@ -6,20 +6,8 @@ import {
 } from "@firecms/data_import_export";
 import { getIn, useFormikContext } from "formik";
 
-import {
-    FieldConfigBadge,
-    getFieldConfig,
-    getFieldId,
-    Properties,
-    Property,
-    PropertyConfig,
-} from "@firecms/core";
-import {
-    Container,
-    Select,
-    Tooltip,
-    Typography
-} from "@firecms/ui";
+import { PropertyConfigBadge, getFieldConfig, getFieldId, Properties, Property, PropertyConfig, } from "@firecms/core";
+import { Container, Select, Tooltip, Typography } from "@firecms/ui";
 import React, { useState } from "react";
 import { OnPropertyChangedParams, PropertyFormDialog, PropertyWithId } from "../PropertyEditView";
 import { getFullId, idToPropertiesPath, namespaceToPropertiesOrderPath } from "../util";
@@ -246,7 +234,7 @@ function PropertySelect({
             position={"item-aligned"}
             renderValue={(value) => {
                 if (!widget) return null;
-                return <FieldConfigBadge propertyConfig={widget}/>
+                return <PropertyConfigBadge propertyConfig={widget}/>
             }}
             onValueChange={(newSelectedWidgetId) => {
                 const newProperty = updatePropertyFromWidget(property, newSelectedWidgetId, propertyConfigs)