@foundrykit/media-plugin 0.1.0 → 0.2.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/README.md CHANGED
@@ -4,7 +4,7 @@ Media library additions for Payload CMS 3 (3.84+):
4
4
 
5
5
  - **List / Grid switch** on upload collection lists, next to Columns and Filters. Works on the full
6
6
  list page and inside the image picker drawer ("Choose from existing"). The choice is remembered
7
- per browser.
7
+ per browser. In grid view a **Per row** menu sets how many images sit on each row (Auto, or 2–8).
8
8
  - **Folders tab in the image picker.** Payload's picker drawer only shows a flat list; this adds a
9
9
  Folders tab so editors can browse into `payload-folders` and pick images from inside folders.
10
10
  Respects the field's `hasMany` (multi-select on galleries, single select otherwise) and reopens
@@ -40,3 +40,16 @@ config), which adds a folder field and so needs a migration on Postgres.
40
40
 
41
41
  A collection that already sets its own `admin.components.views.list` keeps it; the folder picker is
42
42
  then skipped for that collection.
43
+
44
+ ## Development
45
+
46
+ ```sh
47
+ pnpm dev # dev app in dev/ on an in-memory Mongo, seeded with a folder of images
48
+ pnpm test:unit # vitest, src/
49
+ pnpm test:int # vitest against the dev config
50
+ pnpm test:e2e # playwright; starts the dev app itself (E2E_PORT to change the port)
51
+ ```
52
+
53
+ Releases: `pnpm release` on `prod` bumps the version from conventional commits, updates the
54
+ changelog and pushes a `v*` tag; `.github/workflows/publish.yml` publishes it to npm with trusted
55
+ publishing.
@@ -1 +1 @@
1
- {"version":3,"sources":["../../src/components/FolderPicker.tsx"],"sourcesContent":["'use client'\n\nimport {\n Button,\n FolderProvider,\n LoadingOverlay,\n Pill,\n useConfig,\n useFolder,\n useListDrawerContext,\n useModal,\n useServerFunctions,\n useTranslation,\n XIcon,\n} from '@payloadcms/ui'\nimport { FolderBreadcrumbs } from '@payloadcms/ui/elements/FolderView/Breadcrumbs'\nimport { ColoredFolderIcon } from '@payloadcms/ui/elements/FolderView/ColoredFolderIcon'\nimport type { CollectionSlug } from 'payload'\nimport type { FolderBreadcrumb, FolderOrDocument } from 'payload/shared'\nimport React from 'react'\n\nimport './media-plugin.css'\n\nconst baseClass = 'media-folder-picker'\n\n/**\n * The folder each collection's picker was last browsing, so reopening the drawer lands back\n * where the editor was instead of at the root. Module scope rather than state: the picker\n * unmounts with the drawer every time.\n *\n * ponytail: in-memory, so a page reload resets it. Move to sessionStorage if that matters.\n */\nconst lastFolderID = new Map<string, null | number | string>()\n\ntype Results = {\n breadcrumbs: FolderBreadcrumb[]\n documents: FolderOrDocument[]\n FolderResultsComponent: React.ReactNode\n subfolders: FolderOrDocument[]\n}\n\n/**\n * Folder browsing for the picker drawer.\n *\n * Payload already ships every piece of this (the `get-folder-results-component-and-data`\n * server function, `FolderProvider`, the server-rendered results grid) and wires them up\n * for the Move-to-folder drawer — it just never wires them into the list drawer. This is\n * the same assembly, with `onItemClick` selecting a document instead of moving one.\n */\nexport function FolderPicker({\n allowMultiSelect = false,\n collectionSlug,\n list,\n}: {\n /** True when the field takes several media items — mirrors the list's `enableRowSelections`. */\n allowMultiSelect?: boolean\n collectionSlug: CollectionSlug\n list: React.ReactNode\n}) {\n const { config } = useConfig()\n const { drawerSlug, onBulkSelect, onSelect } = useListDrawerContext()\n const { getFolderResultsComponentAndData } = useServerFunctions()\n const { t } = useTranslation()\n\n const folders = config.folders\n const [browsing, setBrowsing] = React.useState(false)\n const [folderID, setFolderID] = React.useState<null | number | string>(null)\n const [results, setResults] = React.useState<null | Results>(null)\n\n const folderSlug = (folders ? folders.slug : undefined) as CollectionSlug | undefined\n\n const openFolder = React.useCallback(\n async (id: null | number | string) => {\n if (!folderSlug) {\n return\n }\n\n setResults(null)\n\n const load = (target: null | number | string) =>\n getFolderResultsComponentAndData({\n browseByFolder: false,\n collectionsToDisplay: [folderSlug, collectionSlug],\n displayAs: 'grid',\n folderAssignedCollections: [collectionSlug],\n folderID: target ?? undefined,\n sort: 'name',\n })\n\n // A remembered folder can have been deleted or renamed since; drop back to the root\n // rather than leaving the picker stuck on an error.\n let resolvedID = id\n let result = await load(id).catch(() => null)\n if (!result && id !== null) {\n resolvedID = null\n result = await load(null).catch(() => null)\n }\n\n setFolderID(resolvedID)\n lastFolderID.set(collectionSlug, resolvedID)\n setResults({\n breadcrumbs: result?.breadcrumbs || [],\n documents: result?.documents || [],\n FolderResultsComponent: result?.FolderResultsComponent || null,\n subfolders: result?.subfolders || [],\n })\n },\n [collectionSlug, folderSlug, getFolderResultsComponentAndData],\n )\n\n React.useEffect(() => {\n void openFolder(lastFolderID.get(collectionSlug) ?? null)\n }, [openFolder, collectionSlug])\n\n /**\n * One document goes through `onSelect`; several through `onBulkSelect`, which is what the\n * upload field's own list rows use (it takes a Map of id -> isSelected). Both append rather\n * than replace on a hasMany field, so a double-click still behaves the same either way.\n */\n const selectItems = React.useCallback(\n (items: FolderOrDocument[]) => {\n if (items.length === 0) {\n return\n }\n\n if (items.length > 1 && typeof onBulkSelect === 'function') {\n onBulkSelect(new Map(items.map((item) => [item.value.id, true])))\n return\n }\n\n const item = items[0]\n if (item && typeof onSelect === 'function') {\n onSelect({\n collectionSlug: item.relationTo,\n doc: item.value,\n docID: String(item.value.id),\n })\n }\n },\n [onBulkSelect, onSelect],\n )\n\n // Folders disabled for this collection — nothing to browse, leave the list alone.\n if (!folders || !folderSlug) {\n return list\n }\n\n return (\n <div className={baseClass}>\n <div className={`${baseClass}__tabs`}>\n <div className={`${baseClass}__tab-group`}>\n <Pill onClick={() => setBrowsing(false)} pillStyle={browsing ? 'light' : 'dark'}>\n {t('general:all')}\n </Pill>\n <Pill onClick={() => setBrowsing(true)} pillStyle={browsing ? 'dark' : 'light'}>\n {t('folder:folders')}\n </Pill>\n </div>\n {/* The stock list header carries its own close button; ours stands in while it is hidden. */}\n {browsing && drawerSlug ? <CloseDrawerButton slug={drawerSlug} /> : null}\n </div>\n\n <div hidden={browsing}>{list}</div>\n\n {browsing ? (\n !results ? (\n <LoadingOverlay />\n ) : (\n <FolderProvider\n allCollectionFolderSlugs={[folderSlug, collectionSlug]}\n allowCreateCollectionSlugs={[]}\n allowMultiSelection={allowMultiSelect}\n breadcrumbs={results.breadcrumbs}\n documents={results.documents}\n folderFieldName={folders.fieldName}\n folderID={folderID ?? undefined}\n FolderResultsComponent={results.FolderResultsComponent}\n key={String(folderID)}\n onItemClick={(item) => {\n if (!item) {\n return\n }\n if (item.relationTo === folderSlug) {\n void openFolder(item.value.id)\n } else {\n selectItems([item])\n }\n }}\n subfolders={results.subfolders}\n >\n <Results folderSlug={folderSlug} onNavigate={openFolder} onSelect={selectItems} />\n </FolderProvider>\n )\n ) : null}\n </div>\n )\n}\n\n/**\n * Stands in for `@payloadcms/ui/elements/CloseModalButton`. That deep import pulls in its own\n * copy of `@faceless-ui/modal`, whose context has no provider, so `closeModal` is undefined and\n * the click throws. `useModal` from the package root reads the provider the admin renders.\n */\nfunction CloseDrawerButton({ slug }: { slug: string }) {\n const { closeModal } = useModal()\n const { t } = useTranslation()\n\n return (\n <button\n aria-label={t('general:close')}\n className={`close-modal-button ${baseClass}__close`}\n onClick={() => closeModal(slug)}\n type=\"button\"\n >\n <XIcon />\n </button>\n )\n}\n\nfunction Results({\n folderSlug,\n onNavigate,\n onSelect,\n}: {\n folderSlug: CollectionSlug\n onNavigate: (id: null | number | string) => Promise<void>\n onSelect: (items: FolderOrDocument[]) => void\n}) {\n const folder = useFolder()\n const { t } = useTranslation()\n\n const breadcrumbs = folder.breadcrumbs || []\n const documents = folder.documents || []\n const subfolders = folder.subfolders || []\n // Subfolders can be highlighted alongside documents; only documents are selectable here.\n const selectedDocs = (folder.getSelectedItems?.() || []).filter(\n (item) => item.relationTo !== folderSlug,\n )\n\n return (\n <>\n <div className={`${baseClass}__toolbar`}>\n <FolderBreadcrumbs\n breadcrumbs={\n [\n {\n id: null,\n name: (\n <span className={`${baseClass}__root-crumb`}>\n <ColoredFolderIcon />\n {t('folder:folders')}\n </span>\n ),\n onClick: () => void onNavigate(null),\n },\n ...breadcrumbs.map((crumb, index) => ({\n id: crumb.id,\n name: crumb.name,\n // The last crumb is where we already are — rendered as plain text.\n onClick:\n index !== breadcrumbs.length - 1 ? () => void onNavigate(crumb.id) : undefined,\n })),\n // `onClick` is optional at runtime: a crumb without one renders unclickable.\n ] as React.ComponentProps<typeof FolderBreadcrumbs>['breadcrumbs']\n }\n />\n <Button\n buttonStyle=\"primary\"\n disabled={selectedDocs.length === 0}\n margin={false}\n onClick={() => onSelect(selectedDocs)}\n size=\"small\"\n >\n {selectedDocs.length > 1\n ? `${t('general:select')} (${selectedDocs.length})`\n : t('general:select')}\n </Button>\n </div>\n\n {subfolders.length + documents.length > 0 ? (\n folder.FolderResultsComponent\n ) : (\n <div className={`${baseClass}__empty`}>\n <h3>{t('general:noResultsFound')}</h3>\n <p>{t('general:noResultsDescription')}</p>\n </div>\n )}\n </>\n )\n}\n"],"names":["Button","FolderProvider","LoadingOverlay","Pill","useConfig","useFolder","useListDrawerContext","useModal","useServerFunctions","useTranslation","XIcon","FolderBreadcrumbs","ColoredFolderIcon","React","baseClass","lastFolderID","Map","FolderPicker","allowMultiSelect","collectionSlug","list","config","drawerSlug","onBulkSelect","onSelect","getFolderResultsComponentAndData","t","folders","browsing","setBrowsing","useState","folderID","setFolderID","results","setResults","folderSlug","slug","undefined","openFolder","useCallback","id","load","target","browseByFolder","collectionsToDisplay","displayAs","folderAssignedCollections","sort","resolvedID","result","catch","set","breadcrumbs","documents","FolderResultsComponent","subfolders","useEffect","get","selectItems","items","length","map","item","value","relationTo","doc","docID","String","div","className","onClick","pillStyle","CloseDrawerButton","hidden","allCollectionFolderSlugs","allowCreateCollectionSlugs","allowMultiSelection","folderFieldName","fieldName","onItemClick","Results","onNavigate","closeModal","button","aria-label","type","folder","selectedDocs","getSelectedItems","filter","name","span","crumb","index","buttonStyle","disabled","margin","size","h3","p"],"mappings":"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"}
1
+ {"version":3,"sources":["../../src/components/FolderPicker.tsx"],"sourcesContent":["'use client'\n\nimport type { CollectionSlug } from 'payload'\nimport type { FolderBreadcrumb, FolderOrDocument } from 'payload/shared'\n\nimport {\n Button,\n FolderProvider,\n LoadingOverlay,\n Pill,\n useConfig,\n useFolder,\n useListDrawerContext,\n useModal,\n useServerFunctions,\n useTranslation,\n XIcon,\n} from '@payloadcms/ui'\nimport { FolderBreadcrumbs } from '@payloadcms/ui/elements/FolderView/Breadcrumbs'\nimport { ColoredFolderIcon } from '@payloadcms/ui/elements/FolderView/ColoredFolderIcon'\nimport React from 'react'\n\nimport './media-plugin.css'\n\nconst baseClass = 'media-folder-picker'\n\n/**\n * The folder each collection's picker was last browsing, so reopening the drawer lands back\n * where the editor was instead of at the root. Module scope rather than state: the picker\n * unmounts with the drawer every time.\n *\n * ponytail: in-memory, so a page reload resets it. Move to sessionStorage if that matters.\n */\nconst lastFolderID = new Map<string, null | number | string>()\n\ntype Results = {\n breadcrumbs: FolderBreadcrumb[]\n documents: FolderOrDocument[]\n FolderResultsComponent: React.ReactNode\n subfolders: FolderOrDocument[]\n}\n\n/**\n * Folder browsing for the picker drawer.\n *\n * Payload already ships every piece of this (the `get-folder-results-component-and-data`\n * server function, `FolderProvider`, the server-rendered results grid) and wires them up\n * for the Move-to-folder drawer — it just never wires them into the list drawer. This is\n * the same assembly, with `onItemClick` selecting a document instead of moving one.\n */\nexport function FolderPicker({\n allowMultiSelect = false,\n collectionSlug,\n list,\n}: {\n /** True when the field takes several media items — mirrors the list's `enableRowSelections`. */\n allowMultiSelect?: boolean\n collectionSlug: CollectionSlug\n list: React.ReactNode\n}) {\n const { config } = useConfig()\n const { drawerSlug, onBulkSelect, onSelect } = useListDrawerContext()\n const { getFolderResultsComponentAndData } = useServerFunctions()\n const { t } = useTranslation()\n\n const folders = config.folders\n const [browsing, setBrowsing] = React.useState(false)\n const [folderID, setFolderID] = React.useState<null | number | string>(null)\n const [results, setResults] = React.useState<null | Results>(null)\n\n const folderSlug = (folders ? folders.slug : undefined)\n\n const openFolder = React.useCallback(\n async (id: null | number | string) => {\n if (!folderSlug) {\n return\n }\n\n setResults(null)\n\n const load = (target: null | number | string) =>\n getFolderResultsComponentAndData({\n browseByFolder: false,\n collectionsToDisplay: [folderSlug, collectionSlug],\n displayAs: 'grid',\n folderAssignedCollections: [collectionSlug],\n folderID: target ?? undefined,\n sort: 'name',\n })\n\n // A remembered folder can have been deleted or renamed since; drop back to the root\n // rather than leaving the picker stuck on an error.\n let resolvedID = id\n let result = await load(id).catch(() => null)\n if (!result && id !== null) {\n resolvedID = null\n result = await load(null).catch(() => null)\n }\n\n setFolderID(resolvedID)\n lastFolderID.set(collectionSlug, resolvedID)\n setResults({\n breadcrumbs: result?.breadcrumbs || [],\n documents: result?.documents || [],\n FolderResultsComponent: result?.FolderResultsComponent || null,\n subfolders: result?.subfolders || [],\n })\n },\n [collectionSlug, folderSlug, getFolderResultsComponentAndData],\n )\n\n React.useEffect(() => {\n void openFolder(lastFolderID.get(collectionSlug) ?? null)\n }, [openFolder, collectionSlug])\n\n /**\n * One document goes through `onSelect`; several through `onBulkSelect`, which is what the\n * upload field's own list rows use (it takes a Map of id -> isSelected). Both append rather\n * than replace on a hasMany field, so a double-click still behaves the same either way.\n */\n const selectItems = React.useCallback(\n (items: FolderOrDocument[]) => {\n if (items.length === 0) {\n return\n }\n\n if (items.length > 1 && typeof onBulkSelect === 'function') {\n onBulkSelect(new Map(items.map((item) => [item.value.id, true])))\n return\n }\n\n const item = items[0]\n if (item && typeof onSelect === 'function') {\n onSelect({\n collectionSlug: item.relationTo,\n doc: item.value,\n docID: String(item.value.id),\n })\n }\n },\n [onBulkSelect, onSelect],\n )\n\n // Folders disabled for this collection — nothing to browse, leave the list alone.\n if (!folders || !folderSlug) {\n return list\n }\n\n return (\n <div className={baseClass}>\n <div className={`${baseClass}__tabs`}>\n <div className={`${baseClass}__tab-group`}>\n <Pill onClick={() => setBrowsing(false)} pillStyle={browsing ? 'light' : 'dark'}>\n {t('general:all')}\n </Pill>\n <Pill onClick={() => setBrowsing(true)} pillStyle={browsing ? 'dark' : 'light'}>\n {t('folder:folders')}\n </Pill>\n </div>\n {/* The stock list header carries its own close button; ours stands in while it is hidden. */}\n {browsing && drawerSlug ? <CloseDrawerButton slug={drawerSlug} /> : null}\n </div>\n\n <div hidden={browsing}>{list}</div>\n\n {browsing ? (\n !results ? (\n <LoadingOverlay />\n ) : (\n <FolderProvider\n allCollectionFolderSlugs={[folderSlug, collectionSlug]}\n allowCreateCollectionSlugs={[]}\n allowMultiSelection={allowMultiSelect}\n breadcrumbs={results.breadcrumbs}\n documents={results.documents}\n folderFieldName={folders.fieldName}\n folderID={folderID ?? undefined}\n FolderResultsComponent={results.FolderResultsComponent}\n key={String(folderID)}\n onItemClick={(item) => {\n if (!item) {\n return\n }\n if (item.relationTo === folderSlug) {\n void openFolder(item.value.id)\n } else {\n selectItems([item])\n }\n }}\n subfolders={results.subfolders}\n >\n <Results folderSlug={folderSlug} onNavigate={openFolder} onSelect={selectItems} />\n </FolderProvider>\n )\n ) : null}\n </div>\n )\n}\n\n/**\n * Stands in for `@payloadcms/ui/elements/CloseModalButton`. That deep import pulls in its own\n * copy of `@faceless-ui/modal`, whose context has no provider, so `closeModal` is undefined and\n * the click throws. `useModal` from the package root reads the provider the admin renders.\n */\nfunction CloseDrawerButton({ slug }: { slug: string }) {\n const { closeModal } = useModal()\n const { t } = useTranslation()\n\n return (\n <button\n aria-label={t('general:close')}\n className={`close-modal-button ${baseClass}__close`}\n onClick={() => closeModal(slug)}\n type=\"button\"\n >\n <XIcon />\n </button>\n )\n}\n\nfunction Results({\n folderSlug,\n onNavigate,\n onSelect,\n}: {\n folderSlug: CollectionSlug\n onNavigate: (id: null | number | string) => Promise<void>\n onSelect: (items: FolderOrDocument[]) => void\n}) {\n const folder = useFolder()\n const { t } = useTranslation()\n\n const breadcrumbs = folder.breadcrumbs || []\n const documents = folder.documents || []\n const subfolders = folder.subfolders || []\n // Subfolders can be highlighted alongside documents; only documents are selectable here.\n const selectedDocs = (folder.getSelectedItems?.() || []).filter(\n (item) => item.relationTo !== folderSlug,\n )\n\n return (\n <>\n <div className={`${baseClass}__toolbar`}>\n <FolderBreadcrumbs\n breadcrumbs={\n [\n {\n id: null,\n name: (\n <span className={`${baseClass}__root-crumb`}>\n <ColoredFolderIcon />\n {t('folder:folders')}\n </span>\n ),\n onClick: () => void onNavigate(null),\n },\n ...breadcrumbs.map((crumb, index) => ({\n id: crumb.id,\n name: crumb.name,\n // The last crumb is where we already are — rendered as plain text.\n onClick:\n index !== breadcrumbs.length - 1 ? () => void onNavigate(crumb.id) : undefined,\n })),\n // `onClick` is optional at runtime: a crumb without one renders unclickable.\n ] as React.ComponentProps<typeof FolderBreadcrumbs>['breadcrumbs']\n }\n />\n <Button\n buttonStyle=\"primary\"\n disabled={selectedDocs.length === 0}\n margin={false}\n onClick={() => onSelect(selectedDocs)}\n size=\"small\"\n >\n {selectedDocs.length > 1\n ? `${t('general:select')} (${selectedDocs.length})`\n : t('general:select')}\n </Button>\n </div>\n\n {subfolders.length + documents.length > 0 ? (\n folder.FolderResultsComponent\n ) : (\n <div className={`${baseClass}__empty`}>\n <h3>{t('general:noResultsFound')}</h3>\n <p>{t('general:noResultsDescription')}</p>\n </div>\n )}\n </>\n )\n}\n"],"names":["Button","FolderProvider","LoadingOverlay","Pill","useConfig","useFolder","useListDrawerContext","useModal","useServerFunctions","useTranslation","XIcon","FolderBreadcrumbs","ColoredFolderIcon","React","baseClass","lastFolderID","Map","FolderPicker","allowMultiSelect","collectionSlug","list","config","drawerSlug","onBulkSelect","onSelect","getFolderResultsComponentAndData","t","folders","browsing","setBrowsing","useState","folderID","setFolderID","results","setResults","folderSlug","slug","undefined","openFolder","useCallback","id","load","target","browseByFolder","collectionsToDisplay","displayAs","folderAssignedCollections","sort","resolvedID","result","catch","set","breadcrumbs","documents","FolderResultsComponent","subfolders","useEffect","get","selectItems","items","length","map","item","value","relationTo","doc","docID","String","div","className","onClick","pillStyle","CloseDrawerButton","hidden","allCollectionFolderSlugs","allowCreateCollectionSlugs","allowMultiSelection","folderFieldName","fieldName","onItemClick","Results","onNavigate","closeModal","button","aria-label","type","folder","selectedDocs","getSelectedItems","filter","name","span","crumb","index","buttonStyle","disabled","margin","size","h3","p"],"mappings":"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"}
@@ -0,0 +1 @@
1
+ import '@testing-library/jest-dom/vitest';
@@ -1,9 +1,11 @@
1
1
  import './media-plugin.css';
2
2
  /**
3
3
  * List / Grid beside Columns and Filters on an upload collection's list, on the full page and
4
- * in the picker drawer. Payload has no slot there, so it is portalled into the search bar of
4
+ * in the picker drawer. It is Payload's own toggle from the By Folder view, so both views switch
5
+ * the same way. Payload has no slot there, so it is portalled into the search bar of
5
6
  * the list this renders in (found from its own position, so a drawer open over the list page
6
- * gets its own switch). The choice is remembered per browser and set as `data-media-view` on
7
- * the list; the grid itself is CSS over the same table (media-plugin.css).
7
+ * gets its own switch). In grid view a "Per row" menu sets how many cards sit on each row. Both
8
+ * choices are remembered per browser and set on the list as `data-media-view` and
9
+ * `--media-grid-columns`; the grid itself is CSS over the same table (media-plugin.css).
8
10
  */
9
11
  export declare function MediaViews(): import("react/jsx-runtime").JSX.Element;
@@ -1,51 +1,81 @@
1
1
  'use client';
2
2
  import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
3
- import { Pill } from '@payloadcms/ui';
3
+ import { ChevronIcon, Pill, Popup, PopupList } from '@payloadcms/ui';
4
+ import { ToggleViewButtons } from '@payloadcms/ui/elements/FolderView/ToggleViewButtons';
4
5
  import { useEffect, useRef, useState } from 'react';
5
6
  import { createPortal } from 'react-dom';
6
7
  import './media-plugin.css';
7
- const VIEWS = [
8
- {
9
- id: 'list',
10
- label: 'List'
11
- },
12
- {
13
- id: 'grid',
14
- label: 'Grid'
15
- }
16
- ];
17
8
  const KEY = 'foundrykit-media-view';
9
+ const COLUMNS_KEY = 'foundrykit-media-columns';
10
+ /** Cards per row in the grid. 0 is "Auto": as many as fit at the minimum card width. */ const COLUMNS = [
11
+ 0,
12
+ 2,
13
+ 3,
14
+ 4,
15
+ 5,
16
+ 6,
17
+ 8
18
+ ];
19
+ const read = (key)=>{
20
+ try {
21
+ return localStorage.getItem(key);
22
+ } catch {
23
+ // Storage can be blocked (private window); the defaults stand.
24
+ return null;
25
+ }
26
+ };
27
+ const write = (key, value)=>{
28
+ try {
29
+ localStorage.setItem(key, value);
30
+ } catch {
31
+ // As above: the choice just isn't remembered.
32
+ }
33
+ };
18
34
  /**
19
35
  * List / Grid beside Columns and Filters on an upload collection's list, on the full page and
20
- * in the picker drawer. Payload has no slot there, so it is portalled into the search bar of
36
+ * in the picker drawer. It is Payload's own toggle from the By Folder view, so both views switch
37
+ * the same way. Payload has no slot there, so it is portalled into the search bar of
21
38
  * the list this renders in (found from its own position, so a drawer open over the list page
22
- * gets its own switch). The choice is remembered per browser and set as `data-media-view` on
23
- * the list; the grid itself is CSS over the same table (media-plugin.css).
39
+ * gets its own switch). In grid view a "Per row" menu sets how many cards sit on each row. Both
40
+ * choices are remembered per browser and set on the list as `data-media-view` and
41
+ * `--media-grid-columns`; the grid itself is CSS over the same table (media-plugin.css).
24
42
  */ export function MediaViews() {
25
43
  const anchor = useRef(null);
26
44
  const [list, setList] = useState(null);
27
45
  const [view, setView] = useState('list');
46
+ const [columns, setColumns] = useState(0);
28
47
  useEffect(()=>{
29
48
  setList(anchor.current?.closest('.collection-list') ?? null);
30
- try {
31
- if (localStorage.getItem(KEY) === 'grid') {
32
- setView('grid');
33
- }
34
- } catch {}
49
+ if (read(KEY) === 'grid') {
50
+ setView('grid');
51
+ }
52
+ const saved = Number(read(COLUMNS_KEY));
53
+ if (COLUMNS.includes(saved)) {
54
+ setColumns(saved);
55
+ }
35
56
  }, []);
36
57
  useEffect(()=>{
37
- if (list) {
38
- list.dataset.mediaView = view;
58
+ if (!list) {
59
+ return;
60
+ }
61
+ list.dataset.mediaView = view;
62
+ if (columns) {
63
+ list.style.setProperty('--media-grid-columns', String(columns));
64
+ } else {
65
+ list.style.removeProperty('--media-grid-columns');
39
66
  }
40
67
  }, [
41
68
  list,
42
- view
69
+ view,
70
+ columns
43
71
  ]);
44
72
  const choose = (v)=>{
45
73
  setView(v);
46
- try {
47
- localStorage.setItem(KEY, v);
48
- } catch {}
74
+ write(KEY, v);
75
+ };
76
+ const chooseColumns = (n)=>{
77
+ setColumns(n);
78
+ write(COLUMNS_KEY, String(n));
49
79
  };
50
80
  const target = list?.querySelector('.search-bar__actions');
51
81
  return /*#__PURE__*/ _jsxs(_Fragment, {
@@ -54,17 +84,38 @@ const KEY = 'foundrykit-media-view';
54
84
  hidden: true,
55
85
  ref: anchor
56
86
  }),
57
- target ? /*#__PURE__*/ createPortal(/*#__PURE__*/ _jsx("fieldset", {
58
- "aria-label": "View",
59
- className: "media-views",
60
- children: VIEWS.map((v)=>/*#__PURE__*/ _jsx(Pill, {
61
- "aria-pressed": view === v.id,
62
- className: view === v.id ? 'media-views__on' : undefined,
63
- onClick: ()=>choose(v.id),
64
- pillStyle: "light",
65
- size: "small",
66
- children: v.label
67
- }, v.id))
87
+ target ? /*#__PURE__*/ createPortal(/*#__PURE__*/ _jsxs(_Fragment, {
88
+ children: [
89
+ view === 'grid' ? /*#__PURE__*/ _jsx(Popup, {
90
+ button: /*#__PURE__*/ _jsxs(Pill, {
91
+ icon: /*#__PURE__*/ _jsx(ChevronIcon, {}),
92
+ pillStyle: "light",
93
+ size: "small",
94
+ children: [
95
+ "Per row: ",
96
+ columns || 'Auto'
97
+ ]
98
+ }),
99
+ buttonType: "custom",
100
+ className: "media-views__columns",
101
+ horizontalAlign: "right",
102
+ render: ({ close })=>/*#__PURE__*/ _jsx(PopupList.ButtonGroup, {
103
+ children: COLUMNS.map((n)=>/*#__PURE__*/ _jsx(PopupList.Button, {
104
+ active: n === columns,
105
+ onClick: ()=>{
106
+ chooseColumns(n);
107
+ close();
108
+ },
109
+ children: n || 'Auto'
110
+ }, n))
111
+ }),
112
+ size: "small"
113
+ }) : null,
114
+ /*#__PURE__*/ _jsx(ToggleViewButtons, {
115
+ activeView: view,
116
+ setActiveView: choose
117
+ })
118
+ ]
68
119
  }), target) : null
69
120
  ]
70
121
  });
@@ -1 +1 @@
1
- {"version":3,"sources":["../../src/components/MediaViews.tsx"],"sourcesContent":["'use client'\n\nimport { Pill } from '@payloadcms/ui'\nimport { useEffect, useRef, useState } from 'react'\nimport { createPortal } from 'react-dom'\n\nimport './media-plugin.css'\n\nconst VIEWS = [\n { id: 'list', label: 'List' },\n { id: 'grid', label: 'Grid' },\n] as const\ntype View = (typeof VIEWS)[number]['id']\nconst KEY = 'foundrykit-media-view'\n\n/**\n * List / Grid beside Columns and Filters on an upload collection's list, on the full page and\n * in the picker drawer. Payload has no slot there, so it is portalled into the search bar of\n * the list this renders in (found from its own position, so a drawer open over the list page\n * gets its own switch). The choice is remembered per browser and set as `data-media-view` on\n * the list; the grid itself is CSS over the same table (media-plugin.css).\n */\nexport function MediaViews() {\n const anchor = useRef<HTMLSpanElement>(null)\n const [list, setList] = useState<HTMLElement | null>(null)\n const [view, setView] = useState<View>('list')\n\n useEffect(() => {\n setList(anchor.current?.closest<HTMLElement>('.collection-list') ?? null)\n try {\n if (localStorage.getItem(KEY) === 'grid') {\n setView('grid')\n }\n } catch {}\n }, [])\n\n useEffect(() => {\n if (list) {\n list.dataset.mediaView = view\n }\n }, [list, view])\n\n const choose = (v: View) => {\n setView(v)\n try {\n localStorage.setItem(KEY, v)\n } catch {}\n }\n\n const target = list?.querySelector('.search-bar__actions')\n\n return (\n <>\n <span hidden ref={anchor} />\n {target\n ? createPortal(\n <fieldset aria-label=\"View\" className=\"media-views\">\n {VIEWS.map((v) => (\n <Pill\n aria-pressed={view === v.id}\n className={view === v.id ? 'media-views__on' : undefined}\n key={v.id}\n onClick={() => choose(v.id)}\n pillStyle=\"light\"\n size=\"small\"\n >\n {v.label}\n </Pill>\n ))}\n </fieldset>,\n target,\n )\n : null}\n </>\n )\n}\n"],"names":["Pill","useEffect","useRef","useState","createPortal","VIEWS","id","label","KEY","MediaViews","anchor","list","setList","view","setView","current","closest","localStorage","getItem","dataset","mediaView","choose","v","setItem","target","querySelector","span","hidden","ref","fieldset","aria-label","className","map","aria-pressed","undefined","onClick","pillStyle","size"],"mappings":"AAAA;;AAEA,SAASA,IAAI,QAAQ,iBAAgB;AACrC,SAASC,SAAS,EAAEC,MAAM,EAAEC,QAAQ,QAAQ,QAAO;AACnD,SAASC,YAAY,QAAQ,YAAW;AAExC,OAAO,qBAAoB;AAE3B,MAAMC,QAAQ;IACZ;QAAEC,IAAI;QAAQC,OAAO;IAAO;IAC5B;QAAED,IAAI;QAAQC,OAAO;IAAO;CAC7B;AAED,MAAMC,MAAM;AAEZ;;;;;;CAMC,GACD,OAAO,SAASC;IACd,MAAMC,SAASR,OAAwB;IACvC,MAAM,CAACS,MAAMC,QAAQ,GAAGT,SAA6B;IACrD,MAAM,CAACU,MAAMC,QAAQ,GAAGX,SAAe;IAEvCF,UAAU;QACRW,QAAQF,OAAOK,OAAO,EAAEC,QAAqB,uBAAuB;QACpE,IAAI;YACF,IAAIC,aAAaC,OAAO,CAACV,SAAS,QAAQ;gBACxCM,QAAQ;YACV;QACF,EAAE,OAAM,CAAC;IACX,GAAG,EAAE;IAELb,UAAU;QACR,IAAIU,MAAM;YACRA,KAAKQ,OAAO,CAACC,SAAS,GAAGP;QAC3B;IACF,GAAG;QAACF;QAAME;KAAK;IAEf,MAAMQ,SAAS,CAACC;QACdR,QAAQQ;QACR,IAAI;YACFL,aAAaM,OAAO,CAACf,KAAKc;QAC5B,EAAE,OAAM,CAAC;IACX;IAEA,MAAME,SAASb,MAAMc,cAAc;IAEnC,qBACE;;0BACE,KAACC;gBAAKC,MAAM;gBAACC,KAAKlB;;YACjBc,uBACGpB,2BACE,KAACyB;gBAASC,cAAW;gBAAOC,WAAU;0BACnC1B,MAAM2B,GAAG,CAAC,CAACV,kBACV,KAACtB;wBACCiC,gBAAcpB,SAASS,EAAEhB,EAAE;wBAC3ByB,WAAWlB,SAASS,EAAEhB,EAAE,GAAG,oBAAoB4B;wBAE/CC,SAAS,IAAMd,OAAOC,EAAEhB,EAAE;wBAC1B8B,WAAU;wBACVC,MAAK;kCAEJf,EAAEf,KAAK;uBALHe,EAAEhB,EAAE;gBASfkB,UAEF;;;AAGV"}
1
+ {"version":3,"sources":["../../src/components/MediaViews.tsx"],"sourcesContent":["'use client'\n\nimport { ChevronIcon, Pill, Popup, PopupList } from '@payloadcms/ui'\nimport { ToggleViewButtons } from '@payloadcms/ui/elements/FolderView/ToggleViewButtons'\nimport { useEffect, useRef, useState } from 'react'\nimport { createPortal } from 'react-dom'\n\nimport './media-plugin.css'\n\ntype View = 'grid' | 'list'\nconst KEY = 'foundrykit-media-view'\nconst COLUMNS_KEY = 'foundrykit-media-columns'\n/** Cards per row in the grid. 0 is \"Auto\": as many as fit at the minimum card width. */\nconst COLUMNS = [0, 2, 3, 4, 5, 6, 8]\n\nconst read = (key: string) => {\n try {\n return localStorage.getItem(key)\n } catch {\n // Storage can be blocked (private window); the defaults stand.\n return null\n }\n}\nconst write = (key: string, value: string) => {\n try {\n localStorage.setItem(key, value)\n } catch {\n // As above: the choice just isn't remembered.\n }\n}\n\n/**\n * List / Grid beside Columns and Filters on an upload collection's list, on the full page and\n * in the picker drawer. It is Payload's own toggle from the By Folder view, so both views switch\n * the same way. Payload has no slot there, so it is portalled into the search bar of\n * the list this renders in (found from its own position, so a drawer open over the list page\n * gets its own switch). In grid view a \"Per row\" menu sets how many cards sit on each row. Both\n * choices are remembered per browser and set on the list as `data-media-view` and\n * `--media-grid-columns`; the grid itself is CSS over the same table (media-plugin.css).\n */\nexport function MediaViews() {\n const anchor = useRef<HTMLSpanElement>(null)\n const [list, setList] = useState<HTMLElement | null>(null)\n const [view, setView] = useState<View>('list')\n const [columns, setColumns] = useState(0)\n\n useEffect(() => {\n setList(anchor.current?.closest<HTMLElement>('.collection-list') ?? null)\n if (read(KEY) === 'grid') {\n setView('grid')\n }\n const saved = Number(read(COLUMNS_KEY))\n if (COLUMNS.includes(saved)) {\n setColumns(saved)\n }\n }, [])\n\n useEffect(() => {\n if (!list) {\n return\n }\n list.dataset.mediaView = view\n if (columns) {\n list.style.setProperty('--media-grid-columns', String(columns))\n } else {\n list.style.removeProperty('--media-grid-columns')\n }\n }, [list, view, columns])\n\n const choose = (v: View) => {\n setView(v)\n write(KEY, v)\n }\n\n const chooseColumns = (n: number) => {\n setColumns(n)\n write(COLUMNS_KEY, String(n))\n }\n\n const target = list?.querySelector('.search-bar__actions')\n\n return (\n <>\n <span hidden ref={anchor} />\n {target\n ? createPortal(\n <>\n {view === 'grid' ? (\n <Popup\n button={\n <Pill icon={<ChevronIcon />} pillStyle=\"light\" size=\"small\">\n Per row: {columns || 'Auto'}\n </Pill>\n }\n buttonType=\"custom\"\n className=\"media-views__columns\"\n horizontalAlign=\"right\"\n render={({ close }) => (\n <PopupList.ButtonGroup>\n {COLUMNS.map((n) => (\n <PopupList.Button\n active={n === columns}\n key={n}\n onClick={() => {\n chooseColumns(n)\n close()\n }}\n >\n {n || 'Auto'}\n </PopupList.Button>\n ))}\n </PopupList.ButtonGroup>\n )}\n size=\"small\"\n />\n ) : null}\n <ToggleViewButtons activeView={view} setActiveView={choose} />\n </>,\n target,\n )\n : null}\n </>\n )\n}\n"],"names":["ChevronIcon","Pill","Popup","PopupList","ToggleViewButtons","useEffect","useRef","useState","createPortal","KEY","COLUMNS_KEY","COLUMNS","read","key","localStorage","getItem","write","value","setItem","MediaViews","anchor","list","setList","view","setView","columns","setColumns","current","closest","saved","Number","includes","dataset","mediaView","style","setProperty","String","removeProperty","choose","v","chooseColumns","n","target","querySelector","span","hidden","ref","button","icon","pillStyle","size","buttonType","className","horizontalAlign","render","close","ButtonGroup","map","Button","active","onClick","activeView","setActiveView"],"mappings":"AAAA;;AAEA,SAASA,WAAW,EAAEC,IAAI,EAAEC,KAAK,EAAEC,SAAS,QAAQ,iBAAgB;AACpE,SAASC,iBAAiB,QAAQ,uDAAsD;AACxF,SAASC,SAAS,EAAEC,MAAM,EAAEC,QAAQ,QAAQ,QAAO;AACnD,SAASC,YAAY,QAAQ,YAAW;AAExC,OAAO,qBAAoB;AAG3B,MAAMC,MAAM;AACZ,MAAMC,cAAc;AACpB,sFAAsF,GACtF,MAAMC,UAAU;IAAC;IAAG;IAAG;IAAG;IAAG;IAAG;IAAG;CAAE;AAErC,MAAMC,OAAO,CAACC;IACZ,IAAI;QACF,OAAOC,aAAaC,OAAO,CAACF;IAC9B,EAAE,OAAM;QACN,+DAA+D;QAC/D,OAAO;IACT;AACF;AACA,MAAMG,QAAQ,CAACH,KAAaI;IAC1B,IAAI;QACFH,aAAaI,OAAO,CAACL,KAAKI;IAC5B,EAAE,OAAM;IACN,8CAA8C;IAChD;AACF;AAEA;;;;;;;;CAQC,GACD,OAAO,SAASE;IACd,MAAMC,SAASd,OAAwB;IACvC,MAAM,CAACe,MAAMC,QAAQ,GAAGf,SAA6B;IACrD,MAAM,CAACgB,MAAMC,QAAQ,GAAGjB,SAAe;IACvC,MAAM,CAACkB,SAASC,WAAW,GAAGnB,SAAS;IAEvCF,UAAU;QACRiB,QAAQF,OAAOO,OAAO,EAAEC,QAAqB,uBAAuB;QACpE,IAAIhB,KAAKH,SAAS,QAAQ;YACxBe,QAAQ;QACV;QACA,MAAMK,QAAQC,OAAOlB,KAAKF;QAC1B,IAAIC,QAAQoB,QAAQ,CAACF,QAAQ;YAC3BH,WAAWG;QACb;IACF,GAAG,EAAE;IAELxB,UAAU;QACR,IAAI,CAACgB,MAAM;YACT;QACF;QACAA,KAAKW,OAAO,CAACC,SAAS,GAAGV;QACzB,IAAIE,SAAS;YACXJ,KAAKa,KAAK,CAACC,WAAW,CAAC,wBAAwBC,OAAOX;QACxD,OAAO;YACLJ,KAAKa,KAAK,CAACG,cAAc,CAAC;QAC5B;IACF,GAAG;QAAChB;QAAME;QAAME;KAAQ;IAExB,MAAMa,SAAS,CAACC;QACdf,QAAQe;QACRvB,MAAMP,KAAK8B;IACb;IAEA,MAAMC,gBAAgB,CAACC;QACrBf,WAAWe;QACXzB,MAAMN,aAAa0B,OAAOK;IAC5B;IAEA,MAAMC,SAASrB,MAAMsB,cAAc;IAEnC,qBACE;;0BACE,KAACC;gBAAKC,MAAM;gBAACC,KAAK1B;;YACjBsB,uBACGlC,2BACE;;oBACGe,SAAS,uBACR,KAACrB;wBACC6C,sBACE,MAAC9C;4BAAK+C,oBAAM,KAAChD;4BAAgBiD,WAAU;4BAAQC,MAAK;;gCAAQ;gCAChDzB,WAAW;;;wBAGzB0B,YAAW;wBACXC,WAAU;wBACVC,iBAAgB;wBAChBC,QAAQ,CAAC,EAAEC,KAAK,EAAE,iBAChB,KAACpD,UAAUqD,WAAW;0CACnB7C,QAAQ8C,GAAG,CAAC,CAAChB,kBACZ,KAACtC,UAAUuD,MAAM;wCACfC,QAAQlB,MAAMhB;wCAEdmC,SAAS;4CACPpB,cAAcC;4CACdc;wCACF;kDAECd,KAAK;uCANDA;;wBAWbS,MAAK;yBAEL;kCACJ,KAAC9C;wBAAkByD,YAAYtC;wBAAMuC,eAAexB;;;gBAEtDI,UAEF;;;AAGV"}
@@ -40,25 +40,7 @@
40
40
  padding-inline: var(--gutter-h);
41
41
  }
42
42
 
43
- /* List / Grid switch (MediaViews.tsx); the grid is drawn over the same table */
44
- .media-views {
45
- display: flex;
46
- gap: 0.125rem;
47
- margin: 0;
48
- padding: 0;
49
- border: 0;
50
- }
51
- .media-views .pill:first-child {
52
- border-radius: 999rem 0.25rem 0.25rem 999rem;
53
- }
54
- .media-views .pill:last-child {
55
- border-radius: 0.25rem 999rem 999rem 0.25rem;
56
- }
57
- .media-views .media-views__on {
58
- background: var(--theme-elevation-150);
59
- font-weight: 600;
60
- }
61
-
43
+ /* Grid view (MediaViews.tsx), drawn over the same table */
62
44
  .collection-list[data-media-view='grid'] .table table,
63
45
  .collection-list[data-media-view='grid'] .table tbody {
64
46
  display: block;
@@ -72,6 +54,10 @@
72
54
  grid-template-columns: repeat(auto-fill, minmax(9.5rem, 1fr));
73
55
  gap: 1rem;
74
56
  }
57
+ /* A fixed number per row, chosen from "Per row" (set on the list as a custom property). */
58
+ .collection-list[data-media-view='grid'][style*='--media-grid-columns'] .table tbody {
59
+ grid-template-columns: repeat(var(--media-grid-columns), minmax(0, 1fr));
60
+ }
75
61
  .collection-list[data-media-view='grid'] .table tr {
76
62
  position: relative;
77
63
  display: block;
@@ -0,0 +1 @@
1
+ export {};
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@foundrykit/media-plugin",
3
- "version": "0.1.0",
3
+ "version": "0.2.0",
4
4
  "description": "Media library for Payload CMS 3: a List / Grid switch on upload lists and a Folders tab in the image picker",
5
5
  "license": "MIT",
6
6
  "repository": {
@@ -30,20 +30,31 @@
30
30
  "build:swc": "swc ./src -d ./dist --config-file .swcrc --strip-leading-paths --ignore \"**/*.test.ts,**/*.test.tsx,**/*.d.ts\"",
31
31
  "build:types": "tsc --outDir dist --rootDir ./src",
32
32
  "clean": "rimraf {dist,*.tsbuildinfo}",
33
- "copyfiles": "copyfiles -u 1 \"src/**/*.{css,scss,svg,png,json}\" dist/",
33
+ "copyfiles": "copyfiles -u 1 \"src/**/*.{html,css,scss,ttf,woff,woff2,eot,svg,jpg,png,json}\" dist/",
34
+ "dev": "next dev dev --turbo",
35
+ "dev:generate-importmap": "pnpm dev:payload generate:importmap",
36
+ "dev:generate-types": "pnpm dev:payload generate:types",
37
+ "dev:payload": "cross-env PAYLOAD_CONFIG_PATH=./dev/payload.config.ts payload",
38
+ "generate:importmap": "pnpm dev:generate-importmap",
39
+ "generate:types": "pnpm dev:generate-types",
34
40
  "lint": "eslint",
35
41
  "lint:fix": "eslint ./src --fix",
36
42
  "prepublishOnly": "pnpm build && node scripts/verify-pack.mjs",
37
43
  "verify:pack": "node scripts/verify-pack.mjs",
38
44
  "release": "release-it",
39
45
  "release:dry": "release-it --dry-run",
40
- "test": "pnpm test:unit",
41
- "test:unit": "vitest run src"
46
+ "test": "pnpm test:unit && pnpm test:int && pnpm test:e2e",
47
+ "test:unit": "vitest run src",
48
+ "test:e2e": "playwright test",
49
+ "test:int": "vitest run dev/int.spec.ts"
42
50
  },
43
51
  "devDependencies": {
44
52
  "@eslint/eslintrc": "^3.2.0",
53
+ "@payloadcms/db-mongodb": "3.84.1",
45
54
  "@payloadcms/eslint-config": "3.28.0",
55
+ "@payloadcms/next": "3.84.1",
46
56
  "@payloadcms/ui": "3.84.1",
57
+ "@playwright/test": "1.58.2",
47
58
  "@release-it/conventional-changelog": "^11.0.0",
48
59
  "@swc-node/register": "1.10.9",
49
60
  "@swc/cli": "0.6.0",
@@ -55,19 +66,26 @@
55
66
  "copyfiles": "2.4.1",
56
67
  "cross-env": "^7.0.3",
57
68
  "eslint": "^9.23.0",
69
+ "eslint-config-next": "16.2.6",
70
+ "graphql": "^16.8.1",
58
71
  "jsdom": "^26.1.0",
72
+ "mongodb-memory-server": "10.1.4",
73
+ "next": "16.2.6",
59
74
  "payload": "3.84.1",
60
75
  "prettier": "^3.4.2",
61
76
  "react": "19.2.6",
62
77
  "react-dom": "19.2.6",
63
78
  "release-it": "^20.0.1",
64
79
  "rimraf": "3.0.2",
80
+ "sharp": "0.34.2",
65
81
  "typescript": "5.7.3",
66
82
  "vite-tsconfig-paths": "6.0.5",
67
83
  "vitest": "4.0.18"
68
84
  },
69
85
  "peerDependencies": {
86
+ "@payloadcms/next": "^3.84.1",
70
87
  "@payloadcms/ui": "^3.84.1",
88
+ "next": ">=15",
71
89
  "payload": "^3.84.1",
72
90
  "react": "^19",
73
91
  "react-dom": "^19"
@@ -79,5 +97,12 @@
79
97
  "publishConfig": {
80
98
  "access": "public"
81
99
  },
82
- "registry": "https://registry.npmjs.org/"
100
+ "registry": "https://registry.npmjs.org/",
101
+ "pnpm": {
102
+ "onlyBuiltDependencies": [
103
+ "sharp",
104
+ "esbuild",
105
+ "unrs-resolver"
106
+ ]
107
+ }
83
108
  }