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
6 changes: 4 additions & 2 deletions collagraph/renderers/pyside/objects/layouts.py
Original file line number Diff line number Diff line change
Expand Up @@ -65,8 +65,10 @@ def remove_form(self, el):
# associated widgets of the return layout item
layout_item = self.takeRow(el)
if layout_item:
layout_item.labelItem.widget().setParent(None)
layout_item.fieldItem.widget().setParent(None)
if layout_item.labelItem:
layout_item.labelItem.widget().setParent(None)
if layout_item.fieldItem:
layout_item.fieldItem.widget().setParent(None)
el.setParent(None)


Expand Down
52 changes: 51 additions & 1 deletion tests/pyside/test_widget.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import textwrap
from functools import partial

import pytest
from observ import reactive
Expand Down Expand Up @@ -40,7 +41,7 @@ def test_widget_as_window(qapp, qtbot):
Widget, _ = load_from_string(
textwrap.dedent(
"""
<widget />
<widget object-name="widget_as_window" />

<script>
import collagraph as cg
Expand All @@ -57,6 +58,7 @@ class Widget(cg.Component):
def check_widget_as_window():
windows = qapp.topLevelWidgets()
assert len(windows) == 1
assert windows[0].objectName() == "widget_as_window"

qtbot.waitUntil(check_widget_as_window, timeout=500)

Expand Down Expand Up @@ -112,3 +114,51 @@ def check_widget():
qtbot.waitUntil(
lambda: isinstance(widget.layout(), QtWidgets.QBoxLayout), timeout=500
)


def test_remove_from_form(qapp, qtbot):
Widget, _ = load_from_string(
textwrap.dedent(
"""
<widget :layout="{'type': 'form'}">
<label
v-if="show"
:form_index="0"
:form_label="''"
text="Hello"
object-name="label"
/>
</widget>

<script>
import collagraph as cg
class Widget(cg.Component):
pass
</script>
"""
)
)

state = reactive({"show": True})
renderer = cg.PySideRenderer(autoshow=False)
gui = cg.Collagraph(renderer=renderer)
gui.render(Widget, qapp, state=state)

window = None

def check_widget():
nonlocal window
windows = qapp.topLevelWidgets()
assert len(windows) == 1
window = windows[0]

qtbot.waitUntil(check_widget, timeout=500)

def label_visible(visible: bool):
assert bool(window.findChild(QtWidgets.QLabel, "label")) is visible

qtbot.waitUntil(partial(label_visible, visible=True), timeout=500)

state["show"] = False

qtbot.waitUntil(partial(label_visible, visible=False), timeout=500)