@contentful/field-editor-rich-text 6.4.0 → 6.4.1

package/dist/cjs/plugins/EmbeddedEntityInline/FetchingWrappedInlineEntryCard.js

@@ -127,7 +127,7 @@ function InternalFetchingWrappedInlineEntryCardWrapper(props) {
         requestStatus,
         onEntityFetchComplete
     ]);
-    if (requestStatus === 'loading' || requestStatus === 'idle') {
+    if ((0, _reactquery.isLoadingStatus)(requestStatus)) {
         return /*#__PURE__*/ _react.createElement(_f36components.InlineEntryCard, {
             isLoading: true
         });

package/dist/cjs/plugins/EmbeddedEntityInline/__tests__/FetchingWrappedInlineEntryCard.test.js

@@ -0,0 +1,96 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+    value: true
+});
+const _react = /*#__PURE__*/ _interop_require_wildcard(require("react"));
+const _react1 = require("@testing-library/react");
+const _vitest = require("vitest");
+const _FetchingWrappedInlineEntryCard = require("../FetchingWrappedInlineEntryCard");
+function _getRequireWildcardCache(nodeInterop) {
+    if (typeof WeakMap !== "function") return null;
+    var cacheBabelInterop = new WeakMap();
+    var cacheNodeInterop = new WeakMap();
+    return (_getRequireWildcardCache = function(nodeInterop) {
+        return nodeInterop ? cacheNodeInterop : cacheBabelInterop;
+    })(nodeInterop);
+}
+function _interop_require_wildcard(obj, nodeInterop) {
+    if (!nodeInterop && obj && obj.__esModule) {
+        return obj;
+    }
+    if (obj === null || typeof obj !== "object" && typeof obj !== "function") {
+        return {
+            default: obj
+        };
+    }
+    var cache = _getRequireWildcardCache(nodeInterop);
+    if (cache && cache.has(obj)) {
+        return cache.get(obj);
+    }
+    var newObj = {
+        __proto__: null
+    };
+    var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor;
+    for(var key in obj){
+        if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) {
+            var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null;
+            if (desc && (desc.get || desc.set)) {
+                Object.defineProperty(newObj, key, desc);
+            } else {
+                newObj[key] = obj[key];
+            }
+        }
+    }
+    newObj.default = obj;
+    if (cache) {
+        cache.set(obj, newObj);
+    }
+    return newObj;
+}
+_vitest.vi.mock('@contentful/field-editor-reference', async ()=>{
+    const actual = await _vitest.vi.importActual('@contentful/field-editor-reference');
+    return {
+        ...actual,
+        useEntity: ()=>({
+                data: undefined,
+                status: 'pending'
+            }),
+        useEntityLoader: ()=>({
+                getEntityScheduledActions: ()=>Promise.resolve([])
+            })
+    };
+});
+_vitest.vi.mock('@contentful/field-editor-shared/react-query', async (importOriginal)=>{
+    const actual = await importOriginal();
+    return {
+        ...actual,
+        useContentType: ()=>({
+                data: undefined
+            })
+    };
+});
+(0, _react1.configure)({
+    testIdAttribute: 'data-test-id'
+});
+const sdk = {
+    field: {
+        locale: 'en-US'
+    },
+    locales: {
+        default: 'en-US'
+    },
+    parameters: {
+        instance: {}
+    }
+};
+(0, _vitest.test)("renders the loading card when useEntity returns status: 'pending' (react-query v5)", ()=>{
+    const { container } = (0, _react1.render)(/*#__PURE__*/ _react.createElement(_FetchingWrappedInlineEntryCard.FetchingWrappedInlineEntryCard, {
+        sdk: sdk,
+        entryId: "entry-id",
+        isSelected: false,
+        isDisabled: false,
+        onEdit: ()=>{},
+        onRemove: ()=>{}
+    }));
+    (0, _vitest.expect)(container.querySelector('[data-test-id="cf-ui-skeleton-form"]')).not.toBeNull();
+});

package/dist/cjs/plugins/EmbeddedResourceInline/FetchingWrappedResourceInlineCard.js

@@ -12,6 +12,7 @@ const _react = /*#__PURE__*/ _interop_require_wildcard(require("react"));
 const _f36components = require("@contentful/f36-components");
 const _fieldeditorreference = require("@contentful/field-editor-reference");
 const _fieldeditorshared = require("@contentful/field-editor-shared");
+const _reactquery = require("@contentful/field-editor-shared/react-query");
 const _richtexttypes = require("@contentful/rich-text-types");
 const _utils = require("../../plugins/shared/utils");
 function _getRequireWildcardCache(nodeInterop) {
@@ -77,7 +78,7 @@ function FetchingWrappedResourceInlineCard(props) {
             isSelected: props.isSelected
         });
     }
-    if (requestStatus === 'loading' || data === undefined) {
+    if ((0, _reactquery.isLoadingStatus)(requestStatus) || data === undefined) {
         return /*#__PURE__*/ _react.createElement(_f36components.InlineEntryCard, {
             isLoading: true
         });

package/dist/cjs/plugins/EmbeddedResourceInline/__tests__/FetchingWrappedResourceInlineCard.test.js

@@ -0,0 +1,91 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+    value: true
+});
+const _react = /*#__PURE__*/ _interop_require_wildcard(require("react"));
+const _react1 = require("@testing-library/react");
+const _vitest = require("vitest");
+const _FetchingWrappedResourceInlineCard = require("../FetchingWrappedResourceInlineCard");
+function _getRequireWildcardCache(nodeInterop) {
+    if (typeof WeakMap !== "function") return null;
+    var cacheBabelInterop = new WeakMap();
+    var cacheNodeInterop = new WeakMap();
+    return (_getRequireWildcardCache = function(nodeInterop) {
+        return nodeInterop ? cacheNodeInterop : cacheBabelInterop;
+    })(nodeInterop);
+}
+function _interop_require_wildcard(obj, nodeInterop) {
+    if (!nodeInterop && obj && obj.__esModule) {
+        return obj;
+    }
+    if (obj === null || typeof obj !== "object" && typeof obj !== "function") {
+        return {
+            default: obj
+        };
+    }
+    var cache = _getRequireWildcardCache(nodeInterop);
+    if (cache && cache.has(obj)) {
+        return cache.get(obj);
+    }
+    var newObj = {
+        __proto__: null
+    };
+    var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor;
+    for(var key in obj){
+        if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) {
+            var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null;
+            if (desc && (desc.get || desc.set)) {
+                Object.defineProperty(newObj, key, desc);
+            } else {
+                newObj[key] = obj[key];
+            }
+        }
+    }
+    newObj.default = obj;
+    if (cache) {
+        cache.set(obj, newObj);
+    }
+    return newObj;
+}
+_vitest.vi.mock('@contentful/field-editor-reference', async ()=>{
+    const actual = await _vitest.vi.importActual('@contentful/field-editor-reference');
+    return {
+        ...actual,
+        useResource: ()=>({
+                data: {
+                    fake: true
+                },
+                status: 'pending'
+            })
+    };
+});
+(0, _react1.configure)({
+    testIdAttribute: 'data-test-id'
+});
+const sdk = {
+    field: {
+        locale: 'en-US'
+    },
+    ids: {
+        entry: 'entry-id'
+    },
+    parameters: {
+        instance: {}
+    }
+};
+const link = {
+    linkType: 'Contentful:Entry',
+    urn: 'crn:contentful:::content:spaces/s/environments/e/entries/target',
+    type: 'ResourceLink'
+};
+(0, _vitest.test)("renders the loading card when useResource returns status: 'pending' (react-query v5)", ()=>{
+    const { container } = (0, _react1.render)(/*#__PURE__*/ _react.createElement(_FetchingWrappedResourceInlineCard.FetchingWrappedResourceInlineCard, {
+        link: link,
+        sdk: sdk,
+        isSelected: false,
+        isDisabled: false,
+        onRemove: ()=>{}
+    }));
+    (0, _vitest.expect)(container.firstChild).not.toBeNull();
+    (0, _vitest.expect)(container.textContent).not.toContain('Untitled');
+});

package/dist/cjs/plugins/Hyperlink/useResourceEntityInfo.js

@@ -10,6 +10,7 @@ Object.defineProperty(exports, "useResourceEntityInfo", {
 });
 const _react = /*#__PURE__*/ _interop_require_wildcard(require("react"));
 const _fieldeditorreference = require("@contentful/field-editor-reference");
+const _reactquery = require("@contentful/field-editor-shared/react-query");
 const _utils = require("../../plugins/shared/utils");
 function _getRequireWildcardCache(nodeInterop) {
     if (typeof WeakMap !== "function") return null;
@@ -62,7 +63,7 @@ function useResourceEntityInfo({ onEntityFetchComplete, target }) {
         status,
         onEntityFetchComplete
     ]);
-    if (status === 'loading' || status === 'pending') {
+    if ((0, _reactquery.isLoadingStatus)(status)) {
         return `Loading entry...`;
     }
     if (!data || error) {

package/dist/cjs/plugins/shared/FetchingWrappedAssetCard.js

@@ -12,6 +12,7 @@ const _react = /*#__PURE__*/ _interop_require_wildcard(require("react"));
 const _f36components = require("@contentful/f36-components");
 const _fieldeditorreference = require("@contentful/field-editor-reference");
 const _fieldeditorshared = require("@contentful/field-editor-shared");
+const _reactquery = require("@contentful/field-editor-shared/react-query");
 const _fastdeepequal = /*#__PURE__*/ _interop_require_default(require("fast-deep-equal"));
 function _interop_require_default(obj) {
     return obj && obj.__esModule ? obj : {
@@ -109,7 +110,7 @@ function FetchingWrappedAssetCard(props) {
         onEntityFetchComplete,
         status
     ]);
-    if (status === 'loading' || status === 'idle' || status === 'pending') {
+    if ((0, _reactquery.isLoadingStatus)(status)) {
         return /*#__PURE__*/ _react.createElement(_f36components.AssetCard, {
             size: "default",
             isLoading: true

package/dist/cjs/plugins/shared/FetchingWrappedEntryCard.js

@@ -118,7 +118,7 @@ const InternalFetchingWrappedEntryCard = (props)=>{
         onEntityFetchComplete,
         status
     ]);
-    if (status === 'loading' || status === 'idle' || status === 'pending') {
+    if ((0, _reactquery.isLoadingStatus)(status)) {
         return /*#__PURE__*/ _react.createElement(_f36components.EntryCard, {
             isLoading: true
         });

package/dist/cjs/plugins/shared/FetchingWrappedResourceCard.js

@@ -11,6 +11,7 @@ Object.defineProperty(exports, "FetchingWrappedResourceCard", {
 const _react = /*#__PURE__*/ _interop_require_wildcard(require("react"));
 const _f36components = require("@contentful/f36-components");
 const _fieldeditorreference = require("@contentful/field-editor-reference");
+const _reactquery = require("@contentful/field-editor-shared/react-query");
 const _fastdeepequal = /*#__PURE__*/ _interop_require_default(require("fast-deep-equal"));
 function _interop_require_default(obj) {
     return obj && obj.__esModule ? obj : {
@@ -59,7 +60,7 @@ function _interop_require_wildcard(obj, nodeInterop) {
     return newObj;
 }
 const InternalEntryCard = /*#__PURE__*/ _react.memo((props)=>{
-    if (props.data === undefined || props.status === 'loading' || props.status === 'pending') {
+    if (props.data === undefined || (0, _reactquery.isLoadingStatus)(props.status)) {
         return /*#__PURE__*/ _react.createElement(_f36components.EntryCard, {
             isLoading: true
         });

package/dist/esm/plugins/EmbeddedEntityInline/FetchingWrappedInlineEntryCard.js

@@ -4,7 +4,7 @@ import { ClockIcon } from '@contentful/f36-icons';
 import tokens from '@contentful/f36-tokens';
 import { ScheduledIconWithTooltip, useEntity, useEntityLoader } from '@contentful/field-editor-reference';
 import { entityHelpers } from '@contentful/field-editor-shared';
-import { SharedQueryClientProvider, useContentType } from '@contentful/field-editor-shared/react-query';
+import { SharedQueryClientProvider, isLoadingStatus, useContentType } from '@contentful/field-editor-shared/react-query';
 import { INLINES } from '@contentful/rich-text-types';
 import { css } from '@emotion/css';
 const { getEntryTitle, getEntityStatus } = entityHelpers;
@@ -71,7 +71,7 @@ function InternalFetchingWrappedInlineEntryCardWrapper(props) {
         requestStatus,
         onEntityFetchComplete
     ]);
-    if (requestStatus === 'loading' || requestStatus === 'idle') {
+    if (isLoadingStatus(requestStatus)) {
         return /*#__PURE__*/ React.createElement(InlineEntryCard, {
             isLoading: true
         });

package/dist/esm/plugins/EmbeddedEntityInline/__tests__/FetchingWrappedInlineEntryCard.test.js

@@ -0,0 +1,51 @@
+import * as React from 'react';
+import { configure, render } from '@testing-library/react';
+import { expect, test, vi } from 'vitest';
+vi.mock('@contentful/field-editor-reference', async ()=>{
+    const actual = await vi.importActual('@contentful/field-editor-reference');
+    return {
+        ...actual,
+        useEntity: ()=>({
+                data: undefined,
+                status: 'pending'
+            }),
+        useEntityLoader: ()=>({
+                getEntityScheduledActions: ()=>Promise.resolve([])
+            })
+    };
+});
+vi.mock('@contentful/field-editor-shared/react-query', async (importOriginal)=>{
+    const actual = await importOriginal();
+    return {
+        ...actual,
+        useContentType: ()=>({
+                data: undefined
+            })
+    };
+});
+import { FetchingWrappedInlineEntryCard } from '../FetchingWrappedInlineEntryCard';
+configure({
+    testIdAttribute: 'data-test-id'
+});
+const sdk = {
+    field: {
+        locale: 'en-US'
+    },
+    locales: {
+        default: 'en-US'
+    },
+    parameters: {
+        instance: {}
+    }
+};
+test("renders the loading card when useEntity returns status: 'pending' (react-query v5)", ()=>{
+    const { container } = render(/*#__PURE__*/ React.createElement(FetchingWrappedInlineEntryCard, {
+        sdk: sdk,
+        entryId: "entry-id",
+        isSelected: false,
+        isDisabled: false,
+        onEdit: ()=>{},
+        onRemove: ()=>{}
+    }));
+    expect(container.querySelector('[data-test-id="cf-ui-skeleton-form"]')).not.toBeNull();
+});

package/dist/esm/plugins/EmbeddedResourceInline/FetchingWrappedResourceInlineCard.js

@@ -2,6 +2,7 @@ import * as React from 'react';
 import { InlineEntryCard, MenuItem, Text } from '@contentful/f36-components';
 import { useResource } from '@contentful/field-editor-reference';
 import { entityHelpers } from '@contentful/field-editor-shared';
+import { isLoadingStatus } from '@contentful/field-editor-shared/react-query';
 import { INLINES } from '@contentful/rich-text-types';
 import { truncateTitle } from '../../plugins/shared/utils';
 const { getEntryTitle, getEntityStatus } = entityHelpers;
@@ -26,7 +27,7 @@ export function FetchingWrappedResourceInlineCard(props) {
             isSelected: props.isSelected
         });
     }
-    if (requestStatus === 'loading' || data === undefined) {
+    if (isLoadingStatus(requestStatus) || data === undefined) {
         return /*#__PURE__*/ React.createElement(InlineEntryCard, {
             isLoading: true
         });

package/dist/esm/plugins/EmbeddedResourceInline/__tests__/FetchingWrappedResourceInlineCard.test.js

@@ -0,0 +1,46 @@
+import * as React from 'react';
+import { configure, render } from '@testing-library/react';
+import { expect, test, vi } from 'vitest';
+vi.mock('@contentful/field-editor-reference', async ()=>{
+    const actual = await vi.importActual('@contentful/field-editor-reference');
+    return {
+        ...actual,
+        useResource: ()=>({
+                data: {
+                    fake: true
+                },
+                status: 'pending'
+            })
+    };
+});
+import { FetchingWrappedResourceInlineCard } from '../FetchingWrappedResourceInlineCard';
+configure({
+    testIdAttribute: 'data-test-id'
+});
+const sdk = {
+    field: {
+        locale: 'en-US'
+    },
+    ids: {
+        entry: 'entry-id'
+    },
+    parameters: {
+        instance: {}
+    }
+};
+const link = {
+    linkType: 'Contentful:Entry',
+    urn: 'crn:contentful:::content:spaces/s/environments/e/entries/target',
+    type: 'ResourceLink'
+};
+test("renders the loading card when useResource returns status: 'pending' (react-query v5)", ()=>{
+    const { container } = render(/*#__PURE__*/ React.createElement(FetchingWrappedResourceInlineCard, {
+        link: link,
+        sdk: sdk,
+        isSelected: false,
+        isDisabled: false,
+        onRemove: ()=>{}
+    }));
+    expect(container.firstChild).not.toBeNull();
+    expect(container.textContent).not.toContain('Untitled');
+});

package/dist/esm/plugins/Hyperlink/useResourceEntityInfo.js

@@ -1,5 +1,6 @@
 import * as React from 'react';
 import { useResource } from '@contentful/field-editor-reference';
+import { isLoadingStatus } from '@contentful/field-editor-shared/react-query';
 import { truncateTitle } from '../../plugins/shared/utils';
 export function useResourceEntityInfo({ onEntityFetchComplete, target }) {
     const { data, error, status } = useResource(target.sys.linkType, target.sys.urn);
@@ -11,7 +12,7 @@ export function useResourceEntityInfo({ onEntityFetchComplete, target }) {
         status,
         onEntityFetchComplete
     ]);
-    if (status === 'loading' || status === 'pending') {
+    if (isLoadingStatus(status)) {
         return `Loading entry...`;
     }
     if (!data || error) {

package/dist/esm/plugins/shared/FetchingWrappedAssetCard.js

@@ -2,6 +2,7 @@ import * as React from 'react';
 import { AssetCard, DragHandle } from '@contentful/f36-components';
 import { useEntity, useEntityLoader, MissingEntityCard, WrappedAssetCard } from '@contentful/field-editor-reference';
 import { useLocalePublishStatus, useActiveLocales, useReleaseStatus } from '@contentful/field-editor-shared';
+import { isLoadingStatus } from '@contentful/field-editor-shared/react-query';
 import areEqual from 'fast-deep-equal';
 const InternalAssetCard = /*#__PURE__*/ React.memo(({ asset, sdk, isDisabled, isSelected, locale, onEdit, onRemove, loadEntityScheduledActions, localesStatusMap, release, releaseStatusMap, releaseEntityStatus })=>{
     const activeLocales = useActiveLocales(sdk);
@@ -53,7 +54,7 @@ export function FetchingWrappedAssetCard(props) {
         onEntityFetchComplete,
         status
     ]);
-    if (status === 'loading' || status === 'idle' || status === 'pending') {
+    if (isLoadingStatus(status)) {
         return /*#__PURE__*/ React.createElement(AssetCard, {
             size: "default",
             isLoading: true

package/dist/esm/plugins/shared/FetchingWrappedEntryCard.js

@@ -2,7 +2,7 @@ import * as React from 'react';
 import { DragHandle, EntryCard } from '@contentful/f36-components';
 import { useEntity, MissingEntityCard, WrappedEntryCard, useEntityLoader } from '@contentful/field-editor-reference';
 import { useLocalePublishStatus, useActiveLocales, useReleaseStatus } from '@contentful/field-editor-shared';
-import { SharedQueryClientProvider, useContentType } from '@contentful/field-editor-shared/react-query';
+import { isLoadingStatus, SharedQueryClientProvider, useContentType } from '@contentful/field-editor-shared/react-query';
 import areEqual from 'fast-deep-equal';
 const InternalEntryCard = /*#__PURE__*/ React.memo(({ entry, sdk, loadEntityScheduledActions, releaseStatusMap, release, releaseEntityStatus, isSelected, isDisabled, locale, contentType, onEdit, onRemove, localesStatusMap })=>{
     const activeLocales = useActiveLocales(sdk);
@@ -62,7 +62,7 @@ const InternalFetchingWrappedEntryCard = (props)=>{
         onEntityFetchComplete,
         status
     ]);
-    if (status === 'loading' || status === 'idle' || status === 'pending') {
+    if (isLoadingStatus(status)) {
         return /*#__PURE__*/ React.createElement(EntryCard, {
             isLoading: true
         });

package/dist/esm/plugins/shared/FetchingWrappedResourceCard.js

@@ -1,9 +1,10 @@
 import * as React from 'react';
 import { DragHandle, EntryCard } from '@contentful/f36-components';
 import { ResourceEntityErrorCard, WrappedEntryCard, useResource } from '@contentful/field-editor-reference';
+import { isLoadingStatus } from '@contentful/field-editor-shared/react-query';
 import areEqual from 'fast-deep-equal';
 const InternalEntryCard = /*#__PURE__*/ React.memo((props)=>{
-    if (props.data === undefined || props.status === 'loading' || props.status === 'pending') {
+    if (props.data === undefined || isLoadingStatus(props.status)) {
         return /*#__PURE__*/ React.createElement(EntryCard, {
             isLoading: true
         });

package/dist/types/plugins/EmbeddedEntityInline/__tests__/FetchingWrappedInlineEntryCard.test.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/types/plugins/EmbeddedResourceInline/__tests__/FetchingWrappedResourceInlineCard.test.d.ts

@@ -0,0 +1 @@
+export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contentful/field-editor-rich-text",
-  "version": "6.4.0",
+  "version": "6.4.1",
   "source": "./src/index.tsx",
   "main": "dist/cjs/index.js",
   "module": "dist/esm/index.js",
@@ -45,8 +45,8 @@
     "@contentful/f36-icons": "^6.7.1",
     "@contentful/f36-tokens": "^6.1.2",
     "@contentful/f36-utils": "^6.1.0",
-    "@contentful/field-editor-reference": "^8.4.0",
-    "@contentful/field-editor-shared": "^4.5.0",
+    "@contentful/field-editor-reference": "^8.4.1",
+    "@contentful/field-editor-shared": "^4.5.1",
     "@contentful/rich-text-plain-text-renderer": "^17.0.0",
     "@contentful/rich-text-types": "^17.2.5",
     "@emotion/css": "^11.13.5",
@@ -94,5 +94,5 @@
   "publishConfig": {
     "registry": "https://npm.pkg.github.com/"
   },
-  "gitHead": "47538f07710ab52d504407c6bf62dd3877ecaabe"
+  "gitHead": "78ed76ca4a3207924294971766a40bb46e196203"
 }