fix: issue with menu item position and parent switch

Author: erdnaxelaweb

components/MenuManagerBundle/src/bundle/Entity/Menu.php

@@ -181,9 +181,17 @@ public function __toString()
 
     public function assignPositions(): void
     {
-        $rootItems = $this->getItemsByParent();
+        /** @var MenuItem[] $childrens */
+        $childrens = $this->items->filter(function (MenuItem $item) {
+            return null === $item->getParent();
+        })->getValues();
+
+        usort($childrens, function (MenuItem $a, MenuItem $b) {
+            return $a->getPosition() <=> $b->getPosition();
+        });
+
         $position = 0;
-        foreach ($rootItems as $item) {
+        foreach ($childrens as $item) {
             $item->setPosition($position);
             $item->assignPositions();
             ++$position;

components/MenuManagerBundle/src/bundle/Entity/MenuItem.php

@@ -315,7 +315,13 @@ public function update(array $properties): void
 
     public function assignPositions(): void
     {
-        $childrens = $this->getChildrens();
+        /** @var MenuItem[] $childrens */
+        $childrens = $this->getChildrens()->getValues();
+
+        usort($childrens, function (MenuItem $a, MenuItem $b) {
+            return $a->getPosition() <=> $b->getPosition();
+        });
+
         $position = 0;
         foreach ($childrens as $child) {
             $child->setPosition($position);

components/MenuManagerBundle/src/lib/MenuItem/Type/DefaultMenuItemType.php

@@ -88,7 +88,7 @@ public function fromHash($hash): ?MenuItem
         $currentParent = $menuItem->getParent();
         if ($currentParent && (!isset($hash['parentId']) || null === $hash['parentId'])) {
             $currentParent->removeChildren($menuItem);
-        } elseif ($hash['parentId'] && (!$currentParent || $currentParent->getId() !== $hash['parentId'])) {
+        } elseif ($hash['parentId'] && (!$currentParent || $currentParent->getId() !== (int) $hash['parentId'])) {
             $parent = $menuItemRepo->find($hash['parentId']);
             if ($parent) {
                 $parent->addChildren($menuItem);