Skip to content

Commit bc6b8c4

Browse files
committed
Bugfix: cannot collapseAll/expandAll for target tree if have multiple tree on one page
1 parent e9c2db3 commit bc6b8c4

File tree

3 files changed

+20
-12
lines changed

3 files changed

+20
-12
lines changed

resources/dist/components/filament-tree-component.js

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

resources/js/components/filament-tree-component.js

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -85,22 +85,30 @@ export default function treeNestableComponent({
8585
* Collapse all the tree
8686
*/
8787
collapseAll: function () {
88-
jQueryNestable.buildNestable($('.dd'), 'collapseAll');
88+
const dd = this.$refs.treeContainer;
89+
if (!dd) {
90+
return;
91+
}
92+
jQueryNestable.buildNestable($(dd), 'collapseAll'); // jQueryNestable.buildNestable($('.dd'), 'collapseAll');
8993
// $('.dd').nestable('collapseAll');
90-
$('.dd').find('.dd-item-btns [data-action=expand]').removeClass('hidden');
91-
$('.dd').find('.dd-item-btns [data-action=collapse]').addClass('hidden');
92-
$('.dd > ol > li').find('li').addClass('hidden');
94+
$(dd).find('.dd-item-btns [data-action=expand]').removeClass('hidden'); // $('.dd').find('.dd-item-btns [data-action=expand]').removeClass('hidden');
95+
$(dd).find('.dd-item-btns [data-action=collapse]').addClass('hidden'); // $('.dd').find('.dd-item-btns [data-action=collapse]').addClass('hidden');
96+
$(dd).find('ol > li').find('li').addClass('hidden'); // $('.dd > ol > li').find('li').addClass('hidden');
9397
},
9498

9599
/**
96100
* Expand all the tree
97101
*/
98102
expandAll: function () {
99-
jQueryNestable.buildNestable($('.dd'), 'expandAll');
103+
const dd = this.$refs.treeContainer;
104+
if (!dd) {
105+
return;
106+
}
107+
jQueryNestable.buildNestable($(dd), 'expandAll'); // jQueryNestable.buildNestable($('.dd'), 'expandAll');
100108
// $('.dd').nestable('expandAll');
101-
$('.dd').find('.dd-item-btns [data-action=expand]').addClass('hidden');
102-
$('.dd').find('.dd-item-btns [data-action=collapse]').removeClass('hidden');
103-
$('.dd > ol > li').find('li').removeClass('hidden');
109+
$(dd).find('.dd-item-btns [data-action=expand]').addClass('hidden'); // $('.dd').find('.dd-item-btns [data-action=expand]').addClass('hidden');
110+
$(dd).find('.dd-item-btns [data-action=collapse]').removeClass('hidden'); // $('.dd').find('.dd-item-btns [data-action=collapse]').removeClass('hidden');
111+
$(dd).find('ol > li').find('li').removeClass('hidden'); // $('.dd > ol > li').find('li').removeClass('hidden');
104112
},
105113
}
106114
}

resources/views/components/tree/index.blade.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
</x-filament::button>
3434
</div>
3535
</menu>
36-
<div class="filament-tree dd" id="{{ $containerKey }}">
36+
<div class="filament-tree dd" id="{{ $containerKey }}" x-ref="treeContainer">
3737
<x-filament-tree::tree.list :records="$records" :containerKey="$containerKey" :tree="$tree"/>
3838
</div>
3939
</x-filament::section>

0 commit comments

Comments
 (0)