@configuratorware/configurator-frontendgui 1.28.3 → 1.29.1

package/src/App/{Screens/Configurator → Modules/Designer}/DesignerUI.js

@@ -7,8 +7,8 @@ import IconDelete from '@material-ui/icons/Delete';
 import IconRotate from '@material-ui/icons/RotateRight';
 import IconScale from '@material-ui/icons/UnfoldMore';
 
-import Designer from 'App/Modules/Designer/Designer';
-import AddVisualElement from 'App/Modules/Designer/Containers/AddVisualElement';
+import Designer from './Designer';
+import AddVisualElement from './Containers/AddVisualElement';
 import withWidth, { isWidthUp } from '@material-ui/core/withWidth/withWidth';
 
 import { getConf } from 'App/configuration';
@@ -16,6 +16,8 @@ import PropTypes from 'prop-types';
 import Typography from '@material-ui/core/Typography';
 import { useSelector } from 'react-redux';
 import { getSelectedDesignProductionMethod } from '../../Reducers/DesignArea/Selectors';
+import StandardToolboxPortal from './MultilayerComponents/StandardToolboxPortal';
+import InlineToolboxPortal from './MultilayerComponents/InlineToolboxPortal';
 
 const StandardToolboxWithCanvasState = withWidth()(
     ({ width }) =>
@@ -26,15 +28,23 @@ const StandardToolboxWithCanvasState = withWidth()(
         )
 );
 
-const renderStandardToolbox = ({ upload, components: { StandardToolbox } }) => (
-    <StandardToolbox {...{ upload }}>
-        {({ canvas }) => (
-            <CanvasStateProvider canvas={canvas}>
-                <StandardToolboxWithCanvasState canvas={canvas} />
-            </CanvasStateProvider>
-        )}
-    </StandardToolbox>
-);
+const renderStandardToolbox = ({ visualizationOverlayMode } = {}) => ({
+    upload,
+    components: { StandardToolbox },
+}) => {
+    const ContainerComponent = visualizationOverlayMode ? StandardToolboxPortal : React.Fragment;
+    return (
+        <ContainerComponent>
+            <StandardToolbox {...{ upload }}>
+                {({ canvas }) => (
+                    <CanvasStateProvider canvas={canvas}>
+                        <StandardToolboxWithCanvasState canvas={canvas} />
+                    </CanvasStateProvider>
+                )}
+            </StandardToolbox>
+        </ContainerComponent>
+    );
+};
 
 const toolboxButtonStyle = {
     width: 40,
@@ -119,8 +129,12 @@ const renderAngleLabel = angleLabel => {
     return <AngleLabel angleLabel={angleLabel} />;
 };
 
-const renderInlineToolbox = ({ components: { InlineToolbox } }) => (
-    <InlineToolbox renderToolboxButton={renderInlineToolButton} renderAngleLabel={renderAngleLabel} />
+const renderInlineToolbox = ({ visualizationOverlayMode }) => ({ components: { InlineToolbox } }) => (
+    <InlineToolbox
+        renderToolboxButton={renderInlineToolButton}
+        renderAngleLabel={renderAngleLabel}
+        ContainerComponent={visualizationOverlayMode ? InlineToolboxPortal : React.Fragment}
+    />
 );
 
 renderInlineToolButton.propTypes = {
@@ -134,17 +148,19 @@ renderInlineToolbox.propTypes = {
     components: PropTypes.element,
 };
 
-renderStandardToolbox.propTypes = {
-    upload: PropTypes.array,
-    components: PropTypes.element,
+export const DefaultDesigner = ({ visualizationOverlayMode, ...props }) => {
+    return (
+        <Designer
+            renderStandardToolbox={renderStandardToolbox({ visualizationOverlayMode })}
+            renderSelectionToolbox={() => null /*disable the default*/}
+            renderInlineToolbox={renderInlineToolbox({ visualizationOverlayMode })}
+            renderRulers={getConf('displayEditorRulers', true) ? null : noop}
+            fillContainer
+            {...props}
+        />
+    );
+};
+
+DefaultDesigner.propTypes = {
+    visualizationOverlayMode: PropTypes.bool.isRequired,
 };
-export const DefaultDesigner = props => (
-    <Designer
-        renderStandardToolbox={renderStandardToolbox}
-        renderSelectionToolbox={() => null /*disable the default*/}
-        renderInlineToolbox={renderInlineToolbox}
-        renderRulers={getConf('displayEditorRulers', true) ? null : noop}
-        fillContainer
-        {...props}
-    />
-);

package/src/App/Modules/Designer/Layouts/DefaultLayout.js

@@ -2,6 +2,7 @@ import React from 'react';
 import { withStyles } from '@material-ui/core/styles';
 import withWidth from '@material-ui/core/withWidth';
 import PropTypes from 'prop-types';
+import clsx from 'clsx';
 
 const styles = theme => ({
     root: {
@@ -97,6 +98,26 @@ const styles = theme => ({
             top: 69,
         },
     },
+    visualizationOverlay: {
+        pointerEvents: 'none',
+        zIndex: 1,
+    },
+    designer: {
+        position: 'absolute',
+        width: '100%',
+        height: 'calc(100% - 342px)',
+        display: 'flex',
+        pointerEvents: 'none',
+        top: 60,
+        [theme.breakpoints.up('sm')]: {
+            top: 0,
+        },
+        [theme.orientation.landscape]: {
+            width: 'calc(100% - 366px)',
+            height: 'calc(100% - 150px)',
+            top: 0,
+        },
+    },
     toBottom: {
         marginTop: 'auto',
     },
@@ -129,6 +150,9 @@ const DefaultLayout = ({
     fallbackMode,
     isPortraitMode,
     imageOnly,
+    renderDesigner,
+    showDesigner,
+    visualizationOverlayMode,
 }) => {
     return imageOnly ? (
         <div className={`${classes.root} ${fallbackMode ? classes.fallbackMode : ''}`}>
@@ -155,7 +179,17 @@ const DefaultLayout = ({
                 })}
             </div>
             <div className={`${classes.container} ${isPortraitMode ? classes.containerTabletPortrait : ''}`}>
-                {!fallbackMode && <div className={classes.visualization}>{renderVisualization()}</div>}
+                {renderDesigner && renderDesigner({ designerClassName: classes.designer })}
+                {!fallbackMode && (
+                    <div
+                        className={clsx(
+                            classes.visualization,
+                            showDesigner && visualizationOverlayMode && classes.visualizationOverlay
+                        )}
+                    >
+                        {renderVisualization()}
+                    </div>
+                )}
                 <div className={classes.main}>
                     {renderMain({
                         area: 'main',

package/src/App/Modules/Designer/MultilayerComponents/DesignerClickAwayListener.js

@@ -0,0 +1,18 @@
+import * as React from 'react';
+import PropTypes from 'prop-types';
+import { Services } from 'App/ServiceLocator';
+import { withStyles } from '@material-ui/core';
+
+const styles = () => ({
+    root: { position: 'absolute', height: '100%', width: '100%' },
+});
+
+export const DesignerClickAwayListener = ({ classes }) => (
+    <div className={classes.root} onClick={() => Services.designData.clearDesignAreaSelection()} />
+);
+
+DesignerClickAwayListener.propTypes = {
+    classes: PropTypes.object.isRequired,
+};
+
+export default withStyles(styles, { name: 'DesignerClickAwayListener' })(DesignerClickAwayListener);

package/src/App/Modules/Designer/MultilayerComponents/InlineToolboxPortal.js

@@ -0,0 +1,54 @@
+import React, { useEffect, useLayoutEffect, useState } from 'react';
+import PropTypes from 'prop-types';
+import Portal from '@material-ui/core/Portal';
+import { withStyles } from '@material-ui/core';
+
+const styles = {
+    root: {
+        position: 'absolute',
+        top: 0,
+        left: 0,
+        zIndex: 1,
+        pointerEvents: 'none',
+        '& > *': {
+            pointerEvents: 'all',
+        },
+    },
+};
+
+const InlineToolboxPortal = ({
+    classes,
+    canvasPosition,
+    canvas,
+    selectedObject,
+    inlineToolboxRef,
+    ...props
+}) => {
+    const [style, setStyle] = useState(null);
+    useEffect(() => {
+        const { top, left, width, height } = canvas.canvasElement.getBoundingClientRect();
+        setStyle({ top, left, width, height, position: 'absolute' });
+    }, [canvasPosition, canvas, selectedObject, inlineToolboxRef]);
+    useLayoutEffect(() => {
+        inlineToolboxRef && inlineToolboxRef.updateToolbarTransform();
+    }, [style, inlineToolboxRef]);
+    return (
+        <Portal>
+            <div className={classes.root} style={style} {...props} />
+        </Portal>
+    );
+};
+
+InlineToolboxPortal.propTypes = {
+    classes: PropTypes.object.isRequired,
+    canvasPosition: PropTypes.object.isRequired,
+    canvas: PropTypes.object.isRequired,
+    selectedObject: PropTypes.object,
+    inlineToolboxRef: PropTypes.object,
+};
+
+export const StyledInlineToolboxPortal = withStyles(styles, { name: 'StandardToolboxPortal' })(
+    InlineToolboxPortal
+);
+
+export default StyledInlineToolboxPortal;

package/src/App/Modules/Designer/MultilayerComponents/StandardToolboxPortal.js

@@ -0,0 +1,38 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import Portal from '@material-ui/core/Portal';
+import { withStyles } from '@material-ui/core';
+
+const styles = theme => ({
+    root: {
+        position: 'absolute',
+        zIndex: 1,
+        display: 'flex',
+        flexDirection: 'column',
+        alignItems: 'center',
+        bottom: 48,
+        left: 8,
+        width: 'calc(100% - 388px)',
+        [theme.orientation.portrait]: {
+            bottom: 370,
+            left: 0,
+            width: '100%',
+        },
+    },
+});
+
+const StandardToolboxPortal = ({ classes, ...props }) => (
+    <Portal>
+        <div className={classes.root} {...props} />
+    </Portal>
+);
+
+StandardToolboxPortal.propTypes = {
+    classes: PropTypes.object.isRequired,
+};
+
+export const StyledStandardToolboxPortal = withStyles(styles, { name: 'StandardToolboxPortal' })(
+    StandardToolboxPortal
+);
+
+export default StyledStandardToolboxPortal;

package/src/App/Reducers/DesignView/Actions.js

@@ -2,8 +2,7 @@ export const actionTypes = {
     SELECT_DESIGN_VIEW: 'DesignView/SELECT_DESIGN_VIEW',
 };
 
-export const selectDesignView = (designViewIdentifier, options) => ({
+export const selectDesignView = designViewIdentifier => ({
     type: actionTypes.SELECT_DESIGN_VIEW,
     designViewIdentifier,
-    options,
 });

package/src/App/Reducers/DesignView/Reducer.js

@@ -1,4 +1,4 @@
-import { actionTypes as designViewActionTypes } from '../DesignView/Actions';
+import { actionTypes as designViewActionTypes } from './Actions';
 import find from 'lodash/find';
 import get from 'lodash/get';
 import * as configuratorActionTypes from '../Configurator/Actions';
@@ -16,7 +16,6 @@ const prepareDesignViews = designViews =>
 const initialState = {
     designViews: [],
     selectedDesignView: {},
-    lastSelectedDesignView: {},
     autogeneratedDesignViews: [],
     viewThumbnailImages: [],
 };
@@ -24,13 +23,11 @@ const initialState = {
 export default function designViewReducer(state = initialState, action = {}) {
     switch (action.type) {
         case designViewActionTypes.SELECT_DESIGN_VIEW: {
-            const { designViewIdentifier, options = {} } = action;
+            const { designViewIdentifier } = action;
             const designView = find(state.designViews, { identifier: designViewIdentifier });
-            const { saveLast = true } = options;
             return {
                 ...state,
                 selectedDesignView: designView,
-                ...(saveLast ? { lastSelectedDesignView: designView } : null),
             };
         }
         case configuratorActionTypes.RECEIVE_DESIGNER_DATA: {
@@ -62,14 +59,12 @@ export default function designViewReducer(state = initialState, action = {}) {
                     ...state,
                     designViews: prepareDesignViews(updatedDesignViews),
                     selectedDesignView: {},
-                    lastSelectedDesignView: {},
                 };
             }
             return {
                 ...state,
                 designViews: prepareDesignViews(designViews),
                 selectedDesignView: {},
-                lastSelectedDesignView: {},
             };
         }
         case configuratorActionTypes.RECEIVE_CONFIGURATION: {
@@ -87,7 +82,6 @@ export default function designViewReducer(state = initialState, action = {}) {
                         ...state,
                         designViews: [],
                         selectedDesignView: {},
-                        lastSelectedDesignView: {},
                         autogeneratedDesignViews,
                         viewThumbnailImages,
                     };
@@ -99,7 +93,6 @@ export default function designViewReducer(state = initialState, action = {}) {
                     ...state,
                     designViews: autogeneratedDesignViews,
                     selectedDesignView,
-                    lastSelectedDesignView: selectedDesignView,
                     autogeneratedDesignViews,
                     viewThumbnailImages,
                 };
@@ -109,7 +102,6 @@ export default function designViewReducer(state = initialState, action = {}) {
                 ...state,
                 designViews: [],
                 selectedDesignView: {},
-                lastSelectedDesignView: {},
                 autogeneratedDesignViews: [],
                 viewThumbnailImages: [],
             };

package/src/App/Reducers/DesignView/__mocks__/designerViewData.js

@@ -91,5 +91,4 @@ export const simpleState = {
     selectedDesignView: {
         identifier: 'front_view',
     },
-    lastSelectedDesignView: {},
 };

package/src/App/Reducers/DesignView/__tests__/Reducer.test.js

@@ -13,7 +13,6 @@ describe('Reducers/DesignView.designViewReducer', () => {
         expect(initialState).toEqual({
             designViews: [],
             selectedDesignView: {},
-            lastSelectedDesignView: {},
             autogeneratedDesignViews: [],
             viewThumbnailImages: [],
         });
@@ -42,23 +41,6 @@ describe('Reducers/DesignView.designViewReducer', () => {
         const action = selectDesignView(identifier);
         const state = designViewReducer(initialState, action);
         expect(state.selectedDesignView.identifier).toBe(identifier);
-        expect(state.lastSelectedDesignView.identifier).toBe(identifier);
-    });
-    test('returns the correct state for SELECT_DESIGN_VIEW action, if the { saveLast: false } option is provided', () => {
-        // select a view directly (eg. user clicks the view buttons)
-        const initialState = designViewReducer(simpleState);
-        const selectedDesignViewIdentifier = simpleState.designViews[1].identifier;
-        const selectDesignViewAction = selectDesignView(selectedDesignViewIdentifier);
-        const state1 = designViewReducer(initialState, selectDesignViewAction);
-        expect(state1.selectedDesignView.identifier).toBe(selectedDesignViewIdentifier);
-        expect(state1.lastSelectedDesignView.identifier).toBe(selectedDesignViewIdentifier);
-
-        // select a view automatically (eg. user switches to a component which has a linked view)
-        const autoDesignViewIdentifier = simpleState.designViews[0].identifier;
-        const action = selectDesignView(autoDesignViewIdentifier, { saveLast: false });
-        const state2 = designViewReducer(state1, action);
-        expect(state2.selectedDesignView.identifier).toBe(autoDesignViewIdentifier);
-        expect(state2.lastSelectedDesignView.identifier).toBe(selectedDesignViewIdentifier);
     });
     test('clears the selectedDesignView for RECEIVE_CONFIGURATION action', () => {
         const initialState = designViewReducer(simpleState);
@@ -70,7 +52,6 @@ describe('Reducers/DesignView.designViewReducer', () => {
         const action = { type: RECEIVE_CONFIGURATION };
         const state = designViewReducer(stateWithSelectedDesignView, action);
         expect(state.selectedDesignView).toEqual({});
-        expect(state.lastSelectedDesignView).toEqual({});
     });
     test(
         'creates the designViews list and sets the selectedDesignView if visualizationData is available ' +
@@ -100,9 +81,6 @@ describe('Reducers/DesignView.designViewReducer', () => {
             expect(state.selectedDesignView).toEqual({
                 identifier: 'front',
             });
-            expect(state.lastSelectedDesignView).toEqual({
-                identifier: 'front',
-            });
         }
     );
 

package/src/App/Reducers/ImageGallery/Actions.js

@@ -1,6 +1,6 @@
 import { createDefaultReceiver, fetchDataAsync, postDataAsync } from '../Actions';
 import { createAsyncTask } from '../UI/Actions';
-import { getUserImagesByDesignArea } from '../ImageGallery/Selectors';
+import { getUserImagesByDesignArea } from './Selectors';
 import { calculateImageBrightness } from '../../Services/DesignDataService';
 import { getImageUsageInfo } from './Selectors';
 import { getCurrentCompatibilityInfoHash } from '../DesignArea/Selectors';

package/src/App/Screens/Configurator/Components/CalculationWidget/index.test.jsx

@@ -2,7 +2,7 @@
 import React from 'react';
 import { noop } from 'lodash';
 import { mount, render } from 'enzyme';
-import CalculationWidget from '../CalculationWidget';
+import CalculationWidget from './index';
 import MenuItem from '@material-ui/core/MenuItem';
 import { Select, ExpansionPanel, ExpansionPanelDetails } from '@material-ui/core';
 import ServiceLocator from 'App/ServiceLocator';

package/src/App/Screens/Configurator/Components/DesignApproval/index.test.jsx

@@ -2,7 +2,7 @@
 import React from 'react';
 import noop from 'lodash/noop';
 import { render } from 'enzyme';
-import DesignApproval from '../DesignApproval';
+import DesignApproval from './index';
 
 it('renders correctly without error', () => {
     const tree = render(<DesignApproval checked={true} error={false} link={'fakeLink'} onChange={noop} />);

package/src/App/Screens/Configurator/Components/FullScreenView/index.js

@@ -27,6 +27,7 @@ const styles = theme => ({
         left: 'calc(50%)',
         zIndex: 2,
         transform: 'translate(-50%, 0)',
+        pointerEvents: 'all',
         [theme.breakpoints.down('sm')]: {
             zIndex: 5,
         },
@@ -179,7 +180,7 @@ class FullScreenView extends React.Component {
                     <Grid
                         container
                         direction="column"
-                        justify="space-between"
+                        justifyContent="space-between"
                         className={clsx(classes.viewsContainer, customClassName('views'))}
                     >
                         {showPreviewButton && (
@@ -216,7 +217,7 @@ class FullScreenView extends React.Component {
                     !topPreviewButton &&
                     showPreviewButton &&
                     width !== 'xs' && (
-                        <Grid container direction="column" justify="space-between" alignItems="center">
+                        <Grid container direction="column" justifyContent="space-between" alignItems="center">
                             <PreviewButton
                                 {...this.props}
                                 onClick={this.openPreview}

package/src/App/Screens/Configurator/Components/FullScreenView/index.test.jsx

@@ -1,7 +1,7 @@
 /* eslint-env jest */
 import React from 'react';
 import { mount, render } from 'enzyme';
-import FullScreenView from '../FullScreenView';
+import FullScreenView from './index';
 
 describe('Screens/Configurator/Components/FullScreenView', () => {
     it('renders correctly', () => {

package/src/App/Screens/Configurator/Components/PreviewPortal/index.js

@@ -51,6 +51,9 @@ const styles = theme => ({
     },
     visualizationWrapperCanvas: {
         height: '100% ',
+        [theme.breakpoints.up('sm')]: {
+            height: 'calc(100% - 100px)',
+        },
     },
     closePreview: {
         color: theme.palette.primary.darkText,
@@ -95,6 +98,7 @@ class PreviewPortal extends React.Component {
         width: PropTypes.string,
         dialogStyle: PropTypes.string,
         hasItems: PropTypes.bool,
+        hasMoreItems: PropTypes.bool,
         alignTarget: PropTypes.shape({ add: PropTypes.func.isRequired, remove: PropTypes.func.isRequired })
             .isRequired,
         children: PropTypes.oneOfType([PropTypes.arrayOf(PropTypes.node), PropTypes.node]),
@@ -117,7 +121,7 @@ class PreviewPortal extends React.Component {
     };
 
     renderPreview() {
-        const { hasItems, closePreviewMode, classes, children, width, dialogStyle } = this.props;
+        const { hasMoreItems, closePreviewMode, classes, children, width, dialogStyle } = this.props;
         const portalStyle = dialogStyle
             ? classes.fullscreenPortal + ' ' + dialogStyle
             : classes.fullscreenPortal;
@@ -141,12 +145,12 @@ class PreviewPortal extends React.Component {
                 <div
                     ref={this.wrapperRef}
                     className={
-                        hasItems ? classes.visualizationWrapperThumbs : classes.visualizationWrapperCanvas
+                        hasMoreItems ? classes.visualizationWrapperThumbs : classes.visualizationWrapperCanvas
                     }
                 >
                     {children}
                 </div>
-                {hasItems && <Thumbnails previewOpen={true} />}
+                {hasMoreItems && <Thumbnails previewOpen={true} />}
                 {width !== 'xs' && (
                     <AnalyticsWrapper targetId="preview_close">
                         <Grid

package/src/App/Screens/Configurator/Containers/AmountPrice.js

@@ -2,7 +2,7 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import AmountPrice from 'App/Shared/Containers/AmountPrice';
 import ProductVariant from 'App/Shared/Containers/ProductVariant';
-import ConfigurationModeSwitch from '../Containers/ConfigurationModeSwitch';
+import ConfigurationModeSwitch from './ConfigurationModeSwitch';
 import { makeStyles } from '@material-ui/core';
 
 export const useStyles = makeStyles(

package/src/App/Screens/Configurator/Containers/Confirm.js

@@ -1,5 +1,5 @@
 import containerConnect from 'Framework/ComponentContainer';
-import Confirm from '../Components/Confirm/index';
+import Confirm from '../Components/Confirm';
 import { hideConfirm } from '../../../Reducers/Confirm/Actions';
 
 const mapStateToProps = ({ confirm }) => {

package/src/App/Screens/Configurator/Containers/FullScreenView.js

@@ -21,6 +21,7 @@ const mapStateToProps = state => {
         },
         showDesignViewList: getDesignViewLength(state) > 1 && !isAnyDesignAreaSelected(state),
         hasItems: getDesignViewLength(state) > 0,
+        hasMoreItems: getDesignViewLength(state) > 1,
         areAllDesignAreasEmpty: areAllDesignAreasEmpty(state.configurator),
     };
 };

package/src/App/Screens/Configurator/Containers/__tests__/Designer.test.js

@@ -3,7 +3,7 @@ import mountWithState from 'Utils/Test/mountWithState';
 import Designer from 'App/Modules/Designer/Containers/Designer';
 import ServiceLocator from 'App/ServiceLocator';
 
-jest.mock('../../DesignerUI', () => {
+jest.mock('App/Modules/Designer/DesignerUI', () => {
     const DefaultDesigner = () => <div />;
 
     return {

package/src/App/Screens/Configurator/Screen.js

@@ -11,7 +11,7 @@ import * as uiActions from 'App/Reducers/UI/Actions';
 import Error from '../../Shared/Containers/Error';
 import ErrorPage from '../../Error/ProductionErrorPage';
 import AlertMessages from 'App/Shared/Containers/AlertMessages';
-import LandscapeInformation from '../Configurator/Components/LandscapeInformation';
+import LandscapeInformation from './Components/LandscapeInformation';
 import Confirm from './Containers/Confirm';
 import SaveConfiguration from 'App/Shared/Containers/SaveConfiguration';
 import SendEmail from 'App/Shared/Containers/SendEmail';
@@ -52,7 +52,7 @@ export const Configurator = props => {
         if (imageOnly) {
             Services.visualization.enableDesignAreaInteraction(false);
         } else {
-            Services.visualization.enableDesignAreaInteraction(true);
+            Services.visualization.initDesignAreaInteraction();
         }
     }, [imageOnly]);
 
@@ -141,6 +141,7 @@ const mapStateToProps = state => {
     const vertical = dock ? dock === 'left' : state.device.screen.orientation === 'landscape';
     const showAddToCartButton = state.ui.visibilityMap.addToCartButton;
     const showConfigurationVariantSelection = state.ui.visibilityMap.configurationvariantSelection;
+    const visualizationOverlayMode = getConf('visualizationOverlayMode');
 
     const configuration = {
         showAddToCartButton: getConf('showAddToCartButton'),
@@ -164,6 +165,7 @@ const mapStateToProps = state => {
         showAddToCartButton,
         showConfigurationVariantSelection,
         configuration,
+        visualizationOverlayMode,
     };
 };
 

package/src/App/Screens/Configurator/__tests__/Screen.test.js

@@ -17,6 +17,9 @@ describe('Screen component', () => {
             enableDesignAreaInteraction() {
                 return null;
             }
+            initDesignAreaInteraction() {
+                return null;
+            }
         })()
     );