src/Components/Editor/Behaviors/AnchorBehaviors.ts

@@ -17,9 +17,8 @@ import { IContainerModel } from '../../../Interfaces/IContainerModel';
 import { constraintBodyInsideUnallocatedWidth } from './RigidBodyBehaviors';
 
 /**
- * Impose the container position to its siblings
+ * Impose the container position
  * Apply the following modification to the overlapping rigid body container :
- * @param container Container to impose its position
  */
 export function ImposePosition(container: IContainerModel): IContainerModel {
   if (container.parent === undefined ||
@@ -27,6 +26,7 @@ export function ImposePosition(container: IContainerModel): IContainerModel {
     return container;
   }
 
+  // Get the closest one
   const rigidBodies = container.parent.children.filter(
     child => child.properties.isRigidBody && !child.properties.isAnchor
   );
@@ -38,33 +38,27 @@ export function ImposePosition(container: IContainerModel): IContainerModel {
   return container;
 }
 
-/**
- * Returns the overlapping containers with container
- * @param container A container
- * @param containers A list of containers
- * @returns A list of overlapping containers
- */
 function getOverlappingContainers(
   container: IContainerModel,
-  containers: IContainerModel[]
+  siblings: IContainerModel[]
 ): IContainerModel[] {
   const min1 = container.properties.x;
   const max1 = container.properties.x + Number(container.properties.width);
   const overlappingContainers: IContainerModel[] = [];
-  for (const other of containers) {
+  for (const sibling of siblings) {
-    if (other === container) {
+    if (sibling === container) {
       continue;
     }
 
-    const min2 = other.properties.x;
+    const min2 = sibling.properties.x;
-    const max2 = other.properties.x + Number(other.properties.width);
+    const max2 = sibling.properties.x + Number(sibling.properties.width);
     const isOverlapping = Math.min(max1, max2) - Math.max(min1, min2) > 0;
 
     if (!isOverlapping) {
       continue;
     }
 
-    overlappingContainers.push(other);
+    overlappingContainers.push(sibling);
   }
   return overlappingContainers;
 }

src/Components/Editor/Behaviors/RigidBodyBehaviors.ts

@@ -240,49 +240,39 @@ function getAvailableWidths(
 
 /**
  * Returns the unallocated widths between two lines in 1D
- * @param unalloctedSpaceLeft left of the first line
+ * @param min1 left of the first line
- * @param unallocatedSpaceRight rigth of the first line
+ * @param max1 rigth of the first line
- * @param rectLeft left of the second line
+ * @param min2 left of the second line
- * @param rectRight right of the second line
+ * @param max2 right of the second line
  * @returns Available widths
  */
 function getAvailableWidthsTwoLines(
-  unalloctedSpaceLeft: number,
+  min1: number,
-  unallocatedSpaceRight: number,
+  max1: number,
-  rectLeft: number,
+  min2: number,
-  rectRight: number
+  max2: number
 ): ISizePointer[] {
-  if (unallocatedSpaceRight < rectLeft ||
+  if (min2 < min1 && max2 > max1) {
-    unalloctedSpaceLeft > rectRight
-  ) {
-    // object 1 and 2 are not overlapping
-    return [{
-      x: unalloctedSpaceLeft,
-      width: unallocatedSpaceRight - unalloctedSpaceLeft
-    }];
-  }
-
-  if (rectLeft < unalloctedSpaceLeft && rectRight > unallocatedSpaceRight) {
     // object 2 is overlapping full width
     return [];
   }
 
-  if (unalloctedSpaceLeft >= rectLeft) {
+  if (min1 >= min2) {
     // object 2 is partially overlapping on the left
     return [
       {
-        x: rectRight,
+        x: max2,
-        width: unallocatedSpaceRight - rectRight
+        width: max1 - max2
       }
     ];
   }
 
-  if (rectRight >= unallocatedSpaceRight) {
+  if (max2 >= max1) {
     // object 2 is partially overlapping on the right
     return [
       {
-        x: rectLeft,
+        x: min2,
-        width: rectRight - unalloctedSpaceLeft
+        width: max2 - min1
       }
     ];
   }
@@ -290,12 +280,12 @@ function getAvailableWidthsTwoLines(
   // object 2 is overlapping in the middle
   return [
     {
-      x: unalloctedSpaceLeft,
+      x: min1,
-      width: rectLeft - unalloctedSpaceLeft
+      width: min2 - min1
     },
     {
-      x: rectRight,
+      x: max2,
-      width: unallocatedSpaceRight - rectRight
+      width: max1 - max2
     }
   ];
 }