Merge branch 'master' of https://github.com/contentful/field-editors into dependabot/npm_and_yarn/master/testing-library/jest-dom-6.4.8

2wce · 2wce · commit c55d6250465c · 2024-08-19T14:55:33.000+02:00
diff --git a/package.json b/package.json
@@ -91,7 +91,7 @@
     "eslint-plugin-react": "7.34.1",
     "eslint-plugin-react-hooks": "4.6.0",
     "eslint-plugin-storybook": "0.6.15",
-    "eslint-plugin-you-dont-need-lodash-underscore": "6.13.0",
+    "eslint-plugin-you-dont-need-lodash-underscore": "6.14.0",
     "git-cz": "4.9.0",
     "html-webpack-plugin": "5.6.0",
     "husky": "7.0.0",
diff --git a/packages/default-field-editors/CHANGELOG.md b/packages/default-field-editors/CHANGELOG.md
@@ -3,6 +3,30 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.7.8](https://github.com/contentful/field-editors/compare/@contentful/default-field-editors@1.7.7...@contentful/default-field-editors@1.7.8) (2024-08-19)
+
+**Note:** Version bump only for package @contentful/default-field-editors
+
+## [1.7.7](https://github.com/contentful/field-editors/compare/@contentful/default-field-editors@1.7.6...@contentful/default-field-editors@1.7.7) (2024-08-19)
+
+**Note:** Version bump only for package @contentful/default-field-editors
+
+## [1.7.6](https://github.com/contentful/field-editors/compare/@contentful/default-field-editors@1.7.5...@contentful/default-field-editors@1.7.6) (2024-08-13)
+
+**Note:** Version bump only for package @contentful/default-field-editors
+
+## [1.7.5](https://github.com/contentful/field-editors/compare/@contentful/default-field-editors@1.7.4...@contentful/default-field-editors@1.7.5) (2024-08-12)
+
+**Note:** Version bump only for package @contentful/default-field-editors
+
+## [1.7.4](https://github.com/contentful/field-editors/compare/@contentful/default-field-editors@1.7.3...@contentful/default-field-editors@1.7.4) (2024-08-08)
+
+**Note:** Version bump only for package @contentful/default-field-editors
+
+## [1.7.3](https://github.com/contentful/field-editors/compare/@contentful/default-field-editors@1.7.2...@contentful/default-field-editors@1.7.3) (2024-08-06)
+
+**Note:** Version bump only for package @contentful/default-field-editors
+
 ## [1.7.2](https://github.com/contentful/field-editors/compare/@contentful/default-field-editors@1.7.1...@contentful/default-field-editors@1.7.2) (2024-07-25)
 
 **Note:** Version bump only for package @contentful/default-field-editors
diff --git a/packages/default-field-editors/package.json b/packages/default-field-editors/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@contentful/default-field-editors",
-  "version": "1.7.2",
+  "version": "1.7.8",
   "main": "dist/cjs/index.js",
   "module": "dist/esm/index.js",
   "types": "dist/types/index.d.ts",
@@ -48,12 +48,12 @@
     "@contentful/field-editor-number": "^1.3.19",
     "@contentful/field-editor-radio": "^1.5.0",
     "@contentful/field-editor-rating": "^1.4.16",
-    "@contentful/field-editor-reference": "^5.30.1",
-    "@contentful/field-editor-rich-text": "^3.25.2",
+    "@contentful/field-editor-reference": "^5.30.5",
+    "@contentful/field-editor-rich-text": "^3.26.4",
     "@contentful/field-editor-shared": "^1.6.0",
     "@contentful/field-editor-single-line": "^1.4.3",
     "@contentful/field-editor-slug": "^1.5.0",
-    "@contentful/field-editor-tags": "^1.4.16",
+    "@contentful/field-editor-tags": "^1.4.18",
     "@contentful/field-editor-url": "^1.3.18",
     "@contentful/field-editor-validation-errors": "^1.3.18",
     "contentful-management": "^11.0.0",
diff --git a/packages/reference/CHANGELOG.md b/packages/reference/CHANGELOG.md
@@ -3,6 +3,26 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [5.30.5](https://github.com/contentful/field-editors/compare/@contentful/field-editor-reference@5.30.4...@contentful/field-editor-reference@5.30.5) (2024-08-19)
+
+**Note:** Version bump only for package @contentful/field-editor-reference
+
+## [5.30.4](https://github.com/contentful/field-editors/compare/@contentful/field-editor-reference@5.30.3...@contentful/field-editor-reference@5.30.4) (2024-08-19)
+
+**Note:** Version bump only for package @contentful/field-editor-reference
+
+## [5.30.3](https://github.com/contentful/field-editors/compare/@contentful/field-editor-reference@5.30.2...@contentful/field-editor-reference@5.30.3) (2024-08-13)
+
+### Bug Fixes
+
+- add an ERL component to handle URLs in the editor [DANTE-1757] ([#1721](https://github.com/contentful/field-editors/issues/1721)) ([59156d8](https://github.com/contentful/field-editors/commit/59156d8a5e26d1bdc4d1240e8bfe5373a8d2d7de))
+
+## [5.30.2](https://github.com/contentful/field-editors/compare/@contentful/field-editor-reference@5.30.1...@contentful/field-editor-reference@5.30.2) (2024-08-06)
+
+### Bug Fixes
+
+- add a missing handler for ERL click [DANTE-1735] ([#1717](https://github.com/contentful/field-editors/issues/1717)) ([5da146c](https://github.com/contentful/field-editors/commit/5da146c3035bc2212eafed167b75e94281623a7f))
+
 ## [5.30.1](https://github.com/contentful/field-editors/compare/@contentful/field-editor-reference@5.30.0...@contentful/field-editor-reference@5.30.1) (2024-07-25)
 
 **Note:** Version bump only for package @contentful/field-editor-reference
diff --git a/packages/reference/package.json b/packages/reference/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@contentful/field-editor-reference",
-  "version": "5.30.1",
+  "version": "5.30.5",
   "main": "dist/cjs/index.js",
   "module": "dist/esm/index.js",
   "types": "dist/types/index.d.ts",
@@ -41,8 +41,8 @@
     "@contentful/field-editor-shared": "^1.6.0",
     "@contentful/mimetype": "^2.2.29",
     "@dnd-kit/core": "^6.0.8",
-    "@dnd-kit/modifiers": "^6.0.1",
-    "@dnd-kit/sortable": "^7.0.2",
+    "@dnd-kit/modifiers": "^7.0.0",
+    "@dnd-kit/sortable": "^8.0.0",
     "@tanstack/react-query": "^4.3.9",
     "constate": "^3.3.2",
     "contentful-management": "^11.30.0",
diff --git a/packages/reference/src/resources/Cards/ExternalEntryCard.tsx b/packages/reference/src/resources/Cards/ExternalEntryCard.tsx
@@ -0,0 +1,16 @@
+import * as React from 'react';
+
+import {
+  ExternalResourceCard,
+  type ExternalResourceCardProps,
+} from '../ExternalResourceCard/ExternalResourceCard';
+
+type ExternalEntryCardProps = ExternalResourceCardProps;
+
+export function ExternalEntryCard(props: ExternalEntryCardProps) {
+  const openEntryDetail = () => {
+    window.open(props.info.resource.fields.externalUrl, '_blank', 'noopener,noreferrer');
+  };
+
+  return <ExternalResourceCard {...props} onEdit={openEntryDetail} />;
+}
diff --git a/packages/reference/src/resources/Cards/ResourceCard.tsx b/packages/reference/src/resources/Cards/ResourceCard.tsx
@@ -7,8 +7,8 @@ import { SetRequired } from 'type-fest';
 import { isContentfulResourceInfo, useResource } from '../../common/EntityStore';
 import { ResourceEntityErrorCard } from '../../components';
 import { RenderDragFn, ResourceLink } from '../../types';
-import { ExternalResourceCard } from '../ExternalResourceCard/ExternalResourceCard';
 import { CardActionsHandlers, ContentfulEntryCard, EntryRoute } from './ContentfulEntryCard';
+import { ExternalEntryCard } from './ExternalEntryCard';
 
 type ResourceCardProps = {
   index?: number;
@@ -57,7 +57,7 @@ function ExistingResourceCard(
     return <ContentfulEntryCard info={info} {...props} />;
   }
 
-  return <ExternalResourceCard info={info} {...props} />;
+  return <ExternalEntryCard info={info} {...props} />;
 }
 
 function ResourceCardWrapper(props: ResourceCardProps & { inView: boolean }) {
diff --git a/packages/reference/src/resources/ExternalResourceCard/ExternalResourceCard.tsx b/packages/reference/src/resources/ExternalResourceCard/ExternalResourceCard.tsx
@@ -99,6 +99,7 @@ export function ExternalResourceCard({
 }: ExternalResourceCardProps) {
   const { resource: entity, resourceType } = info;
   const badge = ExternalEntityBadge(entity.fields.badge);
+
   return (
     <EntryCard
       as={entity.fields.externalUrl ? 'a' : 'article'}
diff --git a/packages/rich-text/CHANGELOG.md b/packages/rich-text/CHANGELOG.md
@@ -3,6 +3,34 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [3.26.4](https://github.com/contentful/field-editors/compare/@contentful/field-editor-rich-text@3.26.3...@contentful/field-editor-rich-text@3.26.4) (2024-08-19)
+
+**Note:** Version bump only for package @contentful/field-editor-rich-text
+
+## [3.26.3](https://github.com/contentful/field-editors/compare/@contentful/field-editor-rich-text@3.26.2...@contentful/field-editor-rich-text@3.26.3) (2024-08-19)
+
+**Note:** Version bump only for package @contentful/field-editor-rich-text
+
+## [3.26.2](https://github.com/contentful/field-editors/compare/@contentful/field-editor-rich-text@3.26.1...@contentful/field-editor-rich-text@3.26.2) (2024-08-13)
+
+**Note:** Version bump only for package @contentful/field-editor-rich-text
+
+## [3.26.1](https://github.com/contentful/field-editors/compare/@contentful/field-editor-rich-text@3.26.0...@contentful/field-editor-rich-text@3.26.1) (2024-08-12)
+
+### Bug Fixes
+
+- **rich-text:** changing scroll position with \r [TOL-2365] ([#1719](https://github.com/contentful/field-editors/issues/1719)) ([4dc22e4](https://github.com/contentful/field-editors/commit/4dc22e4423f908fcc3242eed13fac59ba1f47fc9))
+
+# [3.26.0](https://github.com/contentful/field-editors/compare/@contentful/field-editor-rich-text@3.25.3...@contentful/field-editor-rich-text@3.26.0) (2024-08-08)
+
+### Features
+
+- wrapping connected rte instead of root one with entity provider [] ([#1718](https://github.com/contentful/field-editors/issues/1718)) ([8172ebc](https://github.com/contentful/field-editors/commit/8172ebcfe30a491f32ffc47bb8e500496f90f485))
+
+## [3.25.3](https://github.com/contentful/field-editors/compare/@contentful/field-editor-rich-text@3.25.2...@contentful/field-editor-rich-text@3.25.3) (2024-08-06)
+
+**Note:** Version bump only for package @contentful/field-editor-rich-text
+
 ## [3.25.2](https://github.com/contentful/field-editors/compare/@contentful/field-editor-rich-text@3.25.1...@contentful/field-editor-rich-text@3.25.2) (2024-07-25)
 
 **Note:** Version bump only for package @contentful/field-editor-rich-text
diff --git a/packages/rich-text/package.json b/packages/rich-text/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@contentful/field-editor-rich-text",
-  "version": "3.25.2",
+  "version": "3.26.4",
   "source": "./src/index.tsx",
   "main": "dist/cjs/index.js",
   "module": "dist/esm/index.js",
@@ -44,7 +44,7 @@
     "@contentful/f36-icons": "^4.28.2",
     "@contentful/f36-tokens": "^4.0.5",
     "@contentful/f36-utils": "^4.24.3",
-    "@contentful/field-editor-reference": "^5.30.1",
+    "@contentful/field-editor-reference": "^5.30.5",
     "@contentful/field-editor-shared": "^1.6.0",
     "@contentful/rich-text-plain-text-renderer": "^16.0.4",
     "@contentful/rich-text-types": "16.7.0",
diff --git a/packages/rich-text/src/RichTextEditor.tsx b/packages/rich-text/src/RichTextEditor.tsx
@@ -65,26 +65,28 @@ export const ConnectedRichTextEditor = (props: ConnectedProps) => {
   );
 
   return (
-    <SdkProvider sdk={sdk}>
-      <ContentfulEditorIdProvider value={id}>
-        <div className={styles.root} data-test-id="rich-text-editor">
-          <Plate
-            id={id}
-            initialValue={initialValue}
-            plugins={plugins as PlatePlugin[]}
-            disableCorePlugins={disableCorePlugins}
-          >
-            {!props.isToolbarHidden && (
-              <StickyToolbarWrapper isDisabled={props.isDisabled}>
-                <Toolbar isDisabled={props.isDisabled} />
-              </StickyToolbarWrapper>
-            )}
-            <SyncEditorChanges incomingValue={initialValue} onChange={props.onChange} />
-            <PlateContent id={id} className={classNames} readOnly={props.isDisabled} />
-          </Plate>
-        </div>
-      </ContentfulEditorIdProvider>
-    </SdkProvider>
+    <EntityProvider sdk={sdk}>
+      <SdkProvider sdk={sdk}>
+        <ContentfulEditorIdProvider value={id}>
+          <div className={styles.root} data-test-id="rich-text-editor">
+            <Plate
+              id={id}
+              initialValue={initialValue}
+              plugins={plugins as PlatePlugin[]}
+              disableCorePlugins={disableCorePlugins}
+            >
+              {!props.isToolbarHidden && (
+                <StickyToolbarWrapper isDisabled={props.isDisabled}>
+                  <Toolbar isDisabled={props.isDisabled} />
+                </StickyToolbarWrapper>
+              )}
+              <SyncEditorChanges incomingValue={initialValue} onChange={props.onChange} />
+              <PlateContent id={id} className={classNames} readOnly={props.isDisabled} />
+            </Plate>
+          </div>
+        </ContentfulEditorIdProvider>
+      </SdkProvider>
+    </EntityProvider>
   );
 };
 
@@ -99,27 +101,25 @@ const RichTextEditor = (props: Props) => {
 
   const id = getContentfulEditorId(props.sdk);
   return (
-    <EntityProvider sdk={sdk}>
-      <FieldConnector
-        debounce={0}
-        field={sdk.field}
-        isInitiallyDisabled={isInitiallyDisabled}
-        isEmptyValue={isEmptyValue}
-      >
-        {({ lastRemoteValue, disabled, setValue }) => (
-          <ConnectedRichTextEditor
-            {...otherProps}
-            key={`rich-text-editor-${id}`}
-            value={lastRemoteValue}
-            sdk={sdk}
-            onAction={onAction}
-            isDisabled={disabled}
-            onChange={setValue}
-            restrictedMarks={restrictedMarks}
-          />
-        )}
-      </FieldConnector>
-    </EntityProvider>
+    <FieldConnector
+      debounce={0}
+      field={sdk.field}
+      isInitiallyDisabled={isInitiallyDisabled}
+      isEmptyValue={isEmptyValue}
+    >
+      {({ lastRemoteValue, disabled, setValue }) => (
+        <ConnectedRichTextEditor
+          {...otherProps}
+          key={`rich-text-editor-${id}`}
+          value={lastRemoteValue}
+          sdk={sdk}
+          onAction={onAction}
+          isDisabled={disabled}
+          onChange={setValue}
+          restrictedMarks={restrictedMarks}
+        />
+      )}
+    </FieldConnector>
   );
 };
 
diff --git a/packages/rich-text/src/helpers/sdkNavigatorSlideIn.spec.ts b/packages/rich-text/src/helpers/sdkNavigatorSlideIn.spec.ts
@@ -1,9 +1,15 @@
 import { NavigatorAPI, NavigatorSlideInfo } from '@contentful/app-sdk';
-import cloneDeep from 'lodash/cloneDeep';
 import mitt from 'mitt';
 
 import { watchCurrentSlide } from './sdkNavigatorSlideIn';
 
+// Polyfill for structuredClone
+if (typeof globalThis.structuredClone !== 'function') {
+  globalThis.structuredClone = (obj: any) => {
+    return JSON.parse(JSON.stringify(obj));
+  };
+}
+
 type NavigatorAPIEmitter = {
   slideIn: (slide: NavigatorSlideInfo) => void;
 };
@@ -198,7 +204,7 @@ describe('watchCurrentSlide().unwatch()', () => {
 
   it('does not update .info() after .unwatch()', () => {
     const slide = watchCurrentSlide(api);
-    const lastStatus = cloneDeep(slide.status());
+    const lastStatus = structuredClone(slide.status());
 
     slide.unwatch();
 
diff --git a/packages/rich-text/src/plugins/Normalizer/baseRules.ts b/packages/rich-text/src/plugins/Normalizer/baseRules.ts
@@ -3,6 +3,7 @@ import { BLOCKS, TEXT_CONTAINERS } from '@contentful/rich-text-types';
 import { INLINE_TYPES } from '../../helpers/editor';
 import { transformWrapIn } from '../../helpers/transformers';
 import { getParentNode, isText } from '../../internal/queries';
+import { insertText } from '../../internal/transforms';
 import { Element } from '../../internal/types';
 import { NormalizerRule } from './types';
 
@@ -34,4 +35,12 @@ export const baseRules: Required<NormalizerRule>[] = [
     },
     transform: transformWrapIn(BLOCKS.PARAGRAPH),
   },
+  {
+    // Replaces `\r` as it causes issues with scroll position and focus
+    match: isText,
+    validNode: (_editor, [node]) => typeof node.text === 'string' && !node.text.includes('\r'),
+    transform: (editor, [node, path]) => {
+      return insertText(editor, (node.text as string).replace(/\r/g, ''), { at: path });
+    },
+  },
 ];
diff --git a/packages/tags/CHANGELOG.md b/packages/tags/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.4.18](https://github.com/contentful/field-editors/compare/@contentful/field-editor-tags@1.4.17...@contentful/field-editor-tags@1.4.18) (2024-08-19)
+
+**Note:** Version bump only for package @contentful/field-editor-tags
+
+## [1.4.17](https://github.com/contentful/field-editors/compare/@contentful/field-editor-tags@1.4.16...@contentful/field-editor-tags@1.4.17) (2024-08-19)
+
+**Note:** Version bump only for package @contentful/field-editor-tags
+
 ## [1.4.16](https://github.com/contentful/field-editors/compare/@contentful/field-editor-tags@1.4.15...@contentful/field-editor-tags@1.4.16) (2024-07-23)
 
 **Note:** Version bump only for package @contentful/field-editor-tags
diff --git a/packages/tags/package.json b/packages/tags/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@contentful/field-editor-tags",
-  "version": "1.4.16",
+  "version": "1.4.18",
   "main": "dist/cjs/index.js",
   "module": "dist/esm/index.js",
   "types": "dist/types/index.d.ts",
@@ -40,8 +40,8 @@
     "@contentful/f36-tokens": "^4.0.0",
     "@contentful/field-editor-shared": "^1.6.0",
     "@dnd-kit/core": "^6.0.8",
-    "@dnd-kit/modifiers": "^6.0.1",
-    "@dnd-kit/sortable": "^7.0.2",
+    "@dnd-kit/modifiers": "^7.0.0",
+    "@dnd-kit/sortable": "^8.0.0",
     "emotion": "^10.0.0",
     "lodash": "^4.17.15"
   },
diff --git a/yarn.lock b/yarn.lock
