kitchen-simulator 4.0.4-react-18 → 4.0.5

package/README.md

@@ -44,12 +44,15 @@ You need to check **webpack.config.js** to change the API server.
   Webpack is used as the module bundler. The source code is in the **src** folder.
 
     entry: {
+      // app: './src/renderer.jsx', // For production build WITH API
       app: './src/devLiteRenderer.jsx', // For development of LiteRenderer
       vendor: VENDORS_LIBRARIES
     },
 
   - **index.html**: The main HTML file.
 
+  - **[renderer.jsx](src/renderer.jsx)**: The main JavaScript file that bootstraps the React application. WTH API CALLS
+
   - **[devLiteRenderer.jsx](src/devLiteRenderer.jsx).jsx**: The main JavaScript file that bootstraps the React application. For development lite version without API calls. WITH MOCKS
     - **[LiteRenderer.js](src/LiteRenderer.js)**: The Lite React component that uses mock data and creates the store / catalog etc
       - [LiteKitchenConfigurator.jsx](src/LiteKitchenConfigurator.jsx)

package/es/AppContext.js

@@ -1,3 +1,3 @@
 import React from 'react';
-var AppContext = /*#__PURE__*/React.createContext(null);
+var AppContext = /*#__PURE__*/React.createContext({});
 export default AppContext;

package/es/LiteKitchenConfigurator.js

@@ -1,16 +1,21 @@
 import _extends from "@babel/runtime/helpers/esm/extends";
-import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
+import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
+import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import _classCallCheck from "@babel/runtime/helpers/esm/classCallCheck";
 import _createClass from "@babel/runtime/helpers/esm/createClass";
 import _possibleConstructorReturn from "@babel/runtime/helpers/esm/possibleConstructorReturn";
 import _getPrototypeOf from "@babel/runtime/helpers/esm/getPrototypeOf";
 import _inherits from "@babel/runtime/helpers/esm/inherits";
-var _excluded = ["width", "height", "state", "stateExtractor"];
+import _taggedTemplateLiteral from "@babel/runtime/helpers/esm/taggedTemplateLiteral";
+var _excluded = ["width", "height", "extractedState"];
+var _templateObject, _templateObject2;
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function _callSuper(t, o, e) { return o = _getPrototypeOf(o), _possibleConstructorReturn(t, _isNativeReflectConstruct() ? Reflect.construct(o, e || [], _getPrototypeOf(t).constructor) : o.apply(t, e)); }
 function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); }
+// LiteKitchenConfigurator.jsx
+import styled from 'styled-components';
 import { convert } from "./utils/convert-units-lite";
 import PropTypes from 'prop-types';
 import React, { Component } from 'react';
@@ -25,20 +30,21 @@ import Translator from "./translator/translator";
 import { objectsMap } from "./utils/objects-utils";
 import { VERSION } from "./version";
 import { handleExternalEvent } from "./utils/isolate-event-handler";
-import AppContext from "./AppContext";
 var toolbarW = 0;
 var wrapperStyle = {
   display: 'flex',
   flexFlow: 'row nowrap'
 };
+var WarningItem = styled.div(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  opacity: 0.8;\n  position: absolute;\n  border-radius: 6px;\n  z-index: 11;\n  background-color: #ff7400;\n  width: max-content;\n  align-items: center;\n  padding: 10px;\n  display: none;\n  box-shadow:\n    0px 3px 5px -1px rgba(0, 0, 0, 0.2),\n    0px 6px 10px 0px rgba(0, 0, 0, 0.39),\n    0px 1px 18px 0px rgba(0, 0, 0, 0.12);\n  top: -50px;\n  left: 5px;\n  color: white;\n"])));
+var SubCategoryItemImage = styled.img(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["\n  background-color: ", ";\n  height: 30px;\n  width: 30px;\n  -webkit-mask-image: url(", ");\n  -webkit-mask-size: calc(100% - 2px) calc(100% - 2px);\n  -webkit-mask-repeat: no-repeat;\n  -webkit-mask-position: 1px 1px;\n"])), constants.SECONDARY_PURPLE_COLOR, function (props) {
+  return props.maskImage + '?nocache=2025';
+});
 var LiteKitchenConfigurator = /*#__PURE__*/function (_Component) {
   function LiteKitchenConfigurator(props) {
     var _utmRequestData2, _utmRequestData3, _utmRequestData4, _utmRequestData5, _utmRequestData6, _utmRequestData7, _utmRequestData8, _utmRequestData9, _utmRequestData0;
     var _this;
     _classCallCheck(this, LiteKitchenConfigurator);
     _this = _callSuper(this, LiteKitchenConfigurator, [props]);
-
-    // utm tracking
     var utmDetailParams = new URLSearchParams(_this.props.location && _this.props.location.search);
     var utmStrEncoded = utmDetailParams.get('details');
     var utmRequestData = null;
@@ -48,7 +54,7 @@ var LiteKitchenConfigurator = /*#__PURE__*/function (_Component) {
         utmRequestData = JSON.parse(base64Decode(utmStrEncoded));
         utmRequestData = JSON.parse((_utmRequestData = utmRequestData) === null || _utmRequestData === void 0 ? void 0 : _utmRequestData.utm);
       } catch (e) {
-        console.error('Cannot parse utm parameter: ', error);
+        console.error('Cannot parse utm parameter: ', e);
         utmRequestData = null;
       }
     }
@@ -67,7 +73,6 @@ var LiteKitchenConfigurator = /*#__PURE__*/function (_Component) {
       myProjectsOpen: false,
       myProjectsToLogin: false,
       downloadPopupVisible: false,
-      // For Toolbar Item
       toolbar: '',
       reviewQuotePopupOpened: false,
       floorOpened: false,
@@ -85,8 +90,6 @@ var LiteKitchenConfigurator = /*#__PURE__*/function (_Component) {
       isSaved: false,
       isLeaving: false
     };
-
-    // For UTM tracking
     _this.utm = {
       utm_source: ((_utmRequestData2 = utmRequestData) === null || _utmRequestData2 === void 0 ? void 0 : _utmRequestData2.source) || 'source',
       utm_medium: ((_utmRequestData3 = utmRequestData) === null || _utmRequestData3 === void 0 ? void 0 : _utmRequestData3.medium) || 'medium',
@@ -117,10 +120,13 @@ var LiteKitchenConfigurator = /*#__PURE__*/function (_Component) {
     _this.setDownloadPopupVisible = _this.setDownloadPopupVisible.bind(_this);
     _this.neverShowInput = /*#__PURE__*/React.createRef(null);
     _this.setShowProperty = _this.setShowProperty.bind(_this);
+
+    // cache for viewer2D init so we don't allocate merges every render
+    _this._lastExtractedStateRef = null;
+    _this._cachedViewer2DKey = null;
+    _this._cachedExtractedState = null;
     return _this;
   }
-
-  // Toolbar control functions
   _inherits(LiteKitchenConfigurator, _Component);
   return _createClass(LiteKitchenConfigurator, [{
     key: "setToolbar",
@@ -204,26 +210,32 @@ var LiteKitchenConfigurator = /*#__PURE__*/function (_Component) {
   }, {
     key: "openFloor",
     value: function openFloor() {
+      var _el$parentElement;
       this.setState({
         floorOpened: true
       });
-      document.getElementById('make_floorplan_inactive').parentElement.parentElement.style.zIndex = 999;
+      var el = document.getElementById('make_floorplan_inactive');
+      if (el !== null && el !== void 0 && (_el$parentElement = el.parentElement) !== null && _el$parentElement !== void 0 && _el$parentElement.parentElement) el.parentElement.parentElement.style.zIndex = 999;
     }
   }, {
     key: "openCabinet",
     value: function openCabinet() {
+      var _el$parentElement2;
       this.setState({
         cabinetOpened: true
       });
-      document.getElementById('add_cabinets_inactive').parentElement.parentElement.style.zIndex = 999;
+      var el = document.getElementById('add_cabinets_inactive');
+      if (el !== null && el !== void 0 && (_el$parentElement2 = el.parentElement) !== null && _el$parentElement2 !== void 0 && _el$parentElement2.parentElement) el.parentElement.parentElement.style.zIndex = 999;
     }
   }, {
     key: "toggleDoorStyle",
     value: function toggleDoorStyle(visible) {
+      var _el$parentElement3;
       this.setState({
         doorStyleOpen: visible
       });
-      document.getElementById('select_doorstyle_inactive').parentElement.parentElement.style.zIndex = visible ? 999 : 6;
+      var el = document.getElementById('select_doorstyle_inactive');
+      if (el !== null && el !== void 0 && (_el$parentElement3 = el.parentElement) !== null && _el$parentElement3 !== void 0 && _el$parentElement3.parentElement) el.parentElement.parentElement.style.zIndex = visible ? 999 : 6;
     }
   }, {
     key: "replaceCabinet",
@@ -235,96 +247,117 @@ var LiteKitchenConfigurator = /*#__PURE__*/function (_Component) {
   }, {
     key: "openAppliance",
     value: function openAppliance() {
+      var _el$parentElement4;
       this.setState({
         applianceOpened: true
       });
-      document.getElementById('add_appliances_inactive').parentElement.parentElement.style.zIndex = 999;
+      var el = document.getElementById('add_appliances_inactive');
+      if (el !== null && el !== void 0 && (_el$parentElement4 = el.parentElement) !== null && _el$parentElement4 !== void 0 && _el$parentElement4.parentElement) el.parentElement.parentElement.style.zIndex = 999;
     }
   }, {
     key: "openFinishing",
     value: function openFinishing() {
+      var _el$parentElement5;
       this.setState({
         finishingOpened: true
       });
-      document.getElementById('finishing_touches_inactive').parentElement.parentElement.style.zIndex = 999;
+      var el = document.getElementById('finishing_touches_inactive');
+      if (el !== null && el !== void 0 && (_el$parentElement5 = el.parentElement) !== null && _el$parentElement5 !== void 0 && _el$parentElement5.parentElement) el.parentElement.parentElement.style.zIndex = 999;
     }
   }, {
     key: "onReviewQuoteClicked",
     value: function onReviewQuoteClicked(visible) {
+      var _el$parentElement6;
       this.setState({
         reviewQuotePopupOpened: visible
       });
-      document.getElementById('review_quote_inactive').parentElement.parentElement.style.zIndex = visible ? 999 : 6;
+      var el = document.getElementById('review_quote_inactive');
+      if (el !== null && el !== void 0 && (_el$parentElement6 = el.parentElement) !== null && _el$parentElement6 !== void 0 && _el$parentElement6.parentElement) el.parentElement.parentElement.style.zIndex = visible ? 999 : 6;
     }
   }, {
     key: "closeFloorTB",
     value: function closeFloorTB() {
+      var _el$parentElement7;
       this.setState({
         floorOpened: false
       });
-      document.getElementById('make_floorplan_inactive') && (document.getElementById('make_floorplan_inactive').parentElement.parentElement.style.zIndex = 6);
+      var el = document.getElementById('make_floorplan_inactive');
+      if (el !== null && el !== void 0 && (_el$parentElement7 = el.parentElement) !== null && _el$parentElement7 !== void 0 && _el$parentElement7.parentElement) el.parentElement.parentElement.style.zIndex = 6;
     }
   }, {
     key: "closeCabinetTB",
     value: function closeCabinetTB() {
+      var _el$parentElement8;
       this.setState({
         cabinetOpened: false
       });
-      document.getElementById('add_cabinets_inactive').parentElement.parentElement.style.zIndex = 6;
+      var el = document.getElementById('add_cabinets_inactive');
+      if (el !== null && el !== void 0 && (_el$parentElement8 = el.parentElement) !== null && _el$parentElement8 !== void 0 && _el$parentElement8.parentElement) el.parentElement.parentElement.style.zIndex = 6;
     }
   }, {
     key: "closeFinishingTB",
     value: function closeFinishingTB() {
+      var _el$parentElement9;
       this.setState({
         finishingOpened: false
       });
-      document.getElementById('finishing_touches_inactive').parentElement.parentElement.style.zIndex = 6;
+      var el = document.getElementById('finishing_touches_inactive');
+      if (el !== null && el !== void 0 && (_el$parentElement9 = el.parentElement) !== null && _el$parentElement9 !== void 0 && _el$parentElement9.parentElement) el.parentElement.parentElement.style.zIndex = 6;
     }
   }, {
     key: "closeApplianceTB",
     value: function closeApplianceTB() {
+      var _el$parentElement0;
       this.setState({
         applianceOpened: false
       });
-      document.getElementById('add_appliances_inactive').parentElement.parentElement.style.zIndex = 6;
+      var el = document.getElementById('add_appliances_inactive');
+      if (el !== null && el !== void 0 && (_el$parentElement0 = el.parentElement) !== null && _el$parentElement0 !== void 0 && _el$parentElement0.parentElement) el.parentElement.parentElement.style.zIndex = 6;
     }
   }, {
-    key: "closeDoorstyle",
-    value: function closeDoorstyle() {
-      this.setState({});
-      document.getElementById('select_doorstyle_inactive').parentElement.parentElement.style.zIndex = 6;
-    }
-  }, {
-    key: "closeReviewQuote",
-    value: function closeReviewQuote() {
-      this.setState({});
-      document.getElementById('review_quote_inactive').parentElement.parentElement.style.zIndex = 6;
+    key: "getChildContext",
+    value: function getChildContext() {
+      var _this2 = this;
+      return _objectSpread(_objectSpread({}, objectsMap(actions, function (actionNamespace) {
+        return _this2.props[actionNamespace];
+      })), {}, {
+        translator: this.props.translator,
+        catalog: this.props.catalog
+      });
     }
   }, {
     key: "componentDidMount",
     value: function componentDidMount() {
       window.forRedo = [];
+      var store = this.context.store;
+      var _this$props = this.props,
+        stateExtractor = _this$props.stateExtractor,
+        plugins = _this$props.plugins;
+
+      // keep old behavior: run plugins once on mount
+      var newplugins = _toConsumableArray(plugins);
+      newplugins.forEach(function (newplugin) {
+        return newplugin(store, stateExtractor);
+      });
     }
   }, {
     key: "componentDidUpdate",
     value: function componentDidUpdate(prevProps) {
-      var _this$props = this.props,
-        stateExtractor = _this$props.stateExtractor,
-        state = _this$props.state,
-        projectActions = _this$props.projectActions,
-        catalog = _this$props.catalog,
-        externalEvent = _this$props.externalEvent,
-        onInternalEvent = _this$props.onInternalEvent;
+      var _extractedState$getIn;
+      var _this$props2 = this.props,
+        externalEvent = _this$props2.externalEvent,
+        extractedState = _this$props2.extractedState,
+        projectActions = _this$props2.projectActions,
+        catalog = _this$props2.catalog;
 
-      // handle external events
+      // same behavior: handle external event when it changes
       if (prevProps.externalEvent !== externalEvent) {
         handleExternalEvent(this.props);
       }
-      var plannerState = stateExtractor(state);
-      var catalogReady = plannerState.getIn(['catalog', 'ready']);
-      if (!catalogReady) {
-        projectActions.initCatalog(catalog);
-      }
+
+      // same behavior: init catalog until ready
+      var catalogReady = extractedState === null || extractedState === void 0 || (_extractedState$getIn = extractedState.getIn) === null || _extractedState$getIn === void 0 ? void 0 : _extractedState$getIn.call(extractedState, ['catalog', 'ready']);
+      if (!catalogReady) projectActions.initCatalog(catalog);
     }
   }, {
     key: "isProjectEmpty",
@@ -334,23 +367,51 @@ var LiteKitchenConfigurator = /*#__PURE__*/function (_Component) {
       var layer = layers.get(selectedLayer);
       return layer.areas.size + layer.lines.size + layer.holes.size + layer.items.size === 0;
     }
+  }, {
+    key: "getExtractedStateWithViewer2DInit",
+    value: function getExtractedStateWithViewer2DInit(extractedState, width, height) {
+      if (!extractedState) return extractedState;
+
+      // ✅ If the extractedState reference changed, drop cache immediately.
+      if (this._lastExtractedStateRef !== extractedState) {
+        this._lastExtractedStateRef = extractedState;
+        this._cachedViewer2DKey = null;
+        this._cachedExtractedState = null;
+      }
+      var _viewer2D = extractedState.getIn(['viewer2D']);
+      if (!_viewer2D || _viewer2D.size <= 0) return extractedState;
+      var v = _viewer2D.toJS();
+
+      // Only do the "center viewer2D if e/f are zero" logic.
+      // ✅ No need to build keys from unrelated parts of state.
+      if (v.e !== 0 || v.f !== 0) return extractedState;
+
+      // Build a cache key ONLY for this viewer2D-centering computation.
+      var cacheKey = "".concat(width, ":").concat(height, ":").concat(v.viewerWidth, ":").concat(v.viewerHeight, ":").concat(v.SVGWidth, ":").concat(v.SVGHeight);
+      if (this._cachedViewer2DKey === cacheKey && this._cachedExtractedState) {
+        return this._cachedExtractedState;
+      }
+      var centeredViewer2D = _viewer2D.merge({
+        e: v.viewerWidth / 2 - v.SVGWidth / 2,
+        f: v.viewerHeight / 2 - v.SVGHeight / 2,
+        a: 0.99,
+        d: 0.99
+      });
+      var merged = extractedState.merge({
+        viewer2D: centeredViewer2D
+      });
+      this._cachedViewer2DKey = cacheKey;
+      this._cachedExtractedState = merged;
+      return merged;
+    }
   }, {
     key: "render",
     value: function render() {
-      var _this2 = this;
-      var _this$props2 = this.props,
-        width = _this$props2.width,
-        height = _this$props2.height,
-        state = _this$props2.state,
-        stateExtractor = _this$props2.stateExtractor,
-        props = _objectWithoutProperties(_this$props2, _excluded);
-      var actionsFromProps = objectsMap(actions, function (ns) {
-        return _this2.props[ns];
-      });
-      var appCtxValue = _objectSpread(_objectSpread({}, actionsFromProps), {}, {
-        translator: this.props.translator,
-        catalog: this.props.catalog
-      });
+      var _this$props3 = this.props,
+        width = _this$props3.width,
+        height = _this$props3.height,
+        extractedState = _this$props3.extractedState,
+        props = _objectWithoutProperties(_this$props3, _excluded);
       var _this$state = this.state,
         savePopupVisible = _this$state.savePopupVisible,
         quotePopupVisible = _this$state.quotePopupVisible,
@@ -358,53 +419,22 @@ var LiteKitchenConfigurator = /*#__PURE__*/function (_Component) {
         signOpen = _this$state.signOpen,
         myProjectsOpen = _this$state.myProjectsOpen;
       var contentW = width - toolbarW;
-      // let contentW = width - toolbarW - sidebarW;
-      // let toolbarH = height - footerBarH;
-      // let contentH = height - footerBarH;
-      // let sidebarH = height - footerBarH;
-      var toolbarH = height;
       var contentH = height;
-      var sidebarH = height;
-      var headerW = width;
-      var headerH = 60;
-      var extractedState = stateExtractor(state);
-      var firstVisit = this.state.wizardStepOpend && this.isProjectEmpty(extractedState.scene);
+      var extracted = this.getExtractedStateWithViewer2DInit(extractedState, width, height);
+      var firstVisit = this.state.wizardStepOpend && this.isProjectEmpty(extracted.scene);
       var allVisible = firstVisit || signOpen || myProjectsOpen;
-      var _scene = extractedState.getIn(['scene']);
-      var len = convert(_scene.width).from(_scene.unit).to('cm');
-      var _viewer2D = extractedState.getIn(['viewer2D']);
-      if (_viewer2D.size > 0) {
-        var scaleX = width / len * 3;
-        var scaleY = height / len * 3;
-        var scale = scaleX > scaleY ? scaleY : scaleX;
-        var _e = width - len * scale,
-          _f = height - len * scale;
-        var viewer = _viewer2D.toJS();
-        if (viewer.e === 0 && viewer.f === 0) {
-          _viewer2D = _viewer2D.merge({
-            e: viewer.viewerWidth / 2 - viewer.SVGWidth / 2,
-            f: viewer.viewerHeight / 2 - viewer.SVGHeight / 2,
-            a: 0.99,
-            d: 0.99
-          });
-        }
-      }
-      extractedState = extractedState.merge({
-        viewer2D: _viewer2D
-      });
-      return /*#__PURE__*/React.createElement(AppContext.Provider, {
-        value: appCtxValue
-      }, /*#__PURE__*/React.createElement("section", null, /*#__PURE__*/React.createElement("div", {
+      return /*#__PURE__*/React.createElement("section", null, /*#__PURE__*/React.createElement("div", {
         style: _objectSpread(_objectSpread({}, wrapperStyle), {}, {
           height: height,
           display: 'flex',
-          justifyContent: 'center'
+          justifyContent: 'center',
+          position: 'relative'
         })
       }, /*#__PURE__*/React.createElement(Content, _extends({
         width: contentW,
         height: contentH,
         catalog: this.props.catalog,
-        state: extractedState,
+        state: extracted,
         toolBar: this.state.toolbar,
         setToolbar: this.setToolbar,
         replaceCabinet: this.replaceCabinet,
@@ -414,7 +444,20 @@ var LiteKitchenConfigurator = /*#__PURE__*/function (_Component) {
           return event.preventDefault();
         },
         onInternalEvent: this.props.onInternalEvent
-      })))));
+      })), /*#__PURE__*/React.createElement(WarningItem, {
+        id: "warning_box_2d",
+        style: {
+          display: 'none'
+        }
+      }, /*#__PURE__*/React.createElement(SubCategoryItemImage, {
+        maskImage: "/assets/img/svg/3d_item_warning_info.svg",
+        style: {
+          backgroundColor: constants.BG_COLOR_1,
+          marginRight: 10,
+          height: 30,
+          width: 30
+        }
+      }), "This item is not available in the current door style. Replace it with another one.")));
     }
   }]);
 }(Component);
@@ -428,13 +471,21 @@ LiteKitchenConfigurator.propTypes = {
   width: PropTypes.number.isRequired,
   height: PropTypes.number.isRequired,
   stateExtractor: PropTypes.func.isRequired,
-  sidebarComponents: PropTypes.array,
-  footerbarComponents: PropTypes.array,
-  customContents: PropTypes.object,
-  softwareSignature: PropTypes.string,
   configData: PropTypes.object,
-  onInternalEvent: PropTypes.func
+  onInternalEvent: PropTypes.func,
+  extractedState: PropTypes.object,
+  // ✅ injected by connect
+  externalEvent: PropTypes.object
 };
+LiteKitchenConfigurator.contextTypes = {
+  store: PropTypes.object.isRequired
+};
+LiteKitchenConfigurator.childContextTypes = _objectSpread(_objectSpread({}, objectsMap(actions, function () {
+  return PropTypes.object;
+})), {}, {
+  translator: PropTypes.object,
+  catalog: PropTypes.object
+});
 LiteKitchenConfigurator.defaultProps = {
   translator: new Translator(),
   catalog: new Catalog(),
@@ -447,10 +498,16 @@ LiteKitchenConfigurator.defaultProps = {
   configData: {}
 };
 
-//redux connect
-function mapStateToProps(reduxState) {
+// ✅ Only select the slice you actually use.
+// This preserves behavior but massively reduces rerenders.
+function mapStateToProps(reduxState, ownProps) {
+  var stateExtractor = ownProps.stateExtractor || function (s) {
+    return s;
+  };
+  var extractedState = stateExtractor(reduxState);
   return {
-    state: reduxState
+    extractedState: extractedState,
+    state: extractedState
   };
 }
 function mapDispatchToProps(dispatch) {