npm - @contentful/field-editor-rich-text - Versions diffs - 3.20.2 → 3.20.3 - Mend

@contentful/field-editor-rich-text 3.20.2 → 3.20.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (7) hide show

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

@@ -69,22 +69,59 @@ const styles = {
         marginRight: _f36tokens.default.spacing2Xs
     })
 };
-function FetchingWrappedInlineEntryCard(props) {
-    const { data: entry, status: requestStatus } = (0, _fieldeditorreference.useEntity)('Entry', props.entryId);
-    const { getEntityScheduledActions } = (0, _fieldeditorreference.useEntityLoader)();
-    const loadEntityScheduledActions = ()=>getEntityScheduledActions('Entry', props.entryId);
-    const allContentTypes = props.sdk.space.getCachedContentTypes();
-    const { onEntityFetchComplete } = props;
+function InternalFetchingWrappedInlineEntryCard({ entry, allContentTypes, locale, defaultLocale, isSelected, entryStatus, getEntityScheduledActions, onEdit, onRemove, isDisabled }) {
     const contentType = _react.useMemo(()=>{
-        if (requestStatus !== 'success' || !entry || !allContentTypes) {
+        if (!allContentTypes) {
             return undefined;
         }
         return allContentTypes.find((contentType)=>contentType.sys.id === entry.sys.contentType.sys.id);
     }, [
         allContentTypes,
+        entry
+    ]);
+    const title = _react.useMemo(()=>getEntryTitle({
+            entry,
+            contentType,
+            localeCode: locale,
+            defaultLocaleCode: defaultLocale,
+            defaultTitle: 'Untitled'
+        }), [
         entry,
-        requestStatus
+        contentType,
+        locale,
+        defaultLocale
     ]);
+    return _react.createElement(_f36components.InlineEntryCard, {
+        testId: _richtexttypes.INLINES.EMBEDDED_ENTRY,
+        isSelected: isSelected,
+        title: contentType ? `${contentType.name}: ${title}` : title,
+        status: entryStatus,
+        actions: [
+            _react.createElement(_f36components.MenuItem, {
+                key: "edit",
+                onClick: onEdit
+            }, "Edit"),
+            _react.createElement(_f36components.MenuItem, {
+                key: "remove",
+                onClick: onRemove,
+                disabled: isDisabled,
+                testId: "delete"
+            }, "Remove")
+        ]
+    }, _react.createElement(_fieldeditorreference.ScheduledIconWithTooltip, {
+        getEntityScheduledActions: getEntityScheduledActions,
+        entityType: "Entry",
+        entityId: entry.sys.id
+    }, _react.createElement(_f36icons.ClockIcon, {
+        className: styles.scheduledIcon,
+        variant: "muted",
+        testId: "scheduled-icon"
+    })), _react.createElement(_f36components.Text, null, title));
+}
+function FetchingWrappedInlineEntryCard(props) {
+    const { data: entry, status: requestStatus } = (0, _fieldeditorreference.useEntity)('Entry', props.entryId);
+    const { getEntityScheduledActions } = (0, _fieldeditorreference.useEntityLoader)();
+    const { onEntityFetchComplete } = props;
     _react.useEffect(()=>{
         if (requestStatus !== 'success') {
             return;
@@ -94,20 +131,11 @@ function FetchingWrappedInlineEntryCard(props) {
         requestStatus,
         onEntityFetchComplete
     ]);
-    const contentTypeName = contentType ? contentType.name : '';
-    const title = _react.useMemo(()=>requestStatus === 'success' && getEntryTitle({
-            entry,
-            contentType,
-            localeCode: props.sdk.field.locale,
-            defaultLocaleCode: props.sdk.locales.default,
-            defaultTitle: 'Untitled'
-        }), [
-        entry,
-        requestStatus,
-        contentType,
-        props.sdk.field.locale,
-        props.sdk.locales.default
-    ]);
+    if (requestStatus === 'loading' || requestStatus === 'idle') {
+        return _react.createElement(_f36components.InlineEntryCard, {
+            isLoading: true
+        });
+    }
     if (requestStatus === 'error') {
         return _react.createElement(_f36components.InlineEntryCard, {
             title: "Content missing or inaccessible",
@@ -115,11 +143,6 @@ function FetchingWrappedInlineEntryCard(props) {
             isSelected: props.isSelected
         });
     }
-    if (requestStatus === 'loading') {
-        return _react.createElement(_f36components.InlineEntryCard, {
-            isLoading: true
-        });
-    }
     const entryStatus = getEntryStatus(entry.sys);
     if (entryStatus === 'deleted') {
         return _react.createElement(_f36components.InlineEntryCard, {
@@ -135,30 +158,16 @@ function FetchingWrappedInlineEntryCard(props) {
             ]
         });
     }
-    return _react.createElement(_f36components.InlineEntryCard, {
-        testId: _richtexttypes.INLINES.EMBEDDED_ENTRY,
+    return _react.createElement(InternalFetchingWrappedInlineEntryCard, {
+        allContentTypes: props.sdk.space.getCachedContentTypes(),
+        getEntityScheduledActions: ()=>getEntityScheduledActions('Entry', props.entryId),
+        locale: props.sdk.field.locale,
+        defaultLocale: props.sdk.locales.default,
+        entry: entry,
+        entryStatus: entryStatus,
+        isDisabled: props.isDisabled,
         isSelected: props.isSelected,
-        title: `${contentTypeName}: ${title}`,
-        status: entryStatus,
-        actions: [
-            _react.createElement(_f36components.MenuItem, {
-                key: "edit",
-                onClick: props.onEdit
-            }, "Edit"),
-            _react.createElement(_f36components.MenuItem, {
-                key: "remove",
-                onClick: props.onRemove,
-                disabled: props.isDisabled,
-                testId: "delete"
-            }, "Remove")
-        ]
-    }, _react.createElement(_fieldeditorreference.ScheduledIconWithTooltip, {
-        getEntityScheduledActions: loadEntityScheduledActions,
-        entityType: "Entry",
-        entityId: entry.sys.id
-    }, _react.createElement(_f36icons.ClockIcon, {
-        className: styles.scheduledIcon,
-        variant: "muted",
-        testId: "scheduled-icon"
-    })), _react.createElement(_f36components.Text, null, title));
+        onEdit: props.onEdit,
+        onRemove: props.onRemove
+    });
 }

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

@@ -58,21 +58,7 @@ function _interop_require_wildcard(obj, nodeInterop) {
     }
     return newObj;
 }
-const InternalAssetCard = _react.memo((props)=>{
-    if (props.status === 'error') {
-        return _react.createElement(_fieldeditorreference.MissingEntityCard, {
-            isDisabled: props.isDisabled,
-            onRemove: props.onRemove,
-            providerName: "Contentful"
-        });
-    }
-    if (!props.asset) {
-        return _react.createElement(_f36components.AssetCard, {
-            size: "default",
-            isLoading: true
-        });
-    }
-    return _react.createElement(_fieldeditorreference.WrappedAssetCard, {
+const InternalAssetCard = _react.memo((props)=>_react.createElement(_fieldeditorreference.WrappedAssetCard, {
         getEntityScheduledActions: props.loadEntityScheduledActions,
         size: "small",
         isSelected: props.isSelected,
@@ -83,8 +69,7 @@ const InternalAssetCard = _react.memo((props)=>{
         onEdit: props.onEdit,
         onRemove: props.isDisabled ? undefined : props.onRemove,
         isClickable: false
-    });
-}, _fastdeepequal.default);
+    }), _fastdeepequal.default);
 InternalAssetCard.displayName = 'InternalAssetCard';
 function FetchingWrappedAssetCard(props) {
     const { onEntityFetchComplete } = props;
@@ -102,9 +87,21 @@ function FetchingWrappedAssetCard(props) {
         onEntityFetchComplete,
         status
     ]);
+    if (status === 'loading' || status === 'idle') {
+        return _react.createElement(_f36components.AssetCard, {
+            size: "default",
+            isLoading: true
+        });
+    }
+    if (status === 'error') {
+        return _react.createElement(_fieldeditorreference.MissingEntityCard, {
+            isDisabled: props.isDisabled,
+            onRemove: props.onRemove,
+            providerName: "Contentful"
+        });
+    }
     return _react.createElement(InternalAssetCard, {
         asset: asset,
-        status: status,
         sdk: props.sdk,
         isDisabled: props.isDisabled,
         isSelected: props.isSelected,

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

@@ -59,19 +59,7 @@ function _interop_require_wildcard(obj, nodeInterop) {
     return newObj;
 }
 const InternalEntryCard = _react.memo((props)=>{
-    const { entry, sdk, loadEntityScheduledActions, status } = props;
-    if (status === 'error') {
-        return _react.createElement(_fieldeditorreference.MissingEntityCard, {
-            isDisabled: props.isDisabled,
-            onRemove: props.onRemove,
-            providerName: "Contentful"
-        });
-    }
-    if (entry === undefined) {
-        return _react.createElement(_f36components.EntryCard, {
-            isLoading: true
-        });
-    }
+    const { entry, sdk, loadEntityScheduledActions } = props;
     const contentType = sdk.space.getCachedContentTypes().find((contentType)=>contentType.sys.id === entry.sys.contentType.sys.id);
     return _react.createElement(_fieldeditorreference.WrappedEntryCard, {
         size: "default",
@@ -105,8 +93,19 @@ const FetchingWrappedEntryCard = (props)=>{
         onEntityFetchComplete,
         status
     ]);
+    if (status === 'loading' || status === 'idle') {
+        return _react.createElement(_f36components.EntryCard, {
+            isLoading: true
+        });
+    }
+    if (status === 'error') {
+        return _react.createElement(_fieldeditorreference.MissingEntityCard, {
+            isDisabled: props.isDisabled,
+            onRemove: props.onRemove,
+            providerName: "Contentful"
+        });
+    }
     return _react.createElement(InternalEntryCard, {
-        status: status,
         entry: entry,
         sdk: props.sdk,
         locale: props.locale,

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

@@ -13,22 +13,59 @@ const styles = {
         marginRight: tokens.spacing2Xs
     })
 };
-export function FetchingWrappedInlineEntryCard(props) {
-    const { data: entry, status: requestStatus } = useEntity('Entry', props.entryId);
-    const { getEntityScheduledActions } = useEntityLoader();
-    const loadEntityScheduledActions = ()=>getEntityScheduledActions('Entry', props.entryId);
-    const allContentTypes = props.sdk.space.getCachedContentTypes();
-    const { onEntityFetchComplete } = props;
+function InternalFetchingWrappedInlineEntryCard({ entry, allContentTypes, locale, defaultLocale, isSelected, entryStatus, getEntityScheduledActions, onEdit, onRemove, isDisabled }) {
     const contentType = React.useMemo(()=>{
-        if (requestStatus !== 'success' || !entry || !allContentTypes) {
+        if (!allContentTypes) {
             return undefined;
         }
         return allContentTypes.find((contentType)=>contentType.sys.id === entry.sys.contentType.sys.id);
     }, [
         allContentTypes,
+        entry
+    ]);
+    const title = React.useMemo(()=>getEntryTitle({
+            entry,
+            contentType,
+            localeCode: locale,
+            defaultLocaleCode: defaultLocale,
+            defaultTitle: 'Untitled'
+        }), [
         entry,
-        requestStatus
+        contentType,
+        locale,
+        defaultLocale
     ]);
+    return React.createElement(InlineEntryCard, {
+        testId: INLINES.EMBEDDED_ENTRY,
+        isSelected: isSelected,
+        title: contentType ? `${contentType.name}: ${title}` : title,
+        status: entryStatus,
+        actions: [
+            React.createElement(MenuItem, {
+                key: "edit",
+                onClick: onEdit
+            }, "Edit"),
+            React.createElement(MenuItem, {
+                key: "remove",
+                onClick: onRemove,
+                disabled: isDisabled,
+                testId: "delete"
+            }, "Remove")
+        ]
+    }, React.createElement(ScheduledIconWithTooltip, {
+        getEntityScheduledActions: getEntityScheduledActions,
+        entityType: "Entry",
+        entityId: entry.sys.id
+    }, React.createElement(ClockIcon, {
+        className: styles.scheduledIcon,
+        variant: "muted",
+        testId: "scheduled-icon"
+    })), React.createElement(Text, null, title));
+}
+export function FetchingWrappedInlineEntryCard(props) {
+    const { data: entry, status: requestStatus } = useEntity('Entry', props.entryId);
+    const { getEntityScheduledActions } = useEntityLoader();
+    const { onEntityFetchComplete } = props;
     React.useEffect(()=>{
         if (requestStatus !== 'success') {
             return;
@@ -38,20 +75,11 @@ export function FetchingWrappedInlineEntryCard(props) {
         requestStatus,
         onEntityFetchComplete
     ]);
-    const contentTypeName = contentType ? contentType.name : '';
-    const title = React.useMemo(()=>requestStatus === 'success' && getEntryTitle({
-            entry,
-            contentType,
-            localeCode: props.sdk.field.locale,
-            defaultLocaleCode: props.sdk.locales.default,
-            defaultTitle: 'Untitled'
-        }), [
-        entry,
-        requestStatus,
-        contentType,
-        props.sdk.field.locale,
-        props.sdk.locales.default
-    ]);
+    if (requestStatus === 'loading' || requestStatus === 'idle') {
+        return React.createElement(InlineEntryCard, {
+            isLoading: true
+        });
+    }
     if (requestStatus === 'error') {
         return React.createElement(InlineEntryCard, {
             title: "Content missing or inaccessible",
@@ -59,11 +87,6 @@ export function FetchingWrappedInlineEntryCard(props) {
             isSelected: props.isSelected
         });
     }
-    if (requestStatus === 'loading') {
-        return React.createElement(InlineEntryCard, {
-            isLoading: true
-        });
-    }
     const entryStatus = getEntryStatus(entry.sys);
     if (entryStatus === 'deleted') {
         return React.createElement(InlineEntryCard, {
@@ -79,30 +102,16 @@ export function FetchingWrappedInlineEntryCard(props) {
             ]
         });
     }
-    return React.createElement(InlineEntryCard, {
-        testId: INLINES.EMBEDDED_ENTRY,
+    return React.createElement(InternalFetchingWrappedInlineEntryCard, {
+        allContentTypes: props.sdk.space.getCachedContentTypes(),
+        getEntityScheduledActions: ()=>getEntityScheduledActions('Entry', props.entryId),
+        locale: props.sdk.field.locale,
+        defaultLocale: props.sdk.locales.default,
+        entry: entry,
+        entryStatus: entryStatus,
+        isDisabled: props.isDisabled,
         isSelected: props.isSelected,
-        title: `${contentTypeName}: ${title}`,
-        status: entryStatus,
-        actions: [
-            React.createElement(MenuItem, {
-                key: "edit",
-                onClick: props.onEdit
-            }, "Edit"),
-            React.createElement(MenuItem, {
-                key: "remove",
-                onClick: props.onRemove,
-                disabled: props.isDisabled,
-                testId: "delete"
-            }, "Remove")
-        ]
-    }, React.createElement(ScheduledIconWithTooltip, {
-        getEntityScheduledActions: loadEntityScheduledActions,
-        entityType: "Entry",
-        entityId: entry.sys.id
-    }, React.createElement(ClockIcon, {
-        className: styles.scheduledIcon,
-        variant: "muted",
-        testId: "scheduled-icon"
-    })), React.createElement(Text, null, title));
+        onEdit: props.onEdit,
+        onRemove: props.onRemove
+    });
 }

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

@@ -2,21 +2,7 @@ import * as React from 'react';
 import { AssetCard } from '@contentful/f36-components';
 import { useEntity, useEntityLoader, MissingEntityCard, WrappedAssetCard } from '@contentful/field-editor-reference';
 import areEqual from 'fast-deep-equal';
-const InternalAssetCard = React.memo((props)=>{
-    if (props.status === 'error') {
-        return React.createElement(MissingEntityCard, {
-            isDisabled: props.isDisabled,
-            onRemove: props.onRemove,
-            providerName: "Contentful"
-        });
-    }
-    if (!props.asset) {
-        return React.createElement(AssetCard, {
-            size: "default",
-            isLoading: true
-        });
-    }
-    return React.createElement(WrappedAssetCard, {
+const InternalAssetCard = React.memo((props)=>React.createElement(WrappedAssetCard, {
         getEntityScheduledActions: props.loadEntityScheduledActions,
         size: "small",
         isSelected: props.isSelected,
@@ -27,8 +13,7 @@ const InternalAssetCard = React.memo((props)=>{
         onEdit: props.onEdit,
         onRemove: props.isDisabled ? undefined : props.onRemove,
         isClickable: false
-    });
-}, areEqual);
+    }), areEqual);
 InternalAssetCard.displayName = 'InternalAssetCard';
 export function FetchingWrappedAssetCard(props) {
     const { onEntityFetchComplete } = props;
@@ -46,9 +31,21 @@ export function FetchingWrappedAssetCard(props) {
         onEntityFetchComplete,
         status
     ]);
+    if (status === 'loading' || status === 'idle') {
+        return React.createElement(AssetCard, {
+            size: "default",
+            isLoading: true
+        });
+    }
+    if (status === 'error') {
+        return React.createElement(MissingEntityCard, {
+            isDisabled: props.isDisabled,
+            onRemove: props.onRemove,
+            providerName: "Contentful"
+        });
+    }
     return React.createElement(InternalAssetCard, {
         asset: asset,
-        status: status,
         sdk: props.sdk,
         isDisabled: props.isDisabled,
         isSelected: props.isSelected,

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

@@ -3,19 +3,7 @@ import { EntryCard } from '@contentful/f36-components';
 import { useEntity, MissingEntityCard, WrappedEntryCard, useEntityLoader } from '@contentful/field-editor-reference';
 import areEqual from 'fast-deep-equal';
 const InternalEntryCard = React.memo((props)=>{
-    const { entry, sdk, loadEntityScheduledActions, status } = props;
-    if (status === 'error') {
-        return React.createElement(MissingEntityCard, {
-            isDisabled: props.isDisabled,
-            onRemove: props.onRemove,
-            providerName: "Contentful"
-        });
-    }
-    if (entry === undefined) {
-        return React.createElement(EntryCard, {
-            isLoading: true
-        });
-    }
+    const { entry, sdk, loadEntityScheduledActions } = props;
     const contentType = sdk.space.getCachedContentTypes().find((contentType)=>contentType.sys.id === entry.sys.contentType.sys.id);
     return React.createElement(WrappedEntryCard, {
         size: "default",
@@ -49,8 +37,19 @@ export const FetchingWrappedEntryCard = (props)=>{
         onEntityFetchComplete,
         status
     ]);
+    if (status === 'loading' || status === 'idle') {
+        return React.createElement(EntryCard, {
+            isLoading: true
+        });
+    }
+    if (status === 'error') {
+        return React.createElement(MissingEntityCard, {
+            isDisabled: props.isDisabled,
+            onRemove: props.onRemove,
+            providerName: "Contentful"
+        });
+    }
     return React.createElement(InternalEntryCard, {
-        status: status,
         entry: entry,
         sdk: props.sdk,
         locale: props.locale,

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@contentful/field-editor-rich-text",
-  "version": "3.20.2",
+  "version": "3.20.3",
   "source": "./src/index.tsx",
   "main": "dist/cjs/index.js",
   "module": "dist/esm/index.js",
@@ -44,7 +44,7 @@
     "@contentful/f36-icons": "^4.1.1",
     "@contentful/f36-tokens": "^4.0.0",
     "@contentful/f36-utils": "^4.19.0",
-    "@contentful/field-editor-reference": "^5.27.2",
+    "@contentful/field-editor-reference": "^5.27.3",
     "@contentful/field-editor-shared": "^1.4.8",
     "@contentful/rich-text-plain-text-renderer": "^16.0.4",
     "@contentful/rich-text-types": "16.3.0",
@@ -86,5 +86,5 @@
   "publishConfig": {
     "registry": "https://npm.pkg.github.com/"
   },
-  "gitHead": "0d8d60dde84e039189af98d4e746d27588ed10ff"
+  "gitHead": "4dfb84c2d6e620067bb539985a80e292110e7160"
 }