fix: preserve shared localized draft changes

packages/payload/src/collections/operations/utilities/update.ts

@@ -37,7 +37,11 @@ import {
   hasDraftValidationEnabled,
   hasLocalizeStatusEnabled,
 } from '../../../utilities/getVersionsConfig.js'
+import { mergeLocalizedData } from '../../../utilities/mergeLocalizedData.js'
 import { buildLocalizedPublishData } from '../../../versions/buildSingleLocalePublishData.js'
+import { getLocalizedDraftStatus } from '../../../versions/drafts/getLocalizedDraftStatus.js'
+import { hasNonLocalizedDataChanged } from '../../../versions/drafts/hasNonLocalizedDataChanged.js'
+
 export type SharedUpdateDocumentArgs<TSlug extends CollectionSlug> = {
   autosave: boolean
   collectionConfig: SanitizedCollectionConfig
@@ -312,6 +316,25 @@ export const updateDocument = async <
         for (const localeCode of accessibleLocaleCodes) {
           result._status[localeCode] = unpublishAllLocales ? 'draft' : 'published'
         }
+      } else if (isSavingDraft) {
+        const shouldDraftAllLocales = hasNonLocalizedDataChanged({
+          after: mergeLocalizedData({
+            configBlockReferences: config.blocks,
+            dataWithLocales: result,
+            docWithLocales,
+            fields: collectionConfig.fields,
+            localesToUpdate: config.localization.localeCodes,
+          }),
+          before: docWithLocales,
+          configBlockReferences: config.blocks,
+          fields: collectionConfig.fields,
+        })
+
+        result._status = getLocalizedDraftStatus({
+          existingStatus: shouldDraftAllLocales ? result._status : docWithLocales._status,
+          locale: shouldDraftAllLocales ? 'all' : locale,
+          localeCodes: config.localization.localeCodes,
+        })
       } else if (
         !isSavingDraft &&
         result._status &&

packages/payload/src/globals/operations/update.ts

@@ -35,6 +35,8 @@ import { killTransaction } from '../../utilities/killTransaction.js'
 import { resolveSelect } from '../../utilities/resolveSelect.js'
 import { sanitizeSelect } from '../../utilities/sanitizeSelect.js'
 import { buildLocalizedPublishData } from '../../versions/buildSingleLocalePublishData.js'
+import { getLocalizedDraftStatus } from '../../versions/drafts/getLocalizedDraftStatus.js'
+import { hasNonLocalizedDataChanged } from '../../versions/drafts/hasNonLocalizedDataChanged.js'
 import { getLatestGlobalVersion } from '../../versions/getLatestGlobalVersion.js'
 import { saveVersion } from '../../versions/saveVersion.js'
 type Args<TSlug extends GlobalSlug> = {
@@ -298,6 +300,19 @@ export const updateOperation = async <
           for (const localeCode of accessibleLocaleCodes) {
             result._status[localeCode] = unpublishAllLocales ? 'draft' : 'published'
           }
+        } else if (isSavingDraft) {
+          const shouldDraftAllLocales = hasNonLocalizedDataChanged({
+            after: result,
+            before: globalJSON,
+            configBlockReferences: config.blocks,
+            fields: globalConfig.fields,
+          })
+
+          result._status = getLocalizedDraftStatus({
+            existingStatus: shouldDraftAllLocales ? result._status : globalJSON._status,
+            locale: shouldDraftAllLocales ? 'all' : locale!,
+            localeCodes: config.localization.localeCodes,
+          })
         } else if (
           !isSavingDraft &&
           result._status &&

packages/payload/src/versions/drafts/getLocalizedDraftStatus.spec.ts

@@ -0,0 +1,37 @@
+import { describe, expect, it } from 'vitest'
+
+import { getLocalizedDraftStatus } from './getLocalizedDraftStatus.js'
+
+describe('getLocalizedDraftStatus', () => {
+  it('should preserve existing locale statuses and draft the requested locale', () => {
+    expect(
+      getLocalizedDraftStatus({
+        existingStatus: {
+          en: 'published',
+          es: 'published',
+        },
+        locale: 'en',
+        localeCodes: ['en', 'es'],
+      }),
+    ).toStrictEqual({
+      en: 'draft',
+      es: 'published',
+    })
+  })
+
+  it('should draft all configured locales for locale all without adding an all key', () => {
+    expect(
+      getLocalizedDraftStatus({
+        existingStatus: {
+          en: 'published',
+          es: 'published',
+        },
+        locale: 'all',
+        localeCodes: ['en', 'es'],
+      }),
+    ).toStrictEqual({
+      en: 'draft',
+      es: 'draft',
+    })
+  })
+})

packages/payload/src/versions/drafts/getLocalizedDraftStatus.ts

@@ -0,0 +1,26 @@
+import type { JsonObject } from '../../types/index.js'
+
+type GetLocalizedDraftStatusArgs = {
+  existingStatus: unknown
+  locale: string
+  localeCodes: string[]
+}
+
+export const getLocalizedDraftStatus = ({
+  existingStatus,
+  locale,
+  localeCodes,
+}: GetLocalizedDraftStatusArgs): JsonObject => {
+  const status =
+    existingStatus && typeof existingStatus === 'object' && !Array.isArray(existingStatus)
+      ? { ...(existingStatus as JsonObject) }
+      : {}
+
+  const localesToDraft = locale === 'all' ? localeCodes : [locale]
+
+  for (const localeCode of localesToDraft) {
+    status[localeCode] = 'draft'
+  }
+
+  return status
+}