@payloadcms/ui 4.0.0-internal.a0ef1b8 → 4.0.0-internal.bc5cf8c

package/dist/views/Edit/Auth/APIKey.js

@@ -5,12 +5,10 @@ import { getTranslation } from '@payloadcms/translations';
 import { text } from 'payload/shared';
 import React, { useEffect, useMemo, useState } from 'react';
 import { v4 as uuidv4 } from 'uuid';
-import { Button } from '../../../elements/Button/index.js';
-import { CopyToClipboard } from '../../../elements/CopyToClipboard/index.js';
+import { APIKeyInput } from '../../../elements/APIKeyInput/index.js';
 import { GenerateConfirmation } from '../../../elements/GenerateConfirmation/index.js';
 import { useFormFields } from '../../../forms/Form/context.js';
 import { useField } from '../../../forms/useField/index.js';
-import { EyeIcon } from '../../../icons/Eye/index.js';
 import { useConfig } from '../../../providers/Config/index.js';
 import { useDocumentInfo } from '../../../providers/DocumentInfo/index.js';
 import { useTranslation } from '../../../providers/Translation/index.js';
@@ -23,7 +21,6 @@ export const APIKey = ({
 }) => {
   const [initialAPIKey] = useState(uuidv4());
   const [highlightedField, setHighlightedField] = useState(false);
-  const [showKey, setShowKey] = useState(false);
   const {
     i18n,
     t
@@ -67,15 +64,13 @@ export const APIKey = ({
     }
     return getTranslation(label, i18n);
   }, [apiKeyField, i18n]);
-  const APIKeyLabel = useMemo(() => /*#__PURE__*/_jsxs("label", {
+  const APIKeyLabel = useMemo(() => /*#__PURE__*/_jsx("label", {
     className: `${baseClass}__label field-label`,
     htmlFor: "apiKey",
-    children: [/*#__PURE__*/_jsx("span", {
+    children: /*#__PURE__*/_jsx("span", {
       children: apiKeyLabel
-    }), /*#__PURE__*/_jsx(CopyToClipboard, {
-      value: apiKeyValue
-    })]
-  }), [apiKeyLabel, apiKeyValue]);
+    })
+  }), [apiKeyLabel]);
   const fieldType = useField({
     path: 'apiKey',
     validate
@@ -113,28 +108,11 @@ export const APIKey = ({
   return /*#__PURE__*/_jsxs(React.Fragment, {
     children: [/*#__PURE__*/_jsxs("div", {
       className: [fieldBaseClass, 'api-key', 'read-only'].filter(Boolean).join(' '),
-      children: [APIKeyLabel, /*#__PURE__*/_jsxs("div", {
-        className: `${baseClass}__input-wrap`,
-        children: [/*#__PURE__*/_jsx("input", {
-          "aria-label": apiKeyLabel,
-          className: highlightedField ? 'highlight' : undefined,
-          disabled: true,
-          id: "apiKey",
-          name: "apiKey",
-          type: showKey ? 'text' : 'password',
-          value: value || ''
-        }), /*#__PURE__*/_jsx("div", {
-          className: `${baseClass}__toggle-button-wrap`,
-          children: /*#__PURE__*/_jsx(Button, {
-            buttonStyle: "ghost",
-            className: `${baseClass}__toggle-button`,
-            icon: /*#__PURE__*/_jsx(EyeIcon, {
-              active: showKey,
-              size: 24
-            }),
-            onClick: () => setShowKey(prev => !prev)
-          })
-        })]
+      children: [APIKeyLabel, /*#__PURE__*/_jsx(APIKeyInput, {
+        "aria-label": apiKeyLabel,
+        highlighted: highlightedField,
+        id: "apiKey",
+        value: value
       })]
     }), !readOnly && /*#__PURE__*/_jsx(GenerateConfirmation, {
       highlightField: highlightField,

package/dist/views/Edit/Auth/APIKey.js.map

@@ -1 +1 @@
-{"version":3,"file":"APIKey.js","names":["getTranslation","text","React","useEffect","useMemo","useState","v4","uuidv4","Button","CopyToClipboard","GenerateConfirmation","useFormFields","useField","EyeIcon","useConfig","useDocumentInfo","useTranslation","path","baseClass","fieldBaseClass","APIKey","enabled","readOnly","initialAPIKey","highlightedField","setHighlightedField","showKey","setShowKey","i18n","t","config","getEntityConfig","collectionSlug","apiKey","fields","apiKeyField","find","field","name","validate","val","type","blockData","data","event","maxLength","minLength","preferences","req","payload","siblingData","apiKeyValue","value","apiKeyLabel","label","APIKeyLabel","_jsxs","className","htmlFor","_jsx","fieldType","highlightField","setTimeout","setValue","Fragment","filter","Boolean","join","undefined","disabled","id","buttonStyle","icon","active","size","onClick","prev","setKey"],"sources":["../../../../src/views/Edit/Auth/APIKey.tsx"],"sourcesContent":["'use client'\nimport type { PayloadRequest, TextFieldClient } from 'payload'\n\nimport { getTranslation } from '@payloadcms/translations'\nimport { text } from 'payload/shared'\nimport React, { useEffect, useMemo, useState } from 'react'\nimport { v4 as uuidv4 } from 'uuid'\n\nimport { Button } from '../../../elements/Button/index.js'\nimport { CopyToClipboard } from '../../../elements/CopyToClipboard/index.js'\nimport { GenerateConfirmation } from '../../../elements/GenerateConfirmation/index.js'\nimport { useFormFields } from '../../../forms/Form/context.js'\nimport { useField } from '../../../forms/useField/index.js'\nimport { EyeIcon } from '../../../icons/Eye/index.js'\nimport { useConfig } from '../../../providers/Config/index.js'\nimport { useDocumentInfo } from '../../../providers/DocumentInfo/index.js'\nimport { useTranslation } from '../../../providers/Translation/index.js'\n\nconst path = 'apiKey'\nconst baseClass = 'api-key'\nconst fieldBaseClass = 'field-type'\n\nexport const APIKey: React.FC<{ readonly enabled: boolean; readonly readOnly?: boolean }> = ({\n  enabled,\n  readOnly,\n}) => {\n  const [initialAPIKey] = useState(uuidv4())\n  const [highlightedField, setHighlightedField] = useState(false)\n  const [showKey, setShowKey] = useState(false)\n  const { i18n, t } = useTranslation()\n  const { config, getEntityConfig } = useConfig()\n  const { collectionSlug } = useDocumentInfo()\n\n  const apiKey = useFormFields(([fields]) => (fields && fields[path]) || null)\n\n  const apiKeyField: TextFieldClient = getEntityConfig({ collectionSlug })?.fields?.find(\n    (field) => 'name' in field && field.name === 'apiKey',\n  ) as TextFieldClient\n\n  const validate = (val) =>\n    text(val, {\n      name: 'apiKey',\n      type: 'text',\n      blockData: {},\n      data: {},\n      event: 'onChange',\n      maxLength: 48,\n      minLength: 24,\n      path: ['apiKey'],\n      preferences: { fields: {} },\n      req: {\n        payload: {\n          config,\n        },\n        t,\n      } as unknown as PayloadRequest,\n      siblingData: {},\n    })\n\n  const apiKeyValue = apiKey?.value\n\n  const apiKeyLabel = useMemo(() => {\n    let label: Record<string, string> | string = 'API Key'\n\n    if (apiKeyField?.label) {\n      label = apiKeyField.label\n    }\n\n    return getTranslation(label, i18n)\n  }, [apiKeyField, i18n])\n\n  const APIKeyLabel = useMemo(\n    () => (\n      <label className={`${baseClass}__label field-label`} htmlFor=\"apiKey\">\n        <span>{apiKeyLabel}</span>\n        <CopyToClipboard value={apiKeyValue as string} />\n      </label>\n    ),\n    [apiKeyLabel, apiKeyValue],\n  )\n\n  const fieldType = useField({\n    path: 'apiKey',\n    validate,\n  })\n\n  const highlightField = () => {\n    if (highlightedField) {\n      setHighlightedField(false)\n    }\n    setTimeout(() => {\n      setHighlightedField(true)\n    }, 1)\n  }\n\n  const { setValue, value } = fieldType\n\n  useEffect(() => {\n    if (!apiKeyValue && enabled) {\n      setValue(initialAPIKey)\n    }\n    if (!enabled && apiKeyValue) {\n      setValue(null)\n    }\n  }, [apiKeyValue, enabled, setValue, initialAPIKey])\n\n  useEffect(() => {\n    if (highlightedField) {\n      setTimeout(() => {\n        setHighlightedField(false)\n      }, 10000)\n    }\n  }, [highlightedField])\n\n  if (!enabled) {\n    return null\n  }\n\n  return (\n    <React.Fragment>\n      <div className={[fieldBaseClass, 'api-key', 'read-only'].filter(Boolean).join(' ')}>\n        {APIKeyLabel}\n        <div className={`${baseClass}__input-wrap`}>\n          <input\n            aria-label={apiKeyLabel}\n            className={highlightedField ? 'highlight' : undefined}\n            disabled\n            id=\"apiKey\"\n            name=\"apiKey\"\n            type={showKey ? 'text' : 'password'}\n            value={(value as string) || ''}\n          />\n          <div className={`${baseClass}__toggle-button-wrap`}>\n            <Button\n              buttonStyle=\"ghost\"\n              className={`${baseClass}__toggle-button`}\n              icon={<EyeIcon active={showKey} size={24} />}\n              onClick={() => setShowKey((prev) => !prev)}\n            />\n          </div>\n        </div>\n      </div>\n      {!readOnly && (\n        <GenerateConfirmation highlightField={highlightField} setKey={() => setValue(uuidv4())} />\n      )}\n    </React.Fragment>\n  )\n}\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"APIKey.js","names":["getTranslation","text","React","useEffect","useMemo","useState","v4","uuidv4","APIKeyInput","GenerateConfirmation","useFormFields","useField","useConfig","useDocumentInfo","useTranslation","path","baseClass","fieldBaseClass","APIKey","enabled","readOnly","initialAPIKey","highlightedField","setHighlightedField","i18n","t","config","getEntityConfig","collectionSlug","apiKey","fields","apiKeyField","find","field","name","validate","val","type","blockData","data","event","maxLength","minLength","preferences","req","payload","siblingData","apiKeyValue","value","apiKeyLabel","label","APIKeyLabel","_jsx","className","htmlFor","fieldType","highlightField","setTimeout","setValue","_jsxs","Fragment","filter","Boolean","join","highlighted","id","setKey"],"sources":["../../../../src/views/Edit/Auth/APIKey.tsx"],"sourcesContent":["'use client'\nimport type { PayloadRequest, TextFieldClient } from 'payload'\n\nimport { getTranslation } from '@payloadcms/translations'\nimport { text } from 'payload/shared'\nimport React, { useEffect, useMemo, useState } from 'react'\nimport { v4 as uuidv4 } from 'uuid'\n\nimport { APIKeyInput } from '../../../elements/APIKeyInput/index.js'\nimport { GenerateConfirmation } from '../../../elements/GenerateConfirmation/index.js'\nimport { useFormFields } from '../../../forms/Form/context.js'\nimport { useField } from '../../../forms/useField/index.js'\nimport { useConfig } from '../../../providers/Config/index.js'\nimport { useDocumentInfo } from '../../../providers/DocumentInfo/index.js'\nimport { useTranslation } from '../../../providers/Translation/index.js'\n\nconst path = 'apiKey'\nconst baseClass = 'api-key'\nconst fieldBaseClass = 'field-type'\n\nexport const APIKey: React.FC<{ readonly enabled: boolean; readonly readOnly?: boolean }> = ({\n  enabled,\n  readOnly,\n}) => {\n  const [initialAPIKey] = useState(uuidv4())\n  const [highlightedField, setHighlightedField] = useState(false)\n  const { i18n, t } = useTranslation()\n  const { config, getEntityConfig } = useConfig()\n  const { collectionSlug } = useDocumentInfo()\n\n  const apiKey = useFormFields(([fields]) => (fields && fields[path]) || null)\n\n  const apiKeyField: TextFieldClient = getEntityConfig({ collectionSlug })?.fields?.find(\n    (field) => 'name' in field && field.name === 'apiKey',\n  ) as TextFieldClient\n\n  const validate = (val) =>\n    text(val, {\n      name: 'apiKey',\n      type: 'text',\n      blockData: {},\n      data: {},\n      event: 'onChange',\n      maxLength: 48,\n      minLength: 24,\n      path: ['apiKey'],\n      preferences: { fields: {} },\n      req: {\n        payload: {\n          config,\n        },\n        t,\n      } as unknown as PayloadRequest,\n      siblingData: {},\n    })\n\n  const apiKeyValue = apiKey?.value\n\n  const apiKeyLabel = useMemo(() => {\n    let label: Record<string, string> | string = 'API Key'\n\n    if (apiKeyField?.label) {\n      label = apiKeyField.label\n    }\n\n    return getTranslation(label, i18n)\n  }, [apiKeyField, i18n])\n\n  const APIKeyLabel = useMemo(\n    () => (\n      <label className={`${baseClass}__label field-label`} htmlFor=\"apiKey\">\n        <span>{apiKeyLabel}</span>\n      </label>\n    ),\n    [apiKeyLabel],\n  )\n\n  const fieldType = useField({\n    path: 'apiKey',\n    validate,\n  })\n\n  const highlightField = () => {\n    if (highlightedField) {\n      setHighlightedField(false)\n    }\n    setTimeout(() => {\n      setHighlightedField(true)\n    }, 1)\n  }\n\n  const { setValue, value } = fieldType\n\n  useEffect(() => {\n    if (!apiKeyValue && enabled) {\n      setValue(initialAPIKey)\n    }\n    if (!enabled && apiKeyValue) {\n      setValue(null)\n    }\n  }, [apiKeyValue, enabled, setValue, initialAPIKey])\n\n  useEffect(() => {\n    if (highlightedField) {\n      setTimeout(() => {\n        setHighlightedField(false)\n      }, 10000)\n    }\n  }, [highlightedField])\n\n  if (!enabled) {\n    return null\n  }\n\n  return (\n    <React.Fragment>\n      <div className={[fieldBaseClass, 'api-key', 'read-only'].filter(Boolean).join(' ')}>\n        {APIKeyLabel}\n        <APIKeyInput\n          aria-label={apiKeyLabel}\n          highlighted={highlightedField}\n          id=\"apiKey\"\n          value={value as string}\n        />\n      </div>\n      {!readOnly && (\n        <GenerateConfirmation highlightField={highlightField} setKey={() => setValue(uuidv4())} />\n      )}\n    </React.Fragment>\n  )\n}\n"],"mappings":"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","ignoreList":[]}

package/dist/views/Edit/Auth/index.css

@@ -65,73 +65,6 @@
     background: transparent;
   }
 
-  .auth-fields .field-type.api-key input,
-  .auth-fields .api-key__toggle-button {
-    font-family: var(--text-body-medium-font-family);
-    font-size: var(--text-body-medium-font-size);
-    font-weight: var(--text-body-medium-font-weight);
-    line-height: var(--text-body-medium-line-height);
-  }
-
-  .auth-fields .field-type.api-key input {
-    width: 100%;
-    border: none;
-    border-radius: 0;
-    background: transparent;
-    color: var(--color-text);
-    height: auto;
-    min-width: 0;
-    min-height: unset;
-    outline: none;
-    padding: 0 var(--spacer-2);
-    padding-inline-end: calc(var(--spacer-4) + var(--spacer-3));
-    appearance: none;
-    -webkit-appearance: none;
-  }
-
-  .auth-fields .api-key__input-wrap {
-    position: relative;
-    display: flex;
-    align-items: stretch;
-    width: 100%;
-    background: var(--color-bg-secondary);
-    border: var(--stroke-width-small) solid transparent;
-    border-radius: var(--radius-medium);
-    min-height: var(--spacer-5);
-  }
-
-  .auth-fields .api-key__input-wrap:focus-within {
-    border-color: var(--color-border-selected);
-  }
-
-  .auth-fields .api-key__toggle-button-wrap {
-    position: absolute;
-    top: 50%;
-    right: calc(var(--spacer-2) - 5px); /* 8px input padding - 5px icon viewBox internal padding */
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    transform: translateY(-50%);
-  }
-
-  .auth-fields .api-key__toggle-button {
-    width: var(--spacer-4);
-    height: var(--spacer-4);
-    border: none;
-    color: var(--color-icon-secondary);
-    margin: 0;
-    padding: 0;
-  }
-
-  .auth-fields .api-key__toggle-button:hover {
-    color: var(--color-icon);
-  }
-
-  .auth-fields .api-key__toggle-button.btn--style-ghost:hover:not(.btn--disabled),
-  .auth-fields .api-key__toggle-button.btn--style-ghost:active:not(.btn--disabled) {
-    background-color: transparent;
-  }
-
   .auth-fields__api-key > .btn.btn--style-secondary {
     align-self: flex-start;
   }

package/dist/views/Edit/index.css

@@ -1,18 +1,160 @@
 @layer payload-default {
+  .collection-edit__form {
+    height: 100%;
+    width: 100%;
+    container-type: inline-size;
+    container-name: edit-main;
+  }
+
   .collection-edit__main-wrapper {
     width: 100%;
     display: flex;
   }
 
+  .collection-edit__main-wrapper--scroll-fields-only {
+    height: calc(
+      100dvh - var(--app-header-height, 0px) - var(--doc-controls-height, 0px) -
+        var(--doc-header-height, 0px)
+    );
+    overflow: hidden;
+
+    .collection-edit__main {
+      min-height: 0;
+      overflow: hidden;
+    }
+
+    .document-fields {
+      height: 100%;
+      min-height: 0;
+    }
+
+    .document-fields--force-sidebar-wrap {
+      overflow-y: auto;
+      overscroll-behavior: contain;
+      scrollbar-width: thin;
+      scrollbar-color: var(--scrollbar-color) transparent;
+    }
+
+    .document-fields:not(.document-fields--force-sidebar-wrap) .document-fields__main {
+      min-height: 0;
+      overflow-y: auto;
+      overscroll-behavior: contain;
+      scrollbar-width: thin;
+      scrollbar-color: var(--scrollbar-color) transparent;
+    }
+
+    .document-fields--force-sidebar-wrap .document-fields__main {
+      overflow-y: visible;
+      overscroll-behavior: auto;
+      scrollbar-width: auto;
+      scrollbar-color: auto;
+    }
+
+    .document-fields__sidebar {
+      overscroll-behavior: contain;
+      scrollbar-width: thin;
+      scrollbar-color: var(--scrollbar-color) transparent;
+    }
+
+    .document-fields__sidebar-wrap {
+      --sidebar-wrap-top: 0px;
+      --sidebar-wrap-height: 100%;
+    }
+  }
+
+  .template-default__wrap:has(.collection-edit__main-wrapper--scroll-fields-only) {
+    height: 100dvh;
+    overflow: hidden;
+  }
+
   .collection-edit__main {
     width: 100%;
-    container-type: inline-size;
   }
 
   .collection-edit__main--popup-open {
     width: 100%;
   }
 
+  .collection-edit__main-wrapper--has-upload-panel {
+    .collection-edit__main {
+      flex: 1;
+    }
+    .file-manager {
+      flex: 2;
+      border-inline-start: var(--stroke-width-small) solid var(--color-border);
+    }
+
+    .collection-edit__main:not(:has(.field-type)) {
+      display: none;
+    }
+
+    .collection-edit__main:not(:has(.field-type)) ~ .file-manager {
+      border-inline-start: none;
+    }
+  }
+
+  /* Container query (not viewport) so the layout stacks based on the space actually available
+     to the edit view — e.g. inside a narrow document drawer it uses the stacked mobile layout. */
+  @container edit-main (max-width: 1024px) {
+    .collection-edit__main-wrapper--scroll-fields-only {
+      height: auto;
+      overflow: visible;
+
+      .collection-edit__main {
+        min-height: initial;
+        overflow: visible;
+      }
+
+      .document-fields {
+        height: auto;
+        min-height: initial;
+      }
+
+      .document-fields--force-sidebar-wrap {
+        overflow-y: visible;
+        overscroll-behavior: auto;
+        scrollbar-width: auto;
+        scrollbar-color: auto;
+      }
+
+      .document-fields:not(.document-fields--force-sidebar-wrap) .document-fields__main {
+        min-height: initial;
+        overflow-y: visible;
+        overscroll-behavior: auto;
+        scrollbar-width: auto;
+        scrollbar-color: auto;
+      }
+
+      .document-fields__sidebar {
+        overscroll-behavior: auto;
+        scrollbar-width: auto;
+        scrollbar-color: auto;
+      }
+    }
+
+    .template-default__wrap:has(.collection-edit__main-wrapper--scroll-fields-only) {
+      height: auto;
+      overflow: visible;
+    }
+
+    .collection-edit__main-wrapper--has-upload-panel {
+      flex-direction: column-reverse;
+      gap: var(--spacer-5);
+
+      .file-manager {
+        order: 0;
+        flex: 1 0 0;
+        /* Stacked — no vertical divider; the file manager's own bottom border separates it. */
+        border-inline-start: 0;
+      }
+
+      .document-fields {
+        flex: 0 0 auto;
+        width: 100%;
+      }
+    }
+  }
+
   .collection-edit__main--is-live-previewing {
     width: 40%;
     position: relative;
@@ -29,11 +171,6 @@
     }
   }
 
-  .collection-edit__form {
-    height: 100%;
-    width: 100%;
-  }
-
   .collection-edit__auth {
     border-radius: var(--radius-small);
   }

package/dist/views/Edit/index.d.ts

@@ -5,5 +5,5 @@ export type OnSaveContext = {
     getDocPermissions?: boolean;
     incrementVersionCount?: boolean;
 };
-export declare function DefaultEditView({ BeforeDocumentControls, BeforeDocumentMeta, Description, EditMenuItems, LivePreview: CustomLivePreview, PreviewButton, PublishButton, SaveButton, SaveDraftButton, Status, UnpublishButton, Upload: CustomUpload, UploadControls, }: DocumentViewClientProps): React.JSX.Element;
+export declare function DefaultEditView({ BeforeDocumentControls, BeforeDocumentMeta, Description, EditMenuItems, LivePreview: CustomLivePreview, PreviewButton, PublishButton, SaveButton, SaveDraftButton, Status, UnpublishButton, Upload: CustomUpload, UploadControls, UploadFilePreview, }: DocumentViewClientProps): React.JSX.Element;
 //# sourceMappingURL=index.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/views/Edit/index.tsx"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAc,uBAAuB,EAAE,MAAM,SAAS,CAAA;AAGlE,OAAO,KAAsE,MAAM,OAAO,CAAA;AAsC1F,OAAO,aAAa,CAAA;AAKpB,MAAM,MAAM,aAAa,GAAG;IAC1B,iBAAiB,CAAC,EAAE,OAAO,CAAA;IAC3B,qBAAqB,CAAC,EAAE,OAAO,CAAA;CAChC,CAAA;AAKD,wBAAgB,eAAe,CAAC,EAC9B,sBAAsB,EACtB,kBAAkB,EAClB,WAAW,EACX,aAAa,EACb,WAAW,EAAE,iBAAiB,EAC9B,aAAa,EACb,aAAa,EACb,UAAU,EACV,eAAe,EACf,MAAM,EACN,eAAe,EACf,MAAM,EAAE,YAAY,EACpB,cAAc,GACf,EAAE,uBAAuB,qBA6vBzB"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/views/Edit/index.tsx"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAc,uBAAuB,EAAE,MAAM,SAAS,CAAA;AAGlE,OAAO,KAA4D,MAAM,OAAO,CAAA;AAsChF,OAAO,aAAa,CAAA;AAKpB,MAAM,MAAM,aAAa,GAAG;IAC1B,iBAAiB,CAAC,EAAE,OAAO,CAAA;IAC3B,qBAAqB,CAAC,EAAE,OAAO,CAAA;CAChC,CAAA;AAKD,wBAAgB,eAAe,CAAC,EAC9B,sBAAsB,EACtB,kBAAkB,EAClB,WAAW,EACX,aAAa,EACb,WAAW,EAAE,iBAAiB,EAC9B,aAAa,EACb,aAAa,EACb,UAAU,EACV,eAAe,EACf,MAAM,EACN,eAAe,EACf,MAAM,EAAE,YAAY,EACpB,cAAc,EACd,iBAAiB,GAClB,EAAE,uBAAuB,qBAgxBzB"}

package/dist/views/Edit/index.js

@@ -2,7 +2,7 @@
 
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
 import { formatAdminURL, hasAutosaveEnabled } from 'payload/shared';
-import React, { Fragment, useCallback, useEffect, useMemo, useRef, useState } from 'react';
+import React, { useCallback, useEffect, useMemo, useRef, useState } from 'react';
 import { toast } from 'sonner';
 import { DocumentControls } from '../../elements/DocumentControls/index.js';
 import { DocumentDrawerHeader } from '../../elements/DocumentDrawer/DrawerHeader/index.js';
@@ -11,9 +11,9 @@ import { DocumentFields } from '../../elements/DocumentFields/index.js';
 import { DocumentLocked } from '../../elements/DocumentLocked/index.js';
 import { DocumentStaleData } from '../../elements/DocumentStaleData/index.js';
 import { DocumentTakeOver } from '../../elements/DocumentTakeOver/index.js';
+import { FileManager } from '../../elements/FileManager/index.js';
 import { LeaveWithoutSaving } from '../../elements/LeaveWithoutSaving/index.js';
 import { LivePreviewWindow } from '../../elements/LivePreview/Window/index.js';
-import { Upload } from '../../elements/Upload/index.js';
 import { Form } from '../../forms/Form/index.js';
 import { useAuth } from '../../providers/Auth/index.js';
 import { useConfig } from '../../providers/Config/index.js';
@@ -54,7 +54,8 @@ export function DefaultEditView({
   Status,
   UnpublishButton,
   Upload: CustomUpload,
-  UploadControls
+  UploadControls,
+  UploadFilePreview
 }) {
   const {
     id,
@@ -446,6 +447,73 @@ export function DefaultEditView({
   }, [isInitializing]);
   const shouldShowDocumentLockedModal = documentIsLocked && currentEditor && (typeof currentEditor === 'object' ? currentEditor.id !== user?.id : currentEditor !== user?.id) && !isReadOnlyForIncomingUser && !showTakeOverModal && !documentLockState.current?.hasShownLockedModal && !isLockExpired;
   const isFolderCollection = Boolean(collectionConfig?.hierarchy && typeof collectionConfig.hierarchy === 'object' && collectionConfig.hierarchy.allowHasMany === false);
+  const documentControlsProps = {
+    id,
+    slug: collectionConfig?.slug || globalConfig?.slug,
+    apiURL,
+    BeforeDocumentControls,
+    BeforeDocumentMeta,
+    customComponents: {
+      PreviewButton,
+      PublishButton,
+      SaveButton,
+      SaveDraftButton,
+      Status,
+      UnpublishButton
+    },
+    data,
+    disableActions: disableActions || isTrashed,
+    disableCreate,
+    EditMenuItems,
+    hasPublishPermission,
+    hasSavePermission,
+    isEditing,
+    isInDrawer,
+    isTrashed,
+    onDelete,
+    onDrawerCreateNew: clearDoc,
+    onDuplicate,
+    onRestore,
+    onSave,
+    onTakeOver: () => {
+      void handleTakeOver({
+        id,
+        clearRouteCache,
+        collectionSlug,
+        documentLockStateRef: documentLockState,
+        globalSlug,
+        isLockingEnabled,
+        isWithinDoc: true,
+        setCurrentEditor,
+        setIsReadOnlyForIncomingUser,
+        updateDocumentEditor,
+        user
+      });
+    },
+    permissions: docPermissions,
+    readOnlyForIncomingUser: isReadOnlyForIncomingUser,
+    redirectAfterDelete,
+    redirectAfterDuplicate,
+    redirectAfterRestore,
+    user: currentEditor
+  };
+  const renderAuth = auth ? /*#__PURE__*/_jsx(Auth, {
+    className: `${baseClass}__auth`,
+    collectionSlug: collectionConfig.slug,
+    disableLocalStrategy: collectionConfig.auth?.disableLocalStrategy,
+    email: data?.email,
+    loginWithUsername: auth?.loginWithUsername,
+    operation: operation,
+    readOnly: !hasSavePermission,
+    requirePassword: !id,
+    setValidateBeforeSubmit: setValidateBeforeSubmit,
+    // eslint-disable-next-line react-compiler/react-compiler
+    useAPIKey: auth.useAPIKey,
+    username: data?.username,
+    verify: auth.verify
+  }) : undefined;
+  const shouldRenderUploadPanel = Boolean(upload);
+  const shouldScrollFieldsOnly = shouldRenderUploadPanel;
   return /*#__PURE__*/_jsx("main", {
     className: [baseClass, (id || globalSlug) && `${baseClass}--is-editing`, globalSlug && `global-edit--${globalSlug}`, collectionSlug && `collection-edit--${collectionSlug}`, isLivePreviewing && `${baseClass}--is-live-previewing`].filter(Boolean).join(' '),
     children: /*#__PURE__*/_jsx(OperationProvider, {
@@ -467,9 +535,17 @@ export function DefaultEditView({
         },
         onSuccess: onSave,
         children: [isInDrawer && /*#__PURE__*/_jsx(DocumentDrawerHeader, {
+          actions: /*#__PURE__*/_jsx(DocumentControls, {
+            ...documentControlsProps,
+            variant: "drawerHeaderActions"
+          }),
           AfterHeader: Description,
+          BeforeDocumentMeta: BeforeDocumentMeta,
           drawerSlug: drawerSlug,
-          showDocumentID: !isFolderCollection
+          readOnlyForIncomingUser: isReadOnlyForIncomingUser,
+          renderTitleAsLink: !isFolderCollection,
+          Status: Status,
+          user: currentEditor
         }), isLockingEnabled && shouldShowDocumentLockedModal && /*#__PURE__*/_jsx(DocumentLocked, {
           handleGoBack: () => handleGoBack({
             adminRoute,
@@ -526,93 +602,34 @@ export function DefaultEditView({
           config: config,
           fallback: depth <= 1 ? id?.toString() : undefined,
           globalConfig: globalConfig
-        }), /*#__PURE__*/_jsx(DocumentControls, {
-          apiURL: apiURL,
-          BeforeDocumentControls: BeforeDocumentControls,
-          BeforeDocumentMeta: BeforeDocumentMeta,
-          customComponents: {
-            PreviewButton,
-            PublishButton,
-            SaveButton,
-            SaveDraftButton,
-            Status,
-            UnpublishButton
-          },
-          data: data,
-          disableActions: disableActions || isTrashed,
-          disableCreate: disableCreate,
-          EditMenuItems: EditMenuItems,
-          hasPublishPermission: hasPublishPermission,
-          hasSavePermission: hasSavePermission,
-          id: id,
-          isEditing: isEditing,
-          isInDrawer: isInDrawer,
-          isTrashed: isTrashed,
-          onDelete: onDelete,
-          onDrawerCreateNew: clearDoc,
-          onDuplicate: onDuplicate,
-          onRestore: onRestore,
-          onSave: onSave,
-          onTakeOver: () => handleTakeOver({
-            id,
-            clearRouteCache,
-            collectionSlug,
-            documentLockStateRef: documentLockState,
-            globalSlug,
-            isLockingEnabled,
-            isWithinDoc: true,
-            setCurrentEditor,
-            setIsReadOnlyForIncomingUser,
-            updateDocumentEditor,
-            user
-          }),
-          permissions: docPermissions,
-          readOnlyForIncomingUser: isReadOnlyForIncomingUser,
-          redirectAfterDelete: redirectAfterDelete,
-          redirectAfterDuplicate: redirectAfterDuplicate,
-          redirectAfterRestore: redirectAfterRestore,
-          slug: collectionConfig?.slug || globalConfig?.slug,
-          user: currentEditor
+        }), !isInDrawer && /*#__PURE__*/_jsx(DocumentControls, {
+          ...documentControlsProps,
+          variant: "default"
         }), /*#__PURE__*/_jsxs("div", {
-          className: [`${baseClass}__main-wrapper`, isPopupOpen && `${baseClass}--detached`].filter(Boolean).join(' '),
+          className: [`${baseClass}__main-wrapper`, shouldRenderUploadPanel && `${baseClass}__main-wrapper--has-upload-panel`, shouldScrollFieldsOnly && `${baseClass}__main-wrapper--scroll-fields-only`, isPopupOpen && `${baseClass}--detached`].filter(Boolean).join(' '),
           children: [/*#__PURE__*/_jsxs("div", {
             className: [`${baseClass}__main`, isPopupOpen && `${baseClass}__main--popup-open`].filter(Boolean).join(' '),
             children: [/*#__PURE__*/_jsx(DocumentFields, {
               AfterFields: AfterFields,
-              BeforeFields: BeforeFields || /*#__PURE__*/_jsxs(Fragment, {
-                children: [auth && /*#__PURE__*/_jsx(Auth, {
-                  className: `${baseClass}__auth`,
-                  collectionSlug: collectionConfig.slug,
-                  disableLocalStrategy: collectionConfig.auth?.disableLocalStrategy,
-                  email: data?.email,
-                  loginWithUsername: auth?.loginWithUsername,
-                  operation: operation,
-                  readOnly: !hasSavePermission,
-                  requirePassword: !id,
-                  setValidateBeforeSubmit: setValidateBeforeSubmit,
-                  // eslint-disable-next-line react-compiler/react-compiler
-                  useAPIKey: auth.useAPIKey,
-                  username: data?.username,
-                  verify: auth.verify
-                }), upload && /*#__PURE__*/_jsx(React.Fragment, {
-                  children: /*#__PURE__*/_jsx(UploadControlsProvider, {
-                    children: CustomUpload || /*#__PURE__*/_jsx(Upload, {
-                      collectionSlug: collectionConfig.slug,
-                      initialState: initialState,
-                      uploadConfig: upload,
-                      UploadControls: UploadControls
-                    })
-                  })
-                })]
-              }),
+              BeforeFields: renderAuth || BeforeFields ? /*#__PURE__*/_jsxs(_Fragment, {
+                children: [renderAuth, BeforeFields]
+              }) : null,
               Description: Description,
               docPermissions: docPermissions,
               fields: docConfig.fields,
-              forceSidebarWrap: isLivePreviewing,
+              forceSidebarWrap: shouldRenderUploadPanel || isLivePreviewing,
               isTrashed: isTrashed,
               readOnly: isReadOnlyForIncomingUser || !hasSavePermission || isTrashed,
               schemaPathSegments: schemaPathSegments
             }), AfterDocument]
+          }), shouldRenderUploadPanel && /*#__PURE__*/_jsx(UploadControlsProvider, {
+            children: CustomUpload || /*#__PURE__*/_jsx(FileManager, {
+              collectionSlug: collectionConfig.slug,
+              initialState: initialState,
+              uploadConfig: upload,
+              UploadControls: UploadControls,
+              UploadFilePreview: UploadFilePreview
+            })
           }), isLivePreviewEnabled && !isInDrawer && livePreviewURL && /*#__PURE__*/_jsx(_Fragment, {
             children: CustomLivePreview || /*#__PURE__*/_jsx(LivePreviewWindow, {
               collectionSlug: collectionSlug,