Commit ac534638252de81f37858b35c2014ad88d7e4941

Authored by Igor Kulikov
Committed by GitHub
2 parents 71bed873 df08320e

Merge pull request #5496 from vvlladd28/bug/widget-settings/not-load-advanced

[3.3.2] UI: Fixed not load advanced settings in widget
@@ -20,16 +20,15 @@ import Button from '@material-ui/core/Button'; @@ -20,16 +20,15 @@ import Button from '@material-ui/core/Button';
20 import { JsonFormFieldProps, JsonFormFieldState } from '@shared/components/json-form/react/json-form.models'; 20 import { JsonFormFieldProps, JsonFormFieldState } from '@shared/components/json-form/react/json-form.models';
21 import { IEditorProps } from 'react-ace/src/types'; 21 import { IEditorProps } from 'react-ace/src/types';
22 import { mergeMap } from 'rxjs/operators'; 22 import { mergeMap } from 'rxjs/operators';
23 -import { loadAceDependencies } from '@shared/models/ace/ace.models'; 23 +import { getAce } from '@shared/models/ace/ace.models';
24 import { from } from 'rxjs'; 24 import { from } from 'rxjs';
25 import { Observable } from 'rxjs/internal/Observable'; 25 import { Observable } from 'rxjs/internal/Observable';
26 import { CircularProgress, IconButton } from '@material-ui/core'; 26 import { CircularProgress, IconButton } from '@material-ui/core';
27 import { MouseEvent } from 'react'; 27 import { MouseEvent } from 'react';
28 import { Help, HelpOutline } from '@material-ui/icons'; 28 import { Help, HelpOutline } from '@material-ui/icons';
29 -import { position } from 'html2canvas/dist/types/css/property-descriptors/position';  
30 29
31 const ReactAce = React.lazy(() => { 30 const ReactAce = React.lazy(() => {
32 - return loadAceDependencies().pipe( 31 + return getAce().pipe(
33 mergeMap(() => { 32 mergeMap(() => {
34 return from(import('react-ace')); 33 return from(import('react-ace'));
35 }) 34 })
@@ -22,7 +22,7 @@ import { map, mergeMap, tap } from 'rxjs/operators'; @@ -22,7 +22,7 @@ import { map, mergeMap, tap } from 'rxjs/operators';
22 let aceDependenciesLoaded = false; 22 let aceDependenciesLoaded = false;
23 let aceModule: any; 23 let aceModule: any;
24 24
25 -export function loadAceDependencies(): Observable<any> { 25 +function loadAceDependencies(): Observable<any> {
26 if (aceDependenciesLoaded) { 26 if (aceDependenciesLoaded) {
27 return of(null); 27 return of(null);
28 } else { 28 } else {