@contentful/field-editor-rich-text 4.16.1 → 4.17.0

package/README.md

@@ -11,33 +11,6 @@ import 'codemirror/lib/codemirror.css';
 import { RichTextEditor } from '@contentful/field-editor-rich-text';
 ```
 
-## ⚠️ Important: Package Configuration
-
-Due to peer dependency resolution in npm, you must add the following to your `package.json` to ensure compatible versions are installed:
-This is a temporary workaround until we have upgraded the underlying rich text packages.
-
-**For npm:**
-
-```json
-{
-  "overrides": {
-    "slate": "0.94.1",
-    "slate-react": "0.102.0"
-  }
-}
-```
-
-**For yarn:**
-
-```json
-{
-  "resolutions": {
-    "slate": "0.94.1",
-    "slate-react": "0.102.0"
-  }
-}
-```
-
 ## Migrating to v2
 
 To bring support for Rich Text Tables we rewrote most of the internals of this package to adapt the latest version of [Slate][slate]. We are releasing this change as v2.0.0.

package/dist/cjs/RichTextEditor.js

@@ -24,9 +24,9 @@ const _platecommon = require("@udecode/plate-common");
 const _emotion = require("emotion");
 const _fastdeepequal = /*#__PURE__*/ _interop_require_default(require("fast-deep-equal"));
 const _noop = /*#__PURE__*/ _interop_require_default(require("lodash/noop"));
+const _slatereact = require("slate-react");
 const _CharConstraints = require("./CharConstraints");
 const _ContentfulEditorProvider = require("./ContentfulEditorProvider");
-const _editoroverrides = require("./editor-overrides");
 const _toSlateValue = require("./helpers/toSlateValue");
 const _misc = require("./internal/misc");
 const _plugins = require("./plugins");
@@ -130,7 +130,7 @@ const ConnectedRichTextEditor = (props)=>{
         id: id,
         className: classNames,
         readOnly: props.isDisabled,
-        scrollSelectionIntoView: _editoroverrides.defaultScrollSelectionIntoView
+        scrollSelectionIntoView: _slatereact.defaultScrollSelectionIntoView
     }), props.withCharValidation && /*#__PURE__*/ _react.createElement(_CharConstraints.CharConstraints, null))))));
 };
 const RichTextEditor = (props)=>{

package/dist/esm/RichTextEditor.js

@@ -6,9 +6,9 @@ import { PlateContent, Plate } from '@udecode/plate-common';
 import { css, cx } from 'emotion';
 import deepEquals from 'fast-deep-equal';
 import noop from 'lodash/noop';
+import { defaultScrollSelectionIntoView } from 'slate-react';
 import { CharConstraints } from './CharConstraints';
 import { ContentfulEditorIdProvider, getContentfulEditorId } from './ContentfulEditorProvider';
-import { defaultScrollSelectionIntoView } from './editor-overrides';
 import { toSlateValue } from './helpers/toSlateValue';
 import { normalizeInitialValue } from './internal/misc';
 import { getPlugins, disableCorePlugins } from './plugins';

package/dist/types/internal/types/editor.d.ts

@@ -4,8 +4,8 @@
 import { MARKS } from '@contentful/rich-text-types';
 import * as p from '@udecode/plate-common';
 import * as s from 'slate';
+import { DOMRange as SlateReactDomRange } from 'slate-dom';
 import * as sr from 'slate-react';
-import { DOMRange as SlateReactDomRange } from 'slate-react/dist/utils/dom';
 import type { SelectionMoveOptions as SlateSelectionMoveOptions, SelectionCollapseOptions as SlateSelectionCollapseOptions } from 'slate/dist/interfaces/transforms/selection';
 import type { TextInsertTextOptions as SlateTextInsertTextOptions } from 'slate/dist/interfaces/transforms/text';
 import { TrackingPluginActions } from '../../plugins/Tracking';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contentful/field-editor-rich-text",
-  "version": "4.16.1",
+  "version": "4.17.0",
   "source": "./src/index.tsx",
   "main": "dist/cjs/index.js",
   "module": "dist/esm/index.js",
@@ -68,16 +68,19 @@
     "moment": "^2.20.0",
     "p-debounce": "^2.1.0",
     "react-popper": "^2.3.0",
-    "scroll-into-view-if-needed": "^3.1.0",
-    "slate": "0.94.1",
+    "slate": "0.118.1",
+    "slate-dom": "0.118.1",
     "slate-history": "0.100.0",
     "slate-hyperscript": "0.77.0",
-    "slate-react": "0.102.0"
+    "slate-react": "0.118.2"
   },
   "peerDependencies": {
     "@lingui/core": "^5.3.0",
     "react": ">=16.14.0",
-    "react-dom": ">=16.14.0"
+    "react-dom": ">=16.14.0",
+    "slate": "0.118.1",
+    "slate-dom": "0.118.1",
+    "slate-react": "0.118.2"
   },
   "devDependencies": {
     "@contentful/field-editor-test-utils": "^1.7.0",
@@ -91,5 +94,5 @@
   "publishConfig": {
     "registry": "https://npm.pkg.github.com/"
   },
-  "gitHead": "c29a501efe92281b4a990adc129b78270ce1acff"
+  "gitHead": "164532011d1a69f0d3e2078f8c22db34577050f0"
 }

package/dist/cjs/editor-overrides/index.js

@@ -1,18 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", {
-    value: true
-});
-_export_star(require("./scroll-selection-into-view"), exports);
-function _export_star(from, to) {
-    Object.keys(from).forEach(function(k) {
-        if (k !== "default" && !Object.prototype.hasOwnProperty.call(to, k)) {
-            Object.defineProperty(to, k, {
-                enumerable: true,
-                get: function() {
-                    return from[k];
-                }
-            });
-        }
-    });
-    return from;
-}

package/dist/cjs/editor-overrides/scroll-selection-into-view.js

@@ -1,36 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", {
-    value: true
-});
-Object.defineProperty(exports, "defaultScrollSelectionIntoView", {
-    enumerable: true,
-    get: function() {
-        return defaultScrollSelectionIntoView;
-    }
-});
-const _scrollintoviewifneeded = /*#__PURE__*/ _interop_require_default(require("scroll-into-view-if-needed"));
-const _internal = require("../internal");
-function _interop_require_default(obj) {
-    return obj && obj.__esModule ? obj : {
-        default: obj
-    };
-}
-const defaultScrollSelectionIntoView = (editor, domRange)=>{
-    if (domRange.getBoundingClientRect && (!editor.selection || editor.selection && _internal.Range.isCollapsed(editor.selection))) {
-        const leafEl = domRange.startContainer.parentElement;
-        const domRect = domRange.getBoundingClientRect();
-        const isZeroDimensionRect = domRect.width === 0 && domRect.height === 0 && domRect.x === 0 && domRect.y === 0;
-        if (isZeroDimensionRect) {
-            const leafRect = leafEl.getBoundingClientRect();
-            const leafHasDimensions = leafRect.width > 0 || leafRect.height > 0;
-            if (leafHasDimensions) {
-                return;
-            }
-        }
-        leafEl.getBoundingClientRect = domRange.getBoundingClientRect.bind(domRange);
-        (0, _scrollintoviewifneeded.default)(leafEl, {
-            scrollMode: 'if-needed'
-        });
-        delete leafEl.getBoundingClientRect;
-    }
-};

package/dist/esm/editor-overrides/index.js

@@ -1 +0,0 @@
-export * from './scroll-selection-into-view';

package/dist/esm/editor-overrides/scroll-selection-into-view.js

@@ -1,21 +0,0 @@
-import scrollIntoView from 'scroll-into-view-if-needed';
-import { Range } from '../internal';
-export const defaultScrollSelectionIntoView = (editor, domRange)=>{
-    if (domRange.getBoundingClientRect && (!editor.selection || editor.selection && Range.isCollapsed(editor.selection))) {
-        const leafEl = domRange.startContainer.parentElement;
-        const domRect = domRange.getBoundingClientRect();
-        const isZeroDimensionRect = domRect.width === 0 && domRect.height === 0 && domRect.x === 0 && domRect.y === 0;
-        if (isZeroDimensionRect) {
-            const leafRect = leafEl.getBoundingClientRect();
-            const leafHasDimensions = leafRect.width > 0 || leafRect.height > 0;
-            if (leafHasDimensions) {
-                return;
-            }
-        }
-        leafEl.getBoundingClientRect = domRange.getBoundingClientRect.bind(domRange);
-        scrollIntoView(leafEl, {
-            scrollMode: 'if-needed'
-        });
-        delete leafEl.getBoundingClientRect;
-    }
-};

package/dist/types/editor-overrides/index.d.ts

@@ -1 +0,0 @@
-export * from './scroll-selection-into-view';

package/dist/types/editor-overrides/scroll-selection-into-view.d.ts

@@ -1,2 +0,0 @@
-import { DOMRange, ReactEditor } from '../internal';
-export declare const defaultScrollSelectionIntoView: (editor: ReactEditor, domRange: DOMRange) => void;