@configuratorware/configurator-frontendgui 1.26.5 → 1.26.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@configuratorware/configurator-frontendgui",
-  "version": "1.26.5",
+  "version": "1.26.9",
   "license": "UNLICENSED",
   "private": false,
   "main": "./lib/index.js",
@@ -61,8 +61,8 @@
     "react-router": "^5.2.0",
     "react-router-dom": "^5.2.0",
     "react-swipeable": "^5.5.1",
-    "redhotmagma-graphics-editor": "1.26.5",
-    "redhotmagma-visualization": "1.26.5",
+    "redhotmagma-graphics-editor": "1.26.9",
+    "redhotmagma-visualization": "1.26.9",
     "redux": "^4.0.5",
     "redux-logger": "^3.0.6",
     "redux-persist": "^5.10.0",

package/src/App/Modules/Creator/Components/Optiondetail/index.js

@@ -241,6 +241,8 @@ class Optiondetail extends React.Component {
         const { loading, loadingContainerHeight } = this.state;
         const showNav = _.isArray(options) && options.length > 1;
         const detailImage = details.detailImage;
+        const query = new URLSearchParams(location.search);
+        const hidePrices = query.has('_hide_prices') && query.get('_hide_prices') === '1';
 
         const detailsContent = (
             <div>
@@ -254,9 +256,11 @@ class Optiondetail extends React.Component {
                         {details.abstract}
                     </Markdown>
                 )}
-                <Typography component="div" variant="body2" className={classes.priceFormatted}>
-                    {details.priceFormatted}
-                </Typography>
+                {!hidePrices && (
+                    <Typography component="div" variant="body2" className={classes.priceFormatted}>
+                        {details.priceFormatted}
+                    </Typography>
+                )}
                 {details.description && (
                     <Markdown
                         MdComponent={Typography}

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

@@ -150,6 +150,8 @@ class FullScreenView extends React.Component {
             renderButtonOnTop,
         } = this.props;
 
+        const topPreviewButton = renderTopPreviewButton({ ...this.props, onClick: this.openPreview });
+
         return previewOpen ? (
             <div className={classes.fullScreenWrapper}>
                 <PreviewPortal
@@ -164,7 +166,7 @@ class FullScreenView extends React.Component {
             </div>
         ) : (
             <React.Fragment>
-                {renderTopPreviewButton({ ...this.props, onClick: this.openPreview })}
+                {topPreviewButton}
 
                 {children}
                 {showDesignViewList ? (
@@ -192,13 +194,20 @@ class FullScreenView extends React.Component {
                                 ) : (
                                     <>
                                         <ThumbnailComponent {...thumbnailProps} />
-                                        <PreviewButton {...this.props} bottom onClick={this.openPreview} />
+                                        {!topPreviewButton && (
+                                            <PreviewButton
+                                                {...this.props}
+                                                bottom
+                                                onClick={this.openPreview}
+                                            />
+                                        )}
                                     </>
                                 )}
                             </Grid>
                         )}
                     </Grid>
                 ) : (
+                    !topPreviewButton &&
                     showPreviewButton &&
                     width !== 'xs' && (
                         <Grid container direction="column" justify="space-between" alignItems="center">

package/src/Shared/Components/CustomDialog.js

@@ -60,7 +60,6 @@ export const customDialogStyle = theme => {
             },
         },
         closeIcon: {
-            position: 'absolute',
             right: 28,
             top: 28,
 
@@ -73,6 +72,11 @@ export const customDialogStyle = theme => {
                 cursor: 'pointer',
             },
         },
+        titleContainer: {
+            flexDirection: 'row',
+            alignItems: 'center',
+            justifyContent: 'center',
+        },
     };
 };
 
@@ -92,10 +96,12 @@ export default withWidth({ initialWidth: 'xl' })(
                     {...props}
                 >
                     <DialogTitle id="alert-dialog-title">
-                        {dialogTitle}
-                        <Icon className={classes.closeIcon} onClick={onCancel}>
-                            close
-                        </Icon>
+                        <div className={classes.titleContainer}>
+                            {dialogTitle}
+                            <Icon className={classes.closeIcon} onClick={onCancel}>
+                                close
+                            </Icon>
+                        </div>
                     </DialogTitle>
                     {children}
                 </Dialog>