tabshift/payloadcms
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

fix(richtext-*): do not use different version of faceless-ui by importing prebundled faceless-ui from ui (#6816)

Browse Source 
Fixes editor crashing when opening admin panel
This commit is contained in:
Alessio Gravili
2024-06-17 16:23:24 -04:00
committed by GitHub
parent 47ee40a3f4
commit 35a5d0cb3c
19 changed files with 7254 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/richtext-lexical/package.json
View File

@@ -41,8 +41,6 @@
"translateNewKeys": "tsx scripts/translateNewKeys.ts"
},
"dependencies": {
"@faceless-ui/modal": "3.0.0-beta.0",
"@faceless-ui/scroll-info": "2.0.0-beta.0",
"@lexical/headless": "0.16.0",
"@lexical/link": "0.16.0",
"@lexical/list": "0.16.0",

9
packages/richtext-lexical/src/field/features/blocks/drawer/index.tsx
View File

@@ -1,9 +1,14 @@
'use client'
import type { LexicalCommand, LexicalEditor } from 'lexical'
import { useModal } from '@faceless-ui/modal'
import { useLexicalComposerContext } from '@lexical/react/LexicalComposerContext.js'
import { BlocksDrawer, formatDrawerSlug, useEditDepth, useTranslation } from '@payloadcms/ui/client'
import {
BlocksDrawer,
formatDrawerSlug,
useEditDepth,
useModal,
useTranslation,
} from '@payloadcms/ui/client'
import { $getNodeByKey, COMMAND_PRIORITY_EDITOR, createCommand } from 'lexical'
import React, { useCallback, useEffect, useState } from 'react'

9
packages/richtext-lexical/src/field/features/link/plugins/floatingLinkEditor/LinkEditor/index.tsx
View File

@@ -2,11 +2,16 @@
import type { LexicalNode } from 'lexical'
import type { Data, FormState } from 'payload'
import { useModal } from '@faceless-ui/modal'
import { useLexicalComposerContext } from '@lexical/react/LexicalComposerContext.js'
import { $findMatchingParent, mergeRegister } from '@lexical/utils'
import { getTranslation } from '@payloadcms/translations'
import { formatDrawerSlug, useConfig, useEditDepth, useTranslation } from '@payloadcms/ui/client'
import {
formatDrawerSlug,
useConfig,
useEditDepth,
useModal,
useTranslation,
} from '@payloadcms/ui/client'
import {
$getSelection,
$isLineBreakNode,

5
packages/richtext-lexical/src/field/features/toolbars/fixed/Toolbar/index.tsx
View File

@@ -1,9 +1,8 @@
'use client'
import type { LexicalEditor } from 'lexical'
import * as scrollInfoImport from '@faceless-ui/scroll-info'
import { useLexicalComposerContext } from '@lexical/react/LexicalComposerContext.js'
import { useThrottledEffect, useTranslation } from '@payloadcms/ui/client'
import { useScrollInfo, useThrottledEffect, useTranslation } from '@payloadcms/ui/client'
import * as React from 'react'
import { useMemo } from 'react'
@@ -146,8 +145,6 @@ function FixedToolbar({
editorConfig: SanitizedClientEditorConfig
parentWithFixedToolbar: EditorConfigContextType | false
}): React.ReactNode {
const { useScrollInfo } = scrollInfoImport
const currentToolbarRef = React.useRef<HTMLDivElement>(null)
const { y } = useScrollInfo()

2
packages/richtext-lexical/src/field/features/upload/component/ExtraFieldsDrawer/index.tsx
View File

@@ -2,7 +2,6 @@
import type { FormProps } from '@payloadcms/ui/forms/Form'
import type { ClientCollectionConfig, FormState } from 'payload'
import { useModal } from '@faceless-ui/modal'
import { useLexicalComposerContext } from '@lexical/react/LexicalComposerContext.js'
import { getTranslation } from '@payloadcms/translations'
import {
@@ -13,6 +12,7 @@ import {
useConfig,
useDocumentInfo,
useFieldProps,
useModal,
useTranslation,
} from '@payloadcms/ui/client'
import { getFormState } from '@payloadcms/ui/shared'

1
packages/richtext-slate/package.json
View File

@@ -32,7 +32,6 @@
"prepublishOnly": "pnpm clean && pnpm turbo build"
},
"dependencies": {
"@faceless-ui/modal": "3.0.0-beta.0",
"is-hotkey": "0.2.0",
"slate": "0.91.4",
"slate-history": "0.86.0",

9
packages/richtext-slate/src/field/elements/link/Button/index.tsx
View File

@@ -2,8 +2,13 @@
import type { FormState } from 'payload'
import { useModal } from '@faceless-ui/modal'
import { useConfig, useDrawerSlug, useFieldProps, useTranslation } from '@payloadcms/ui/client'
import {
useConfig,
useDrawerSlug,
useFieldProps,
useModal,
useTranslation,
} from '@payloadcms/ui/client'
import { getFormState, reduceFieldsToValues } from '@payloadcms/ui/shared'
import React, { Fragment, useState } from 'react'
import { Editor, Range, Transforms } from 'slate'

2
packages/richtext-slate/src/field/elements/link/Element/index.tsx
View File

@@ -1,7 +1,6 @@
'use client'
import type { FormState } from 'payload'
import { useModal } from '@faceless-ui/modal'
import { getTranslation } from '@payloadcms/translations'
import {
Button,
@@ -12,6 +11,7 @@ import {
useDocumentInfo,
useDrawerSlug,
useLocale,
useModal,
useTranslation,
} from '@payloadcms/ui/client'
import { getFormState, reduceFieldsToValues } from '@payloadcms/ui/shared'

2
packages/richtext-slate/src/field/elements/upload/Element/UploadDrawer/index.tsx
View File

@@ -3,7 +3,6 @@
import type { FormFieldBase } from '@payloadcms/ui/fields/shared'
import type { ClientCollectionConfig } from 'payload'
import { useModal } from '@faceless-ui/modal'
import { getTranslation } from '@payloadcms/translations'
import {
Drawer,
@@ -13,6 +12,7 @@ import {
useConfig,
useDocumentInfo,
useLocale,
useModal,
useTranslation,
} from '@payloadcms/ui/client'
import { type FormProps } from '@payloadcms/ui/forms/Form'

3
pnpm-lock.yaml generated
View File

@@ -1256,9 +1256,6 @@ importers:
packages/richtext-slate:
dependencies:
'@faceless-ui/modal':
specifier: 3.0.0-beta.0
version: 3.0.0-beta.0(react-dom@19.0.0-rc-f994737d14-20240522)(react@19.0.0-rc-f994737d14-20240522)
'@payloadcms/translations':
specifier: workspace:*
version: link:../translations

2
templates/blank-3.0/package.json
View File

@@ -32,7 +32,7 @@
"@types/react-dom": "npm:types-react-dom@19.0.0-beta.2",
"dotenv": "^16.4.5",
"eslint": "^8",
"eslint-config-next": "^14.2.3",
"eslint-config-next": "15.0.0-rc.0",
"typescript": "^5.4.5"
},
"engines": {

2
templates/blank-3.0/src/collections/Media.ts
View File

@@ -1,4 +1,4 @@
import type { CollectionConfig } from 'payload/types'
import type { CollectionConfig } from 'payload'
export const Media: CollectionConfig = {
slug: 'media',

2
templates/blank-3.0/src/collections/Users.ts
View File

@@ -1,4 +1,4 @@
import type { CollectionConfig } from 'payload/types'
import type { CollectionConfig } from 'payload'
export const Users: CollectionConfig = {
slug: 'users',

2
templates/blank-3.0/src/payload.config.ts
View File

@@ -2,7 +2,7 @@
import { mongooseAdapter } from '@payloadcms/db-mongodb' // database-adapter-import
import { lexicalEditor } from '@payloadcms/richtext-lexical'
import path from 'path'
import { buildConfig } from 'payload/config'
import { buildConfig } from 'payload'
import { fileURLToPath } from 'url'
import sharp from 'sharp'

3
templates/blank/package.json
View File

@@ -9,6 +9,7 @@
"dev": "cross-env NODE_OPTIONS=--no-deprecation next dev",
"devsafe": "rm -rf .next && cross-env NODE_OPTIONS=--no-deprecation next dev",
"generate:types": "payload generate:types",
"ii": "pnpm --ignore-workspace install",
"lint": "cross-env NODE_OPTIONS=--no-deprecation next lint",
"payload": "cross-env NODE_OPTIONS=--no-deprecation payload",
"start": "cross-env NODE_OPTIONS=--no-deprecation next start"
@@ -32,7 +33,7 @@
"@types/react-dom": "npm:types-react-dom@19.0.0-beta.2",
"dotenv": "^16.4.5",
"eslint": "^8",
"eslint-config-next": "^14.2.3",
"eslint-config-next": "15.0.0-rc.0",
"typescript": "^5.4.5"
},
"engines": {

7212
templates/blank/pnpm-lock.yaml generated Normal file
View File

File diff suppressed because it is too large Load Diff

2
templates/blank/src/collections/Media.ts
View File

@@ -1,4 +1,4 @@
import type { CollectionConfig } from 'payload/types'
import type { CollectionConfig } from 'payload'
export const Media: CollectionConfig = {
slug: 'media',

2
templates/blank/src/collections/Users.ts
View File

@@ -1,4 +1,4 @@
import type { CollectionConfig } from 'payload/types'
import type { CollectionConfig } from 'payload'
export const Users: CollectionConfig = {
slug: 'users',

18
templates/blank/src/payload.config.ts
View File

@@ -2,12 +2,12 @@
import { mongooseAdapter } from '@payloadcms/db-mongodb'
import { lexicalEditor } from '@payloadcms/richtext-lexical'
import path from 'path'
import { buildConfig } from 'payload/config'
import { fileURLToPath } from 'url'
import { buildConfig } from 'payload'
import sharp from 'sharp'
import { fileURLToPath } from 'url'
import { Users } from './collections/Users'
import { Media } from './collections/Media'
import { Users } from './collections/Users'
const filename = fileURLToPath(import.meta.url)
const dirname = path.dirname(filename)
@@ -17,14 +17,14 @@ export default buildConfig({
user: Users.slug,
},
collections: [Users, Media],
editor: lexicalEditor(),
secret: process.env.PAYLOAD_SECRET || '',
typescript: {
outputFile: path.resolve(dirname, 'payload-types.ts'),
},
db: mongooseAdapter({
url: process.env.DATABASE_URI || '',
}),
sharp,
editor: lexicalEditor(),
plugins: [],
secret: process.env.PAYLOAD_SECRET || '',
sharp,
typescript: {
outputFile: path.resolve(dirname, 'payload-types.ts'),
},
})