@payloadcms/ui 3.0.0-canary.6041f49 → 3.0.0-canary.f1db24e

package/dist/fields/Relationship/AddNew/index.js

@@ -1,4 +1,5 @@
 'use client';
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { getTranslation } from '@payloadcms/translations';
 import React, { Fragment, useCallback, useEffect, useState } from 'react';
 import { Button } from '../../../elements/Button/index.js';
@@ -28,7 +29,7 @@ hasMany, path, relationTo, setValue, value })=>{
     const onSave = useCallback(({ doc, operation })=>{
         if (operation === 'create') {
             const newValue = Array.isArray(relationTo) ? {
-                relationTo: collectionConfig.slug,
+                relationTo: collectionConfig?.slug,
                 value: doc.id
             } : doc.id;
             // ensure the value is not already in the array
@@ -68,9 +69,9 @@ hasMany, path, relationTo, setValue, value })=>{
     useEffect(()=>{
         if (permissions) {
             if (relatedCollections.length === 1) {
-                setShow(permissions.collections[relatedCollections[0].slug].create.permission);
+                setShow(permissions.collections[relatedCollections[0]?.slug]?.create?.permission);
             } else {
-                setShow(relatedCollections.some((collection)=>permissions.collections[collection.slug].create.permission));
+                setShow(relatedCollections.some((collection)=>permissions.collections[collection?.slug]?.create?.permission));
             }
         }
     }, [
@@ -79,7 +80,7 @@ hasMany, path, relationTo, setValue, value })=>{
     ]);
     useEffect(()=>{
         if (relatedToMany && selectedCollection) {
-            setCollectionConfig(relatedCollections.find((collection)=>collection.slug === selectedCollection));
+            setCollectionConfig(relatedCollections.find((collection)=>collection?.slug === selectedCollection));
         }
     }, [
         selectedCollection,
@@ -107,47 +108,69 @@ hasMany, path, relationTo, setValue, value })=>{
         relatedToMany
     ]);
     if (show) {
-        return /*#__PURE__*/ React.createElement("div", {
+        return /*#__PURE__*/ _jsxs("div", {
             className: baseClass,
-            id: `${path}-add-new`
-        }, relatedCollections.length === 1 && /*#__PURE__*/ React.createElement(Fragment, null, /*#__PURE__*/ React.createElement(DocumentDrawerToggler, {
-            className: `${baseClass}__add-button`,
-            onClick: ()=>setShowTooltip(false),
-            onMouseEnter: ()=>setShowTooltip(true),
-            onMouseLeave: ()=>setShowTooltip(false)
-        }, /*#__PURE__*/ React.createElement(Tooltip, {
-            className: `${baseClass}__tooltip`,
-            show: showTooltip
-        }, t('fields:addNewLabel', {
-            label: getTranslation(relatedCollections[0].labels.singular, i18n)
-        })), /*#__PURE__*/ React.createElement(Plus, null)), /*#__PURE__*/ React.createElement(DocumentDrawer, {
-            onSave: onSave
-        })), relatedCollections.length > 1 && /*#__PURE__*/ React.createElement(Fragment, null, /*#__PURE__*/ React.createElement(Popup, {
-            button: /*#__PURE__*/ React.createElement(Button, {
-                buttonStyle: "none",
-                className: `${baseClass}__add-button`,
-                tooltip: popupOpen ? undefined : t('fields:addNew')
-            }, /*#__PURE__*/ React.createElement(Plus, null)),
-            buttonType: "custom",
-            horizontalAlign: "center",
-            onToggleOpen: onPopupToggle,
-            render: ({ close: closePopup })=>/*#__PURE__*/ React.createElement(PopupList.ButtonGroup, null, relatedCollections.map((relatedCollection)=>{
-                    if (permissions.collections[relatedCollection.slug].create.permission) {
-                        return /*#__PURE__*/ React.createElement(PopupList.Button, {
-                            className: `${baseClass}__relation-button--${relatedCollection.slug}`,
-                            key: relatedCollection.slug,
-                            onClick: ()=>{
-                                closePopup();
-                                setSelectedCollection(relatedCollection.slug);
-                            }
-                        }, getTranslation(relatedCollection.labels.singular, i18n));
-                    }
-                    return null;
-                })),
-            size: "medium"
-        }), collectionConfig && permissions.collections[collectionConfig.slug].create.permission && /*#__PURE__*/ React.createElement(DocumentDrawer, {
-            onSave: onSave
-        })));
+            id: `${path}-add-new`,
+            children: [
+                relatedCollections.length === 1 && /*#__PURE__*/ _jsxs(Fragment, {
+                    children: [
+                        /*#__PURE__*/ _jsxs(DocumentDrawerToggler, {
+                            className: `${baseClass}__add-button`,
+                            onClick: ()=>setShowTooltip(false),
+                            onMouseEnter: ()=>setShowTooltip(true),
+                            onMouseLeave: ()=>setShowTooltip(false),
+                            children: [
+                                /*#__PURE__*/ _jsx(Tooltip, {
+                                    className: `${baseClass}__tooltip`,
+                                    show: showTooltip,
+                                    children: t('fields:addNewLabel', {
+                                        label: getTranslation(relatedCollections[0].labels.singular, i18n)
+                                    })
+                                }),
+                                /*#__PURE__*/ _jsx(Plus, {})
+                            ]
+                        }),
+                        /*#__PURE__*/ _jsx(DocumentDrawer, {
+                            onSave: onSave
+                        })
+                    ]
+                }),
+                relatedCollections.length > 1 && /*#__PURE__*/ _jsxs(Fragment, {
+                    children: [
+                        /*#__PURE__*/ _jsx(Popup, {
+                            button: /*#__PURE__*/ _jsx(Button, {
+                                buttonStyle: "none",
+                                className: `${baseClass}__add-button`,
+                                tooltip: popupOpen ? undefined : t('fields:addNew'),
+                                children: /*#__PURE__*/ _jsx(Plus, {})
+                            }),
+                            buttonType: "custom",
+                            horizontalAlign: "center",
+                            onToggleOpen: onPopupToggle,
+                            render: ({ close: closePopup })=>/*#__PURE__*/ _jsx(PopupList.ButtonGroup, {
+                                    children: relatedCollections.map((relatedCollection)=>{
+                                        if (permissions.collections[relatedCollection?.slug].create.permission) {
+                                            return /*#__PURE__*/ _jsx(PopupList.Button, {
+                                                className: `${baseClass}__relation-button--${relatedCollection?.slug}`,
+                                                onClick: ()=>{
+                                                    closePopup();
+                                                    setSelectedCollection(relatedCollection?.slug);
+                                                },
+                                                children: getTranslation(relatedCollection?.labels?.singular, i18n)
+                                            }, relatedCollection?.slug);
+                                        }
+                                        return null;
+                                    })
+                                }),
+                            size: "medium"
+                        }),
+                        collectionConfig && permissions.collections[collectionConfig?.slug]?.create?.permission && /*#__PURE__*/ _jsx(DocumentDrawer, {
+                            onSave: onSave
+                        })
+                    ]
+                })
+            ]
+        });
     }
     return null;
 };

package/dist/fields/Relationship/AddNew/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../src/fields/Relationship/AddNew/index.tsx"],"sourcesContent":["'use client'\nimport type { ClientCollectionConfig } from 'payload/types'\n\nimport { getTranslation } from '@payloadcms/translations'\nimport React, { Fragment, useCallback, useEffect, useState } from 'react'\n\nimport type { DocumentInfoContext } from '../../../providers/DocumentInfo/types.js'\nimport type { Value } from '../types.js'\nimport type { Props } from './types.js'\n\nimport { Button } from '../../../elements/Button/index.js'\nimport { useDocumentDrawer } from '../../../elements/DocumentDrawer/index.js'\nimport * as PopupList from '../../../elements/Popup/PopupButtonList/index.js'\nimport { Popup } from '../../../elements/Popup/index.js'\nimport { Tooltip } from '../../../elements/Tooltip/index.js'\nimport { Plus } from '../../../icons/Plus/index.js'\nimport { useAuth } from '../../../providers/Auth/index.js'\nimport { useTranslation } from '../../../providers/Translation/index.js'\nimport './index.scss'\nimport { useRelatedCollections } from './useRelatedCollections.js'\n\nconst baseClass = 'relationship-add-new'\n\nexport const AddNewRelation: React.FC<Props> = ({\n  // dispatchOptions,\n  hasMany,\n  path,\n  relationTo,\n  setValue,\n  value,\n}) => {\n  const relatedCollections = useRelatedCollections(relationTo)\n  const { permissions } = useAuth()\n  const [show, setShow] = useState(false)\n  const [selectedCollection, setSelectedCollection] = useState<string>()\n  const relatedToMany = relatedCollections.length > 1\n  const [collectionConfig, setCollectionConfig] = useState<ClientCollectionConfig>(() =>\n    !relatedToMany ? relatedCollections[0] : undefined,\n  )\n  const [popupOpen, setPopupOpen] = useState(false)\n  const { i18n, t } = useTranslation()\n  const [showTooltip, setShowTooltip] = useState(false)\n\n  const [DocumentDrawer, DocumentDrawerToggler, { isDrawerOpen, toggleDrawer }] = useDocumentDrawer(\n    {\n      collectionSlug: collectionConfig?.slug,\n    },\n  )\n\n  const onSave: DocumentInfoContext['onSave'] = useCallback(\n    ({ doc, operation }) => {\n      if (operation === 'create') {\n        const newValue: Value = Array.isArray(relationTo)\n          ? {\n              relationTo: collectionConfig.slug,\n              value: doc.id,\n            }\n          : doc.id\n\n        // ensure the value is not already in the array\n        const isNewValue =\n          Array.isArray(relationTo) && Array.isArray(value)\n            ? !value.some((v) => v && typeof v === 'object' && v.value === doc.id)\n            : value !== doc.id\n\n        if (isNewValue) {\n          // dispatchOptions({\n          //   collection: collectionConfig,\n          //   // TODO: fix this\n          //   // @ts-expect-error-next-line\n          //   type: 'ADD',\n          //   config,\n          //   docs: [doc],\n          //   i18n,\n          //   sort: true,\n          // })\n\n          if (hasMany) {\n            setValue([...(Array.isArray(value) ? value : []), newValue])\n          } else {\n            setValue(newValue)\n          }\n        }\n\n        setSelectedCollection(undefined)\n      }\n    },\n    [relationTo, collectionConfig, hasMany, setValue, value],\n  )\n\n  const onPopupToggle = useCallback((state) => {\n    setPopupOpen(state)\n  }, [])\n\n  useEffect(() => {\n    if (permissions) {\n      if (relatedCollections.length === 1) {\n        setShow(permissions.collections[relatedCollections[0].slug].create.permission)\n      } else {\n        setShow(\n          relatedCollections.some(\n            (collection) => permissions.collections[collection.slug].create.permission,\n          ),\n        )\n      }\n    }\n  }, [permissions, relatedCollections])\n\n  useEffect(() => {\n    if (relatedToMany && selectedCollection) {\n      setCollectionConfig(\n        relatedCollections.find((collection) => collection.slug === selectedCollection),\n      )\n    }\n  }, [selectedCollection, relatedToMany, relatedCollections])\n\n  useEffect(() => {\n    if (relatedToMany && collectionConfig) {\n      // the drawer must be rendered on the page before before opening it\n      // this is why 'selectedCollection' is different from 'collectionConfig'\n      toggleDrawer()\n      setSelectedCollection(undefined)\n    }\n  }, [toggleDrawer, relatedToMany, collectionConfig])\n\n  useEffect(() => {\n    if (relatedToMany && !isDrawerOpen) {\n      setCollectionConfig(undefined)\n    }\n  }, [isDrawerOpen, relatedToMany])\n\n  if (show) {\n    return (\n      <div className={baseClass} id={`${path}-add-new`}>\n        {relatedCollections.length === 1 && (\n          <Fragment>\n            <DocumentDrawerToggler\n              className={`${baseClass}__add-button`}\n              onClick={() => setShowTooltip(false)}\n              onMouseEnter={() => setShowTooltip(true)}\n              onMouseLeave={() => setShowTooltip(false)}\n            >\n              <Tooltip className={`${baseClass}__tooltip`} show={showTooltip}>\n                {t('fields:addNewLabel', {\n                  label: getTranslation(relatedCollections[0].labels.singular, i18n),\n                })}\n              </Tooltip>\n              <Plus />\n            </DocumentDrawerToggler>\n            <DocumentDrawer onSave={onSave} />\n          </Fragment>\n        )}\n        {relatedCollections.length > 1 && (\n          <Fragment>\n            <Popup\n              button={\n                <Button\n                  buttonStyle=\"none\"\n                  className={`${baseClass}__add-button`}\n                  tooltip={popupOpen ? undefined : t('fields:addNew')}\n                >\n                  <Plus />\n                </Button>\n              }\n              buttonType=\"custom\"\n              horizontalAlign=\"center\"\n              onToggleOpen={onPopupToggle}\n              render={({ close: closePopup }) => (\n                <PopupList.ButtonGroup>\n                  {relatedCollections.map((relatedCollection) => {\n                    if (permissions.collections[relatedCollection.slug].create.permission) {\n                      return (\n                        <PopupList.Button\n                          className={`${baseClass}__relation-button--${relatedCollection.slug}`}\n                          key={relatedCollection.slug}\n                          onClick={() => {\n                            closePopup()\n                            setSelectedCollection(relatedCollection.slug)\n                          }}\n                        >\n                          {getTranslation(relatedCollection.labels.singular, i18n)}\n                        </PopupList.Button>\n                      )\n                    }\n\n                    return null\n                  })}\n                </PopupList.ButtonGroup>\n              )}\n              size=\"medium\"\n            />\n            {collectionConfig &&\n              permissions.collections[collectionConfig.slug].create.permission && (\n                <DocumentDrawer onSave={onSave} />\n              )}\n          </Fragment>\n        )}\n      </div>\n    )\n  }\n  return null\n}\n"],"names":["getTranslation","React","Fragment","useCallback","useEffect","useState","Button","useDocumentDrawer","PopupList","Popup","Tooltip","Plus","useAuth","useTranslation","useRelatedCollections","baseClass","AddNewRelation","hasMany","path","relationTo","setValue","value","relatedCollections","permissions","show","setShow","selectedCollection","setSelectedCollection","relatedToMany","length","collectionConfig","setCollectionConfig","undefined","popupOpen","setPopupOpen","i18n","t","showTooltip","setShowTooltip","DocumentDrawer","DocumentDrawerToggler","isDrawerOpen","toggleDrawer","collectionSlug","slug","onSave","doc","operation","newValue","Array","isArray","id","isNewValue","some","v","onPopupToggle","state","collections","create","permission","collection","find","div","className","onClick","onMouseEnter","onMouseLeave","label","labels","singular","button","buttonStyle","tooltip","buttonType","horizontalAlign","onToggleOpen","render","close","closePopup","ButtonGroup","map","relatedCollection","key","size"],"rangeMappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;","mappings":"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"}
+{"version":3,"sources":["../../../../src/fields/Relationship/AddNew/index.tsx"],"sourcesContent":["'use client'\nimport type { ClientCollectionConfig } from 'payload/types'\n\nimport { getTranslation } from '@payloadcms/translations'\nimport React, { Fragment, useCallback, useEffect, useState } from 'react'\n\nimport type { DocumentInfoContext } from '../../../providers/DocumentInfo/types.js'\nimport type { Value } from '../types.js'\nimport type { Props } from './types.js'\n\nimport { Button } from '../../../elements/Button/index.js'\nimport { useDocumentDrawer } from '../../../elements/DocumentDrawer/index.js'\nimport * as PopupList from '../../../elements/Popup/PopupButtonList/index.js'\nimport { Popup } from '../../../elements/Popup/index.js'\nimport { Tooltip } from '../../../elements/Tooltip/index.js'\nimport { Plus } from '../../../icons/Plus/index.js'\nimport { useAuth } from '../../../providers/Auth/index.js'\nimport { useTranslation } from '../../../providers/Translation/index.js'\nimport './index.scss'\nimport { useRelatedCollections } from './useRelatedCollections.js'\n\nconst baseClass = 'relationship-add-new'\n\nexport const AddNewRelation: React.FC<Props> = ({\n  // dispatchOptions,\n  hasMany,\n  path,\n  relationTo,\n  setValue,\n  value,\n}) => {\n  const relatedCollections = useRelatedCollections(relationTo)\n  const { permissions } = useAuth()\n  const [show, setShow] = useState(false)\n  const [selectedCollection, setSelectedCollection] = useState<string>()\n  const relatedToMany = relatedCollections.length > 1\n  const [collectionConfig, setCollectionConfig] = useState<ClientCollectionConfig>(() =>\n    !relatedToMany ? relatedCollections[0] : undefined,\n  )\n  const [popupOpen, setPopupOpen] = useState(false)\n  const { i18n, t } = useTranslation()\n  const [showTooltip, setShowTooltip] = useState(false)\n\n  const [DocumentDrawer, DocumentDrawerToggler, { isDrawerOpen, toggleDrawer }] = useDocumentDrawer(\n    {\n      collectionSlug: collectionConfig?.slug,\n    },\n  )\n\n  const onSave: DocumentInfoContext['onSave'] = useCallback(\n    ({ doc, operation }) => {\n      if (operation === 'create') {\n        const newValue: Value = Array.isArray(relationTo)\n          ? {\n              relationTo: collectionConfig?.slug,\n              value: doc.id,\n            }\n          : doc.id\n\n        // ensure the value is not already in the array\n        const isNewValue =\n          Array.isArray(relationTo) && Array.isArray(value)\n            ? !value.some((v) => v && typeof v === 'object' && v.value === doc.id)\n            : value !== doc.id\n\n        if (isNewValue) {\n          // dispatchOptions({\n          //   collection: collectionConfig,\n          //   // TODO: fix this\n          //   // @ts-expect-error-next-line\n          //   type: 'ADD',\n          //   config,\n          //   docs: [doc],\n          //   i18n,\n          //   sort: true,\n          // })\n\n          if (hasMany) {\n            setValue([...(Array.isArray(value) ? value : []), newValue])\n          } else {\n            setValue(newValue)\n          }\n        }\n\n        setSelectedCollection(undefined)\n      }\n    },\n    [relationTo, collectionConfig, hasMany, setValue, value],\n  )\n\n  const onPopupToggle = useCallback((state) => {\n    setPopupOpen(state)\n  }, [])\n\n  useEffect(() => {\n    if (permissions) {\n      if (relatedCollections.length === 1) {\n        setShow(permissions.collections[relatedCollections[0]?.slug]?.create?.permission)\n      } else {\n        setShow(\n          relatedCollections.some(\n            (collection) => permissions.collections[collection?.slug]?.create?.permission,\n          ),\n        )\n      }\n    }\n  }, [permissions, relatedCollections])\n\n  useEffect(() => {\n    if (relatedToMany && selectedCollection) {\n      setCollectionConfig(\n        relatedCollections.find((collection) => collection?.slug === selectedCollection),\n      )\n    }\n  }, [selectedCollection, relatedToMany, relatedCollections])\n\n  useEffect(() => {\n    if (relatedToMany && collectionConfig) {\n      // the drawer must be rendered on the page before before opening it\n      // this is why 'selectedCollection' is different from 'collectionConfig'\n      toggleDrawer()\n      setSelectedCollection(undefined)\n    }\n  }, [toggleDrawer, relatedToMany, collectionConfig])\n\n  useEffect(() => {\n    if (relatedToMany && !isDrawerOpen) {\n      setCollectionConfig(undefined)\n    }\n  }, [isDrawerOpen, relatedToMany])\n\n  if (show) {\n    return (\n      <div className={baseClass} id={`${path}-add-new`}>\n        {relatedCollections.length === 1 && (\n          <Fragment>\n            <DocumentDrawerToggler\n              className={`${baseClass}__add-button`}\n              onClick={() => setShowTooltip(false)}\n              onMouseEnter={() => setShowTooltip(true)}\n              onMouseLeave={() => setShowTooltip(false)}\n            >\n              <Tooltip className={`${baseClass}__tooltip`} show={showTooltip}>\n                {t('fields:addNewLabel', {\n                  label: getTranslation(relatedCollections[0].labels.singular, i18n),\n                })}\n              </Tooltip>\n              <Plus />\n            </DocumentDrawerToggler>\n            <DocumentDrawer onSave={onSave} />\n          </Fragment>\n        )}\n        {relatedCollections.length > 1 && (\n          <Fragment>\n            <Popup\n              button={\n                <Button\n                  buttonStyle=\"none\"\n                  className={`${baseClass}__add-button`}\n                  tooltip={popupOpen ? undefined : t('fields:addNew')}\n                >\n                  <Plus />\n                </Button>\n              }\n              buttonType=\"custom\"\n              horizontalAlign=\"center\"\n              onToggleOpen={onPopupToggle}\n              render={({ close: closePopup }) => (\n                <PopupList.ButtonGroup>\n                  {relatedCollections.map((relatedCollection) => {\n                    if (permissions.collections[relatedCollection?.slug].create.permission) {\n                      return (\n                        <PopupList.Button\n                          className={`${baseClass}__relation-button--${relatedCollection?.slug}`}\n                          key={relatedCollection?.slug}\n                          onClick={() => {\n                            closePopup()\n                            setSelectedCollection(relatedCollection?.slug)\n                          }}\n                        >\n                          {getTranslation(relatedCollection?.labels?.singular, i18n)}\n                        </PopupList.Button>\n                      )\n                    }\n\n                    return null\n                  })}\n                </PopupList.ButtonGroup>\n              )}\n              size=\"medium\"\n            />\n            {collectionConfig &&\n              permissions.collections[collectionConfig?.slug]?.create?.permission && (\n                <DocumentDrawer onSave={onSave} />\n              )}\n          </Fragment>\n        )}\n      </div>\n    )\n  }\n  return null\n}\n"],"names":["getTranslation","React","Fragment","useCallback","useEffect","useState","Button","useDocumentDrawer","PopupList","Popup","Tooltip","Plus","useAuth","useTranslation","useRelatedCollections","baseClass","AddNewRelation","hasMany","path","relationTo","setValue","value","relatedCollections","permissions","show","setShow","selectedCollection","setSelectedCollection","relatedToMany","length","collectionConfig","setCollectionConfig","undefined","popupOpen","setPopupOpen","i18n","t","showTooltip","setShowTooltip","DocumentDrawer","DocumentDrawerToggler","isDrawerOpen","toggleDrawer","collectionSlug","slug","onSave","doc","operation","newValue","Array","isArray","id","isNewValue","some","v","onPopupToggle","state","collections","create","permission","collection","find","div","className","onClick","onMouseEnter","onMouseLeave","label","labels","singular","button","buttonStyle","tooltip","buttonType","horizontalAlign","onToggleOpen","render","close","closePopup","ButtonGroup","map","relatedCollection","size"],"rangeMappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;","mappings":"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"}

package/dist/fields/Relationship/findOptionsByValue.js

@@ -1,5 +1,5 @@
 export const findOptionsByValue = ({ options, value })=>{
-    if (value) {
+    if (value || typeof value === 'number') {
         if (Array.isArray(value)) {
             return value.map((val)=>{
                 let matchedOption;

package/dist/fields/Relationship/findOptionsByValue.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/fields/Relationship/findOptionsByValue.ts"],"sourcesContent":["import type { Option } from '../../elements/ReactSelect/types.js'\nimport type { OptionGroup, Value } from './types.js'\n\ntype Args = {\n  options: OptionGroup[]\n  value: Value | Value[]\n}\n\nexport const findOptionsByValue = ({ options, value }: Args): Option | Option[] => {\n  if (value) {\n    if (Array.isArray(value)) {\n      return value.map((val) => {\n        let matchedOption: Option\n\n        options.forEach((optGroup) => {\n          if (!matchedOption) {\n            matchedOption = optGroup.options.find((option) => {\n              if (typeof val === 'object') {\n                return option.value === val.value && option.relationTo === val.relationTo\n              }\n\n              return val === option.value\n            })\n          }\n        })\n\n        return matchedOption\n      })\n    }\n\n    let matchedOption: Option\n\n    options.forEach((optGroup) => {\n      if (!matchedOption) {\n        matchedOption = optGroup.options.find((option) => {\n          if (typeof value === 'object') {\n            return option.value === value.value && option.relationTo === value.relationTo\n          }\n          return value === option.value\n        })\n      }\n    })\n\n    return matchedOption\n  }\n\n  return undefined\n}\n"],"names":["findOptionsByValue","options","value","Array","isArray","map","val","matchedOption","forEach","optGroup","find","option","relationTo","undefined"],"rangeMappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;","mappings":"AAQA,OAAO,MAAMA,qBAAqB,CAAC,EAAEC,OAAO,EAAEC,KAAK,EAAQ;IACzD,IAAIA,OAAO;QACT,IAAIC,MAAMC,OAAO,CAACF,QAAQ;YACxB,OAAOA,MAAMG,GAAG,CAAC,CAACC;gBAChB,IAAIC;gBAEJN,QAAQO,OAAO,CAAC,CAACC;oBACf,IAAI,CAACF,eAAe;wBAClBA,gBAAgBE,SAASR,OAAO,CAACS,IAAI,CAAC,CAACC;4BACrC,IAAI,OAAOL,QAAQ,UAAU;gCAC3B,OAAOK,OAAOT,KAAK,KAAKI,IAAIJ,KAAK,IAAIS,OAAOC,UAAU,KAAKN,IAAIM,UAAU;4BAC3E;4BAEA,OAAON,QAAQK,OAAOT,KAAK;wBAC7B;oBACF;gBACF;gBAEA,OAAOK;YACT;QACF;QAEA,IAAIA;QAEJN,QAAQO,OAAO,CAAC,CAACC;YACf,IAAI,CAACF,eAAe;gBAClBA,gBAAgBE,SAASR,OAAO,CAACS,IAAI,CAAC,CAACC;oBACrC,IAAI,OAAOT,UAAU,UAAU;wBAC7B,OAAOS,OAAOT,KAAK,KAAKA,MAAMA,KAAK,IAAIS,OAAOC,UAAU,KAAKV,MAAMU,UAAU;oBAC/E;oBACA,OAAOV,UAAUS,OAAOT,KAAK;gBAC/B;YACF;QACF;QAEA,OAAOK;IACT;IAEA,OAAOM;AACT,EAAC"}
+{"version":3,"sources":["../../../src/fields/Relationship/findOptionsByValue.ts"],"sourcesContent":["import type { Option } from '../../elements/ReactSelect/types.js'\nimport type { OptionGroup, Value } from './types.js'\n\ntype Args = {\n  options: OptionGroup[]\n  value: Value | Value[]\n}\n\nexport const findOptionsByValue = ({ options, value }: Args): Option | Option[] => {\n  if (value || typeof value === 'number') {\n    if (Array.isArray(value)) {\n      return value.map((val) => {\n        let matchedOption: Option\n\n        options.forEach((optGroup) => {\n          if (!matchedOption) {\n            matchedOption = optGroup.options.find((option) => {\n              if (typeof val === 'object') {\n                return option.value === val.value && option.relationTo === val.relationTo\n              }\n\n              return val === option.value\n            })\n          }\n        })\n\n        return matchedOption\n      })\n    }\n\n    let matchedOption: Option\n\n    options.forEach((optGroup) => {\n      if (!matchedOption) {\n        matchedOption = optGroup.options.find((option) => {\n          if (typeof value === 'object') {\n            return option.value === value.value && option.relationTo === value.relationTo\n          }\n          return value === option.value\n        })\n      }\n    })\n\n    return matchedOption\n  }\n\n  return undefined\n}\n"],"names":["findOptionsByValue","options","value","Array","isArray","map","val","matchedOption","forEach","optGroup","find","option","relationTo","undefined"],"rangeMappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;","mappings":"AAQA,OAAO,MAAMA,qBAAqB,CAAC,EAAEC,OAAO,EAAEC,KAAK,EAAQ;IACzD,IAAIA,SAAS,OAAOA,UAAU,UAAU;QACtC,IAAIC,MAAMC,OAAO,CAACF,QAAQ;YACxB,OAAOA,MAAMG,GAAG,CAAC,CAACC;gBAChB,IAAIC;gBAEJN,QAAQO,OAAO,CAAC,CAACC;oBACf,IAAI,CAACF,eAAe;wBAClBA,gBAAgBE,SAASR,OAAO,CAACS,IAAI,CAAC,CAACC;4BACrC,IAAI,OAAOL,QAAQ,UAAU;gCAC3B,OAAOK,OAAOT,KAAK,KAAKI,IAAIJ,KAAK,IAAIS,OAAOC,UAAU,KAAKN,IAAIM,UAAU;4BAC3E;4BAEA,OAAON,QAAQK,OAAOT,KAAK;wBAC7B;oBACF;gBACF;gBAEA,OAAOK;YACT;QACF;QAEA,IAAIA;QAEJN,QAAQO,OAAO,CAAC,CAACC;YACf,IAAI,CAACF,eAAe;gBAClBA,gBAAgBE,SAASR,OAAO,CAACS,IAAI,CAAC,CAACC;oBACrC,IAAI,OAAOT,UAAU,UAAU;wBAC7B,OAAOS,OAAOT,KAAK,KAAKA,MAAMA,KAAK,IAAIS,OAAOC,UAAU,KAAKV,MAAMU,UAAU;oBAC/E;oBACA,OAAOV,UAAUS,OAAOT,KAAK;gBAC/B;YACF;QACF;QAEA,OAAOK;IACT;IAEA,OAAOM;AACT,EAAC"}

package/dist/fields/Relationship/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/fields/Relationship/index.tsx"],"names":[],"mappings":"AAUA,OAAO,KAA+D,MAAM,OAAO,CAAA;AAGnF,OAAO,KAAK,EAAsB,sBAAsB,EAAS,MAAM,YAAY,CAAA;AAenF,OAAO,cAAc,CAAA;AASrB,OAAO,EAAE,sBAAsB,EAAE,CAAA;AAsiBjC,eAAO,MAAM,YAAY,kCAAmC,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/fields/Relationship/index.tsx"],"names":[],"mappings":"AAMA,OAAO,KAA+D,MAAM,OAAO,CAAA;AAGnF,OAAO,KAAK,EAAsB,sBAAsB,EAAS,MAAM,YAAY,CAAA;AAkBnF,OAAO,cAAc,CAAA;AASrB,OAAO,EAAE,sBAAsB,EAAE,CAAA;AAqjBjC,eAAO,MAAM,YAAY,kCAAmC,CAAA"}

package/dist/fields/Relationship/index.js

@@ -1,13 +1,13 @@
 'use client';
-import { FieldDescription } from '@payloadcms/ui/forms/FieldDescription';
-import { FieldError } from '@payloadcms/ui/forms/FieldError';
-import { FieldLabel } from '@payloadcms/ui/forms/FieldLabel';
-import { useFieldProps } from '@payloadcms/ui/forms/FieldPropsProvider';
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { wordBoundariesRegex } from 'payload/utilities';
 import qs from 'qs';
 import React, { useCallback, useEffect, useReducer, useRef, useState } from 'react';
 import { ReactSelect } from '../../elements/ReactSelect/index.js';
-import { useFormProcessing } from '../../forms/Form/context.js';
+import { FieldDescription } from '../../forms/FieldDescription/index.js';
+import { FieldError } from '../../forms/FieldError/index.js';
+import { FieldLabel } from '../../forms/FieldLabel/index.js';
+import { useFieldProps } from '../../forms/FieldPropsProvider/index.js';
 import { useField } from '../../forms/useField/index.js';
 import { withCondition } from '../../forms/withCondition/index.js';
 import { useDebouncedCallback } from '../../hooks/useDebouncedCallback.js';
@@ -31,7 +31,6 @@ const RelationshipField = (props)=>{
     const { i18n, t } = useTranslation();
     const { permissions } = useAuth();
     const { code: locale } = useLocale();
-    const formProcessing = useFormProcessing();
     const hasMultipleRelations = Array.isArray(relationTo);
     const [options, dispatchOptions] = useReducer(optionsReducer, []);
     const [lastFullyLoadedRelation, setLastFullyLoadedRelation] = useState(-1);
@@ -54,11 +53,11 @@ const RelationshipField = (props)=>{
         required
     ]);
     const { path: pathFromContext, readOnly: readOnlyFromContext } = useFieldProps();
-    const readOnly = readOnlyFromProps || readOnlyFromContext;
-    const { filterOptions, initialValue, path, setValue, showError, value } = useField({
+    const { filterOptions, formInitializing, formProcessing, initialValue, path, setValue, showError, value } = useField({
         path: pathFromContext || pathFromProps || name,
         validate: memoizedValidate
     });
+    const readOnly = readOnlyFromProps || readOnlyFromContext || formInitializing;
     const valueRef = useRef(value);
     valueRef.current = value;
     const [drawerIsOpen, setDrawerIsOpen] = useState(false);
@@ -93,13 +92,12 @@ const RelationshipField = (props)=>{
                 }
                 if (resultsFetched < 10) {
                     const collection = collections.find((coll)=>coll.slug === relation);
-                    let fieldToSearch = collection?.defaultSort || collection?.admin?.useAsTitle || 'id';
-                    if (!searchArg) {
-                        if (typeof sortOptions === 'string') {
-                            fieldToSearch = sortOptions;
-                        } else if (sortOptions?.[relation]) {
-                            fieldToSearch = sortOptions[relation];
-                        }
+                    const fieldToSearch = collection?.admin?.useAsTitle || 'id';
+                    let fieldToSort = collection?.defaultSort || 'id';
+                    if (typeof sortOptions === 'string') {
+                        fieldToSort = sortOptions;
+                    } else if (sortOptions?.[relation]) {
+                        fieldToSort = sortOptions[relation];
                     }
                     const query = {
                         depth: 0,
@@ -107,7 +105,7 @@ const RelationshipField = (props)=>{
                         limit: maxResultsPerRequest,
                         locale,
                         page: lastLoadedPageToUse,
-                        sort: fieldToSearch,
+                        sort: fieldToSort,
                         where: {
                             and: [
                                 {
@@ -368,7 +366,7 @@ const RelationshipField = (props)=>{
         value
     });
     if (!Array.isArray(valueToRender) && valueToRender?.value === 'null') valueToRender.value = null;
-    return /*#__PURE__*/ React.createElement("div", {
+    return /*#__PURE__*/ _jsxs("div", {
         className: [
             fieldBaseClass,
             baseClass,
@@ -381,98 +379,121 @@ const RelationshipField = (props)=>{
         style: {
             ...style,
             width
-        }
-    }, /*#__PURE__*/ React.createElement(FieldError, {
-        CustomError: CustomError,
-        path: path,
-        ...errorProps || {}
-    }), /*#__PURE__*/ React.createElement(FieldLabel, {
-        CustomLabel: CustomLabel,
-        label: label,
-        required: required,
-        ...labelProps || {}
-    }), !errorLoading && /*#__PURE__*/ React.createElement("div", {
-        className: `${baseClass}__wrap`
-    }, /*#__PURE__*/ React.createElement(ReactSelect, {
-        backspaceRemovesValue: !drawerIsOpen,
-        components: {
-            MultiValueLabel,
-            SingleValue
-        },
-        customProps: {
-            disableKeyDown: drawerIsOpen,
-            disableMouseDown: drawerIsOpen,
-            onSave,
-            setDrawerIsOpen
-        },
-        disabled: readOnly || formProcessing,
-        filterOption: enableWordBoundarySearch ? filterOption : undefined,
-        isLoading: isLoading,
-        isMulti: hasMany,
-        isSortable: isSortable,
-        onChange: !readOnly ? (selected)=>{
-            if (selected === null) {
-                setValue(hasMany ? [] : null);
-            } else if (hasMany) {
-                setValue(selected ? selected.map((option)=>{
-                    if (hasMultipleRelations) {
-                        return {
-                            relationTo: option.relationTo,
-                            value: option.value
-                        };
-                    }
-                    return option.value;
-                }) : null);
-            } else if (hasMultipleRelations) {
-                setValue({
-                    relationTo: selected.relationTo,
-                    value: selected.value
-                });
-            } else {
-                setValue(selected.value);
-            }
-        } : undefined,
-        onInputChange: (newSearch)=>handleInputChange(newSearch, value),
-        onMenuClose: ()=>{
-            menuIsOpen.current = false;
-        },
-        onMenuOpen: ()=>{
-            menuIsOpen.current = true;
-            if (!hasLoadedFirstPageRef.current) {
-                setIsLoading(true);
-                void getResults({
-                    lastLoadedPage: {},
-                    onSuccess: ()=>{
-                        hasLoadedFirstPageRef.current = true;
-                        setIsLoading(false);
-                    },
-                    value: initialValue
-                });
-            }
-        },
-        onMenuScrollToBottom: ()=>{
-            void getResults({
-                lastFullyLoadedRelation,
-                lastLoadedPage,
-                search,
-                sort: false,
-                value: initialValue
-            });
         },
-        options: options,
-        showError: showError,
-        value: valueToRender ?? null
-    }), !readOnly && allowCreate && /*#__PURE__*/ React.createElement(AddNewRelation, {
-        dispatchOptions,
-        hasMany,
-        options,
-        path,
-        relationTo,
-        setValue,
-        value
-    })), errorLoading && /*#__PURE__*/ React.createElement("div", {
-        className: `${baseClass}__error-loading`
-    }, errorLoading), CustomDescription !== undefined ? CustomDescription : /*#__PURE__*/ React.createElement(FieldDescription, descriptionProps || {}));
+        children: [
+            /*#__PURE__*/ _jsx(FieldLabel, {
+                CustomLabel: CustomLabel,
+                label: label,
+                required: required,
+                ...labelProps || {}
+            }),
+            /*#__PURE__*/ _jsxs("div", {
+                className: `${fieldBaseClass}__wrap`,
+                children: [
+                    /*#__PURE__*/ _jsx(FieldError, {
+                        CustomError: CustomError,
+                        path: path,
+                        ...errorProps || {}
+                    }),
+                    !errorLoading && /*#__PURE__*/ _jsxs("div", {
+                        className: `${baseClass}__wrap`,
+                        children: [
+                            /*#__PURE__*/ _jsx(ReactSelect, {
+                                backspaceRemovesValue: !drawerIsOpen,
+                                components: {
+                                    MultiValueLabel,
+                                    SingleValue
+                                },
+                                customProps: {
+                                    disableKeyDown: drawerIsOpen,
+                                    disableMouseDown: drawerIsOpen,
+                                    onSave,
+                                    setDrawerIsOpen
+                                },
+                                disabled: readOnly || formProcessing || drawerIsOpen,
+                                filterOption: enableWordBoundarySearch ? filterOption : undefined,
+                                getOptionValue: (option)=>{
+                                    if (!option) return undefined;
+                                    return hasMany && Array.isArray(relationTo) ? `${option.relationTo}_${option.value}` : option.value;
+                                },
+                                isLoading: isLoading,
+                                isMulti: hasMany,
+                                isSortable: isSortable,
+                                onChange: !readOnly ? (selected)=>{
+                                    if (selected === null) {
+                                        setValue(hasMany ? [] : null);
+                                    } else if (hasMany) {
+                                        setValue(selected ? selected.map((option)=>{
+                                            if (hasMultipleRelations) {
+                                                return {
+                                                    relationTo: option.relationTo,
+                                                    value: option.value
+                                                };
+                                            }
+                                            return option.value;
+                                        }) : null);
+                                    } else if (hasMultipleRelations) {
+                                        setValue({
+                                            relationTo: selected.relationTo,
+                                            value: selected.value
+                                        });
+                                    } else {
+                                        setValue(selected.value);
+                                    }
+                                } : undefined,
+                                onInputChange: (newSearch)=>handleInputChange(newSearch, value),
+                                onMenuClose: ()=>{
+                                    menuIsOpen.current = false;
+                                },
+                                onMenuOpen: ()=>{
+                                    menuIsOpen.current = true;
+                                    if (!hasLoadedFirstPageRef.current) {
+                                        setIsLoading(true);
+                                        void getResults({
+                                            lastLoadedPage: {},
+                                            onSuccess: ()=>{
+                                                hasLoadedFirstPageRef.current = true;
+                                                setIsLoading(false);
+                                            },
+                                            value: initialValue
+                                        });
+                                    }
+                                },
+                                onMenuScrollToBottom: ()=>{
+                                    void getResults({
+                                        lastFullyLoadedRelation,
+                                        lastLoadedPage,
+                                        search,
+                                        sort: false,
+                                        value: initialValue
+                                    });
+                                },
+                                options: options,
+                                showError: showError,
+                                value: valueToRender ?? null
+                            }),
+                            !readOnly && allowCreate && /*#__PURE__*/ _jsx(AddNewRelation, {
+                                dispatchOptions,
+                                hasMany,
+                                options,
+                                path,
+                                relationTo,
+                                setValue,
+                                value
+                            })
+                        ]
+                    }),
+                    errorLoading && /*#__PURE__*/ _jsx("div", {
+                        className: `${baseClass}__error-loading`,
+                        children: errorLoading
+                    }),
+                    CustomDescription !== undefined ? CustomDescription : /*#__PURE__*/ _jsx(FieldDescription, {
+                        ...descriptionProps || {}
+                    })
+                ]
+            })
+        ]
+    });
 };
 export const Relationship = withCondition(RelationshipField);