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

package/dist/providers/UploadHandlers/index.d.ts

@@ -1,18 +1,13 @@
-import type { UploadCollectionSlug } from 'payload';
+import type { UploadCollectionSlug, UploadInstructions } from 'payload';
 import React from 'react';
 type UploadHandler = (args: {
     docPrefix?: string;
     file: File;
-    updateFilename: (filename: string) => void;
-}) => Promise<unknown>;
+}) => Promise<UploadInstructions['file']>;
 export type UploadHandlersContext = {
     getUploadHandler: (args: {
         collectionSlug: UploadCollectionSlug;
     }) => null | UploadHandler;
-    setUploadHandler: (args: {
-        collectionSlug: UploadCollectionSlug;
-        handler: UploadHandler;
-    }) => unknown;
 };
 export declare const UploadHandlersProvider: ({ children }: {
     children: any;

package/dist/providers/UploadHandlers/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/providers/UploadHandlers/index.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,SAAS,CAAA;AAEnD,OAAO,KAAmB,MAAM,OAAO,CAAA;AAEvC,KAAK,aAAa,GAAG,CAAC,IAAI,EAAE;IAC1B,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,IAAI,EAAE,IAAI,CAAA;IACV,cAAc,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,IAAI,CAAA;CAC3C,KAAK,OAAO,CAAC,OAAO,CAAC,CAAA;AAEtB,MAAM,MAAM,qBAAqB,GAAG;IAClC,gBAAgB,EAAE,CAAC,IAAI,EAAE;QAAE,cAAc,EAAE,oBAAoB,CAAA;KAAE,KAAK,IAAI,GAAG,aAAa,CAAA;IAC1F,gBAAgB,EAAE,CAAC,IAAI,EAAE;QACvB,cAAc,EAAE,oBAAoB,CAAA;QACpC,OAAO,EAAE,aAAa,CAAA;KACvB,KAAK,OAAO,CAAA;CACd,CAAA;AAID,eAAO,MAAM,sBAAsB,GAAI;;CAAY,sBAqBlD,CAAA;AAED,eAAO,MAAM,iBAAiB,QAAO,qBAQpC,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/providers/UploadHandlers/index.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,oBAAoB,EAAE,kBAAkB,EAAE,MAAM,SAAS,CAAA;AAGvE,OAAO,KAAK,MAAM,OAAO,CAAA;AAIzB,KAAK,aAAa,GAAG,CAAC,IAAI,EAAE;IAC1B,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,IAAI,EAAE,IAAI,CAAA;CACX,KAAK,OAAO,CAAC,kBAAkB,CAAC,MAAM,CAAC,CAAC,CAAA;AAEzC,MAAM,MAAM,qBAAqB,GAAG;IAClC,gBAAgB,EAAE,CAAC,IAAI,EAAE;QAAE,cAAc,EAAE,oBAAoB,CAAA;KAAE,KAAK,IAAI,GAAG,aAAa,CAAA;CAC3F,CAAA;AAID,eAAO,MAAM,sBAAsB;;uBAyElC,CAAA;AAED,eAAO,MAAM,iBAAiB,QAAO,qBAQpC,CAAA"}

package/dist/providers/UploadHandlers/index.js

@@ -2,62 +2,119 @@
 
 import { c as _c } from "react/compiler-runtime";
 import { jsx as _jsx } from "react/jsx-runtime";
-import React, { useState } from 'react';
+import { formatAdminURL } from 'payload/shared';
+import React from 'react';
+import { useConfig } from '../Config/index.js';
 const Context = /*#__PURE__*/React.createContext(null);
 export const UploadHandlersProvider = t0 => {
-  const $ = _c(6);
+  const $ = _c(5);
   const {
     children
   } = t0;
-  const [uploadHandlers, setUploadHandlers] = useState(_temp);
+  const {
+    config,
+    getEntityConfig
+  } = useConfig();
   let t1;
-  if ($[0] !== uploadHandlers) {
-    t1 = t2 => {
+  if ($[0] !== children || $[1] !== config.routes.api || $[2] !== config.serverURL || $[3] !== getEntityConfig) {
+    const uploadInstructionsURL = formatAdminURL({
+      apiRoute: config.routes.api,
+      path: "/upload-instructions",
+      serverURL: config.serverURL
+    });
+    const getUploadHandler = t2 => {
       const {
         collectionSlug
       } = t2;
-      return uploadHandlers.get(collectionSlug);
-    };
-    $[0] = uploadHandlers;
-    $[1] = t1;
-  } else {
-    t1 = $[1];
-  }
-  const getUploadHandler = t1;
-  let t2;
-  if ($[2] === Symbol.for("react.memo_cache_sentinel")) {
-    t2 = t3 => {
-      const {
-        collectionSlug: collectionSlug_0,
-        handler
-      } = t3;
-      setUploadHandlers(uploadHandlers_0 => {
-        const clone = new Map(uploadHandlers_0);
-        clone.set(collectionSlug_0, handler);
-        return clone;
-      });
+      if (!getEntityConfig({
+        collectionSlug
+      })?.upload?.uploadInstructions.useInAdmin) {
+        return null;
+      }
+      return async t3 => {
+        const {
+          docPrefix,
+          file
+        } = t3;
+        const response = await fetch(uploadInstructionsURL, {
+          body: JSON.stringify({
+            collectionSlug,
+            docPrefix,
+            filename: file.name,
+            filesize: file.size,
+            mimeType: file.type
+          }),
+          credentials: "include",
+          headers: {
+            "Content-Type": "application/json"
+          },
+          method: "POST"
+        });
+        if (!response.ok) {
+          const {
+            errors
+          } = await response.json();
+          throw new Error(errors.map(_temp).join(", "));
+        }
+        const instructions = await response.json();
+        let uploadedFile = instructions.file;
+        if (instructions.type === "http") {
+          const {
+            url,
+            ...request
+          } = instructions.request;
+          const upload = await fetch(url, {
+            body: file,
+            ...request
+          });
+          if (!upload.ok) {
+            throw new Error(`Upload failed with status ${upload.status}`);
+          }
+          return uploadedFile;
+        }
+        const result = await new Promise((resolve, reject) => {
+          const event = new CustomEvent(`payload:upload:${instructions.name}`, {
+            cancelable: true,
+            detail: {
+              collectionSlug,
+              data: instructions.data,
+              docPrefix,
+              file,
+              reject,
+              resolve,
+              updateFilename: filename => {
+                uploadedFile = {
+                  ...uploadedFile,
+                  filename
+                };
+              }
+            }
+          });
+          if (window.dispatchEvent(event)) {
+            reject(new Error(`Unsupported upload instruction: ${instructions.name}`));
+          }
+        });
+        return typeof result === "object" && result !== null ? {
+          ...uploadedFile,
+          uploadReference: result
+        } : uploadedFile;
+      };
     };
-    $[2] = t2;
-  } else {
-    t2 = $[2];
-  }
-  const setUploadHandler = t2;
-  let t3;
-  if ($[3] !== children || $[4] !== getUploadHandler) {
-    t3 = _jsx(Context, {
+    t1 = _jsx(Context, {
       value: {
-        getUploadHandler,
-        setUploadHandler
+        getUploadHandler
       },
       children
     });
-    $[3] = children;
-    $[4] = getUploadHandler;
-    $[5] = t3;
+    $[0] = children;
+    $[1] = config.routes.api;
+    $[2] = config.serverURL;
+    $[3] = getEntityConfig;
+    $[4] = t1;
   } else {
-    t3 = $[5];
+    t1 = $[4];
   }
-  return t3;
+  return t1;
 };
 export const useUploadHandlers = () => {
   const context = React.use(Context);
@@ -66,7 +123,10 @@ export const useUploadHandlers = () => {
   }
   return context;
 };
-function _temp() {
-  return new Map();
+function _temp(t0) {
+  const {
+    message
+  } = t0;
+  return message;
 }
 //# sourceMappingURL=index.js.map

package/dist/providers/UploadHandlers/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","names":["c","_c","React","useState","Context","createContext","UploadHandlersProvider","t0","$","children","uploadHandlers","setUploadHandlers","_temp","t1","t2","collectionSlug","get","getUploadHandler","Symbol","for","t3","collectionSlug_0","handler","uploadHandlers_0","clone","Map","set","setUploadHandler","_jsx","value","useUploadHandlers","context","use","Error"],"sources":["../../../src/providers/UploadHandlers/index.tsx"],"sourcesContent":["'use client'\nimport type { UploadCollectionSlug } from 'payload'\n\nimport React, { useState } from 'react'\n\ntype UploadHandler = (args: {\n  docPrefix?: string\n  file: File\n  updateFilename: (filename: string) => void\n}) => Promise<unknown>\n\nexport type UploadHandlersContext = {\n  getUploadHandler: (args: { collectionSlug: UploadCollectionSlug }) => null | UploadHandler\n  setUploadHandler: (args: {\n    collectionSlug: UploadCollectionSlug\n    handler: UploadHandler\n  }) => unknown\n}\n\nconst Context = React.createContext<null | UploadHandlersContext>(null)\n\nexport const UploadHandlersProvider = ({ children }) => {\n  const [uploadHandlers, setUploadHandlers] = useState<Map<UploadCollectionSlug, UploadHandler>>(\n    () => new Map(),\n  )\n\n  const getUploadHandler: UploadHandlersContext['getUploadHandler'] = ({ collectionSlug }) => {\n    return uploadHandlers.get(collectionSlug)\n  }\n\n  const setUploadHandler: UploadHandlersContext['setUploadHandler'] = ({\n    collectionSlug,\n    handler,\n  }) => {\n    setUploadHandlers((uploadHandlers) => {\n      const clone = new Map(uploadHandlers)\n      clone.set(collectionSlug, handler)\n      return clone\n    })\n  }\n\n  return <Context value={{ getUploadHandler, setUploadHandler }}>{children}</Context>\n}\n\nexport const useUploadHandlers = (): UploadHandlersContext => {\n  const context = React.use(Context)\n\n  if (context === null) {\n    throw new Error('useUploadHandlers must be used within UploadHandlersProvider')\n  }\n\n  return context\n}\n"],"mappings":"AAAA;;AAAA,SAAAA,CAAA,IAAAC,EAAA;;AAGA,OAAOC,KAAA,IAASC,QAAQ,QAAQ;AAgBhC,MAAMC,OAAA,gBAAUF,KAAA,CAAMG,aAAa,CAA+B;AAElE,OAAO,MAAMC,sBAAA,GAAyBC,EAAA;EAAA,MAAAC,CAAA,GAAAP,EAAA;EAAC;IAAAQ;EAAA,IAAAF,EAAY;EACjD,OAAAG,cAAA,EAAAC,iBAAA,IAA4CR,QAAA,CAAAS,KAChC;EAAA,IAAAC,EAAA;EAAA,IAAAL,CAAA,QAAAE,cAAA;IAGwDG,EAAA,GAAAC,EAAA;MAAC;QAAAC;MAAA,IAAAD,EAAkB;MAAA,OAC9EJ,cAAA,CAAAM,GAAA,CAAmBD,cAAA;IAAA;IAC5BP,CAAA,MAAAE,cAAA;IAAAF,CAAA,MAAAK,EAAA;EAAA;IAAAA,EAAA,GAAAL,CAAA;EAAA;EAFA,MAAAS,gBAAA,GAAoEJ,EAEpE;EAAA,IAAAC,EAAA;EAAA,IAAAN,CAAA,QAAAU,MAAA,CAAAC,GAAA;IAEoEL,EAAA,GAAAM,EAAA;MAAC;QAAAL,cAAA,EAAAM,gBAAA;QAAAC;MAAA,IAAAF,EAGpE;MACCT,iBAAA,CAAAY,gBAAA;QACE,MAAAC,KAAA,OAAAC,GAAA,CAAsBf,gBAAA;QACtBc,KAAA,CAAAE,GAAA,CAAUX,gBAAA,EAAgBO,OAAA;QAAA,OACnBE,KAAA;MAAA,CACT;IAAA;IACFhB,CAAA,MAAAM,EAAA;EAAA;IAAAA,EAAA,GAAAN,CAAA;EAAA;EATA,MAAAmB,gBAAA,GAAoEb,EASpE;EAAA,IAAAM,EAAA;EAAA,IAAAZ,CAAA,QAAAC,QAAA,IAAAD,CAAA,QAAAS,gBAAA;IAEOG,EAAA,GAAAQ,IAAA,CAAAxB,OAAA;MAAAyB,KAAA;QAAAZ,gBAAA;QAAAU;MAAA;MAAAlB;IAAA,C;;;;;;;SAAAW,E;CACT;AAEA,OAAO,MAAMU,iBAAA,GAAoBA,CAAA;EAC/B,MAAMC,OAAA,GAAU7B,KAAA,CAAM8B,GAAG,CAAC5B,OAAA;EAE1B,IAAI2B,OAAA,KAAY,MAAM;IACpB,MAAM,IAAIE,KAAA,CAAM;EAClB;EAEA,OAAOF,OAAA;AACT;AA/BsC,SAAAnB,MAAA;EAAA,WAAAa,GAAA;AAAA","ignoreList":[]}
+{"version":3,"file":"index.js","names":["c","_c","formatAdminURL","React","useConfig","Context","createContext","UploadHandlersProvider","t0","$","children","config","getEntityConfig","t1","routes","api","serverURL","uploadInstructionsURL","apiRoute","path","getUploadHandler","t2","collectionSlug","upload","uploadInstructions","useInAdmin","t3","docPrefix","file","response","fetch","body","JSON","stringify","filename","name","filesize","size","mimeType","type","credentials","headers","method","ok","errors","json","Error","map","_temp","join","instructions","uploadedFile","url","request","status","result","Promise","resolve","reject","event","CustomEvent","cancelable","detail","data","updateFilename","window","dispatchEvent","uploadReference","_jsx","value","useUploadHandlers","context","use","message"],"sources":["../../../src/providers/UploadHandlers/index.tsx"],"sourcesContent":["'use client'\nimport type { UploadCollectionSlug, UploadInstructions } from 'payload'\n\nimport { formatAdminURL } from 'payload/shared'\nimport React from 'react'\n\nimport { useConfig } from '../Config/index.js'\n\ntype UploadHandler = (args: {\n  docPrefix?: string\n  file: File\n}) => Promise<UploadInstructions['file']>\n\nexport type UploadHandlersContext = {\n  getUploadHandler: (args: { collectionSlug: UploadCollectionSlug }) => null | UploadHandler\n}\n\nconst Context = React.createContext<null | UploadHandlersContext>(null)\n\nexport const UploadHandlersProvider = ({ children }) => {\n  const { config, getEntityConfig } = useConfig()\n  const uploadInstructionsURL = formatAdminURL({\n    apiRoute: config.routes.api,\n    path: '/upload-instructions',\n    serverURL: config.serverURL,\n  })\n  const getUploadHandler: UploadHandlersContext['getUploadHandler'] = ({ collectionSlug }) => {\n    if (!getEntityConfig({ collectionSlug })?.upload?.uploadInstructions.useInAdmin) {\n      return null\n    }\n\n    return async ({ docPrefix, file }) => {\n      const response = await fetch(uploadInstructionsURL, {\n        body: JSON.stringify({\n          collectionSlug,\n          docPrefix,\n          filename: file.name,\n          filesize: file.size,\n          mimeType: file.type,\n        }),\n        credentials: 'include',\n        headers: { 'Content-Type': 'application/json' },\n        method: 'POST',\n      })\n\n      if (!response.ok) {\n        const { errors } = (await response.json()) as { errors: { message: string }[] }\n        throw new Error(errors.map(({ message }) => message).join(', '))\n      }\n\n      const instructions = (await response.json()) as UploadInstructions\n      let uploadedFile = instructions.file\n\n      if (instructions.type === 'http') {\n        const { url, ...request } = instructions.request\n        const upload = await fetch(url, { body: file, ...request })\n\n        if (!upload.ok) {\n          throw new Error(`Upload failed with status ${upload.status}`)\n        }\n\n        return uploadedFile\n      }\n\n      const result = await new Promise<unknown>((resolve, reject) => {\n        const event = new CustomEvent(`payload:upload:${instructions.name}`, {\n          cancelable: true,\n          detail: {\n            collectionSlug,\n            data: instructions.data,\n            docPrefix,\n            file,\n            reject,\n            resolve,\n            updateFilename: (filename: string) => {\n              uploadedFile = { ...uploadedFile, filename }\n            },\n          },\n        })\n\n        if (window.dispatchEvent(event)) {\n          reject(new Error(`Unsupported upload instruction: ${instructions.name}`))\n        }\n      })\n\n      return typeof result === 'object' && result !== null\n        ? { ...uploadedFile, uploadReference: result as Record<string, unknown> }\n        : uploadedFile\n    }\n  }\n\n  return <Context value={{ getUploadHandler }}>{children}</Context>\n}\n\nexport const useUploadHandlers = (): UploadHandlersContext => {\n  const context = React.use(Context)\n\n  if (context === null) {\n    throw new Error('useUploadHandlers must be used within UploadHandlersProvider')\n  }\n\n  return context\n}\n"],"mappings":"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","ignoreList":[]}

package/dist/scss/app.scss

@@ -1,7 +1,6 @@
 @layer payload-default, payload;
 
-@import './styles';
-@import './toasts.scss';
+@import 'styles';
 @import './colors.scss';
 @import '../styles.css';
 
@@ -39,7 +38,9 @@
 
     --gutter-h: var(--spacer-5);
     --spacing-view-bottom: var(--gutter-h);
-    --doc-controls-height: calc(var(--text-body-large-line-height) + var(--spacer-4));
+    --app-header-height: 0px;
+    --doc-controls-height: 0px;
+    --doc-header-height: 0px;
     --nav-width: 275px;
 
     @include large-break {
@@ -48,7 +49,6 @@
 
     @include mid-break {
       --gutter-h: var(--spacer-3);
-      --doc-controls-height: calc(var(--base) * 2.4);
     }
 
     @include small-break {
@@ -96,6 +96,12 @@
     overflow-x: hidden;
   }
 
+  // Lock background scroll while a drawer is open. Backs up faceless-ui's JS
+  // body-scroll-lock, which a sibling modal can clear prematurely.
+  body:has(.drawer--is-open) {
+    overflow: hidden;
+  }
+
   img {
     max-width: 100%;
     height: auto;