@openmrs/esm-styleguide 10.0.1-pre.5255 → 10.0.1-pre.5263
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/.turbo/turbo-build.log +1 -1
- package/dist/modals/index.js +3 -4
- package/dist/workspaces/container/workspace-renderer.component.d.ts.map +1 -1
- package/dist/workspaces/container/workspace-renderer.component.js +3 -2
- package/dist/workspaces2/active-workspace-window.component.d.ts.map +1 -1
- package/dist/workspaces2/active-workspace-window.component.js +3 -3
- package/package.json +25 -25
- package/src/modals/index.tsx +3 -3
- package/src/workspaces/container/workspace-renderer.component.tsx +5 -2
- package/src/workspaces/container/workspace-renderer.test.tsx +3 -2
- package/src/workspaces2/active-workspace-window.component.tsx +5 -3
package/.turbo/turbo-build.log
CHANGED
|
@@ -1,3 +1,3 @@
|
|
|
1
|
-
[0] Successfully compiled: 123 files, copied 167 files with swc (
|
|
1
|
+
[0] Successfully compiled: 123 files, copied 167 files with swc (251.32ms)
|
|
2
2
|
[0] swc --strip-leading-paths --copy-files src -d dist && svgo -rf dist --quiet exited with code 0
|
|
3
3
|
[1] tsc --project tsconfig.build.json exited with code 0
|
package/dist/modals/index.js
CHANGED
|
@@ -1,6 +1,5 @@
|
|
|
1
|
-
/** @module @category UI */ import {
|
|
2
|
-
import {
|
|
3
|
-
import { getModalRegistration } from "@openmrs/esm-extensions";
|
|
1
|
+
/** @module @category UI */ import { createGlobalStore } from "@openmrs/esm-state";
|
|
2
|
+
import { getModalRegistration, renderParcel } from "@openmrs/esm-extensions";
|
|
4
3
|
import { reportError } from "@openmrs/esm-error-handling";
|
|
5
4
|
const modalStore = createGlobalStore('modalState', {
|
|
6
5
|
modalContainer: null,
|
|
@@ -27,7 +26,7 @@ let parcelCount = 0;
|
|
|
27
26
|
const { load } = modalRegistration;
|
|
28
27
|
const lifecycle = await load();
|
|
29
28
|
const id = parcelCount++;
|
|
30
|
-
parcel =
|
|
29
|
+
parcel = await renderParcel({
|
|
31
30
|
...lifecycle,
|
|
32
31
|
name: `${modalName}-${id}`
|
|
33
32
|
}, {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"workspace-renderer.component.d.ts","sourceRoot":"","sources":["../../../src/workspaces/container/workspace-renderer.component.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAuC,MAAM,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"workspace-renderer.component.d.ts","sourceRoot":"","sources":["../../../src/workspaces/container/workspace-renderer.component.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAuC,MAAM,OAAO,CAAC;AAO5D,OAAO,EAAE,KAAK,aAAa,EAAE,MAAM,eAAe,CAAC;AAGnD,UAAU,sBAAsB;IAC9B,SAAS,EAAE,aAAa,CAAC;IACzB,uBAAuB,CAAC,EAAE,MAAM,CAAC;CAClC;AAID,wBAAgB,iBAAiB,CAAC,EAAE,SAAS,EAAE,uBAAuB,EAAE,EAAE,sBAAsB,qBAmC/F"}
|
|
@@ -1,11 +1,12 @@
|
|
|
1
1
|
import { jsx as _jsx } from "react/jsx-runtime";
|
|
2
2
|
import React, { useEffect, useState, useMemo } from "react";
|
|
3
|
-
import { mountRootParcel } from "single-spa";
|
|
4
3
|
import Parcel from "single-spa-react/parcel";
|
|
5
4
|
import { InlineLoading } from "@carbon/react";
|
|
5
|
+
import { createParcelMounter } from "@openmrs/esm-extensions";
|
|
6
6
|
import { getCoreTranslation } from "@openmrs/esm-translations";
|
|
7
7
|
import styles from "./workspace.module.scss";
|
|
8
8
|
import { useWorkspaceGroupStore } from "../workspace-sidebar-store/useWorkspaceGroupStore.js";
|
|
9
|
+
const mountParcel = createParcelMounter();
|
|
9
10
|
export function WorkspaceRenderer({ workspace, additionalPropsFromPage }) {
|
|
10
11
|
const [lifecycle, setLifecycle] = useState();
|
|
11
12
|
const workspaceGroupState = useWorkspaceGroupStore(workspace.currentWorkspaceGroup);
|
|
@@ -37,7 +38,7 @@ export function WorkspaceRenderer({ workspace, additionalPropsFromPage }) {
|
|
|
37
38
|
]);
|
|
38
39
|
return lifecycle ? /*#__PURE__*/ _jsx(Parcel, {
|
|
39
40
|
config: lifecycle,
|
|
40
|
-
mountParcel:
|
|
41
|
+
mountParcel: mountParcel,
|
|
41
42
|
...props
|
|
42
43
|
}, workspace.name) : /*#__PURE__*/ _jsx(InlineLoading, {
|
|
43
44
|
className: styles.loader,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"active-workspace-window.component.d.ts","sourceRoot":"","sources":["../../src/workspaces2/active-workspace-window.component.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAuC,MAAM,OAAO,CAAC;AAK5D,OAAO,EAAE,KAAK,YAAY,
|
|
1
|
+
{"version":3,"file":"active-workspace-window.component.d.ts","sourceRoot":"","sources":["../../src/workspaces2/active-workspace-window.component.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAuC,MAAM,OAAO,CAAC;AAK5D,OAAO,EAAE,KAAK,YAAY,EAA8D,MAAM,yBAAyB,CAAC;AAOxH,UAAU,oBAAoB;IAC5B,YAAY,EAAE,YAAY,CAAC;IAC3B,cAAc,EAAE,OAAO,CAAC;CACzB;AACD;;GAEG;AACH,QAAA,MAAM,qBAAqB,EAAE,KAAK,CAAC,EAAE,CAAC,oBAAoB,CA4CzD,CAAC;AA2IF,eAAe,qBAAqB,CAAC"}
|
|
@@ -2,9 +2,8 @@ import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-run
|
|
|
2
2
|
import React, { useEffect, useMemo, useState } from "react";
|
|
3
3
|
import classNames from "classnames";
|
|
4
4
|
import Parcel from "single-spa-react/parcel";
|
|
5
|
-
import { mountRootParcel } from "single-spa";
|
|
6
5
|
import { InlineLoading } from "@carbon/react";
|
|
7
|
-
import { workspace2Store } from "@openmrs/esm-extensions";
|
|
6
|
+
import { createParcelMounter, workspace2Store } from "@openmrs/esm-extensions";
|
|
8
7
|
import { loadLifeCycles } from "@openmrs/esm-routes";
|
|
9
8
|
import { getCoreTranslation } from "@openmrs/esm-translations";
|
|
10
9
|
import { promptForClosingWorkspaces, useWorkspace2Store } from "./workspace2.js";
|
|
@@ -52,6 +51,7 @@ import styles from "./workspace2.module.scss";
|
|
|
52
51
|
}, openedWorkspace.uuid))
|
|
53
52
|
});
|
|
54
53
|
};
|
|
54
|
+
const mountParcel = createParcelMounter();
|
|
55
55
|
const ActiveWorkspace = ({ lifeCycle, openedWorkspace, openedWindow, isRootWorkspace, isLeafWorkspace, showActionMenu })=>{
|
|
56
56
|
const { openedGroup, closeWorkspace, openChildWorkspace } = useWorkspace2Store();
|
|
57
57
|
const props = useMemo(()=>openedWorkspace && {
|
|
@@ -161,7 +161,7 @@ const ActiveWorkspace = ({ lifeCycle, openedWorkspace, openedWindow, isRootWorks
|
|
|
161
161
|
}
|
|
162
162
|
return /*#__PURE__*/ _jsx(Parcel, {
|
|
163
163
|
config: lifeCycle,
|
|
164
|
-
mountParcel:
|
|
164
|
+
mountParcel: mountParcel,
|
|
165
165
|
...props
|
|
166
166
|
}, openedWorkspace.workspaceName);
|
|
167
167
|
};
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@openmrs/esm-styleguide",
|
|
3
|
-
"version": "10.0.1-pre.
|
|
3
|
+
"version": "10.0.1-pre.5263",
|
|
4
4
|
"license": "MPL-2.0",
|
|
5
5
|
"description": "The styleguide for OpenMRS SPA",
|
|
6
6
|
"module": "dist/internal.js",
|
|
@@ -78,18 +78,18 @@
|
|
|
78
78
|
"react-aria-components": "^1.7.1"
|
|
79
79
|
},
|
|
80
80
|
"peerDependencies": {
|
|
81
|
-
"@openmrs/esm-api": "^10.0.1-pre.
|
|
82
|
-
"@openmrs/esm-config": "^10.0.1-pre.
|
|
83
|
-
"@openmrs/esm-emr-api": "^10.0.1-pre.
|
|
84
|
-
"@openmrs/esm-error-handling": "^10.0.1-pre.
|
|
85
|
-
"@openmrs/esm-extensions": "^10.0.1-pre.
|
|
86
|
-
"@openmrs/esm-globals": "^10.0.1-pre.
|
|
87
|
-
"@openmrs/esm-navigation": "^10.0.1-pre.
|
|
88
|
-
"@openmrs/esm-react-utils": "^10.0.1-pre.
|
|
89
|
-
"@openmrs/esm-routes": "^10.0.1-pre.
|
|
90
|
-
"@openmrs/esm-state": "^10.0.1-pre.
|
|
91
|
-
"@openmrs/esm-translations": "^10.0.1-pre.
|
|
92
|
-
"@openmrs/esm-utils": "^10.0.1-pre.
|
|
81
|
+
"@openmrs/esm-api": "^10.0.1-pre.5263",
|
|
82
|
+
"@openmrs/esm-config": "^10.0.1-pre.5263",
|
|
83
|
+
"@openmrs/esm-emr-api": "^10.0.1-pre.5263",
|
|
84
|
+
"@openmrs/esm-error-handling": "^10.0.1-pre.5263",
|
|
85
|
+
"@openmrs/esm-extensions": "^10.0.1-pre.5263",
|
|
86
|
+
"@openmrs/esm-globals": "^10.0.1-pre.5263",
|
|
87
|
+
"@openmrs/esm-navigation": "^10.0.1-pre.5263",
|
|
88
|
+
"@openmrs/esm-react-utils": "^10.0.1-pre.5263",
|
|
89
|
+
"@openmrs/esm-routes": "^10.0.1-pre.5263",
|
|
90
|
+
"@openmrs/esm-state": "^10.0.1-pre.5263",
|
|
91
|
+
"@openmrs/esm-translations": "^10.0.1-pre.5263",
|
|
92
|
+
"@openmrs/esm-utils": "^10.0.1-pre.5263",
|
|
93
93
|
"dayjs": "1.x",
|
|
94
94
|
"i18next": "25.x",
|
|
95
95
|
"react": "18.x",
|
|
@@ -99,18 +99,18 @@
|
|
|
99
99
|
"swr": "2.x"
|
|
100
100
|
},
|
|
101
101
|
"devDependencies": {
|
|
102
|
-
"@openmrs/esm-api": "10.0.1-pre.
|
|
103
|
-
"@openmrs/esm-config": "10.0.1-pre.
|
|
104
|
-
"@openmrs/esm-emr-api": "10.0.1-pre.
|
|
105
|
-
"@openmrs/esm-error-handling": "10.0.1-pre.
|
|
106
|
-
"@openmrs/esm-extensions": "10.0.1-pre.
|
|
107
|
-
"@openmrs/esm-globals": "10.0.1-pre.
|
|
108
|
-
"@openmrs/esm-navigation": "10.0.1-pre.
|
|
109
|
-
"@openmrs/esm-react-utils": "10.0.1-pre.
|
|
110
|
-
"@openmrs/esm-routes": "10.0.1-pre.
|
|
111
|
-
"@openmrs/esm-state": "10.0.1-pre.
|
|
112
|
-
"@openmrs/esm-translations": "10.0.1-pre.
|
|
113
|
-
"@openmrs/esm-utils": "10.0.1-pre.
|
|
102
|
+
"@openmrs/esm-api": "10.0.1-pre.5263",
|
|
103
|
+
"@openmrs/esm-config": "10.0.1-pre.5263",
|
|
104
|
+
"@openmrs/esm-emr-api": "10.0.1-pre.5263",
|
|
105
|
+
"@openmrs/esm-error-handling": "10.0.1-pre.5263",
|
|
106
|
+
"@openmrs/esm-extensions": "10.0.1-pre.5263",
|
|
107
|
+
"@openmrs/esm-globals": "10.0.1-pre.5263",
|
|
108
|
+
"@openmrs/esm-navigation": "10.0.1-pre.5263",
|
|
109
|
+
"@openmrs/esm-react-utils": "10.0.1-pre.5263",
|
|
110
|
+
"@openmrs/esm-routes": "10.0.1-pre.5263",
|
|
111
|
+
"@openmrs/esm-state": "10.0.1-pre.5263",
|
|
112
|
+
"@openmrs/esm-translations": "10.0.1-pre.5263",
|
|
113
|
+
"@openmrs/esm-utils": "10.0.1-pre.5263",
|
|
114
114
|
"@swc/cli": "0.8.1",
|
|
115
115
|
"@swc/core": "1.15.21",
|
|
116
116
|
"@types/geopattern": "^1.2.9",
|
package/src/modals/index.tsx
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
/** @module @category UI */
|
|
2
|
-
import {
|
|
2
|
+
import { type Parcel } from 'single-spa';
|
|
3
3
|
import { createGlobalStore } from '@openmrs/esm-state';
|
|
4
|
-
import { getModalRegistration } from '@openmrs/esm-extensions';
|
|
4
|
+
import { getModalRegistration, renderParcel } from '@openmrs/esm-extensions';
|
|
5
5
|
import { reportError } from '@openmrs/esm-error-handling';
|
|
6
6
|
|
|
7
7
|
type ModalInstanceState = 'NEW' | 'MOUNTED' | 'TO_BE_DELETED';
|
|
@@ -63,7 +63,7 @@ async function renderModalIntoDOM(
|
|
|
63
63
|
|
|
64
64
|
const lifecycle = await load();
|
|
65
65
|
const id = parcelCount++;
|
|
66
|
-
parcel =
|
|
66
|
+
parcel = await renderParcel(
|
|
67
67
|
{
|
|
68
68
|
...lifecycle,
|
|
69
69
|
name: `${modalName}-${id}`,
|
|
@@ -1,7 +1,8 @@
|
|
|
1
1
|
import React, { useEffect, useState, useMemo } from 'react';
|
|
2
|
-
import {
|
|
2
|
+
import { type ParcelConfig } from 'single-spa';
|
|
3
3
|
import Parcel from 'single-spa-react/parcel';
|
|
4
4
|
import { InlineLoading } from '@carbon/react';
|
|
5
|
+
import { createParcelMounter } from '@openmrs/esm-extensions';
|
|
5
6
|
import { getCoreTranslation } from '@openmrs/esm-translations';
|
|
6
7
|
import styles from './workspace.module.scss';
|
|
7
8
|
import { type OpenWorkspace } from '../workspaces';
|
|
@@ -12,6 +13,8 @@ interface WorkspaceRendererProps {
|
|
|
12
13
|
additionalPropsFromPage?: object;
|
|
13
14
|
}
|
|
14
15
|
|
|
16
|
+
const mountParcel = createParcelMounter();
|
|
17
|
+
|
|
15
18
|
export function WorkspaceRenderer({ workspace, additionalPropsFromPage }: WorkspaceRendererProps) {
|
|
16
19
|
const [lifecycle, setLifecycle] = useState<ParcelConfig | undefined>();
|
|
17
20
|
const workspaceGroupState = useWorkspaceGroupStore(workspace.currentWorkspaceGroup);
|
|
@@ -43,7 +46,7 @@ export function WorkspaceRenderer({ workspace, additionalPropsFromPage }: Worksp
|
|
|
43
46
|
);
|
|
44
47
|
|
|
45
48
|
return lifecycle ? (
|
|
46
|
-
<Parcel key={workspace.name} config={lifecycle} mountParcel={
|
|
49
|
+
<Parcel key={workspace.name} config={lifecycle} mountParcel={mountParcel} {...props} />
|
|
47
50
|
) : (
|
|
48
51
|
<InlineLoading className={styles.loader} description={`${getCoreTranslation('loading', 'Loading')} ...`} />
|
|
49
52
|
);
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
import React from 'react';
|
|
2
2
|
import { describe, expect, it, vi } from 'vitest';
|
|
3
3
|
import '@testing-library/jest-dom/vitest';
|
|
4
|
+
import { createParcelMounter } from '@openmrs/esm-extensions';
|
|
4
5
|
import { render, screen } from '@testing-library/react';
|
|
5
|
-
import { mountRootParcel } from 'single-spa';
|
|
6
6
|
import { WorkspaceRenderer } from './workspace-renderer.component';
|
|
7
7
|
import { getWorkspaceGroupStore } from '../workspaces';
|
|
8
8
|
|
|
@@ -22,6 +22,7 @@ describe('WorkspaceRenderer', () => {
|
|
|
22
22
|
const mockPromptBeforeClosing = vi.fn();
|
|
23
23
|
const mockSetTitle = vi.fn();
|
|
24
24
|
const mockLoadFn = vi.fn().mockImplementation(() => Promise.resolve('file-content'));
|
|
25
|
+
const mountParcel = createParcelMounter();
|
|
25
26
|
|
|
26
27
|
getWorkspaceGroupStore('test-sidebar-store')?.setState({
|
|
27
28
|
// Testing that the workspace group state should be overrided by additionalProps
|
|
@@ -54,7 +55,7 @@ describe('WorkspaceRenderer', () => {
|
|
|
54
55
|
|
|
55
56
|
expect(mockFn).toHaveBeenCalledWith({
|
|
56
57
|
config: 'file-content',
|
|
57
|
-
mountParcel:
|
|
58
|
+
mountParcel: mountParcel,
|
|
58
59
|
closeWorkspace: mockCloseWorkspace,
|
|
59
60
|
closeWorkspaceWithSavedChanges: mockCloseWorkspaceWithSavedChanges,
|
|
60
61
|
promptBeforeClosing: mockPromptBeforeClosing,
|
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
import React, { useEffect, useMemo, useState } from 'react';
|
|
2
2
|
import classNames from 'classnames';
|
|
3
3
|
import Parcel from 'single-spa-react/parcel';
|
|
4
|
-
import {
|
|
4
|
+
import { type ParcelConfig } from 'single-spa';
|
|
5
5
|
import { InlineLoading } from '@carbon/react';
|
|
6
|
-
import { type OpenedWindow, type OpenedWorkspace, workspace2Store } from '@openmrs/esm-extensions';
|
|
6
|
+
import { type OpenedWindow, type OpenedWorkspace, createParcelMounter, workspace2Store } from '@openmrs/esm-extensions';
|
|
7
7
|
import { loadLifeCycles } from '@openmrs/esm-routes';
|
|
8
8
|
import { getCoreTranslation } from '@openmrs/esm-translations';
|
|
9
9
|
import { promptForClosingWorkspaces, useWorkspace2Store } from './workspace2';
|
|
@@ -72,6 +72,8 @@ interface ActiveWorkspaceProps {
|
|
|
72
72
|
showActionMenu: boolean;
|
|
73
73
|
}
|
|
74
74
|
|
|
75
|
+
const mountParcel = createParcelMounter();
|
|
76
|
+
|
|
75
77
|
const ActiveWorkspace: React.FC<ActiveWorkspaceProps> = ({
|
|
76
78
|
lifeCycle,
|
|
77
79
|
openedWorkspace,
|
|
@@ -195,7 +197,7 @@ const ActiveWorkspace: React.FC<ActiveWorkspaceProps> = ({
|
|
|
195
197
|
);
|
|
196
198
|
}
|
|
197
199
|
|
|
198
|
-
return <Parcel key={openedWorkspace.workspaceName} config={lifeCycle} mountParcel={
|
|
200
|
+
return <Parcel key={openedWorkspace.workspaceName} config={lifeCycle} mountParcel={mountParcel} {...props} />;
|
|
199
201
|
};
|
|
200
202
|
|
|
201
203
|
export default ActiveWorkspaceWindow;
|