diff --git a/Resources/Private/Fusion/Component/Pagination.fusion b/Resources/Private/Fusion/Component/Pagination.fusion index f97c410..8e6a60d 100644 --- a/Resources/Private/Fusion/Component/Pagination.fusion +++ b/Resources/Private/Fusion/Component/Pagination.fusion @@ -6,7 +6,7 @@ prototype(Breadlesscode.Listable:Pagination) < prototype(Neos.Fusion:Component) paginationConfig = ${ [] } @process.wrapPaginationUl = ${ '' } - @process.wrapPaginationNav = ${ '' } + @process.wrapPaginationNav = ${ '' } @if.hasOnlyOnePage = ${ this.totalCount > this.itemsPerPage } renderer = Neos.Fusion:Collection { @@ -19,7 +19,7 @@ prototype(Breadlesscode.Listable:Pagination) < prototype(Neos.Fusion:Component) } itemRenderer = Breadlesscode.Listable:PaginationItem { page = ${ item.page } - isCurrent = ${ props.currentPage == item.page } + isCurrent = ${ String.toInteger(props.currentPage) == String.toInteger(item.page) } uri = Neos.Neos:NodeUri { node = ${ documentNode } additionalParams = Neos.Fusion:RawArray { diff --git a/Resources/Private/Fusion/Component/PaginationItem.fusion b/Resources/Private/Fusion/Component/PaginationItem.fusion index 23d34ce..7499af7 100644 --- a/Resources/Private/Fusion/Component/PaginationItem.fusion +++ b/Resources/Private/Fusion/Component/PaginationItem.fusion @@ -18,7 +18,7 @@ prototype(Breadlesscode.Listable:PaginationItem) < prototype(Neos.Fusion:Compone aria-label.@if.hasUri = ${ props.uri ? true : false } aria-current= ${ "true" } - aria-current.@if.isCurrent = ${ props.isCurrent } + aria-current.@if.isCurrent = ${ props.isCurrent ? true : false } } @process.itemWrap = Neos.Fusion:Tag {