@openmrs/esm-styleguide 8.0.1-pre.3634 → 8.0.1-pre.3641
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.
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@openmrs/esm-styleguide",
|
|
3
|
-
"version": "8.0.1-pre.
|
|
3
|
+
"version": "8.0.1-pre.3641",
|
|
4
4
|
"license": "MPL-2.0",
|
|
5
5
|
"description": "The styleguide for OpenMRS SPA",
|
|
6
6
|
"main": "dist/openmrs-esm-styleguide.js",
|
|
@@ -98,17 +98,17 @@
|
|
|
98
98
|
"swr": "2.x"
|
|
99
99
|
},
|
|
100
100
|
"devDependencies": {
|
|
101
|
-
"@openmrs/esm-api": "8.0.1-pre.
|
|
102
|
-
"@openmrs/esm-config": "8.0.1-pre.
|
|
103
|
-
"@openmrs/esm-emr-api": "8.0.1-pre.
|
|
104
|
-
"@openmrs/esm-error-handling": "8.0.1-pre.
|
|
105
|
-
"@openmrs/esm-extensions": "8.0.1-pre.
|
|
106
|
-
"@openmrs/esm-globals": "8.0.1-pre.
|
|
107
|
-
"@openmrs/esm-navigation": "8.0.1-pre.
|
|
108
|
-
"@openmrs/esm-react-utils": "8.0.1-pre.
|
|
109
|
-
"@openmrs/esm-state": "8.0.1-pre.
|
|
110
|
-
"@openmrs/esm-translations": "8.0.1-pre.
|
|
111
|
-
"@openmrs/esm-utils": "8.0.1-pre.
|
|
101
|
+
"@openmrs/esm-api": "8.0.1-pre.3641",
|
|
102
|
+
"@openmrs/esm-config": "8.0.1-pre.3641",
|
|
103
|
+
"@openmrs/esm-emr-api": "8.0.1-pre.3641",
|
|
104
|
+
"@openmrs/esm-error-handling": "8.0.1-pre.3641",
|
|
105
|
+
"@openmrs/esm-extensions": "8.0.1-pre.3641",
|
|
106
|
+
"@openmrs/esm-globals": "8.0.1-pre.3641",
|
|
107
|
+
"@openmrs/esm-navigation": "8.0.1-pre.3641",
|
|
108
|
+
"@openmrs/esm-react-utils": "8.0.1-pre.3641",
|
|
109
|
+
"@openmrs/esm-state": "8.0.1-pre.3641",
|
|
110
|
+
"@openmrs/esm-translations": "8.0.1-pre.3641",
|
|
111
|
+
"@openmrs/esm-utils": "8.0.1-pre.3641",
|
|
112
112
|
"@rspack/cli": "^1.3.11",
|
|
113
113
|
"@rspack/core": "^1.3.11",
|
|
114
114
|
"@types/geopattern": "^1.2.9",
|
|
@@ -1,8 +1,10 @@
|
|
|
1
|
-
import React from 'react';
|
|
1
|
+
import React, { useEffect } from 'react';
|
|
2
|
+
import { subscribeOpenmrsEvent } from '@openmrs/esm-emr-api';
|
|
3
|
+
import { navigate } from '@openmrs/esm-navigation';
|
|
2
4
|
import classNames from 'classnames';
|
|
3
5
|
import { createRoot } from 'react-dom/client';
|
|
4
6
|
import { ActionMenu } from './action-menu2/action-menu2.component';
|
|
5
|
-
import { useWorkspace2Store } from './workspace2';
|
|
7
|
+
import { closeWorkspaceGroup2, useWorkspace2Store } from './workspace2';
|
|
6
8
|
import ActiveWorkspaceWindow from './active-workspace-window.component';
|
|
7
9
|
import styles from './workspace-windows-and-menu.module.scss';
|
|
8
10
|
|
|
@@ -20,6 +22,26 @@ export function renderWorkspaceWindowsAndMenu(target: HTMLElement | null) {
|
|
|
20
22
|
function WorkspaceWindowsAndMenu() {
|
|
21
23
|
const { openedGroup, openedWindows, registeredGroupsByName } = useWorkspace2Store();
|
|
22
24
|
|
|
25
|
+
useEffect(() => {
|
|
26
|
+
const unsubscribe = subscribeOpenmrsEvent('before-page-changed', (pageChangedEvent) => {
|
|
27
|
+
const { newPage, newUrl, cancelNavigation } = pageChangedEvent;
|
|
28
|
+
if (openedGroup && newPage) {
|
|
29
|
+
// first cancel the navigation request
|
|
30
|
+
// re-do the navigation when workspace group is successfully closed
|
|
31
|
+
cancelNavigation();
|
|
32
|
+
closeWorkspaceGroup2().then((isClosed) => {
|
|
33
|
+
if (isClosed) {
|
|
34
|
+
// the closeWorkspaceGroup2() promise resolves too soon for some reason;
|
|
35
|
+
// wrap the navigate() in Promise.resolve to avoid conflict with cancelNavigation()
|
|
36
|
+
Promise.resolve().then(() => navigate({ to: newUrl }));
|
|
37
|
+
}
|
|
38
|
+
});
|
|
39
|
+
}
|
|
40
|
+
});
|
|
41
|
+
|
|
42
|
+
return unsubscribe;
|
|
43
|
+
}, [openedGroup]);
|
|
44
|
+
|
|
23
45
|
if (!openedGroup) {
|
|
24
46
|
return null;
|
|
25
47
|
}
|