Skip to content

Commit 197b563

Browse files
feat: update nmrium to pre-release version 0.33.0-pre.1677504537
1 parent 45a429a commit 197b563

5 files changed

Lines changed: 36 additions & 33 deletions

File tree

package-lock.json

Lines changed: 15 additions & 15 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
"@vitejs/plugin-react-swc": "^3.2.0",
1818
"filelist-utils": "^1.7.1",
1919
"nmr-load-save": "^0.7.26",
20-
"nmrium": "^0.33.0-pre.1677156813",
20+
"nmrium": "^0.33.0-pre.1677504537",
2121
"react-router-dom": "^6.8.1"
2222
},
2323
"scripts": {

src/NMRiumWrapper.tsx

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
import NMRium, { NMRiumData, NMRiumRef } from 'nmrium';
1+
import NMRium, { NMRiumData, NMRiumRef, OnNMRiumChange } from 'nmrium';
22
import { useEffect, useState, useCallback, CSSProperties, useRef } from 'react';
3-
import { SerializedNmriumState } from 'nmr-load-save';
43
import events from './events';
54
import { usePreferences } from './hooks/usePreferences';
65
import { useLoadSpectra } from './hooks/useLoadSpectra';
@@ -34,8 +33,8 @@ export default function NMRiumWrapper() {
3433
const nmriumRef = useRef<NMRiumRef>(null);
3534
const [data, setDate] = useState<NMRiumData>();
3635
const { workspace, preferences } = usePreferences();
37-
const dataChangeHandler = useCallback((nmriumData: SerializedNmriumState) => {
38-
events.trigger('data-change', nmriumData);
36+
const dataChangeHandler = useCallback<OnNMRiumChange>((state, source) => {
37+
events.trigger('data-change', { data: state, source });
3938
}, []);
4039

4140
const { load: loadSpectra, isLoading, data: loadedData } = useLoadSpectra();
@@ -102,7 +101,7 @@ export default function NMRiumWrapper() {
102101
<NMRium
103102
ref={nmriumRef}
104103
data={data}
105-
onDataChange={dataChangeHandler}
104+
onChange={dataChangeHandler}
106105
preferences={preferences}
107106
workspace={workspace}
108107
/>

src/events/types.ts

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
import { SerializedNmriumState } from 'nmr-load-save';
2-
import { NMRiumData } from 'nmrium';
1+
import { NMRiumData, NmriumState } from 'nmrium';
32
import { BlobObject } from 'nmrium/lib/component/utility/export';
43

54
type EventType =
@@ -33,8 +32,13 @@ type ActionResponse = {
3332
data: BlobObject;
3433
};
3534

35+
type DataChange = {
36+
data: NmriumState;
37+
source: 'data' | 'view' | 'settings';
38+
};
39+
3640
type EventData<T extends EventType> = T extends 'data-change'
37-
? SerializedNmriumState
41+
? DataChange
3842
: T extends 'load'
3943
? LoadData
4044
: T extends 'action-request'

yarn.lock

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4770,10 +4770,10 @@
47704770
"ml-matrix-peaks-finder" "^1.0.0"
47714771
"ml-peak-shape-generator" "^4.1.1"
47724772

4773-
"nmr-load-save@^0.7.25", "nmr-load-save@^0.7.26":
4774-
"integrity" "sha512-a3mAu+dR8zkpBeZUAVM4rQrIc+GyDkpieDMLsL3T2KoQzZ9JDDk5w4WtdzRequvGYOFQ+4s8gzjKJuY9NDnlKw=="
4775-
"resolved" "https://registry.npmjs.org/nmr-load-save/-/nmr-load-save-0.7.26.tgz"
4776-
"version" "0.7.26"
4773+
"nmr-load-save@^0.7.26", "nmr-load-save@^0.7.27":
4774+
"integrity" "sha512-y8Pmp5m2Xqu31zydiykXcaiBjYqa4tBZ+zl11Kv9v3PTN08pQGXc2J63T1PLbZI6SefujfM5xVaNkthowv2/dQ=="
4775+
"resolved" "https://registry.npmjs.org/nmr-load-save/-/nmr-load-save-0.7.27.tgz"
4776+
"version" "0.7.27"
47774777
dependencies:
47784778
"@lukeed/uuid" "^2.0.0"
47794779
"@types/lodash.merge" "^4.6.7"
@@ -4834,10 +4834,10 @@
48344834
"openchemlib" "^8.0.1"
48354835
"openchemlib-utils" "^2.1.2"
48364836

4837-
"nmrium@^0.33.0-pre.1677156813":
4838-
"integrity" "sha512-MwK41X5KWMb9/sq94Xfzt6TjIrwiw1MiS3uctGc40qIkgp52PZFfxlYCYJIRSHuhHgDktwEqvJDY5PHbO64VWA=="
4839-
"resolved" "https://registry.npmjs.org/nmrium/-/nmrium-0.33.0-pre.1677156813.tgz"
4840-
"version" "0.33.0-pre.1677156813"
4837+
"nmrium@^0.33.0-pre.1677504537":
4838+
"integrity" "sha512-tvFQwe1K3PybIGK114tPn1f1F8mZzZ7yTdLc69KpI7qpftjBm8x0HdyRU7+TMZvuYBT2uvfHkUGv7VpQHKCUfw=="
4839+
"resolved" "https://registry.npmjs.org/nmrium/-/nmrium-0.33.0-pre.1677504537.tgz"
4840+
"version" "0.33.0-pre.1677504537"
48414841
dependencies:
48424842
"@emotion/react" "^11.10.5"
48434843
"@lukeed/uuid" "^2.0.0"
@@ -4864,7 +4864,7 @@
48644864
"ml-stat" "^1.3.3"
48654865
"multiplet-analysis" "^2.0.0"
48664866
"nmr-correlation" "^2.3.3"
4867-
"nmr-load-save" "^0.7.25"
4867+
"nmr-load-save" "^0.7.27"
48684868
"nmr-processing" "^9.3.6"
48694869
"nmredata" "^0.9.2"
48704870
"numeral" "^2.0.6"

0 commit comments

Comments
 (0)