@contentful/field-editor-reference 5.1.5 → 5.1.8

package/dist/field-editor-reference.esm.js

@@ -1960,13 +1960,13 @@ function _fetchContentfulEntry() {
             _resourceId$split = resourceId.split('/'), spaceId = _resourceId$split[1], entryId = _resourceId$split[3];
             environmentId = 'master';
             _context3.next = 6;
-            return Promise.all([fetch(['space', spaceId], function (_ref9) {
-              var cmaClient = _ref9.cmaClient;
+            return Promise.all([fetch(['space', spaceId], function (_ref10) {
+              var cmaClient = _ref10.cmaClient;
               return cmaClient.space.get({
                 spaceId: spaceId
               });
-            }, options), fetch(['entry', spaceId, environmentId, entryId], function (_ref10) {
-              var cmaClient = _ref10.cmaClient;
+            }, options), fetch(['entry', spaceId, environmentId, entryId], function (_ref11) {
+              var cmaClient = _ref11.cmaClient;
               return cmaClient.entry.get({
                 spaceId: spaceId,
                 environmentId: environmentId,
@@ -1980,15 +1980,15 @@ function _fetchContentfulEntry() {
             entry = _yield$Promise$all[1];
             contentTypeId = entry.sys.contentType.sys.id;
             _context3.next = 12;
-            return Promise.all([fetch(['contentType', spaceId, environmentId, contentTypeId], function (_ref11) {
-              var cmaClient = _ref11.cmaClient;
+            return Promise.all([fetch(['contentType', spaceId, environmentId, contentTypeId], function (_ref12) {
+              var cmaClient = _ref12.cmaClient;
               return cmaClient.contentType.get({
                 contentTypeId: contentTypeId,
                 spaceId: spaceId,
                 environmentId: environmentId
               });
             }, options), fetch(['defaultLocale', spaceId, environmentId], /*#__PURE__*/function () {
-              var _ref13 = _asyncToGenerator( /*#__PURE__*/runtime_1.mark(function _callee2(_ref12) {
+              var _ref14 = _asyncToGenerator( /*#__PURE__*/runtime_1.mark(function _callee2(_ref13) {
                 var _locales$items$find;
 
                 var cmaClient, locales, defaultLocaleCode;
@@ -1996,7 +1996,7 @@ function _fetchContentfulEntry() {
                   while (1) {
                     switch (_context2.prev = _context2.next) {
                       case 0:
-                        cmaClient = _ref12.cmaClient;
+                        cmaClient = _ref13.cmaClient;
                         _context2.next = 3;
                         return cmaClient.locale.getMany({
                           spaceId: spaceId,
@@ -2022,7 +2022,7 @@ function _fetchContentfulEntry() {
               }));
 
               return function (_x3) {
-                return _ref13.apply(this, arguments);
+                return _ref14.apply(this, arguments);
               };
             }(), options)]);
 
@@ -2052,6 +2052,9 @@ var _constate = /*#__PURE__*/constate(function useInitServices(props) {
 
   var currentSpaceId = props.sdk.ids.space;
   var currentEnvironmentId = (_props$sdk$ids$enviro = props.sdk.ids.environmentAlias) != null ? _props$sdk$ids$enviro : props.sdk.ids.environment;
+  var environmentIds = useMemo(function () {
+    return [props.sdk.ids.environmentAlias, props.sdk.ids.environment];
+  }, [props.sdk.ids.environmentAlias, props.sdk.ids.environment]);
   var queryClient = useQueryClient();
   var queryCache = queryClient.getQueryCache();
   var entityChangeUnsubscribers = useRef({});
@@ -2206,20 +2209,40 @@ var _constate = /*#__PURE__*/constate(function useInitServices(props) {
   }, [fetch]);
   var isSameSpaceEntityQueryKey = useCallback(function (queryKey) {
     var isEntityKey = isEntityQueryKey(queryKey);
-    var isSameSpaceEntityKey = isEntityKey && queryKey[2] === currentSpaceId && queryKey[3] === currentEnvironmentId;
+    var isSameSpaceEntityKey = isEntityKey && queryKey[2] === currentSpaceId && environmentIds.includes(queryKey[3]);
     return isSameSpaceEntityKey;
-  }, [currentSpaceId, currentEnvironmentId]); // @ts-expect-error ...
+  }, [currentSpaceId, environmentIds]); // @ts-expect-error ...
 
   // @ts-expect-error ...
   var onEntityChanged = props.sdk.space.onEntityChanged;
+  var onSlideInNavigation = props.sdk.navigator.onSlideInNavigation;
   useEffect(function () {
+    function findSameSpaceQueries() {
+      return queryCache.findAll({
+        type: 'active',
+        predicate: function predicate(query) {
+          return isSameSpaceEntityQueryKey(query.queryKey);
+        }
+      });
+    }
+
     if (typeof onEntityChanged !== 'function') {
-      return;
+      return onSlideInNavigation(function (_ref4) {
+        var oldSlideLevel = _ref4.oldSlideLevel,
+            newSlideLevel = _ref4.newSlideLevel;
+
+        if (oldSlideLevel > newSlideLevel) {
+          findSameSpaceQueries().forEach(function (query) {
+            // automatically refetches the query
+            void queryClient.invalidateQueries(query.queryKey);
+          });
+        }
+      });
     }
 
-    var subscribeQuery = function subscribeQuery(_ref4) {
-      var queryKey = _ref4.queryKey,
-          queryHash = _ref4.queryHash;
+    var subscribeQuery = function subscribeQuery(_ref5) {
+      var queryKey = _ref5.queryKey,
+          queryHash = _ref5.queryHash;
       var entityType = queryKey[0],
           entityId = queryKey[1];
       entityChangeUnsubscribers.current[queryHash] = onEntityChanged(entityType, entityId, function (data) {
@@ -2227,13 +2250,7 @@ var _constate = /*#__PURE__*/constate(function useInitServices(props) {
       });
     };
 
-    var queries = queryCache.findAll({
-      type: 'active',
-      predicate: function predicate(query) {
-        return isSameSpaceEntityQueryKey(query.queryKey);
-      }
-    });
-    queries.forEach(subscribeQuery);
+    findSameSpaceQueries().forEach(subscribeQuery);
     var unsubscribe = queryCache.subscribe(function (event) {
       if (!event) {
         return;
@@ -2266,30 +2283,35 @@ var _constate = /*#__PURE__*/constate(function useInitServices(props) {
       });
       entityChangeUnsubscribers.current = {};
     };
-  }, [onEntityChanged, queryCache, isSameSpaceEntityQueryKey, queryClient]);
+  }, [onEntityChanged, queryCache, isSameSpaceEntityQueryKey, queryClient, getEntity, onSlideInNavigation]);
   return {
+    ids: props.sdk.ids,
     cmaClient: cmaClient,
     fetch: fetch,
     getResource: getResource,
     getEntity: getEntity,
-    ids: props.sdk.ids,
     getEntityScheduledActions: getEntityScheduledActions
   };
-}, function (_ref5) {
-  var fetch = _ref5.fetch;
-  return fetch;
 }, function (_ref6) {
-  var getResource = _ref6.getResource,
-      getEntity = _ref6.getEntity,
-      getEntityScheduledActions = _ref6.getEntityScheduledActions;
+  var fetch = _ref6.fetch;
+  return fetch;
+}, function (_ref7) {
+  var getResource = _ref7.getResource,
+      getEntity = _ref7.getEntity,
+      getEntityScheduledActions = _ref7.getEntityScheduledActions;
   return {
     getResource: getResource,
     getEntity: getEntity,
     getEntityScheduledActions: getEntityScheduledActions
   };
-}, function (_ref7) {
-  var ids = _ref7.ids;
-  return ids;
+}, function (_ref8) {
+  var _ids$environmentAlias;
+
+  var ids = _ref8.ids;
+  return {
+    environment: (_ids$environmentAlias = ids.environmentAlias) != null ? _ids$environmentAlias : ids.environment,
+    space: ids.space
+  };
 }),
     InternalServiceProvider = _constate[0],
     useEntityLoader = _constate[2],
@@ -2342,9 +2364,9 @@ function useResource(resourceType, urn, options) {
   };
 }
 
-function EntityProvider(_ref8) {
-  var children = _ref8.children,
-      props = _objectWithoutPropertiesLoose(_ref8, _excluded2);
+function EntityProvider(_ref9) {
+  var children = _ref9.children,
+      props = _objectWithoutPropertiesLoose(_ref9, _excluded2);
 
   var reactQueryClient = useMemo(function () {
     var queryCache = new QueryCache();