@payloadcms/next 3.0.0-canary.4704e79 → 3.0.0-canary.483db21

package/dist/views/Version/Restore/index.js

@@ -1,33 +1,41 @@
 'use client';
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { getTranslation } from '@payloadcms/translations';
-import { Button, Modal, Pill, useConfig, useModal, useTranslation } from '@payloadcms/ui/client';
-import { requests } from '@payloadcms/ui/shared';
+import { Button, ChevronIcon, Modal, Pill, Popup, PopupList, useConfig, useModal, useTranslation } from '@payloadcms/ui';
+import { formatAdminURL, requests } from '@payloadcms/ui/shared';
 import { useRouter } from 'next/navigation.js';
 import React, { Fragment, useCallback, useState } from 'react';
 import { toast } from 'sonner';
 import { MinimalTemplate } from '../../../templates/Minimal/index.js';
 const baseClass = 'restore-version';
 const modalSlug = 'restore-version';
-const Restore = ({ className, collectionSlug, globalSlug, label, originalDocID, versionDate, versionID })=>{
-    const { routes: { admin, api }, serverURL } = useConfig();
+const Restore = ({ className, collectionSlug, globalSlug, label, originalDocID, status, versionDate, versionID })=>{
+    const { routes: { admin: adminRoute, api: apiRoute }, serverURL } = useConfig();
     const { toggleModal } = useModal();
     const [processing, setProcessing] = useState(false);
     const router = useRouter();
     const { i18n, t } = useTranslation();
+    const [draft, setDraft] = useState(false);
     const restoreMessage = t('version:aboutToRestoreGlobal', {
         label: getTranslation(label, i18n),
         versionDate
     });
-    let fetchURL = `${serverURL}${api}`;
+    let fetchURL = `${serverURL}${apiRoute}`;
     let redirectURL;
+    const canRestoreAsDraft = status !== 'draft';
     if (collectionSlug) {
-        fetchURL = `${fetchURL}/${collectionSlug}/versions/${versionID}`;
-        redirectURL = `${admin}/collections/${collectionSlug}/${originalDocID}`;
+        fetchURL = `${fetchURL}/${collectionSlug}/versions/${versionID}?draft=${draft}`;
+        redirectURL = formatAdminURL({
+            adminRoute,
+            path: `/collections/${collectionSlug}/${originalDocID}`
+        });
     }
     if (globalSlug) {
-        fetchURL = `${fetchURL}/globals/${globalSlug}/versions/${versionID}`;
-        redirectURL = `${admin}/globals/${globalSlug}`;
+        fetchURL = `${fetchURL}/globals/${globalSlug}/versions/${versionID}?draft=${draft}`;
+        redirectURL = formatAdminURL({
+            adminRoute,
+            path: `/globals/${globalSlug}`
+        });
     }
     const handleRestore = useCallback(async ()=>{
         setProcessing(true);
@@ -52,13 +60,38 @@ const Restore = ({ className, collectionSlug, globalSlug, label, originalDocID,
     ]);
     return /*#__PURE__*/ _jsxs(Fragment, {
         children: [
-            /*#__PURE__*/ _jsx(Pill, {
+            /*#__PURE__*/ _jsxs("div", {
                 className: [
                     baseClass,
                     className
                 ].filter(Boolean).join(' '),
-                onClick: ()=>toggleModal(modalSlug),
-                children: t('version:restoreThisVersion')
+                children: [
+                    /*#__PURE__*/ _jsx(Pill, {
+                        className: [
+                            canRestoreAsDraft && `${baseClass}__button`
+                        ].filter(Boolean).join(' '),
+                        onClick: ()=>toggleModal(modalSlug),
+                        children: t('version:restoreThisVersion')
+                    }),
+                    canRestoreAsDraft && /*#__PURE__*/ _jsx(Popup, {
+                        button: /*#__PURE__*/ _jsx(Pill, {
+                            className: `${baseClass}__chevron`,
+                            children: /*#__PURE__*/ _jsx(ChevronIcon, {})
+                        }),
+                        caret: false,
+                        render: ()=>/*#__PURE__*/ _jsx(PopupList.ButtonGroup, {
+                                children: /*#__PURE__*/ _jsx(PopupList.Button, {
+                                    onClick: ()=>[
+                                            setDraft(true),
+                                            toggleModal(modalSlug)
+                                        ],
+                                    children: t('version:restoreAsDraft')
+                                })
+                            }),
+                        size: "large",
+                        verticalAlign: "bottom"
+                    })
+                ]
             }),
             /*#__PURE__*/ _jsx(Modal, {
                 className: `${baseClass}__modal`,
@@ -79,7 +112,7 @@ const Restore = ({ className, collectionSlug, globalSlug, label, originalDocID,
                             children: t('general:cancel')
                         }),
                         /*#__PURE__*/ _jsx(Button, {
-                            onClick: processing ? undefined : handleRestore,
+                            onClick: processing ? undefined : ()=>void handleRestore(),
                             children: processing ? t('version:restoring') : t('general:confirm')
                         })
                     ]

package/dist/views/Version/Restore/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../src/views/Version/Restore/index.tsx"],"sourcesContent":["'use client'\nimport { getTranslation } from '@payloadcms/translations'\nimport { Button, Modal, Pill, useConfig, useModal, useTranslation } from '@payloadcms/ui/client'\nimport { requests } from '@payloadcms/ui/shared'\nimport { useRouter } from 'next/navigation.js'\nimport React, { Fragment, useCallback, useState } from 'react'\nimport { toast } from 'sonner'\n\nimport type { Props } from './types.js'\n\nimport { MinimalTemplate } from '../../../templates/Minimal/index.js'\nimport './index.scss'\n\nconst baseClass = 'restore-version'\nconst modalSlug = 'restore-version'\n\nconst Restore: React.FC<Props> = ({\n  className,\n  collectionSlug,\n  globalSlug,\n  label,\n  originalDocID,\n  versionDate,\n  versionID,\n}) => {\n  const {\n    routes: { admin, api },\n    serverURL,\n  } = useConfig()\n  const { toggleModal } = useModal()\n  const [processing, setProcessing] = useState(false)\n  const router = useRouter()\n  const { i18n, t } = useTranslation()\n\n  const restoreMessage = t('version:aboutToRestoreGlobal', {\n    label: getTranslation(label, i18n),\n    versionDate,\n  })\n\n  let fetchURL = `${serverURL}${api}`\n  let redirectURL: string\n\n  if (collectionSlug) {\n    fetchURL = `${fetchURL}/${collectionSlug}/versions/${versionID}`\n    redirectURL = `${admin}/collections/${collectionSlug}/${originalDocID}`\n  }\n\n  if (globalSlug) {\n    fetchURL = `${fetchURL}/globals/${globalSlug}/versions/${versionID}`\n    redirectURL = `${admin}/globals/${globalSlug}`\n  }\n\n  const handleRestore = useCallback(async () => {\n    setProcessing(true)\n\n    const res = await requests.post(fetchURL, {\n      headers: {\n        'Accept-Language': i18n.language,\n      },\n    })\n\n    if (res.status === 200) {\n      const json = await res.json()\n      toast.success(json.message)\n      router.push(redirectURL)\n    } else {\n      toast.error(t('version:problemRestoringVersion'))\n    }\n  }, [fetchURL, redirectURL, t, i18n, router])\n\n  return (\n    <Fragment>\n      <Pill\n        className={[baseClass, className].filter(Boolean).join(' ')}\n        onClick={() => toggleModal(modalSlug)}\n      >\n        {t('version:restoreThisVersion')}\n      </Pill>\n      <Modal className={`${baseClass}__modal`} slug={modalSlug}>\n        <MinimalTemplate className={`${baseClass}__modal-template`}>\n          <h1>{t('version:confirmVersionRestoration')}</h1>\n          <p>{restoreMessage}</p>\n          <Button\n            buttonStyle=\"secondary\"\n            onClick={processing ? undefined : () => toggleModal(modalSlug)}\n            type=\"button\"\n          >\n            {t('general:cancel')}\n          </Button>\n          <Button onClick={processing ? undefined : handleRestore}>\n            {processing ? t('version:restoring') : t('general:confirm')}\n          </Button>\n        </MinimalTemplate>\n      </Modal>\n    </Fragment>\n  )\n}\n\nexport default Restore\n"],"names":["getTranslation","Button","Modal","Pill","useConfig","useModal","useTranslation","requests","useRouter","React","Fragment","useCallback","useState","toast","MinimalTemplate","baseClass","modalSlug","Restore","className","collectionSlug","globalSlug","label","originalDocID","versionDate","versionID","routes","admin","api","serverURL","toggleModal","processing","setProcessing","router","i18n","t","restoreMessage","fetchURL","redirectURL","handleRestore","res","post","headers","language","status","json","success","message","push","error","filter","Boolean","join","onClick","slug","h1","p","buttonStyle","undefined","type"],"rangeMappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;","mappings":"AAAA;;AACA,SAASA,cAAc,QAAQ,2BAA0B;AACzD,SAASC,MAAM,EAAEC,KAAK,EAAEC,IAAI,EAAEC,SAAS,EAAEC,QAAQ,EAAEC,cAAc,QAAQ,wBAAuB;AAChG,SAASC,QAAQ,QAAQ,wBAAuB;AAChD,SAASC,SAAS,QAAQ,qBAAoB;AAC9C,OAAOC,SAASC,QAAQ,EAAEC,WAAW,EAAEC,QAAQ,QAAQ,QAAO;AAC9D,SAASC,KAAK,QAAQ,SAAQ;AAI9B,SAASC,eAAe,QAAQ,sCAAqC;AAGrE,MAAMC,YAAY;AAClB,MAAMC,YAAY;AAElB,MAAMC,UAA2B,CAAC,EAChCC,SAAS,EACTC,cAAc,EACdC,UAAU,EACVC,KAAK,EACLC,aAAa,EACbC,WAAW,EACXC,SAAS,EACV;IACC,MAAM,EACJC,QAAQ,EAAEC,KAAK,EAAEC,GAAG,EAAE,EACtBC,SAAS,EACV,GAAGxB;IACJ,MAAM,EAAEyB,WAAW,EAAE,GAAGxB;IACxB,MAAM,CAACyB,YAAYC,cAAc,GAAGnB,SAAS;IAC7C,MAAMoB,SAASxB;IACf,MAAM,EAAEyB,IAAI,EAAEC,CAAC,EAAE,GAAG5B;IAEpB,MAAM6B,iBAAiBD,EAAE,gCAAgC;QACvDb,OAAOrB,eAAeqB,OAAOY;QAC7BV;IACF;IAEA,IAAIa,WAAW,CAAC,EAAER,UAAU,EAAED,IAAI,CAAC;IACnC,IAAIU;IAEJ,IAAIlB,gBAAgB;QAClBiB,WAAW,CAAC,EAAEA,SAAS,CAAC,EAAEjB,eAAe,UAAU,EAAEK,UAAU,CAAC;QAChEa,cAAc,CAAC,EAAEX,MAAM,aAAa,EAAEP,eAAe,CAAC,EAAEG,cAAc,CAAC;IACzE;IAEA,IAAIF,YAAY;QACdgB,WAAW,CAAC,EAAEA,SAAS,SAAS,EAAEhB,WAAW,UAAU,EAAEI,UAAU,CAAC;QACpEa,cAAc,CAAC,EAAEX,MAAM,SAAS,EAAEN,WAAW,CAAC;IAChD;IAEA,MAAMkB,gBAAgB3B,YAAY;QAChCoB,cAAc;QAEd,MAAMQ,MAAM,MAAMhC,SAASiC,IAAI,CAACJ,UAAU;YACxCK,SAAS;gBACP,mBAAmBR,KAAKS,QAAQ;YAClC;QACF;QAEA,IAAIH,IAAII,MAAM,KAAK,KAAK;YACtB,MAAMC,OAAO,MAAML,IAAIK,IAAI;YAC3B/B,MAAMgC,OAAO,CAACD,KAAKE,OAAO;YAC1Bd,OAAOe,IAAI,CAACV;QACd,OAAO;YACLxB,MAAMmC,KAAK,CAACd,EAAE;QAChB;IACF,GAAG;QAACE;QAAUC;QAAaH;QAAGD;QAAMD;KAAO;IAE3C,qBACE,MAACtB;;0BACC,KAACP;gBACCe,WAAW;oBAACH;oBAAWG;iBAAU,CAAC+B,MAAM,CAACC,SAASC,IAAI,CAAC;gBACvDC,SAAS,IAAMvB,YAAYb;0BAE1BkB,EAAE;;0BAEL,KAAChC;gBAAMgB,WAAW,CAAC,EAAEH,UAAU,OAAO,CAAC;gBAAEsC,MAAMrC;0BAC7C,cAAA,MAACF;oBAAgBI,WAAW,CAAC,EAAEH,UAAU,gBAAgB,CAAC;;sCACxD,KAACuC;sCAAIpB,EAAE;;sCACP,KAACqB;sCAAGpB;;sCACJ,KAAClC;4BACCuD,aAAY;4BACZJ,SAAStB,aAAa2B,YAAY,IAAM5B,YAAYb;4BACpD0C,MAAK;sCAEJxB,EAAE;;sCAEL,KAACjC;4BAAOmD,SAAStB,aAAa2B,YAAYnB;sCACvCR,aAAaI,EAAE,uBAAuBA,EAAE;;;;;;;AAMrD;AAEA,eAAejB,QAAO"}
+{"version":3,"sources":["../../../../src/views/Version/Restore/index.tsx"],"sourcesContent":["'use client'\nimport { getTranslation } from '@payloadcms/translations'\nimport {\n  Button,\n  ChevronIcon,\n  Modal,\n  Pill,\n  Popup,\n  PopupList,\n  useConfig,\n  useModal,\n  useTranslation,\n} from '@payloadcms/ui'\nimport { formatAdminURL, requests } from '@payloadcms/ui/shared'\nimport { useRouter } from 'next/navigation.js'\nimport React, { Fragment, useCallback, useState } from 'react'\nimport { toast } from 'sonner'\n\nimport type { Props } from './types.js'\n\nimport { MinimalTemplate } from '../../../templates/Minimal/index.js'\nimport './index.scss'\n\nconst baseClass = 'restore-version'\nconst modalSlug = 'restore-version'\n\nconst Restore: React.FC<Props> = ({\n  className,\n  collectionSlug,\n  globalSlug,\n  label,\n  originalDocID,\n  status,\n  versionDate,\n  versionID,\n}) => {\n  const {\n    routes: { admin: adminRoute, api: apiRoute },\n    serverURL,\n  } = useConfig()\n\n  const { toggleModal } = useModal()\n  const [processing, setProcessing] = useState(false)\n  const router = useRouter()\n  const { i18n, t } = useTranslation()\n  const [draft, setDraft] = useState(false)\n\n  const restoreMessage = t('version:aboutToRestoreGlobal', {\n    label: getTranslation(label, i18n),\n    versionDate,\n  })\n\n  let fetchURL = `${serverURL}${apiRoute}`\n  let redirectURL: string\n  const canRestoreAsDraft = status !== 'draft'\n\n  if (collectionSlug) {\n    fetchURL = `${fetchURL}/${collectionSlug}/versions/${versionID}?draft=${draft}`\n    redirectURL = formatAdminURL({\n      adminRoute,\n      path: `/collections/${collectionSlug}/${originalDocID}`,\n    })\n  }\n\n  if (globalSlug) {\n    fetchURL = `${fetchURL}/globals/${globalSlug}/versions/${versionID}?draft=${draft}`\n    redirectURL = formatAdminURL({\n      adminRoute,\n      path: `/globals/${globalSlug}`,\n    })\n  }\n\n  const handleRestore = useCallback(async () => {\n    setProcessing(true)\n\n    const res = await requests.post(fetchURL, {\n      headers: {\n        'Accept-Language': i18n.language,\n      },\n    })\n\n    if (res.status === 200) {\n      const json = await res.json()\n      toast.success(json.message)\n      router.push(redirectURL)\n    } else {\n      toast.error(t('version:problemRestoringVersion'))\n    }\n  }, [fetchURL, redirectURL, t, i18n, router])\n  return (\n    <Fragment>\n      <div className={[baseClass, className].filter(Boolean).join(' ')}>\n        <Pill\n          className={[canRestoreAsDraft && `${baseClass}__button`].filter(Boolean).join(' ')}\n          onClick={() => toggleModal(modalSlug)}\n        >\n          {t('version:restoreThisVersion')}\n        </Pill>\n        {canRestoreAsDraft && (\n          <Popup\n            button={\n              <Pill className={`${baseClass}__chevron`}>\n                <ChevronIcon />\n              </Pill>\n            }\n            caret={false}\n            render={() => (\n              <PopupList.ButtonGroup>\n                <PopupList.Button onClick={() => [setDraft(true), toggleModal(modalSlug)]}>\n                  {t('version:restoreAsDraft')}\n                </PopupList.Button>\n              </PopupList.ButtonGroup>\n            )}\n            size=\"large\"\n            verticalAlign=\"bottom\"\n          />\n        )}\n      </div>\n      <Modal className={`${baseClass}__modal`} slug={modalSlug}>\n        <MinimalTemplate className={`${baseClass}__modal-template`}>\n          <h1>{t('version:confirmVersionRestoration')}</h1>\n          <p>{restoreMessage}</p>\n          <Button\n            buttonStyle=\"secondary\"\n            onClick={processing ? undefined : () => toggleModal(modalSlug)}\n            type=\"button\"\n          >\n            {t('general:cancel')}\n          </Button>\n          <Button onClick={processing ? undefined : () => void handleRestore()}>\n            {processing ? t('version:restoring') : t('general:confirm')}\n          </Button>\n        </MinimalTemplate>\n      </Modal>\n    </Fragment>\n  )\n}\n\nexport default Restore\n"],"names":["getTranslation","Button","ChevronIcon","Modal","Pill","Popup","PopupList","useConfig","useModal","useTranslation","formatAdminURL","requests","useRouter","React","Fragment","useCallback","useState","toast","MinimalTemplate","baseClass","modalSlug","Restore","className","collectionSlug","globalSlug","label","originalDocID","status","versionDate","versionID","routes","admin","adminRoute","api","apiRoute","serverURL","toggleModal","processing","setProcessing","router","i18n","t","draft","setDraft","restoreMessage","fetchURL","redirectURL","canRestoreAsDraft","path","handleRestore","res","post","headers","language","json","success","message","push","error","div","filter","Boolean","join","onClick","button","caret","render","ButtonGroup","size","verticalAlign","slug","h1","p","buttonStyle","undefined","type"],"mappings":"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"}

package/dist/views/Version/Restore/index.scss

@@ -2,6 +2,37 @@
 
 .restore-version {
   cursor: pointer;
+  display: flex;
+
+  .popup-button {
+    display: flex;
+  }
+
+  &__chevron {
+    background-color: var(--theme-elevation-150);
+    border-top-left-radius: 0;
+    border-bottom-left-radius: 0;
+    cursor: pointer;
+
+    .stroke {
+      stroke-width: 1px;
+    }
+
+    &:hover {
+      background: var(--theme-elevation-100);
+    }
+  }
+
+  &__button {
+    border-top-right-radius: 0px;
+    border-bottom-right-radius: 0px;
+    margin-right: 2px;
+
+    &:focus {
+      border-radius: 0;
+      outline-offset: 0;
+    }
+  }
 
   &__modal {
     @include blur-bg;

package/dist/views/Version/Restore/types.d.ts

@@ -5,6 +5,7 @@ export type Props = {
     globalSlug?: SanitizedGlobalConfig['slug'];
     label: SanitizedCollectionConfig['labels']['singular'];
     originalDocID: number | string;
+    status?: string;
     versionDate: string;
     versionID: string;
 };

package/dist/views/Version/Restore/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../src/views/Version/Restore/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,yBAAyB,EAAE,qBAAqB,EAAE,MAAM,SAAS,CAAA;AAE/E,MAAM,MAAM,KAAK,GAAG;IAClB,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,cAAc,CAAC,EAAE,yBAAyB,CAAC,MAAM,CAAC,CAAA;IAClD,UAAU,CAAC,EAAE,qBAAqB,CAAC,MAAM,CAAC,CAAA;IAC1C,KAAK,EAAE,yBAAyB,CAAC,QAAQ,CAAC,CAAC,UAAU,CAAC,CAAA;IACtD,aAAa,EAAE,MAAM,GAAG,MAAM,CAAA;IAC9B,WAAW,EAAE,MAAM,CAAA;IACnB,SAAS,EAAE,MAAM,CAAA;CAClB,CAAA"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../src/views/Version/Restore/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,yBAAyB,EAAE,qBAAqB,EAAE,MAAM,SAAS,CAAA;AAE/E,MAAM,MAAM,KAAK,GAAG;IAClB,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,cAAc,CAAC,EAAE,yBAAyB,CAAC,MAAM,CAAC,CAAA;IAClD,UAAU,CAAC,EAAE,qBAAqB,CAAC,MAAM,CAAC,CAAA;IAC1C,KAAK,EAAE,yBAAyB,CAAC,QAAQ,CAAC,CAAC,UAAU,CAAC,CAAA;IACtD,aAAa,EAAE,MAAM,GAAG,MAAM,CAAA;IAC9B,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,WAAW,EAAE,MAAM,CAAA;IACnB,SAAS,EAAE,MAAM,CAAA;CAClB,CAAA"}

package/dist/views/Version/Restore/types.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../src/views/Version/Restore/types.ts"],"sourcesContent":["import type { SanitizedCollectionConfig, SanitizedGlobalConfig } from 'payload'\n\nexport type Props = {\n  className?: string\n  collectionSlug?: SanitizedCollectionConfig['slug']\n  globalSlug?: SanitizedGlobalConfig['slug']\n  label: SanitizedCollectionConfig['labels']['singular']\n  originalDocID: number | string\n  versionDate: string\n  versionID: string\n}\n"],"names":[],"rangeMappings":"","mappings":"AAEA,WAQC"}
+{"version":3,"sources":["../../../../src/views/Version/Restore/types.ts"],"sourcesContent":["import type { SanitizedCollectionConfig, SanitizedGlobalConfig } from 'payload'\n\nexport type Props = {\n  className?: string\n  collectionSlug?: SanitizedCollectionConfig['slug']\n  globalSlug?: SanitizedGlobalConfig['slug']\n  label: SanitizedCollectionConfig['labels']['singular']\n  originalDocID: number | string\n  status?: string\n  versionDate: string\n  versionID: string\n}\n"],"names":[],"mappings":"AAEA,WASC"}

package/dist/views/Version/SelectComparison/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/views/Version/SelectComparison/index.tsx"],"names":[],"mappings":"AAYA,OAAO,KAA2C,MAAM,OAAO,CAAA;AAE/D,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,YAAY,CAAA;AAGvC,OAAO,cAAc,CAAA;AAQrB,eAAO,MAAM,gBAAgB,EAAE,KAAK,CAAC,EAAE,CAAC,KAAK,CAiH5C,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/views/Version/SelectComparison/index.tsx"],"names":[],"mappings":"AAOA,OAAO,KAA2C,MAAM,OAAO,CAAA;AAE/D,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,YAAY,CAAA;AAGvC,OAAO,cAAc,CAAA;AAQrB,eAAO,MAAM,gBAAgB,EAAE,KAAK,CAAC,EAAE,CAAC,KAAK,CAuJ5C,CAAA"}

package/dist/views/Version/SelectComparison/index.js

@@ -1,19 +1,16 @@
 'use client';
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-import { ReactSelect, fieldBaseClass, useConfig, useDocumentInfo, useTranslation } from '@payloadcms/ui/client';
+import { ReactSelect, fieldBaseClass, useConfig, useTranslation } from '@payloadcms/ui';
 import { formatDate } from '@payloadcms/ui/shared';
-import qs from 'qs';
+import * as qs from 'qs-esm';
 import React, { useCallback, useEffect, useState } from 'react';
-import { mostRecentVersionOption, publishedVersionOption } from '../shared.js';
+import { renderPill } from '../../Versions/cells/AutosaveCell/index.js';
 const baseClass = 'compare-version';
 const maxResultsPerRequest = 10;
-const baseOptions = [
-    mostRecentVersionOption
-];
+const baseOptions = [];
 export const SelectComparison = (props)=>{
-    const { baseURL, onChange, parentID, publishedDoc, value, versionID } = props;
+    const { baseURL, latestDraftVersion, latestPublishedVersion, onChange, parentID, value, versionID } = props;
     const { admin: { dateFormat } } = useConfig();
-    const { docConfig } = useDocumentInfo();
     const [options, setOptions] = useState(baseOptions);
     const [lastLoadedPage, setLastLoadedPage] = useState(1);
     const [errorLoading, setErrorLoading] = useState('');
@@ -35,13 +32,6 @@ export const SelectComparison = (props)=>{
                 ]
             }
         };
-        if (docConfig.versions?.drafts) {
-            query.where.and.push({
-                latest: {
-                    not_equals: true
-                }
-            });
-        }
         if (parentID) {
             query.where.and.push({
                 parent: {
@@ -59,16 +49,41 @@ export const SelectComparison = (props)=>{
         if (response.ok) {
             const data = await response.json();
             if (data.docs.length > 0) {
-                setOptions((existingOptions)=>[
-                        ...existingOptions,
-                        ...data.docs.map((doc)=>({
-                                label: formatDate({
+                const versionInfo = {
+                    draft: {
+                        currentLabel: t('version:currentDraft'),
+                        latestVersion: latestDraftVersion,
+                        pillStyle: undefined,
+                        previousLabel: t('version:draft')
+                    },
+                    published: {
+                        currentLabel: t('version:currentPublishedVersion'),
+                        latestVersion: latestPublishedVersion,
+                        pillStyle: 'success',
+                        previousLabel: t('version:previouslyPublished')
+                    }
+                };
+                const additionalOptions = data.docs.map((doc)=>{
+                    const status = doc.version._status;
+                    const { currentLabel, latestVersion, pillStyle, previousLabel } = versionInfo[status] || {};
+                    return {
+                        label: /*#__PURE__*/ _jsxs("div", {
+                            children: [
+                                formatDate({
                                     date: doc.updatedAt,
                                     i18n,
                                     pattern: dateFormat
                                 }),
-                                value: doc.id
-                            }))
+                                "  ",
+                                renderPill(doc, latestVersion, currentLabel, previousLabel, pillStyle)
+                            ]
+                        }),
+                        value: doc.id
+                    };
+                });
+                setOptions((existingOptions)=>[
+                        ...existingOptions,
+                        ...additionalOptions
                     ]);
                 if (!data.hasNextPage) {
                     loadedAllOptionsRef.current = true;
@@ -85,7 +100,8 @@ export const SelectComparison = (props)=>{
         versionID,
         t,
         i18n,
-        docConfig.versions?.drafts
+        latestDraftVersion,
+        latestPublishedVersion
     ]);
     useEffect(()=>{
         void getResults({
@@ -94,6 +110,16 @@ export const SelectComparison = (props)=>{
     }, [
         getResults
     ]);
+    const filteredOptions = options.filter((option, index, self)=>self.findIndex((t)=>t.value === option.value) === index);
+    useEffect(()=>{
+        if (filteredOptions.length > 0 && !value) {
+            onChange(filteredOptions[0]);
+        }
+    }, [
+        filteredOptions,
+        value,
+        onChange
+    ]);
     return /*#__PURE__*/ _jsxs("div", {
         className: [
             fieldBaseClass,
@@ -114,12 +140,7 @@ export const SelectComparison = (props)=>{
                         lastLoadedPage: lastLoadedPage + 1
                     });
                 },
-                options: [
-                    ...publishedDoc?._status === 'published' ? [
-                        publishedVersionOption
-                    ] : [],
-                    ...options
-                ],
+                options: filteredOptions,
                 placeholder: t('version:selectVersionToCompare'),
                 value: value
             }),

package/dist/views/Version/SelectComparison/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../src/views/Version/SelectComparison/index.tsx"],"sourcesContent":["'use client'\nimport type { PaginatedDocs, Where } from 'payload'\n\nimport {\n  ReactSelect,\n  fieldBaseClass,\n  useConfig,\n  useDocumentInfo,\n  useTranslation,\n} from '@payloadcms/ui/client'\nimport { formatDate } from '@payloadcms/ui/shared'\nimport qs from 'qs'\nimport React, { useCallback, useEffect, useState } from 'react'\n\nimport type { Props } from './types.js'\n\nimport { mostRecentVersionOption, publishedVersionOption } from '../shared.js'\nimport './index.scss'\n\nconst baseClass = 'compare-version'\n\nconst maxResultsPerRequest = 10\n\nconst baseOptions = [mostRecentVersionOption]\n\nexport const SelectComparison: React.FC<Props> = (props) => {\n  const { baseURL, onChange, parentID, publishedDoc, value, versionID } = props\n\n  const {\n    admin: { dateFormat },\n  } = useConfig()\n\n  const { docConfig } = useDocumentInfo()\n  const [options, setOptions] = useState(baseOptions)\n  const [lastLoadedPage, setLastLoadedPage] = useState(1)\n  const [errorLoading, setErrorLoading] = useState('')\n  const { i18n, t } = useTranslation()\n  const loadedAllOptionsRef = React.useRef(false)\n\n  const getResults = useCallback(\n    async ({ lastLoadedPage: lastLoadedPageArg }) => {\n      if (loadedAllOptionsRef.current) return\n      const query: {\n        [key: string]: unknown\n        where: Where\n      } = {\n        depth: 0,\n        limit: maxResultsPerRequest,\n        page: lastLoadedPageArg,\n        where: {\n          and: [\n            {\n              id: {\n                not_equals: versionID,\n              },\n            },\n          ],\n        },\n      }\n\n      if (docConfig.versions?.drafts) {\n        query.where.and.push({\n          latest: {\n            not_equals: true,\n          },\n        })\n      }\n\n      if (parentID) {\n        query.where.and.push({\n          parent: {\n            equals: parentID,\n          },\n        })\n      }\n\n      const search = qs.stringify(query)\n\n      const response = await fetch(`${baseURL}?${search}`, {\n        credentials: 'include',\n        headers: {\n          'Accept-Language': i18n.language,\n        },\n      })\n\n      if (response.ok) {\n        const data: PaginatedDocs = await response.json()\n        if (data.docs.length > 0) {\n          setOptions((existingOptions) => [\n            ...existingOptions,\n            ...data.docs.map((doc) => ({\n              label: formatDate({ date: doc.updatedAt, i18n, pattern: dateFormat }),\n              value: doc.id,\n            })),\n          ])\n\n          if (!data.hasNextPage) {\n            loadedAllOptionsRef.current = true\n          }\n          setLastLoadedPage(data.page)\n        }\n      } else {\n        setErrorLoading(t('error:unspecific'))\n      }\n    },\n    [dateFormat, baseURL, parentID, versionID, t, i18n, docConfig.versions?.drafts],\n  )\n\n  useEffect(() => {\n    void getResults({ lastLoadedPage: 1 })\n  }, [getResults])\n\n  return (\n    <div\n      className={[fieldBaseClass, baseClass, errorLoading && 'error-loading']\n        .filter(Boolean)\n        .join(' ')}\n    >\n      <div className={`${baseClass}__label`}>{t('version:compareVersion')}</div>\n      {!errorLoading && (\n        <ReactSelect\n          isClearable={false}\n          isSearchable={false}\n          onChange={onChange}\n          onMenuScrollToBottom={() => {\n            void getResults({ lastLoadedPage: lastLoadedPage + 1 })\n          }}\n          options={[\n            ...(publishedDoc?._status === 'published' ? [publishedVersionOption] : []),\n            ...options,\n          ]}\n          placeholder={t('version:selectVersionToCompare')}\n          value={value}\n        />\n      )}\n      {errorLoading && <div className={`${baseClass}__error-loading`}>{errorLoading}</div>}\n    </div>\n  )\n}\n"],"names":["ReactSelect","fieldBaseClass","useConfig","useDocumentInfo","useTranslation","formatDate","qs","React","useCallback","useEffect","useState","mostRecentVersionOption","publishedVersionOption","baseClass","maxResultsPerRequest","baseOptions","SelectComparison","props","baseURL","onChange","parentID","publishedDoc","value","versionID","admin","dateFormat","docConfig","options","setOptions","lastLoadedPage","setLastLoadedPage","errorLoading","setErrorLoading","i18n","t","loadedAllOptionsRef","useRef","getResults","lastLoadedPageArg","current","query","depth","limit","page","where","and","id","not_equals","versions","drafts","push","latest","parent","equals","search","stringify","response","fetch","credentials","headers","language","ok","data","json","docs","length","existingOptions","map","doc","label","date","updatedAt","pattern","hasNextPage","div","className","filter","Boolean","join","isClearable","isSearchable","onMenuScrollToBottom","_status","placeholder"],"rangeMappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;","mappings":"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"}
+{"version":3,"sources":["../../../../src/views/Version/SelectComparison/index.tsx"],"sourcesContent":["'use client'\n\nimport type { PaginatedDocs, Where } from 'payload'\n\nimport { ReactSelect, fieldBaseClass, useConfig, useTranslation } from '@payloadcms/ui'\nimport { formatDate } from '@payloadcms/ui/shared'\nimport * as qs from 'qs-esm'\nimport React, { useCallback, useEffect, useState } from 'react'\n\nimport type { Props } from './types.js'\n\nimport { renderPill } from '../../Versions/cells/AutosaveCell/index.js'\nimport './index.scss'\n\nconst baseClass = 'compare-version'\n\nconst maxResultsPerRequest = 10\n\nconst baseOptions = []\n\nexport const SelectComparison: React.FC<Props> = (props) => {\n  const {\n    baseURL,\n    latestDraftVersion,\n    latestPublishedVersion,\n    onChange,\n    parentID,\n    value,\n    versionID,\n  } = props\n\n  const {\n    admin: { dateFormat },\n  } = useConfig()\n\n  const [options, setOptions] = useState<\n    {\n      label: React.ReactNode | string\n      value: string\n    }[]\n  >(baseOptions)\n  const [lastLoadedPage, setLastLoadedPage] = useState(1)\n  const [errorLoading, setErrorLoading] = useState('')\n  const { i18n, t } = useTranslation()\n  const loadedAllOptionsRef = React.useRef(false)\n\n  const getResults = useCallback(\n    async ({ lastLoadedPage: lastLoadedPageArg }) => {\n      if (loadedAllOptionsRef.current) return\n      const query: {\n        [key: string]: unknown\n        where: Where\n      } = {\n        depth: 0,\n        limit: maxResultsPerRequest,\n        page: lastLoadedPageArg,\n        where: {\n          and: [\n            {\n              id: {\n                not_equals: versionID,\n              },\n            },\n          ],\n        },\n      }\n\n      if (parentID) {\n        query.where.and.push({\n          parent: {\n            equals: parentID,\n          },\n        })\n      }\n\n      const search = qs.stringify(query)\n\n      const response = await fetch(`${baseURL}?${search}`, {\n        credentials: 'include',\n        headers: {\n          'Accept-Language': i18n.language,\n        },\n      })\n\n      if (response.ok) {\n        const data: PaginatedDocs = await response.json()\n\n        if (data.docs.length > 0) {\n          const versionInfo = {\n            draft: {\n              currentLabel: t('version:currentDraft'),\n              latestVersion: latestDraftVersion,\n              pillStyle: undefined,\n              previousLabel: t('version:draft'),\n            },\n            published: {\n              currentLabel: t('version:currentPublishedVersion'),\n              latestVersion: latestPublishedVersion,\n              pillStyle: 'success',\n              previousLabel: t('version:previouslyPublished'),\n            },\n          }\n\n          const additionalOptions = data.docs.map((doc) => {\n            const status = doc.version._status\n            const { currentLabel, latestVersion, pillStyle, previousLabel } =\n              versionInfo[status] || {}\n\n            return {\n              label: (\n                <div>\n                  {formatDate({ date: doc.updatedAt, i18n, pattern: dateFormat })}\n                  &nbsp;&nbsp;\n                  {renderPill(doc, latestVersion, currentLabel, previousLabel, pillStyle)}\n                </div>\n              ),\n              value: doc.id,\n            }\n          })\n\n          setOptions((existingOptions) => [...existingOptions, ...additionalOptions])\n\n          if (!data.hasNextPage) {\n            loadedAllOptionsRef.current = true\n          }\n          setLastLoadedPage(data.page)\n        }\n      } else {\n        setErrorLoading(t('error:unspecific'))\n      }\n    },\n    [dateFormat, baseURL, parentID, versionID, t, i18n, latestDraftVersion, latestPublishedVersion],\n  )\n\n  useEffect(() => {\n    void getResults({ lastLoadedPage: 1 })\n  }, [getResults])\n\n  const filteredOptions = options.filter(\n    (option, index, self) => self.findIndex((t) => t.value === option.value) === index,\n  )\n\n  useEffect(() => {\n    if (filteredOptions.length > 0 && !value) {\n      onChange(filteredOptions[0])\n    }\n  }, [filteredOptions, value, onChange])\n\n  return (\n    <div\n      className={[fieldBaseClass, baseClass, errorLoading && 'error-loading']\n        .filter(Boolean)\n        .join(' ')}\n    >\n      <div className={`${baseClass}__label`}>{t('version:compareVersion')}</div>\n      {!errorLoading && (\n        <ReactSelect\n          isClearable={false}\n          isSearchable={false}\n          onChange={onChange}\n          onMenuScrollToBottom={() => {\n            void getResults({ lastLoadedPage: lastLoadedPage + 1 })\n          }}\n          options={filteredOptions}\n          placeholder={t('version:selectVersionToCompare')}\n          value={value}\n        />\n      )}\n      {errorLoading && <div className={`${baseClass}__error-loading`}>{errorLoading}</div>}\n    </div>\n  )\n}\n"],"names":["ReactSelect","fieldBaseClass","useConfig","useTranslation","formatDate","qs","React","useCallback","useEffect","useState","renderPill","baseClass","maxResultsPerRequest","baseOptions","SelectComparison","props","baseURL","latestDraftVersion","latestPublishedVersion","onChange","parentID","value","versionID","admin","dateFormat","options","setOptions","lastLoadedPage","setLastLoadedPage","errorLoading","setErrorLoading","i18n","t","loadedAllOptionsRef","useRef","getResults","lastLoadedPageArg","current","query","depth","limit","page","where","and","id","not_equals","push","parent","equals","search","stringify","response","fetch","credentials","headers","language","ok","data","json","docs","length","versionInfo","draft","currentLabel","latestVersion","pillStyle","undefined","previousLabel","published","additionalOptions","map","doc","status","version","_status","label","div","date","updatedAt","pattern","existingOptions","hasNextPage","filteredOptions","filter","option","index","self","findIndex","className","Boolean","join","isClearable","isSearchable","onMenuScrollToBottom","placeholder"],"mappings":"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"}

package/dist/views/Version/SelectComparison/index.scss

@@ -3,7 +3,7 @@
     border: 1px solid var(--theme-error-500);
     min-height: calc(var(--base) * 2);
     padding: calc(var(--base) * 0.5) calc(var(--base) * 0.75);
-    background-color: var(--theme-error-500);
+    background-color: var(--theme-error-100);
     color: var(--theme-elevation-0);
   }
 

package/dist/views/Version/SelectComparison/types.d.ts

@@ -2,9 +2,10 @@ import type { PaginatedDocs, SanitizedCollectionConfig } from 'payload';
 import type { CompareOption } from '../Default/types.js';
 export type Props = {
     baseURL: string;
+    latestDraftVersion?: string;
+    latestPublishedVersion?: string;
     onChange: (val: CompareOption) => void;
     parentID?: number | string;
-    publishedDoc: any;
     value: CompareOption;
     versionID: string;
 };

package/dist/views/Version/SelectComparison/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../src/views/Version/SelectComparison/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,yBAAyB,EAAE,MAAM,SAAS,CAAA;AAEvE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAA;AAExD,MAAM,MAAM,KAAK,GAAG;IAClB,OAAO,EAAE,MAAM,CAAA;IACf,QAAQ,EAAE,CAAC,GAAG,EAAE,aAAa,KAAK,IAAI,CAAA;IACtC,QAAQ,CAAC,EAAE,MAAM,GAAG,MAAM,CAAA;IAC1B,YAAY,EAAE,GAAG,CAAA;IACjB,KAAK,EAAE,aAAa,CAAA;IACpB,SAAS,EAAE,MAAM,CAAA;CAClB,CAAA;AAED,KAAK,KAAK,GAAG;IACX,QAAQ,EAAE,OAAO,CAAA;IACjB,IAAI,EAAE,OAAO,CAAA;CACd,CAAA;AAED,KAAK,GAAG,GAAG;IACT,UAAU,EAAE,yBAAyB,CAAA;IACrC,IAAI,EAAE,aAAa,CAAC,GAAG,CAAC,CAAA;IACxB,IAAI,EAAE,KAAK,CAAA;CACZ,CAAA;AAED,MAAM,MAAM,MAAM,GAAG,GAAG,GAAG,KAAK,CAAA;AAEhC,MAAM,MAAM,iBAAiB,GAAG;IAC9B,UAAU,EAAE,MAAM,CAAA;IAClB,KAAK,EAAE,MAAM,CAAA;CACd,CAAA"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../src/views/Version/SelectComparison/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,yBAAyB,EAAE,MAAM,SAAS,CAAA;AAEvE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAA;AAExD,MAAM,MAAM,KAAK,GAAG;IAClB,OAAO,EAAE,MAAM,CAAA;IACf,kBAAkB,CAAC,EAAE,MAAM,CAAA;IAC3B,sBAAsB,CAAC,EAAE,MAAM,CAAA;IAC/B,QAAQ,EAAE,CAAC,GAAG,EAAE,aAAa,KAAK,IAAI,CAAA;IACtC,QAAQ,CAAC,EAAE,MAAM,GAAG,MAAM,CAAA;IAC1B,KAAK,EAAE,aAAa,CAAA;IACpB,SAAS,EAAE,MAAM,CAAA;CAClB,CAAA;AAED,KAAK,KAAK,GAAG;IACX,QAAQ,EAAE,OAAO,CAAA;IACjB,IAAI,EAAE,OAAO,CAAA;CACd,CAAA;AAED,KAAK,GAAG,GAAG;IACT,UAAU,EAAE,yBAAyB,CAAA;IACrC,IAAI,EAAE,aAAa,CAAC,GAAG,CAAC,CAAA;IACxB,IAAI,EAAE,KAAK,CAAA;CACZ,CAAA;AAED,MAAM,MAAM,MAAM,GAAG,GAAG,GAAG,KAAK,CAAA;AAEhC,MAAM,MAAM,iBAAiB,GAAG;IAC9B,UAAU,EAAE,MAAM,CAAA;IAClB,KAAK,EAAE,MAAM,CAAA;CACd,CAAA"}

package/dist/views/Version/SelectComparison/types.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../src/views/Version/SelectComparison/types.ts"],"sourcesContent":["import type { PaginatedDocs, SanitizedCollectionConfig } from 'payload'\n\nimport type { CompareOption } from '../Default/types.js'\n\nexport type Props = {\n  baseURL: string\n  onChange: (val: CompareOption) => void\n  parentID?: number | string\n  publishedDoc: any\n  value: CompareOption\n  versionID: string\n}\n\ntype CLEAR = {\n  required: boolean\n  type: 'CLEAR'\n}\n\ntype ADD = {\n  collection: SanitizedCollectionConfig\n  data: PaginatedDocs<any>\n  type: 'ADD'\n}\n\nexport type Action = ADD | CLEAR\n\nexport type ValueWithRelation = {\n  relationTo: string\n  value: string\n}\n"],"names":[],"rangeMappings":"","mappings":"AA0BA,WAGC"}
+{"version":3,"sources":["../../../../src/views/Version/SelectComparison/types.ts"],"sourcesContent":["import type { PaginatedDocs, SanitizedCollectionConfig } from 'payload'\n\nimport type { CompareOption } from '../Default/types.js'\n\nexport type Props = {\n  baseURL: string\n  latestDraftVersion?: string\n  latestPublishedVersion?: string\n  onChange: (val: CompareOption) => void\n  parentID?: number | string\n  value: CompareOption\n  versionID: string\n}\n\ntype CLEAR = {\n  required: boolean\n  type: 'CLEAR'\n}\n\ntype ADD = {\n  collection: SanitizedCollectionConfig\n  data: PaginatedDocs<any>\n  type: 'ADD'\n}\n\nexport type Action = ADD | CLEAR\n\nexport type ValueWithRelation = {\n  relationTo: string\n  value: string\n}\n"],"names":[],"mappings":"AA2BA,WAGC"}

package/dist/views/Version/SelectLocales/index.js

@@ -1,6 +1,6 @@
 'use client';
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-import { ReactSelect, useLocale, useTranslation } from '@payloadcms/ui/client';
+import { ReactSelect, useLocale, useTranslation } from '@payloadcms/ui';
 import React from 'react';
 const baseClass = 'select-version-locales';
 export const SelectLocales = ({ onChange, options, value })=>{

package/dist/views/Version/SelectLocales/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../src/views/Version/SelectLocales/index.tsx"],"sourcesContent":["'use client'\nimport { ReactSelect, useLocale, useTranslation } from '@payloadcms/ui/client'\nimport React from 'react'\n\nimport type { Props } from './types.js'\n\nimport './index.scss'\n\nconst baseClass = 'select-version-locales'\n\nexport const SelectLocales: React.FC<Props> = ({ onChange, options, value }) => {\n  const { t } = useTranslation()\n  const { code } = useLocale()\n\n  const format = (items) => {\n    return items.map((item) => {\n      if (typeof item.label === 'string') return item\n      if (typeof item.label !== 'string' && item.label[code]) {\n        return {\n          label: item.label[code],\n          value: item.value,\n        }\n      }\n    })\n  }\n\n  return (\n    <div className={baseClass}>\n      <div className={`${baseClass}__label`}>{t('version:showLocales')}</div>\n      <ReactSelect\n        isMulti\n        onChange={onChange}\n        options={format(options)}\n        placeholder={t('version:selectLocales')}\n        value={format(value)}\n      />\n    </div>\n  )\n}\n"],"names":["ReactSelect","useLocale","useTranslation","React","baseClass","SelectLocales","onChange","options","value","t","code","format","items","map","item","label","div","className","isMulti","placeholder"],"rangeMappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;","mappings":"AAAA;;AACA,SAASA,WAAW,EAAEC,SAAS,EAAEC,cAAc,QAAQ,wBAAuB;AAC9E,OAAOC,WAAW,QAAO;AAMzB,MAAMC,YAAY;AAElB,OAAO,MAAMC,gBAAiC,CAAC,EAAEC,QAAQ,EAAEC,OAAO,EAAEC,KAAK,EAAE;IACzE,MAAM,EAAEC,CAAC,EAAE,GAAGP;IACd,MAAM,EAAEQ,IAAI,EAAE,GAAGT;IAEjB,MAAMU,SAAS,CAACC;QACd,OAAOA,MAAMC,GAAG,CAAC,CAACC;YAChB,IAAI,OAAOA,KAAKC,KAAK,KAAK,UAAU,OAAOD;YAC3C,IAAI,OAAOA,KAAKC,KAAK,KAAK,YAAYD,KAAKC,KAAK,CAACL,KAAK,EAAE;gBACtD,OAAO;oBACLK,OAAOD,KAAKC,KAAK,CAACL,KAAK;oBACvBF,OAAOM,KAAKN,KAAK;gBACnB;YACF;QACF;IACF;IAEA,qBACE,MAACQ;QAAIC,WAAWb;;0BACd,KAACY;gBAAIC,WAAW,CAAC,EAAEb,UAAU,OAAO,CAAC;0BAAGK,EAAE;;0BAC1C,KAACT;gBACCkB,OAAO;gBACPZ,UAAUA;gBACVC,SAASI,OAAOJ;gBAChBY,aAAaV,EAAE;gBACfD,OAAOG,OAAOH;;;;AAItB,EAAC"}
+{"version":3,"sources":["../../../../src/views/Version/SelectLocales/index.tsx"],"sourcesContent":["'use client'\nimport { ReactSelect, useLocale, useTranslation } from '@payloadcms/ui'\nimport React from 'react'\n\nimport type { Props } from './types.js'\n\nimport './index.scss'\n\nconst baseClass = 'select-version-locales'\n\nexport const SelectLocales: React.FC<Props> = ({ onChange, options, value }) => {\n  const { t } = useTranslation()\n  const { code } = useLocale()\n\n  const format = (items) => {\n    return items.map((item) => {\n      if (typeof item.label === 'string') return item\n      if (typeof item.label !== 'string' && item.label[code]) {\n        return {\n          label: item.label[code],\n          value: item.value,\n        }\n      }\n    })\n  }\n\n  return (\n    <div className={baseClass}>\n      <div className={`${baseClass}__label`}>{t('version:showLocales')}</div>\n      <ReactSelect\n        isMulti\n        onChange={onChange}\n        options={format(options)}\n        placeholder={t('version:selectLocales')}\n        value={format(value)}\n      />\n    </div>\n  )\n}\n"],"names":["ReactSelect","useLocale","useTranslation","React","baseClass","SelectLocales","onChange","options","value","t","code","format","items","map","item","label","div","className","isMulti","placeholder"],"mappings":"AAAA;;AACA,SAASA,WAAW,EAAEC,SAAS,EAAEC,cAAc,QAAQ,iBAAgB;AACvE,OAAOC,WAAW,QAAO;AAMzB,MAAMC,YAAY;AAElB,OAAO,MAAMC,gBAAiC,CAAC,EAAEC,QAAQ,EAAEC,OAAO,EAAEC,KAAK,EAAE;IACzE,MAAM,EAAEC,CAAC,EAAE,GAAGP;IACd,MAAM,EAAEQ,IAAI,EAAE,GAAGT;IAEjB,MAAMU,SAAS,CAACC;QACd,OAAOA,MAAMC,GAAG,CAAC,CAACC;YAChB,IAAI,OAAOA,KAAKC,KAAK,KAAK,UAAU,OAAOD;YAC3C,IAAI,OAAOA,KAAKC,KAAK,KAAK,YAAYD,KAAKC,KAAK,CAACL,KAAK,EAAE;gBACtD,OAAO;oBACLK,OAAOD,KAAKC,KAAK,CAACL,KAAK;oBACvBF,OAAOM,KAAKN,KAAK;gBACnB;YACF;QACF;IACF;IAEA,qBACE,MAACQ;QAAIC,WAAWb;;0BACd,KAACY;gBAAIC,WAAW,CAAC,EAAEb,UAAU,OAAO,CAAC;0BAAGK,EAAE;;0BAC1C,KAACT;gBACCkB,OAAO;gBACPZ,UAAUA;gBACVC,SAASI,OAAOJ;gBAChBY,aAAaV,EAAE;gBACfD,OAAOG,OAAOH;;;;AAItB,EAAC"}

package/dist/views/Version/SelectLocales/types.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../src/views/Version/SelectLocales/types.ts"],"sourcesContent":["import type { OptionObject } from 'payload'\n\nexport type Props = {\n  onChange: (options: OptionObject[]) => void\n  options: OptionObject[]\n  value: OptionObject[]\n}\n"],"names":[],"rangeMappings":"","mappings":"AAEA,WAIC"}
+{"version":3,"sources":["../../../../src/views/Version/SelectLocales/types.ts"],"sourcesContent":["import type { OptionObject } from 'payload'\n\nexport type Props = {\n  onChange: (options: OptionObject[]) => void\n  options: OptionObject[]\n  value: OptionObject[]\n}\n"],"names":[],"mappings":"AAEA,WAIC"}

package/dist/views/Version/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/views/Version/index.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAGV,iBAAiB,EAGlB,MAAM,SAAS,CAAA;AAOhB,eAAO,MAAM,WAAW,EAAE,iBA4HzB,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/views/Version/index.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAGV,iBAAiB,EAGlB,MAAM,SAAS,CAAA;AAQhB,eAAO,MAAM,WAAW,EAAE,iBAgHzB,CAAA"}

package/dist/views/Version/index.js

@@ -1,10 +1,11 @@
 import { jsx as _jsx } from "react/jsx-runtime";
 import { notFound } from 'next/navigation.js';
 import React from 'react';
+import { getLatestVersion } from '../Versions/getLatestVersion.js';
 import { DefaultVersionView } from './Default/index.js';
 export const VersionView = async (props)=>{
     const { initPageResult, routeSegments } = props;
-    const { collectionConfig, docID: id, globalConfig, permissions, req: { payload, payload: { config } = {}, user } = {} } = initPageResult;
+    const { collectionConfig, docID: id, globalConfig, permissions, req, req: { payload, payload: { config } = {}, user } = {} } = initPageResult;
     const versionID = routeSegments[routeSegments.length - 1];
     const collectionSlug = collectionConfig?.slug;
     const globalSlug = globalConfig?.slug;
@@ -12,8 +13,8 @@ export const VersionView = async (props)=>{
     let docPermissions;
     let slug;
     let doc;
-    let publishedDoc;
-    let mostRecentDoc;
+    let latestPublishedVersion = null;
+    let latestDraftVersion = null;
     if (collectionSlug) {
         // /collections/:slug/:id/versions/:versionID
         slug = collectionSlug;
@@ -25,26 +26,13 @@ export const VersionView = async (props)=>{
                 depth: 1,
                 locale: '*',
                 overrideAccess: false,
+                req,
                 user
             });
-            publishedDoc = await payload.findByID({
-                id,
-                collection: slug,
-                depth: 1,
-                draft: false,
-                locale: '*',
-                overrideAccess: false,
-                user
-            });
-            mostRecentDoc = await payload.findByID({
-                id,
-                collection: slug,
-                depth: 1,
-                draft: true,
-                locale: '*',
-                overrideAccess: false,
-                user
-            });
+            if (collectionConfig?.versions?.drafts) {
+                latestDraftVersion = await getLatestVersion(payload, slug, 'draft', 'collection');
+                latestPublishedVersion = await getLatestVersion(payload, slug, 'published', 'collection');
+            }
         } catch (error) {
             return notFound();
         }
@@ -60,42 +48,39 @@ export const VersionView = async (props)=>{
                 depth: 1,
                 locale: '*',
                 overrideAccess: false,
+                req,
                 user
             });
-            publishedDoc = await payload.findGlobal({
-                slug,
-                depth: 1,
-                draft: false,
-                locale: '*',
-                overrideAccess: false,
-                user
-            });
-            mostRecentDoc = await payload.findGlobal({
-                slug,
-                depth: 1,
-                draft: true,
-                locale: '*',
-                overrideAccess: false,
-                user
-            });
+            if (globalConfig?.versions?.drafts) {
+                latestDraftVersion = await getLatestVersion(payload, slug, 'draft', 'global');
+                latestPublishedVersion = await getLatestVersion(payload, slug, 'published', 'global');
+            }
         } catch (error) {
             return notFound();
         }
     }
-    const localeOptions = localization && localization?.locales && localization.locales.map(({ code, label })=>({
-            label: typeof label === 'string' ? label : '',
+    const publishedNewerThanDraft = latestPublishedVersion?.updatedAt > latestDraftVersion?.updatedAt;
+    if (publishedNewerThanDraft) {
+        latestDraftVersion = {
+            id: '',
+            updatedAt: ''
+        };
+    }
+    const localeOptions = localization && localization.locales.map(({ code, label })=>({
+            label,
             value: code
         }));
+    const latestVersion = latestPublishedVersion?.updatedAt > latestDraftVersion?.updatedAt ? latestPublishedVersion : latestDraftVersion;
     if (!doc) {
         return notFound();
     }
     return /*#__PURE__*/ _jsx(DefaultVersionView, {
         doc: doc,
         docPermissions: docPermissions,
-        initialComparisonDoc: mostRecentDoc,
+        initialComparisonDoc: latestVersion,
+        latestDraftVersion: latestDraftVersion?.id,
+        latestPublishedVersion: latestPublishedVersion?.id,
         localeOptions: localeOptions,
-        mostRecentDoc: mostRecentDoc,
-        publishedDoc: publishedDoc,
         versionID: versionID
     });
 };

package/dist/views/Version/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/views/Version/index.tsx"],"sourcesContent":["import type {\n  CollectionPermission,\n  Document,\n  EditViewComponent,\n  GlobalPermission,\n  OptionObject,\n} from 'payload'\n\nimport { notFound } from 'next/navigation.js'\nimport React from 'react'\n\nimport { DefaultVersionView } from './Default/index.js'\n\nexport const VersionView: EditViewComponent = async (props) => {\n  const { initPageResult, routeSegments } = props\n\n  const {\n    collectionConfig,\n    docID: id,\n    globalConfig,\n    permissions,\n    req: { payload, payload: { config } = {}, user } = {},\n  } = initPageResult\n\n  const versionID = routeSegments[routeSegments.length - 1]\n\n  const collectionSlug = collectionConfig?.slug\n  const globalSlug = globalConfig?.slug\n\n  const { localization } = config\n\n  let docPermissions: CollectionPermission | GlobalPermission\n  let slug: string\n\n  let doc: Document\n  let publishedDoc: Document\n  let mostRecentDoc: Document\n\n  if (collectionSlug) {\n    // /collections/:slug/:id/versions/:versionID\n    slug = collectionSlug\n    docPermissions = permissions.collections[collectionSlug]\n\n    try {\n      doc = await payload.findVersionByID({\n        id: versionID,\n        collection: slug,\n        depth: 1,\n        locale: '*',\n        overrideAccess: false,\n        user,\n      })\n\n      publishedDoc = await payload.findByID({\n        id,\n        collection: slug,\n        depth: 1,\n        draft: false,\n        locale: '*',\n        overrideAccess: false,\n        user,\n      })\n\n      mostRecentDoc = await payload.findByID({\n        id,\n        collection: slug,\n        depth: 1,\n        draft: true,\n        locale: '*',\n        overrideAccess: false,\n        user,\n      })\n    } catch (error) {\n      return notFound()\n    }\n  }\n\n  if (globalSlug) {\n    // /globals/:slug/versions/:versionID\n    slug = globalSlug\n    docPermissions = permissions.globals[globalSlug]\n\n    try {\n      doc = await payload.findGlobalVersionByID({\n        id: versionID,\n        slug,\n        depth: 1,\n        locale: '*',\n        overrideAccess: false,\n        user,\n      })\n\n      publishedDoc = await payload.findGlobal({\n        slug,\n        depth: 1,\n        draft: false,\n        locale: '*',\n        overrideAccess: false,\n        user,\n      })\n\n      mostRecentDoc = await payload.findGlobal({\n        slug,\n        depth: 1,\n        draft: true,\n        locale: '*',\n        overrideAccess: false,\n        user,\n      })\n    } catch (error) {\n      return notFound()\n    }\n  }\n\n  const localeOptions: OptionObject[] =\n    localization &&\n    localization?.locales &&\n    localization.locales.map(({ code, label }) => ({\n      label: typeof label === 'string' ? label : '',\n      value: code,\n    }))\n\n  if (!doc) {\n    return notFound()\n  }\n\n  return (\n    <DefaultVersionView\n      doc={doc}\n      docPermissions={docPermissions}\n      initialComparisonDoc={mostRecentDoc}\n      localeOptions={localeOptions}\n      mostRecentDoc={mostRecentDoc}\n      publishedDoc={publishedDoc}\n      versionID={versionID}\n    />\n  )\n}\n"],"names":["notFound","React","DefaultVersionView","VersionView","props","initPageResult","routeSegments","collectionConfig","docID","id","globalConfig","permissions","req","payload","config","user","versionID","length","collectionSlug","slug","globalSlug","localization","docPermissions","doc","publishedDoc","mostRecentDoc","collections","findVersionByID","collection","depth","locale","overrideAccess","findByID","draft","error","globals","findGlobalVersionByID","findGlobal","localeOptions","locales","map","code","label","value","initialComparisonDoc"],"rangeMappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;","mappings":";AAQA,SAASA,QAAQ,QAAQ,qBAAoB;AAC7C,OAAOC,WAAW,QAAO;AAEzB,SAASC,kBAAkB,QAAQ,qBAAoB;AAEvD,OAAO,MAAMC,cAAiC,OAAOC;IACnD,MAAM,EAAEC,cAAc,EAAEC,aAAa,EAAE,GAAGF;IAE1C,MAAM,EACJG,gBAAgB,EAChBC,OAAOC,EAAE,EACTC,YAAY,EACZC,WAAW,EACXC,KAAK,EAAEC,OAAO,EAAEA,SAAS,EAAEC,MAAM,EAAE,GAAG,CAAC,CAAC,EAAEC,IAAI,EAAE,GAAG,CAAC,CAAC,EACtD,GAAGV;IAEJ,MAAMW,YAAYV,aAAa,CAACA,cAAcW,MAAM,GAAG,EAAE;IAEzD,MAAMC,iBAAiBX,kBAAkBY;IACzC,MAAMC,aAAaV,cAAcS;IAEjC,MAAM,EAAEE,YAAY,EAAE,GAAGP;IAEzB,IAAIQ;IACJ,IAAIH;IAEJ,IAAII;IACJ,IAAIC;IACJ,IAAIC;IAEJ,IAAIP,gBAAgB;QAClB,6CAA6C;QAC7CC,OAAOD;QACPI,iBAAiBX,YAAYe,WAAW,CAACR,eAAe;QAExD,IAAI;YACFK,MAAM,MAAMV,QAAQc,eAAe,CAAC;gBAClClB,IAAIO;gBACJY,YAAYT;gBACZU,OAAO;gBACPC,QAAQ;gBACRC,gBAAgB;gBAChBhB;YACF;YAEAS,eAAe,MAAMX,QAAQmB,QAAQ,CAAC;gBACpCvB;gBACAmB,YAAYT;gBACZU,OAAO;gBACPI,OAAO;gBACPH,QAAQ;gBACRC,gBAAgB;gBAChBhB;YACF;YAEAU,gBAAgB,MAAMZ,QAAQmB,QAAQ,CAAC;gBACrCvB;gBACAmB,YAAYT;gBACZU,OAAO;gBACPI,OAAO;gBACPH,QAAQ;gBACRC,gBAAgB;gBAChBhB;YACF;QACF,EAAE,OAAOmB,OAAO;YACd,OAAOlC;QACT;IACF;IAEA,IAAIoB,YAAY;QACd,qCAAqC;QACrCD,OAAOC;QACPE,iBAAiBX,YAAYwB,OAAO,CAACf,WAAW;QAEhD,IAAI;YACFG,MAAM,MAAMV,QAAQuB,qBAAqB,CAAC;gBACxC3B,IAAIO;gBACJG;gBACAU,OAAO;gBACPC,QAAQ;gBACRC,gBAAgB;gBAChBhB;YACF;YAEAS,eAAe,MAAMX,QAAQwB,UAAU,CAAC;gBACtClB;gBACAU,OAAO;gBACPI,OAAO;gBACPH,QAAQ;gBACRC,gBAAgB;gBAChBhB;YACF;YAEAU,gBAAgB,MAAMZ,QAAQwB,UAAU,CAAC;gBACvClB;gBACAU,OAAO;gBACPI,OAAO;gBACPH,QAAQ;gBACRC,gBAAgB;gBAChBhB;YACF;QACF,EAAE,OAAOmB,OAAO;YACd,OAAOlC;QACT;IACF;IAEA,MAAMsC,gBACJjB,gBACAA,cAAckB,WACdlB,aAAakB,OAAO,CAACC,GAAG,CAAC,CAAC,EAAEC,IAAI,EAAEC,KAAK,EAAE,GAAM,CAAA;YAC7CA,OAAO,OAAOA,UAAU,WAAWA,QAAQ;YAC3CC,OAAOF;QACT,CAAA;IAEF,IAAI,CAAClB,KAAK;QACR,OAAOvB;IACT;IAEA,qBACE,KAACE;QACCqB,KAAKA;QACLD,gBAAgBA;QAChBsB,sBAAsBnB;QACtBa,eAAeA;QACfb,eAAeA;QACfD,cAAcA;QACdR,WAAWA;;AAGjB,EAAC"}
+{"version":3,"sources":["../../../src/views/Version/index.tsx"],"sourcesContent":["import type {\n  CollectionPermission,\n  Document,\n  EditViewComponent,\n  GlobalPermission,\n  OptionObject,\n} from 'payload'\n\nimport { notFound } from 'next/navigation.js'\nimport React from 'react'\n\nimport { getLatestVersion } from '../Versions/getLatestVersion.js'\nimport { DefaultVersionView } from './Default/index.js'\n\nexport const VersionView: EditViewComponent = async (props) => {\n  const { initPageResult, routeSegments } = props\n\n  const {\n    collectionConfig,\n    docID: id,\n    globalConfig,\n    permissions,\n    req,\n    req: { payload, payload: { config } = {}, user } = {},\n  } = initPageResult\n\n  const versionID = routeSegments[routeSegments.length - 1]\n\n  const collectionSlug = collectionConfig?.slug\n  const globalSlug = globalConfig?.slug\n\n  const { localization } = config\n\n  let docPermissions: CollectionPermission | GlobalPermission\n  let slug: string\n\n  let doc: Document\n  let latestPublishedVersion = null\n  let latestDraftVersion = null\n\n  if (collectionSlug) {\n    // /collections/:slug/:id/versions/:versionID\n    slug = collectionSlug\n    docPermissions = permissions.collections[collectionSlug]\n\n    try {\n      doc = await payload.findVersionByID({\n        id: versionID,\n        collection: slug,\n        depth: 1,\n        locale: '*',\n        overrideAccess: false,\n        req,\n        user,\n      })\n\n      if (collectionConfig?.versions?.drafts) {\n        latestDraftVersion = await getLatestVersion(payload, slug, 'draft', 'collection')\n        latestPublishedVersion = await getLatestVersion(payload, slug, 'published', 'collection')\n      }\n    } catch (error) {\n      return notFound()\n    }\n  }\n\n  if (globalSlug) {\n    // /globals/:slug/versions/:versionID\n    slug = globalSlug\n    docPermissions = permissions.globals[globalSlug]\n\n    try {\n      doc = await payload.findGlobalVersionByID({\n        id: versionID,\n        slug,\n        depth: 1,\n        locale: '*',\n        overrideAccess: false,\n        req,\n        user,\n      })\n\n      if (globalConfig?.versions?.drafts) {\n        latestDraftVersion = await getLatestVersion(payload, slug, 'draft', 'global')\n        latestPublishedVersion = await getLatestVersion(payload, slug, 'published', 'global')\n      }\n    } catch (error) {\n      return notFound()\n    }\n  }\n\n  const publishedNewerThanDraft = latestPublishedVersion?.updatedAt > latestDraftVersion?.updatedAt\n\n  if (publishedNewerThanDraft) {\n    latestDraftVersion = {\n      id: '',\n      updatedAt: '',\n    }\n  }\n\n  const localeOptions: OptionObject[] =\n    localization &&\n    localization.locales.map(({ code, label }) => ({\n      label,\n      value: code,\n    }))\n\n  const latestVersion =\n    latestPublishedVersion?.updatedAt > latestDraftVersion?.updatedAt\n      ? latestPublishedVersion\n      : latestDraftVersion\n\n  if (!doc) {\n    return notFound()\n  }\n\n  return (\n    <DefaultVersionView\n      doc={doc}\n      docPermissions={docPermissions}\n      initialComparisonDoc={latestVersion}\n      latestDraftVersion={latestDraftVersion?.id}\n      latestPublishedVersion={latestPublishedVersion?.id}\n      localeOptions={localeOptions}\n      versionID={versionID}\n    />\n  )\n}\n"],"names":["notFound","React","getLatestVersion","DefaultVersionView","VersionView","props","initPageResult","routeSegments","collectionConfig","docID","id","globalConfig","permissions","req","payload","config","user","versionID","length","collectionSlug","slug","globalSlug","localization","docPermissions","doc","latestPublishedVersion","latestDraftVersion","collections","findVersionByID","collection","depth","locale","overrideAccess","versions","drafts","error","globals","findGlobalVersionByID","publishedNewerThanDraft","updatedAt","localeOptions","locales","map","code","label","value","latestVersion","initialComparisonDoc"],"mappings":";AAQA,SAASA,QAAQ,QAAQ,qBAAoB;AAC7C,OAAOC,WAAW,QAAO;AAEzB,SAASC,gBAAgB,QAAQ,kCAAiC;AAClE,SAASC,kBAAkB,QAAQ,qBAAoB;AAEvD,OAAO,MAAMC,cAAiC,OAAOC;IACnD,MAAM,EAAEC,cAAc,EAAEC,aAAa,EAAE,GAAGF;IAE1C,MAAM,EACJG,gBAAgB,EAChBC,OAAOC,EAAE,EACTC,YAAY,EACZC,WAAW,EACXC,GAAG,EACHA,KAAK,EAAEC,OAAO,EAAEA,SAAS,EAAEC,MAAM,EAAE,GAAG,CAAC,CAAC,EAAEC,IAAI,EAAE,GAAG,CAAC,CAAC,EACtD,GAAGV;IAEJ,MAAMW,YAAYV,aAAa,CAACA,cAAcW,MAAM,GAAG,EAAE;IAEzD,MAAMC,iBAAiBX,kBAAkBY;IACzC,MAAMC,aAAaV,cAAcS;IAEjC,MAAM,EAAEE,YAAY,EAAE,GAAGP;IAEzB,IAAIQ;IACJ,IAAIH;IAEJ,IAAII;IACJ,IAAIC,yBAAyB;IAC7B,IAAIC,qBAAqB;IAEzB,IAAIP,gBAAgB;QAClB,6CAA6C;QAC7CC,OAAOD;QACPI,iBAAiBX,YAAYe,WAAW,CAACR,eAAe;QAExD,IAAI;YACFK,MAAM,MAAMV,QAAQc,eAAe,CAAC;gBAClClB,IAAIO;gBACJY,YAAYT;gBACZU,OAAO;gBACPC,QAAQ;gBACRC,gBAAgB;gBAChBnB;gBACAG;YACF;YAEA,IAAIR,kBAAkByB,UAAUC,QAAQ;gBACtCR,qBAAqB,MAAMxB,iBAAiBY,SAASM,MAAM,SAAS;gBACpEK,yBAAyB,MAAMvB,iBAAiBY,SAASM,MAAM,aAAa;YAC9E;QACF,EAAE,OAAOe,OAAO;YACd,OAAOnC;QACT;IACF;IAEA,IAAIqB,YAAY;QACd,qCAAqC;QACrCD,OAAOC;QACPE,iBAAiBX,YAAYwB,OAAO,CAACf,WAAW;QAEhD,IAAI;YACFG,MAAM,MAAMV,QAAQuB,qBAAqB,CAAC;gBACxC3B,IAAIO;gBACJG;gBACAU,OAAO;gBACPC,QAAQ;gBACRC,gBAAgB;gBAChBnB;gBACAG;YACF;YAEA,IAAIL,cAAcsB,UAAUC,QAAQ;gBAClCR,qBAAqB,MAAMxB,iBAAiBY,SAASM,MAAM,SAAS;gBACpEK,yBAAyB,MAAMvB,iBAAiBY,SAASM,MAAM,aAAa;YAC9E;QACF,EAAE,OAAOe,OAAO;YACd,OAAOnC;QACT;IACF;IAEA,MAAMsC,0BAA0Bb,wBAAwBc,YAAYb,oBAAoBa;IAExF,IAAID,yBAAyB;QAC3BZ,qBAAqB;YACnBhB,IAAI;YACJ6B,WAAW;QACb;IACF;IAEA,MAAMC,gBACJlB,gBACAA,aAAamB,OAAO,CAACC,GAAG,CAAC,CAAC,EAAEC,IAAI,EAAEC,KAAK,EAAE,GAAM,CAAA;YAC7CA;YACAC,OAAOF;QACT,CAAA;IAEF,MAAMG,gBACJrB,wBAAwBc,YAAYb,oBAAoBa,YACpDd,yBACAC;IAEN,IAAI,CAACF,KAAK;QACR,OAAOxB;IACT;IAEA,qBACE,KAACG;QACCqB,KAAKA;QACLD,gBAAgBA;QAChBwB,sBAAsBD;QACtBpB,oBAAoBA,oBAAoBhB;QACxCe,wBAAwBA,wBAAwBf;QAChD8B,eAAeA;QACfvB,WAAWA;;AAGjB,EAAC"}