File tree Expand file tree Collapse file tree 6 files changed +54
-36
lines changed
Expand file tree Collapse file tree 6 files changed +54
-36
lines changed Original file line number Diff line number Diff line change @@ -18,8 +18,6 @@ function BasicViewerPage() {
1818 nutrientViewer = await loadNutrientViewer ( ) ;
1919
2020 if ( container && nutrientViewer ) {
21- unloadBasicViewer ( nutrientViewer , container ) ;
22-
2321 loadBasicViewer ( nutrientViewer , container ) ;
2422 }
2523 } ) ( ) ;
Original file line number Diff line number Diff line change @@ -14,15 +14,17 @@ function CustomOverlaysPage() {
1414
1515 if ( ! container ) return ;
1616
17- let nutrientViewer ;
17+ let nutrientViewer = null ;
1818
19- try {
20- nutrientViewer = loadNutrientViewer ( ) ;
19+ ( async ( ) => {
20+ nutrientViewer = await loadNutrientViewer ( ) ;
2121
22- loadCustomOverlaysViewer ( nutrientViewer , container ) ;
23- } catch ( error ) {
24- console . error ( "Failed to load Nutrient Viewer:" , error ) ;
25- }
22+ if ( container && nutrientViewer ) {
23+ unloadCustomOverlaysViewer ( nutrientViewer , container ) ;
24+
25+ loadCustomOverlaysViewer ( nutrientViewer , container ) ;
26+ }
27+ } ) ( ) ;
2628
2729 return ( ) => {
2830 if ( nutrientViewer && container ) {
Original file line number Diff line number Diff line change @@ -10,15 +10,24 @@ function MagazineModePage() {
1010
1111 useEffect ( ( ) => {
1212 const container = containerRef . current ;
13- const { NutrientViewer } = window ;
1413
15- if ( container && NutrientViewer ) {
16- loadMagazineViewer ( NutrientViewer , container ) ;
17- }
14+ if ( ! container ) return ;
15+
16+ let nutrientViewer = null ;
17+
18+ ( async ( ) => {
19+ nutrientViewer = await loadNutrientViewer ( ) ;
20+
21+ if ( container && nutrientViewer ) {
22+ unloadMagazineViewer ( nutrientViewer , container ) ;
23+
24+ loadMagazineViewer ( nutrientViewer , container ) ;
25+ }
26+ } ) ( ) ;
1827
1928 return ( ) => {
20- if ( NutrientViewer ) {
21- unloadMagazineViewer ( NutrientViewer , container ) ;
29+ if ( nutrientViewer && container ) {
30+ unloadMagazineViewer ( nutrientViewer , container ) ;
2231 }
2332 } ;
2433 } , [ ] ) ;
Original file line number Diff line number Diff line change @@ -15,15 +15,18 @@ function BasicViewerPage() {
1515
1616 if ( ! container ) return ;
1717
18- let nutrientViewer : ReturnType < typeof loadNutrientViewer > ;
18+ let nutrientViewer : Awaited < ReturnType < typeof loadNutrientViewer > > | null =
19+ null ;
1920
20- try {
21- nutrientViewer = loadNutrientViewer ( ) ;
21+ ( async ( ) => {
22+ nutrientViewer = await loadNutrientViewer ( ) ;
2223
23- loadBasicViewer ( nutrientViewer , container ) ;
24- } catch ( error ) {
25- console . error ( "Failed to load Nutrient Viewer:" , error ) ;
26- }
24+ if ( container && nutrientViewer ) {
25+ unloadBasicViewer ( nutrientViewer , container ) ;
26+
27+ loadBasicViewer ( nutrientViewer , container ) ;
28+ }
29+ } ) ( ) ;
2730
2831 return ( ) => {
2932 if ( nutrientViewer && container ) {
Original file line number Diff line number Diff line change @@ -14,15 +14,18 @@ function CustomOverlaysPage() {
1414
1515 if ( ! container ) return ;
1616
17- let nutrientViewer : ReturnType < typeof loadNutrientViewer > ;
17+ let nutrientViewer : Awaited < ReturnType < typeof loadNutrientViewer > > | null =
18+ null ;
1819
19- try {
20- nutrientViewer = loadNutrientViewer ( ) ;
20+ ( async ( ) => {
21+ nutrientViewer = await loadNutrientViewer ( ) ;
2122
22- loadCustomOverlaysViewer ( nutrientViewer , container ) ;
23- } catch ( error ) {
24- console . error ( "Failed to load Nutrient Viewer:" , error ) ;
25- }
23+ if ( container && nutrientViewer ) {
24+ unloadCustomOverlaysViewer ( nutrientViewer , container ) ;
25+
26+ loadCustomOverlaysViewer ( nutrientViewer , container ) ;
27+ }
28+ } ) ( ) ;
2629
2730 return ( ) => {
2831 if ( nutrientViewer && container ) {
Original file line number Diff line number Diff line change @@ -14,15 +14,18 @@ function MagazineModePage() {
1414
1515 if ( ! container ) return ;
1616
17- let nutrientViewer : ReturnType < typeof loadNutrientViewer > ;
17+ let nutrientViewer : Awaited < ReturnType < typeof loadNutrientViewer > > | null =
18+ null ;
1819
19- try {
20- nutrientViewer = loadNutrientViewer ( ) ;
20+ ( async ( ) => {
21+ nutrientViewer = await loadNutrientViewer ( ) ;
2122
22- loadMagazineViewer ( nutrientViewer , container ) ;
23- } catch ( error ) {
24- console . error ( "Failed to load Nutrient Viewer:" , error ) ;
25- }
23+ if ( container && nutrientViewer ) {
24+ unloadMagazineViewer ( nutrientViewer , container ) ;
25+
26+ loadMagazineViewer ( nutrientViewer , container ) ;
27+ }
28+ } ) ( ) ;
2629
2730 return ( ) => {
2831 if ( nutrientViewer && container ) {
You can’t perform that action at this time.
0 commit comments