@delmaredigital/payload-puck 0.6.21 → 0.6.23

package/dist/admin/PuckEditorView.js

@@ -2,6 +2,7 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { useEffect, useState } from 'react';
 import { useParams, useSearchParams } from 'next/navigation';
+import { mapPayloadFieldsToRootProps } from '../api/utils/mapRootProps.js';
 /**
  * Ready-to-use Puck editor page component
  *
@@ -190,7 +191,7 @@ import { useParams, useSearchParams } from 'next/navigation';
         });
     }
     // Default puck data if none exists
-    const initialData = page.puckData || {
+    const basePuckData = page.puckData || {
         root: {
             props: {
                 title: page.title || 'New Page'
@@ -199,6 +200,20 @@ import { useParams, useSearchParams } from 'next/navigation';
         content: [],
         zones: {}
     };
+    // Hydrate root.props from Payload fields — ensures saved values like pageLayout,
+    // isHomepage, conversion settings etc. are reflected in the editor UI even if
+    // they weren't stored in puckData (Puck may strip props that match defaults)
+    const payloadRootProps = mapPayloadFieldsToRootProps(page);
+    const initialData = {
+        ...basePuckData,
+        root: {
+            ...basePuckData.root,
+            props: {
+                ...basePuckData.root?.props,
+                ...payloadRootProps
+            }
+        }
+    };
     return /*#__PURE__*/ _jsx(PuckEditor, {
         pageId: page.id,
         initialData: initialData,

package/dist/api/createPuckApiRoutesVersions.js

@@ -1,5 +1,6 @@
 import { NextResponse } from 'next/server';
 import { getPayload } from 'payload';
+import { resolveLocaleFromNextRequest } from '../utils/locale.js';
 /**
  * Create API route handlers for /api/puck/pages/[id]/versions
  *
@@ -70,6 +71,7 @@ import { getPayload } from 'payload';
             const url = new URL(request.url);
             const limit = parseInt(url.searchParams.get('limit') || '20', 10);
             const page = parseInt(url.searchParams.get('page') || '1', 10);
+            const locale = resolveLocaleFromNextRequest(request);
             // Fetch versions for this page
             const versions = await payload.findVersions({
                 collection,
@@ -80,7 +82,10 @@ import { getPayload } from 'payload';
                 },
                 sort: '-updatedAt',
                 limit,
-                page
+                page,
+                ...locale ? {
+                    locale: locale.toString()
+                } : {}
             });
             return NextResponse.json({
                 docs: versions.docs,

package/dist/editor/PuckEditorImpl.client.js

@@ -1,8 +1,9 @@
 'use client';
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
-import { useState, useCallback, useMemo, useRef, createElement } from 'react';
+import { useState, useCallback, useMemo, useRef, createElement, useEffect } from 'react';
 import { useRouter } from 'next/navigation';
 import { Puck } from '@puckeditor/core';
+import { useLocale } from '@payloadcms/ui';
 import '@puckeditor/core/puck.css';
 import headingAnalyzer from '@puckeditor/plugin-heading-analyzer';
 import '@puckeditor/plugin-heading-analyzer/dist/index.css';
@@ -71,6 +72,18 @@ import { useAiPrompts } from '../ai/hooks/useAiPrompts.js';
     // Track if document was ever published (initially or during this session)
     const [wasPublished, setWasPublished] = useState(initialStatus === 'published');
     const { hasUnsavedChanges, markClean, markDirty } = useUnsavedChanges();
+    // Get current locale code
+    const { code: currentLocale } = useLocale();
+    // Store the initial locale on mount
+    const initialLocale = useRef(currentLocale);
+    useEffect(()=>{
+        // If the locale changes from what it was at load, force a hard refresh
+        if (initialLocale.current && currentLocale !== initialLocale.current) {
+            window.location.reload();
+        }
+    }, [
+        currentLocale
+    ]);
     // Preview modal state
     const [isPreviewOpen, setIsPreviewOpen] = useState(false);
     // Preview dark mode state (for toggling dark/light in preview iframe)
@@ -143,7 +156,7 @@ import { useAiPrompts } from '../ai/hooks/useAiPrompts.js';
     // Helper to make save request with optional homepage swap
     const makeSaveRequest = useCallback(async (data, options = {})=>{
         const typedData = data;
-        return fetch(`${apiEndpoint}/${pageId}`, {
+        return fetch(`${apiEndpoint}/${pageId}${currentLocale ? `?locale=${currentLocale}` : ''}`, {
             method: 'PATCH',
             headers: {
                 'Content-Type': 'application/json'
@@ -168,7 +181,8 @@ import { useAiPrompts } from '../ai/hooks/useAiPrompts.js';
         apiEndpoint,
         pageId,
         pageTitle,
-        pageSlug
+        pageSlug,
+        currentLocale
     ]);
     // Handle homepage conflict - prompt user to swap
     const handleHomepageConflict = useCallback(async (existingHomepage, data, publish)=>{
@@ -179,7 +193,8 @@ import { useAiPrompts } from '../ai/hooks/useAiPrompts.js';
         // Retry with swapHomepage flag
         const response = await makeSaveRequest(data, {
             publish,
-            swapHomepage: true
+            swapHomepage: true,
+            currentLocale
         });
         if (!response.ok) {
             const errorData = await response.json();
@@ -187,7 +202,8 @@ import { useAiPrompts } from '../ai/hooks/useAiPrompts.js';
         }
         return true;
     }, [
-        makeSaveRequest
+        makeSaveRequest,
+        currentLocale
     ]);
     // Handle save (as draft)
     const handleSave = useCallback(async (data)=>{
@@ -195,7 +211,8 @@ import { useAiPrompts } from '../ai/hooks/useAiPrompts.js';
         const typedData = data;
         try {
             const response = await makeSaveRequest(data, {
-                publish: false
+                publish: false,
+                currentLocale
             });
             if (!response.ok) {
                 const errorData = await response.json();
@@ -234,7 +251,8 @@ import { useAiPrompts } from '../ai/hooks/useAiPrompts.js';
         handleHomepageConflict,
         markClean,
         onSaveSuccess,
-        onSaveError
+        onSaveError,
+        currentLocale
     ]);
     // Handle publish
     const handlePublish = useCallback(async (data)=>{

package/dist/editor/components/VersionHistory.js

@@ -1,6 +1,7 @@
 'use client';
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { useState, useCallback, useEffect, useRef, memo } from 'react';
+import { useLocale } from '@payloadcms/ui';
 import { History, Loader2, Check, RotateCcw, X, ChevronDown } from 'lucide-react';
 // Shared styles
 const styles = {
@@ -188,11 +189,12 @@ const styles = {
     const [isAvailable, setIsAvailable] = useState(null);
     const [hoveredIndex, setHoveredIndex] = useState(null);
     const dropdownRef = useRef(null);
+    const { code: currentLocale } = useLocale();
     // Check if versions endpoint is available on mount
     useEffect(()=>{
         async function checkAvailability() {
             try {
-                const response = await fetch(`${apiEndpoint}/${pageId}/versions?limit=1`, {
+                const response = await fetch(`${apiEndpoint}/${pageId}/versions?limit=1${currentLocale ? `&locale=${currentLocale}` : ''}`, {
                     method: 'GET'
                 });
                 setIsAvailable(response.status !== 404);
@@ -220,7 +222,7 @@ const styles = {
         setIsLoading(true);
         setError(null);
         try {
-            const response = await fetch(`${apiEndpoint}/${pageId}/versions?limit=20`);
+            const response = await fetch(`${apiEndpoint}/${pageId}/versions?limit=20${currentLocale ? `&locale=${currentLocale}` : ''}`);
             if (!response.ok) {
                 throw new Error('Failed to fetch versions');
             }
@@ -252,13 +254,14 @@ const styles = {
         }
         setIsRestoring(true);
         try {
-            const response = await fetch(`${apiEndpoint}/${pageId}/versions`, {
+            const response = await fetch(`${apiEndpoint}/${pageId}/restore`, {
                 method: 'POST',
                 headers: {
                     'Content-Type': 'application/json'
                 },
                 body: JSON.stringify({
-                    versionId: version.id
+                    versionId: version.id,
+                    locale: currentLocale
                 })
             });
             if (!response.ok) {

package/dist/editor/plugins/VersionHistoryPanel.js

@@ -3,6 +3,7 @@ import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { useState, useCallback, useEffect, memo } from 'react';
 import { createUsePuck } from '@puckeditor/core';
 import { Loader2, Check, RotateCcw, AlertCircle } from 'lucide-react';
+import { useLocale } from '@payloadcms/ui';
 // Create usePuck hook for accessing editor state and dispatch
 const usePuck = createUsePuck();
 // Panel styles using Puck's CSS variables
@@ -186,12 +187,13 @@ const styles = {
     const [error, setError] = useState(null);
     const [hoveredIndex, setHoveredIndex] = useState(null);
     const [successMessage, setSuccessMessage] = useState(null);
+    const { code: currentLocale } = useLocale();
     // Fetch versions on mount
     const fetchVersions = useCallback(async ()=>{
         setIsLoading(true);
         setError(null);
         try {
-            const url = `${apiEndpoint}/${pageId}/versions?limit=20`;
+            const url = `${apiEndpoint}/${pageId}/versions?limit=20${currentLocale ? `&locale=${currentLocale}` : ''}`;
             const response = await fetch(url);
             if (!response.ok) {
                 if (response.status === 404) {
@@ -229,13 +231,14 @@ const styles = {
         setSuccessMessage(null);
         try {
             // Call restore endpoint
-            const response = await fetch(`${apiEndpoint}/${pageId}/versions`, {
+            const response = await fetch(`${apiEndpoint}/${pageId}/restore`, {
                 method: 'POST',
                 headers: {
                     'Content-Type': 'application/json'
                 },
                 body: JSON.stringify({
-                    versionId: version.id
+                    versionId: version.id,
+                    locale: currentLocale
                 })
             });
             if (!response.ok) {
@@ -268,7 +271,8 @@ const styles = {
         pageId,
         dispatch,
         onRestoreSuccess,
-        fetchVersions
+        fetchVersions,
+        currentLocale
     ]);
     // Format date for display
     function formatDate(dateStr) {

package/dist/endpoints/index.d.ts

@@ -3,6 +3,9 @@
  *
  * These handlers are registered via config.endpoints in the plugin.
  * They provide CRUD operations for Puck-enabled collections.
+ *
+ * Access control: All handlers pass `overrideAccess: false` and `req` to
+ * Payload's local API, so collection-level access rules are enforced.
  */
 import type { PayloadHandler } from 'payload';
 export interface PuckEndpointOptions {

package/dist/endpoints/index.js

@@ -3,8 +3,12 @@
  *
  * These handlers are registered via config.endpoints in the plugin.
  * They provide CRUD operations for Puck-enabled collections.
+ *
+ * Access control: All handlers pass `overrideAccess: false` and `req` to
+ * Payload's local API, so collection-level access rules are enforced.
  */ import { APIError } from 'payload';
 import { unsetHomepage, HomepageConflictError } from '../plugin/hooks/isHomepageUnique.js';
+import { resolveLocale } from '../utils/locale.js';
 /**
  * GET /api/puck/:collection
  * List all documents in a Puck-enabled collection
@@ -20,11 +24,17 @@ import { unsetHomepage, HomepageConflictError } from '../plugin/hooks/isHomepage
                     status: 400
                 });
             }
+            const locale = resolveLocale(req);
             const result = await req.payload.find({
                 collection: collection,
+                req,
+                overrideAccess: false,
                 draft: true,
                 depth: 0,
-                limit: 100
+                limit: 100,
+                ...locale ? {
+                    locale
+                } : {}
             });
             return Response.json(result);
         } catch (error) {
@@ -53,10 +63,17 @@ import { unsetHomepage, HomepageConflictError } from '../plugin/hooks/isHomepage
                 });
             }
             const body = await req.json?.();
+            const { _locale, ...data } = body || {};
+            const locale = resolveLocale(req, _locale);
             const doc = await req.payload.create({
                 collection: collection,
-                data: body,
-                draft: true
+                req,
+                overrideAccess: false,
+                data,
+                draft: true,
+                ...locale ? {
+                    locale
+                } : {}
             });
             return Response.json({
                 doc
@@ -87,11 +104,17 @@ import { unsetHomepage, HomepageConflictError } from '../plugin/hooks/isHomepage
                     status: 400
                 });
             }
+            const locale = resolveLocale(req);
             const doc = await req.payload.findByID({
                 collection: collection,
+                req,
+                overrideAccess: false,
                 id,
                 draft: true,
-                depth: 0
+                depth: 0,
+                ...locale ? {
+                    locale
+                } : {}
             });
             return Response.json({
                 doc
@@ -123,7 +146,8 @@ import { unsetHomepage, HomepageConflictError } from '../plugin/hooks/isHomepage
                 });
             }
             const body = await req.json?.();
-            const { _status, swapHomepage, ...data } = body || {};
+            const { _status, _locale, swapHomepage, ...data } = body || {};
+            const locale = resolveLocale(req, _locale);
             // Determine if this is a publish or draft save
             const shouldPublish = _status === 'published';
             // Handle homepage swap if requested
@@ -133,6 +157,8 @@ import { unsetHomepage, HomepageConflictError } from '../plugin/hooks/isHomepage
                 // Find the current homepage
                 const existingHomepage = await req.payload.find({
                     collection: collection,
+                    req,
+                    overrideAccess: false,
                     where: {
                         and: [
                             {
@@ -148,26 +174,40 @@ import { unsetHomepage, HomepageConflictError } from '../plugin/hooks/isHomepage
                         ]
                     },
                     limit: 1,
-                    depth: 0
+                    depth: 0,
+                    ...locale ? {
+                        locale
+                    } : {}
                 });
                 // Unset the existing homepage if found
                 if (existingHomepage.docs.length > 0) {
                     const existingId = String(existingHomepage.docs[0].id);
-                    await unsetHomepage(req.payload, collection, existingId);
+                    await unsetHomepage(req.payload, collection, existingId, locale);
                 }
             }
             const doc = await req.payload.update({
                 collection: collection,
+                req,
+                overrideAccess: false,
                 id,
                 data: {
                     ...data,
                     _status: shouldPublish ? 'published' : 'draft'
                 },
                 draft: !shouldPublish,
-                // Skip the isHomepage hook if we've already handled the swap
-                context: swapHomepage ? {
-                    skipIsHomepageHook: true
-                } : undefined
+                context: {
+                    // Skip the isHomepage hook if we've already handled the swap
+                    ...swapHomepage && {
+                        skipIsHomepageHook: true
+                    },
+                    // Pass locale to context so hooks can access it without re-reading body
+                    ...locale && {
+                        locale
+                    }
+                },
+                ...locale ? {
+                    locale
+                } : {}
             });
             return Response.json({
                 doc,
@@ -221,6 +261,8 @@ import { unsetHomepage, HomepageConflictError } from '../plugin/hooks/isHomepage
             }
             await req.payload.delete({
                 collection: collection,
+                req,
+                overrideAccess: false,
                 id
             });
             return Response.json({
@@ -245,6 +287,7 @@ import { unsetHomepage, HomepageConflictError } from '../plugin/hooks/isHomepage
         try {
             const collection = req.routeParams?.collection;
             const id = req.routeParams?.id;
+            const locale = resolveLocale(req);
             if (!collections.includes(collection)) {
                 return Response.json({
                     error: `Collection '${collection}' is not configured for Puck`
@@ -254,13 +297,19 @@ import { unsetHomepage, HomepageConflictError } from '../plugin/hooks/isHomepage
             }
             const versions = await req.payload.findVersions({
                 collection: collection,
+                req,
+                overrideAccess: false,
                 where: {
                     parent: {
                         equals: id
                     }
                 },
                 sort: '-updatedAt',
-                limit: 20
+                limit: 20,
+                ...locale ? {
+                    locale,
+                    fallbackLocale: false
+                } : {}
             });
             return Response.json({
                 versions: versions.docs
@@ -292,7 +341,7 @@ import { unsetHomepage, HomepageConflictError } from '../plugin/hooks/isHomepage
                 });
             }
             const body = await req.json?.();
-            const { versionId } = body || {};
+            const { versionId, locale } = body || {};
             if (!versionId) {
                 return Response.json({
                     error: 'Missing versionId in request body'
@@ -302,7 +351,12 @@ import { unsetHomepage, HomepageConflictError } from '../plugin/hooks/isHomepage
             }
             const doc = await req.payload.restoreVersion({
                 collection: collection,
-                id: versionId
+                req,
+                overrideAccess: false,
+                id: versionId,
+                ...locale ? {
+                    locale: locale.toString()
+                } : {}
             });
             return Response.json({
                 doc

package/dist/plugin/hooks/isHomepageUnique.d.ts

@@ -52,4 +52,4 @@ export declare function createIsHomepageUniqueHook(options?: IsHomepageUniqueHoo
  * Unsets isHomepage on the specified page.
  * Used when swapping homepages.
  */
-export declare function unsetHomepage(payload: any, collectionSlug: string, pageId: string): Promise<void>;
+export declare function unsetHomepage(payload: any, collectionSlug: string, pageId: string, locale?: string): Promise<void>;

package/dist/plugin/hooks/isHomepageUnique.js

@@ -48,9 +48,14 @@ import { APIError } from 'payload';
             return data;
         }
         const collectionSlug = options.collectionSlug || collection.slug;
+        // Use locale from context (passed by endpoint handler) or fall back to req.locale
+        const locale = context?.locale || req.locale;
         // Query for existing homepage (excluding current document)
         const existingHomepage = await req.payload.find({
             collection: collectionSlug,
+            ...locale ? {
+                locale: locale.toString()
+            } : {},
             where: {
                 and: [
                     {
@@ -85,7 +90,7 @@ import { APIError } from 'payload';
 /**
  * Unsets isHomepage on the specified page.
  * Used when swapping homepages.
- */ export async function unsetHomepage(payload, collectionSlug, pageId) {
+ */ export async function unsetHomepage(payload, collectionSlug, pageId, locale) {
     await payload.update({
         collection: collectionSlug,
         id: pageId,
@@ -95,6 +100,9 @@ import { APIError } from 'payload';
         // Skip hooks to avoid infinite loops
         context: {
             skipIsHomepageHook: true
-        }
+        },
+        ...locale ? {
+            locale: locale.toString()
+        } : {}
     });
 }

package/dist/utils/locale.d.ts

@@ -0,0 +1,22 @@
+/**
+ * Locale Resolver — Determines the locale for a Payload operation.
+ */
+import type { PayloadHandler } from 'payload';
+import type { NextRequest } from 'next/server';
+/**
+ * Resolves the locale to use for a Payload operation.
+ *
+ * Priority:
+ *   1. Explicit `bodyLocale` (from `_locale` in the request body, sent by PuckEditor)
+ *   2. `?locale=` query param (standard REST convention, already parsed by Payload)
+ *   3. `req.locale` set by Payload's middleware (from admin UI context)
+ */
+export declare function resolveLocale(req: Parameters<PayloadHandler>[0], bodyLocale?: string): string | undefined;
+/**
+ * Resolves the locale from a Next.js API route request.
+ *
+ * Priority:
+ *   1. Explicit `bodyLocale` (from `_locale` in the request body)
+ *   2. `?locale=` query param
+ */
+export declare function resolveLocaleFromNextRequest(req: NextRequest, bodyLocale?: string): string | undefined;

package/dist/utils/locale.js

@@ -0,0 +1,28 @@
+/**
+ * Locale Resolver — Determines the locale for a Payload operation.
+ */ /**
+ * Resolves the locale to use for a Payload operation.
+ *
+ * Priority:
+ *   1. Explicit `bodyLocale` (from `_locale` in the request body, sent by PuckEditor)
+ *   2. `?locale=` query param (standard REST convention, already parsed by Payload)
+ *   3. `req.locale` set by Payload's middleware (from admin UI context)
+ */ export function resolveLocale(req, bodyLocale) {
+    if (bodyLocale) return bodyLocale;
+    const queryLocale = req.query?.locale;
+    if (queryLocale) return queryLocale;
+    if (req.locale) return typeof req.locale === 'string' ? req.locale : req.locale.code;
+    return undefined;
+}
+/**
+ * Resolves the locale from a Next.js API route request.
+ *
+ * Priority:
+ *   1. Explicit `bodyLocale` (from `_locale` in the request body)
+ *   2. `?locale=` query param
+ */ export function resolveLocaleFromNextRequest(req, bodyLocale) {
+    if (bodyLocale) return bodyLocale;
+    const queryLocale = req.nextUrl.searchParams.get('locale') ?? undefined;
+    if (queryLocale) return queryLocale;
+    return undefined;
+}

package/dist/version.d.ts

@@ -1 +1 @@
-export declare const VERSION = "0.6.21";
+export declare const VERSION = "0.6.23";

package/dist/version.js

@@ -1,2 +1,2 @@
 // Auto-generated by scripts/generate-version.js - do not edit manually
-export const VERSION = '0.6.21';
+export const VERSION = '0.6.23';

package/dist/views/PuckEditorView.js

@@ -68,12 +68,16 @@ import { mapPayloadFieldsToRootProps } from '../api/utils/mapRootProps.js';
     let page = null;
     let error = null;
     const needsRelationships = typeof previewUrlConfig === 'function';
+    // Read locale from searchParams (e.g. ?locale=bg)
+    const resolvedSearch = await searchParams;
+    const locale = resolvedSearch?.locale || req.locale;
     try {
         page = await payload.findByID({
             collection: collection,
             id: pageId,
             draft: true,
-            depth: needsRelationships ? 1 : 0
+            depth: needsRelationships ? 1 : 0,
+            locale
         });
     } catch (err) {
         console.error('[PuckEditorView] Error fetching page:', err);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@delmaredigital/payload-puck",
-  "version": "0.6.21",
+  "version": "0.6.23",
   "description": "Puck visual page builder plugin for Payload CMS",
   "type": "module",
   "license": "MIT",