@contentful/field-editor-rich-text 3.28.2 → 3.30.0

package/dist/cjs/RichTextEditor.js

@@ -117,7 +117,8 @@ const ConnectedRichTextEditor = (props)=>{
         plugins: plugins,
         disableCorePlugins: _plugins.disableCorePlugins
     }, !props.isToolbarHidden && _react.createElement(_StickyToolbarWrapper.default, {
-        isDisabled: props.isDisabled
+        isDisabled: props.isDisabled,
+        offset: props.stickyToolbarOffset
     }, _react.createElement(_Toolbar.default, {
         isDisabled: props.isDisabled
     })), _react.createElement(_SyncEditorChanges.SyncEditorChanges, {

package/dist/cjs/Toolbar/components/StickyToolbarWrapper.js

@@ -16,14 +16,14 @@ function _interop_require_default(obj) {
     };
 }
 const styles = {
-    nativeSticky: (0, _emotion.css)`
+    nativeSticky: (offset)=>(0, _emotion.css)`
     position: -webkit-sticky;
     position: sticky;
-    top: -1px;
+    top: ${offset ? offset : -1}px;
     z-index: 2;
   `
 };
-const StickyToolbarWrapper = ({ isDisabled, children })=>_react.default.createElement("div", {
-        className: isDisabled ? '' : styles.nativeSticky
+const StickyToolbarWrapper = ({ isDisabled, offset, children })=>_react.default.createElement("div", {
+        className: isDisabled ? '' : styles.nativeSticky(offset)
     }, children);
 const _default = StickyToolbarWrapper;

package/dist/esm/RichTextEditor.js

@@ -53,7 +53,8 @@ export const ConnectedRichTextEditor = (props)=>{
         plugins: plugins,
         disableCorePlugins: disableCorePlugins
     }, !props.isToolbarHidden && React.createElement(StickyToolbarWrapper, {
-        isDisabled: props.isDisabled
+        isDisabled: props.isDisabled,
+        offset: props.stickyToolbarOffset
     }, React.createElement(Toolbar, {
         isDisabled: props.isDisabled
     })), React.createElement(SyncEditorChanges, {

package/dist/esm/Toolbar/components/StickyToolbarWrapper.js

@@ -1,14 +1,14 @@
 import React from 'react';
 import { css } from 'emotion';
 const styles = {
-    nativeSticky: css`
+    nativeSticky: (offset)=>css`
     position: -webkit-sticky;
     position: sticky;
-    top: -1px;
+    top: ${offset ? offset : -1}px;
     z-index: 2;
   `
 };
-const StickyToolbarWrapper = ({ isDisabled, children })=>React.createElement("div", {
-        className: isDisabled ? '' : styles.nativeSticky
+const StickyToolbarWrapper = ({ isDisabled, offset, children })=>React.createElement("div", {
+        className: isDisabled ? '' : styles.nativeSticky(offset)
     }, children);
 export default StickyToolbarWrapper;

package/dist/types/RichTextEditor.d.ts

@@ -29,6 +29,7 @@ type ConnectedRichTextProps = {
     isDisabled?: boolean;
     isToolbarHidden?: boolean;
     actionsDisabled?: boolean;
+    stickyToolbarOffset?: number;
 };
 export declare const ConnectedRichTextEditor: (props: ConnectedRichTextProps) => React.JSX.Element;
 declare const RichTextEditor: (props: RichTextProps) => React.JSX.Element;

package/dist/types/Toolbar/components/StickyToolbarWrapper.d.ts

@@ -1,7 +1,8 @@
 import React, { ReactNode } from 'react';
 type StickyToolbarProps = {
     isDisabled?: boolean;
+    offset?: number;
     children: ReactNode;
 };
-declare const StickyToolbarWrapper: ({ isDisabled, children }: StickyToolbarProps) => React.JSX.Element;
+declare const StickyToolbarWrapper: ({ isDisabled, offset, children }: StickyToolbarProps) => React.JSX.Element;
 export default StickyToolbarWrapper;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contentful/field-editor-rich-text",
-  "version": "3.28.2",
+  "version": "3.30.0",
   "source": "./src/index.tsx",
   "main": "dist/cjs/index.js",
   "module": "dist/esm/index.js",
@@ -46,8 +46,8 @@
     "@contentful/f36-utils": "^4.24.3",
     "@contentful/field-editor-reference": "^5.31.2",
     "@contentful/field-editor-shared": "^1.8.0",
-    "@contentful/rich-text-plain-text-renderer": "^16.0.4",
-    "@contentful/rich-text-types": "16.7.0",
+    "@contentful/rich-text-plain-text-renderer": "^17.0.0",
+    "@contentful/rich-text-types": "^17.0.0",
     "@popperjs/core": "^2.11.5",
     "@udecode/plate-basic-marks": "36.0.0",
     "@udecode/plate-break": "36.0.0",
@@ -77,7 +77,7 @@
   },
   "devDependencies": {
     "@contentful/field-editor-test-utils": "^1.5.2",
-    "@contentful/rich-text-react-renderer": "^15.16.4",
+    "@contentful/rich-text-react-renderer": "^16.0.0",
     "@types/is-hotkey": "^0.1.6",
     "@udecode/plate-test-utils": "^3.2.0",
     "prism-react-renderer": "2.4.0",
@@ -86,5 +86,5 @@
   "publishConfig": {
     "registry": "https://npm.pkg.github.com/"
   },
-  "gitHead": "eb3a6f6fd6b37d1ec6fb83dc8401a55ebfe4ff68"
+  "gitHead": "617172986bc02e431405a0e994bda361b6c4bf05"
 }

package/dist/cjs/test-utils/validation.js

@@ -1,127 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", {
-    value: true
-});
-Object.defineProperty(exports, "validateRichTextDocument", {
-    enumerable: true,
-    get: function() {
-        return validateRichTextDocument;
-    }
-});
-const _richtexttypes = require("@contentful/rich-text-types");
-const _schemas = require("@contentful/rich-text-types/dist/schemas");
-const _ajv = _interop_require_default(require("ajv"));
-function _interop_require_default(obj) {
-    return obj && obj.__esModule ? obj : {
-        default: obj
-    };
-}
-const ajv = new _ajv.default({
-    allErrors: true,
-    verbose: true
-});
-function validateRichTextDocument(document) {
-    const validateRootNode = getValidator(_richtexttypes.BLOCKS.DOCUMENT);
-    const rootNodeIsValid = validateRootNode(removeGrandChildNodes(document));
-    const errors = [];
-    if (rootNodeIsValid) {
-        validateChildNodes(document, [
-            'content'
-        ], errors);
-    } else {
-        buildSchemaErrors(validateRootNode, [], errors);
-    }
-    return errors;
-}
-function validateChildNodes(node, path, errors) {
-    for(let i = 0; i < node.content.length; i++){
-        validateNode(node.content[i], [
-            ...path,
-            i
-        ], errors);
-    }
-}
-function validateNode(node, path, errors) {
-    const validateSchema = getValidator(node.nodeType);
-    const isValid = validateSchema(removeGrandChildNodes(resetChildNodes(node)));
-    if (!isValid) {
-        buildSchemaErrors(validateSchema, path, errors);
-        return;
-    }
-    if (!isLeafNode(node)) {
-        validateChildNodes(node, [
-            ...path,
-            'content'
-        ], errors);
-    }
-}
-function getValidator(nodeType) {
-    const schema = (0, _schemas.getSchemaWithNodeType)(nodeType);
-    const validate = ajv.compile(schema);
-    const validator = (data)=>{
-        validate(data);
-        validator.errors = removeGrandChildrenMinItemsErrors(validate.errors ?? []);
-        return validator.errors.length === 0;
-    };
-    return validator;
-}
-function buildSchemaErrors(validateSchema, _, errors) {
-    const schemaErrors = validateSchema.errors;
-    const constraintError = schemaErrors.find((e)=>e.keyword === 'enum' || e.keyword === 'anyOf');
-    if (constraintError) {
-        errors.push(constraintError);
-        return;
-    }
-    errors.push(...schemaErrors);
-}
-function resetChildNodes(node) {
-    const { content } = node;
-    if (isLeafNode(node)) {
-        return node;
-    }
-    return Object.assign({}, node, {
-        content: content.map(resetNode)
-    });
-}
-function resetNode(node) {
-    const { nodeType } = node;
-    if (_richtexttypes.helpers.isText(node)) {
-        return {
-            nodeType,
-            data: {},
-            value: '',
-            marks: []
-        };
-    }
-    return {
-        nodeType,
-        data: {},
-        content: []
-    };
-}
-function removeGrandChildNodes(node) {
-    const { content } = node;
-    if (isLeafNode(node)) {
-        return node;
-    }
-    return Object.assign({}, node, {
-        content: content.map(removeChildNodes)
-    });
-}
-function removeChildNodes(node) {
-    if (_richtexttypes.helpers.isText(node)) {
-        return node;
-    }
-    return Object.assign({}, node, {
-        content: []
-    });
-}
-function isLeafNode(node) {
-    return _richtexttypes.helpers.isText(node) || !Array.isArray(node.content);
-}
-function removeGrandChildrenMinItemsErrors(errors) {
-    return errors.filter((error)=>{
-        const level = error.instancePath.split('/').length;
-        return !(level > 3 && error.keyword === 'minItems');
-    });
-}

package/dist/esm/test-utils/validation.js

@@ -1,112 +0,0 @@
-import { helpers, BLOCKS } from '@contentful/rich-text-types';
-import { getSchemaWithNodeType } from '@contentful/rich-text-types/dist/schemas';
-import Ajv from 'ajv';
-const ajv = new Ajv({
-    allErrors: true,
-    verbose: true
-});
-export function validateRichTextDocument(document) {
-    const validateRootNode = getValidator(BLOCKS.DOCUMENT);
-    const rootNodeIsValid = validateRootNode(removeGrandChildNodes(document));
-    const errors = [];
-    if (rootNodeIsValid) {
-        validateChildNodes(document, [
-            'content'
-        ], errors);
-    } else {
-        buildSchemaErrors(validateRootNode, [], errors);
-    }
-    return errors;
-}
-function validateChildNodes(node, path, errors) {
-    for(let i = 0; i < node.content.length; i++){
-        validateNode(node.content[i], [
-            ...path,
-            i
-        ], errors);
-    }
-}
-function validateNode(node, path, errors) {
-    const validateSchema = getValidator(node.nodeType);
-    const isValid = validateSchema(removeGrandChildNodes(resetChildNodes(node)));
-    if (!isValid) {
-        buildSchemaErrors(validateSchema, path, errors);
-        return;
-    }
-    if (!isLeafNode(node)) {
-        validateChildNodes(node, [
-            ...path,
-            'content'
-        ], errors);
-    }
-}
-function getValidator(nodeType) {
-    const schema = getSchemaWithNodeType(nodeType);
-    const validate = ajv.compile(schema);
-    const validator = (data)=>{
-        validate(data);
-        validator.errors = removeGrandChildrenMinItemsErrors(validate.errors ?? []);
-        return validator.errors.length === 0;
-    };
-    return validator;
-}
-function buildSchemaErrors(validateSchema, _, errors) {
-    const schemaErrors = validateSchema.errors;
-    const constraintError = schemaErrors.find((e)=>e.keyword === 'enum' || e.keyword === 'anyOf');
-    if (constraintError) {
-        errors.push(constraintError);
-        return;
-    }
-    errors.push(...schemaErrors);
-}
-function resetChildNodes(node) {
-    const { content } = node;
-    if (isLeafNode(node)) {
-        return node;
-    }
-    return Object.assign({}, node, {
-        content: content.map(resetNode)
-    });
-}
-function resetNode(node) {
-    const { nodeType } = node;
-    if (helpers.isText(node)) {
-        return {
-            nodeType,
-            data: {},
-            value: '',
-            marks: []
-        };
-    }
-    return {
-        nodeType,
-        data: {},
-        content: []
-    };
-}
-function removeGrandChildNodes(node) {
-    const { content } = node;
-    if (isLeafNode(node)) {
-        return node;
-    }
-    return Object.assign({}, node, {
-        content: content.map(removeChildNodes)
-    });
-}
-function removeChildNodes(node) {
-    if (helpers.isText(node)) {
-        return node;
-    }
-    return Object.assign({}, node, {
-        content: []
-    });
-}
-function isLeafNode(node) {
-    return helpers.isText(node) || !Array.isArray(node.content);
-}
-function removeGrandChildrenMinItemsErrors(errors) {
-    return errors.filter((error)=>{
-        const level = error.instancePath.split('/').length;
-        return !(level > 3 && error.keyword === 'minItems');
-    });
-}

package/dist/types/test-utils/validation.d.ts

@@ -1 +0,0 @@
-export declare function validateRichTextDocument(document: any): never[];