@firecms/core 3.0.0-canary.198 → 3.0.0-canary.199

package/dist/index.es.js

@@ -14617,7 +14617,7 @@ const EntityCollectionView = React__default.memo(function EntityCollectionView2(
       ...entity_1.values
     }, propertyKey, value_0);
     const saveProps = {
-      path: fullPath,
+      path: entity_1.path ?? fullPath,
       entityId: entity_1.id,
       values: updatedValues,
       previousValues: entity_1.values,
@@ -21199,11 +21199,11 @@ function getNavigationEntriesFromPath(props) {
           const entityViews = collection.entityViews;
           const customView = entityViews && entityViews.map((entry) => resolveEntityView(entry, props.contextEntityViews)).filter(Boolean).find((entry) => entry.key === newPath);
           if (customView) {
-            const path2 = currentFullPath && currentFullPath.length > 0 ? currentFullPath + "/" + customView.key : customView.key;
             result.push({
               type: "custom_view",
-              path: path2,
-              fullPath: fullPath + "/" + path2,
+              path: collectionPath,
+              entityId,
+              fullPath: fullPath + "/" + customView.key,
               view: customView
             });
           } else if (collection.subcollections) {
@@ -23481,6 +23481,18 @@ function _temp2$1(entry_1) {
 function _temp$1(entry_0) {
   return entry_0.path;
 }
+function getSelectedTabFromUrl(isNew, lastCustomView) {
+  if (isNew) {
+    return void 0;
+  } else if (lastCustomView) {
+    if (lastCustomView.type === "custom_view") {
+      return lastCustomView.view.key;
+    } else if (lastCustomView.type === "collection") {
+      return lastCustomView.id ?? lastCustomView.path;
+    }
+  }
+  return void 0;
+}
 function EntityFullScreenRoute({
   pathname,
   navigationEntries,
@@ -23495,7 +23507,7 @@ function EntityFullScreenRoute({
   const navigationEntriesAfterEntity = lastEntityEntry ? navigationEntries.slice(navigationEntries.indexOf(lastEntityEntry) + 1) : [];
   const lastCustomView = navigationEntriesAfterEntity.findLast((entry_0) => entry_0.type === "custom_view" || entry_0.type === "collection");
   const entityId = lastEntityEntry?.entityId;
-  const urlTab = isNew ? void 0 : (lastCustomView && "id" in lastCustomView ? lastCustomView?.id : void 0) ?? lastCustomView?.path;
+  const urlTab = getSelectedTabFromUrl(isNew, lastCustomView);
   const [selectedTab, setSelectedTab] = useState(urlTab);
   const parentCollectionIds = navigation.getParentCollectionIds(navigationPath);
   useEffect(() => {