@foundrykit/history-plugin 0.2.1 → 0.2.2

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.
@@ -22,6 +22,8 @@ export type Entry = {
22
22
  id: ID;
23
23
  kind: Kind;
24
24
  latest: boolean;
25
+ /** This save moved the document to the trash, or brought it back. */
26
+ trash: 'restored' | 'trashed' | null;
25
27
  updatedAt: string;
26
28
  };
27
29
  /** Labels for the top-level fields that differ between two version snapshots. */
package/dist/timeline.js CHANGED
@@ -3,6 +3,8 @@ export const AUTHOR_FIELD = 'updatedBy';
3
3
  '_status',
4
4
  AUTHOR_FIELD,
5
5
  'createdAt',
6
+ // Trashing and restoring are told apart below (`trash`), not listed as a changed field.
7
+ 'deletedAt',
6
8
  'id',
7
9
  'updatedAt'
8
10
  ]);
@@ -51,6 +53,11 @@ const plural = (n, word)=>`${n} ${word}${n === 1 ? '' : 's'}`;
51
53
  label
52
54
  ];
53
55
  });
56
+ const trashMove = (previous, newest)=>{
57
+ const was = Boolean(previous?.version.deletedAt);
58
+ const is = Boolean(newest.version.deletedAt);
59
+ return is && !was ? 'trashed' : was && !is ? 'restored' : null;
60
+ };
54
61
  /**
55
62
  * Turns versions (newest first) into timeline entries. `older` is the version just before the
56
63
  * last one on this page, used to work out what that one changed.
@@ -84,6 +91,7 @@ const plural = (n, word)=>`${n} ${word}${n === 1 ? '' : 's'}`;
84
91
  first: !previous,
85
92
  kind: kindOf(newest, drafts),
86
93
  latest: Boolean(newest.latest),
94
+ trash: trashMove(previous, newest),
87
95
  updatedAt: newest.updatedAt
88
96
  };
89
97
  });
@@ -1 +1 @@
1
- {"version":3,"sources":["../src/timeline.ts"],"sourcesContent":["import type { FlattenedField } from 'payload';\n\nexport const AUTHOR_FIELD = 'updatedBy';\n\n/** Bookkeeping fields every version has; they never count as a change. */\nconst IGNORED = new Set([\n '_status',\n AUTHOR_FIELD,\n 'createdAt',\n 'id',\n 'updatedAt',\n]);\n\ntype ID = number | string;\n\nexport type RawVersion = {\n autosave?: boolean;\n id: ID;\n latest?: boolean;\n updatedAt: string;\n version: Record<string, unknown>;\n};\n\nexport type Kind = 'autosave' | 'draft' | 'published' | 'saved';\n\nexport type Entry = {\n author: ID | null;\n /** One label per changed field, e.g. \"Title\" or \"Layout (+2 blocks)\". */\n changes: string[];\n /** How many versions were merged into this entry (consecutive autosaves). */\n count: number;\n /** The first version saved when the document was created. */\n created: boolean;\n /** The oldest version there is, which has no earlier one to compare with. */\n first: boolean;\n id: ID;\n kind: Kind;\n latest: boolean;\n updatedAt: string;\n};\n\nconst kindOf = (v: RawVersion, drafts: boolean): Kind => {\n if (v.autosave) {\n return 'autosave';\n }\n if (!drafts) {\n return 'saved';\n }\n return v.version._status === 'published' ? 'published' : 'draft';\n};\n\n/**\n * Whether the first version is the document's creation. A document that existed before versions\n * were turned on gets its first version on a later save, which isn't its creation.\n */\nconst isCreation = (v: RawVersion) => {\n const createdAt = v.version.createdAt;\n return (\n typeof createdAt !== 'string' ||\n Date.parse(v.updatedAt) - Date.parse(createdAt) < 60_000\n );\n};\n\nconst plural = (n: number, word: string) => `${n} ${word}${n === 1 ? '' : 's'}`;\n\n/** Labels for the top-level fields that differ between two version snapshots. */\nexport const changedFields = (\n fields: FlattenedField[],\n before: Record<string, unknown>,\n after: Record<string, unknown>\n): string[] =>\n fields.flatMap(field => {\n if (IGNORED.has(field.name)) {\n return [];\n }\n const a = before[field.name];\n const b = after[field.name];\n if (JSON.stringify(a ?? null) === JSON.stringify(b ?? null)) {\n return [];\n }\n const label = typeof field.label === 'string' ? field.label : field.name;\n if (\n (field.type === 'blocks' || field.type === 'array') &&\n Array.isArray(b)\n ) {\n const diff = b.length - (Array.isArray(a) ? a.length : 0);\n const unit = field.type === 'blocks' ? 'block' : 'row';\n if (diff > 0) {\n return [`${label} (+${plural(diff, unit)})`];\n }\n if (diff < 0) {\n return [`${label} (−${plural(-diff, unit)})`];\n }\n }\n return [label];\n });\n\n/**\n * Turns versions (newest first) into timeline entries. `older` is the version just before the\n * last one on this page, used to work out what that one changed.\n */\nexport const buildTimeline = ({\n drafts,\n fields,\n older,\n versions,\n}: {\n drafts: boolean;\n fields: FlattenedField[];\n older?: RawVersion;\n versions: RawVersion[];\n}): Entry[] => {\n const authorOf = (v: RawVersion) =>\n (v.version[AUTHOR_FIELD] as ID | null | undefined) ?? null;\n\n // A run of autosaves by one person reads as one edit, so group them first.\n const groups: RawVersion[][] = [];\n for (const v of versions) {\n const group = groups.at(-1);\n const head = group?.[0];\n if (\n group &&\n head?.autosave &&\n v.autosave &&\n String(authorOf(head)) === String(authorOf(v))\n ) {\n group.push(v);\n } else {\n groups.push([v]);\n }\n }\n\n let seen = 0;\n return groups.map(group => {\n seen += group.length;\n const newest = group[0];\n // What the whole group changed: compare the newest with the version before the oldest.\n const previous = versions[seen] ?? older;\n return {\n id: newest.id,\n author: authorOf(newest),\n changes: previous\n ? changedFields(fields, previous.version, newest.version)\n : [],\n count: group.length,\n created: !previous && isCreation(newest),\n first: !previous,\n kind: kindOf(newest, drafts),\n latest: Boolean(newest.latest),\n updatedAt: newest.updatedAt,\n };\n });\n};\n"],"names":["AUTHOR_FIELD","IGNORED","Set","kindOf","v","drafts","autosave","version","_status","isCreation","createdAt","Date","parse","updatedAt","plural","n","word","changedFields","fields","before","after","flatMap","field","has","name","a","b","JSON","stringify","label","type","Array","isArray","diff","length","unit","buildTimeline","older","versions","authorOf","groups","group","at","head","String","push","seen","map","newest","previous","id","author","changes","count","created","first","kind","latest","Boolean"],"mappings":"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"}
1
+ {"version":3,"sources":["../src/timeline.ts"],"sourcesContent":["import type { FlattenedField } from 'payload';\n\nexport const AUTHOR_FIELD = 'updatedBy';\n\n/** Bookkeeping fields every version has; they never count as a change. */\nconst IGNORED = new Set([\n '_status',\n AUTHOR_FIELD,\n 'createdAt',\n // Trashing and restoring are told apart below (`trash`), not listed as a changed field.\n 'deletedAt',\n 'id',\n 'updatedAt',\n]);\n\ntype ID = number | string;\n\nexport type RawVersion = {\n autosave?: boolean;\n id: ID;\n latest?: boolean;\n updatedAt: string;\n version: Record<string, unknown>;\n};\n\nexport type Kind = 'autosave' | 'draft' | 'published' | 'saved';\n\nexport type Entry = {\n author: ID | null;\n /** One label per changed field, e.g. \"Title\" or \"Layout (+2 blocks)\". */\n changes: string[];\n /** How many versions were merged into this entry (consecutive autosaves). */\n count: number;\n /** The first version saved when the document was created. */\n created: boolean;\n /** The oldest version there is, which has no earlier one to compare with. */\n first: boolean;\n id: ID;\n kind: Kind;\n latest: boolean;\n /** This save moved the document to the trash, or brought it back. */\n trash: 'restored' | 'trashed' | null;\n updatedAt: string;\n};\n\nconst kindOf = (v: RawVersion, drafts: boolean): Kind => {\n if (v.autosave) {\n return 'autosave';\n }\n if (!drafts) {\n return 'saved';\n }\n return v.version._status === 'published' ? 'published' : 'draft';\n};\n\n/**\n * Whether the first version is the document's creation. A document that existed before versions\n * were turned on gets its first version on a later save, which isn't its creation.\n */\nconst isCreation = (v: RawVersion) => {\n const createdAt = v.version.createdAt;\n return (\n typeof createdAt !== 'string' ||\n Date.parse(v.updatedAt) - Date.parse(createdAt) < 60_000\n );\n};\n\nconst plural = (n: number, word: string) => `${n} ${word}${n === 1 ? '' : 's'}`;\n\n/** Labels for the top-level fields that differ between two version snapshots. */\nexport const changedFields = (\n fields: FlattenedField[],\n before: Record<string, unknown>,\n after: Record<string, unknown>\n): string[] =>\n fields.flatMap(field => {\n if (IGNORED.has(field.name)) {\n return [];\n }\n const a = before[field.name];\n const b = after[field.name];\n if (JSON.stringify(a ?? null) === JSON.stringify(b ?? null)) {\n return [];\n }\n const label = typeof field.label === 'string' ? field.label : field.name;\n if (\n (field.type === 'blocks' || field.type === 'array') &&\n Array.isArray(b)\n ) {\n const diff = b.length - (Array.isArray(a) ? a.length : 0);\n const unit = field.type === 'blocks' ? 'block' : 'row';\n if (diff > 0) {\n return [`${label} (+${plural(diff, unit)})`];\n }\n if (diff < 0) {\n return [`${label} (−${plural(-diff, unit)})`];\n }\n }\n return [label];\n });\n\nconst trashMove = (previous: RawVersion | undefined, newest: RawVersion) => {\n const was = Boolean(previous?.version.deletedAt);\n const is = Boolean(newest.version.deletedAt);\n return is && !was ? 'trashed' : was && !is ? 'restored' : null;\n};\n\n/**\n * Turns versions (newest first) into timeline entries. `older` is the version just before the\n * last one on this page, used to work out what that one changed.\n */\nexport const buildTimeline = ({\n drafts,\n fields,\n older,\n versions,\n}: {\n drafts: boolean;\n fields: FlattenedField[];\n older?: RawVersion;\n versions: RawVersion[];\n}): Entry[] => {\n const authorOf = (v: RawVersion) =>\n (v.version[AUTHOR_FIELD] as ID | null | undefined) ?? null;\n\n // A run of autosaves by one person reads as one edit, so group them first.\n const groups: RawVersion[][] = [];\n for (const v of versions) {\n const group = groups.at(-1);\n const head = group?.[0];\n if (\n group &&\n head?.autosave &&\n v.autosave &&\n String(authorOf(head)) === String(authorOf(v))\n ) {\n group.push(v);\n } else {\n groups.push([v]);\n }\n }\n\n let seen = 0;\n return groups.map(group => {\n seen += group.length;\n const newest = group[0];\n // What the whole group changed: compare the newest with the version before the oldest.\n const previous = versions[seen] ?? older;\n return {\n id: newest.id,\n author: authorOf(newest),\n changes: previous\n ? changedFields(fields, previous.version, newest.version)\n : [],\n count: group.length,\n created: !previous && isCreation(newest),\n first: !previous,\n kind: kindOf(newest, drafts),\n latest: Boolean(newest.latest),\n trash: trashMove(previous, newest),\n updatedAt: newest.updatedAt,\n };\n });\n};\n"],"names":["AUTHOR_FIELD","IGNORED","Set","kindOf","v","drafts","autosave","version","_status","isCreation","createdAt","Date","parse","updatedAt","plural","n","word","changedFields","fields","before","after","flatMap","field","has","name","a","b","JSON","stringify","label","type","Array","isArray","diff","length","unit","trashMove","previous","newest","was","Boolean","deletedAt","is","buildTimeline","older","versions","authorOf","groups","group","at","head","String","push","seen","map","id","author","changes","count","created","first","kind","latest","trash"],"mappings":"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"}
@@ -50,6 +50,20 @@ const timeAgo = (iso, locale)=>{
50
50
  }
51
51
  return format.format(0, 'minute');
52
52
  };
53
+ const dayAndTime = (iso, locale)=>{
54
+ const date = new Date(iso);
55
+ return {
56
+ day: date.toLocaleDateString(locale, {
57
+ day: 'numeric',
58
+ month: 'short',
59
+ year: 'numeric'
60
+ }),
61
+ time: date.toLocaleTimeString(locale, {
62
+ hour: '2-digit',
63
+ minute: '2-digit'
64
+ })
65
+ };
66
+ };
53
67
  const describe = (entry)=>{
54
68
  if (entry.created) {
55
69
  return 'Created';
@@ -85,6 +99,8 @@ const describe = (entry)=>{
85
99
  const result = collectionConfig ? await payload.findVersions({
86
100
  ...query,
87
101
  collection: collectionConfig.slug,
102
+ // Include the versions saved while it was in the trash, so moving it there and back shows.
103
+ trash: true,
88
104
  where: {
89
105
  parent: {
90
106
  equals: docID
@@ -155,35 +171,71 @@ const describe = (entry)=>{
155
171
  className: "history__list",
156
172
  children: entries.map((entry)=>{
157
173
  const name = nameOf(entry.author);
174
+ const { day, time } = dayAndTime(entry.updatedAt, req.i18n.language);
175
+ const kind = entry.trash === 'trashed' ? 'Moved to trash' : entry.trash === 'restored' ? 'Restored from trash' : entry.count > 1 ? `${entry.count} autosaves` : KIND_LABELS[entry.kind];
158
176
  return /*#__PURE__*/ _jsxs("li", {
159
- className: "history__entry",
177
+ className: [
178
+ 'history__entry',
179
+ entry.latest && 'history__entry--latest'
180
+ ].filter(Boolean).join(' '),
160
181
  children: [
182
+ /*#__PURE__*/ _jsx("div", {
183
+ className: "history__when",
184
+ children: /*#__PURE__*/ _jsxs("time", {
185
+ dateTime: entry.updatedAt,
186
+ title: new Date(entry.updatedAt).toLocaleString(req.i18n.language, {
187
+ dateStyle: 'full',
188
+ timeStyle: 'short'
189
+ }),
190
+ children: [
191
+ /*#__PURE__*/ _jsx("span", {
192
+ className: "history__day",
193
+ children: day
194
+ }),
195
+ /*#__PURE__*/ _jsx("span", {
196
+ className: "history__time",
197
+ children: time
198
+ }),
199
+ /*#__PURE__*/ _jsx("span", {
200
+ className: "history__ago",
201
+ children: timeAgo(entry.updatedAt, req.i18n.language)
202
+ })
203
+ ]
204
+ })
205
+ }),
161
206
  /*#__PURE__*/ _jsx("span", {
162
207
  "aria-hidden": true,
163
- className: "history__avatar",
164
- children: initials(name)
208
+ className: "history__dot"
165
209
  }),
166
210
  /*#__PURE__*/ _jsxs("div", {
167
211
  className: "history__body",
168
212
  children: [
169
213
  /*#__PURE__*/ _jsxs("div", {
170
- className: "history__meta",
214
+ className: "history__title",
171
215
  children: [
172
- /*#__PURE__*/ _jsx("strong", {
173
- children: name
216
+ /*#__PURE__*/ _jsx("span", {
217
+ "aria-hidden": true,
218
+ className: "history__avatar",
219
+ children: initials(name)
174
220
  }),
175
- /*#__PURE__*/ _jsx("time", {
176
- dateTime: entry.updatedAt,
177
- title: entry.updatedAt,
178
- children: timeAgo(entry.updatedAt, req.i18n.language)
179
- }),
180
- /*#__PURE__*/ _jsx(Pill, {
181
- size: "small",
182
- children: entry.count > 1 ? `${entry.count} autosaves` : KIND_LABELS[entry.kind]
221
+ /*#__PURE__*/ _jsxs("span", {
222
+ className: "history__who",
223
+ children: [
224
+ kind,
225
+ " by ",
226
+ /*#__PURE__*/ _jsx("strong", {
227
+ children: name
228
+ })
229
+ ]
183
230
  }),
184
231
  entry.latest && /*#__PURE__*/ _jsx(Pill, {
185
232
  size: "small",
186
233
  children: "Latest"
234
+ }),
235
+ /*#__PURE__*/ _jsx("a", {
236
+ className: "history__compare",
237
+ href: url(`${base}/${entry.id}`),
238
+ children: "View changes →"
187
239
  })
188
240
  ]
189
241
  }),
@@ -192,11 +244,6 @@ const describe = (entry)=>{
192
244
  children: describe(entry)
193
245
  })
194
246
  ]
195
- }),
196
- /*#__PURE__*/ _jsx("a", {
197
- className: "history__compare",
198
- href: url(`${base}/${entry.id}`),
199
- children: "View"
200
247
  })
201
248
  ]
202
249
  }, entry.id);
@@ -1 +1 @@
1
- {"version":3,"sources":["../../src/views/TimelineView.tsx"],"sourcesContent":["import { Gutter, Pill, SetDocumentStepNav } from '@payloadcms/ui';\nimport { notFound } from 'next/navigation.js';\nimport type { CollectionSlug, DocumentViewServerProps } from 'payload';\nimport { formatAdminURL } from 'payload/shared';\n\nimport type { Entry, Kind, RawVersion } from '../timeline.js';\n\nimport { buildTimeline } from '../timeline.js';\nimport './index.scss';\n\nconst PER_PAGE = 25;\n\nconst KIND_LABELS: Record<Kind, string> = {\n autosave: 'Autosave',\n draft: 'Draft',\n published: 'Published',\n saved: 'Saved',\n};\n\nconst initials = (label: string) =>\n label\n .split(/[\\s@.]+/)\n .filter(Boolean)\n .slice(0, 2)\n .map(part => part[0].toUpperCase())\n .join('');\n\nconst UNITS: [Intl.RelativeTimeFormatUnit, number][] = [\n ['year', 365 * 24 * 3600],\n ['month', 30 * 24 * 3600],\n ['week', 7 * 24 * 3600],\n ['day', 24 * 3600],\n ['hour', 3600],\n ['minute', 60],\n];\n\nconst timeAgo = (iso: string, locale: string) => {\n const seconds = (Date.parse(iso) - Date.now()) / 1000;\n const format = new Intl.RelativeTimeFormat(locale, { numeric: 'auto' });\n for (const [unit, size] of UNITS) {\n if (Math.abs(seconds) >= size) {\n return format.format(Math.round(seconds / size), unit);\n }\n }\n return format.format(0, 'minute');\n};\n\nconst describe = (entry: Entry) => {\n if (entry.created) {\n return 'Created';\n }\n if (entry.first) {\n return 'First recorded version';\n }\n if (!entry.changes.length) {\n return 'No content changes';\n }\n return `Changed ${entry.changes.join(', ')}`;\n};\n\n/** Replaces Payload's versions table with a timeline: who, when, what kind of save, what changed. */\nexport const TimelineView = async ({\n initPageResult,\n searchParams,\n}: DocumentViewServerProps) => {\n const { collectionConfig, docID, globalConfig, req } = initPageResult;\n const { payload, user } = req;\n const entity = collectionConfig ?? globalConfig;\n if (!entity) {\n return notFound();\n }\n const page = Math.max(1, Number(searchParams?.page) || 1);\n\n // One extra version, so the last entry on the page can be compared with the one before it.\n // ponytail: offset paging by over-fetching; fine for hundreds of versions, switch to a\n // cursor on updatedAt if documents get thousands.\n const skip = (page - 1) * PER_PAGE;\n const query = {\n depth: 0,\n limit: skip + PER_PAGE + 1,\n overrideAccess: false,\n req,\n sort: '-updatedAt',\n user,\n } as const;\n const result = collectionConfig\n ? await payload.findVersions({\n ...query,\n collection: collectionConfig.slug,\n where: { parent: { equals: docID } },\n })\n : await payload.findGlobalVersions({ ...query, slug: globalConfig!.slug });\n const docs = (result.docs as unknown as RawVersion[]).slice(skip);\n const versions = docs.slice(0, PER_PAGE);\n const hasMore = docs.length > PER_PAGE;\n\n const entries = buildTimeline({\n drafts: Boolean(entity.versions?.drafts),\n fields: entity.flattenedFields,\n older: docs[PER_PAGE],\n versions,\n });\n\n // eslint-disable-next-line @typescript-eslint/no-unnecessary-type-assertion -- a union once a site generates types\n const usersSlug = payload.config.admin.user as CollectionSlug;\n const titleField =\n payload.collections[usersSlug]?.config.admin.useAsTitle ?? 'email';\n const authorIDs = [\n ...new Set(entries.map(e => e.author).filter(id => id !== null)),\n ];\n const authors = authorIDs.length\n ? (\n await payload.find({\n collection: usersSlug,\n depth: 0,\n limit: authorIDs.length,\n overrideAccess: true,\n pagination: false,\n req,\n where: { id: { in: authorIDs } },\n })\n ).docs\n : [];\n const nameOf = (id: Entry['author']) => {\n const author = authors.find(a => String(a.id) === String(id)) as\n | Record<string, unknown>\n | undefined;\n if (!author) {\n return id === null ? 'Unknown' : 'Deleted user';\n }\n return String(author[titleField] || author.email || author.id);\n };\n\n const base: `/${string}` = collectionConfig\n ? `/collections/${collectionConfig.slug}/${docID}/versions`\n : `/globals/${globalConfig!.slug}/versions`;\n const url = (path: `/${string}`) =>\n formatAdminURL({ adminRoute: payload.config.routes.admin, path });\n const label = collectionConfig\n ? typeof collectionConfig.labels.plural === 'string'\n ? collectionConfig.labels.plural\n : collectionConfig.slug\n : typeof globalConfig!.label === 'string'\n ? globalConfig!.label\n : globalConfig!.slug;\n\n return (\n <>\n <SetDocumentStepNav\n collectionSlug={collectionConfig?.slug}\n globalSlug={globalConfig?.slug}\n id={docID}\n pluralLabel={label}\n useAsTitle={collectionConfig?.admin.useAsTitle ?? globalConfig?.slug}\n view='Versions'\n />\n <main className='history'>\n <Gutter>\n {entries.length === 0 ? (\n <p>No versions yet.</p>\n ) : (\n <ol className='history__list'>\n {entries.map(entry => {\n const name = nameOf(entry.author);\n return (\n <li className='history__entry' key={entry.id}>\n <span aria-hidden className='history__avatar'>\n {initials(name)}\n </span>\n <div className='history__body'>\n <div className='history__meta'>\n <strong>{name}</strong>\n <time\n dateTime={entry.updatedAt}\n title={entry.updatedAt}\n >\n {timeAgo(entry.updatedAt, req.i18n.language)}\n </time>\n <Pill size='small'>\n {entry.count > 1\n ? `${entry.count} autosaves`\n : KIND_LABELS[entry.kind]}\n </Pill>\n {entry.latest && <Pill size='small'>Latest</Pill>}\n </div>\n <div className='history__changes'>{describe(entry)}</div>\n </div>\n {/* A plain link: Payload's client-side Link didn't navigate from this view. */}\n <a\n className='history__compare'\n href={url(`${base}/${entry.id}`)}\n >\n View\n </a>\n </li>\n );\n })}\n </ol>\n )}\n {(page > 1 || hasMore) && (\n <nav className='history__pages'>\n {page > 1 && <a href={`?page=${page - 1}`}>Newer</a>}\n {hasMore && <a href={`?page=${page + 1}`}>Older</a>}\n </nav>\n )}\n </Gutter>\n </main>\n </>\n );\n};\n"],"names":["Gutter","Pill","SetDocumentStepNav","notFound","formatAdminURL","buildTimeline","PER_PAGE","KIND_LABELS","autosave","draft","published","saved","initials","label","split","filter","Boolean","slice","map","part","toUpperCase","join","UNITS","timeAgo","iso","locale","seconds","Date","parse","now","format","Intl","RelativeTimeFormat","numeric","unit","size","Math","abs","round","describe","entry","created","first","changes","length","TimelineView","initPageResult","searchParams","collectionConfig","docID","globalConfig","req","payload","user","entity","page","max","Number","skip","query","depth","limit","overrideAccess","sort","result","findVersions","collection","slug","where","parent","equals","findGlobalVersions","docs","versions","hasMore","entries","drafts","fields","flattenedFields","older","usersSlug","config","admin","titleField","collections","useAsTitle","authorIDs","Set","e","author","id","authors","find","pagination","in","nameOf","a","String","email","base","url","path","adminRoute","routes","labels","plural","collectionSlug","globalSlug","pluralLabel","view","main","className","p","ol","name","li","span","aria-hidden","div","strong","time","dateTime","updatedAt","title","i18n","language","count","kind","latest","href","nav"],"mappings":";AAAA,SAASA,MAAM,EAAEC,IAAI,EAAEC,kBAAkB,QAAQ,iBAAiB;AAClE,SAASC,QAAQ,QAAQ,qBAAqB;AAE9C,SAASC,cAAc,QAAQ,iBAAiB;AAIhD,SAASC,aAAa,QAAQ,iBAAiB;AAC/C,OAAO,eAAe;AAEtB,MAAMC,WAAW;AAEjB,MAAMC,cAAoC;IACxCC,UAAU;IACVC,OAAO;IACPC,WAAW;IACXC,OAAO;AACT;AAEA,MAAMC,WAAW,CAACC,QAChBA,MACGC,KAAK,CAAC,WACNC,MAAM,CAACC,SACPC,KAAK,CAAC,GAAG,GACTC,GAAG,CAACC,CAAAA,OAAQA,IAAI,CAAC,EAAE,CAACC,WAAW,IAC/BC,IAAI,CAAC;AAEV,MAAMC,QAAiD;IACrD;QAAC;QAAQ,MAAM,KAAK;KAAK;IACzB;QAAC;QAAS,KAAK,KAAK;KAAK;IACzB;QAAC;QAAQ,IAAI,KAAK;KAAK;IACvB;QAAC;QAAO,KAAK;KAAK;IAClB;QAAC;QAAQ;KAAK;IACd;QAAC;QAAU;KAAG;CACf;AAED,MAAMC,UAAU,CAACC,KAAaC;IAC5B,MAAMC,UAAU,AAACC,CAAAA,KAAKC,KAAK,CAACJ,OAAOG,KAAKE,GAAG,EAAC,IAAK;IACjD,MAAMC,SAAS,IAAIC,KAAKC,kBAAkB,CAACP,QAAQ;QAAEQ,SAAS;IAAO;IACrE,KAAK,MAAM,CAACC,MAAMC,KAAK,IAAIb,MAAO;QAChC,IAAIc,KAAKC,GAAG,CAACX,YAAYS,MAAM;YAC7B,OAAOL,OAAOA,MAAM,CAACM,KAAKE,KAAK,CAACZ,UAAUS,OAAOD;QACnD;IACF;IACA,OAAOJ,OAAOA,MAAM,CAAC,GAAG;AAC1B;AAEA,MAAMS,WAAW,CAACC;IAChB,IAAIA,MAAMC,OAAO,EAAE;QACjB,OAAO;IACT;IACA,IAAID,MAAME,KAAK,EAAE;QACf,OAAO;IACT;IACA,IAAI,CAACF,MAAMG,OAAO,CAACC,MAAM,EAAE;QACzB,OAAO;IACT;IACA,OAAO,CAAC,QAAQ,EAAEJ,MAAMG,OAAO,CAACtB,IAAI,CAAC,OAAO;AAC9C;AAEA,mGAAmG,GACnG,OAAO,MAAMwB,eAAe,OAAO,EACjCC,cAAc,EACdC,YAAY,EACY;IACxB,MAAM,EAAEC,gBAAgB,EAAEC,KAAK,EAAEC,YAAY,EAAEC,GAAG,EAAE,GAAGL;IACvD,MAAM,EAAEM,OAAO,EAAEC,IAAI,EAAE,GAAGF;IAC1B,MAAMG,SAASN,oBAAoBE;IACnC,IAAI,CAACI,QAAQ;QACX,OAAOnD;IACT;IACA,MAAMoD,OAAOnB,KAAKoB,GAAG,CAAC,GAAGC,OAAOV,cAAcQ,SAAS;IAEvD,2FAA2F;IAC3F,uFAAuF;IACvF,kDAAkD;IAClD,MAAMG,OAAO,AAACH,CAAAA,OAAO,CAAA,IAAKjD;IAC1B,MAAMqD,QAAQ;QACZC,OAAO;QACPC,OAAOH,OAAOpD,WAAW;QACzBwD,gBAAgB;QAChBX;QACAY,MAAM;QACNV;IACF;IACA,MAAMW,SAAShB,mBACX,MAAMI,QAAQa,YAAY,CAAC;QACzB,GAAGN,KAAK;QACRO,YAAYlB,iBAAiBmB,IAAI;QACjCC,OAAO;YAAEC,QAAQ;gBAAEC,QAAQrB;YAAM;QAAE;IACrC,KACA,MAAMG,QAAQmB,kBAAkB,CAAC;QAAE,GAAGZ,KAAK;QAAEQ,MAAMjB,aAAciB,IAAI;IAAC;IAC1E,MAAMK,OAAO,AAACR,OAAOQ,IAAI,CAA6BvD,KAAK,CAACyC;IAC5D,MAAMe,WAAWD,KAAKvD,KAAK,CAAC,GAAGX;IAC/B,MAAMoE,UAAUF,KAAK5B,MAAM,GAAGtC;IAE9B,MAAMqE,UAAUtE,cAAc;QAC5BuE,QAAQ5D,QAAQsC,OAAOmB,QAAQ,EAAEG;QACjCC,QAAQvB,OAAOwB,eAAe;QAC9BC,OAAOP,IAAI,CAAClE,SAAS;QACrBmE;IACF;IAEA,mHAAmH;IACnH,MAAMO,YAAY5B,QAAQ6B,MAAM,CAACC,KAAK,CAAC7B,IAAI;IAC3C,MAAM8B,aACJ/B,QAAQgC,WAAW,CAACJ,UAAU,EAAEC,OAAOC,MAAMG,cAAc;IAC7D,MAAMC,YAAY;WACb,IAAIC,IAAIZ,QAAQzD,GAAG,CAACsE,CAAAA,IAAKA,EAAEC,MAAM,EAAE1E,MAAM,CAAC2E,CAAAA,KAAMA,OAAO;KAC3D;IACD,MAAMC,UAAUL,UAAU1C,MAAM,GAC5B,AACE,CAAA,MAAMQ,QAAQwC,IAAI,CAAC;QACjB1B,YAAYc;QACZpB,OAAO;QACPC,OAAOyB,UAAU1C,MAAM;QACvBkB,gBAAgB;QAChB+B,YAAY;QACZ1C;QACAiB,OAAO;YAAEsB,IAAI;gBAAEI,IAAIR;YAAU;QAAE;IACjC,EAAC,EACDd,IAAI,GACN,EAAE;IACN,MAAMuB,SAAS,CAACL;QACd,MAAMD,SAASE,QAAQC,IAAI,CAACI,CAAAA,IAAKC,OAAOD,EAAEN,EAAE,MAAMO,OAAOP;QAGzD,IAAI,CAACD,QAAQ;YACX,OAAOC,OAAO,OAAO,YAAY;QACnC;QACA,OAAOO,OAAOR,MAAM,CAACN,WAAW,IAAIM,OAAOS,KAAK,IAAIT,OAAOC,EAAE;IAC/D;IAEA,MAAMS,OAAqBnD,mBACvB,CAAC,aAAa,EAAEA,iBAAiBmB,IAAI,CAAC,CAAC,EAAElB,MAAM,SAAS,CAAC,GACzD,CAAC,SAAS,EAAEC,aAAciB,IAAI,CAAC,SAAS,CAAC;IAC7C,MAAMiC,MAAM,CAACC,OACXjG,eAAe;YAAEkG,YAAYlD,QAAQ6B,MAAM,CAACsB,MAAM,CAACrB,KAAK;YAAEmB;QAAK;IACjE,MAAMxF,QAAQmC,mBACV,OAAOA,iBAAiBwD,MAAM,CAACC,MAAM,KAAK,WACxCzD,iBAAiBwD,MAAM,CAACC,MAAM,GAC9BzD,iBAAiBmB,IAAI,GACvB,OAAOjB,aAAcrC,KAAK,KAAK,WAC7BqC,aAAcrC,KAAK,GACnBqC,aAAciB,IAAI;IAExB,qBACE;;0BACE,KAACjE;gBACCwG,gBAAgB1D,kBAAkBmB;gBAClCwC,YAAYzD,cAAciB;gBAC1BuB,IAAIzC;gBACJ2D,aAAa/F;gBACbwE,YAAYrC,kBAAkBkC,MAAMG,cAAcnC,cAAciB;gBAChE0C,MAAK;;0BAEP,KAACC;gBAAKC,WAAU;0BACd,cAAA,MAAC/G;;wBACE2E,QAAQ/B,MAAM,KAAK,kBAClB,KAACoE;sCAAE;2CAEH,KAACC;4BAAGF,WAAU;sCACXpC,QAAQzD,GAAG,CAACsB,CAAAA;gCACX,MAAM0E,OAAOnB,OAAOvD,MAAMiD,MAAM;gCAChC,qBACE,MAAC0B;oCAAGJ,WAAU;;sDACZ,KAACK;4CAAKC,aAAW;4CAACN,WAAU;sDACzBnG,SAASsG;;sDAEZ,MAACI;4CAAIP,WAAU;;8DACb,MAACO;oDAAIP,WAAU;;sEACb,KAACQ;sEAAQL;;sEACT,KAACM;4DACCC,UAAUjF,MAAMkF,SAAS;4DACzBC,OAAOnF,MAAMkF,SAAS;sEAErBnG,QAAQiB,MAAMkF,SAAS,EAAEvE,IAAIyE,IAAI,CAACC,QAAQ;;sEAE7C,KAAC5H;4DAAKkC,MAAK;sEACRK,MAAMsF,KAAK,GAAG,IACX,GAAGtF,MAAMsF,KAAK,CAAC,UAAU,CAAC,GAC1BvH,WAAW,CAACiC,MAAMuF,IAAI,CAAC;;wDAE5BvF,MAAMwF,MAAM,kBAAI,KAAC/H;4DAAKkC,MAAK;sEAAQ;;;;8DAEtC,KAACmF;oDAAIP,WAAU;8DAAoBxE,SAASC;;;;sDAG9C,KAACwD;4CACCe,WAAU;4CACVkB,MAAM7B,IAAI,GAAGD,KAAK,CAAC,EAAE3D,MAAMkD,EAAE,EAAE;sDAChC;;;mCA1BiClD,MAAMkD,EAAE;4BA+BhD;;wBAGFnC,CAAAA,OAAO,KAAKmB,OAAM,mBAClB,MAACwD;4BAAInB,WAAU;;gCACZxD,OAAO,mBAAK,KAACyC;oCAAEiC,MAAM,CAAC,MAAM,EAAE1E,OAAO,GAAG;8CAAE;;gCAC1CmB,yBAAW,KAACsB;oCAAEiC,MAAM,CAAC,MAAM,EAAE1E,OAAO,GAAG;8CAAE;;;;;;;;;AAOxD,EAAE"}
1
+ {"version":3,"sources":["../../src/views/TimelineView.tsx"],"sourcesContent":["import { Gutter, Pill, SetDocumentStepNav } from '@payloadcms/ui';\nimport { notFound } from 'next/navigation.js';\nimport type { CollectionSlug, DocumentViewServerProps } from 'payload';\nimport { formatAdminURL } from 'payload/shared';\n\nimport type { Entry, Kind, RawVersion } from '../timeline.js';\n\nimport { buildTimeline } from '../timeline.js';\nimport './index.scss';\n\nconst PER_PAGE = 25;\n\nconst KIND_LABELS: Record<Kind, string> = {\n autosave: 'Autosave',\n draft: 'Draft',\n published: 'Published',\n saved: 'Saved',\n};\n\nconst initials = (label: string) =>\n label\n .split(/[\\s@.]+/)\n .filter(Boolean)\n .slice(0, 2)\n .map(part => part[0].toUpperCase())\n .join('');\n\nconst UNITS: [Intl.RelativeTimeFormatUnit, number][] = [\n ['year', 365 * 24 * 3600],\n ['month', 30 * 24 * 3600],\n ['week', 7 * 24 * 3600],\n ['day', 24 * 3600],\n ['hour', 3600],\n ['minute', 60],\n];\n\nconst timeAgo = (iso: string, locale: string) => {\n const seconds = (Date.parse(iso) - Date.now()) / 1000;\n const format = new Intl.RelativeTimeFormat(locale, { numeric: 'auto' });\n for (const [unit, size] of UNITS) {\n if (Math.abs(seconds) >= size) {\n return format.format(Math.round(seconds / size), unit);\n }\n }\n return format.format(0, 'minute');\n};\n\nconst dayAndTime = (iso: string, locale: string) => {\n const date = new Date(iso);\n return {\n day: date.toLocaleDateString(locale, {\n day: 'numeric',\n month: 'short',\n year: 'numeric',\n }),\n time: date.toLocaleTimeString(locale, {\n hour: '2-digit',\n minute: '2-digit',\n }),\n };\n};\n\nconst describe = (entry: Entry) => {\n if (entry.created) {\n return 'Created';\n }\n if (entry.first) {\n return 'First recorded version';\n }\n if (!entry.changes.length) {\n return 'No content changes';\n }\n return `Changed ${entry.changes.join(', ')}`;\n};\n\n/** Replaces Payload's versions table with a timeline: who, when, what kind of save, what changed. */\nexport const TimelineView = async ({\n initPageResult,\n searchParams,\n}: DocumentViewServerProps) => {\n const { collectionConfig, docID, globalConfig, req } = initPageResult;\n const { payload, user } = req;\n const entity = collectionConfig ?? globalConfig;\n if (!entity) {\n return notFound();\n }\n const page = Math.max(1, Number(searchParams?.page) || 1);\n\n // One extra version, so the last entry on the page can be compared with the one before it.\n // ponytail: offset paging by over-fetching; fine for hundreds of versions, switch to a\n // cursor on updatedAt if documents get thousands.\n const skip = (page - 1) * PER_PAGE;\n const query = {\n depth: 0,\n limit: skip + PER_PAGE + 1,\n overrideAccess: false,\n req,\n sort: '-updatedAt',\n user,\n } as const;\n const result = collectionConfig\n ? await payload.findVersions({\n ...query,\n collection: collectionConfig.slug,\n // Include the versions saved while it was in the trash, so moving it there and back shows.\n trash: true,\n where: { parent: { equals: docID } },\n })\n : await payload.findGlobalVersions({ ...query, slug: globalConfig!.slug });\n const docs = (result.docs as unknown as RawVersion[]).slice(skip);\n const versions = docs.slice(0, PER_PAGE);\n const hasMore = docs.length > PER_PAGE;\n\n const entries = buildTimeline({\n drafts: Boolean(entity.versions?.drafts),\n fields: entity.flattenedFields,\n older: docs[PER_PAGE],\n versions,\n });\n\n // eslint-disable-next-line @typescript-eslint/no-unnecessary-type-assertion -- a union once a site generates types\n const usersSlug = payload.config.admin.user as CollectionSlug;\n const titleField =\n payload.collections[usersSlug]?.config.admin.useAsTitle ?? 'email';\n const authorIDs = [\n ...new Set(entries.map(e => e.author).filter(id => id !== null)),\n ];\n const authors = authorIDs.length\n ? (\n await payload.find({\n collection: usersSlug,\n depth: 0,\n limit: authorIDs.length,\n overrideAccess: true,\n pagination: false,\n req,\n where: { id: { in: authorIDs } },\n })\n ).docs\n : [];\n const nameOf = (id: Entry['author']) => {\n const author = authors.find(a => String(a.id) === String(id)) as\n | Record<string, unknown>\n | undefined;\n if (!author) {\n return id === null ? 'Unknown' : 'Deleted user';\n }\n return String(author[titleField] || author.email || author.id);\n };\n\n const base: `/${string}` = collectionConfig\n ? `/collections/${collectionConfig.slug}/${docID}/versions`\n : `/globals/${globalConfig!.slug}/versions`;\n const url = (path: `/${string}`) =>\n formatAdminURL({ adminRoute: payload.config.routes.admin, path });\n const label = collectionConfig\n ? typeof collectionConfig.labels.plural === 'string'\n ? collectionConfig.labels.plural\n : collectionConfig.slug\n : typeof globalConfig!.label === 'string'\n ? globalConfig!.label\n : globalConfig!.slug;\n\n return (\n <>\n <SetDocumentStepNav\n collectionSlug={collectionConfig?.slug}\n globalSlug={globalConfig?.slug}\n id={docID}\n pluralLabel={label}\n useAsTitle={collectionConfig?.admin.useAsTitle ?? globalConfig?.slug}\n view='Versions'\n />\n <main className='history'>\n <Gutter>\n {entries.length === 0 ? (\n <p>No versions yet.</p>\n ) : (\n <ol className='history__list'>\n {entries.map(entry => {\n const name = nameOf(entry.author);\n const { day, time } = dayAndTime(\n entry.updatedAt,\n req.i18n.language\n );\n const kind =\n entry.trash === 'trashed'\n ? 'Moved to trash'\n : entry.trash === 'restored'\n ? 'Restored from trash'\n : entry.count > 1\n ? `${entry.count} autosaves`\n : KIND_LABELS[entry.kind];\n return (\n <li\n className={[\n 'history__entry',\n entry.latest && 'history__entry--latest',\n ]\n .filter(Boolean)\n .join(' ')}\n key={entry.id}\n >\n <div className='history__when'>\n <time\n dateTime={entry.updatedAt}\n title={new Date(entry.updatedAt).toLocaleString(\n req.i18n.language,\n { dateStyle: 'full', timeStyle: 'short' }\n )}\n >\n <span className='history__day'>{day}</span>\n <span className='history__time'>{time}</span>\n <span className='history__ago'>\n {timeAgo(entry.updatedAt, req.i18n.language)}\n </span>\n </time>\n </div>\n <span aria-hidden className='history__dot' />\n <div className='history__body'>\n <div className='history__title'>\n <span aria-hidden className='history__avatar'>\n {initials(name)}\n </span>\n <span className='history__who'>\n {kind} by <strong>{name}</strong>\n </span>\n {entry.latest && <Pill size='small'>Latest</Pill>}\n {/* A plain link: Payload's client-side Link didn't navigate from this view. */}\n <a\n className='history__compare'\n href={url(`${base}/${entry.id}`)}\n >\n View changes →\n </a>\n </div>\n <div className='history__changes'>{describe(entry)}</div>\n </div>\n </li>\n );\n })}\n </ol>\n )}\n {(page > 1 || hasMore) && (\n <nav className='history__pages'>\n {page > 1 && <a href={`?page=${page - 1}`}>Newer</a>}\n {hasMore && <a href={`?page=${page + 1}`}>Older</a>}\n </nav>\n )}\n </Gutter>\n </main>\n </>\n );\n};\n"],"names":["Gutter","Pill","SetDocumentStepNav","notFound","formatAdminURL","buildTimeline","PER_PAGE","KIND_LABELS","autosave","draft","published","saved","initials","label","split","filter","Boolean","slice","map","part","toUpperCase","join","UNITS","timeAgo","iso","locale","seconds","Date","parse","now","format","Intl","RelativeTimeFormat","numeric","unit","size","Math","abs","round","dayAndTime","date","day","toLocaleDateString","month","year","time","toLocaleTimeString","hour","minute","describe","entry","created","first","changes","length","TimelineView","initPageResult","searchParams","collectionConfig","docID","globalConfig","req","payload","user","entity","page","max","Number","skip","query","depth","limit","overrideAccess","sort","result","findVersions","collection","slug","trash","where","parent","equals","findGlobalVersions","docs","versions","hasMore","entries","drafts","fields","flattenedFields","older","usersSlug","config","admin","titleField","collections","useAsTitle","authorIDs","Set","e","author","id","authors","find","pagination","in","nameOf","a","String","email","base","url","path","adminRoute","routes","labels","plural","collectionSlug","globalSlug","pluralLabel","view","main","className","p","ol","name","updatedAt","i18n","language","kind","count","li","latest","div","dateTime","title","toLocaleString","dateStyle","timeStyle","span","aria-hidden","strong","href","nav"],"mappings":"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"}
@@ -4,56 +4,125 @@
4
4
  padding-bottom: calc(var(--base) * 4);
5
5
  }
6
6
 
7
+ // A vertical timeline: when on the left, a line with a dot per save, what happened on the right.
7
8
  .history__list {
8
9
  list-style: none;
9
- margin: 0;
10
+ margin: calc(var(--base) * 0.5) 0 0;
10
11
  padding: 0;
11
12
  }
12
13
 
13
14
  .history__entry {
14
- align-items: center;
15
- border-bottom: 1px solid var(--theme-elevation-100);
16
- display: flex;
17
- gap: var(--base);
18
- padding: calc(var(--base) * 0.75) 0;
15
+ column-gap: calc(var(--base) * 1.25);
16
+ display: grid;
17
+ grid-template-columns: 9rem 0.75rem minmax(0, 1fr);
18
+ padding-bottom: var(--base);
19
+ position: relative;
20
+
21
+ // The line, from this dot down to the next one.
22
+ &::before {
23
+ background: var(--theme-elevation-150);
24
+ bottom: 0;
25
+ content: "";
26
+ left: calc(9rem + var(--base) * 1.25 + 0.375rem - 1px);
27
+ position: absolute;
28
+ top: 1.25rem;
29
+ width: 2px;
30
+ }
31
+
32
+ &:last-child::before {
33
+ display: none;
34
+ }
19
35
  }
20
36
 
21
- .history__avatar {
22
- align-items: center;
23
- background: var(--theme-elevation-150);
37
+ .history__when {
38
+ padding-top: 0.75rem;
39
+ text-align: right;
40
+
41
+ time {
42
+ display: flex;
43
+ flex-direction: column;
44
+ gap: 0.125rem;
45
+ }
46
+ }
47
+
48
+ .history__day {
49
+ font-weight: 600;
50
+ }
51
+
52
+ .history__time,
53
+ .history__ago {
54
+ color: var(--theme-elevation-500);
55
+ font-size: 0.85em;
56
+ }
57
+
58
+ .history__dot {
59
+ background: var(--theme-bg);
60
+ border: 2px solid var(--theme-elevation-400);
24
61
  border-radius: 50%;
25
- display: inline-flex;
26
- flex-shrink: 0;
27
- font-size: 0.75em;
28
- height: 32px;
29
- justify-content: center;
30
- width: 32px;
62
+ height: 0.75rem;
63
+ margin-top: 1rem;
64
+ position: relative;
65
+ width: 0.75rem;
66
+ z-index: 1;
67
+
68
+ .history__entry--latest & {
69
+ background: var(--theme-success-500);
70
+ border-color: var(--theme-success-500);
71
+ }
31
72
  }
32
73
 
33
74
  .history__body {
34
- flex: 1;
75
+ background: var(--theme-elevation-50);
76
+ border: 1px solid var(--theme-elevation-100);
77
+ border-radius: var(--style-radius-m);
78
+ display: flex;
79
+ flex-direction: column;
80
+ gap: calc(var(--base) * 0.25);
35
81
  min-width: 0;
82
+ padding: calc(var(--base) * 0.75) var(--base);
83
+
84
+ .history__entry--latest & {
85
+ border-color: var(--theme-success-250);
86
+ }
36
87
  }
37
88
 
38
- .history__meta {
39
- align-items: center;
89
+ .history__title {
90
+ align-items: flex-start;
40
91
  display: flex;
41
- flex-wrap: wrap;
92
+ font-size: 1.1em;
42
93
  gap: calc(var(--base) * 0.5);
94
+ }
43
95
 
44
- time {
45
- color: var(--theme-elevation-500);
46
- }
96
+ // Long names (often an email) wrap beside the avatar instead of pushing it onto its own line.
97
+ .history__who {
98
+ min-width: 0;
99
+ overflow-wrap: anywhere;
100
+ padding-top: 0.0625rem;
101
+ }
102
+
103
+ .history__avatar {
104
+ align-items: center;
105
+ background: var(--theme-elevation-150);
106
+ border-radius: 50%;
107
+ display: inline-flex;
108
+ flex-shrink: 0;
109
+ font-size: 0.65em;
110
+ margin-top: 0.125rem;
111
+ height: 1.5rem;
112
+ justify-content: center;
113
+ width: 1.5rem;
47
114
  }
48
115
 
49
116
  .history__changes {
50
117
  color: var(--theme-elevation-600);
51
- margin-top: calc(var(--base) * 0.25);
52
118
  overflow-wrap: anywhere;
53
119
  }
54
120
 
55
121
  .history__compare {
56
122
  flex-shrink: 0;
123
+ font-size: 0.9em;
124
+ margin-left: auto;
125
+ white-space: nowrap;
57
126
  }
58
127
 
59
128
  .history__pages {
@@ -66,3 +135,29 @@
66
135
  color: var(--theme-elevation-600);
67
136
  white-space: nowrap;
68
137
  }
138
+
139
+ @media (max-width: 40rem) {
140
+ .history__entry {
141
+ grid-template-columns: 0.75rem minmax(0, 1fr);
142
+
143
+ &::before {
144
+ left: calc(0.375rem - 1px);
145
+ }
146
+ }
147
+
148
+ .history__when {
149
+ grid-column: 2;
150
+ grid-row: 2;
151
+ text-align: left;
152
+
153
+ time {
154
+ flex-direction: row;
155
+ gap: 0.5rem;
156
+ }
157
+ }
158
+
159
+ .history__dot {
160
+ grid-column: 1;
161
+ grid-row: 1;
162
+ }
163
+ }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@foundrykit/history-plugin",
3
- "version": "0.2.1",
3
+ "version": "0.2.2",
4
4
  "description": "Version history for Payload CMS 3: who made each version, a timeline of changes and a clearer compare view",
5
5
  "license": "MIT",
6
6
  "repository": {