@cardinali-studio/adminkit 2.2.18 → 2.2.20

package/dist/api.d.ts

@@ -46,6 +46,10 @@ export interface RepoPage {
     url: string;
     /** Lo `sha` del blob su GitHub: identifica la VERSIONE di questo file, non il suo contenuto. */
     sha: string;
+    /** Identità D1 site-owned. Assenti nella corsia Git/Hugo. */
+    documentId?: string;
+    draftRevisionId?: string | null;
+    publishedRevisionId?: string | null;
     page: Record<string, unknown>;
     /** Le sibling dichiarate dal sito, senza caricare il loro contenuto nell'elenco. */
     translations?: Record<string, {
@@ -53,6 +57,18 @@ export interface RepoPage {
         sha?: string;
     }>;
 }
+export type ContentPublishTarget = {
+    documentId: string;
+    expectedDraftRevisionId: string | null;
+    includeSiteAccess?: boolean;
+};
+export type ContentPublishDocument = {
+    documentId: string;
+    kind: string;
+    updatedAt: number;
+    draftRevisionId: string;
+    publishedRevisionId: string | null;
+};
 export type ContentSaveCommand = {
     revisionId: string;
     documentId: string;
@@ -122,6 +138,11 @@ export declare const api: {
         files: number;
         skipped: string[];
         shas?: Record<string, string>;
+        documents?: Record<string, {
+            documentId: string;
+            draftRevisionId: string | null;
+            publishedRevisionId: string | null;
+        }>;
     }>;
     contentState: () => Promise<{
         ok: true;
@@ -163,23 +184,24 @@ export declare const api: {
         ok: true;
         configured: true;
         ahead: number;
-        documents: {
-            documentId: string;
-            kind: string;
-            updatedAt: number;
-        }[];
+        documents: ContentPublishDocument[];
         mediaOperations?: MediaOperationStatus[];
         siteAccess?: {
             enabled: boolean;
         } | null;
         activeReleaseId?: string | null;
     }>;
-    contentPublish: () => Promise<{
+    contentPublish: (target: ContentPublishTarget) => Promise<{
         ok: true;
         published: boolean;
         releaseId?: string;
         attemptId?: string;
         message?: string;
+        verified?: boolean;
+        observedReleaseId?: string | null;
+        documents?: number;
+        dependentDocuments?: number;
+        remainingAhead?: number;
     }>;
     publishState: () => Promise<{
         ok: true;
@@ -288,6 +310,9 @@ export declare const api: {
         trashed: number;
         pagesUpdated: string[];
         refsToken?: string;
+        d1?: boolean;
+        deferred?: boolean;
+        operationId?: string;
     }>;
     requests: () => Promise<{
         ok: true;

package/dist/api.js

@@ -66,7 +66,7 @@ export const api = {
     /** D1 publication is site-owned: the site chooses which documents it can
      * materialize, while the panel only displays the pending immutable inputs. */
     contentPublishState: () => call("/admin/api/content/publish"),
-    contentPublish: () => post("/admin/api/content/publish", {}),
+    contentPublish: (target) => post("/admin/api/content/publish", target),
     // ---- pubblicazione
     /* Salvare scrive sulla bozza e non fa partire nessuna build; è questo che manda online. Due
      * gesti separati, quindi due chiamate: una chiede quanto c'è di non pubblicato, l'altra lo

package/dist/app/App.js

@@ -21,7 +21,7 @@ import "../theme.css";
 import "./app.css";
 import { MediaFolders, MediaGrid, ProsePages, Trash, useMediaLibrary, usePicker } from "../form/index.js";
 import { Preview, isLocalPreview } from "../preview.js";
-import { site } from "./site.js";
+import { contentPersistenceMode, site } from "./site.js";
 import { useHashRoute } from "./lib/router";
 import { usePages, legacyDraft, legacyDraftTitles, discardLegacyDraft } from "./lib/pages";
 import { useHome } from "./lib/home";
@@ -185,14 +185,32 @@ export function App() {
     /* Chi risponde del «Salva»: le pagine, la home, o nessuno (media e richieste si scrivono nel
      * momento in cui si fa il gesto — un bottone di salvataggio lì sarebbe una promessa falsa).
      *
-     * «Pubblica» invece NON passa di qui: è globale. Salvare scrive sulla bozza, e pubblicare
-     * manda online tutto ciò che c'è sulla bozza — pagine, home e impostazioni insieme — non la
-     * sezione che si sta guardando. Metterlo dentro `saver` avrebbe voluto dire tre pulsanti che
-     * fanno la stessa identica cosa. */
+     * In D1 «Pubblica» usa invece l'identità del contenuto aperto: le altre bozze rimangono
+     * salvate. La corsia Git/Hugo conserva il suo publish globale. */
     const saver = section === "pages" ? pages
         : section === "home" ? home
             : section === "settings" ? settings
                 : null;
+    const removedPageTarget = section === "pages" && route[1]
+        ? pages.removedPublishTargets[route[1]] ?? null : null;
+    const d1PublishTarget = section === "pages" && editing?._documentId
+        ? { documentId: editing._documentId, expectedDraftRevisionId: editing._draftRevisionId ?? null }
+        : section === "pages" && removedPageTarget ? removedPageTarget
+            : section === "home" ? home.publishTarget
+                : section === "settings" ? settings.publishTarget
+                    : null;
+    const d1DocumentPending = d1PublishTarget
+        ? publish.documents.some((document) => document.documentId === d1PublishTarget.documentId
+            && document.draftRevisionId === d1PublishTarget.expectedDraftRevisionId)
+        : false;
+    const d1ContextPending = Boolean(d1PublishTarget && (d1DocumentPending
+        || (section === "settings" && publish.siteAccessPending)));
+    const contextualPublishLabel = section === "pages" ? (removedPageTarget ? "Pubblica eliminazione" : "Pubblica questa pagina")
+        : section === "home" ? "Pubblica la Home"
+            : "Pubblica le impostazioni";
+    const contextualPendingCount = (d1DocumentPending ? 1 : 0)
+        + (section === "settings" && publish.siteAccessPending ? 1 : 0);
+    const otherPendingCount = Math.max(0, publish.ahead - contextualPendingCount);
     const heading = section === "overview" ? "Panoramica"
         : section === "pages" ? (editing ? String(editing.title ?? editing.slug) : "Pagine")
             : section === "home" ? (homeGroup || "Home")
@@ -219,7 +237,7 @@ export function App() {
         const p = all.slice(0, i + 1).join("/") + "/";
         return { prefix: p, label: media.labelOf(p) };
     });
-    return (_jsx(ProsePages.Provider, { value: pageLinks, children: _jsxs("div", { className: "app" + (hasList(section) && !offModule ? "" : " is-two"), children: [_jsxs("nav", { className: "rail", children: [_jsxs("div", { className: "rail-brand", children: [_jsx("span", { className: "rail-brand-name", children: site().name }), _jsx("span", { className: "rail-brand-role", children: "pannello" })] }), _jsx("div", { className: "rail-nav", children: navGroups.map((g) => (_jsxs("div", { className: "rail-group", children: [g.title && _jsx("span", { className: "rail-group-title", children: g.title }), g.items.map((n) => (_jsxs("button", { className: "rail-item" + (section === n.id ? " is-on" : ""), disabled: section === "media" && media.mutating, onClick: () => go(`/${n.id}`), children: [_jsx(n.icon, {}), _jsx("span", { children: n.label }), "badge" in n && n.badge ? _jsx("span", { className: "rail-badge", children: n.badge }) : null] }, n.id)))] }, g.title ?? "top"))) }), _jsxs("div", { className: "rail-foot", children: [_jsxs("a", { className: "rail-item", href: "/", target: "_blank", rel: "noreferrer", children: [_jsx(Icon.out, {}), _jsx("span", { children: "Vedi il sito" })] }), _jsxs("button", { className: "rail-item", onClick: toggleTheme, children: [theme === "dark" ? _jsx(Icon.sun, {}) : _jsx(Icon.moon, {}), _jsx("span", { children: theme === "dark" ? "Tema chiaro" : "Tema scuro" })] }), _jsxs("button", { className: "rail-item" + (section === "settings" ? " is-on" : ""), disabled: section === "media" && media.mutating, onClick: () => go("/settings/site"), children: [_jsx(Icon.settings, {}), _jsx("span", { children: "Impostazioni" })] })] })] }), hasList(section) && !offModule && (_jsxs("div", { className: "col", children: [section === "pages" && (_jsxs(_Fragment, { children: [_jsx("div", { className: "col-head", children: list && _jsx(NewPageButton, { pages: list, onCreate: (p) => pages.update([...list, p]) }) }), _jsx("div", { className: "col-body", children: pages.error ? _jsx("p", { className: "ak-error", children: pages.error })
+    return (_jsx(ProsePages.Provider, { value: pageLinks, children: _jsxs("div", { className: "app" + (hasList(section) && !offModule ? "" : " is-two"), children: [_jsxs("nav", { className: "rail", children: [_jsxs("div", { className: "rail-brand", children: [_jsx("span", { className: "rail-brand-name", children: site().name }), _jsx("span", { className: "rail-brand-role", children: "pannello" })] }), _jsx("div", { className: "rail-nav", children: navGroups.map((g) => (_jsxs("div", { className: "rail-group", children: [g.title && _jsx("span", { className: "rail-group-title", children: g.title }), g.items.map((n) => (_jsxs("button", { className: "rail-item" + (section === n.id ? " is-on" : ""), "aria-label": n.label, disabled: section === "media" && media.mutating, onClick: () => go(`/${n.id}`), children: [_jsx(n.icon, {}), _jsx("span", { children: n.label }), "badge" in n && n.badge ? _jsx("span", { className: "rail-badge", children: n.badge }) : null] }, n.id)))] }, g.title ?? "top"))) }), _jsxs("div", { className: "rail-foot", children: [_jsxs("a", { className: "rail-item", href: "/", target: "_blank", rel: "noreferrer", "aria-label": "Vedi il sito", children: [_jsx(Icon.out, {}), _jsx("span", { children: "Vedi il sito" })] }), _jsxs("button", { className: "rail-item", onClick: toggleTheme, "aria-label": theme === "dark" ? "Tema chiaro" : "Tema scuro", children: [theme === "dark" ? _jsx(Icon.sun, {}) : _jsx(Icon.moon, {}), _jsx("span", { children: theme === "dark" ? "Tema chiaro" : "Tema scuro" })] }), _jsxs("button", { className: "rail-item" + (section === "settings" ? " is-on" : ""), "aria-label": "Impostazioni", disabled: section === "media" && media.mutating, onClick: () => go("/settings/site"), children: [_jsx(Icon.settings, {}), _jsx("span", { children: "Impostazioni" })] })] })] }), hasList(section) && !offModule && (_jsxs("div", { className: "col", children: [section === "pages" && (_jsxs(_Fragment, { children: [_jsx("div", { className: "col-head", children: list && _jsx(NewPageButton, { pages: list, onCreate: (p) => pages.update([...list, p]) }) }), _jsx("div", { className: "col-body", children: pages.error ? _jsx("p", { className: "ak-error", children: pages.error })
                                         : !list ? _jsx("p", { className: "ak-hint", children: "Carico\u2026" })
                                             : _jsx(PagesList, { pages: list, current: editing?.slug, onEdit: (slug) => go(`/pages/${slug}`), languages: languages, onChange: pages.update, onRenamed: (from, to) => {
                                                     if (editing?.slug === from)
@@ -249,9 +267,11 @@ export function App() {
                                                rileggerlo, «Pubblica» comparirebbe solo al ricaricamento della pagina — cioè
                                                il pannello direbbe che non c'è niente da pubblicare subito dopo aver salvato
                                                qualcosa da pubblicare. */
-                                            onClick: () => void saver.save().then(() => publish.reload()), children: saver.saving ? "Salvo…" : "Salva" })] })), publish.ahead > 0 && (_jsx("button", { className: "ak-btn ak-btn-primary", disabled: publish.publishing, onClick: () => void publish.publish(), title: publish.commits.map((c) => c.message).join("\n"), children: publish.publishing ? "Pubblico…"
-                                        : publish.ahead === 1 ? "Pubblica (1 modifica)"
-                                            : `Pubblica (${publish.ahead} modifiche)` }))] }), offModule ? _jsx(FeatureOff, { info: offModule }) : _jsxs(_Fragment, { children: [draft !== null && (_jsxs("div", { className: "app-legacy", children: [_jsxs("p", { className: "app-legacy-row", children: [_jsxs("span", { children: ["Questo browser conserva una bozza del ", _jsx("strong", { children: "vecchio" }), " pannello (", draft, " pagine). Non viene usata: quello che si vede qui \u00E8 il sito pubblicato."] }), _jsx("button", { className: "ak-btn ak-btn-quiet", onClick: () => setDraftOpen((v) => !v), children: draftOpen ? "Nascondi" : "Cosa contiene" }), _jsx("button", { className: "ak-btn ak-btn-quiet", onClick: () => { discardLegacyDraft(); setDraft(null); }, children: "Butta" })] }), draftOpen && _jsx("p", { className: "app-legacy-list", children: legacyDraftTitles().join(" · ") })] })), _jsxs("div", { className: "pane-body" + (wide ? " is-wide" : ""), children: [section === "overview" && (
+                                            onClick: () => void saver.save().then(() => publish.reload()), children: saver.saving ? "Salvo…" : "Salva" })] })), contentPersistenceMode() === "d1" && d1ContextPending && otherPendingCount > 0 && (_jsx("span", { className: "pane-count", title: "Queste modifiche restano in bozza", children: otherPendingCount === 1 ? "1 altra bozza" : `${otherPendingCount} altre bozze` })), ((contentPersistenceMode() === "d1" && d1ContextPending)
+                                    || (contentPersistenceMode() !== "d1" && publish.ahead > 0)) && (_jsx("button", { className: "ak-btn ak-btn-primary", disabled: publish.publishing, onClick: () => void publish.publish(d1PublishTarget ?? undefined), title: publish.commits.map((c) => c.message).join("\n"), children: publish.publishing ? "Pubblico…"
+                                        : contentPersistenceMode() === "d1" ? contextualPublishLabel
+                                            : publish.ahead === 1 ? "Pubblica (1 modifica)"
+                                                : `Pubblica (${publish.ahead} modifiche)` }))] }), offModule ? _jsx(FeatureOff, { info: offModule }) : _jsxs(_Fragment, { children: [draft !== null && (_jsxs("div", { className: "app-legacy", children: [_jsxs("p", { className: "app-legacy-row", children: [_jsxs("span", { children: ["Questo browser conserva una bozza del ", _jsx("strong", { children: "vecchio" }), " pannello (", draft, " pagine). Non viene usata: quello che si vede qui \u00E8 il sito pubblicato."] }), _jsx("button", { className: "ak-btn ak-btn-quiet", onClick: () => setDraftOpen((v) => !v), children: draftOpen ? "Nascondi" : "Cosa contiene" }), _jsx("button", { className: "ak-btn ak-btn-quiet", onClick: () => { discardLegacyDraft(); setDraft(null); }, children: "Butta" })] }), draftOpen && _jsx("p", { className: "app-legacy-list", children: legacyDraftTitles().join(" · ") })] })), _jsxs("div", { className: "pane-body" + (wide ? " is-wide" : ""), children: [section === "overview" && (
                                         /* Transfer e richieste arrivano da QUI, già caricati per i badge della prima
                                            colonna: la Panoramica non li richiede una seconda volta, altrimenti lo stesso
                                            numero avrebbe due sorgenti e una delle due sarebbe sempre indietro. */

package/dist/app/app.css

@@ -745,49 +745,63 @@ body { margin: 0; background: var(--ak-bg); color: var(--ak-ink); font-family: v
 }
 .pe-photo-overlay img { max-width: 100%; max-height: 100%; display: block; }
 
-/* La modalità masonry replica il flusso del sito: le foto riempiono ogni colonna dall'alto
-   verso il basso e conservano il proprio rapporto d'aspetto. Le regole base qui sopra restano
-   quindi intatte per tutte le gallery con layout ordinario. */
-.pe-gallery.is-masonry > .pe-photo-grid {
+/* Il masonry verticale usa il flusso CSS a colonne: riempie una colonna dall'alto verso il
+   basso prima di passare alla successiva. `.is-masonry` resta come alias visuale per markup
+   legacy; i nuovi consumer ricevono sempre il nome esplicito. */
+.pe-gallery:is(.is-masonry, .is-masonry-vertical) > .pe-photo-grid {
   display: block; column-count: 3; column-gap: 1.5vw;
   padding: 4px 2px 40px;
 }
-.pe-gallery.is-masonry > .pe-photo-grid > .pe-photo {
+.pe-gallery:is(.is-masonry, .is-masonry-vertical) > .pe-photo-grid > .pe-photo {
   width: 100%; margin: 0 0 1.5vw; padding: 0;
   display: inline-block; break-inside: avoid; -webkit-column-break-inside: avoid;
   vertical-align: top;
 }
-.pe-gallery.is-masonry > .pe-photo-grid .pe-photo-frame {
+.pe-gallery:is(.is-masonry, .is-masonry-vertical) > .pe-photo-grid .pe-photo-frame {
   width: 100%; height: auto; display: block; overflow: hidden;
 }
-.pe-gallery.is-masonry > .pe-photo-grid .pe-photo-frame img {
+.pe-gallery:is(.is-masonry, .is-masonry-vertical) > .pe-photo-grid .pe-photo-frame img {
   width: 100%; height: auto; max-width: none; max-height: none;
 }
-.pe-gallery.is-masonry > .pe-photo-grid .pe-photo-actions {
+.pe-gallery:is(.is-masonry, .is-masonry-vertical) > .pe-photo-grid .pe-photo-actions {
   top: 8px; transform: translate(-50%, 0);
 }
-.pe-gallery.is-masonry > .pe-photo-grid .pe-photo:hover .pe-photo-actions,
-.pe-gallery.is-masonry > .pe-photo-grid .pe-photo:focus-within .pe-photo-actions {
+.pe-gallery:is(.is-masonry, .is-masonry-vertical) > .pe-photo-grid .pe-photo:hover .pe-photo-actions,
+.pe-gallery:is(.is-masonry, .is-masonry-vertical) > .pe-photo-grid .pe-photo:focus-within .pe-photo-actions {
   transform: translate(-50%, -2px);
 }
-.pe-gallery.is-masonry > .pe-photo-grid .pe-photo figcaption {
+.pe-gallery:is(.is-masonry, .is-masonry-vertical) > .pe-photo-grid .pe-photo figcaption {
   position: absolute; z-index: 2; right: 8px; bottom: 8px; left: 8px;
   padding: 6px 8px; border-radius: 4px; background: rgba(20,20,22,.72);
   color: #fff; text-align: left; opacity: 0; pointer-events: none;
   transition: opacity .12s;
 }
-.pe-gallery.is-masonry > .pe-photo-grid .pe-photo:hover figcaption,
-.pe-gallery.is-masonry > .pe-photo-grid .pe-photo:focus-within figcaption { opacity: 1; }
-.pe-gallery.is-masonry > .pe-photo-grid .pe-photo.is-insert-before::before,
-.pe-gallery.is-masonry > .pe-photo-grid .pe-photo.is-insert-after::after {
+.pe-gallery:is(.is-masonry, .is-masonry-vertical) > .pe-photo-grid .pe-photo:hover figcaption,
+.pe-gallery:is(.is-masonry, .is-masonry-vertical) > .pe-photo-grid .pe-photo:focus-within figcaption { opacity: 1; }
+.pe-gallery:is(.is-masonry, .is-masonry-vertical) > .pe-photo-grid .pe-photo.is-insert-before::before,
+.pe-gallery:is(.is-masonry, .is-masonry-vertical) > .pe-photo-grid .pe-photo.is-insert-after::after {
   right: 0; left: 0; width: auto; height: 3px;
 }
-.pe-gallery.is-masonry > .pe-photo-grid .pe-photo.is-insert-before::before {
+.pe-gallery:is(.is-masonry, .is-masonry-vertical) > .pe-photo-grid .pe-photo.is-insert-before::before {
   top: -7px; bottom: auto;
 }
-.pe-gallery.is-masonry > .pe-photo-grid .pe-photo.is-insert-after::after {
+.pe-gallery:is(.is-masonry, .is-masonry-vertical) > .pe-photo-grid .pe-photo.is-insert-after::after {
   top: auto; bottom: -7px;
 }
+
+/* Il masonry orizzontale mostra l'ordine editoriale da sinistra a destra. Sei slot rendono
+   ogni riga dell'admin equivalente a due battute della gallery pubblica a tre colonne; il
+   canvas uniforme mantiene stabile il drag e `contain` rende leggibile l'orientamento. */
+.pe-gallery.is-masonry-horizontal > .pe-photo-grid {
+  display: grid; grid-template-columns: repeat(6, minmax(0, 1fr));
+  gap: 20px 12px; column-count: auto; padding: 4px 2px 40px;
+}
+.pe-gallery.is-masonry-horizontal > .pe-photo-grid .pe-photo-frame {
+  height: clamp(112px, 8.5vw, 150px); aspect-ratio: auto;
+}
+.pe-gallery.is-masonry-horizontal > .pe-photo-grid .pe-photo-frame img {
+  width: auto; height: auto; max-width: 100%; max-height: 100%; object-fit: contain;
+}
 .pe-hidden-gallery {
   display: flex; flex-direction: column; gap: 18px; padding: 24px 2px 8px;
   border-top: 1px solid var(--ak-line);
@@ -2127,11 +2141,13 @@ body:has(.uk) .pane-body { padding-bottom: 190px; }
   .seo-row > .seo-field,
   .seo-row > .seo-help { grid-column: 2; }
   .seo-help { padding-top: 0; }
+  .pe-gallery.is-masonry-horizontal > .pe-photo-grid { grid-template-columns: repeat(4, minmax(0, 1fr)); }
 }
 
 @media (max-width: 900px) {
-  .pe-gallery.is-masonry > .pe-photo-grid { column-count: 2; column-gap: 3vw; }
-  .pe-gallery.is-masonry > .pe-photo-grid > .pe-photo { margin-bottom: 3vw; }
+  .pe-gallery:is(.is-masonry, .is-masonry-vertical) > .pe-photo-grid { column-count: 2; column-gap: 3vw; }
+  .pe-gallery:is(.is-masonry, .is-masonry-vertical) > .pe-photo-grid > .pe-photo { margin-bottom: 3vw; }
+  .pe-gallery.is-masonry-horizontal > .pe-photo-grid { grid-template-columns: repeat(3, minmax(0, 1fr)); }
   .settings-editor { padding-inline: 6px; gap: 34px; }
   .st-row { grid-template-columns: minmax(0, 1fr); gap: 15px; padding: 22px 0; }
   .seo-editor { padding-inline: 6px; }

package/dist/app/lib/gallery-layout.d.ts

@@ -0,0 +1,8 @@
+export type GalleryLayout = "grid" | "masonry-vertical" | "masonry-horizontal";
+/**
+ * `masonry` era il solo valore speciale supportato dal kit e descriveva il
+ * flusso CSS a colonne, quindi resta un alias del layout verticale. I siti
+ * possono migrare ai nomi espliciti senza cambiare di colpo documenti già
+ * pubblicati.
+ */
+export declare function normalizeGalleryLayout(value: unknown): GalleryLayout;

package/dist/app/lib/gallery-layout.js

@@ -0,0 +1,13 @@
+/**
+ * `masonry` era il solo valore speciale supportato dal kit e descriveva il
+ * flusso CSS a colonne, quindi resta un alias del layout verticale. I siti
+ * possono migrare ai nomi espliciti senza cambiare di colpo documenti già
+ * pubblicati.
+ */
+export function normalizeGalleryLayout(value) {
+    if (value === "masonry" || value === "masonry-vertical")
+        return "masonry-vertical";
+    if (value === "masonry-horizontal")
+        return "masonry-horizontal";
+    return "grid";
+}

package/dist/app/lib/home.d.ts

@@ -8,4 +8,8 @@ export declare function useHome(active: boolean): {
     change: (next: Record<string, unknown>) => void;
     save: () => Promise<void>;
     setNotice: import("react").Dispatch<import("react").SetStateAction<string | null>>;
+    publishTarget: {
+        documentId: string;
+        expectedDraftRevisionId: string | null;
+    } | null;
 };

package/dist/app/lib/home.js

@@ -89,5 +89,9 @@ export function useHome(active) {
         }
     }, [data, revision]);
     const change = useCallback((next) => { setData(next); setDirty(true); }, []);
-    return { data, error, dirty, saving, notice, load, change, save, setNotice };
+    const mapped = site().homeDocument;
+    return { data, error, dirty, saving, notice, load, change, save, setNotice,
+        publishTarget: contentPersistenceMode() === "d1" && mapped && revision
+            ? { documentId: mapped.documentId, expectedDraftRevisionId: revision.expected }
+            : null };
 }

package/dist/app/lib/pages.d.ts

@@ -4,6 +4,10 @@ export type PageModel = Record<string, unknown> & {
     /** Versione del file da cui questa pagina è stata letta. Torna al server nel salvataggio: se
      *  nel frattempo il file è cambiato, il server rifiuta invece di sovrascrivere. */
     _sha?: string;
+    /** Metadati D1 usati soltanto per pubblicare la pagina aperta. */
+    _documentId?: string;
+    _draftRevisionId?: string | null;
+    _publishedRevisionId?: string | null;
     /** Presenza/versione delle sibling dichiarate; il loro contenuto è caricato solo aprendole. */
     translations?: Record<string, {
         exists: boolean;
@@ -28,6 +32,10 @@ export declare function usePages(): {
     isPristine: (slug: string) => boolean;
     save: () => Promise<void>;
     setNotice: import("react").Dispatch<import("react").SetStateAction<string | null>>;
+    removedPublishTargets: Record<string, {
+        documentId: string;
+        expectedDraftRevisionId: string | null;
+    }>;
 };
 export declare function legacyDraft(): number | null;
 /** I titoli che la bozza contiene, per poterla guardare prima di buttarla. */

package/dist/app/lib/pages.js

@@ -23,6 +23,7 @@ export function usePages() {
     const [dirty, setDirty] = useState(false);
     const [saving, setSaving] = useState(false);
     const [notice, setNotice] = useState(null);
+    const [removedPublishTargets, setRemovedPublishTargets] = useState({});
     const load = useCallback(async () => {
         try {
             const d = await api.pages();
@@ -31,10 +32,13 @@ export function usePages() {
              * andava riconciliato con `modelFromRaw` — un passaggio in meno, e una grafia in meno da
              * far combaciare. L'ordine per peso lo dà già il server. */
             const list = (d.pages ?? []).map((p) => ({
-                ...p.page, slug: p.slug, url: p.url, _orig: p.slug, _sha: p.sha, translations: p.translations,
+                ...p.page, slug: p.slug, url: p.url, _orig: p.slug, _sha: p.sha,
+                _documentId: p.documentId, _draftRevisionId: p.draftRevisionId,
+                _publishedRevisionId: p.publishedRevisionId, translations: p.translations,
             }));
             base.current = new Map(list.map((p) => [p.slug, p]));
             setPages(list);
+            setRemovedPublishTargets({});
             setDirty(false);
             setError(null);
         }
@@ -89,8 +93,16 @@ export function usePages() {
             pages.forEach((p) => {
                 p._orig = p.slug;
                 const s = r.shas?.[p.slug];
-                if (s)
+                if (s) {
                     p._sha = s;
+                    p._draftRevisionId = s;
+                }
+                const document = r.documents?.[p.slug];
+                if (document) {
+                    p._documentId = document.documentId;
+                    p._draftRevisionId = document.draftRevisionId;
+                    p._publishedRevisionId = document.publishedRevisionId;
+                }
                 /* Le sibling hanno lo stesso ciclo di vita del file base: se non si aggiorna il loro
                    SHA qui, la modifica EN appena salvata parte già da una versione che non esiste più
                    e il Worker la rifiuta come conflitto al click successivo. */
@@ -108,6 +120,13 @@ export function usePages() {
                         p._translations[code]._sha = translationSha;
                 }
             });
+            const liveSlugs = new Set(pages.map((page) => page.slug));
+            setRemovedPublishTargets(Object.fromEntries(Object.entries(r.documents ?? {})
+                .filter(([slug]) => !liveSlugs.has(slug))
+                .map(([slug, document]) => [slug, {
+                    documentId: document.documentId,
+                    expectedDraftRevisionId: document.draftRevisionId,
+                }])));
             // Da qui in poi il file contiene ciò che hanno queste pagine: tornano tutte "non toccate".
             base.current = new Map(pages.map((p) => [p.slug, p]));
         }
@@ -124,7 +143,8 @@ export function usePages() {
             setSaving(false);
         }
     }, [pages]);
-    return { pages, error, dirty, saving, notice, load, update, refresh, isPristine, save, setNotice };
+    return { pages, error, dirty, saving, notice, load, update, refresh, isPristine, save, setNotice,
+        removedPublishTargets };
 }
 /* Bozza lasciata dal VECCHIO pannello nel localStorage di questo browser: si mostra, non si usa.
  *

package/dist/app/lib/publish.d.ts

@@ -1,3 +1,4 @@
+import { type ContentPublishDocument, type ContentPublishTarget } from "../../index.js";
 export interface PublishState {
     /** Quanti commit ci sono sulla bozza che non sono ancora online. */
     ahead: number;
@@ -6,13 +7,20 @@ export interface PublishState {
         message: string;
         date: string | null;
     }[];
+    documents: ContentPublishDocument[];
+    siteAccessPending: boolean;
     /** Falso se il branch di bozza non esiste ancora (passo manuale di configurazione). */
     configured: boolean;
     publishing: boolean;
     notice: string | null;
     error: string | null;
     reload(): Promise<void>;
-    publish(): Promise<void>;
+    publish(target?: ContentPublishTarget): Promise<void>;
     clearNotice(): void;
 }
+export declare function contentPublicationNotice(result: {
+    published: boolean;
+    message?: string;
+    verified?: boolean;
+}): string;
 export declare function usePublish(): PublishState;

package/dist/app/lib/publish.js

@@ -8,10 +8,20 @@
 import { useCallback, useEffect, useState } from "react";
 import { api, ApiError } from "../../index.js";
 import { contentPersistenceMode } from "../site.js";
+export function contentPublicationNotice(result) {
+    if (result.published === false) {
+        return result.message ?? "Non c'erano modifiche salvate da pubblicare.";
+    }
+    return result.message ?? (result.verified === true
+        ? "Pubblicato e verificato online."
+        : "Pubblicato. Verifica online in attesa.");
+}
 export function usePublish() {
     const [ahead, setAhead] = useState(0);
     const [commits, setCommits] = useState([]);
     const [configured, setConfigured] = useState(true);
+    const [documents, setDocuments] = useState([]);
+    const [siteAccessPending, setSiteAccessPending] = useState(false);
     const [publishing, setPublishing] = useState(false);
     const [notice, setNotice] = useState(null);
     const [error, setError] = useState(null);
@@ -20,6 +30,8 @@ export function usePublish() {
             try {
                 const d = await api.contentPublishState();
                 setAhead(d.ahead ?? 0);
+                setDocuments(d.documents ?? []);
+                setSiteAccessPending(Boolean(d.siteAccess));
                 setCommits((d.documents ?? []).map((document) => ({
                     message: `Modifica salvata (${document.kind})`, date: document.updatedAt ? new Date(document.updatedAt).toISOString() : null,
                 })).concat((d.mediaOperations ?? [])
@@ -42,6 +54,8 @@ export function usePublish() {
         }
         try {
             const d = await api.publishState();
+            setDocuments([]);
+            setSiteAccessPending(false);
             setAhead(d.ahead ?? 0);
             setCommits(d.commits ?? []);
             setConfigured(d.configured !== false);
@@ -57,15 +71,15 @@ export function usePublish() {
      * per cui uno guarda quel pulsante, e un conteggio che compare solo dopo esserci passati sopra
      * non serve a niente. È la stessa ragione dei badge di Richieste e Consegne. */
     useEffect(() => { void reload(); }, [reload]);
-    const publish = useCallback(async () => {
+    const publish = useCallback(async (target) => {
         if (contentPersistenceMode() === "d1") {
             setPublishing(true);
             setNotice(null);
             try {
-                const r = await api.contentPublish();
-                setNotice(r.published === false
-                    ? r.message ?? "Non c'erano modifiche salvate da pubblicare."
-                    : "Pubblicazione avviata. Il sito si aggiorna fra qualche minuto.");
+                if (!target)
+                    throw new ApiError("Apri il contenuto che vuoi pubblicare.", "invalid_request", 400);
+                const r = await api.contentPublish(target);
+                setNotice(contentPublicationNotice(r));
                 await reload();
             }
             catch (e) {
@@ -101,7 +115,7 @@ export function usePublish() {
         }
     }, [reload]);
     return {
-        ahead, commits, configured, publishing, notice, error,
+        ahead, commits, documents, siteAccessPending, configured, publishing, notice, error,
         reload, publish, clearNotice: () => setNotice(null),
     };
 }

package/dist/app/lib/settings.d.ts

@@ -28,4 +28,9 @@ export declare function useSiteSettings(active: boolean): {
     setNotice: import("react").Dispatch<import("react").SetStateAction<string | null>>;
     accessDraftPending: boolean;
     discardSiteAccess: () => Promise<void>;
+    publishTarget: {
+        documentId: string;
+        expectedDraftRevisionId: string | null;
+        includeSiteAccess: boolean;
+    } | null;
 };

package/dist/app/lib/settings.js

@@ -152,5 +152,10 @@ export function useSiteSettings(active) {
         }
     }, [accessState, editorialBaseline]);
     return { data, error, dirty, saving, notice, load, change, save, setNotice,
-        accessDraftPending: Boolean(accessState?.draft), discardSiteAccess };
+        accessDraftPending: Boolean(accessState?.draft), discardSiteAccess,
+        publishTarget: contentPersistenceMode() === "d1" && site().siteSettingsDocument && revision
+            ? { documentId: site().siteSettingsDocument.documentId,
+                expectedDraftRevisionId: revision.expected,
+                includeSiteAccess: Boolean(accessState?.draft) }
+            : null };
 }

package/dist/app/routes/PageEditor.js

@@ -15,6 +15,7 @@ import { CSS } from "@dnd-kit/utilities";
 import { ProseField, SchemaForm } from "../../form/index.js";
 import { api } from "../../index.js";
 import { pageType } from "../site.js";
+import { normalizeGalleryLayout } from "../lib/gallery-layout";
 import { uniqueSlug } from "../lib/slug";
 import { proseStats } from "../lib/text";
 import { Icon } from "../ui/icons";
@@ -100,7 +101,7 @@ function imageName(src) {
         return raw;
     }
 }
-function GalleryCard({ item, masonry = false, sortable = true, activeId, overId, activeIndex, overIndex, onReplace, onToggle, onRemove, }) {
+function GalleryCard({ item, verticalMasonry = false, sortable = true, activeId, overId, activeIndex, overIndex, onReplace, onToggle, onRemove, }) {
     const { attributes, listeners, setNodeRef, transform, transition, isDragging } = useSortable({
         id: item.src,
         disabled: !sortable,
@@ -108,7 +109,7 @@ function GalleryCard({ item, masonry = false, sortable = true, activeId, overId,
     const isTarget = sortable && overId === item.src && activeId !== item.src;
     const insertAfter = isTarget && activeIndex < overIndex;
     const insertBefore = isTarget && activeIndex > overIndex;
-    const frameStyle = masonry && item.w && item.h
+    const frameStyle = verticalMasonry && item.w && item.h
         ? { aspectRatio: `${item.w} / ${item.h}` }
         : undefined;
     return (_jsxs("figure", { ref: setNodeRef, className: [
@@ -120,8 +121,10 @@ function GalleryCard({ item, masonry = false, sortable = true, activeId, overId,
             insertAfter ? "is-insert-after" : "",
         ].filter(Boolean).join(" "), style: sortable ? { transform: CSS.Transform.toString(transform), transition } : undefined, children: [_jsxs("div", { className: "pe-photo-frame", style: frameStyle, ...(sortable ? attributes : {}), ...(sortable ? listeners : {}), children: [_jsx("img", { src: item.src, alt: imageName(item.src), draggable: false }), item.hidden && _jsx("span", { className: "pe-hidden-label", children: "Nascosta" })] }), _jsxs("div", { className: "pe-photo-actions", children: [_jsx("button", { type: "button", onClick: onReplace, title: "Cambia immagine", "aria-label": "Cambia immagine", children: _jsx(Icon.replace, {}) }), _jsx("button", { type: "button", onClick: onToggle, title: item.hidden ? "Rimetti online" : "Nascondi dalla gallery", "aria-label": item.hidden ? "Rimetti online" : "Nascondi dalla gallery", children: item.hidden ? _jsx(Icon.eye, {}) : _jsx(Icon.eyeOff, {}) }), _jsx("button", { type: "button", className: "is-danger", onClick: onRemove, title: "Rimuovi dalla gallery", "aria-label": "Rimuovi dalla gallery", children: _jsx(Icon.trash, {}) })] }), _jsx("figcaption", { title: imageName(item.src), children: imageName(item.src) })] }));
 }
-function GalleryEditor({ value, onChange, pickMediaFiles, masonry = false, }) {
+function GalleryEditor({ value, onChange, pickMediaFiles, layout = "grid", }) {
     const list = Array.isArray(value) ? value : [];
+    const masonry = layout !== "grid";
+    const verticalMasonry = layout === "masonry-vertical";
     const shownItems = masonry ? list.filter((item) => !item.hidden) : list;
     const hiddenItems = masonry ? list.filter((item) => item.hidden) : [];
     const [activeId, setActiveId] = useState(null);
@@ -203,9 +206,9 @@ function GalleryEditor({ value, onChange, pickMediaFiles, masonry = false, }) {
         ? { ...item, hidden: item.hidden ? undefined : true }
         : item));
     const remove = (src) => onChange(list.filter((item) => item.src !== src));
-    return (_jsxs("section", { className: `pe-gallery${masonry ? " is-masonry" : ""}`, "aria-label": "Foto della gallery", children: [_jsxs("div", { className: "pe-gallery-bar", children: [_jsxs("div", { className: "pe-gallery-summary", children: [_jsxs("strong", { children: [list.length, " ", list.length === 1 ? "foto" : "foto"] }), _jsx("span", { children: list.length === 0
+    return (_jsxs("section", { className: `pe-gallery${masonry ? ` is-${layout}` : ""}`, "aria-label": "Foto della gallery", children: [_jsxs("div", { className: "pe-gallery-bar", children: [_jsxs("div", { className: "pe-gallery-summary", children: [_jsxs("strong", { children: [list.length, " ", list.length === 1 ? "foto" : "foto"] }), _jsx("span", { children: list.length === 0
                                     ? "Scegli le immagini da mostrare nella pagina."
-                                    : `${visible} online${visible < list.length ? ` · ${list.length - visible} nascoste` : ""}` }), masonry && list.length > 0 && (_jsx("span", { className: "pe-gallery-layout-note", children: "Masonry \u00B7 3 colonne \u00B7 ordine dall\u2019alto verso il basso" }))] }), list.length === 0 ? (_jsxs("button", { type: "button", className: "pe-add", onClick: () => void add("start"), children: ["Aggiungi foto ", _jsx(Icon.plus, {})] })) : (_jsxs("div", { className: "pe-add-group", ref: addPositionRef, children: [_jsxs("button", { type: "button", className: "pe-add", onClick: () => void add("start"), children: ["Aggiungi in cima ", _jsx(Icon.plus, {})] }), _jsx("button", { type: "button", className: "pe-add-position", "aria-label": "Scegli dove aggiungere le foto", "aria-expanded": addPositionOpen, "aria-controls": "gallery-add-position", onClick: () => setAddPositionOpen((open) => !open), children: "\u2304" }), addPositionOpen && (_jsx("div", { className: "pe-add-menu", id: "gallery-add-position", children: _jsx("button", { type: "button", onClick: () => void add("end"), children: "Aggiungi in fondo" }) }))] }))] }), list.length === 0 ? (_jsxs("button", { type: "button", className: "pe-gallery-empty", onClick: () => void add("start"), children: [_jsx(Icon.gallery, {}), _jsx("strong", { children: "La gallery \u00E8 vuota" }), _jsx("span", { children: "Aggiungi le prime fotografie" })] })) : (_jsxs(DndContext, { sensors: sensors, collisionDetection: closestCenter, onDragStart: ({ active }) => setActiveId(String(active.id)), onDragOver: ({ over }) => setOverId(over ? String(over.id) : null), onDragCancel: () => { setActiveId(null); setOverId(null); }, onDragEnd: finishDrag, children: [_jsx(SortableContext, { items: shownItems.map((item) => item.src), strategy: rectSortingStrategy, children: _jsx("div", { className: "pe-photo-grid", children: shownItems.map((item) => (_jsx(GalleryCard, { item: item, masonry: masonry, activeId: activeId, overId: overId, activeIndex: activeIndex, overIndex: overIndex, onReplace: () => void replace(itemIndex(item.src)), onToggle: () => toggle(item.src), onRemove: () => remove(item.src) }, item.src))) }) }), _jsx(DragOverlay, { children: activeItem && (_jsx("div", { className: "pe-photo-overlay", children: _jsx("img", { src: activeItem.src, alt: "" }) })) }), masonry && hiddenItems.length > 0 && (_jsxs("section", { className: "pe-hidden-gallery", "aria-label": "Foto nascoste", children: [_jsxs("div", { className: "pe-hidden-gallery-head", children: [_jsx("strong", { children: "Nascoste" }), _jsx("span", { children: "Non occupano spazio nella gallery pubblica." })] }), _jsx("div", { className: "pe-hidden-grid", children: hiddenItems.map((item) => (_jsx(GalleryCard, { item: item, sortable: false, activeId: activeId, overId: overId, activeIndex: activeIndex, overIndex: overIndex, onReplace: () => void replace(itemIndex(item.src)), onToggle: () => toggle(item.src), onRemove: () => remove(item.src) }, item.src))) })] }))] }))] }));
+                                    : `${visible} online${visible < list.length ? ` · ${list.length - visible} nascoste` : ""}` }), layout === "masonry-vertical" && list.length > 0 && (_jsx("span", { className: "pe-gallery-layout-note", children: "Masonry verticale \u00B7 3 colonne \u00B7 ordine dall\u2019alto verso il basso" })), layout === "masonry-horizontal" && list.length > 0 && (_jsx("span", { className: "pe-gallery-layout-note", children: "Masonry orizzontale \u00B7 6 colonne \u00B7 ordine da sinistra a destra" }))] }), list.length === 0 ? (_jsxs("button", { type: "button", className: "pe-add", onClick: () => void add("start"), children: ["Aggiungi foto ", _jsx(Icon.plus, {})] })) : (_jsxs("div", { className: "pe-add-group", ref: addPositionRef, children: [_jsxs("button", { type: "button", className: "pe-add", onClick: () => void add("start"), children: ["Aggiungi in cima ", _jsx(Icon.plus, {})] }), _jsx("button", { type: "button", className: "pe-add-position", "aria-label": "Scegli dove aggiungere le foto", "aria-expanded": addPositionOpen, "aria-controls": "gallery-add-position", onClick: () => setAddPositionOpen((open) => !open), children: "\u2304" }), addPositionOpen && (_jsx("div", { className: "pe-add-menu", id: "gallery-add-position", children: _jsx("button", { type: "button", onClick: () => void add("end"), children: "Aggiungi in fondo" }) }))] }))] }), list.length === 0 ? (_jsxs("button", { type: "button", className: "pe-gallery-empty", onClick: () => void add("start"), children: [_jsx(Icon.gallery, {}), _jsx("strong", { children: "La gallery \u00E8 vuota" }), _jsx("span", { children: "Aggiungi le prime fotografie" })] })) : (_jsxs(DndContext, { sensors: sensors, collisionDetection: closestCenter, onDragStart: ({ active }) => setActiveId(String(active.id)), onDragOver: ({ over }) => setOverId(over ? String(over.id) : null), onDragCancel: () => { setActiveId(null); setOverId(null); }, onDragEnd: finishDrag, children: [_jsx(SortableContext, { items: shownItems.map((item) => item.src), strategy: rectSortingStrategy, children: _jsx("div", { className: "pe-photo-grid", children: shownItems.map((item) => (_jsx(GalleryCard, { item: item, verticalMasonry: verticalMasonry, activeId: activeId, overId: overId, activeIndex: activeIndex, overIndex: overIndex, onReplace: () => void replace(itemIndex(item.src)), onToggle: () => toggle(item.src), onRemove: () => remove(item.src) }, item.src))) }) }), _jsx(DragOverlay, { children: activeItem && (_jsx("div", { className: "pe-photo-overlay", children: _jsx("img", { src: activeItem.src, alt: "" }) })) }), masonry && hiddenItems.length > 0 && (_jsxs("section", { className: "pe-hidden-gallery", "aria-label": "Foto nascoste", children: [_jsxs("div", { className: "pe-hidden-gallery-head", children: [_jsx("strong", { children: "Nascoste" }), _jsx("span", { children: "Non occupano spazio nella gallery pubblica." })] }), _jsx("div", { className: "pe-hidden-grid", children: hiddenItems.map((item) => (_jsx(GalleryCard, { item: item, sortable: false, activeId: activeId, overId: overId, activeIndex: activeIndex, overIndex: overIndex, onReplace: () => void replace(itemIndex(item.src)), onToggle: () => toggle(item.src), onRemove: () => remove(item.src) }, item.src))) })] }))] }))] }));
 }
 export function PageEditor({ page, onChange, onRefresh, pristine, pickMedia, pickMediaFiles, activeLanguage, defaultLanguage, }) {
     const [bodyState, setBodyState] = useState("idle");
@@ -342,7 +345,7 @@ export function PageEditor({ page, onChange, onRefresh, pristine, pickMedia, pic
            (`sections[].images`) e dove la griglia esce sul sito. Non c'è più un pannello staccato in
            fondo — c'era finché le foto stavano in un campo della pagina, e insieme a lui è sparito
            il caso in cui la stessa griglia si vedeva due volte. */
-        return (_jsxs("div", { className: "ed ed-gallery", children: [bodyState === "error" && (_jsx("p", { className: "pe-load-error", children: "Non sono riuscito ad aggiornare i dati della pagina dal sito." })), _jsx(GallerySectionsEditor, { value: page.sections, onChange: (sections) => onChange({ ...page, sections }), renderGallery: (images, onImages) => (_jsx(GalleryEditor, { value: images, onChange: onImages, pickMediaFiles: pickMediaFiles, masonry: page.galleryLayout === "masonry" })), pickMediaFiles: pickMediaFiles })] }));
+        return (_jsxs("div", { className: "ed ed-gallery", children: [bodyState === "error" && (_jsx("p", { className: "pe-load-error", children: "Non sono riuscito ad aggiornare i dati della pagina dal sito." })), _jsx(GallerySectionsEditor, { value: page.sections, onChange: (sections) => onChange({ ...page, sections }), renderGallery: (images, onImages) => (_jsx(GalleryEditor, { value: images, onChange: onImages, pickMediaFiles: pickMediaFiles, layout: normalizeGalleryLayout(page.galleryLayout) })), pickMediaFiles: pickMediaFiles })] }));
     }
     return (_jsxs("div", { className: "ed", children: [translationActive && (_jsx("p", { className: "pe-translation-note", children: page.translations?.[activeLanguage]?.exists || page._translations?.[activeLanguage]
                     ? `Stai modificando ${activeLanguage.toUpperCase()}. I campi non traducibili restano visibili e vengono copiati dalla lingua predefinita al salvataggio.`

package/dist/form/media/useMediaLibrary.d.ts

@@ -1,6 +1,13 @@
-import { type AssetFile, type AssetFolder } from "../../api.js";
+import { api, type AssetFile, type AssetFolder } from "../../api.js";
 import type { MediaOperationStatus } from "../../media.js";
 import { type MediaUploadJob } from "./media-upload-queue.js";
+/** D1 registra l'intera cancellazione nel preflight: non esistono né il token Git né i
+ * successivi gruppi R2 della corsia legacy. Tenere qui la biforcazione evita che il client
+ * annunci un falso errore dopo che il server ha già accettato l'operazione. */
+export declare function deleteMediaKeys(keys: string[], remove: typeof api.remove, onProgress?: (done: number) => void): Promise<{
+    done: number;
+    refsToken?: string;
+}>;
 export type MediaOperationState = "idle" | "planning" | "awaiting_confirmation" | "moving" | "deleting" | "renaming" | "creating_folder" | "journal";
 export type SortKey = "uploaded" | "capturedAt" | "name" | "size";
 export declare const SORT_LABELS: Record<SortKey, string>;

package/dist/form/media/useMediaLibrary.js

@@ -21,6 +21,28 @@ import { executeMediaMovePlan, mediaMoveConfirmation, mediaMoveNeedsConfirmation
  * pensa che sia bloccato. Alzarlo fa tornare il difetto: richieste lunghe che muoiono a metà. */
 const CHUNK = 10;
 const MOVE_CONFIRM_FILE_THRESHOLD = 2;
+/** D1 registra l'intera cancellazione nel preflight: non esistono né il token Git né i
+ * successivi gruppi R2 della corsia legacy. Tenere qui la biforcazione evita che il client
+ * annunci un falso errore dopo che il server ha già accettato l'operazione. */
+export async function deleteMediaKeys(keys, remove, onProgress = () => { }) {
+    const preflight = await remove({ keys }, { refsOnly: true });
+    if (preflight.d1 === true) {
+        const done = preflight.trashed ?? keys.length;
+        onProgress(done);
+        return { done };
+    }
+    if (!preflight.refsToken) {
+        throw new Error("Il server non ha confermato la verifica dei riferimenti.");
+    }
+    let done = 0;
+    for (let i = 0; i < keys.length; i += CHUNK) {
+        const group = keys.slice(i, i + CHUNK);
+        const result = await remove({ keys: group }, { skipRefs: true, refsToken: preflight.refsToken });
+        done += result.trashed ?? group.length;
+        onProgress(done);
+    }
+    return { done, refsToken: preflight.refsToken };
+}
 export const SORT_LABELS = {
     uploaded: "caricamento", capturedAt: "scatto", name: "nome", size: "peso",
 };
@@ -410,17 +432,9 @@ export function useMediaLibrary({ mode, multiple = true, active = true, remember
             let refsToken;
             if (keys.length) {
                 setProgress({ done: 0, total: keys.length, verb: "Cestino" });
-                const preflight = await api.remove({ keys }, { refsOnly: true });
-                if (!preflight.refsToken)
-                    throw new Error("Il server non ha confermato la verifica dei riferimenti.");
-                refsToken = preflight.refsToken;
-                let done = 0;
-                for (let i = 0; i < keys.length; i += CHUNK) {
-                    const group = keys.slice(i, i + CHUNK);
-                    const r = await api.remove({ keys: group }, { skipRefs: true, refsToken: preflight.refsToken });
-                    done += r.trashed ?? group.length;
-                    setProgress({ done, total: keys.length, verb: "Cestino" });
-                }
+                const result = await deleteMediaKeys(keys, api.remove, (done) => setProgress({ done, total: keys.length, verb: "Cestino" }));
+                refsToken = result.refsToken;
+                const done = result.done;
                 if (done < keys.length) {
                     failure = `Cestinate ${done} foto su ${keys.length}: le altre sono ancora lì, riprova.`;
                 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cardinali-studio/adminkit",
-  "version": "2.2.18",
+  "version": "2.2.20",
   "type": "module",
   "description": "Motore riusabile di un pannello di amministrazione per siti Hugo su Cloudflare Pages: codec del front matter guidato dallo schema, form React, libreria media su R2. NIENTE di specifico di un sito qui dentro.",
   "license": "UNLICENSED",