@payloadcms/richtext-lexical 0.1.0-beta.3 → 0.1.0-beta.4

package/dist/validate/validateNodes.js

@@ -41,4 +41,4 @@ async function validateNodes({ nodeValidations, nodes, payloadConfig, validation
     return true;
 }
 
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy92YWxpZGF0ZS92YWxpZGF0ZU5vZGVzLnRzIl0sInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB0eXBlIHsgU2VyaWFsaXplZEVkaXRvclN0YXRlLCBTZXJpYWxpemVkTGV4aWNhbE5vZGUgfSBmcm9tICdsZXhpY2FsJ1xuaW1wb3J0IHR5cGUgeyBTYW5pdGl6ZWRDb25maWcgfSBmcm9tICdwYXlsb2FkL2NvbmZpZydcbmltcG9ydCB0eXBlIHsgUmljaFRleHRGaWVsZCwgVmFsaWRhdGVPcHRpb25zIH0gZnJvbSAncGF5bG9hZC90eXBlcydcblxuaW1wb3J0IHR5cGUgeyBOb2RlVmFsaWRhdGlvbiB9IGZyb20gJy4uL2ZpZWxkL2ZlYXR1cmVzL3R5cGVzJ1xuZXhwb3J0IGFzeW5jIGZ1bmN0aW9uIHZhbGlkYXRlTm9kZXMoe1xuICBub2RlVmFsaWRhdGlvbnMsXG4gIG5vZGVzLFxuICBwYXlsb2FkQ29uZmlnLFxuICB2YWxpZGF0aW9uOiB2YWxpZGF0aW9uRnJvbVByb3BzLFxufToge1xuICBub2RlVmFsaWRhdGlvbnM6IE1hcDxzdHJpbmcsIEFycmF5PE5vZGVWYWxpZGF0aW9uPj5cbiAgbm9kZXM6IFNlcmlhbGl6ZWRMZXhpY2FsTm9kZVtdXG4gIHBheWxvYWRDb25maWc6IFNhbml0aXplZENvbmZpZ1xuICB2YWxpZGF0aW9uOiB7XG4gICAgb3B0aW9uczogVmFsaWRhdGVPcHRpb25zPFNlcmlhbGl6ZWRFZGl0b3JTdGF0ZSwgdW5rbm93biwgUmljaFRleHRGaWVsZD5cbiAgICB2YWx1ZTogU2VyaWFsaXplZEVkaXRvclN0YXRlXG4gIH1cbn0pOiBQcm9taXNlPHN0cmluZyB8IHRydWU+IHtcbiAgZm9yIChjb25zdCBub2RlIG9mIG5vZGVzKSB7XG4gICAgLy8gVmFsaWRhdGUgbm9kZVxuICAgIGlmIChcbiAgICAgIG5vZGVWYWxpZGF0aW9ucyAmJlxuICAgICAgdHlwZW9mIG5vZGVWYWxpZGF0aW9ucz8uaGFzID09PSAnZnVuY3Rpb24nICYmXG4gICAgICBub2RlVmFsaWRhdGlvbnM/Lmhhcyhub2RlLnR5cGUpXG4gICAgKSB7XG4gICAgICBjb25zdCB2YWxpZGF0aW9ucyA9IG5vZGVWYWxpZGF0aW9ucy5nZXQobm9kZS50eXBlKVxuICAgICAgZm9yIChjb25zdCB2YWxpZGF0aW9uIG9mIHZhbGlkYXRpb25zKSB7XG4gICAgICAgIGNvbnN0IHZhbGlkYXRpb25SZXN1bHQgPSBhd2FpdCB2YWxpZGF0aW9uKHtcbiAgICAgICAgICBub2RlLFxuICAgICAgICAgIG5vZGVWYWxpZGF0aW9ucyxcbiAgICAgICAgICBwYXlsb2FkQ29uZmlnLFxuICAgICAgICAgIHZhbGlkYXRpb246IHZhbGlkYXRpb25Gcm9tUHJvcHMsXG4gICAgICAgIH0pXG4gICAgICAgIGlmICh2YWxpZGF0aW9uUmVzdWx0ICE9PSB0cnVlKSB7XG4gICAgICAgICAgcmV0dXJuIHZhbGlkYXRpb25SZXN1bHRcbiAgICAgICAgfVxuICAgICAgfVxuICAgIH1cbiAgICAvLyBWYWxpZGF0ZSBub2RlJ3MgY2hpbGRyZW5cbiAgICBpZiAoJ2NoaWxkcmVuJyBpbiBub2RlICYmIG5vZGU/LmNoaWxkcmVuKSB7XG4gICAgICBjb25zdCBjaGlsZHJlblZhbGlkYXRpb25SZXN1bHQgPSBhd2FpdCB2YWxpZGF0ZU5vZGVzKHtcbiAgICAgICAgbm9kZVZhbGlkYXRpb25zLFxuICAgICAgICBub2Rlczogbm9kZS5jaGlsZHJlbiBhcyBTZXJpYWxpemVkTGV4aWNhbE5vZGVbXSxcbiAgICAgICAgcGF5bG9hZENvbmZpZyxcbiAgICAgICAgdmFsaWRhdGlvbjogdmFsaWRhdGlvbkZyb21Qcm9wcyxcbiAgICAgIH0pXG4gICAgICBpZiAoY2hpbGRyZW5WYWxpZGF0aW9uUmVzdWx0ICE9PSB0cnVlKSB7XG4gICAgICAgIHJldHVybiBjaGlsZHJlblZhbGlkYXRpb25SZXN1bHRcbiAgICAgIH1cbiAgICB9XG4gIH1cblxuICByZXR1cm4gdHJ1ZVxufVxuIl0sIm5hbWVzIjpbInZhbGlkYXRlTm9kZXMiLCJub2RlVmFsaWRhdGlvbnMiLCJub2RlcyIsInBheWxvYWRDb25maWciLCJ2YWxpZGF0aW9uIiwidmFsaWRhdGlvbkZyb21Qcm9wcyIsIm5vZGUiLCJoYXMiLCJ0eXBlIiwidmFsaWRhdGlvbnMiLCJnZXQiLCJ2YWxpZGF0aW9uUmVzdWx0IiwiY2hpbGRyZW4iLCJjaGlsZHJlblZhbGlkYXRpb25SZXN1bHQiXSwibWFwcGluZ3MiOiI7Ozs7K0JBS3NCQTs7O2VBQUFBOzs7QUFBZixlQUFlQSxjQUFjLEVBQ2xDQyxlQUFlLEVBQ2ZDLEtBQUssRUFDTEMsYUFBYSxFQUNiQyxZQUFZQyxtQkFBbUIsRUFTaEM7SUFDQyxLQUFLLE1BQU1DLFFBQVFKLE1BQU87UUFDeEIsZ0JBQWdCO1FBQ2hCLElBQ0VELG1CQUNBLE9BQU9BLGlCQUFpQk0sUUFBUSxjQUNoQ04saUJBQWlCTSxJQUFJRCxLQUFLRSxJQUFJLEdBQzlCO1lBQ0EsTUFBTUMsY0FBY1IsZ0JBQWdCUyxHQUFHLENBQUNKLEtBQUtFLElBQUk7WUFDakQsS0FBSyxNQUFNSixjQUFjSyxZQUFhO2dCQUNwQyxNQUFNRSxtQkFBbUIsTUFBTVAsV0FBVztvQkFDeENFO29CQUNBTDtvQkFDQUU7b0JBQ0FDLFlBQVlDO2dCQUNkO2dCQUNBLElBQUlNLHFCQUFxQixNQUFNO29CQUM3QixPQUFPQTtnQkFDVDtZQUNGO1FBQ0Y7UUFDQSwyQkFBMkI7UUFDM0IsSUFBSSxjQUFjTCxRQUFRQSxNQUFNTSxVQUFVO1lBQ3hDLE1BQU1DLDJCQUEyQixNQUFNYixjQUFjO2dCQUNuREM7Z0JBQ0FDLE9BQU9JLEtBQUtNLFFBQVE7Z0JBQ3BCVDtnQkFDQUMsWUFBWUM7WUFDZDtZQUNBLElBQUlRLDZCQUE2QixNQUFNO2dCQUNyQyxPQUFPQTtZQUNUO1FBQ0Y7SUFDRjtJQUVBLE9BQU87QUFDVCJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy92YWxpZGF0ZS92YWxpZGF0ZU5vZGVzLnRzIl0sInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB0eXBlIHsgU2VyaWFsaXplZEVkaXRvclN0YXRlLCBTZXJpYWxpemVkTGV4aWNhbE5vZGUgfSBmcm9tICdsZXhpY2FsJ1xuaW1wb3J0IHR5cGUgeyBTYW5pdGl6ZWRDb25maWcgfSBmcm9tICdwYXlsb2FkL2NvbmZpZydcbmltcG9ydCB0eXBlIHsgUmljaFRleHRGaWVsZCwgVmFsaWRhdGVPcHRpb25zIH0gZnJvbSAncGF5bG9hZC90eXBlcydcblxuaW1wb3J0IHR5cGUgeyBOb2RlVmFsaWRhdGlvbiB9IGZyb20gJy4uL2ZpZWxkL2ZlYXR1cmVzL3R5cGVzJ1xuXG5leHBvcnQgYXN5bmMgZnVuY3Rpb24gdmFsaWRhdGVOb2Rlcyh7XG4gIG5vZGVWYWxpZGF0aW9ucyxcbiAgbm9kZXMsXG4gIHBheWxvYWRDb25maWcsXG4gIHZhbGlkYXRpb246IHZhbGlkYXRpb25Gcm9tUHJvcHMsXG59OiB7XG4gIG5vZGVWYWxpZGF0aW9uczogTWFwPHN0cmluZywgQXJyYXk8Tm9kZVZhbGlkYXRpb24+PlxuICBub2RlczogU2VyaWFsaXplZExleGljYWxOb2RlW11cbiAgcGF5bG9hZENvbmZpZzogU2FuaXRpemVkQ29uZmlnXG4gIHZhbGlkYXRpb246IHtcbiAgICBvcHRpb25zOiBWYWxpZGF0ZU9wdGlvbnM8U2VyaWFsaXplZEVkaXRvclN0YXRlLCB1bmtub3duLCBSaWNoVGV4dEZpZWxkPlxuICAgIHZhbHVlOiBTZXJpYWxpemVkRWRpdG9yU3RhdGVcbiAgfVxufSk6IFByb21pc2U8c3RyaW5nIHwgdHJ1ZT4ge1xuICBmb3IgKGNvbnN0IG5vZGUgb2Ygbm9kZXMpIHtcbiAgICAvLyBWYWxpZGF0ZSBub2RlXG4gICAgaWYgKFxuICAgICAgbm9kZVZhbGlkYXRpb25zICYmXG4gICAgICB0eXBlb2Ygbm9kZVZhbGlkYXRpb25zPy5oYXMgPT09ICdmdW5jdGlvbicgJiZcbiAgICAgIG5vZGVWYWxpZGF0aW9ucz8uaGFzKG5vZGUudHlwZSlcbiAgICApIHtcbiAgICAgIGNvbnN0IHZhbGlkYXRpb25zID0gbm9kZVZhbGlkYXRpb25zLmdldChub2RlLnR5cGUpXG4gICAgICBmb3IgKGNvbnN0IHZhbGlkYXRpb24gb2YgdmFsaWRhdGlvbnMpIHtcbiAgICAgICAgY29uc3QgdmFsaWRhdGlvblJlc3VsdCA9IGF3YWl0IHZhbGlkYXRpb24oe1xuICAgICAgICAgIG5vZGUsXG4gICAgICAgICAgbm9kZVZhbGlkYXRpb25zLFxuICAgICAgICAgIHBheWxvYWRDb25maWcsXG4gICAgICAgICAgdmFsaWRhdGlvbjogdmFsaWRhdGlvbkZyb21Qcm9wcyxcbiAgICAgICAgfSlcbiAgICAgICAgaWYgKHZhbGlkYXRpb25SZXN1bHQgIT09IHRydWUpIHtcbiAgICAgICAgICByZXR1cm4gdmFsaWRhdGlvblJlc3VsdFxuICAgICAgICB9XG4gICAgICB9XG4gICAgfVxuXG4gICAgLy8gVmFsaWRhdGUgbm9kZSdzIGNoaWxkcmVuXG4gICAgaWYgKCdjaGlsZHJlbicgaW4gbm9kZSAmJiBub2RlPy5jaGlsZHJlbikge1xuICAgICAgY29uc3QgY2hpbGRyZW5WYWxpZGF0aW9uUmVzdWx0ID0gYXdhaXQgdmFsaWRhdGVOb2Rlcyh7XG4gICAgICAgIG5vZGVWYWxpZGF0aW9ucyxcbiAgICAgICAgbm9kZXM6IG5vZGUuY2hpbGRyZW4gYXMgU2VyaWFsaXplZExleGljYWxOb2RlW10sXG4gICAgICAgIHBheWxvYWRDb25maWcsXG4gICAgICAgIHZhbGlkYXRpb246IHZhbGlkYXRpb25Gcm9tUHJvcHMsXG4gICAgICB9KVxuICAgICAgaWYgKGNoaWxkcmVuVmFsaWRhdGlvblJlc3VsdCAhPT0gdHJ1ZSkge1xuICAgICAgICByZXR1cm4gY2hpbGRyZW5WYWxpZGF0aW9uUmVzdWx0XG4gICAgICB9XG4gICAgfVxuICB9XG5cbiAgcmV0dXJuIHRydWVcbn1cbiJdLCJuYW1lcyI6WyJ2YWxpZGF0ZU5vZGVzIiwibm9kZVZhbGlkYXRpb25zIiwibm9kZXMiLCJwYXlsb2FkQ29uZmlnIiwidmFsaWRhdGlvbiIsInZhbGlkYXRpb25Gcm9tUHJvcHMiLCJub2RlIiwiaGFzIiwidHlwZSIsInZhbGlkYXRpb25zIiwiZ2V0IiwidmFsaWRhdGlvblJlc3VsdCIsImNoaWxkcmVuIiwiY2hpbGRyZW5WYWxpZGF0aW9uUmVzdWx0Il0sIm1hcHBpbmdzIjoiOzs7OytCQU1zQkE7OztlQUFBQTs7O0FBQWYsZUFBZUEsY0FBYyxFQUNsQ0MsZUFBZSxFQUNmQyxLQUFLLEVBQ0xDLGFBQWEsRUFDYkMsWUFBWUMsbUJBQW1CLEVBU2hDO0lBQ0MsS0FBSyxNQUFNQyxRQUFRSixNQUFPO1FBQ3hCLGdCQUFnQjtRQUNoQixJQUNFRCxtQkFDQSxPQUFPQSxpQkFBaUJNLFFBQVEsY0FDaENOLGlCQUFpQk0sSUFBSUQsS0FBS0UsSUFBSSxHQUM5QjtZQUNBLE1BQU1DLGNBQWNSLGdCQUFnQlMsR0FBRyxDQUFDSixLQUFLRSxJQUFJO1lBQ2pELEtBQUssTUFBTUosY0FBY0ssWUFBYTtnQkFDcEMsTUFBTUUsbUJBQW1CLE1BQU1QLFdBQVc7b0JBQ3hDRTtvQkFDQUw7b0JBQ0FFO29CQUNBQyxZQUFZQztnQkFDZDtnQkFDQSxJQUFJTSxxQkFBcUIsTUFBTTtvQkFDN0IsT0FBT0E7Z0JBQ1Q7WUFDRjtRQUNGO1FBRUEsMkJBQTJCO1FBQzNCLElBQUksY0FBY0wsUUFBUUEsTUFBTU0sVUFBVTtZQUN4QyxNQUFNQywyQkFBMkIsTUFBTWIsY0FBYztnQkFDbkRDO2dCQUNBQyxPQUFPSSxLQUFLTSxRQUFRO2dCQUNwQlQ7Z0JBQ0FDLFlBQVlDO1lBQ2Q7WUFDQSxJQUFJUSw2QkFBNkIsTUFBTTtnQkFDckMsT0FBT0E7WUFDVDtRQUNGO0lBQ0Y7SUFFQSxPQUFPO0FBQ1QifQ==

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@payloadcms/richtext-lexical",
-  "version": "0.1.0-beta.3",
+  "version": "0.1.0-beta.4",
   "description": "The officially supported Lexical richtext adapter for Payload",
   "repository": "https://github.com/payloadcms/payload",
   "license": "MIT",
@@ -43,8 +43,8 @@
   "devDependencies": {
     "@types/node": "20.6.2",
     "@types/react": "18.2.15",
-    "@payloadcms/eslint-config": "0.0.1",
-    "payload": "2.0.0-beta.17"
+    "payload": "2.0.0-beta.29",
+    "@payloadcms/eslint-config": "0.0.1"
   },
   "exports": null,
   "publishConfig": {

package/src/index.ts

@@ -1,27 +1,51 @@
+import type { EditorConfig as LexicalEditorConfig } from 'lexical/LexicalEditor'
 import type { RichTextAdapter } from 'payload/types'
 
 import { withMergedProps } from 'payload/components/utilities'
 
+import type { FeatureProvider } from './field/features/types'
 import type { EditorConfig, SanitizedEditorConfig } from './field/lexical/config/types'
 import type { AdapterProps } from './types'
 
 import { RichTextCell } from './cell'
 import { RichTextField } from './field'
-import { defaultEditorConfig, defaultSanitizedEditorConfig } from './field/lexical/config/default'
+import {
+  defaultEditorFeatures,
+  defaultEditorLexicalConfig,
+  defaultSanitizedEditorConfig,
+} from './field/lexical/config/default'
 import { sanitizeEditorConfig } from './field/lexical/config/sanitize'
 import { cloneDeep } from './field/lexical/utils/cloneDeep'
 import { richTextRelationshipPromise } from './populate/richTextRelationshipPromise'
 import { richTextValidateHOC } from './validate'
 
-export function lexicalEditor({
-  userConfig,
-}: {
-  userConfig?: (defaultEditorConfig: EditorConfig) => EditorConfig
-}): RichTextAdapter<AdapterProps> {
-  const finalSanitizedEditorConfig: SanitizedEditorConfig =
-    userConfig == null || typeof userConfig != 'function'
-      ? cloneDeep(defaultSanitizedEditorConfig)
-      : sanitizeEditorConfig(userConfig(cloneDeep(defaultEditorConfig)))
+export type LexicalEditorProps = {
+  features?:
+    | (({ defaultFeatures }: { defaultFeatures: FeatureProvider[] }) => FeatureProvider[])
+    | FeatureProvider[]
+  lexical?: LexicalEditorConfig
+}
+
+export function lexicalEditor(props?: LexicalEditorProps): RichTextAdapter<AdapterProps> {
+  let finalSanitizedEditorConfig: SanitizedEditorConfig = null
+  if (!props || (!props.features && !props.lexical)) {
+    finalSanitizedEditorConfig = cloneDeep(defaultSanitizedEditorConfig)
+  } else {
+    let features: FeatureProvider[] =
+      props.features && typeof props.features === 'function'
+        ? props.features({ defaultFeatures: cloneDeep(defaultEditorFeatures) })
+        : (props.features as FeatureProvider[])
+    if (!features) {
+      features = cloneDeep(defaultEditorFeatures)
+    }
+
+    const lexical: LexicalEditorConfig = props.lexical || cloneDeep(defaultEditorLexicalConfig)
+
+    finalSanitizedEditorConfig = sanitizeEditorConfig({
+      features,
+      lexical,
+    })
+  }
 
   return {
     CellComponent: withMergedProps({
@@ -88,9 +112,11 @@ export { CheckListFeature } from './field/features/lists/CheckList'
 export { OrderedListFeature } from './field/features/lists/OrderedList'
 export { UnoderedListFeature } from './field/features/lists/UnorderedList'
 export type {
+  AfterReadPromise,
   Feature,
   FeatureProvider,
   FeatureProviderMap,
+  NodeValidation,
   ResolvedFeature,
   ResolvedFeatureMap,
   SanitizedFeatures,
@@ -100,7 +126,12 @@ export {
   EditorConfigProvider,
   useEditorConfigContext,
 } from './field/lexical/config/EditorConfigProvider'
-export { defaultEditorConfig, defaultSanitizedEditorConfig } from './field/lexical/config/default'
+export {
+  defaultEditorConfig,
+  defaultEditorFeatures,
+  defaultEditorLexicalConfig,
+  defaultSanitizedEditorConfig,
+} from './field/lexical/config/default'
 export { loadFeatures, sortFeaturesForOptimalLoading } from './field/lexical/config/loader'
 export { sanitizeEditorConfig, sanitizeFeatures } from './field/lexical/config/sanitize'
 // export SanitizedEditorConfig