kitchen-simulator 3.1.2 → 4.0.1-react-18

package/README.md

@@ -44,15 +44,12 @@ 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({});
+var AppContext = /*#__PURE__*/React.createContext(null);
 export default AppContext;

package/es/LiteKitchenConfigurator.js

@@ -1,7 +1,7 @@
 import _extends from "@babel/runtime/helpers/esm/extends";
 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 _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 import _classCallCheck from "@babel/runtime/helpers/esm/classCallCheck";
 import _createClass from "@babel/runtime/helpers/esm/createClass";
 import _possibleConstructorReturn from "@babel/runtime/helpers/esm/possibleConstructorReturn";
@@ -12,7 +12,6 @@ function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbol
 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; })(); }
-import axios from 'axios';
 import { convert } from "./utils/convert-units-lite";
 import PropTypes from 'prop-types';
 import React, { Component } from 'react';
@@ -27,6 +26,7 @@ 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',
@@ -301,21 +301,9 @@ var LiteKitchenConfigurator = /*#__PURE__*/function (_Component) {
       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() {
-      console.log('context =>', this.context);
       window.forRedo = [];
       var store = this.context.store;
       var _this$props = this.props,
@@ -357,6 +345,15 @@ var LiteKitchenConfigurator = /*#__PURE__*/function (_Component) {
   }, {
     key: "render",
     value: function render() {
+      var _this2 = this;
+      var actionsFromProps = objectsMap(actions, function (ns) {
+        return _this2.props[ns];
+      });
+      var appCtxValue = _objectSpread(_objectSpread({}, actionsFromProps), {}, {
+        translator: this.props.translator,
+        // instance (defaultProps already gives one)
+        catalog: this.props.catalog
+      });
       var _this$props2 = this.props,
         width = _this$props2.width,
         height = _this$props2.height,
@@ -404,7 +401,9 @@ var LiteKitchenConfigurator = /*#__PURE__*/function (_Component) {
       extractedState = extractedState.merge({
         viewer2D: _viewer2D
       });
-      return /*#__PURE__*/React.createElement("section", null, /*#__PURE__*/React.createElement("div", {
+      return /*#__PURE__*/React.createElement(AppContext.Provider, {
+        value: appCtxValue
+      }, /*#__PURE__*/React.createElement("section", null, /*#__PURE__*/React.createElement("div", {
         style: _objectSpread(_objectSpread({}, wrapperStyle), {}, {
           height: height,
           display: 'flex',
@@ -424,7 +423,7 @@ var LiteKitchenConfigurator = /*#__PURE__*/function (_Component) {
           return event.preventDefault();
         },
         onInternalEvent: this.props.onInternalEvent
-      }))));
+      })))));
     }
   }]);
 }(Component);
@@ -445,15 +444,6 @@ LiteKitchenConfigurator.propTypes = {
   configData: PropTypes.object,
   onInternalEvent: PropTypes.func
 };
-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(),

package/es/LiteRenderer.js

@@ -20,10 +20,7 @@ import { createStore } from 'redux';
 import * as Models from "./models";
 import { State } from "./models";
 import PlannerReducer from "./reducers/reducer";
-import AppContext from "./AppContext";
 import Catalog from "./catalog/catalog";
-import { SVGLoader } from 'three/addons/loaders/SVGLoader';
-import { TOE_KICK_MOLDING } from "./constants";
 import * as Areas from "./catalog/areas/area/planner-element";
 import * as Lines from "./catalog/lines/wall/planner-element";
 import * as Holes from "./catalog/holes/export";
@@ -282,7 +279,7 @@ export default function LiteRenderer(props) {
     initCatalog();
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [id]);
-  return /*#__PURE__*/React.createElement(AppContext.Provider, null, /*#__PURE__*/React.createElement(Provider, {
+  return /*#__PURE__*/React.createElement(Provider, {
     store: store
   }, /*#__PURE__*/React.createElement(ToolErrorBoundary, {
     pushError: pushError
@@ -299,7 +296,7 @@ export default function LiteRenderer(props) {
     configData: configData,
     externalEvent: externalEvent,
     onInternalEvent: onInternalEvent
-  }, passThrough)))));
+  }, passThrough))));
 }
 
 /* ============================== prop types ============================== */

package/es/actions/export.js

@@ -8,29 +8,16 @@ import * as verticesActions from "./vertices-actions";
 import * as itemsActions from "./items-actions";
 import * as areaActions from "./area-actions";
 import * as groupsActions from "./groups-actions";
-
-export {
-  projectActions,
-  viewer2DActions,
-  viewer3DActions,
-  linesActions,
-  holesActions,
-  sceneActions,
-  verticesActions,
-  itemsActions,
-  areaActions,
-  groupsActions
-};
-
+export { projectActions, viewer2DActions, viewer3DActions, linesActions, holesActions, sceneActions, verticesActions, itemsActions, areaActions, groupsActions };
 export default {
-  projectActions,
-  viewer2DActions,
-  viewer3DActions,
-  linesActions,
-  holesActions,
-  sceneActions,
-  verticesActions,
-  itemsActions,
-  areaActions,
-  groupsActions
-};
+  projectActions: projectActions,
+  viewer2DActions: viewer2DActions,
+  viewer3DActions: viewer3DActions,
+  linesActions: linesActions,
+  holesActions: holesActions,
+  sceneActions: sceneActions,
+  verticesActions: verticesActions,
+  itemsActions: itemsActions,
+  areaActions: areaActions,
+  groupsActions: groupsActions
+};

package/es/catalog/catalog.js

@@ -1,8 +1,7 @@
 import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 import _classCallCheck from "@babel/runtime/helpers/esm/classCallCheck";
 import _createClass from "@babel/runtime/helpers/esm/createClass";
-import { PropertyColor, PropertyEnum, PropertyString, PropertyNumber, PropertyLengthMeasure, PropertyToggle, PropertyCheckbox, PropertyHidden, PropertyReadOnly } from "./properties/export";
-import { UNIT_CENTIMETER, UNIT_INCH } from "../constants";
+import { UNIT_CENTIMETER } from "../constants";
 import { returnReplaceableDeepSearchType } from "../components/viewer2d/utils";
 var Catalog = /*#__PURE__*/function () {
   function Catalog() {
@@ -19,7 +18,6 @@ var Catalog = /*#__PURE__*/function () {
     };
     this.propertyTypes = {};
     this.unit = unit;
-    this.registerMultiplePropertyType([['color', PropertyColor, PropertyColor], ['enum', PropertyEnum, PropertyEnum], ['string', PropertyString, PropertyString], ['number', PropertyNumber, PropertyNumber], ['length-measure', PropertyLengthMeasure, PropertyLengthMeasure], ['toggle', PropertyToggle, PropertyToggle], ['checkbox', PropertyCheckbox, PropertyCheckbox], ['hidden', PropertyHidden, PropertyHidden], ['read-only', PropertyReadOnly, PropertyReadOnly]]);
   }
 
   /**
@@ -85,20 +83,6 @@ var Catalog = /*#__PURE__*/function () {
       }
     }
 
-    /**
-     * @description Register multiple elements
-     * @param {array} [elementArray] Array of elements
-     * @return {void}
-     */
-  }, {
-    key: "registerMultipleElements",
-    value: function registerMultipleElements(elementArray) {
-      var _this = this;
-      elementArray.forEach(function (el) {
-        return _this.registerElement(el);
-      });
-    }
-
     /**
      * @description Register a new property
      * @param {string} type Type of property
@@ -124,9 +108,9 @@ var Catalog = /*#__PURE__*/function () {
   }, {
     key: "registerMultiplePropertyType",
     value: function registerMultiplePropertyType(propertyTypeArray) {
-      var _this2 = this;
+      var _this = this;
       propertyTypeArray.forEach(function (el) {
-        return _this2.registerPropertyType.apply(_this2, _toConsumableArray(el));
+        return _this.registerPropertyType.apply(_this, _toConsumableArray(el));
       });
     }
 
@@ -179,7 +163,7 @@ var Catalog = /*#__PURE__*/function () {
   }, {
     key: "registerCategory",
     value: function registerCategory(name, label, childs) {
-      var _this3 = this;
+      var _this2 = this;
       if (this.validateCategory(name, label)) {
         this.categories[name] = {
           name: name,
@@ -190,7 +174,7 @@ var Catalog = /*#__PURE__*/function () {
         this.categories.root.categories.push(this.categories[name]);
         if (childs && childs.length) {
           childs.forEach(function (el) {
-            return _this3.addToCategory(name, el);
+            return _this2.addToCategory(name, el);
           });
         }
         return this.categories[name];

package/es/components/content.js

@@ -7,7 +7,8 @@ import Viewer3DFirstPerson from "./viewer3d/viewer3d-first-person";
 // import ProjectConfigurator from './configurator/project-configurator';
 import * as constants from "../constants";
 import Front3D from "./viewer3d/front3D";
-export default function Content(_ref, _ref2) {
+import { useAppContext } from "../useAppContext";
+export default function Content(_ref) {
   var width = _ref.width,
     height = _ref.height,
     state = _ref.state,
@@ -18,7 +19,6 @@ export default function Content(_ref, _ref2) {
     keyDownEnable = _ref.keyDownEnable,
     catalog = _ref.catalog,
     onInternalEvent = _ref.onInternalEvent;
-  var projectActions = _ref2.projectActions;
   var mode = state.get('mode');
 
   // Internal Event for unselect_all
@@ -133,7 +133,4 @@ Content.propTypes = {
   height: PropTypes.number.isRequired,
   replaceCabinet: PropTypes.func.isRequired,
   onInternalEvent: PropTypes.func.isRequired
-};
-Content.contextTypes = {
-  projectActions: PropTypes.object.isRequired
 };

package/es/components/export.js

@@ -1,7 +1,9 @@
 import Content from "./content";
 import Viewer2DComponents from "./viewer2d/export";
 import StyleComponents from "./style/export";
-
-export { Content, Viewer2DComponents, StyleComponents };
-
-export default { Content, Viewer2DComponents, StyleComponents };
+export { Content, Viewer2DComponents };
+export default {
+  Content: Content,
+  Viewer2DComponents: Viewer2DComponents,
+  StyleComponents: StyleComponents
+};

package/es/components/style/export.js

@@ -1,31 +1,5 @@
-import Button from "./button";
-import CancelButton from "./cancel-button";
-import ContentContainer from "./content-container";
-import ContentTitle from "./content-title";
-import DeleteButton from "./delete-button";
-import FormBlock from "./form-block";
-import FormColorInput from "./form-color-input";
-import FormLabel from "./form-label";
 import FormNumberInput from "./form-number-input";
-import FormSelect from "./form-select";
-import FormSlider from "./form-slider";
-import FormSubmitButton from "./form-submit-button";
-import FormTextInput from "./form-text-input";
-import FormNumberInput2 from "./form-number-input_2";
-export { Button, CancelButton, ContentContainer, ContentTitle, DeleteButton, FormBlock, FormColorInput, FormLabel, FormNumberInput, FormSelect, FormSlider, FormSubmitButton, FormTextInput, FormNumberInput2 };
+export { FormNumberInput };
 export default {
-  Button: Button,
-  CancelButton: CancelButton,
-  ContentContainer: ContentContainer,
-  ContentTitle: ContentTitle,
-  DeleteButton: DeleteButton,
-  FormBlock: FormBlock,
-  FormColorInput: FormColorInput,
-  FormLabel: FormLabel,
-  FormNumberInput: FormNumberInput,
-  FormSelect: FormSelect,
-  FormSlider: FormSlider,
-  FormSubmitButton: FormSubmitButton,
-  FormTextInput: FormTextInput,
-  FormNumberInput2: FormNumberInput2
+  FormNumberInput: FormNumberInput
 };

package/es/components/style/form-number-input.js

@@ -1,18 +1,17 @@
+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";
-import _taggedTemplateLiteral from "@babel/runtime/helpers/esm/taggedTemplateLiteral";
-var _templateObject;
+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; })(); }
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import { KEYBOARD_BUTTON_CODE, TEXT_COLOR_NEUTRAL_0, SECONDARY_PURPLE_COLOR, DEFAULT_FONT_FAMILY } from "../../constants";
-import styled from 'styled-components';
 import { isValidNumber } from "../../utils/helper";
-var StyledInput = styled.input(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  display: block;\n  padding: 15px 25px 12px 0px;\n  width: 120px;\n  color: ", ";\n  background-color: rgb(255, 255, 255);\n  border: 2px solid;\n  text-align: right;\n  float: right;\n  font-family: ", ";\n  font-size: 16px;\n  font-weight: 600;\n  line-height: 17px;\n  border-radius: 5px;\n  outline: 0;\n  :focus {\n    border-color: ", ";\n  }\n"])), TEXT_COLOR_NEUTRAL_0, DEFAULT_FONT_FAMILY, SECONDARY_PURPLE_COLOR);
 var FormNumberInput = /*#__PURE__*/function (_Component) {
   function FormNumberInput(props, context) {
     var _this;
@@ -104,13 +103,30 @@ var FormNumberInput = /*#__PURE__*/function (_Component) {
           });
         }
       };
-      return /*#__PURE__*/React.createElement(StyledInput, {
+      var baseInputStyle = {
+        display: 'block',
+        padding: '15px 25px 12px 0px',
+        width: '120px',
+        color: TEXT_COLOR_NEUTRAL_0,
+        backgroundColor: 'rgb(255, 255, 255)',
+        border: '2px solid',
+        textAlign: 'right',
+        "float": 'right',
+        fontFamily: DEFAULT_FONT_FAMILY,
+        fontSize: '16px',
+        fontWeight: 600,
+        lineHeight: '17px',
+        borderRadius: '5px',
+        outline: 0,
+        borderColor: this.state.focusOn ? SECONDARY_PURPLE_COLOR : undefined
+      };
+      return /*#__PURE__*/React.createElement("input", {
         id: "form_number_input",
         autoFocus: this.state.focusOn,
         readOnly: !!this.props.disabled,
         type: "text",
         value: currValue,
-        style: style,
+        style: _objectSpread(_objectSpread({}, baseInputStyle), style),
         onChange: function onChange(evt) {
           _this2.context.projectActions.copyProperties('ddddd');
           var valid = regexp.test(evt.nativeEvent.target.value);
@@ -167,11 +183,6 @@ FormNumberInput.propTypes = {
   labelName: PropTypes.string,
   isCeiling: PropTypes.string
 };
-FormNumberInput.contextTypes = {
-  translator: PropTypes.object.isRequired,
-  projectActions: PropTypes.object.isRequired,
-  linesActions: PropTypes.object.isRequired
-};
 FormNumberInput.defaultProps = {
   value: 0,
   style: {},

package/es/components/viewer2d/group.js

@@ -2,6 +2,7 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import If from "../../utils/react-if";
 import * as sharedStyles from "../../shared-style";
+import { useAppContext } from "../../useAppContext";
 var cx = 0;
 var cy = 0;
 var radius = 5;
@@ -10,12 +11,13 @@ var STYLE_CIRCLE = {
   stroke: sharedStyles.MATERIAL_COLORS[500].orange,
   cursor: 'default'
 };
-export default function Group(_ref, _ref2) {
+export default function Group(_ref) {
   var layer = _ref.layer,
     group = _ref.group,
     scene = _ref.scene,
     catalog = _ref.catalog;
-  var translator = _ref2.translator;
+  var _useAppContext = useAppContext(),
+    translator = _useAppContext.translator;
   return /*#__PURE__*/React.createElement("g", {
     "data-element-root": true,
     "data-prototype": group.prototype,
@@ -47,7 +49,4 @@ Group.propTypes = {
   layer: PropTypes.object.isRequired,
   scene: PropTypes.object.isRequired,
   catalog: PropTypes.object.isRequired
-};
-Group.contextTypes = {
-  translator: PropTypes.object.isRequired
 };