BUGFIX: Copy/Paste across dimensions should not lead to error

Resolves: #4614
neos · Oct 21, 2024 · 4b6366d · 4b6366d
1 parent 0448005
commit 4b6366d
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/Classes/Domain/Model/Changes/CopyAfter.php b/Classes/Domain/Model/Changes/CopyAfter.php
@@ -70,7 +70,9 @@ public function apply(): void
                 ),
                 $subject->workspaceName,
                 $subject,
-                OriginDimensionSpacePoint::fromDimensionSpacePoint($subject->dimensionSpacePoint),
+                // NOTE: in order to be able to copy/paste across dimensions, we need to use
+                // the TARGET NODE's DimensionSpacePoint to create the node in the target dimension.
+                OriginDimensionSpacePoint::fromDimensionSpacePoint($previousSibling->dimensionSpacePoint),
                 $parentNodeOfPreviousSibling->aggregateId,
                 $succeedingSibling?->aggregateId
             );

diff --git a/Classes/Domain/Model/Changes/CopyBefore.php b/Classes/Domain/Model/Changes/CopyBefore.php
@@ -65,7 +65,9 @@ public function apply(): void
                 ),
                 $subject->workspaceName,
                 $subject,
-                OriginDimensionSpacePoint::fromDimensionSpacePoint($subject->dimensionSpacePoint),
+                // NOTE: in order to be able to copy/paste across dimensions, we need to use
+                // the TARGET NODE's DimensionSpacePoint to create the node in the target dimension.
+                OriginDimensionSpacePoint::fromDimensionSpacePoint($succeedingSibling->dimensionSpacePoint),
                 $parentNodeOfSucceedingSibling->aggregateId,
                 $succeedingSibling->aggregateId
             );

diff --git a/Classes/Domain/Model/Changes/CopyInto.php b/Classes/Domain/Model/Changes/CopyInto.php
@@ -74,7 +74,9 @@ public function apply(): void
                 ),
                 $subject->workspaceName,
                 $subject,
-                OriginDimensionSpacePoint::fromDimensionSpacePoint($subject->dimensionSpacePoint),
+                // NOTE: in order to be able to copy/paste across dimensions, we need to use
+                // the TARGET NODE's DimensionSpacePoint to create the node in the target dimension.
+                OriginDimensionSpacePoint::fromDimensionSpacePoint($parentNode->dimensionSpacePoint),
                 $parentNode->aggregateId,
                 null
             );