From dcfb93aa12717e4d369d3a550390eb44d44c82a0 Mon Sep 17 00:00:00 2001
From: Siklos <siklos@tuta.io>
Date: Mon, 15 Aug 2022 23:04:45 +0200
Subject: [PATCH] Fix bugs created by using Number()

---
 src/Components/App/MenuActions.ts             | 4 ++--
 src/Components/Editor/ContainerOperations.ts  | 5 +++--
 src/Components/Properties/Properties.test.tsx | 5 ++++-
 src/utils/default.ts                          | 4 ++--
 4 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/src/Components/App/MenuActions.ts b/src/Components/App/MenuActions.ts
index c144acc..8dec2a1 100644
--- a/src/Components/App/MenuActions.ts
+++ b/src/Components/App/MenuActions.ts
@@ -20,8 +20,8 @@ export function NewEditor(
           parentId: 'null',
           x: 0,
           y: 0,
-          width: configuration.MainContainer.Width,
-          height: configuration.MainContainer.Height,
+          width: Number(configuration.MainContainer.Width),
+          height: Number(configuration.MainContainer.Height),
           isRigidBody: false,
           isAnchor: false,
           fillOpacity: 0,
diff --git a/src/Components/Editor/ContainerOperations.ts b/src/Components/Editor/ContainerOperations.ts
index 43f7d31..0ab670d 100644
--- a/src/Components/Editor/ContainerOperations.ts
+++ b/src/Components/Editor/ContainerOperations.ts
@@ -209,6 +209,7 @@ export function AddContainer(
   x = ApplyAddMethod(index, containerConfig, parentClone, x);
 
   const defaultProperties: IProperties = {
+    ...containerConfig.Style,
     id: `${type}-${count}`,
     parentId: parentClone.properties.id,
     x,
@@ -217,9 +218,9 @@ export function AddContainer(
     height,
     isRigidBody: false,
     isAnchor: false,
-    XPositionReference: containerConfig.XPositionReference,
-    ...containerConfig.Style
+    XPositionReference: containerConfig.XPositionReference
   };
+
   // Create the container
   const newContainer = new ContainerModel(
     parentClone,
diff --git a/src/Components/Properties/Properties.test.tsx b/src/Components/Properties/Properties.test.tsx
index 9fbef37..8b8db31 100644
--- a/src/Components/Properties/Properties.test.tsx
+++ b/src/Components/Properties/Properties.test.tsx
@@ -1,6 +1,7 @@
 import { fireEvent, render, screen } from '@testing-library/react';
 import * as React from 'react';
 import { expect, describe, it, vi } from 'vitest';
+import IProperties from '../../Interfaces/IProperties';
 import { Properties } from './Properties';
 
 describe.concurrent('Properties', () => {
@@ -18,11 +19,13 @@ describe.concurrent('Properties', () => {
   });
 
   it('Some properties, change values with dynamic input', () => {
-    const prop = {
+    const prop: IProperties = {
       id: 'stuff',
       parentId: 'parentId',
       x: 1,
       y: 1,
+      width: 1,
+      height: 1,
       isRigidBody: false,
       isAnchor: false
     };
diff --git a/src/utils/default.ts b/src/utils/default.ts
index 44f737f..b16e528 100644
--- a/src/utils/default.ts
+++ b/src/utils/default.ts
@@ -30,8 +30,8 @@ export const DEFAULT_MAINCONTAINER_PROPS: IProperties = {
   parentId: 'null',
   x: 0,
   y: 0,
-  width: DEFAULT_CONFIG.MainContainer.Width,
-  height: DEFAULT_CONFIG.MainContainer.Height,
+  width: Number(DEFAULT_CONFIG.MainContainer.Width),
+  height: Number(DEFAULT_CONFIG.MainContainer.Height),
   isRigidBody: false,
   isAnchor: false,
   fillOpacity: 0,