Skip to content

Commit 522d8a9

Browse files
Fix Repeater persistCollapsed (#18348)
* Fix Repeater persist collapsed * shouldPersistCollapsed function call * Added persistCollapsed on builder
1 parent 72e21e5 commit 522d8a9

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

‎packages/forms/resources/views/components/builder.blade.php‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
3333
$collapseAllActionIsVisible = $isCollapsible && $collapseAllAction->isVisible();
3434
$expandAllActionIsVisible = $isCollapsible && $expandAllAction->isVisible();
35+
$persistCollapsed = $shouldPersistCollapsed();
3536
3637
$key = $getKey();
3738
$statePath = $getStatePath();
@@ -122,7 +123,7 @@ class="fi-fo-builder-items"
122123
wire:ignore.self
123124
wire:key="{{ $item->getLivewireKey() }}.item"
124125
x-data="{
125-
isCollapsed: @js($isCollapsed($item)),
126+
isCollapsed: @if ($persistCollapsed) $persist(@js($isCollapsed($item))).as(`builder-${@js($key)}-${@js($itemKey)}-isCollapsed`) @else @js($isCollapsed($item)) @endif,
126127
}"
127128
x-on:builder-expand.window="$event.detail === '{{ $statePath }}' && (isCollapsed = false)"
128129
x-on:builder-collapse.window="$event.detail === '{{ $statePath }}' && (isCollapsed = true)"

‎packages/forms/resources/views/components/repeater/index.blade.php‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
3131
$collapseAllActionIsVisible = $isCollapsible && $collapseAllAction->isVisible();
3232
$expandAllActionIsVisible = $isCollapsible && $expandAllAction->isVisible();
33+
$persistCollapsed = $shouldPersistCollapsed();
3334
3435
$key = $getKey();
3536
$statePath = $getStatePath();
@@ -111,7 +112,7 @@
111112
wire:ignore.self
112113
wire:key="{{ $item->getLivewireKey() }}.item"
113114
x-data="{
114-
isCollapsed: @js($isCollapsed($item)),
115+
isCollapsed: @if ($persistCollapsed) $persist(@js($isCollapsed($item))).as(`repeater-${@js($key)}-${@js($itemKey)}-isCollapsed`) @else @js($isCollapsed($item)) @endif,
115116
}"
116117
x-on:repeater-expand.window="$event.detail === '{{ $statePath }}' && (isCollapsed = false)"
117118
x-on:repeater-collapse.window="$event.detail === '{{ $statePath }}' && (isCollapsed = true)"

0 commit comments

Comments
 (0)