Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 27 additions & 5 deletions panel/layout/accordion.py
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ class Accordion(NamedListPanel):

def __init__(self, *objects, **params):
super().__init__(*objects, **params)
self._updating_active = False
self.param.watch(self._update_active, ['active'])
self.param.watch(self._update_cards, self._synced_properties)

Expand Down Expand Up @@ -82,6 +83,7 @@ def _get_objects(self, model, old_objects, doc, root, comm=None):
header_css_classes=['accordion-header'],
margin=self.margin
)
card.param.watch(self._set_active, ['collapsed'])
self._panels[id(pane)] = card
card.param.set_param(**params)
if ref in card._models:
Expand All @@ -94,7 +96,6 @@ def _get_objects(self, model, old_objects, doc, root, comm=None):
panel.js_on_change('collapsed', cb)
except RerenderError:
return self._get_objects(model, current_objects[:i], doc, root, comm)

new_models.append(panel)
self._update_cards()
self._update_active()
Expand All @@ -114,11 +115,32 @@ def _apply_style(self, i):
margin = (0, 5, 0, 5)
return dict(margin=margin, collapsed = i not in self.active)

def _set_active(self, *events):
if self._updating_active:
return
active = []
self._updating_active = True
try:
for i, pane in enumerate(self.objects):
if id(pane) not in self._panels:
continue
elif not self._panels[id(pane)].collapsed:
active.append(i)
self.active = active
finally:
self._updating_active = False

def _update_active(self, *events):
for i, pane in enumerate(self.objects):
if id(pane) not in self._panels:
continue
self._panels[id(pane)].collapsed = i not in self.active
if self._updating_active:
return
self._updating_active = True
try:
for i, pane in enumerate(self.objects):
if id(pane) not in self._panels:
continue
self._panels[id(pane)].collapsed = i not in self.active
finally:
self._updating_active = False

def _update_cards(self, *events):
params = {k: v for k, v in self.param.get_param_values()
Expand Down
2 changes: 2 additions & 0 deletions panel/layout/card.py
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,8 @@ class Card(Column):

_bokeh_model = BkCard

_linked_props = ['collapsed']

_rename = dict(Column._rename, title=None, header=None, title_css_classes=None)

def __init__(self, *objects, **params):
Expand Down
16 changes: 15 additions & 1 deletion panel/tests/layout/test_accordion.py
Original file line number Diff line number Diff line change
Expand Up @@ -121,5 +121,19 @@ def test_accordion_active(document, comm, accordion):
accordion.active = [0, 1]
assert not model.children[0].collapsed
assert not model.children[1].collapsed



def test_accordion_set_card_collapsed(document, comm, accordion):
accordion.get_root(document, comm=comm)

c1, c2 = accordion._panels.values()

c1.collapsed = False
assert accordion.active == [0]

c2.collapsed = False
assert accordion.active == [0, 1]

c1.collapsed = True
c2.collapsed = True
assert accordion.active == []