@firecms/core 3.0.0-canary.139 → 3.0.0-canary.140

package/dist/components/ArrayContainer.d.ts

@@ -1,10 +1,10 @@
 import React from "react";
 import { DraggableProvided } from "@hello-pangea/dnd";
-interface ArrayContainerProps<T> {
+export interface ArrayContainerProps<T> {
     droppableId: string;
     value: T[];
     addLabel: string;
-    buildEntry: (index: number, internalId: number) => React.ReactNode;
+    buildEntry: (index: number, internalId: number, isDragging: boolean) => React.ReactNode;
     disabled?: boolean;
     size?: "small" | "medium";
     onInternalIdAdded?: (id: number) => void;
@@ -23,7 +23,7 @@ type ArrayContainerItemProps = {
     internalId: number;
     size?: "small" | "medium";
     disabled: boolean;
-    buildEntry: (index: number, internalId: number) => React.ReactNode;
+    buildEntry: (index: number, internalId: number, isDragging: boolean) => React.ReactNode;
     remove: (index: number) => void;
     copy: (index: number) => void;
     isDragging: boolean;

package/dist/form/PropertyFieldBinding.d.ts

@@ -26,5 +26,5 @@ import { CMSType, PropertyFieldBindingProps } from "../types";
  * @group Form custom fields
  */
 export declare const PropertyFieldBinding: typeof PropertyFieldBindingInternal;
-declare function PropertyFieldBindingInternal<T extends CMSType = CMSType, M extends Record<string, any> = Record<string, any>>({ propertyKey, property, context, includeDescription, underlyingValueHasChanged, disabled, partOfArray, minimalistView, autoFocus, index, size }: PropertyFieldBindingProps<T, M>): ReactElement<PropertyFieldBindingProps<T, M>>;
+declare function PropertyFieldBindingInternal<T extends CMSType = CMSType, M extends Record<string, any> = Record<string, any>>({ propertyKey, property, context, includeDescription, underlyingValueHasChanged, disabled: disabledProp, partOfArray, minimalistView, autoFocus, index, size }: PropertyFieldBindingProps<T, M>): ReactElement<PropertyFieldBindingProps<T, M>>;
 export {};

package/dist/index.es.js

@@ -3598,7 +3598,7 @@ async function saveEntityWithCallbacks({
   } else {
     updatedValues = values;
   }
-  console.log("Saving entity", {
+  console.debug("Saving entity", {
     entityId,
     updatedValues,
     collection
@@ -13529,7 +13529,7 @@ function ArrayContainerItem({
               "div",
               {
                 className: "flex-grow w-[calc(100%-48px)] text-text-primary dark:text-text-primary-dark",
-                children: buildEntry(index, internalId)
+                children: buildEntry(index, internalId, isDragging)
               }
             ),
             /* @__PURE__ */ jsx(
@@ -15113,7 +15113,7 @@ function PropertyFieldBindingInternal({
   context,
   includeDescription,
   underlyingValueHasChanged,
-  disabled,
+  disabled: disabledProp,
   partOfArray,
   minimalistView,
   autoFocus,
@@ -15136,6 +15136,7 @@ function PropertyFieldBindingInternal({
           propertyConfigs: customizationController.propertyConfigs,
           index
         });
+        const disabled = disabledProp || isReadOnly(resolvedProperty) || Boolean(resolvedProperty?.disabled);
         if (resolvedProperty === null || isHidden(resolvedProperty)) {
           return /* @__PURE__ */ jsx(Fragment, {});
         } else if (isReadOnly(resolvedProperty)) {
@@ -15344,9 +15345,10 @@ function MapFieldBinding({
   }
   const mapFormView = /* @__PURE__ */ jsx(Fragment, { children: /* @__PURE__ */ jsx("div", { className: "py-1 flex flex-col space-y-2", children: Object.entries(mapProperties).filter(([_, property2]) => !isHidden(property2)).map(
     ([entryKey, childProperty], index) => {
+      const thisDisabled = isReadOnly(childProperty) || Boolean(childProperty.disabled);
       const fieldBindingProps = {
         propertyKey: `${propertyKey}.${entryKey}`,
-        disabled,
+        disabled: disabled || thisDisabled,
         property: childProperty,
         includeDescription,
         underlyingValueHasChanged,
@@ -16149,7 +16151,7 @@ function BlockFieldBinding({
     setValue
   });
   const [lastAddedId, setLastAddedId] = useState();
-  const buildEntry = useCallback((index, internalId) => {
+  const buildEntry = useCallback((index, internalId, isDragging) => {
     return /* @__PURE__ */ jsx(
       BlockEntry,
       {
@@ -16162,7 +16164,7 @@ function BlockFieldBinding({
         autoFocus: internalId === lastAddedId,
         context
       },
-      `array_one_of_${index}`
+      `array_one_of_${internalId}`
     );
   }, [context, lastAddedId, property.oneOf, propertyKey, value]);
   const title = /* @__PURE__ */ jsx(
@@ -16177,17 +16179,17 @@ function BlockFieldBinding({
   );
   const firstOneOfKey = Object.keys(property.oneOf.properties)[0];
   const body = /* @__PURE__ */ jsx(
-    FormikArrayContainer,
+    ArrayContainer,
     {
       value,
       className: "flex flex-col gap-3",
-      name: propertyKey,
+      droppableId: propertyKey,
       addLabel: property.name ? "Add entry to " + property.name : "Add entry",
       buildEntry,
       onInternalIdAdded: setLastAddedId,
       disabled: isSubmitting || Boolean(property.disabled),
       includeAddButton: !property.disabled,
-      setFieldValue,
+      onValueChange: (value2) => setFieldValue(propertyKey, value2),
       newDefaultEntry: {
         [property.oneOf.typeField ?? DEFAULT_ONE_OF_TYPE]: firstOneOfKey,
         [property.oneOf.valueField ?? DEFAULT_ONE_OF_VALUE]: getDefaultValueFor(property.oneOf.properties[firstOneOfKey])
@@ -16490,9 +16492,10 @@ function ArrayCustomShapedFieldBinding({
     ] })
   ] });
   const body = resolvedProperties.map((childProperty, index) => {
+    const thisDisabled = isReadOnly(childProperty) || Boolean(childProperty.disabled);
     const fieldProps = {
       propertyKey: `${propertyKey}[${index}]`,
-      disabled,
+      disabled: disabled || thisDisabled,
       property: childProperty,
       includeDescription,
       underlyingValueHasChanged,
@@ -18026,7 +18029,7 @@ function EntityEditViewInner({
           children: pluginActions
         }
       ),
-      /* @__PURE__ */ jsx("div", { className: "h-full overflow-auto", children: /* @__PURE__ */ jsxs("div", { className: "pt-12 pb-16 pl-4 sm:px-8 md:px-10", children: [
+      /* @__PURE__ */ jsxs("div", { className: "pt-12 pb-16 pl-4 sm:px-8 md:px-10", children: [
         /* @__PURE__ */ jsxs(
           "div",
           {
@@ -18074,7 +18077,7 @@ function EntityEditViewInner({
           ),
           /* @__PURE__ */ jsx("div", { className: "h-14" })
         ] })
-      ] }) })
+      ] })
     ] });
     if (plugins) {
       plugins.forEach((plugin) => {
@@ -18143,11 +18146,11 @@ function EntityEditViewInner({
     if (entityId && onIdChange)
       onIdChange(entityId);
   }, [entityId, onIdChange]);
-  return /* @__PURE__ */ jsx(Formex, { value: formex, children: /* @__PURE__ */ jsxs("div", { className: "flex flex-col h-full w-full transition-width duration-250 ease-in-out", children: [
+  return /* @__PURE__ */ jsx(Formex, { value: formex, children: /* @__PURE__ */ jsxs("div", { className: "flex flex-col h-full w-full", children: [
     /* @__PURE__ */ jsxs(
       "div",
       {
-        className: cls(defaultBorderMixin, "no-scrollbar border-b pl-2 pr-2 pt-1 flex items-end overflow-scroll bg-gray-50 dark:bg-gray-950"),
+        className: cls(defaultBorderMixin, "no-scrollbar h-16 border-b pl-2 pr-2 pt-1 flex items-end overflow-scroll bg-gray-50 dark:bg-gray-950"),
         children: [
           /* @__PURE__ */ jsx(
             "div",