kitchen-simulator 10.3.0 → 11.0.0-react-18

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (41) hide show
  1. package/es/LiteKitchenConfigurator.js +11 -42
  2. package/es/LiteRenderer.js +24 -2
  3. package/es/actions/export.js +12 -25
  4. package/es/components/content.js +0 -3
  5. package/es/components/export.js +4 -6
  6. package/es/components/style/form-number-input.js +5 -7
  7. package/es/components/viewer2d/group.js +5 -6
  8. package/es/components/viewer2d/item.js +5 -6
  9. package/es/components/viewer2d/line.js +47 -18
  10. package/es/components/viewer2d/rulerX.js +8 -9
  11. package/es/components/viewer2d/rulerY.js +8 -9
  12. package/es/components/viewer2d/scene.js +9 -9
  13. package/es/components/viewer2d/state.js +1 -1
  14. package/es/components/viewer2d/viewer2d.js +28 -32
  15. package/es/components/viewer3d/viewer3d-first-person.js +8 -13
  16. package/es/components/viewer3d/viewer3d.js +8 -15
  17. package/es/utils/helper.js +0 -68
  18. package/lib/LiteKitchenConfigurator.js +11 -42
  19. package/lib/LiteRenderer.js +25 -3
  20. package/lib/actions/export.js +39 -35
  21. package/lib/components/content.js +0 -3
  22. package/lib/components/export.js +16 -6
  23. package/lib/components/style/form-number-input.js +5 -7
  24. package/lib/components/viewer2d/group.js +5 -6
  25. package/lib/components/viewer2d/item.js +4 -5
  26. package/lib/components/viewer2d/line.js +47 -18
  27. package/lib/components/viewer2d/rulerX.js +8 -9
  28. package/lib/components/viewer2d/rulerY.js +8 -9
  29. package/lib/components/viewer2d/scene.js +9 -9
  30. package/lib/components/viewer2d/state.js +1 -1
  31. package/lib/components/viewer2d/viewer2d.js +26 -30
  32. package/lib/components/viewer3d/viewer3d-first-person.js +8 -13
  33. package/lib/components/viewer3d/viewer3d.js +8 -15
  34. package/lib/utils/helper.js +1 -69
  35. package/package.json +6 -21
  36. package/es/analytics/ga4.js +0 -188
  37. package/es/components/style/form-submit-button.js +0 -25
  38. package/es/devLiteRenderer.js +0 -926
  39. package/lib/analytics/ga4.js +0 -194
  40. package/lib/components/style/form-submit-button.js +0 -35
  41. package/lib/devLiteRenderer.js +0 -930
@@ -1,7 +1,17 @@
1
- import Content from "./content";
2
- import Viewer2DComponents from "./viewer2d/export";
3
- import StyleComponents from "./style/export";
1
+ "use strict";
4
2
 
5
- export { Content, Viewer2DComponents, StyleComponents };
6
-
7
- export default { Content, Viewer2DComponents, StyleComponents };
3
+ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
4
+ Object.defineProperty(exports, "__esModule", {
5
+ value: true
6
+ });
7
+ Object.defineProperty(exports, "Content", {
8
+ enumerable: true,
9
+ get: function get() {
10
+ return _content["default"];
11
+ }
12
+ });
13
+ exports["default"] = void 0;
14
+ var _content = _interopRequireDefault(require("./content"));
15
+ var _default = exports["default"] = {
16
+ Content: _content["default"]
17
+ };
@@ -11,9 +11,11 @@ var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/creat
11
11
  var _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime/helpers/possibleConstructorReturn"));
12
12
  var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/getPrototypeOf"));
13
13
  var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
14
+ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
14
15
  var _taggedTemplateLiteral2 = _interopRequireDefault(require("@babel/runtime/helpers/taggedTemplateLiteral"));
15
16
  var _react = _interopRequireWildcard(require("react"));
16
17
  var _propTypes = _interopRequireDefault(require("prop-types"));
18
+ var _AppContext = _interopRequireDefault(require("../../AppContext"));
17
19
  var _constants = require("../../constants");
18
20
  var _styledComponents = _interopRequireDefault(require("styled-components"));
19
21
  var _helper = require("../../utils/helper");
@@ -47,8 +49,8 @@ var FormNumberInput = exports["default"] = /*#__PURE__*/function (_Component) {
47
49
  }
48
50
  }
49
51
  }, {
50
- key: "componentWillReceiveProps",
51
- value: function componentWillReceiveProps(nextProps) {
52
+ key: "UNSAFE_componentWillReceiveProps",
53
+ value: function UNSAFE_componentWillReceiveProps(nextProps) {
52
54
  if (this.props.value !== nextProps.value || this.props.focus !== nextProps.focus) {
53
55
  this.setState({
54
56
  showedValue: nextProps.value,
@@ -162,6 +164,7 @@ var FormNumberInput = exports["default"] = /*#__PURE__*/function (_Component) {
162
164
  }
163
165
  }]);
164
166
  }(_react.Component);
167
+ (0, _defineProperty2["default"])(FormNumberInput, "contextType", _AppContext["default"]);
165
168
  FormNumberInput.propTypes = {
166
169
  value: _propTypes["default"].oneOfType([_propTypes["default"].number, _propTypes["default"].string]),
167
170
  style: _propTypes["default"].object,
@@ -175,11 +178,6 @@ FormNumberInput.propTypes = {
175
178
  labelName: _propTypes["default"].string,
176
179
  isCeiling: _propTypes["default"].string
177
180
  };
178
- FormNumberInput.contextTypes = {
179
- translator: _propTypes["default"].object.isRequired,
180
- projectActions: _propTypes["default"].object.isRequired,
181
- linesActions: _propTypes["default"].object.isRequired
182
- };
183
181
  FormNumberInput.defaultProps = {
184
182
  value: 0,
185
183
  style: {},
@@ -6,8 +6,9 @@ Object.defineProperty(exports, "__esModule", {
6
6
  value: true
7
7
  });
8
8
  exports["default"] = Group;
9
- var _react = _interopRequireDefault(require("react"));
9
+ var _react = _interopRequireWildcard(require("react"));
10
10
  var _propTypes = _interopRequireDefault(require("prop-types"));
11
+ var _AppContext = _interopRequireDefault(require("../../AppContext"));
11
12
  var _reactIf = _interopRequireDefault(require("../../utils/react-if"));
12
13
  var sharedStyles = _interopRequireWildcard(require("../../shared-style"));
13
14
  function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, "default": e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
@@ -19,12 +20,13 @@ var STYLE_CIRCLE = {
19
20
  stroke: sharedStyles.MATERIAL_COLORS[500].orange,
20
21
  cursor: 'default'
21
22
  };
22
- function Group(_ref, _ref2) {
23
+ function Group(_ref) {
23
24
  var layer = _ref.layer,
24
25
  group = _ref.group,
25
26
  scene = _ref.scene,
26
27
  catalog = _ref.catalog;
27
- var translator = _ref2.translator;
28
+ var _useContext = (0, _react.useContext)(_AppContext["default"]),
29
+ translator = _useContext.translator;
28
30
  return /*#__PURE__*/_react["default"].createElement("g", {
29
31
  "data-element-root": true,
30
32
  "data-prototype": group.prototype,
@@ -57,7 +59,4 @@ Group.propTypes = {
57
59
  scene: _propTypes["default"].object.isRequired,
58
60
  catalog: _propTypes["default"].object.isRequired
59
61
  };
60
- Group.contextTypes = {
61
- translator: _propTypes["default"].object.isRequired
62
- };
63
62
  module.exports = exports.default;
@@ -9,6 +9,7 @@ exports["default"] = Item;
9
9
  var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
10
10
  var _react = _interopRequireWildcard(require("react"));
11
11
  var _propTypes = _interopRequireDefault(require("prop-types"));
12
+ var _AppContext = _interopRequireDefault(require("../../AppContext"));
12
13
  var _rulerDist = _interopRequireDefault(require("./rulerDist"));
13
14
  var _convertUnitsLite = require("../../utils/convert-units-lite");
14
15
  var _export = require("../../utils/export");
@@ -30,14 +31,15 @@ var STYLE_CIRCLE2 = {
30
31
  stroke: '#0096fd',
31
32
  cursor: 'ew-resize'
32
33
  };
33
- function Item(_ref, _ref2) {
34
+ function Item(_ref) {
34
35
  var _element$render2D;
35
36
  var layer = _ref.layer,
36
37
  item = _ref.item,
37
38
  scene = _ref.scene,
38
39
  catalog = _ref.catalog,
39
40
  mode = _ref.mode;
40
- var itemsActions = _ref2.itemsActions;
41
+ var _useContext = (0, _react.useContext)(_AppContext["default"]),
42
+ itemsActions = _useContext.itemsActions;
41
43
  var _useState = (0, _react.useState)(false),
42
44
  _useState2 = (0, _slicedToArray2["default"])(_useState, 2),
43
45
  clockRotateState = _useState2[0],
@@ -239,7 +241,4 @@ Item.propTypes = {
239
241
  scene: _propTypes["default"].object.isRequired,
240
242
  catalog: _propTypes["default"].object.isRequired
241
243
  };
242
- Item.contextTypes = {
243
- itemsActions: _propTypes["default"].object.isRequired
244
- };
245
244
  module.exports = exports.default;
@@ -258,11 +258,13 @@ function Line(_ref) {
258
258
  if (!showWallCabinetMeasure || wall_posArray.length <= 2) {
259
259
  wallSpace = 0;
260
260
  }
261
- wallRuler = wall_posAndwidth.map(function (pAw) {
261
+ wallRuler = wall_posAndwidth.map(function (pAw, pAwIdx) {
262
262
  if (pAw.length > 1) {
263
263
  if (Math.sin(angle) === 0 || _export.GeometryUtils.almostEqual(y1, y2)) {
264
264
  if (x1 - x2 > 0) {
265
- return /*#__PURE__*/_react["default"].createElement("g", null, /*#__PURE__*/_react["default"].createElement("line", {
265
+ return /*#__PURE__*/_react["default"].createElement("g", {
266
+ key: "wall_".concat(pAwIdx)
267
+ }, /*#__PURE__*/_react["default"].createElement("line", {
266
268
  x1: pAw.pos.x + pAw.length,
267
269
  y1: pAw.pos.y,
268
270
  x2: pAw.pos.x + pAw.length,
@@ -284,7 +286,9 @@ function Line(_ref) {
284
286
  style: STYLE_DASH
285
287
  }));
286
288
  } else {
287
- return /*#__PURE__*/_react["default"].createElement("g", null, /*#__PURE__*/_react["default"].createElement("line", {
289
+ return /*#__PURE__*/_react["default"].createElement("g", {
290
+ key: "wall_".concat(pAwIdx)
291
+ }, /*#__PURE__*/_react["default"].createElement("line", {
288
292
  x1: pAw.pos.x + pAw.length,
289
293
  y1: pAw.pos.y,
290
294
  x2: pAw.pos.x + pAw.length,
@@ -309,7 +313,9 @@ function Line(_ref) {
309
313
  } else {
310
314
  if (y1 - y2 > 0) {
311
315
  if (x1 - x2 < 0 || _export.GeometryUtils.almostEqual(x1, x2)) {
312
- return /*#__PURE__*/_react["default"].createElement("g", null, /*#__PURE__*/_react["default"].createElement("line", {
316
+ return /*#__PURE__*/_react["default"].createElement("g", {
317
+ key: "wall_".concat(pAwIdx)
318
+ }, /*#__PURE__*/_react["default"].createElement("line", {
313
319
  x1: pAw.pos.x - pAw.length * Math.cos(angle / 180 * Math.PI),
314
320
  y1: pAw.pos.y - pAw.length * Math.sin(angle / 180 * Math.PI),
315
321
  x2: pAw.pos.x - pAw.length * Math.cos(angle / 180 * Math.PI) - (thickness / 2 + wallSpace) * Math.sin(angle / 180 * Math.PI),
@@ -331,7 +337,9 @@ function Line(_ref) {
331
337
  style: STYLE_DASH
332
338
  }));
333
339
  } else {
334
- return /*#__PURE__*/_react["default"].createElement("g", null, /*#__PURE__*/_react["default"].createElement("line", {
340
+ return /*#__PURE__*/_react["default"].createElement("g", {
341
+ key: "wall_".concat(pAwIdx)
342
+ }, /*#__PURE__*/_react["default"].createElement("line", {
335
343
  x1: pAw.pos.x,
336
344
  y1: pAw.pos.y,
337
345
  x2: pAw.pos.x - (thickness / 2 + wallSpace) * Math.sin(angle / 180 * Math.PI),
@@ -355,7 +363,9 @@ function Line(_ref) {
355
363
  }
356
364
  } else {
357
365
  if (x1 - x2 < 0 || _export.GeometryUtils.almostEqual(x1, x2)) {
358
- return /*#__PURE__*/_react["default"].createElement("g", null, /*#__PURE__*/_react["default"].createElement("line", {
366
+ return /*#__PURE__*/_react["default"].createElement("g", {
367
+ key: "wall_".concat(pAwIdx)
368
+ }, /*#__PURE__*/_react["default"].createElement("line", {
359
369
  x1: pAw.pos.x,
360
370
  y1: pAw.pos.y,
361
371
  x2: pAw.pos.x - (thickness / 2 + wallSpace) * Math.sin(angle / 180 * Math.PI),
@@ -377,7 +387,9 @@ function Line(_ref) {
377
387
  style: STYLE_DASH
378
388
  }));
379
389
  } else {
380
- return /*#__PURE__*/_react["default"].createElement("g", null, /*#__PURE__*/_react["default"].createElement("line", {
390
+ return /*#__PURE__*/_react["default"].createElement("g", {
391
+ key: "wall_".concat(pAwIdx)
392
+ }, /*#__PURE__*/_react["default"].createElement("line", {
381
393
  x1: pAw.pos.x + pAw.length * Math.cos(angle / 180 * Math.PI),
382
394
  y1: pAw.pos.y + pAw.length * Math.sin(angle / 180 * Math.PI),
383
395
  x2: pAw.pos.x + pAw.length * Math.cos(angle / 180 * Math.PI) - (thickness / 2 + wallSpace) * Math.sin(angle / 180 * Math.PI),
@@ -470,11 +482,13 @@ function Line(_ref) {
470
482
  if (!showBaseCabinetMeasure || base_posArray.length <= 2) {
471
483
  baseSpace -= STEP;
472
484
  }
473
- baseRuler = base_posAndwidth.map(function (pAw) {
485
+ baseRuler = base_posAndwidth.map(function (pAw, pAwIdx) {
474
486
  if (pAw.length > 1) {
475
487
  if (Math.sin(angle) === 0 || _export.GeometryUtils.almostEqual(y1, y2)) {
476
488
  if (x1 - x2 > 0) {
477
- return /*#__PURE__*/_react["default"].createElement("g", null, /*#__PURE__*/_react["default"].createElement("line", {
489
+ return /*#__PURE__*/_react["default"].createElement("g", {
490
+ key: "base_".concat(pAwIdx)
491
+ }, /*#__PURE__*/_react["default"].createElement("line", {
478
492
  x1: pAw.pos.x + pAw.length,
479
493
  y1: pAw.pos.y,
480
494
  x2: pAw.pos.x + pAw.length,
@@ -496,7 +510,9 @@ function Line(_ref) {
496
510
  style: STYLE_DASH
497
511
  }));
498
512
  } else {
499
- return /*#__PURE__*/_react["default"].createElement("g", null, /*#__PURE__*/_react["default"].createElement("line", {
513
+ return /*#__PURE__*/_react["default"].createElement("g", {
514
+ key: "base_".concat(pAwIdx)
515
+ }, /*#__PURE__*/_react["default"].createElement("line", {
500
516
  x1: pAw.pos.x + pAw.length,
501
517
  y1: pAw.pos.y,
502
518
  x2: pAw.pos.x + pAw.length,
@@ -521,7 +537,9 @@ function Line(_ref) {
521
537
  } else {
522
538
  if (y1 - y2 > 0) {
523
539
  if (x1 - x2 < 0 || _export.GeometryUtils.almostEqual(x1, x2)) {
524
- return /*#__PURE__*/_react["default"].createElement("g", null, /*#__PURE__*/_react["default"].createElement("line", {
540
+ return /*#__PURE__*/_react["default"].createElement("g", {
541
+ key: "base_".concat(pAwIdx)
542
+ }, /*#__PURE__*/_react["default"].createElement("line", {
525
543
  x1: pAw.pos.x - pAw.length * Math.cos(angle / 180 * Math.PI),
526
544
  y1: pAw.pos.y - pAw.length * Math.sin(angle / 180 * Math.PI),
527
545
  x2: pAw.pos.x - pAw.length * Math.cos(angle / 180 * Math.PI) - (thickness / 2 + baseSpace) * Math.sin(angle / 180 * Math.PI),
@@ -543,7 +561,9 @@ function Line(_ref) {
543
561
  style: STYLE_DASH
544
562
  }));
545
563
  } else {
546
- return /*#__PURE__*/_react["default"].createElement("g", null, /*#__PURE__*/_react["default"].createElement("line", {
564
+ return /*#__PURE__*/_react["default"].createElement("g", {
565
+ key: "base_".concat(pAwIdx)
566
+ }, /*#__PURE__*/_react["default"].createElement("line", {
547
567
  x1: pAw.pos.x,
548
568
  y1: pAw.pos.y,
549
569
  x2: pAw.pos.x - (thickness / 2 + baseSpace) * Math.sin(angle / 180 * Math.PI),
@@ -567,7 +587,9 @@ function Line(_ref) {
567
587
  }
568
588
  } else {
569
589
  if (x1 - x2 < 0 || _export.GeometryUtils.almostEqual(x1, x2)) {
570
- return /*#__PURE__*/_react["default"].createElement("g", null, /*#__PURE__*/_react["default"].createElement("line", {
590
+ return /*#__PURE__*/_react["default"].createElement("g", {
591
+ key: "base_".concat(pAwIdx)
592
+ }, /*#__PURE__*/_react["default"].createElement("line", {
571
593
  x1: pAw.pos.x,
572
594
  y1: pAw.pos.y,
573
595
  x2: pAw.pos.x - (thickness / 2 + baseSpace) * Math.sin(angle / 180 * Math.PI),
@@ -589,7 +611,9 @@ function Line(_ref) {
589
611
  style: STYLE_DASH
590
612
  }));
591
613
  } else {
592
- return /*#__PURE__*/_react["default"].createElement("g", null, /*#__PURE__*/_react["default"].createElement("line", {
614
+ return /*#__PURE__*/_react["default"].createElement("g", {
615
+ key: "base_".concat(pAwIdx)
616
+ }, /*#__PURE__*/_react["default"].createElement("line", {
593
617
  x1: pAw.pos.x + pAw.length * Math.cos(angle / 180 * Math.PI),
594
618
  y1: pAw.pos.y + pAw.length * Math.sin(angle / 180 * Math.PI),
595
619
  x2: pAw.pos.x + pAw.length * Math.cos(angle / 180 * Math.PI) - (thickness / 2 + baseSpace) * Math.sin(angle / 180 * Math.PI),
@@ -663,14 +687,15 @@ function Line(_ref) {
663
687
  //the space from the dimensioning line to the bottom
664
688
  var lineSpacedimension2 = 14;
665
689
  if (compareVertices(vertex0, vertex1) >= 0 && vertex0.x !== vertex1.x) {
666
- renderedRuler.push(/*#__PURE__*/_react["default"].createElement("g", null, /*#__PURE__*/_react["default"].createElement("line", {
690
+ renderedRuler.push(/*#__PURE__*/_react["default"].createElement("g", {
691
+ key: "ruler-a"
692
+ }, /*#__PURE__*/_react["default"].createElement("line", {
667
693
  x1: length,
668
694
  y1: lineSpace + lineSpacedimension1,
669
695
  x2: length,
670
696
  y2: lineSpace + lineSpacedimension2,
671
697
  style: STYLE_ROOM_SHAPE
672
698
  }), /*#__PURE__*/_react["default"].createElement(_ruler["default"], {
673
- key: 0,
674
699
  layer: layer,
675
700
  unit: scene.unit,
676
701
  rulerUnit: scene.rulerUnit,
@@ -685,14 +710,15 @@ function Line(_ref) {
685
710
  style: STYLE_ROOM_SHAPE
686
711
  })));
687
712
  } else {
688
- renderedRuler.push(/*#__PURE__*/_react["default"].createElement("g", null, /*#__PURE__*/_react["default"].createElement("line", {
713
+ renderedRuler.push(/*#__PURE__*/_react["default"].createElement("g", {
714
+ key: "ruler-b"
715
+ }, /*#__PURE__*/_react["default"].createElement("line", {
689
716
  x1: 0,
690
717
  y1: lineSpace + lineSpacedimension1,
691
718
  x2: 0,
692
719
  y2: lineSpace + lineSpacedimension2,
693
720
  style: STYLE_ROOM_SHAPE
694
721
  }), /*#__PURE__*/_react["default"].createElement(_ruler["default"], {
695
- key: 0,
696
722
  layer: layer,
697
723
  unit: scene.unit,
698
724
  rulerUnit: scene.rulerUnit,
@@ -734,6 +760,7 @@ function Line(_ref) {
734
760
  }
735
761
  if (compareVertices(vertex0, vertex1) >= 0 && vertex0.x !== vertex1.x) {
736
762
  renderedAllRuler.push(/*#__PURE__*/_react["default"].createElement("g", {
763
+ key: "allRuler_a_".concat(index),
737
764
  transform: "translate(".concat(x1, ", ").concat(y1, ") rotate(").concat(angle, ", 0, 0)")
738
765
  }, /*#__PURE__*/_react["default"].createElement("line", {
739
766
  x1: allRuler[index],
@@ -758,6 +785,7 @@ function Line(_ref) {
758
785
  })));
759
786
  } else {
760
787
  renderedAllRuler.push(/*#__PURE__*/_react["default"].createElement("g", {
788
+ key: "allRuler_b_".concat(index),
761
789
  transform: "translate(".concat(x1, ", ").concat(y1, ") rotate(").concat(angle, ", 0, 0)")
762
790
  }, /*#__PURE__*/_react["default"].createElement("line", {
763
791
  x1: allRuler[index],
@@ -857,6 +885,7 @@ function Line(_ref) {
857
885
 
858
886
  // Angle SVG Path
859
887
  lines.push(/*#__PURE__*/_react["default"].createElement("path", {
888
+ key: "angle-path-".concat(index),
860
889
  style: STYLE_ANGLE,
861
890
  d: "\n M ".concat(vertex[0].x, ",").concat(vertex[0].y, " L ").concat(pos1.x, ",").concat(pos1.y, " A ").concat(minLineLength, " ").concat(minLineLength, " ").concat(angle, " 0 ").concat(t > 0 ? 1 : 0, " ").concat(pos2.x, ",").concat(pos2.y, " z\n ")
862
891
  }));
@@ -6,14 +6,15 @@ Object.defineProperty(exports, "__esModule", {
6
6
  value: true
7
7
  });
8
8
  exports["default"] = void 0;
9
- var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
10
9
  var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
11
10
  var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
12
11
  var _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime/helpers/possibleConstructorReturn"));
13
12
  var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/getPrototypeOf"));
14
13
  var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
14
+ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
15
15
  var _react = _interopRequireWildcard(require("react"));
16
16
  var _propTypes = _interopRequireDefault(require("prop-types"));
17
+ var _AppContext = _interopRequireDefault(require("../../AppContext"));
17
18
  var SharedStyle = _interopRequireWildcard(require("../../shared-style"));
18
19
  function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, "default": e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
19
20
  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; }
@@ -54,7 +55,7 @@ var RulerX = exports["default"] = /*#__PURE__*/function (_Component) {
54
55
  };
55
56
  var markerStyle = {
56
57
  position: 'absolute',
57
- left: this.props.zeroLeftPosition + this.props.mouseX * this.props.zoom - 6.5,
58
+ left: (this.props.zeroLeftPosition || 0) + (this.props.mouseX || 0) * (this.props.zoom || 1) - 6.5,
58
59
  top: 8,
59
60
  width: 0,
60
61
  height: 0,
@@ -74,12 +75,12 @@ var RulerX = exports["default"] = /*#__PURE__*/function (_Component) {
74
75
  grdAutoColumns: "".concat(elementW, "px")
75
76
  };
76
77
  var positiveRulerContainer = _objectSpread(_objectSpread({}, rulerContainer), {}, {
77
- width: this.props.positiveUnitsNumber * elementW,
78
- left: this.props.zeroLeftPosition
78
+ width: (this.props.positiveUnitsNumber || 0) * elementW,
79
+ left: this.props.zeroLeftPosition || 0
79
80
  });
80
81
  var negativeRulerContainer = _objectSpread(_objectSpread({}, rulerContainer), {}, {
81
- width: this.props.negativeUnitsNumber * elementW,
82
- left: this.props.zeroLeftPosition - this.props.negativeUnitsNumber * elementW
82
+ width: (this.props.negativeUnitsNumber || 0) * elementW,
83
+ left: (this.props.zeroLeftPosition || 0) - (this.props.negativeUnitsNumber || 0) * elementW
83
84
  });
84
85
  var positiveDomElements = [];
85
86
  if (elementW <= 200) {
@@ -129,6 +130,7 @@ var RulerX = exports["default"] = /*#__PURE__*/function (_Component) {
129
130
  }
130
131
  }]);
131
132
  }(_react.Component);
133
+ (0, _defineProperty2["default"])(RulerX, "contextType", _AppContext["default"]);
132
134
  RulerX.propTypes = {
133
135
  unitPixelSize: _propTypes["default"].number.isRequired,
134
136
  positiveUnitsNumber: _propTypes["default"].number,
@@ -148,7 +150,4 @@ RulerX.defaultProps = {
148
150
  fontColor: SharedStyle.COLORS.white,
149
151
  markerColor: SharedStyle.SECONDARY_COLOR.main
150
152
  };
151
- RulerX.contextTypes = {
152
- translator: _propTypes["default"].object.isRequired
153
- };
154
153
  module.exports = exports.default;
@@ -6,14 +6,15 @@ Object.defineProperty(exports, "__esModule", {
6
6
  value: true
7
7
  });
8
8
  exports["default"] = void 0;
9
- var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
10
9
  var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
11
10
  var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
12
11
  var _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime/helpers/possibleConstructorReturn"));
13
12
  var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/getPrototypeOf"));
14
13
  var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
14
+ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
15
15
  var _react = _interopRequireWildcard(require("react"));
16
16
  var _propTypes = _interopRequireDefault(require("prop-types"));
17
+ var _AppContext = _interopRequireDefault(require("../../AppContext"));
17
18
  var SharedStyle = _interopRequireWildcard(require("../../shared-style"));
18
19
  function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, "default": e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
19
20
  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; }
@@ -58,7 +59,7 @@ var RulerY = exports["default"] = /*#__PURE__*/function (_Component) {
58
59
  };
59
60
  var markerStyle = {
60
61
  position: 'absolute',
61
- top: this.props.zeroTopPosition - this.props.mouseY * this.props.zoom - 6.5,
62
+ top: (this.props.zeroTopPosition || 0) - (this.props.mouseY || 0) * (this.props.zoom || 1) - 6.5,
62
63
  left: 8,
63
64
  width: 0,
64
65
  height: 0,
@@ -78,12 +79,12 @@ var RulerY = exports["default"] = /*#__PURE__*/function (_Component) {
78
79
  paddingLeft: '5px'
79
80
  };
80
81
  var positiveRulerContainer = _objectSpread(_objectSpread({}, rulerContainer), {}, {
81
- top: this.props.zeroTopPosition - this.props.positiveUnitsNumber * elementH,
82
- height: this.props.positiveUnitsNumber * elementH
82
+ top: (this.props.zeroTopPosition || 0) - (this.props.positiveUnitsNumber || 0) * elementH,
83
+ height: (this.props.positiveUnitsNumber || 0) * elementH
83
84
  });
84
85
  var negativeRulerContainer = _objectSpread(_objectSpread({}, rulerContainer), {}, {
85
- top: this.props.zeroTopPosition + this.props.negativeUnitsNumber * elementH,
86
- height: this.props.negativeUnitsNumber * elementH
86
+ top: (this.props.zeroTopPosition || 0) + (this.props.negativeUnitsNumber || 0) * elementH,
87
+ height: (this.props.negativeUnitsNumber || 0) * elementH
87
88
  });
88
89
  var positiveDomElements = [];
89
90
  if (elementH <= 200) {
@@ -133,6 +134,7 @@ var RulerY = exports["default"] = /*#__PURE__*/function (_Component) {
133
134
  }
134
135
  }]);
135
136
  }(_react.Component);
137
+ (0, _defineProperty2["default"])(RulerY, "contextType", _AppContext["default"]);
136
138
  RulerY.propTypes = {
137
139
  unitPixelSize: _propTypes["default"].number.isRequired,
138
140
  zoom: _propTypes["default"].number.isRequired,
@@ -150,7 +152,4 @@ RulerY.defaultProps = {
150
152
  fontColor: SharedStyle.COLORS.white,
151
153
  markerColor: SharedStyle.SECONDARY_COLOR.main
152
154
  };
153
- RulerY.contextTypes = {
154
- translator: _propTypes["default"].object.isRequired
155
- };
156
155
  module.exports = exports.default;
@@ -14,8 +14,10 @@ var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/creat
14
14
  var _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime/helpers/possibleConstructorReturn"));
15
15
  var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/getPrototypeOf"));
16
16
  var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
17
+ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
17
18
  var _react = _interopRequireWildcard(require("react"));
18
19
  var _propTypes = _interopRequireDefault(require("prop-types"));
20
+ var _AppContext = _interopRequireDefault(require("../../AppContext"));
19
21
  var _export = require("./export");
20
22
  var _utils = require("./utils");
21
23
  function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, "default": e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
@@ -28,9 +30,9 @@ var Scene = exports["default"] = /*#__PURE__*/function (_Component) {
28
30
  }
29
31
  (0, _inherits2["default"])(Scene, _Component);
30
32
  return (0, _createClass2["default"])(Scene, [{
31
- key: "componentWillReceiveProps",
33
+ key: "UNSAFE_componentWillReceiveProps",
32
34
  value: function () {
33
- var _componentWillReceiveProps = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee(nextProps) {
35
+ var _UNSAFE_componentWillReceiveProps = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee(nextProps) {
34
36
  var scene, catalog, height, layers, selectedLayer, msg, isNotFoundInElements, itemType;
35
37
  return _regenerator["default"].wrap(function (_context) {
36
38
  while (1) switch (_context.prev = _context.next) {
@@ -69,10 +71,10 @@ var Scene = exports["default"] = /*#__PURE__*/function (_Component) {
69
71
  }
70
72
  }, _callee, this);
71
73
  }));
72
- function componentWillReceiveProps(_x) {
73
- return _componentWillReceiveProps.apply(this, arguments);
74
+ function UNSAFE_componentWillReceiveProps(_x) {
75
+ return _UNSAFE_componentWillReceiveProps.apply(this, arguments);
74
76
  }
75
- return componentWillReceiveProps;
77
+ return UNSAFE_componentWillReceiveProps;
76
78
  }()
77
79
  }, {
78
80
  key: "shouldComponentUpdate",
@@ -126,12 +128,10 @@ var Scene = exports["default"] = /*#__PURE__*/function (_Component) {
126
128
  }
127
129
  }]);
128
130
  }(_react.Component);
131
+ (0, _defineProperty2["default"])(Scene, "contextType", _AppContext["default"]);
129
132
  Scene.propTypes = {
130
133
  scene: _propTypes["default"].object.isRequired,
131
134
  catalog: _propTypes["default"].object.isRequired,
132
- relatedLines: _propTypes["default"].object.isRequired
133
- };
134
- Scene.contextTypes = {
135
- projectActions: _propTypes["default"].object.isRequired
135
+ relatedLines: _propTypes["default"].array.isRequired
136
136
  };
137
137
  module.exports = exports.default;
@@ -78,6 +78,6 @@ function State(_ref) {
78
78
  State.propTypes = {
79
79
  state: _propTypes["default"].object.isRequired,
80
80
  catalog: _propTypes["default"].object.isRequired,
81
- relatedLines: _propTypes["default"].object.isRequired
81
+ relatedLines: _propTypes["default"].array.isRequired
82
82
  };
83
83
  module.exports = exports.default;
@@ -10,6 +10,7 @@ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/de
10
10
  var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
11
11
  var _react = _interopRequireWildcard(require("react"));
12
12
  var _propTypes = _interopRequireDefault(require("prop-types"));
13
+ var _AppContext = _interopRequireDefault(require("../../AppContext"));
13
14
  var _reactSvgPanZoom = require("react-svg-pan-zoom");
14
15
  var _constants = _interopRequireWildcard(require("../../constants"));
15
16
  var constants = _constants;
@@ -128,21 +129,22 @@ function extractElementData(node) {
128
129
  direct: node.attributes.getNamedItem('data-direct') ? node.attributes.getNamedItem('data-direct').value : 0
129
130
  };
130
131
  }
131
- function Viewer2D(_ref, _ref2) {
132
+ function Viewer2D(_ref) {
132
133
  var state = _ref.state,
133
134
  width = _ref.width,
134
135
  height = _ref.height,
135
136
  setToolbar = _ref.setToolbar,
136
137
  replaceCabinet = _ref.replaceCabinet,
137
138
  onInternalEvent = _ref.onInternalEvent;
138
- var viewer2DActions = _ref2.viewer2DActions,
139
- linesActions = _ref2.linesActions,
140
- holesActions = _ref2.holesActions,
141
- verticesActions = _ref2.verticesActions,
142
- itemsActions = _ref2.itemsActions,
143
- areaActions = _ref2.areaActions,
144
- projectActions = _ref2.projectActions,
145
- catalog = _ref2.catalog;
139
+ var _useContext = (0, _react.useContext)(_AppContext["default"]),
140
+ viewer2DActions = _useContext.viewer2DActions,
141
+ linesActions = _useContext.linesActions,
142
+ holesActions = _useContext.holesActions,
143
+ verticesActions = _useContext.verticesActions,
144
+ itemsActions = _useContext.itemsActions,
145
+ areaActions = _useContext.areaActions,
146
+ projectActions = _useContext.projectActions,
147
+ catalog = _useContext.catalog;
146
148
  var _useState = (0, _react.useState)(null),
147
149
  _useState2 = (0, _slicedToArray2["default"])(_useState, 2),
148
150
  rulerEdit = _useState2[0],
@@ -189,9 +191,9 @@ function Viewer2D(_ref, _ref2) {
189
191
  var layerID = scene.selectedLayer;
190
192
  var wall_thickness = _constants.LINE_THICKNESS / 2;
191
193
  var layer = scene.getIn(['layers', layerID]);
192
- var mapCursorPosition = function mapCursorPosition(_ref3) {
193
- var x = _ref3.x,
194
- y = _ref3.y;
194
+ var mapCursorPosition = function mapCursorPosition(_ref2) {
195
+ var x = _ref2.x,
196
+ y = _ref2.y;
195
197
  return {
196
198
  x: x,
197
199
  y: -y + scene.height
@@ -1344,11 +1346,11 @@ function Viewer2D(_ref, _ref2) {
1344
1346
  var rulerBgColor = SharedStyle.PRIMARY_COLOR.main;
1345
1347
  var rulerFnColor = SharedStyle.COLORS.white;
1346
1348
  var rulerMkColor = SharedStyle.SECONDARY_COLOR.main;
1347
- var sceneWidth = SVGWidth || state.getIn(['scene', 'width']);
1348
- var sceneHeight = SVGHeight || state.getIn(['scene', 'height']);
1349
+ var sceneWidth = SVGWidth || state.getIn(['scene', 'width']) || 0;
1350
+ var sceneHeight = SVGHeight || state.getIn(['scene', 'height']) || 0;
1349
1351
  var sceneZoom = state.zoom || 1;
1350
- var rulerXElements = Math.ceil(sceneWidth / rulerUnitPixelSize) + 1;
1351
- var rulerYElements = Math.ceil(sceneHeight / rulerUnitPixelSize) + 1;
1352
+ var rulerXElements = sceneWidth ? Math.ceil(sceneWidth / rulerUnitPixelSize) + 1 : 0;
1353
+ var rulerYElements = sceneHeight ? Math.ceil(sceneHeight / rulerUnitPixelSize) + 1 : 0;
1352
1354
  return /*#__PURE__*/_react["default"].createElement("div", null, rulerEdit, /*#__PURE__*/_react["default"].createElement("div", {
1353
1355
  style: {
1354
1356
  margin: 0,
@@ -1398,7 +1400,7 @@ function Viewer2D(_ref, _ref2) {
1398
1400
  zoom: sceneZoom,
1399
1401
  mouseY: state.mouse.get('y'),
1400
1402
  height: height - rulerSize,
1401
- zeroTopPosition: sceneHeight * sceneZoom + f || 0,
1403
+ zeroTopPosition: sceneHeight * sceneZoom + (f || 0),
1402
1404
  backgroundColor: rulerBgColor,
1403
1405
  fontColor: rulerFnColor,
1404
1406
  markerColor: rulerMkColor,
@@ -1411,7 +1413,7 @@ function Viewer2D(_ref, _ref2) {
1411
1413
  },
1412
1414
  width: width - rulerSize,
1413
1415
  height: height - rulerSize,
1414
- value: viewer2D.isEmpty() ? null : viewer2D.toJS(),
1416
+ value: viewer2D.isEmpty() ? _reactSvgPanZoom.INITIAL_VALUE : viewer2D.toJS(),
1415
1417
  onChangeValue: onChangeValue,
1416
1418
  tool: mode2Tool(mode),
1417
1419
  onChangeTool: onChangeTool,
@@ -1419,8 +1421,12 @@ function Viewer2D(_ref, _ref2) {
1419
1421
  onMouseDown: onMouseDown,
1420
1422
  onMouseMove: onMouseMove,
1421
1423
  onMouseUp: onMouseUp,
1422
- miniaturePosition: "none",
1423
- toolbarPosition: "none",
1424
+ customMiniature: function customMiniature() {
1425
+ return null;
1426
+ },
1427
+ customToolbar: function customToolbar() {
1428
+ return null;
1429
+ },
1424
1430
  detectPinchGesture: false,
1425
1431
  disableDoubleClickZoomWithToolAuto: true,
1426
1432
  ref: Viewer
@@ -1459,14 +1465,4 @@ Viewer2D.propTypes = {
1459
1465
  width: _propTypes["default"].number.isRequired,
1460
1466
  height: _propTypes["default"].number.isRequired
1461
1467
  };
1462
- Viewer2D.contextTypes = {
1463
- viewer2DActions: _propTypes["default"].object.isRequired,
1464
- linesActions: _propTypes["default"].object.isRequired,
1465
- holesActions: _propTypes["default"].object.isRequired,
1466
- verticesActions: _propTypes["default"].object.isRequired,
1467
- itemsActions: _propTypes["default"].object.isRequired,
1468
- areaActions: _propTypes["default"].object.isRequired,
1469
- projectActions: _propTypes["default"].object.isRequired,
1470
- catalog: _propTypes["default"].object.isRequired
1471
- };
1472
1468
  module.exports = exports.default;