@equinor/fusion-framework-react-app 5.2.12 → 5.3.0

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

@@ -1,3 +1,4 @@
-export type { CreateBookMarkFn } from '@equinor/fusion-framework-react-module-bookmark';
-export { default, useCurrentBookmark } from './useCurrentBookmark';
+export { enableBookmark } from '@equinor/fusion-framework-react-module-bookmark';
+export { useCurrentBookmark } from './useCurrentBookmark';
 export { useBookmark } from './useBookmark';
+export type { Bookmark, Bookmarks, BookmarkData, BookmarkPayloadGenerator, BookmarkProvider, } from '@equinor/fusion-framework-react-module-bookmark';

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

@@ -1,4 +1,5 @@
 /**
+ * @deprecated Use useBookmark from @equinor/fusion-framework-react-module-bookmark
  *  For application development the useCurrentBookmark should be sufficient enough
  *
  *  Functionality provided here is:
@@ -14,5 +15,5 @@
  * @template TData - Current applications  bookmark type
  * @return {*}  {Bookmarks<TData>} the full api fro handling bookmarks
  */
-export declare const useBookmark: <TData>() => import("@equinor/fusion-framework-react-module-bookmark").Bookmarks<TData>;
+export declare const useBookmark: <TData>() => import("@equinor/fusion-framework-react-module-bookmark/dist/types/useBookmark").useBookmarkResult;
 export default useBookmark;

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

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

package/dist/types/version.d.ts

@@ -1 +1 @@
-export declare const version = "5.2.12";
+export declare const version = "5.3.0";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@equinor/fusion-framework-react-app",
-  "version": "5.2.12",
+  "version": "5.3.0",
   "description": "",
   "main": "./dist/esm/index.js",
   "types": "./dist/types/index.d.ts",
@@ -82,12 +82,12 @@
     "directory": "packages/react"
   },
   "dependencies": {
-    "@equinor/fusion-framework-module": "^4.3.5",
-    "@equinor/fusion-framework-module-app": "^6.0.2",
-    "@equinor/fusion-framework-app": "^9.1.12",
+    "@equinor/fusion-framework-app": "^9.1.13",
     "@equinor/fusion-framework-module-navigation": "^4.0.7",
-    "@equinor/fusion-framework-react": "^7.3.1",
+    "@equinor/fusion-framework-react": "^7.3.2",
     "@equinor/fusion-framework-react-module": "^3.1.6",
+    "@equinor/fusion-framework-module-app": "^6.0.2",
+    "@equinor/fusion-framework-module": "^4.3.5",
     "@equinor/fusion-framework-react-module-http": "^8.0.0"
   },
   "devDependencies": {
@@ -98,11 +98,11 @@
     "rxjs": "^7.8.1",
     "typescript": "^5.5.4",
     "@equinor/fusion-framework-module-event": "^4.2.4",
-    "@equinor/fusion-framework-module-msal": "^3.1.5",
-    "@equinor/fusion-framework-react-module-bookmark": "^2.1.19",
     "@equinor/fusion-framework-module-feature-flag": "^1.1.10",
+    "@equinor/fusion-framework-module-msal": "^3.1.5",
     "@equinor/fusion-framework-react-module-context": "^6.2.14",
-    "@equinor/fusion-framework-react-widget": "^1.1.19",
+    "@equinor/fusion-framework-react-module-bookmark": "^2.2.0",
+    "@equinor/fusion-framework-react-widget": "^1.1.20",
     "@equinor/fusion-observable": "^8.4.2"
   },
   "peerDependencies": {

package/src/bookmark/index.ts

@@ -1,4 +1,12 @@
-export type { CreateBookMarkFn } from '@equinor/fusion-framework-react-module-bookmark';
+export { enableBookmark } from '@equinor/fusion-framework-react-module-bookmark';
 
-export { default, useCurrentBookmark } from './useCurrentBookmark';
+export { useCurrentBookmark } from './useCurrentBookmark';
 export { useBookmark } from './useBookmark';
+
+export type {
+    Bookmark,
+    Bookmarks,
+    BookmarkData,
+    BookmarkPayloadGenerator,
+    BookmarkProvider,
+} from '@equinor/fusion-framework-react-module-bookmark';

package/src/bookmark/useBookmark.ts

@@ -1,6 +1,7 @@
 import { useBookmark as _useBookmark } from '@equinor/fusion-framework-react-module-bookmark';
 
 /**
+ * @deprecated Use useBookmark from @equinor/fusion-framework-react-module-bookmark
  *  For application development the useCurrentBookmark should be sufficient enough
  *
  *  Functionality provided here is:
@@ -16,6 +17,7 @@ import { useBookmark as _useBookmark } from '@equinor/fusion-framework-react-mod
  * @template TData - Current applications  bookmark type
  * @return {*}  {Bookmarks<TData>} the full api fro handling bookmarks
  */
-export const useBookmark = <TData>() => _useBookmark<TData>();
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
+export const useBookmark = <TData>() => _useBookmark();
 
 export default useBookmark;

package/src/bookmark/useCurrentBookmark.ts

@@ -1,7 +1,11 @@
 import {
-    CreateBookMarkFn,
+    BookmarkData,
+    BookmarkPayloadGenerator,
     useCurrentBookmark as _useCurrentBookmark,
 } from '@equinor/fusion-framework-react-module-bookmark';
+import { BookmarkModule } from '../../../../modules/bookmark/src';
+import { useFrameworkModule } from '@equinor/fusion-framework-react';
+import useAppModules from '../useAppModules';
 
 /**
  * By providing a CreateBookMarkFn bookmarks is enabled for the current application.
@@ -15,7 +19,21 @@ import {
  * ```
  * @return {*}  {CurrentBookmark<TData>}
  */
-export const useCurrentBookmark = <TData>(createBookmarkState?: CreateBookMarkFn<TData>) =>
-    _useCurrentBookmark(createBookmarkState);
+export const useCurrentBookmark = <TData extends BookmarkData>(
+    payloadGenerator?: BookmarkPayloadGenerator<TData>,
+) => {
+    const appBookmarkProvider = useAppModules<[BookmarkModule]>().bookmark;
+    const frameworkBookmarkProvider = useFrameworkModule<BookmarkModule>('bookmark');
+    if (!appBookmarkProvider) {
+        console.warn(
+            '@deprecation',
+            'application has not enabled bookmarks, this will not work in the future',
+        );
+    }
+    return _useCurrentBookmark<TData>({
+        provider: appBookmarkProvider ?? frameworkBookmarkProvider,
+        payloadGenerator,
+    });
+};
 
 export default useCurrentBookmark;

package/src/version.ts

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