@configuratorware/configurator-frontendgui 1.48.0 → 1.48.1

package/App/Screens/{ItemOverview.js → ItemOverview/Components/ItemOverview.js}

@@ -7,20 +7,19 @@ exports["default"] = exports.ItemOverview = void 0;
 var _react = _interopRequireWildcard(require("react"));
 var _propTypes = _interopRequireDefault(require("prop-types"));
 var _clsx = _interopRequireDefault(require("clsx"));
-var _ItemTile = _interopRequireDefault(require("./Configurator/Components/ItemTile/ItemTile"));
+var _ItemTile = _interopRequireDefault(require("../../Configurator/Components/ItemTile/ItemTile"));
 var _styles = require("@material-ui/core/styles");
 var _AppBar = _interopRequireDefault(require("@material-ui/core/AppBar"));
 var _ButtonBase = _interopRequireDefault(require("@material-ui/core/ButtonBase"));
 var _Typography = _interopRequireDefault(require("@material-ui/core/Typography"));
 var _Grid = _interopRequireDefault(require("@material-ui/core/Grid"));
 var _useMediaQuery = _interopRequireDefault(require("@material-ui/core/useMediaQuery"));
-var _i18n = require("../../Framework/i18n");
-var _lazyFetch = require("../Utils/Request/lazyFetch");
+var _i18n = require("../../../../Framework/i18n");
+var _lazyFetch = require("../../../Utils/Request/lazyFetch");
 var _lab = require("@material-ui/lab");
-var _GlobalLoader = _interopRequireDefault(require("../Shared/Containers/GlobalLoader"));
-var _Actions = require("../Reducers/UI/Actions");
+var _GlobalLoader = _interopRequireDefault(require("../../../Shared/Containers/GlobalLoader"));
+var _Actions = require("../../../Reducers/UI/Actions");
 var _reactRedux = require("react-redux");
-var _ThemeProvider = _interopRequireDefault(require("./Configurator/ThemeProvider"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
@@ -101,8 +100,7 @@ var useStyles = (0, _styles.makeStyles)(function (theme) {
   name: 'ItemOverview'
 });
 var ItemOverview = exports.ItemOverview = function ItemOverview(_ref) {
-  var ThemeProvider = _ref.ThemeProvider,
-    pageSize = _ref.pageSize;
+  var pageSize = _ref.pageSize;
   var classes = useStyles();
   var theme = (0, _styles.useTheme)();
   var isMobile = (0, _useMediaQuery["default"])(theme.breakpoints.down('sm'));
@@ -289,7 +287,7 @@ var ItemOverview = exports.ItemOverview = function ItemOverview(_ref) {
       })));
     }
   };
-  return /*#__PURE__*/_react["default"].createElement(ThemeProvider, null, /*#__PURE__*/_react["default"].createElement(_AppBar["default"], {
+  return /*#__PURE__*/_react["default"].createElement("div", null, /*#__PURE__*/_react["default"].createElement(_AppBar["default"], {
     color: "default",
     className: classes.header
   }, /*#__PURE__*/_react["default"].createElement(_Typography["default"], {
@@ -299,7 +297,6 @@ var ItemOverview = exports.ItemOverview = function ItemOverview(_ref) {
   }, !!categories.length && renderCategories(), !!items.length && renderItems()), /*#__PURE__*/_react["default"].createElement(_GlobalLoader["default"], null));
 };
 ItemOverview.defaultProps = {
-  ThemeProvider: _ThemeProvider["default"],
   pageSize: 8
 };
 var _default = exports["default"] = ItemOverview;

package/App/Screens/ItemOverview/Screen.js

@@ -0,0 +1,27 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports["default"] = exports.ItemOverviewScreen = void 0;
+var _react = _interopRequireDefault(require("react"));
+var _propTypes = _interopRequireDefault(require("prop-types"));
+var _ThemeProvider = _interopRequireDefault(require("../Configurator/ThemeProvider"));
+var _ItemOverview = _interopRequireDefault(require("./Components/ItemOverview"));
+var _excluded = ["ThemeProvider", "renderItemOverview"];
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
+function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
+function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
+var ItemOverviewScreen = exports.ItemOverviewScreen = function ItemOverviewScreen(_ref) {
+  var ThemeProvider = _ref.ThemeProvider,
+    renderItemOverview = _ref.renderItemOverview,
+    props = _objectWithoutProperties(_ref, _excluded);
+  return /*#__PURE__*/_react["default"].createElement(ThemeProvider, null, renderItemOverview(props));
+};
+ItemOverviewScreen.defaultProps = {
+  ThemeProvider: _ThemeProvider["default"],
+  renderItemOverview: function renderItemOverview(props) {
+    return /*#__PURE__*/_react["default"].createElement(_ItemOverview["default"], props);
+  }
+};
+var _default = exports["default"] = ItemOverviewScreen;

package/App/Screens.js

@@ -15,9 +15,9 @@ var screens = (0, _configuration.getConf)('screens', {});
 // note: require should be used here to avoid importing the screen when it's not used
 
 if (!screens.ItemOverview) {
-  var _require = require("./Screens/ItemOverview"),
-    ItemOverview = _require.ItemOverview;
-  screens.ItemOverview = ItemOverview;
+  var _require = require("./Screens/ItemOverview/Screen"),
+    ItemOverviewScreen = _require.ItemOverviewScreen;
+  screens.ItemOverview = ItemOverviewScreen;
 }
 if (!screens.Configurator) {
   var _require2 = require("./Screens/Configurator/Screen"),

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@configuratorware/configurator-frontendgui",
-  "version": "1.48.0",
+  "version": "1.48.1",
   "license": "UNLICENSED",
   "private": false,
   "main": "./index.js",
   "dependencies": {
     "@babel/polyfill": "^7.12.1",
-    "@configuratorware/scripts": "1.48.0",
+    "@configuratorware/scripts": "1.48.1",
     "@material-ui/core": "^4.12.4",
     "@material-ui/icons": "^4.11.3",
     "@material-ui/lab": "^4.0.0-alpha.61",
@@ -36,8 +36,8 @@
     "react-router-dom": "^5.3.4",
     "react-swipeable": "^5.5.1",
     "react-zoom-pan-pinch": "^2.1.3",
-    "redhotmagma-graphics-editor": "1.48.0",
-    "redhotmagma-visualization": "1.48.0",
+    "redhotmagma-graphics-editor": "1.48.1",
+    "redhotmagma-visualization": "1.48.1",
     "redux": "^4.1.0",
     "redux-logger": "^3.0.6",
     "redux-persist": "^5.10.0",

package/src/App/Screens/{ItemOverview.js → ItemOverview/Components/ItemOverview.js}

@@ -1,7 +1,7 @@
 import React, { useEffect, useState } from 'react';
 import PropTypes from 'prop-types';
 import clsx from 'clsx';
-import ItemTile from './Configurator/Components/ItemTile/ItemTile';
+import ItemTile from '../../Configurator/Components/ItemTile/ItemTile';
 import { makeStyles, useTheme } from '@material-ui/core/styles';
 import AppBar from '@material-ui/core/AppBar';
 import ButtonBase from '@material-ui/core/ButtonBase';
@@ -9,12 +9,11 @@ import Typography from '@material-ui/core/Typography';
 import Grid from '@material-ui/core/Grid';
 import useMediaQuery from '@material-ui/core/useMediaQuery';
 import { T } from 'Framework/i18n';
-import { lazyFetch } from '../Utils/Request/lazyFetch';
+import { lazyFetch } from '../../../Utils/Request/lazyFetch';
 import { Pagination } from '@material-ui/lab';
-import GlobalLoader from '../Shared/Containers/GlobalLoader';
-import { withGlobalLoader } from '../Reducers/UI/Actions';
+import GlobalLoader from '../../../Shared/Containers/GlobalLoader';
+import { withGlobalLoader } from '../../../Reducers/UI/Actions';
 import { useDispatch } from 'react-redux';
-import DefaultThemeProvider from './Configurator/ThemeProvider';
 
 const useStyles = makeStyles(
     theme => ({
@@ -80,7 +79,7 @@ const useStyles = makeStyles(
     { name: 'ItemOverview' }
 );
 
-export const ItemOverview = ({ ThemeProvider, pageSize }) => {
+export const ItemOverview = ({ pageSize }) => {
     const classes = useStyles();
     const theme = useTheme();
     const isMobile = useMediaQuery(theme.breakpoints.down('sm'));
@@ -205,7 +204,7 @@ export const ItemOverview = ({ ThemeProvider, pageSize }) => {
     };
 
     return (
-        <ThemeProvider>
+        <div>
             <AppBar color="default" className={classes.header}>
                 <Typography variant="h5">{T('itemOverview.title')}</Typography>
             </AppBar>
@@ -214,17 +213,15 @@ export const ItemOverview = ({ ThemeProvider, pageSize }) => {
                 {!!items.length && renderItems()}
             </div>
             <GlobalLoader />
-        </ThemeProvider>
+        </div>
     );
 };
 
 ItemOverview.propTypes = {
-    ThemeProvider: PropTypes.elementType.isRequired,
     pageSize: PropTypes.number,
 };
 
 ItemOverview.defaultProps = {
-    ThemeProvider: DefaultThemeProvider,
     pageSize: 8,
 };
 

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

@@ -0,0 +1,19 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import DefaultThemeProvider from '../Configurator/ThemeProvider';
+import ItemOverview from './Components/ItemOverview';
+
+export const ItemOverviewScreen = ({ ThemeProvider, renderItemOverview, ...props }) => (
+    <ThemeProvider>{renderItemOverview(props)}</ThemeProvider>
+);
+
+ItemOverviewScreen.propTypes = {
+    ThemeProvider: PropTypes.elementType.isRequired,
+    renderItemOverview: PropTypes.func,
+};
+ItemOverviewScreen.defaultProps = {
+    ThemeProvider: DefaultThemeProvider,
+    renderItemOverview: props => <ItemOverview {...props} />,
+};
+
+export default ItemOverviewScreen;

package/src/App/Screens.js

@@ -10,8 +10,8 @@ const screens = getConf('screens', {});
 // note: require should be used here to avoid importing the screen when it's not used
 
 if (!screens.ItemOverview) {
-    const { ItemOverview } = require('./Screens/ItemOverview');
-    screens.ItemOverview = ItemOverview;
+    const { ItemOverviewScreen } = require('./Screens/ItemOverview/Screen');
+    screens.ItemOverview = ItemOverviewScreen;
 }
 if (!screens.Configurator) {
     const { ConnectedConfiguratorScreen } = require('./Screens/Configurator/Screen');