@openmrs/esm-styleguide 8.0.1-pre.3675 → 8.0.1-pre.3684

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.
Files changed (5) hide show
  1. package/.turbo/turbo-build.log +2 -2
  2. package/dist/openmrs-esm-styleguide.js +1 -1
  3. package/dist/openmrs-esm-styleguide.js.map +1 -1
  4. package/package.json +12 -12
  5. package/src/workspaces2/workspace-windows-and-menu.component.tsx +4 -12
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@openmrs/esm-styleguide",
3
- "version": "8.0.1-pre.3675",
3
+ "version": "8.0.1-pre.3684",
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.3675",
102
- "@openmrs/esm-config": "8.0.1-pre.3675",
103
- "@openmrs/esm-emr-api": "8.0.1-pre.3675",
104
- "@openmrs/esm-error-handling": "8.0.1-pre.3675",
105
- "@openmrs/esm-extensions": "8.0.1-pre.3675",
106
- "@openmrs/esm-globals": "8.0.1-pre.3675",
107
- "@openmrs/esm-navigation": "8.0.1-pre.3675",
108
- "@openmrs/esm-react-utils": "8.0.1-pre.3675",
109
- "@openmrs/esm-state": "8.0.1-pre.3675",
110
- "@openmrs/esm-translations": "8.0.1-pre.3675",
111
- "@openmrs/esm-utils": "8.0.1-pre.3675",
101
+ "@openmrs/esm-api": "8.0.1-pre.3684",
102
+ "@openmrs/esm-config": "8.0.1-pre.3684",
103
+ "@openmrs/esm-emr-api": "8.0.1-pre.3684",
104
+ "@openmrs/esm-error-handling": "8.0.1-pre.3684",
105
+ "@openmrs/esm-extensions": "8.0.1-pre.3684",
106
+ "@openmrs/esm-globals": "8.0.1-pre.3684",
107
+ "@openmrs/esm-navigation": "8.0.1-pre.3684",
108
+ "@openmrs/esm-react-utils": "8.0.1-pre.3684",
109
+ "@openmrs/esm-state": "8.0.1-pre.3684",
110
+ "@openmrs/esm-translations": "8.0.1-pre.3684",
111
+ "@openmrs/esm-utils": "8.0.1-pre.3684",
112
112
  "@rspack/cli": "^1.3.11",
113
113
  "@rspack/core": "^1.3.11",
114
114
  "@types/geopattern": "^1.2.9",
package/src/workspaces2/workspace-windows-and-menu.component.tsx CHANGED
@@ -1,6 +1,5 @@
1
1
  import React, { useEffect } from 'react';
2
2
  import { subscribeOpenmrsEvent } from '@openmrs/esm-emr-api';
3
- import { navigate } from '@openmrs/esm-navigation';
4
3
  import classNames from 'classnames';
5
4
  import { createRoot } from 'react-dom/client';
6
5
  import { ActionMenu } from './action-menu2/action-menu2.component';
@@ -24,18 +23,11 @@ function WorkspaceWindowsAndMenu() {
24
23
 
25
24
  useEffect(() => {
26
25
  const unsubscribe = subscribeOpenmrsEvent('before-page-changed', (pageChangedEvent) => {
27
- const { newPage, newUrl, cancelNavigation } = pageChangedEvent;
26
+ const { newPage, cancelNavigation } = pageChangedEvent;
28
27
  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
- });
28
+ // Prompt to close the workspaces
29
+ // should only cancel navigation if the user cancels the prompt
30
+ cancelNavigation(closeWorkspaceGroup2().then((isClosed) => !isClosed));
39
31
  }
40
32
  });
41
33