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

package/src/index.ts

@@ -1,26 +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({
@@ -56,6 +81,9 @@ export function lexicalEditor({
 
       return null
     },
+    validate: richTextValidateHOC({
+      editorConfig: finalSanitizedEditorConfig,
+    }),
   }
 }
 
@@ -84,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,
@@ -96,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

package/dist/populate/validation.d.ts

@@ -1,4 +0,0 @@
-import type { RichTextField, Validate } from 'payload/types';
-import type { AdapterProps } from '../types';
-export declare const richTextValidate: Validate<unknown, unknown, RichTextField<AdapterProps>>;
-//# sourceMappingURL=validation.d.ts.map

package/dist/populate/validation.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"validation.d.ts","sourceRoot":"","sources":["../../src/populate/validation.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAA;AAE5D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,UAAU,CAAA;AAI5C,eAAO,MAAM,gBAAgB,EAAE,QAAQ,CAAC,OAAO,EAAE,OAAO,EAAE,aAAa,CAAC,YAAY,CAAC,CAWpF,CAAA"}

package/dist/populate/validation.js

@@ -1,21 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", {
-    value: true
-});
-Object.defineProperty(exports, "richTextValidate", {
-    enumerable: true,
-    get: function() {
-        return richTextValidate;
-    }
-});
-const _defaultValue = require("./defaultValue");
-const richTextValidate = (value, { required, t })=>{
-    if (required) {
-        const stringifiedDefaultValue = JSON.stringify(_defaultValue.defaultRichTextValue);
-        if (value && JSON.stringify(value) !== stringifiedDefaultValue) return true;
-        return t('validation:required');
-    }
-    return true;
-};
-
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9wb3B1bGF0ZS92YWxpZGF0aW9uLnRzIl0sInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB0eXBlIHsgUmljaFRleHRGaWVsZCwgVmFsaWRhdGUgfSBmcm9tICdwYXlsb2FkL3R5cGVzJ1xuXG5pbXBvcnQgdHlwZSB7IEFkYXB0ZXJQcm9wcyB9IGZyb20gJy4uL3R5cGVzJ1xuXG5pbXBvcnQgeyBkZWZhdWx0UmljaFRleHRWYWx1ZSB9IGZyb20gJy4vZGVmYXVsdFZhbHVlJ1xuXG5leHBvcnQgY29uc3QgcmljaFRleHRWYWxpZGF0ZTogVmFsaWRhdGU8dW5rbm93biwgdW5rbm93biwgUmljaFRleHRGaWVsZDxBZGFwdGVyUHJvcHM+PiA9IChcbiAgdmFsdWUsXG4gIHsgcmVxdWlyZWQsIHQgfSxcbikgPT4ge1xuICBpZiAocmVxdWlyZWQpIHtcbiAgICBjb25zdCBzdHJpbmdpZmllZERlZmF1bHRWYWx1ZSA9IEpTT04uc3RyaW5naWZ5KGRlZmF1bHRSaWNoVGV4dFZhbHVlKVxuICAgIGlmICh2YWx1ZSAmJiBKU09OLnN0cmluZ2lmeSh2YWx1ZSkgIT09IHN0cmluZ2lmaWVkRGVmYXVsdFZhbHVlKSByZXR1cm4gdHJ1ZVxuICAgIHJldHVybiB0KCd2YWxpZGF0aW9uOnJlcXVpcmVkJylcbiAgfVxuXG4gIHJldHVybiB0cnVlXG59XG4iXSwibmFtZXMiOlsicmljaFRleHRWYWxpZGF0ZSIsInZhbHVlIiwicmVxdWlyZWQiLCJ0Iiwic3RyaW5naWZpZWREZWZhdWx0VmFsdWUiLCJKU09OIiwic3RyaW5naWZ5IiwiZGVmYXVsdFJpY2hUZXh0VmFsdWUiXSwibWFwcGluZ3MiOiI7Ozs7K0JBTWFBOzs7ZUFBQUE7Ozs4QkFGd0I7QUFFOUIsTUFBTUEsbUJBQTRFLENBQ3ZGQyxPQUNBLEVBQUVDLFFBQVEsRUFBRUMsQ0FBQyxFQUFFO0lBRWYsSUFBSUQsVUFBVTtRQUNaLE1BQU1FLDBCQUEwQkMsS0FBS0MsU0FBUyxDQUFDQyxrQ0FBb0I7UUFDbkUsSUFBSU4sU0FBU0ksS0FBS0MsU0FBUyxDQUFDTCxXQUFXRyx5QkFBeUIsT0FBTztRQUN2RSxPQUFPRCxFQUFFO0lBQ1g7SUFFQSxPQUFPO0FBQ1QifQ==