@contentful/field-editor-rich-text 2.3.16 → 2.3.19

package/dist/field-editor-rich-text.esm.js

@@ -2153,7 +2153,9 @@ function useFetchedEntity(_ref) {
       getEntry = _useEntities.getEntry,
       getAsset = _useEntities.getAsset;
 
-  var store = type === 'Entry' ? entries : assets;
+  var store = useMemo(function () {
+    return type === 'Entry' ? entries : assets;
+  }, [assets, entries, type]);
 
   var _useState = useState(store == null ? void 0 : store[id]),
       entity = _useState[0],
@@ -2161,6 +2163,10 @@ function useFetchedEntity(_ref) {
 
 
   useEffect(function () {
+    if (!store) {
+      return;
+    }
+
     var newValue = store[id];
 
     if (!areEqual(entity, newValue)) {
@@ -2169,12 +2175,16 @@ function useFetchedEntity(_ref) {
   }, [store, entity, id]); // Fetch the entity if needed
 
   useEffect(function () {
+    if (!store) {
+      return;
+    }
+
     (type === 'Entry' ? getEntry : getAsset)(id); // "getEntry" and "getAsset" instances change with every
     // entity store update causing page lag on initial load
     // TODO: consider rewriting useEntities() hook to avoid that happening in
     // first place.
     // eslint-disable-next-line react-hooks/exhaustive-deps -- TODO: explain this disable
-  }, [type, id]);
+  }, [type, id, store]);
   useEffect(function () {
     if (entity) {
       onEntityFetchComplete == null ? void 0 : onEntityFetchComplete();