From b535e1fa8dcdce6f35f4d2c9f6a8c36e4323a947 Mon Sep 17 00:00:00 2001 From: Simon Paidla Date: Wed, 24 Sep 2025 08:49:11 +0200 Subject: [PATCH 1/2] TASK // Neos 9 compatibility --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index fee45e3..f4d4037 100644 --- a/composer.json +++ b/composer.json @@ -3,7 +3,7 @@ "type": "neos-plugin", "description": "Flex column layouts for neos nodetypes", "require": { - "neos/neos": "^5.0 || ^7.0 || ^8.0", + "neos/neos": "^5.0 || ^7.0 || ^8.0 || ^9.0", "neos/fusion-afx": "*", "neos/nodetypes-columnlayouts": "*", "shel/neos-colorpicker": "*" From 2692a1abee676a9f697939f74df68cde97f0e10c Mon Sep 17 00:00:00 2001 From: Simon Paidla Date: Mon, 29 Sep 2025 09:55:54 +0200 Subject: [PATCH 2/2] TASK // Neos 9 compatibility --- Resources/Private/Fusion/Content/MultiColumn.fusion | 8 ++++---- composer.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Resources/Private/Fusion/Content/MultiColumn.fusion b/Resources/Private/Fusion/Content/MultiColumn.fusion index bb11db0..d005cc6 100644 --- a/Resources/Private/Fusion/Content/MultiColumn.fusion +++ b/Resources/Private/Fusion/Content/MultiColumn.fusion @@ -51,15 +51,15 @@ prototype(TechDivision.NodeTypes.FlexColumnLayouts:MultiColumn) < prototype(Neos } containerStyles = TechDivision.NodeTypes.FlexColumnLayouts:Helper.VisualStyles - columns = Neos.Fusion:Collection { + columns = Neos.Fusion:Loop { @context.columnLayout = ${q(node).property('layout')} @context.parentNode = ${node} - collection = ${q(node).children('[instanceof TechDivision.NodeTypes.FlexColumnLayouts:FlexCollection]')} + items = ${q(node).children('[instanceof TechDivision.NodeTypes.FlexColumnLayouts:FlexCollection]')} itemName = 'node' iterationName = 'columnIteration' itemRenderer = Neos.Neos:ContentCollection { nodePath = '.' - attributes = Neos.Fusion:Attributes { + attributes = Neos.Fusion:DataStructure { class > class = TechDivision.NodeTypes.FlexColumnLayouts:Helper.CssClasses { flexItem = ${'flex-item'} @@ -91,7 +91,7 @@ prototype(TechDivision.NodeTypes.FlexColumnLayouts:MultiColumn) < prototype(Neos @cache { mode = 'cached' entryIdentifier { - node = ${node} + node = ${Neos.Caching.entryIdentifierForNode(node)} } entryTags { # Whenever the node changes the matched condition could change diff --git a/composer.json b/composer.json index f4d4037..5269431 100644 --- a/composer.json +++ b/composer.json @@ -3,7 +3,7 @@ "type": "neos-plugin", "description": "Flex column layouts for neos nodetypes", "require": { - "neos/neos": "^5.0 || ^7.0 || ^8.0 || ^9.0", + "neos/neos": "^9.0 || dev-master", "neos/fusion-afx": "*", "neos/nodetypes-columnlayouts": "*", "shel/neos-colorpicker": "*"