@j2inn/fin5-ui-utils 8.1.2 → 8.3.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -3,6 +3,17 @@ import { HistorianArgs, HistorianType } from './openFin5Historian';
3
3
  export declare const getFin5top: (notifyFailure?: () => void) => Fin5Top | null;
4
4
  export declare const fin5Top: Fin5Top | null;
5
5
  export declare function isWindowTopFin5(notifyFailure?: () => void): boolean;
6
+ interface RemotePopupStatus {
7
+ isOpen: boolean;
8
+ isMinimized: boolean;
9
+ id: string | null;
10
+ }
11
+ /**
12
+ * Check the status of the Folio popup.
13
+ * @returns an object containing the status of the Folio popup, including whether it's open,
14
+ * minimized, and its id.
15
+ */
16
+ export declare const getFolioPopupState: () => Promise<RemotePopupStatus>;
6
17
  export interface Fin5Top extends Window {
7
18
  app: Fin5App;
8
19
  languageManager: LanguageManager;
@@ -47,11 +58,13 @@ export interface Fin5App {
47
58
  * @param {string} url - Is the url which is to be loaded
48
59
  * @param {string} title - Specifies the title to be displayed on the iframe object
49
60
  * @param {string} targetId - Specifies the id of the equip (etc) to which the main navigation update.
50
- * @param {object} settings - extra settings that can be passed in when calling hte func
51
- * @param {boolean} settings.collapse - flag indicating the collapse state of the RHS app panel
61
+ * @param {object} settings - Is the set of extra settings which will be also passed down to NavigateToApp
62
+ * @param {string} settings.app - the name of the application on the RHS
63
+ * @param {string[]} settings.params - overridden/additional params to pass to NavigateToApp
52
64
  */
53
65
  LoadApplication: (url: string, title?: string, targetRef?: TargetRef, settings?: {
54
- collapse?: boolean;
66
+ app?: string;
67
+ params?: string[];
55
68
  }) => Promise<void>;
56
69
  /**
57
70
  * As the name suggests, this method logs out the user and resets the current session.
@@ -108,7 +121,16 @@ export interface Fin5App {
108
121
  * @param {TargetRef} targetRef - id of the target to be shown in the charts app. If not provided, it will open with the current target ref.
109
122
  */
110
123
  OpenCharts: (chartId?: string, targetRef?: TargetRef) => Promise<void>;
124
+ /**
125
+ * Gets the name of the current application. Eg: notes, trends etc..
126
+ *
127
+ * @method CurrentAppName
128
+ * @param {boolean} isSpecialAppId : if true, returns the special app id (iframe app name) which is the url hash without the underscore
129
+ * @return {string | boolean} if false, there's no app currently open. Otherwise, returns the identifier of the app.
130
+ */
131
+ CurrentAppName: (isSpecialAppId?: boolean) => string | boolean;
111
132
  findComponent: (name: string) => Fin5AppComponent;
133
+ findAllComponents: (name: string) => Fin5AppComponent[];
112
134
  /**
113
135
  * @see https://ractive.js.org/api/#ractiveobserve
114
136
  */
@@ -150,6 +172,7 @@ interface LanguageManager {
150
172
  }
151
173
  interface Fin5AppComponent {
152
174
  set: (value: unknown) => Promise<undefined>;
175
+ get: (value: unknown) => unknown;
153
176
  }
154
177
  export declare type TargetRef = string | null | undefined;
155
178
  export interface SchedulesParams {
@@ -3,7 +3,7 @@
3
3
  * Copyright (c) 2022, J2 Innovations. All Rights Reserved
4
4
  */
5
5
  Object.defineProperty(exports, "__esModule", { value: true });
6
- exports.Fin5AppNames = exports.isWindowTopFin5 = exports.fin5Top = exports.getFin5top = void 0;
6
+ exports.Fin5AppNames = exports.getFolioPopupState = exports.isWindowTopFin5 = exports.fin5Top = exports.getFin5top = void 0;
7
7
  class Fin5TopRetriever {
8
8
  static _fin5Top;
9
9
  static get fin5Top() {
@@ -32,6 +32,31 @@ function isWindowTopFin5(notifyFailure) {
32
32
  return false;
33
33
  }
34
34
  exports.isWindowTopFin5 = isWindowTopFin5;
35
+ /**
36
+ * Check the status of the Folio popup.
37
+ * @returns an object containing the status of the Folio popup, including whether it's open,
38
+ * minimized, and its id.
39
+ */
40
+ const getFolioPopupState = async () => {
41
+ const stack = ((await exports.fin5Top?.app?.get('remotePopupStack')) ??
42
+ []);
43
+ const folio = stack.find((p) => {
44
+ const url = (p.url || '').toLowerCase();
45
+ const title = p.settings?.headerContent?.title?.toLowerCase() ?? '';
46
+ return url.includes('folio') || title.includes('folio');
47
+ });
48
+ if (!folio) {
49
+ return { isOpen: false, isMinimized: false, id: null };
50
+ }
51
+ const popups = exports.fin5Top?.app?.findAllComponents('remotecontentpopup') || [];
52
+ const popup = popups.find((c) => c.get('identifier') === folio.id);
53
+ return {
54
+ isOpen: true,
55
+ isMinimized: popup ? !!popup.get('isMinimized') : false,
56
+ id: folio.id,
57
+ };
58
+ };
59
+ exports.getFolioPopupState = getFolioPopupState;
35
60
  var Fin5AppNames;
36
61
  (function (Fin5AppNames) {
37
62
  Fin5AppNames["EQUIP"] = "equip";
@@ -1 +1 @@
1
- {"version":3,"file":"fin5Top.js","sourceRoot":"","sources":["../../src/fin5Top/fin5Top.ts"],"names":[],"mappings":";AAAA;;GAEG;;;AAKH,MAAM,gBAAgB;IACb,MAAM,CAAC,QAAQ,CAAgB;IAEvC,MAAM,KAAK,OAAO;QACjB,OAAO,IAAI,CAAC,UAAU,EAAE,CAAA;IACzB,CAAC;IACD,MAAM,CAAC,UAAU,GAAG,CAAC,aAA0B,EAAkB,EAAE;QAClE,IAAI,IAAI,CAAC,QAAQ,KAAK,SAAS,EAAE;YAChC,IAAI,CAAC,QAAQ,GAAG,eAAe,CAAC,aAAa,CAAC;gBAC7C,CAAC,CAAE,MAAM,CAAC,GAA0B,CAAC,uEAAuE;gBAC5G,CAAC,CAAC,IAAI,CAAA;SACP;QACD,OAAO,IAAI,CAAC,QAAQ,CAAA;IACrB,CAAC,CAAA;;AAGW,QAAA,UAAU,GAAG,gBAAgB,CAAC,UAAU,CAAA;AAExC,QAAA,OAAO,GAAG,gBAAgB,CAAC,OAAO,CAAA;AAE/C,SAAgB,eAAe,CAAC,aAA0B;IACzD,IAAI;QACH,MAAM,EAAE,GAAG,EAAE,MAAM,CAAA;QACnB,IAAK,MAAM,CAAC,GAA0B,CAAC,QAAQ,EAAE;YAChD,OAAO,IAAI,CAAA;SACX;KACD;IAAC,MAAM,GAAE;IACV,aAAa,EAAE,EAAE,CAAA;IACjB,OAAO,KAAK,CAAA;AACb,CAAC;AATD,0CASC;AA2JD,IAAY,YAyBX;AAzBD,WAAY,YAAY;IACvB,+BAAe,CAAA;IACf,qCAAqB,CAAA;IACrB,iCAAiB,CAAA;IACjB,iCAAiB,CAAA;IACjB,+BAAe,CAAA;IACf,mCAAmB,CAAA;IACnB,8CAA8B,CAAA;IAC9B,+BAAe,CAAA;IACf,uCAAuB,CAAA;IACvB,8CAA8B,CAAA;IAC9B,oCAAoB,CAAA;IACpB,wCAAwB,CAAA;IACxB,iCAAiB,CAAA;IACjB,wCAAwB,CAAA;IACxB,iCAAiB,CAAA;IACjB,iCAAiB,CAAA;IACjB,mCAAmB,CAAA;IACnB,mCAAmB,CAAA;IACnB,+BAAe,CAAA;IACf,mCAAmB,CAAA;IACnB,+BAAe,CAAA;IACf,6BAAa,CAAA;IACb,uCAAuB,CAAA;IACvB,qCAAqB,CAAA;AACtB,CAAC,EAzBW,YAAY,GAAZ,oBAAY,KAAZ,oBAAY,QAyBvB"}
1
+ {"version":3,"file":"fin5Top.js","sourceRoot":"","sources":["../../src/fin5Top/fin5Top.ts"],"names":[],"mappings":"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"}
@@ -1,5 +1,5 @@
1
- import type { Location } from '@remix-run/router';
2
1
  import React from 'react';
2
+ import type { Location } from 'react-router';
3
3
  import { HeaderSiderLayoutProps } from './HeaderSiderLayout';
4
4
  import { ReactRouterMenuPage } from './ReactRouterLayout';
5
5
  export interface ReactRouterHeaderSiderLayoutProps extends HeaderSiderLayoutProps<ReactRouterMenuPage> {
@@ -1 +1 @@
1
- {"version":3,"file":"ReactRouterHeaderSiderLayout.js","sourceRoot":"","sources":["../../../../src/react/components/navigation/ReactRouterHeaderSiderLayout.tsx"],"names":[],"mappings":";AAAA;;GAEG;;;;;;AAGH,kDAAyB;AACzB,+CAAkD;AAClD,2DAA+E;AAC/E,2DAK4B;AAO5B;;GAEG;AACI,MAAM,4BAA4B,GAErC,CAAC,EAAE,eAAe,EAAE,KAAK,GAAG,EAAE,EAAE,QAAQ,EAAE,GAAG,UAAU,EAAE,EAAE,EAAE;IAChE,MAAM,QAAQ,GAAG,IAAA,0BAAW,GAAE,CAAA;IAC9B,MAAM,cAAc,GAAG,IAAA,qCAAiB,EAAC,KAAK,EAAE,eAAe,CAAC,CAAA;IAChE,MAAM,eAAe,GAAG,IAAA,yCAAqB,EAAC,KAAK,CAAC,CAAA;IACpD,MAAM,eAAe,GAAG,IAAA,sCAAkB,EAAC,QAAQ,EAAE,eAAe,EAAE,KAAK,CAAC,CAAA;IAE5E,OAAO,CACN,8BAAC,qCAAiB,OACb,UAAU,EACd,KAAK,EAAE,KAAK,EACZ,QAAQ,EAAE,QAAQ,IAAI,eAAe,EACrC,aAAa,EAAE,cAAc;QAC7B,8BAAC,qBAAM,OAAG,CACS,CACpB,CAAA;AACF,CAAC,CAAA;AAjBY,QAAA,4BAA4B,gCAiBxC"}
1
+ {"version":3,"file":"ReactRouterHeaderSiderLayout.js","sourceRoot":"","sources":["../../../../src/react/components/navigation/ReactRouterHeaderSiderLayout.tsx"],"names":[],"mappings":";AAAA;;GAEG;;;;;;AAEH,kDAAyB;AAEzB,+CAAkD;AAClD,2DAA+E;AAC/E,2DAK4B;AAO5B;;GAEG;AACI,MAAM,4BAA4B,GAErC,CAAC,EAAE,eAAe,EAAE,KAAK,GAAG,EAAE,EAAE,QAAQ,EAAE,GAAG,UAAU,EAAE,EAAE,EAAE;IAChE,MAAM,QAAQ,GAAG,IAAA,0BAAW,GAAE,CAAA;IAC9B,MAAM,cAAc,GAAG,IAAA,qCAAiB,EAAC,KAAK,EAAE,eAAe,CAAC,CAAA;IAChE,MAAM,eAAe,GAAG,IAAA,yCAAqB,EAAC,KAAK,CAAC,CAAA;IACpD,MAAM,eAAe,GAAG,IAAA,sCAAkB,EAAC,QAAQ,EAAE,eAAe,EAAE,KAAK,CAAC,CAAA;IAE5E,OAAO,CACN,8BAAC,qCAAiB,OACb,UAAU,EACd,KAAK,EAAE,KAAK,EACZ,QAAQ,EAAE,QAAQ,IAAI,eAAe,EACrC,aAAa,EAAE,cAAc;QAC7B,8BAAC,qBAAM,OAAG,CACS,CACpB,CAAA;AACF,CAAC,CAAA;AAjBY,QAAA,4BAA4B,gCAiBxC"}
@@ -1,6 +1,5 @@
1
- import type { Location } from '@remix-run/router';
2
1
  import React from 'react';
3
- import { NavigateFunction } from 'react-router';
2
+ import type { Location, NavigateFunction } from 'react-router';
4
3
  import { BasicLayoutProps } from './BasicLayout';
5
4
  import { MenuPage } from './MenuPage';
6
5
  export declare type ReactRouterMenuPage = MenuPage & {
@@ -1 +1 @@
1
- {"version":3,"file":"ReactRouterLayout.js","sourceRoot":"","sources":["../../../../src/react/components/navigation/ReactRouterLayout.tsx"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"ReactRouterLayout.js","sourceRoot":"","sources":["../../../../src/react/components/navigation/ReactRouterLayout.tsx"],"names":[],"mappings":"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"}
@@ -3,6 +3,17 @@ import { HistorianArgs, HistorianType } from './openFin5Historian';
3
3
  export declare const getFin5top: (notifyFailure?: () => void) => Fin5Top | null;
4
4
  export declare const fin5Top: Fin5Top | null;
5
5
  export declare function isWindowTopFin5(notifyFailure?: () => void): boolean;
6
+ interface RemotePopupStatus {
7
+ isOpen: boolean;
8
+ isMinimized: boolean;
9
+ id: string | null;
10
+ }
11
+ /**
12
+ * Check the status of the Folio popup.
13
+ * @returns an object containing the status of the Folio popup, including whether it's open,
14
+ * minimized, and its id.
15
+ */
16
+ export declare const getFolioPopupState: () => Promise<RemotePopupStatus>;
6
17
  export interface Fin5Top extends Window {
7
18
  app: Fin5App;
8
19
  languageManager: LanguageManager;
@@ -47,11 +58,13 @@ export interface Fin5App {
47
58
  * @param {string} url - Is the url which is to be loaded
48
59
  * @param {string} title - Specifies the title to be displayed on the iframe object
49
60
  * @param {string} targetId - Specifies the id of the equip (etc) to which the main navigation update.
50
- * @param {object} settings - extra settings that can be passed in when calling hte func
51
- * @param {boolean} settings.collapse - flag indicating the collapse state of the RHS app panel
61
+ * @param {object} settings - Is the set of extra settings which will be also passed down to NavigateToApp
62
+ * @param {string} settings.app - the name of the application on the RHS
63
+ * @param {string[]} settings.params - overridden/additional params to pass to NavigateToApp
52
64
  */
53
65
  LoadApplication: (url: string, title?: string, targetRef?: TargetRef, settings?: {
54
- collapse?: boolean;
66
+ app?: string;
67
+ params?: string[];
55
68
  }) => Promise<void>;
56
69
  /**
57
70
  * As the name suggests, this method logs out the user and resets the current session.
@@ -108,7 +121,16 @@ export interface Fin5App {
108
121
  * @param {TargetRef} targetRef - id of the target to be shown in the charts app. If not provided, it will open with the current target ref.
109
122
  */
110
123
  OpenCharts: (chartId?: string, targetRef?: TargetRef) => Promise<void>;
124
+ /**
125
+ * Gets the name of the current application. Eg: notes, trends etc..
126
+ *
127
+ * @method CurrentAppName
128
+ * @param {boolean} isSpecialAppId : if true, returns the special app id (iframe app name) which is the url hash without the underscore
129
+ * @return {string | boolean} if false, there's no app currently open. Otherwise, returns the identifier of the app.
130
+ */
131
+ CurrentAppName: (isSpecialAppId?: boolean) => string | boolean;
111
132
  findComponent: (name: string) => Fin5AppComponent;
133
+ findAllComponents: (name: string) => Fin5AppComponent[];
112
134
  /**
113
135
  * @see https://ractive.js.org/api/#ractiveobserve
114
136
  */
@@ -150,6 +172,7 @@ interface LanguageManager {
150
172
  }
151
173
  interface Fin5AppComponent {
152
174
  set: (value: unknown) => Promise<undefined>;
175
+ get: (value: unknown) => unknown;
153
176
  }
154
177
  export declare type TargetRef = string | null | undefined;
155
178
  export interface SchedulesParams {
@@ -28,6 +28,30 @@ export function isWindowTopFin5(notifyFailure) {
28
28
  notifyFailure?.();
29
29
  return false;
30
30
  }
31
+ /**
32
+ * Check the status of the Folio popup.
33
+ * @returns an object containing the status of the Folio popup, including whether it's open,
34
+ * minimized, and its id.
35
+ */
36
+ export const getFolioPopupState = async () => {
37
+ const stack = ((await fin5Top?.app?.get('remotePopupStack')) ??
38
+ []);
39
+ const folio = stack.find((p) => {
40
+ const url = (p.url || '').toLowerCase();
41
+ const title = p.settings?.headerContent?.title?.toLowerCase() ?? '';
42
+ return url.includes('folio') || title.includes('folio');
43
+ });
44
+ if (!folio) {
45
+ return { isOpen: false, isMinimized: false, id: null };
46
+ }
47
+ const popups = fin5Top?.app?.findAllComponents('remotecontentpopup') || [];
48
+ const popup = popups.find((c) => c.get('identifier') === folio.id);
49
+ return {
50
+ isOpen: true,
51
+ isMinimized: popup ? !!popup.get('isMinimized') : false,
52
+ id: folio.id,
53
+ };
54
+ };
31
55
  export var Fin5AppNames;
32
56
  (function (Fin5AppNames) {
33
57
  Fin5AppNames["EQUIP"] = "equip";
@@ -1 +1 @@
1
- {"version":3,"file":"fin5Top.js","sourceRoot":"","sources":["../../src/fin5Top/fin5Top.ts"],"names":[],"mappings":"AAAA;;GAEG;AAKH,MAAM,gBAAgB;IACb,MAAM,CAAC,QAAQ,CAAgB;IAEvC,MAAM,KAAK,OAAO;QACjB,OAAO,IAAI,CAAC,UAAU,EAAE,CAAA;IACzB,CAAC;IACD,MAAM,CAAC,UAAU,GAAG,CAAC,aAA0B,EAAkB,EAAE;QAClE,IAAI,IAAI,CAAC,QAAQ,KAAK,SAAS,EAAE;YAChC,IAAI,CAAC,QAAQ,GAAG,eAAe,CAAC,aAAa,CAAC;gBAC7C,CAAC,CAAE,MAAM,CAAC,GAA0B,CAAC,uEAAuE;gBAC5G,CAAC,CAAC,IAAI,CAAA;SACP;QACD,OAAO,IAAI,CAAC,QAAQ,CAAA;IACrB,CAAC,CAAA;;AAGF,MAAM,CAAC,MAAM,UAAU,GAAG,gBAAgB,CAAC,UAAU,CAAA;AAErD,MAAM,CAAC,MAAM,OAAO,GAAG,gBAAgB,CAAC,OAAO,CAAA;AAE/C,MAAM,UAAU,eAAe,CAAC,aAA0B;IACzD,IAAI;QACH,MAAM,EAAE,GAAG,EAAE,MAAM,CAAA;QACnB,IAAK,MAAM,CAAC,GAA0B,CAAC,QAAQ,EAAE;YAChD,OAAO,IAAI,CAAA;SACX;KACD;IAAC,MAAM,GAAE;IACV,aAAa,EAAE,EAAE,CAAA;IACjB,OAAO,KAAK,CAAA;AACb,CAAC;AA2JD,MAAM,CAAN,IAAY,YAyBX;AAzBD,WAAY,YAAY;IACvB,+BAAe,CAAA;IACf,qCAAqB,CAAA;IACrB,iCAAiB,CAAA;IACjB,iCAAiB,CAAA;IACjB,+BAAe,CAAA;IACf,mCAAmB,CAAA;IACnB,8CAA8B,CAAA;IAC9B,+BAAe,CAAA;IACf,uCAAuB,CAAA;IACvB,8CAA8B,CAAA;IAC9B,oCAAoB,CAAA;IACpB,wCAAwB,CAAA;IACxB,iCAAiB,CAAA;IACjB,wCAAwB,CAAA;IACxB,iCAAiB,CAAA;IACjB,iCAAiB,CAAA;IACjB,mCAAmB,CAAA;IACnB,mCAAmB,CAAA;IACnB,+BAAe,CAAA;IACf,mCAAmB,CAAA;IACnB,+BAAe,CAAA;IACf,6BAAa,CAAA;IACb,uCAAuB,CAAA;IACvB,qCAAqB,CAAA;AACtB,CAAC,EAzBW,YAAY,KAAZ,YAAY,QAyBvB"}
1
+ {"version":3,"file":"fin5Top.js","sourceRoot":"","sources":["../../src/fin5Top/fin5Top.ts"],"names":[],"mappings":"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"}
@@ -1,5 +1,5 @@
1
- import type { Location } from '@remix-run/router';
2
1
  import React from 'react';
2
+ import type { Location } from 'react-router';
3
3
  import { HeaderSiderLayoutProps } from './HeaderSiderLayout';
4
4
  import { ReactRouterMenuPage } from './ReactRouterLayout';
5
5
  export interface ReactRouterHeaderSiderLayoutProps extends HeaderSiderLayoutProps<ReactRouterMenuPage> {
@@ -1 +1 @@
1
- {"version":3,"file":"ReactRouterHeaderSiderLayout.js","sourceRoot":"","sources":["../../../../src/react/components/navigation/ReactRouterHeaderSiderLayout.tsx"],"names":[],"mappings":"AAAA;;GAEG;AAGH,OAAO,KAAK,MAAM,OAAO,CAAA;AACzB,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,cAAc,CAAA;AAClD,OAAO,EAAE,iBAAiB,EAA0B,MAAM,qBAAqB,CAAA;AAC/E,OAAO,EAEN,kBAAkB,EAClB,qBAAqB,EACrB,iBAAiB,GACjB,MAAM,qBAAqB,CAAA;AAO5B;;GAEG;AACH,MAAM,CAAC,MAAM,4BAA4B,GAErC,CAAC,EAAE,eAAe,EAAE,KAAK,GAAG,EAAE,EAAE,QAAQ,EAAE,GAAG,UAAU,EAAE,EAAE,EAAE;IAChE,MAAM,QAAQ,GAAG,WAAW,EAAE,CAAA;IAC9B,MAAM,cAAc,GAAG,iBAAiB,CAAC,KAAK,EAAE,eAAe,CAAC,CAAA;IAChE,MAAM,eAAe,GAAG,qBAAqB,CAAC,KAAK,CAAC,CAAA;IACpD,MAAM,eAAe,GAAG,kBAAkB,CAAC,QAAQ,EAAE,eAAe,EAAE,KAAK,CAAC,CAAA;IAE5E,OAAO,CACN,oBAAC,iBAAiB,OACb,UAAU,EACd,KAAK,EAAE,KAAK,EACZ,QAAQ,EAAE,QAAQ,IAAI,eAAe,EACrC,aAAa,EAAE,cAAc;QAC7B,oBAAC,MAAM,OAAG,CACS,CACpB,CAAA;AACF,CAAC,CAAA"}
1
+ {"version":3,"file":"ReactRouterHeaderSiderLayout.js","sourceRoot":"","sources":["../../../../src/react/components/navigation/ReactRouterHeaderSiderLayout.tsx"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,KAAK,MAAM,OAAO,CAAA;AAEzB,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,cAAc,CAAA;AAClD,OAAO,EAAE,iBAAiB,EAA0B,MAAM,qBAAqB,CAAA;AAC/E,OAAO,EAEN,kBAAkB,EAClB,qBAAqB,EACrB,iBAAiB,GACjB,MAAM,qBAAqB,CAAA;AAO5B;;GAEG;AACH,MAAM,CAAC,MAAM,4BAA4B,GAErC,CAAC,EAAE,eAAe,EAAE,KAAK,GAAG,EAAE,EAAE,QAAQ,EAAE,GAAG,UAAU,EAAE,EAAE,EAAE;IAChE,MAAM,QAAQ,GAAG,WAAW,EAAE,CAAA;IAC9B,MAAM,cAAc,GAAG,iBAAiB,CAAC,KAAK,EAAE,eAAe,CAAC,CAAA;IAChE,MAAM,eAAe,GAAG,qBAAqB,CAAC,KAAK,CAAC,CAAA;IACpD,MAAM,eAAe,GAAG,kBAAkB,CAAC,QAAQ,EAAE,eAAe,EAAE,KAAK,CAAC,CAAA;IAE5E,OAAO,CACN,oBAAC,iBAAiB,OACb,UAAU,EACd,KAAK,EAAE,KAAK,EACZ,QAAQ,EAAE,QAAQ,IAAI,eAAe,EACrC,aAAa,EAAE,cAAc;QAC7B,oBAAC,MAAM,OAAG,CACS,CACpB,CAAA;AACF,CAAC,CAAA"}
@@ -1,6 +1,5 @@
1
- import type { Location } from '@remix-run/router';
2
1
  import React from 'react';
3
- import { NavigateFunction } from 'react-router';
2
+ import type { Location, NavigateFunction } from 'react-router';
4
3
  import { BasicLayoutProps } from './BasicLayout';
5
4
  import { MenuPage } from './MenuPage';
6
5
  export declare type ReactRouterMenuPage = MenuPage & {
@@ -2,7 +2,7 @@
2
2
  * Copyright (c) 2023, J2 Innovations. All Rights Reserved
3
3
  */
4
4
  import React, { useCallback, useEffect, useMemo } from 'react';
5
- import { Outlet, useLocation, useNavigate, } from 'react-router';
5
+ import { Outlet, useLocation, useNavigate } from 'react-router';
6
6
  import { IN_IFRAME, fin5SkipHashUpdate, getFin5HashFrameParameters, getTopLocation, } from '../../../fin5Top/useFin5AppURLHashParameter';
7
7
  import { BasicLayout } from './BasicLayout';
8
8
  import { pageTreeToPageList } from './MenuPage';
@@ -1 +1 @@
1
- {"version":3,"file":"ReactRouterLayout.js","sourceRoot":"","sources":["../../../../src/react/components/navigation/ReactRouterLayout.tsx"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"ReactRouterLayout.js","sourceRoot":"","sources":["../../../../src/react/components/navigation/ReactRouterLayout.tsx"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@j2inn/fin5-ui-utils",
3
- "version": "8.1.2",
3
+ "version": "8.3.0",
4
4
  "description": "A set of useful client-side utilities useful for creating UI applications on top of FIN 5",
5
5
  "main": "dist/index.js",
6
6
  "types": "dist/index.d.ts",
@@ -8,7 +8,7 @@
8
8
  "scripts": {
9
9
  "clean": "rimraf ./dist",
10
10
  "doc": "typedoc ./src --excludePrivate",
11
- "prebuild": "npm run lint && npm run test",
11
+ "prebuild": "npm run clean && npm run lint && npm run test",
12
12
  "build": "tsc && npm run-script build:es",
13
13
  "build:es": "tsc --module ESNext --outDir dist_es",
14
14
  "checktypes": "tsc --noEmit",
@@ -47,8 +47,7 @@
47
47
  "react": "^18.2.0",
48
48
  "react-dom": "^18.2.0",
49
49
  "react-jss": "^10.9.2",
50
- "react-router": "^6.10.0",
51
- "react-router-dom": "^6.10.0"
50
+ "react-router": "^6.10.0 || ^7.0.0"
52
51
  },
53
52
  "devDependencies": {
54
53
  "@babel/cli": "^7.18.10",
@@ -73,6 +72,7 @@
73
72
  "@types/node": "^18.7.18",
74
73
  "@types/react": "^18.0.20",
75
74
  "@types/react-dom": "^18.0.20",
75
+ "@testing-library/react": "^13.4.0",
76
76
  "@typescript-eslint/eslint-plugin": "^5.37.0",
77
77
  "@typescript-eslint/parser": "^5.37.0",
78
78
  "babel-eslint": "^10.1.0",
@@ -100,6 +100,7 @@
100
100
  "jest-chain": "^1.1.5",
101
101
  "jest-css-modules": "^2.1.0",
102
102
  "jest-css-modules-transform": "^4.2.1",
103
+ "jest-environment-jsdom": "^29.0.3",
103
104
  "jest-extended": "^3.1.0",
104
105
  "less": "^4.1.2",
105
106
  "less-loader": "^11.0.0",
@@ -115,6 +116,7 @@
115
116
  "react": "^18.2.0",
116
117
  "react-dom": "^18.2.0",
117
118
  "react-jss": "^10.9.2",
119
+ "react-router": "^7.18.5",
118
120
  "rimraf": "^3.0.2",
119
121
  "stylus-loader": "^7.0.0",
120
122
  "ts-jest": "^29.0.1",