Skip to content

Commit 0794117

Browse files
authored
Merge branch 'development' into update-nmrium
2 parents e1e0172 + 62aba3d commit 0794117

2 files changed

Lines changed: 25 additions & 6 deletions

File tree

src/NMRiumWrapper.tsx

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,8 @@ export default function NMRiumWrapper() {
3434
const { allowedOrigins, isFetchAllowedOriginsPending } = useWhiteList();
3535
const nmriumRef = useRef<NMRiumRef>(null);
3636
const [data, setDate] = useState<NMRiumData>();
37-
const { workspace, preferences } = usePreferences();
37+
38+
const { workspace, preferences, defaultEmptyMessage } = usePreferences();
3839
const dataChangeHandler = useCallback<NMRiumChangeCb>((state, source) => {
3940
events.trigger('data-change', { state, source });
4041
}, []);
@@ -101,6 +102,8 @@ export default function NMRiumWrapper() {
101102
};
102103
});
103104

105+
console.log(defaultEmptyMessage);
106+
104107
return (
105108
<div style={styles.container}>
106109
{isLoading ||
@@ -115,6 +118,7 @@ export default function NMRiumWrapper() {
115118
onChange={dataChangeHandler}
116119
preferences={preferences}
117120
workspace={workspace}
121+
emptyText={defaultEmptyMessage}
118122
/>
119123
</div>
120124
);

src/hooks/usePreferences.ts

Lines changed: 20 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,26 +2,41 @@ import { WorkspacePreferences } from 'nmr-load-save';
22
import { NMRiumWorkspace } from 'nmrium';
33
import { useLayoutEffect, useState } from 'react';
44

5+
interface Preferences {
6+
preferences: WorkspacePreferences | undefined;
7+
workspace: NMRiumWorkspace | undefined;
8+
defaultEmptyMessage: string | undefined;
9+
}
10+
11+
const DEFAULT_PREFERENCES = {
12+
preferences: undefined,
13+
workspace: undefined,
14+
defaultEmptyMessage: undefined,
15+
};
16+
517
export function usePreferences() {
6-
const [configuration, setConfiguration] = useState<{
7-
preferences: WorkspacePreferences | undefined;
8-
workspace: NMRiumWorkspace | undefined;
9-
}>({ preferences: undefined, workspace: undefined });
18+
const [configuration, setConfiguration] =
19+
useState<Preferences>(DEFAULT_PREFERENCES);
1020

1121
useLayoutEffect(() => {
1222
const { href } = window.location;
1323
const parameters = new URL(href).searchParams;
1424

1525
let preferences: WorkspacePreferences | undefined;
1626
let workspace: NMRiumWorkspace | undefined;
27+
let defaultEmptyMessage: string | undefined;
1728

1829
if (parameters.has('workspace')) {
1930
workspace = parameters.get('workspace') as NMRiumWorkspace;
2031
}
2132
if (parameters.has('preferences')) {
2233
preferences = JSON.parse(parameters.get('preferences') || '');
2334
}
24-
setConfiguration({ preferences, workspace });
35+
36+
if (parameters.has('defaultEmptyMessage')) {
37+
defaultEmptyMessage = parameters.get('defaultEmptyMessage') as string;
38+
}
39+
setConfiguration({ preferences, workspace, defaultEmptyMessage });
2540
}, []);
2641

2742
return configuration;

0 commit comments

Comments
 (0)