@equinor/fusion-framework-react-app 6.2.2 → 6.2.4

package/dist/types/bookmark/useCurrentBookmark.d.ts

@@ -1,4 +1,4 @@
-import { type BookmarkData, type BookmarkPayloadGenerator, useCurrentBookmark as _useCurrentBookmark } from '@equinor/fusion-framework-react-module-bookmark';
+import { type BookmarkData, type BookmarkPayloadGenerator, type useCurrentBookmarkReturn } from '@equinor/fusion-framework-react-module-bookmark';
 /**
  * By providing a CreateBookMarkFn bookmarks is enabled for the current application.
  *
@@ -11,5 +11,5 @@ import { type BookmarkData, type BookmarkPayloadGenerator, useCurrentBookmark as
  * ```
  * @return {*}  {CurrentBookmark<TData>}
  */
-export declare const useCurrentBookmark: <TData extends BookmarkData>(payloadGenerator?: BookmarkPayloadGenerator<TData>) => ReturnType<typeof _useCurrentBookmark<TData>>;
+export declare const useCurrentBookmark: <TData extends BookmarkData>(payloadGenerator?: BookmarkPayloadGenerator<TData>) => useCurrentBookmarkReturn<TData>;
 export default useCurrentBookmark;

package/dist/types/version.d.ts

@@ -1 +1 @@
-export declare const version = "6.2.2";
+export declare const version = "6.2.4";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@equinor/fusion-framework-react-app",
-  "version": "6.2.2",
+  "version": "6.2.4",
   "description": "",
   "main": "./dist/esm/index.js",
   "types": "./dist/types/index.d.ts",
@@ -106,12 +106,12 @@
     "directory": "packages/react"
   },
   "dependencies": {
-    "@equinor/fusion-framework-app": "^9.3.18",
+    "@equinor/fusion-framework-app": "^9.3.20",
     "@equinor/fusion-framework-module": "^4.4.2",
     "@equinor/fusion-framework-module-app": "^6.1.16",
     "@equinor/fusion-framework-module-navigation": "^5.0.3",
-    "@equinor/fusion-framework-react": "^7.4.15",
     "@equinor/fusion-framework-react-module": "^3.1.12",
+    "@equinor/fusion-framework-react": "^7.4.15",
     "@equinor/fusion-framework-react-module-http": "^9.0.3"
   },
   "devDependencies": {
@@ -124,8 +124,8 @@
     "@equinor/fusion-framework-module-ag-grid": "^34.0.2",
     "@equinor/fusion-framework-module-event": "^4.3.6",
     "@equinor/fusion-framework-module-feature-flag": "^1.1.21",
-    "@equinor/fusion-framework-react-module-bookmark": "^4.0.8",
     "@equinor/fusion-framework-module-msal": "^4.0.7",
+    "@equinor/fusion-framework-react-module-bookmark": "^4.0.11",
     "@equinor/fusion-framework-react-module-context": "^6.2.31",
     "@equinor/fusion-observable": "^8.5.1"
   },

package/src/bookmark/useCurrentBookmark.ts

@@ -1,11 +1,15 @@
 import {
   type BookmarkData,
   type BookmarkPayloadGenerator,
+  type useCurrentBookmarkReturn,
   useCurrentBookmark as _useCurrentBookmark,
+  type BookmarkModule,
+  bookmarkWithDataSchema,
 } from '@equinor/fusion-framework-react-module-bookmark';
-import type { BookmarkModule } from '../../../../modules/bookmark/src';
+
 import { useFrameworkModule } from '@equinor/fusion-framework-react';
 import useAppModules from '../useAppModules';
+import { useCurrentApp } from '@equinor/fusion-framework-react/app';
 
 /**
  * By providing a CreateBookMarkFn bookmarks is enabled for the current application.
@@ -21,7 +25,8 @@ import useAppModules from '../useAppModules';
  */
 export const useCurrentBookmark = <TData extends BookmarkData>(
   payloadGenerator?: BookmarkPayloadGenerator<TData>,
-): ReturnType<typeof _useCurrentBookmark<TData>> => {
+): useCurrentBookmarkReturn<TData> => {
+  const { currentApp } = useCurrentApp();
   const appBookmarkProvider = useAppModules<[BookmarkModule]>().bookmark;
   const frameworkBookmarkProvider = useFrameworkModule<BookmarkModule>('bookmark');
   if (!appBookmarkProvider) {
@@ -30,10 +35,19 @@ export const useCurrentBookmark = <TData extends BookmarkData>(
       'application has not enabled bookmarks, this will not work in the future',
     );
   }
-  return _useCurrentBookmark<TData>({
+  const { currentBookmark, setCurrentBookmark } = _useCurrentBookmark<TData>({
     provider: appBookmarkProvider ?? frameworkBookmarkProvider,
     payloadGenerator,
   });
+
+  const currentBookmarkAppKey = bookmarkWithDataSchema().safeParse(currentBookmark).success
+    ? bookmarkWithDataSchema().parse(currentBookmark).appKey
+    : null;
+
+  return {
+    currentBookmark: currentBookmarkAppKey === currentApp?.appKey ? currentBookmark : null,
+    setCurrentBookmark,
+  };
 };
 
 export default useCurrentBookmark;

package/src/version.ts

@@ -1,2 +1,2 @@
 // Generated by genversion.
-export const version = '6.2.2';
+export const version = '6.2.4';