@openmrs/esm-react-utils 8.0.1-pre.3444 → 8.0.1-pre.3457
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/ExtensionSlot.js +1 -1
- package/dist/useExtensionSlot.d.ts +2 -1
- package/dist/useExtensionSlot.js +14 -4
- package/package.json +12 -12
- package/src/ExtensionSlot.tsx +3 -3
- package/src/useExtensionSlot.ts +16 -4
package/.turbo/turbo-build.log
CHANGED
package/dist/ExtensionSlot.js
CHANGED
|
@@ -41,7 +41,7 @@ function defaultSelect(extensions) {
|
|
|
41
41
|
}
|
|
42
42
|
const name = extensionSlotName ?? legacyExtensionSlotName;
|
|
43
43
|
const slotRef = useRef(null);
|
|
44
|
-
const { extensions, extensionSlotModuleName } = useExtensionSlot(name);
|
|
44
|
+
const { extensions, extensionSlotModuleName } = useExtensionSlot(name, state);
|
|
45
45
|
const extensionsToRender = useMemo(()=>select(extensions), [
|
|
46
46
|
select,
|
|
47
47
|
extensions
|
|
@@ -1,5 +1,6 @@
|
|
|
1
|
+
import { type ExtensionSlotCustomState } from '@openmrs/esm-extensions';
|
|
1
2
|
/** @internal */
|
|
2
|
-
export declare function useExtensionSlot(slotName: string): {
|
|
3
|
+
export declare function useExtensionSlot(slotName: string, state?: ExtensionSlotCustomState): {
|
|
3
4
|
extensions: import("@openmrs/esm-extensions").AssignedExtension[];
|
|
4
5
|
extensionSlotName: string;
|
|
5
6
|
extensionSlotModuleName: string;
|
package/dist/useExtensionSlot.js
CHANGED
|
@@ -1,15 +1,25 @@
|
|
|
1
|
-
import { useContext, useEffect } from "react";
|
|
2
|
-
import { registerExtensionSlot } from "@openmrs/esm-extensions";
|
|
1
|
+
import { useContext, useEffect, useRef } from "react";
|
|
2
|
+
import { registerExtensionSlot, updateExtensionSlotState } from "@openmrs/esm-extensions";
|
|
3
3
|
import { ComponentContext } from "./ComponentContext.js";
|
|
4
4
|
import { useAssignedExtensions } from "./useAssignedExtensions.js";
|
|
5
|
-
/** @internal */ export function useExtensionSlot(slotName) {
|
|
5
|
+
/** @internal */ export function useExtensionSlot(slotName, state) {
|
|
6
6
|
const { moduleName } = useContext(ComponentContext);
|
|
7
|
+
const isInitialRender = useRef(true);
|
|
7
8
|
if (!moduleName) {
|
|
8
9
|
throw Error('ComponentContext has not been provided. This should come from @openmrs/esm-react-utils.');
|
|
9
10
|
}
|
|
10
11
|
useEffect(()=>{
|
|
11
|
-
registerExtensionSlot(moduleName, slotName);
|
|
12
|
+
registerExtensionSlot(moduleName, slotName, state);
|
|
13
|
+
isInitialRender.current = false;
|
|
12
14
|
}, []);
|
|
15
|
+
useEffect(()=>{
|
|
16
|
+
if (!isInitialRender.current) {
|
|
17
|
+
updateExtensionSlotState(slotName, state);
|
|
18
|
+
}
|
|
19
|
+
}, [
|
|
20
|
+
slotName,
|
|
21
|
+
state
|
|
22
|
+
]);
|
|
13
23
|
const extensions = useAssignedExtensions(slotName);
|
|
14
24
|
return {
|
|
15
25
|
extensions,
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@openmrs/esm-react-utils",
|
|
3
|
-
"version": "8.0.1-pre.
|
|
3
|
+
"version": "8.0.1-pre.3457",
|
|
4
4
|
"license": "MPL-2.0",
|
|
5
5
|
"description": "React utilities for OpenMRS.",
|
|
6
6
|
"type": "module",
|
|
@@ -78,17 +78,17 @@
|
|
|
78
78
|
"swr": "2.x"
|
|
79
79
|
},
|
|
80
80
|
"devDependencies": {
|
|
81
|
-
"@openmrs/esm-api": "8.0.1-pre.
|
|
82
|
-
"@openmrs/esm-config": "8.0.1-pre.
|
|
83
|
-
"@openmrs/esm-context": "8.0.1-pre.
|
|
84
|
-
"@openmrs/esm-emr-api": "8.0.1-pre.
|
|
85
|
-
"@openmrs/esm-error-handling": "8.0.1-pre.
|
|
86
|
-
"@openmrs/esm-extensions": "8.0.1-pre.
|
|
87
|
-
"@openmrs/esm-feature-flags": "8.0.1-pre.
|
|
88
|
-
"@openmrs/esm-globals": "8.0.1-pre.
|
|
89
|
-
"@openmrs/esm-navigation": "8.0.1-pre.
|
|
90
|
-
"@openmrs/esm-state": "8.0.1-pre.
|
|
91
|
-
"@openmrs/esm-utils": "8.0.1-pre.
|
|
81
|
+
"@openmrs/esm-api": "8.0.1-pre.3457",
|
|
82
|
+
"@openmrs/esm-config": "8.0.1-pre.3457",
|
|
83
|
+
"@openmrs/esm-context": "8.0.1-pre.3457",
|
|
84
|
+
"@openmrs/esm-emr-api": "8.0.1-pre.3457",
|
|
85
|
+
"@openmrs/esm-error-handling": "8.0.1-pre.3457",
|
|
86
|
+
"@openmrs/esm-extensions": "8.0.1-pre.3457",
|
|
87
|
+
"@openmrs/esm-feature-flags": "8.0.1-pre.3457",
|
|
88
|
+
"@openmrs/esm-globals": "8.0.1-pre.3457",
|
|
89
|
+
"@openmrs/esm-navigation": "8.0.1-pre.3457",
|
|
90
|
+
"@openmrs/esm-state": "8.0.1-pre.3457",
|
|
91
|
+
"@openmrs/esm-utils": "8.0.1-pre.3457",
|
|
92
92
|
"@swc/cli": "^0.7.7",
|
|
93
93
|
"@swc/core": "^1.11.29",
|
|
94
94
|
"concurrently": "^9.1.2",
|
package/src/ExtensionSlot.tsx
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
/** @module @category Extension */
|
|
2
|
-
import React, { useRef, useMemo } from 'react';
|
|
3
|
-
import { type AssignedExtension } from '@openmrs/esm-extensions';
|
|
2
|
+
import React, { useRef, useMemo, useEffect } from 'react';
|
|
3
|
+
import { updateInternalExtensionStore, type AssignedExtension } from '@openmrs/esm-extensions';
|
|
4
4
|
import { ComponentContext } from './ComponentContext';
|
|
5
5
|
import { Extension } from './Extension';
|
|
6
6
|
import { useExtensionSlot } from './useExtensionSlot';
|
|
@@ -85,7 +85,7 @@ export function ExtensionSlot({
|
|
|
85
85
|
|
|
86
86
|
const name = (extensionSlotName ?? legacyExtensionSlotName) as string;
|
|
87
87
|
const slotRef = useRef(null);
|
|
88
|
-
const { extensions, extensionSlotModuleName } = useExtensionSlot(name);
|
|
88
|
+
const { extensions, extensionSlotModuleName } = useExtensionSlot(name, state);
|
|
89
89
|
|
|
90
90
|
const extensionsToRender = useMemo(() => select(extensions), [select, extensions]);
|
|
91
91
|
|
package/src/useExtensionSlot.ts
CHANGED
|
@@ -1,20 +1,32 @@
|
|
|
1
|
-
import { useContext, useEffect } from 'react';
|
|
2
|
-
import {
|
|
1
|
+
import { useContext, useEffect, useRef } from 'react';
|
|
2
|
+
import {
|
|
3
|
+
type ExtensionSlotCustomState,
|
|
4
|
+
registerExtensionSlot,
|
|
5
|
+
updateExtensionSlotState,
|
|
6
|
+
} from '@openmrs/esm-extensions';
|
|
3
7
|
import { ComponentContext } from './ComponentContext';
|
|
4
8
|
import { useAssignedExtensions } from './useAssignedExtensions';
|
|
5
9
|
|
|
6
10
|
/** @internal */
|
|
7
|
-
export function useExtensionSlot(slotName: string) {
|
|
11
|
+
export function useExtensionSlot(slotName: string, state?: ExtensionSlotCustomState) {
|
|
8
12
|
const { moduleName } = useContext(ComponentContext);
|
|
13
|
+
const isInitialRender = useRef(true);
|
|
9
14
|
|
|
10
15
|
if (!moduleName) {
|
|
11
16
|
throw Error('ComponentContext has not been provided. This should come from @openmrs/esm-react-utils.');
|
|
12
17
|
}
|
|
13
18
|
|
|
14
19
|
useEffect(() => {
|
|
15
|
-
registerExtensionSlot(moduleName, slotName);
|
|
20
|
+
registerExtensionSlot(moduleName, slotName, state);
|
|
21
|
+
isInitialRender.current = false;
|
|
16
22
|
}, []);
|
|
17
23
|
|
|
24
|
+
useEffect(() => {
|
|
25
|
+
if (!isInitialRender.current) {
|
|
26
|
+
updateExtensionSlotState(slotName, state);
|
|
27
|
+
}
|
|
28
|
+
}, [slotName, state]);
|
|
29
|
+
|
|
18
30
|
const extensions = useAssignedExtensions(slotName);
|
|
19
31
|
|
|
20
32
|
return {
|