@byline/admin 4.3.0 → 4.4.1

package/dist/fields/array/array-field.d.ts

@@ -6,18 +6,11 @@
  * Copyright (c) Infonomic Company Limited
  */
 import type { ArrayField as ArrayFieldType, FieldAdminConfig } from '@byline/core';
-export declare const ArrayField: ({ field, defaultValue, path, disableSorting, collectionPath, contentLocale, fieldAdmin, }: {
+export declare const ArrayField: ({ field, defaultValue, path, disableSorting, contentLocale, fieldAdmin, }: {
     field: ArrayFieldType;
     defaultValue: any;
     path: string;
     disableSorting?: boolean;
-    /**
-     * Collection path forwarded to upload-capable fields (`file` / `image`)
-     * nested inside an array item, which need it to reach the `/upload`
-     * endpoint. Without it those fields fall back to their empty placeholder
-     * and never render an upload widget.
-     */
-    collectionPath?: string;
     /**
      * Active content locale, forwarded to each array item's fields so
      * localized widgets nested inside an array (e.g. a `localized` richText)

package/dist/fields/array/array-field.js

@@ -8,16 +8,18 @@ import { defaultScalarForField } from "../field-helpers.js";
 import { FieldRenderer } from "../field-renderer.js";
 import { SortableItem, StaticItem } from "../sortable-item.js";
 import { useFormContext } from "../../forms/form-context.js";
+import { hasExistingIdTargets } from "../../forms/nested-path.js";
+import { moveRepeatingItems, repeatingItemId, repeatingItemPath } from "../../forms/repeating-items.js";
 import array_field_module from "./array-field.module.js";
-const ArrayField = ({ field, defaultValue, path, disableSorting = false, collectionPath, contentLocale, fieldAdmin })=>{
-    const { appendPatch, getFieldValue, getFieldValues, setFieldStore } = useFormContext();
+const ArrayField = ({ field, defaultValue, path, disableSorting = false, contentLocale, fieldAdmin })=>{
+    const { appendPatch, getFieldValue, getFieldValues, removePendingUploadsUnder, setFieldStore } = useFormContext();
     const { t } = useTranslation('byline-admin');
     const [items, setItems] = useState([]);
     useEffect(()=>{
         const storeValue = getFieldValue(path);
         const source = Array.isArray(storeValue) ? storeValue : defaultValue;
         Array.isArray(source) ? setItems(source.map((item)=>({
-                id: item && 'object' == typeof item && 'id' in item ? String(item.id) : item && 'object' == typeof item && '_id' in item ? String(item._id) : crypto.randomUUID(),
+                id: item && 'object' == typeof item && '_id' in item ? String(item._id) : item && 'object' == typeof item && 'id' in item ? String(item.id) : crypto.randomUUID(),
                 data: item
             }))) : setItems([]);
     }, [
@@ -25,28 +27,19 @@ const ArrayField = ({ field, defaultValue, path, disableSorting = false, collect
         getFieldValue,
         path
     ]);
-    const patchItemId = (item, index)=>{
-        if (item && 'object' == typeof item) {
-            if ('_id' in item) return String(item._id);
-            if ('id' in item) return String(item.id);
-        }
-        return String(index);
-    };
     const handleDragEnd = ({ moveFromIndex, moveToIndex })=>{
-        setItems((prev)=>moveItem(prev, moveFromIndex, moveToIndex));
         const currentArray = getFieldValue(path) ?? defaultValue;
-        if (Array.isArray(currentArray)) {
-            const clampedFrom = Math.max(0, Math.min(moveFromIndex, currentArray.length - 1));
-            const clampedTo = Math.max(0, Math.min(moveToIndex, currentArray.length - 1));
-            if (clampedFrom === clampedTo) return;
-            const item = currentArray[clampedFrom];
-            appendPatch({
-                kind: 'array.move',
-                path: path,
-                itemId: patchItemId(item, clampedFrom),
-                toIndex: clampedTo
-            });
-        }
+        if (!Array.isArray(currentArray)) return;
+        const move = moveRepeatingItems(currentArray, moveFromIndex, moveToIndex);
+        if (null == move) return;
+        setItems((prev)=>moveItem(prev, move.fromIndex, move.toIndex));
+        setFieldStore(path, move.items);
+        appendPatch({
+            kind: 'array.move',
+            path,
+            itemId: move.itemId,
+            toIndex: move.toIndex
+        });
     };
     const handleAddItem = async (atIndex)=>{
         const childFields = field.fields ?? [];
@@ -60,6 +53,7 @@ const ArrayField = ({ field, defaultValue, path, disableSorting = false, collect
             for (const innerField of childField.fields)groupObj[innerField.name] = await defaultScalarForField(innerField, getFieldValues);
             newItem[childField.name] = groupObj;
         } else newItem[childField.name] = await defaultScalarForField(childField, getFieldValues);
+        if (!hasExistingIdTargets(getFieldValues(), path)) return;
         const currentArray = getFieldValue(path) ?? defaultValue;
         const insertAt = null != atIndex ? atIndex : currentArray ? currentArray.length : 0;
         const newItemWrapper = {
@@ -89,11 +83,13 @@ const ArrayField = ({ field, defaultValue, path, disableSorting = false, collect
         const currentArray = getFieldValue(path) ?? defaultValue;
         if (!Array.isArray(currentArray) || index < 0 || index >= currentArray.length) return;
         const item = currentArray[index];
+        const itemPath = repeatingItemPath(path, item, index);
         setItems((prev)=>prev.filter((_, i)=>i !== index));
+        removePendingUploadsUnder(itemPath);
         appendPatch({
             kind: 'array.remove',
             path: path,
-            itemId: patchItemId(item, index)
+            itemId: repeatingItemId(item) ?? String(index)
         });
         const newArrayValue = [
             ...currentArray
@@ -106,7 +102,7 @@ const ArrayField = ({ field, defaultValue, path, disableSorting = false, collect
     };
     const renderItem = (itemWrapper, index)=>{
         const item = itemWrapper.data;
-        const arrayElementPath = `${path}[${index}]`;
+        const arrayElementPath = repeatingItemPath(path, item, index);
         if (!item || 'object' != typeof item) return null;
         const childFields = field.fields ?? [];
         if (0 === childFields.length) return null;
@@ -127,7 +123,6 @@ const ArrayField = ({ field, defaultValue, path, disableSorting = false, collect
                                 defaultValue: groupData[innerField.name],
                                 basePath: `${arrayElementPath}.${childField.name}`,
                                 disableSorting: true,
-                                collectionPath: collectionPath,
                                 contentLocale: contentLocale,
                                 components: groupAdmin?.[innerField.name]?.components,
                                 editor: groupAdmin?.[innerField.name]?.editor,
@@ -141,7 +136,6 @@ const ArrayField = ({ field, defaultValue, path, disableSorting = false, collect
                 defaultValue: initial,
                 basePath: arrayElementPath,
                 disableSorting: true,
-                collectionPath: collectionPath,
                 contentLocale: contentLocale,
                 components: fieldAdmin?.[childField.name]?.components,
                 editor: fieldAdmin?.[childField.name]?.editor,

package/dist/fields/blocks/blocks-field.js

@@ -8,9 +8,11 @@ import { defaultScalarForField } from "../field-helpers.js";
 import { GroupField } from "../group/group-field.js";
 import { SortableItem } from "../sortable-item.js";
 import { useFormContext } from "../../forms/form-context.js";
+import { hasExistingIdTargets } from "../../forms/nested-path.js";
+import { moveRepeatingItems, repeatingItemId, repeatingItemPath } from "../../forms/repeating-items.js";
 import blocks_field_module from "./blocks-field.module.js";
 const BlocksField = ({ field, defaultValue, path, contentLocale })=>{
-    const { appendPatch, getFieldValue, getFieldValues, setFieldStore } = useFormContext();
+    const { appendPatch, getFieldValue, getFieldValues, removePendingUploadsUnder, setFieldStore } = useFormContext();
     const { t } = useTranslation('byline-admin');
     const [items, setItems] = useState([]);
     const [showAddBlockModal, setShowAddBlockModal] = useState(false);
@@ -43,21 +45,18 @@ const BlocksField = ({ field, defaultValue, path, contentLocale })=>{
         path
     ]);
     const handleDragEnd = ({ moveFromIndex, moveToIndex })=>{
-        setItems((prev)=>moveItem(prev, moveFromIndex, moveToIndex));
         const currentArray = getFieldValue(path) ?? defaultValue;
-        if (Array.isArray(currentArray)) {
-            const clampedFrom = Math.max(0, Math.min(moveFromIndex, currentArray.length - 1));
-            const clampedTo = Math.max(0, Math.min(moveToIndex, currentArray.length - 1));
-            if (clampedFrom === clampedTo) return;
-            const item = currentArray[clampedFrom];
-            const itemId = item && 'object' == typeof item && '_id' in item ? String(item._id) : String(clampedFrom);
-            appendPatch({
-                kind: 'array.move',
-                path: path,
-                itemId,
-                toIndex: clampedTo
-            });
-        }
+        if (!Array.isArray(currentArray)) return;
+        const move = moveRepeatingItems(currentArray, moveFromIndex, moveToIndex);
+        if (null == move) return;
+        setItems((prev)=>moveItem(prev, move.fromIndex, move.toIndex));
+        setFieldStore(path, move.items);
+        appendPatch({
+            kind: 'array.move',
+            path,
+            itemId: move.itemId,
+            toIndex: move.toIndex
+        });
     };
     const handleAddItem = async (forcedVariantName, atIndex)=>{
         setShowAddBlockModal(false);
@@ -71,6 +70,7 @@ const BlocksField = ({ field, defaultValue, path, contentLocale })=>{
             _type: variant.blockType
         };
         for (const f of compositeFields)newItem[f.name] = await defaultScalarForField(f, getFieldValues);
+        if (!hasExistingIdTargets(getFieldValues(), path)) return;
         const currentArray = getFieldValue(path) ?? defaultValue;
         const insertAt = null != atIndex ? atIndex : currentArray ? currentArray.length : 0;
         const newItemWrapper = {
@@ -100,8 +100,10 @@ const BlocksField = ({ field, defaultValue, path, contentLocale })=>{
         const currentArray = getFieldValue(path) ?? defaultValue;
         if (!Array.isArray(currentArray) || index < 0 || index >= currentArray.length) return;
         const item = currentArray[index];
-        const itemId = item && 'object' == typeof item && '_id' in item ? String(item._id) : String(index);
+        const itemPath = repeatingItemPath(path, item, index);
+        const itemId = repeatingItemId(item) ?? String(index);
         setItems((prev)=>prev.filter((_, i)=>i !== index));
+        removePendingUploadsUnder(itemPath);
         appendPatch({
             kind: 'array.remove',
             path: path,
@@ -121,7 +123,7 @@ const BlocksField = ({ field, defaultValue, path, contentLocale })=>{
     };
     const renderItem = (itemWrapper, index)=>{
         const item = itemWrapper.data;
-        const arrayElementPath = `${path}[${index}]`;
+        const arrayElementPath = repeatingItemPath(path, item, index);
         if (!item || 'object' != typeof item || 'string' != typeof item._type) return null;
         const subField = field.blocks?.find((b)=>b.blockType === item._type);
         if (null == subField) return null;

package/dist/fields/field-renderer.d.ts

@@ -12,8 +12,6 @@ interface FieldRendererProps {
     basePath?: string;
     disableSorting?: boolean;
     hideLabel?: boolean;
-    /** Collection path (e.g. `'media'`) forwarded to upload-capable fields. */
-    collectionPath?: string;
     /**
      * The active content locale (e.g. `'en'`, `'fr'`). When provided and
      * `field.localized === true`, a small locale badge is shown so the editor
@@ -42,5 +40,5 @@ interface FieldRendererProps {
      */
     fieldAdmin?: Record<string, FieldAdminConfig>;
 }
-export declare const FieldRenderer: ({ field, defaultValue: initialDefault, basePath, disableSorting, hideLabel, collectionPath, contentLocale, components, editor, fieldAdmin, }: FieldRendererProps) => import("react").JSX.Element | null;
+export declare const FieldRenderer: ({ field, defaultValue: initialDefault, basePath, disableSorting, hideLabel, contentLocale, components, editor, fieldAdmin, }: FieldRendererProps) => import("react").JSX.Element | null;
 export {};

package/dist/fields/field-renderer.js

@@ -20,7 +20,7 @@ import { TextField } from "./text/text-field.js";
 import { TextAreaField } from "./text-area/text-area-field.js";
 import { useFieldChangeHandler } from "./use-field-change-handler.js";
 import { useFieldCondition } from "./use-field-condition.js";
-const FieldRenderer = ({ field, defaultValue: initialDefault, basePath, disableSorting, hideLabel, collectionPath, contentLocale, components, editor, fieldAdmin })=>{
+const FieldRenderer = ({ field, defaultValue: initialDefault, basePath, disableSorting, hideLabel, contentLocale, components, editor, fieldAdmin })=>{
     const path = basePath ? `${basePath}.${field.name}` : field.name;
     const htmlId = path.replace(/[[\].]/g, '-');
     const handleChange = useFieldChangeHandler(field, path);
@@ -161,8 +161,7 @@ const FieldRenderer = ({ field, defaultValue: initialDefault, basePath, disableS
                     } : field,
                     defaultValue: defaultValue,
                     onChange: handleChange,
-                    path: path,
-                    collectionPath: collectionPath
+                    path: path
                 });
             case 'image':
                 return /*#__PURE__*/ jsx(ImageField, {
@@ -172,8 +171,7 @@ const FieldRenderer = ({ field, defaultValue: initialDefault, basePath, disableS
                     } : field,
                     defaultValue: defaultValue,
                     onChange: handleChange,
-                    path: path,
-                    collectionPath: collectionPath
+                    path: path
                 });
             case 'relation':
                 if (field.hasMany) return /*#__PURE__*/ jsx(RelationManyField, {
@@ -204,7 +202,6 @@ const FieldRenderer = ({ field, defaultValue: initialDefault, basePath, disableS
                     defaultValue: defaultValue,
                     path: path,
                     disableSorting: disableSorting,
-                    collectionPath: collectionPath,
                     contentLocale: contentLocale,
                     fieldAdmin: fieldAdmin
                 });
@@ -223,7 +220,6 @@ const FieldRenderer = ({ field, defaultValue: initialDefault, basePath, disableS
                     defaultValue: defaultValue,
                     path: path,
                     disableSorting: disableSorting,
-                    collectionPath: collectionPath,
                     contentLocale: contentLocale,
                     fieldAdmin: fieldAdmin
                 });

package/dist/fields/file/file-field.d.ts

@@ -8,12 +8,10 @@
 import { type FileField as FieldType, type StoredFileValue } from '@byline/core';
 interface FileFieldProps {
     field: FieldType;
-    /** Collection path required to call the /upload endpoint. */
-    collectionPath?: string;
     value?: StoredFileValue | null;
     defaultValue?: StoredFileValue | null;
     onChange?: (value: StoredFileValue | null) => void;
     path?: string;
 }
-export declare const FileField: ({ field, collectionPath, value, defaultValue, onChange: _onChange, path, }: FileFieldProps) => import("react").JSX.Element;
+export declare const FileField: ({ field, value, defaultValue, onChange: _onChange, path, }: FileFieldProps) => import("react").JSX.Element;
 export {};

package/dist/fields/file/file-field.js

@@ -18,14 +18,14 @@ function triggerDownload(url, filename) {
     a.click();
     document.body.removeChild(a);
 }
-const FileField = ({ field, collectionPath, value, defaultValue, onChange: _onChange, path })=>{
+const FileField = ({ field, value, defaultValue, onChange: _onChange, path })=>{
     const fieldPath = path ?? field.name;
     const { t } = useTranslation('byline-admin');
     const fieldError = useFieldError(fieldPath);
     const isDirty = useIsDirty(fieldPath);
     const fieldValue = useFieldValue(fieldPath);
     const isUploading = useIsFieldUploading(fieldPath);
-    const { removePendingUpload, documentId } = useFormContext();
+    const { removePendingUpload, documentId, collectionPath } = useFormContext();
     const handleChange = useFieldChangeHandler(field, fieldPath);
     const incomingValue = isDirty ? fieldValue ?? null : value ?? fieldValue ?? defaultValue ?? null;
     const isPending = isPendingStoredFileValue(incomingValue);

package/dist/fields/file/file-upload-field.js

@@ -17,11 +17,11 @@ const FileUploadField = ({ field: _field, collectionPath, fieldPath, onUploaded,
         setErrorMessage(null);
         const previewUrl = URL.createObjectURL(file);
         const pendingValue = createPendingStoredFileValue(file, previewUrl);
-        addPendingUpload(fieldPath, {
+        if (!addPendingUpload(fieldPath, {
             file,
             previewUrl,
             collectionPath
-        });
+        })) return;
         setStatus('idle');
         onUploaded(pendingValue);
     }, [

package/dist/fields/group/group-field.d.ts

@@ -20,12 +20,6 @@ interface GroupFieldProps {
      * listeners.
      */
     disableSorting?: boolean;
-    /**
-     * Collection path forwarded to upload-capable child fields (`file` / `image`),
-     * which need it to reach the `/upload` endpoint. Without it those fields fall
-     * back to their empty placeholder and never render an upload widget.
-     */
-    collectionPath?: string;
     /**
      * Active content locale, forwarded to child fields so localized widgets
      * nested inside the group (e.g. a `localized` richText) can render their
@@ -44,5 +38,5 @@ interface GroupFieldProps {
      */
     fieldAdmin?: Record<string, FieldAdminConfig>;
 }
-export declare const GroupField: ({ field, defaultValue, path, disableSorting, collectionPath, contentLocale, fieldAdmin, }: GroupFieldProps) => import("react").JSX.Element;
+export declare const GroupField: ({ field, defaultValue, path, disableSorting, contentLocale, fieldAdmin, }: GroupFieldProps) => import("react").JSX.Element;
 export {};

package/dist/fields/group/group-field.js

@@ -7,7 +7,7 @@ import { placeholderForField } from "../field-helpers.js";
 import { FieldRenderer } from "../field-renderer.js";
 import { useFieldError } from "../../forms/form-context.js";
 import group_field_module from "./group-field.module.js";
-const GroupField = ({ field, defaultValue, path, disableSorting = true, collectionPath, contentLocale, fieldAdmin })=>{
+const GroupField = ({ field, defaultValue, path, disableSorting = true, contentLocale, fieldAdmin })=>{
     const fieldError = useFieldError(field.name);
     const groupData = useMemo(()=>{
         if (defaultValue && 'object' == typeof defaultValue && !Array.isArray(defaultValue)) return defaultValue;
@@ -48,7 +48,6 @@ const GroupField = ({ field, defaultValue, path, disableSorting = true, collecti
                         defaultValue: groupData[innerField.name],
                         basePath: path,
                         disableSorting: disableSorting,
-                        collectionPath: collectionPath,
                         contentLocale: contentLocale,
                         components: fieldAdmin?.[innerField.name]?.components,
                         editor: fieldAdmin?.[innerField.name]?.editor,

package/dist/fields/image/image-field.d.ts

@@ -8,12 +8,10 @@
 import { type ImageField as FieldType, type StoredFileValue } from '@byline/core';
 interface ImageFieldProps {
     field: FieldType;
-    /** Collection path required to call the /upload endpoint. */
-    collectionPath?: string;
     value?: StoredFileValue | null;
     defaultValue?: StoredFileValue | null;
     onChange?: (value: StoredFileValue | null) => void;
     path?: string;
 }
-export declare const ImageField: ({ field, collectionPath, value, defaultValue, onChange: _onChange, path, }: ImageFieldProps) => import("react").JSX.Element;
+export declare const ImageField: ({ field, value, defaultValue, onChange: _onChange, path, }: ImageFieldProps) => import("react").JSX.Element;
 export {};

package/dist/fields/image/image-field.js

@@ -8,13 +8,13 @@ import { useFieldError, useFieldValue, useFormContext, useIsDirty, useIsFieldUpl
 import { useFieldChangeHandler } from "../use-field-change-handler.js";
 import image_field_module from "./image-field.module.js";
 import { ImageUploadField } from "./image-upload-field.js";
-const ImageField = ({ field, collectionPath, value, defaultValue, onChange: _onChange, path })=>{
+const ImageField = ({ field, value, defaultValue, onChange: _onChange, path })=>{
     const fieldPath = path ?? field.name;
     const fieldError = useFieldError(fieldPath);
     const isDirty = useIsDirty(fieldPath);
     const fieldValue = useFieldValue(fieldPath);
     const isUploading = useIsFieldUploading(fieldPath);
-    const { removePendingUpload, documentId } = useFormContext();
+    const { removePendingUpload, documentId, collectionPath } = useFormContext();
     const { t } = useTranslation('byline-admin');
     const handleChange = useFieldChangeHandler(field, fieldPath);
     const incomingValue = isDirty ? fieldValue ?? null : value ?? fieldValue ?? defaultValue ?? null;

package/dist/fields/image/image-upload-field.js

@@ -1,5 +1,5 @@
 import { Fragment, jsx, jsxs } from "react/jsx-runtime";
-import { useCallback, useRef, useState } from "react";
+import { useCallback, useEffect, useRef, useState } from "react";
 import { createPendingStoredFileValue } from "@byline/core";
 import { useTranslation } from "@byline/i18n/react";
 import classnames from "classnames";
@@ -7,11 +7,18 @@ import { useFormContext } from "../../forms/form-context.js";
 import image_upload_field_module from "./image-upload-field.module.js";
 const ImageUploadField = ({ field: _field, collectionPath, fieldPath, onUploaded, accept = 'image/*' })=>{
     const inputRef = useRef(null);
+    const mountedRef = useRef(true);
     const [status, setStatus] = useState('idle');
     const [errorMessage, setErrorMessage] = useState(null);
     const [isDragOver, setIsDragOver] = useState(false);
     const { addPendingUpload } = useFormContext();
     const { t } = useTranslation('byline-admin');
+    useEffect(()=>{
+        mountedRef.current = true;
+        return ()=>{
+            mountedRef.current = false;
+        };
+    }, []);
     const handleFileSelected = useCallback((file)=>{
         setStatus('processing');
         setErrorMessage(null);
@@ -23,6 +30,7 @@ const ImageUploadField = ({ field: _field, collectionPath, fieldPath, onUploaded
         const previewUrl = URL.createObjectURL(file);
         const img = new Image();
         img.onload = ()=>{
+            if (!mountedRef.current) return void URL.revokeObjectURL(previewUrl);
             const w = img.naturalWidth;
             const h = img.naturalHeight;
             const dimensions = w > 0 && h > 0 ? {
@@ -30,16 +38,17 @@ const ImageUploadField = ({ field: _field, collectionPath, fieldPath, onUploaded
                 height: h
             } : void 0;
             const pendingValue = createPendingStoredFileValue(file, previewUrl, dimensions);
-            addPendingUpload(fieldPath, {
+            if (!addPendingUpload(fieldPath, {
                 file,
                 previewUrl,
                 collectionPath
-            });
+            })) return;
             setStatus('idle');
             onUploaded(pendingValue);
         };
         img.onerror = ()=>{
             URL.revokeObjectURL(previewUrl);
+            if (!mountedRef.current) return;
             setStatus('error');
             setErrorMessage(t('fields.image.upload.errors.cannotRead'));
         };

package/dist/forms/__probe-nested.test.node.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/forms/__probe-two.test.node.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/forms/form-context.d.ts

@@ -55,6 +55,19 @@ interface FormContextType {
      * `@byline/core`).
      */
     documentId: string | null;
+    /**
+     * Path of the collection this form edits, `null` when the form is rendered
+     * without one. Upload widgets need it to address the upload endpoint.
+     *
+     * It lives here rather than being passed down because it is constant for
+     * the whole form: threading it as a prop meant every nesting-capable
+     * container (`array`, `group`, `blocks`) had to remember to forward it,
+     * and a container that forgot silently rendered upload fields read-only —
+     * no error, just a missing drop zone. That happened twice, in `array` /
+     * `group` and then in `blocks`. A value read from context cannot be
+     * dropped by a container that never carries it.
+     */
+    collectionPath: string | null;
     setFieldValue: (name: string, value: any) => void;
     setFieldStore: (name: string, value: any) => void;
     getFieldValue: (name: string) => any;
@@ -81,8 +94,9 @@ interface FormContextType {
     subscribeField: (name: string, listener: FieldListener) => () => void;
     subscribeErrors: (listener: ErrorsListener) => () => void;
     subscribeMeta: (listener: MetaListener) => () => void;
-    addPendingUpload: (fieldPath: string, upload: PendingUpload) => void;
+    addPendingUpload: (fieldPath: string, upload: PendingUpload) => boolean;
     removePendingUpload: (fieldPath: string) => void;
+    removePendingUploadsUnder: (itemPath: string) => void;
     getPendingUploads: () => Map<string, PendingUpload>;
     hasPendingUploads: () => boolean;
     clearPendingUploads: () => void;
@@ -97,7 +111,7 @@ interface FormContextType {
     subscribeSystemAvailableLocales: (listener: SystemAvailableLocalesListener) => () => void;
 }
 export declare const useFormContext: () => FormContextType;
-export declare const FormProvider: ({ children, initialData, documentId, }: {
+export declare const FormProvider: ({ children, initialData, documentId, collectionPath, }: {
     children: React.ReactNode;
     initialData?: Record<string, any>;
     /**
@@ -105,6 +119,12 @@ export declare const FormProvider: ({ children, initialData, documentId, }: {
      * the context for upload widgets honouring `upload.requireSavedDocument`.
      */
     documentId?: string | null;
+    /**
+     * Path of the collection being edited. Exposed on the context so upload
+     * widgets can reach the upload endpoint from any nesting depth without
+     * every container forwarding it — see `FormContextType.collectionPath`.
+     */
+    collectionPath?: string | null;
 }) => React.JSX.Element;
 /**
  * Subscribe to the system `path` slot edited by the path widget.

package/dist/forms/form-context.js

@@ -2,7 +2,8 @@
 import { jsx } from "react/jsx-runtime";
 import { createContext, useCallback, useContext, useEffect, useRef, useState } from "react";
 import { normalizeHooks } from "@byline/core";
-import { get, set as external_nested_path_js_set } from "./nested-path.js";
+import { get, hasExistingIdTargets, setWithResult } from "./nested-path.js";
+import { deletePendingUploadsUnderPath } from "./pending-uploads.js";
 import { useTrackedSlot } from "./use-tracked-slot.js";
 const sameLocaleSet = (a, b)=>{
     if (a.length !== b.length) return false;
@@ -22,7 +23,7 @@ const useFormContext = ()=>{
     if (null == context) throw new Error('useFormContext must be used within a FormProvider');
     return context;
 };
-const FormProvider = ({ children, initialData = {}, documentId = null })=>{
+const FormProvider = ({ children, initialData = {}, documentId = null, collectionPath = null })=>{
     const fieldValues = useRef(JSON.parse(JSON.stringify(initialData?.fields ?? initialData)));
     const initialValues = useRef(initialData?.fields ?? initialData);
     const errorsRef = useRef([]);
@@ -95,11 +96,12 @@ const FormProvider = ({ children, initialData = {}, documentId = null })=>{
         const newFieldValues = {
             ...fieldValues.current
         };
-        external_nested_path_js_set(newFieldValues, name, value);
+        if (!setWithResult(newFieldValues, name, value)) return false;
         fieldValues.current = newFieldValues;
         dirtyFields.current.add(name);
         notifyFieldListeners(name, value);
         notifyMetaListeners();
+        return true;
     }, [
         notifyFieldListeners,
         notifyMetaListeners
@@ -110,7 +112,7 @@ const FormProvider = ({ children, initialData = {}, documentId = null })=>{
         updateFieldStoreInternal
     ]);
     const setFieldValue = useCallback((name, value)=>{
-        updateFieldStoreInternal(name, value);
+        if (!updateFieldStoreInternal(name, value)) return;
         const patch = {
             kind: 'field.set',
             path: name,
@@ -185,11 +187,16 @@ const FormProvider = ({ children, initialData = {}, documentId = null })=>{
         };
     }, []);
     const addPendingUpload = useCallback((fieldPath, upload)=>{
+        if (!hasExistingIdTargets(fieldValues.current, fieldPath)) {
+            URL.revokeObjectURL(upload.previewUrl);
+            return false;
+        }
         const existing = pendingUploadsRef.current.get(fieldPath);
         if (existing) URL.revokeObjectURL(existing.previewUrl);
         pendingUploadsRef.current.set(fieldPath, upload);
         dirtyFields.current.add(fieldPath);
         notifyMetaListeners();
+        return true;
     }, [
         notifyMetaListeners
     ]);
@@ -203,6 +210,12 @@ const FormProvider = ({ children, initialData = {}, documentId = null })=>{
     }, [
         notifyMetaListeners
     ]);
+    const removePendingUploadsUnder = useCallback((itemPath)=>{
+        const deleted = deletePendingUploadsUnderPath(pendingUploadsRef.current, itemPath, (url)=>URL.revokeObjectURL(url));
+        if (deleted) notifyMetaListeners();
+    }, [
+        notifyMetaListeners
+    ]);
     const getPendingUploads = useCallback(()=>new Map(pendingUploadsRef.current), []);
     const hasPendingUploads = useCallback(()=>pendingUploadsRef.current.size > 0, []);
     const clearPendingUploads = useCallback(()=>{
@@ -377,6 +390,7 @@ const FormProvider = ({ children, initialData = {}, documentId = null })=>{
     return /*#__PURE__*/ jsx(FormContext.Provider, {
         value: {
             documentId,
+            collectionPath,
             setFieldValue,
             setFieldStore,
             getFieldValue,
@@ -402,6 +416,7 @@ const FormProvider = ({ children, initialData = {}, documentId = null })=>{
             subscribeMeta,
             addPendingUpload,
             removePendingUpload,
+            removePendingUploadsUnder,
             getPendingUploads,
             hasPendingUploads,
             clearPendingUploads,

package/dist/forms/form-renderer.js

@@ -183,7 +183,6 @@ const FormContent = ({ mode, fields, onSubmit, onCancel, onStatusChange, onUnpub
         return /*#__PURE__*/ jsx(FieldRenderer, {
             field: field,
             defaultValue: initialData?.fields?.[field.name],
-            collectionPath: collectionPath,
             contentLocale: contentLocale,
             components: adminConfig?.fields?.[field.name]?.components,
             editor: adminConfig?.fields?.[field.name]?.editor,
@@ -233,6 +232,8 @@ const FormContent = ({ mode, fields, onSubmit, onCancel, onStatusChange, onUnpub
         noValidate: true,
         onSubmit: handleSubmit,
         className: classnames('byline-form', form_renderer_module.form),
+        inert: isUploading ? true : void 0,
+        "aria-busy": isUploading,
         children: [
             /*#__PURE__*/ jsxs("div", {
                 className: classnames('byline-form-heading-row', form_renderer_module["heading-row"]),
@@ -405,6 +406,7 @@ const FormRenderer = ({ mode, fields, onSubmit, onCancel, onStatusChange, onUnpu
     return /*#__PURE__*/ jsx(FormProvider, {
         initialData: initialData,
         documentId: 'edit' === mode && 'string' == typeof initialData?.id ? initialData.id : null,
+        collectionPath: collectionPath ?? null,
         children: /*#__PURE__*/ jsx(FormContent, {
             mode: mode,
             fields: fields,

package/dist/forms/nested-path.d.ts

@@ -8,7 +8,7 @@
  * Minimal nested `get`/`set` over string field paths, replacing lodash-es
  * (which pulled a large shared chunk onto unrelated bundles). Supports the
  * dot + bracket notation produced by the form field-path builders, e.g.
- * `title`, `a.b.c`, `items[0].title`, `blocks[2].nested[1].field`.
+ * `title`, `a.b.c`, `items[0].title`, `blocks[id=abc].nested[1].field`.
  *
  * `set` mirrors lodash semantics: it creates intermediate **arrays** when the
  * next path segment is a numeric index and plain **objects** otherwise, and it
@@ -21,4 +21,8 @@
 /** Split a field path into segments: `items[0].title` -> ['items','0','title']. */
 export declare function toPath(path: string): string[];
 export declare function get<T = any>(object: unknown, path: string): T;
+/** Whether every stable-id selector in a path still identifies a live item. */
+export declare function hasExistingIdTargets(object: unknown, path: string): boolean;
+/** Set a path and report whether all stable-id selectors resolved. */
+export declare function setWithResult<T extends object>(object: T, path: string, value: unknown): boolean;
 export declare function set<T extends object>(object: T, path: string, value: unknown): T;