chore(release): v3.0.0-beta.109 [skip ci]

fix(db-mongodb): docs duplicated in list view with drafts (#8435 )
fixes #8430
2024-09-26 14:00:43 -04:00 · 2024-09-26 13:57:07 -04:00 · 2024-09-26 14:37:25 -03:00 · 2024-09-26 11:22:36 -06:00 · 2024-09-26 08:37:23 -06:00 · 2024-09-26 11:09:29 -03:00
52 changed files with 136 additions and 71 deletions
--- a/docs/admin/overview.mdx
+++ b/docs/admin/overview.mdx
@@ -98,6 +98,7 @@ The following options are available:
 | **`livePreview`** | Enable real-time editing for instant visual feedback of your front-end application. [More details](../live-preview/overview).                                         |
 | **`meta`**        | Base metadata to use for the Admin Panel. [More details](./metadata). |
 | **`routes`**      | Replace built-in Admin Panel routes with your own custom routes. [More details](#customizing-routes).                                                                 |
+| **`theme`**       | Restrict the Admin Panel theme to use only one of your choice. Default is `all`.
 | **`user`**        | The `slug` of the Collection that you want to allow to login to the Admin Panel. [More details](#the-admin-user-collection).                                          |

 <Banner type="success">
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "payload-monorepo",
-  "version": "3.0.0-beta.108",
+  "version": "3.0.0-beta.109",
  "private": true,
  "type": "module",
  "scripts": {
--- a/packages/create-payload-app/package.json
+++ b/packages/create-payload-app/package.json
@@ -1,6 +1,6 @@
 {
  "name": "create-payload-app",
-  "version": "3.0.0-beta.108",
+  "version": "3.0.0-beta.109",
  "homepage": "https://payloadcms.com",
  "repository": {
    "type": "git",
--- a/packages/db-mongodb/package.json
+++ b/packages/db-mongodb/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@payloadcms/db-mongodb",
-  "version": "3.0.0-beta.108",
+  "version": "3.0.0-beta.109",
  "description": "The officially supported MongoDB database adapter for Payload",
  "homepage": "https://payloadcms.com",
  "repository": {
--- a/packages/db-mongodb/src/createVersion.ts
+++ b/packages/db-mongodb/src/createVersion.ts
@@ -1,3 +1,5 @@
+import ObjectIdImport from 'bson-objectid'
+import { isValidObjectId } from 'mongoose'
 import {
  buildVersionCollectionFields,
  type CreateVersion,
@@ -10,6 +12,8 @@ import type { MongooseAdapter } from './index.js'
 import { sanitizeRelationshipIDs } from './utilities/sanitizeRelationshipIDs.js'
 import { withSession } from './withSession.js'

+const ObjectId = (ObjectIdImport.default ||
+  ObjectIdImport) as unknown as typeof ObjectIdImport.default
 export const createVersion: CreateVersion = async function createVersion(
  this: MongooseAdapter,
  {
@@ -47,6 +51,23 @@ export const createVersion: CreateVersion = async function createVersion(

  const [doc] = await VersionModel.create([data], options, req)

+  const parentQuery = {
+    $or: [
+      {
+        parent: {
+          $eq: data.parent,
+        },
+      },
+    ],
+  }
+  if (typeof data.parent === 'string' && isValidObjectId(data.parent)) {
+    parentQuery.$or.push({
+      parent: {
+        $eq: ObjectId(data.parent),
+      },
+    })
+  }
+
  await VersionModel.updateMany(
    {
      $and: [
@@ -55,11 +76,7 @@ export const createVersion: CreateVersion = async function createVersion(
            $ne: doc._id,
          },
        },
-        {
-          parent: {
-            $eq: data.parent,
-          },
-        },
+        parentQuery,
        {
          latest: {
            $eq: true,
--- a/packages/db-postgres/package.json
+++ b/packages/db-postgres/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@payloadcms/db-postgres",
-  "version": "3.0.0-beta.108",
+  "version": "3.0.0-beta.109",
  "description": "The officially supported Postgres database adapter for Payload",
  "homepage": "https://payloadcms.com",
  "repository": {
--- a/packages/db-sqlite/package.json
+++ b/packages/db-sqlite/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@payloadcms/db-sqlite",
-  "version": "3.0.0-beta.108",
+  "version": "3.0.0-beta.109",
  "description": "The officially supported SQLite database adapter for Payload",
  "homepage": "https://payloadcms.com",
  "repository": {
--- a/packages/db-vercel-postgres/package.json
+++ b/packages/db-vercel-postgres/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@payloadcms/db-vercel-postgres",
-  "version": "3.0.0-beta.108",
+  "version": "3.0.0-beta.109",
  "description": "Vercel Postgres adapter for Payload",
  "homepage": "https://payloadcms.com",
  "repository": {
--- a/packages/drizzle/package.json
+++ b/packages/drizzle/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@payloadcms/drizzle",
-  "version": "3.0.0-beta.108",
+  "version": "3.0.0-beta.109",
  "description": "A library of shared functions used by different payload database adapters",
  "homepage": "https://payloadcms.com",
  "repository": {
--- a/packages/email-nodemailer/package.json
+++ b/packages/email-nodemailer/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@payloadcms/email-nodemailer",
-  "version": "3.0.0-beta.108",
+  "version": "3.0.0-beta.109",
  "description": "Payload Nodemailer Email Adapter",
  "homepage": "https://payloadcms.com",
  "repository": {
--- a/packages/email-resend/package.json
+++ b/packages/email-resend/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@payloadcms/email-resend",
-  "version": "3.0.0-beta.108",
+  "version": "3.0.0-beta.109",
  "description": "Payload Resend Email Adapter",
  "homepage": "https://payloadcms.com",
  "repository": {
--- a/packages/graphql/package.json
+++ b/packages/graphql/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@payloadcms/graphql",
-  "version": "3.0.0-beta.108",
+  "version": "3.0.0-beta.109",
  "homepage": "https://payloadcms.com",
  "repository": {
    "type": "git",
--- a/packages/live-preview-react/package.json
+++ b/packages/live-preview-react/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@payloadcms/live-preview-react",
-  "version": "3.0.0-beta.108",
+  "version": "3.0.0-beta.109",
  "description": "The official React SDK for Payload Live Preview",
  "homepage": "https://payloadcms.com",
  "repository": {
--- a/packages/live-preview-vue/package.json
+++ b/packages/live-preview-vue/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@payloadcms/live-preview-vue",
-  "version": "3.0.0-beta.108",
+  "version": "3.0.0-beta.109",
  "description": "The official Vue SDK for Payload Live Preview",
  "homepage": "https://payloadcms.com",
  "repository": {
--- a/packages/live-preview/package.json
+++ b/packages/live-preview/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@payloadcms/live-preview",
-  "version": "3.0.0-beta.108",
+  "version": "3.0.0-beta.109",
  "description": "The official live preview JavaScript SDK for Payload",
  "homepage": "https://payloadcms.com",
  "repository": {
--- a/packages/next/package.json
+++ b/packages/next/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@payloadcms/next",
-  "version": "3.0.0-beta.108",
+  "version": "3.0.0-beta.109",
  "homepage": "https://payloadcms.com",
  "repository": {
    "type": "git",
--- a/packages/next/src/utilities/getRequestTheme.ts
+++ b/packages/next/src/utilities/getRequestTheme.ts
@@ -12,6 +12,10 @@ type GetRequestLanguageArgs = {
 const acceptedThemes: Theme[] = ['dark', 'light']

 export const getRequestTheme = ({ config, cookies, headers }: GetRequestLanguageArgs): Theme => {
+  if (config.admin.theme !== 'all' && acceptedThemes.includes(config.admin.theme)) {
+    return config.admin.theme
+  }
+
  const themeCookie = cookies.get(`${config.cookiePrefix || 'payload'}-theme`)

  const themeFromCookie: Theme = (
--- a/packages/next/src/views/Account/Settings/index.tsx
+++ b/packages/next/src/views/Account/Settings/index.tsx
@@ -1,5 +1,5 @@
 import type { I18n } from '@payloadcms/translations'
-import type { LanguageOptions } from 'payload'
+import type { Config, LanguageOptions } from 'payload'

 import { FieldLabel } from '@payloadcms/ui'
 import React from 'react'
@@ -14,8 +14,9 @@ export const Settings: React.FC<{
  readonly className?: string
  readonly i18n: I18n
  readonly languageOptions: LanguageOptions
+  readonly theme: Config['admin']['theme']
 }> = (props) => {
-  const { className, i18n, languageOptions } = props
+  const { className, i18n, languageOptions, theme } = props

  return (
    <div className={[baseClass, className].filter(Boolean).join(' ')}>
@@ -24,7 +25,7 @@ export const Settings: React.FC<{
        <FieldLabel field={null} htmlFor="language-select" label={i18n.t('general:language')} />
        <LanguageSelector languageOptions={languageOptions} />
      </div>
-      <ToggleTheme />
+      {theme === 'all' && <ToggleTheme />}
    </div>
  )
 }
--- a/packages/next/src/views/Account/index.tsx
+++ b/packages/next/src/views/Account/index.tsx
@@ -38,7 +38,11 @@ export const Account: React.FC<AdminViewProps> = async ({
  } = initPageResult

  const {
-    admin: { components: { views: { Account: CustomAccountComponent } = {} } = {}, user: userSlug },
+    admin: {
+      components: { views: { Account: CustomAccountComponent } = {} } = {},
+      theme,
+      user: userSlug,
+    },
    routes: { api },
    serverURL,
  } = config
@@ -85,7 +89,7 @@ export const Account: React.FC<AdminViewProps> = async ({

    return (
      <DocumentInfoProvider
-        AfterFields={<Settings i18n={i18n} languageOptions={languageOptions} />}
+        AfterFields={<Settings i18n={i18n} languageOptions={languageOptions} theme={theme} />}
        apiURL={`${serverURL}${api}/${userSlug}${user?.id ? `/${user.id}` : ''}`}
        collectionSlug={userSlug}
        docPermissions={docPermissions}
--- a/packages/next/src/views/Edit/Default/index.tsx
+++ b/packages/next/src/views/Edit/Default/index.tsx
@@ -113,10 +113,19 @@ export const DefaultEditView: React.FC = () => {

  const isLockingEnabled = lockDocumentsProp !== false

-  const preventLeaveWithoutSaving =
-    (!(collectionConfig?.versions?.drafts && collectionConfig?.versions?.drafts?.autosave) ||
-      !(globalConfig?.versions?.drafts && globalConfig?.versions?.drafts?.autosave)) &&
-    !disableLeaveWithoutSaving
+  let preventLeaveWithoutSaving = true
+
+  if (collectionConfig) {
+    preventLeaveWithoutSaving = !(
+      collectionConfig?.versions?.drafts && collectionConfig?.versions?.drafts?.autosave
+    )
+  } else if (globalConfig) {
+    preventLeaveWithoutSaving = !(
+      globalConfig?.versions?.drafts && globalConfig?.versions?.drafts?.autosave
+    )
+  } else if (typeof disableLeaveWithoutSaving !== 'undefined') {
+    preventLeaveWithoutSaving = !disableLeaveWithoutSaving
+  }

  const [isReadOnlyForIncomingUser, setIsReadOnlyForIncomingUser] = useState(false)
  const [showTakeOverModal, setShowTakeOverModal] = useState(false)
--- a/packages/payload/package.json
+++ b/packages/payload/package.json
@@ -1,6 +1,6 @@
 {
  "name": "payload",
-  "version": "3.0.0-beta.108",
+  "version": "3.0.0-beta.109",
  "description": "Node, React, Headless CMS and Application Framework built on Next.js",
  "keywords": [
    "admin panel",
--- a/packages/payload/src/admin/elements/Tab.ts
+++ b/packages/payload/src/admin/elements/Tab.ts
@@ -42,12 +42,6 @@ export type DocumentTabConfig = {
  readonly Pill?: PayloadComponent
 }

-export type ClientDocumentTabConfig = {
-  condition?: never
-  isActive?: boolean
-  label?: string
-} & DocumentTabConfig
-
 export type DocumentTabComponent = PayloadComponent<{
  path: string
 }>
--- a/packages/payload/src/admin/types.ts
+++ b/packages/payload/src/admin/types.ts
@@ -11,7 +11,6 @@ export type { CustomPublishButton } from './elements/PublishButton.js'
 export type { CustomSaveButton } from './elements/SaveButton.js'
 export type { CustomSaveDraftButton } from './elements/SaveDraftButton.js'
 export type {
-  ClientDocumentTabConfig,
  DocumentTabComponent,
  DocumentTabCondition,
  DocumentTabConfig,
--- a/packages/payload/src/admin/views/types.ts
+++ b/packages/payload/src/admin/views/types.ts
@@ -8,7 +8,7 @@ import type { Locale, MetaConfig, PayloadComponent } from '../../config/types.js
 import type { SanitizedGlobalConfig } from '../../globals/config/types.js'
 import type { PayloadRequest } from '../../types/index.js'
 import type { LanguageOptions } from '../LanguageOptions.js'
-import type { ClientDocumentTabConfig, MappedComponent } from '../types.js'
+import type { MappedComponent } from '../types.js'

 export type AdminViewConfig = {
  Component: AdminViewComponent
@@ -23,7 +23,6 @@ export type AdminViewConfig = {
 export type MappedView = {
  actions?: MappedComponent[]
  Component: MappedComponent
-  tab?: ClientDocumentTabConfig
 }

 export type AdminViewProps = {
--- a/packages/payload/src/config/defaults.ts
+++ b/packages/payload/src/config/defaults.ts
@@ -25,6 +25,7 @@ export const defaults: Omit<Config, 'db' | 'editor' | 'secret'> = {
      reset: '/reset',
      unauthorized: '/unauthorized',
    },
+    theme: 'all',
  },
  bin: [],
  collections: [],
--- a/packages/payload/src/config/types.ts
+++ b/packages/payload/src/config/types.ts
@@ -818,6 +818,12 @@ export type Config = {
      /** The route for the unauthorized page. */
      unauthorized?: string
    }
+    /**
+     * Restrict the Admin Panel theme to use only one of your choice
+     *
+     * @default 'all' // The theme can be configured by users
+     */
+    theme?: 'all' | 'dark' | 'light'
    /** The slug of a Collection that you want to be used to log in to the Admin dashboard. */
    user?: string
  }
--- a/packages/plugin-cloud-storage/package.json
+++ b/packages/plugin-cloud-storage/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@payloadcms/plugin-cloud-storage",
-  "version": "3.0.0-beta.108",
+  "version": "3.0.0-beta.109",
  "description": "The official cloud storage plugin for Payload CMS",
  "homepage": "https://payloadcms.com",
  "repository": {
--- a/packages/plugin-cloud/package.json
+++ b/packages/plugin-cloud/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@payloadcms/plugin-cloud",
-  "version": "3.0.0-beta.108",
+  "version": "3.0.0-beta.109",
  "description": "The official Payload Cloud plugin",
  "homepage": "https://payloadcms.com",
  "repository": {
--- a/packages/plugin-form-builder/package.json
+++ b/packages/plugin-form-builder/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@payloadcms/plugin-form-builder",
-  "version": "3.0.0-beta.108",
+  "version": "3.0.0-beta.109",
  "description": "Form builder plugin for Payload CMS",
  "keywords": [
    "payload",
--- a/packages/plugin-nested-docs/package.json
+++ b/packages/plugin-nested-docs/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@payloadcms/plugin-nested-docs",
-  "version": "3.0.0-beta.108",
+  "version": "3.0.0-beta.109",
  "description": "The official Nested Docs plugin for Payload",
  "homepage": "https://payloadcms.com",
  "repository": {
--- a/packages/plugin-redirects/package.json
+++ b/packages/plugin-redirects/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@payloadcms/plugin-redirects",
-  "version": "3.0.0-beta.108",
+  "version": "3.0.0-beta.109",
  "description": "Redirects plugin for Payload",
  "keywords": [
    "payload",
--- a/packages/plugin-search/package.json
+++ b/packages/plugin-search/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@payloadcms/plugin-search",
-  "version": "3.0.0-beta.108",
+  "version": "3.0.0-beta.109",
  "description": "Search plugin for Payload",
  "keywords": [
    "payload",
--- a/packages/plugin-seo/package.json
+++ b/packages/plugin-seo/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@payloadcms/plugin-seo",
-  "version": "3.0.0-beta.108",
+  "version": "3.0.0-beta.109",
  "description": "SEO plugin for Payload",
  "keywords": [
    "payload",
--- a/packages/plugin-stripe/package.json
+++ b/packages/plugin-stripe/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@payloadcms/plugin-stripe",
-  "version": "3.0.0-beta.108",
+  "version": "3.0.0-beta.109",
  "description": "Stripe plugin for Payload",
  "keywords": [
    "payload",
--- a/packages/richtext-lexical/package.json
+++ b/packages/richtext-lexical/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@payloadcms/richtext-lexical",
-  "version": "3.0.0-beta.108",
+  "version": "3.0.0-beta.109",
  "description": "The officially supported Lexical richtext adapter for Payload",
  "homepage": "https://payloadcms.com",
  "repository": {
--- a/packages/richtext-lexical/src/features/experimental_table/client/plugins/TablePlugin/index.scss
+++ b/packages/richtext-lexical/src/features/experimental_table/client/plugins/TablePlugin/index.scss
@@ -3,6 +3,7 @@
 .LexicalEditorTheme {
  &__table {
    border-collapse: collapse;
+    max-width: 100%;
    border-spacing: 0;
    overflow-y: scroll;
    overflow-x: scroll;
--- a/packages/richtext-slate/package.json
+++ b/packages/richtext-slate/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@payloadcms/richtext-slate",
-  "version": "3.0.0-beta.108",
+  "version": "3.0.0-beta.109",
  "description": "The officially supported Slate richtext adapter for Payload",
  "homepage": "https://payloadcms.com",
  "repository": {
--- a/packages/storage-azure/package.json
+++ b/packages/storage-azure/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@payloadcms/storage-azure",
-  "version": "3.0.0-beta.108",
+  "version": "3.0.0-beta.109",
  "description": "Payload storage adapter for Azure Blob Storage",
  "homepage": "https://payloadcms.com",
  "repository": {
--- a/packages/storage-gcs/package.json
+++ b/packages/storage-gcs/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@payloadcms/storage-gcs",
-  "version": "3.0.0-beta.108",
+  "version": "3.0.0-beta.109",
  "description": "Payload storage adapter for Google Cloud Storage",
  "homepage": "https://payloadcms.com",
  "repository": {
--- a/packages/storage-s3/package.json
+++ b/packages/storage-s3/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@payloadcms/storage-s3",
-  "version": "3.0.0-beta.108",
+  "version": "3.0.0-beta.109",
  "description": "Payload storage adapter for Amazon S3",
  "homepage": "https://payloadcms.com",
  "repository": {
--- a/packages/storage-uploadthing/package.json
+++ b/packages/storage-uploadthing/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@payloadcms/storage-uploadthing",
-  "version": "3.0.0-beta.108",
+  "version": "3.0.0-beta.109",
  "description": "Payload storage adapter for uploadthing",
  "homepage": "https://payloadcms.com",
  "repository": {
--- a/packages/storage-vercel-blob/package.json
+++ b/packages/storage-vercel-blob/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@payloadcms/storage-vercel-blob",
-  "version": "3.0.0-beta.108",
+  "version": "3.0.0-beta.109",
  "description": "Payload storage adapter for Vercel Blob Storage",
  "homepage": "https://payloadcms.com",
  "repository": {
--- a/packages/translations/package.json
+++ b/packages/translations/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@payloadcms/translations",
-  "version": "3.0.0-beta.108",
+  "version": "3.0.0-beta.109",
  "homepage": "https://payloadcms.com",
  "repository": {
    "type": "git",
--- a/packages/ui/package.json
+++ b/packages/ui/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@payloadcms/ui",
-  "version": "3.0.0-beta.108",
+  "version": "3.0.0-beta.109",
  "homepage": "https://payloadcms.com",
  "repository": {
    "type": "git",
--- a/packages/ui/src/elements/Autosave/index.tsx
+++ b/packages/ui/src/elements/Autosave/index.tsx
@@ -47,7 +47,7 @@ export const Autosave: React.FC<Props> = ({
  } = useConfig()
  const { docConfig, getVersions, versions } = useDocumentInfo()
  const { reportUpdate } = useDocumentEvents()
-  const { dispatchFields, setModified, setSubmitted } = useForm()
+  const { dispatchFields, setSubmitted } = useForm()
  const submitted = useFormSubmitted()
  const versionsConfig = docConfig?.versions

@@ -149,7 +149,7 @@ export const Autosave: React.FC<Props> = ({
                      entitySlug,
                      updatedAt: newDate.toISOString(),
                    })
-                    setModified(false)
+
                    void getVersions()
                  } else {
                    return res.json()
@@ -247,7 +247,6 @@ export const Autosave: React.FC<Props> = ({
    reportUpdate,
    serverURL,
    setSubmitted,
-    setModified,
    versionsConfig?.drafts,
    debouncedFields,
    submitted,
--- a/packages/ui/src/fields/Number/index.tsx
+++ b/packages/ui/src/fields/Number/index.tsx
@@ -78,7 +78,7 @@ const NumberFieldComponent: NumberFieldClientComponent = (props) => {
      let newVal = val

      if (Number.isNaN(val)) {
-        newVal = undefined
+        newVal = null
      }

      if (typeof onChangeFromProps === 'function') {
--- a/packages/ui/src/providers/Config/createClientConfig/collections.tsx
+++ b/packages/ui/src/providers/Config/createClientConfig/collections.tsx
@@ -250,6 +250,15 @@ export const createClientCollectionConfig = ({
    )
  }

+  // Ensure that the label in Edit view is a string, translate it if it's a function
+  if (collection?.admin?.components?.views?.edit) {
+    Object.entries(collection?.admin?.components?.views?.edit).forEach(([key, view]) => {
+      if ('tab' in view && 'label' in view.tab && typeof view.tab.label === 'function') {
+        collection.admin.components.views.edit[key].tab.label = view.tab.label({ t: i18n.t })
+      }
+    })
+  }
+
  clientCollection.admin.components.views = (
    collection?.admin?.components?.views
      ? deepCopyObjectSimple(collection?.admin?.components?.views)
@@ -306,13 +315,6 @@ export const createClientCollectionConfig = ({
        )
      }

-      // Ensure that the label in a tab in an Edit view is a string, translate it if it's a function
-      if ('tab' in view && 'label' in view.tab && typeof view.tab.label === 'function') {
-        clientCollection.admin.components.views.edit[key].tab.label = view.tab.label({
-          t: i18n.t,
-        })
-      }
-
      if ('actions' in view && view.actions?.length) {
        clientCollection.admin.components.views.edit[key].actions = view.actions.map((Component) =>
          createMappedComponent(
--- a/packages/ui/src/providers/Root/index.tsx
+++ b/packages/ui/src/providers/Root/index.tsx
@@ -88,7 +88,7 @@ export const RootProvider: React.FC<Props> = ({
                      <ModalProvider classPrefix="payload" transTime={0} zIndex="var(--z-modal)">
                        <AuthProvider permissions={permissions} user={user}>
                          <PreferencesProvider>
-                            <ThemeProvider cookiePrefix={config.cookiePrefix} theme={theme}>
+                            <ThemeProvider theme={theme}>
                              <ParamsProvider>
                                <LocaleProvider>
                                  <StepNavProvider>
--- a/packages/ui/src/providers/Theme/index.tsx
+++ b/packages/ui/src/providers/Theme/index.tsx
@@ -1,6 +1,8 @@
 'use client'
 import React, { createContext, useCallback, useContext, useEffect, useState } from 'react'

+import { useConfig } from '../Config/index.js'
+
 export type Theme = 'dark' | 'light'

 export type ThemeContext = {
@@ -55,20 +57,26 @@ export const defaultTheme = 'light'

 export const ThemeProvider: React.FC<{
  children?: React.ReactNode
-  cookiePrefix?: string
  theme?: Theme
-}> = ({ children, cookiePrefix, theme: initialTheme }) => {
-  const cookieKey = `${cookiePrefix || 'payload'}-theme`
+}> = ({ children, theme: initialTheme }) => {
+  const { config } = useConfig()
+
+  const preselectedTheme = config.admin.theme
+  const cookieKey = `${config.cookiePrefix || 'payload'}-theme`

  const [theme, setThemeState] = useState<Theme>(initialTheme || defaultTheme)

  const [autoMode, setAutoMode] = useState<boolean>()

  useEffect(() => {
+    if (preselectedTheme !== 'all') {
+      return
+    }
+
    const { theme, themeFromCookies } = getTheme(cookieKey)
    setThemeState(theme)
    setAutoMode(!themeFromCookies)
-  }, [cookieKey])
+  }, [preselectedTheme, cookieKey])

  const setTheme = useCallback(
    (themeToSet: 'auto' | Theme) => {
--- a/test/admin-root/config.ts
+++ b/test/admin-root/config.ts
@@ -21,6 +21,7 @@ export default buildConfigWithDefaults({
    importMap: {
      baseDir: path.resolve(dirname),
    },
+    theme: 'dark',
  },
  cors: ['http://localhost:3000', 'http://localhost:3001'],
  globals: [MenuGlobal],
--- a/test/admin-root/e2e.spec.ts
+++ b/test/admin-root/e2e.spec.ts
@@ -98,4 +98,11 @@ test.describe('Admin Panel (Root)', () => {
    await expect(favicons.nth(1)).toHaveAttribute('media', '(prefers-color-scheme: dark)')
    await expect(favicons.nth(1)).toHaveAttribute('href', /\/payload-favicon-light\.[a-z\d]+\.png/)
  })
+
+  test('config.admin.theme should restrict the theme', async () => {
+    await page.goto(url.account)
+    await expect(page.locator('html')).toHaveAttribute('data-theme', 'dark')
+    await expect(page.locator('#field-theme')).toBeHidden()
+    await expect(page.locator('#field-theme-auto')).toBeHidden()
+  })
 })
--- a/test/fields/collections/Number/e2e.spec.ts
+++ b/test/fields/collections/Number/e2e.spec.ts
@@ -138,4 +138,16 @@ describe('Number', () => {
      'The following field is invalid: withMinRows',
    )
  })
+
+  test('should keep data removed on save if deleted', async () => {
+    const input = 1
+    await page.goto(url.create)
+    const field = page.locator('#field-number')
+    await field.fill(String(input))
+    await saveDocAndAssert(page)
+    await expect(field).toHaveValue(String(input))
+    await field.fill('')
+    await saveDocAndAssert(page)
+    await expect(field).toHaveValue('')
+  })
 })
Author	SHA1	Message	Date
Elliot DeNolf	e900e8974b	chore(release): v3.0.0-beta.109 [skip ci]	2024-09-26 14:00:43 -04:00
Dan Ribbens	adc9bb5cbd	fix(db-mongodb): docs duplicated in list view with drafts (#8435 ) fixes #8430	2024-09-26 13:57:07 -04:00
Germán Jabloñski	a09811f5d4	fix(richtext-lexical): add max-width to tables (temporary fix for overflow). (#8431 ) This is a half-baked and temporary solution to https://github.com/payloadcms/payload/issues/8036 As I said there: - ideally tables would have a horizontal scroll independent of the rest of the document, just like Notion does. - the solution in this PR can make the experience of resizing columns frustrating However, despite that drawback, it is arguably a better behavior than the current one where they can have overflow over the editor container. Until the ideal solution is implemented, let's default to this behavior. ## Before ![image](https://github.com/user-attachments/assets/b2856a3f-4b43-45f0-a7db-00c53fe5c980) ## After ![image](https://github.com/user-attachments/assets/2f60d186-d614-4c72-968c-137820812e11)	2024-09-26 14:37:25 -03:00
Paul	c73f6c74b3	fix(ui): autosave and preventLeaveWithoutSaving interfering with fetching form-state reliably (#8434 ) Removes the setModified call from Autosave logic and updates the `preventLeaveWithoutSaving` logic in Document info to actually disable if autosave is enabled (previously it always resolved to true) Fixes https://github.com/payloadcms/payload/issues/8072	2024-09-26 11:22:36 -06:00
Paul	5c2e39ef0c	fix(ui): number field not being able to clear out the field's value (#8425 ) Fixes #7780 Fixes a bug where the number field won't save data if it's being removed entirely (should be null) instead of changed to another value. --------- Co-authored-by: PatrikKozak <patrik@payloadcms.com>	2024-09-26 08:37:23 -06:00
Riley Pearce	84d2026330	feat: preselected theme (#8354 ) This PR implements the ability to attempt to force the use of light/dark theme in the admin panel. While I am a big advocate for the benefits that dark mode can bring to UX, it does not always suit a clients branding needs. Open to discussion on whether we consider this a suitable feature for the platform. Please feel free to add to this PR as needed. TODO: - [x] Implement tests (I'm open to guidance on this from the Payload team as currently it doesn't look like it's possible to adjust the payload config file on the fly - meaning it can't be easily placed in the admin folder tests). --------- Co-authored-by: Germán Jabloñski <43938777+GermanJablo@users.noreply.github.com>	2024-09-26 11:09:29 -03:00