nova-trame 1.0.0rc2__py3-none-any.whl → 1.0.0rc4__py3-none-any.whl

nova/trame/view/components/visualization/matplotlib_figure.py

@@ -70,6 +70,13 @@ class _MPLApplication(tornado.web.Application):
                 data_uri = "data:image/png;base64," + blob.encode("base64").replace("\n", "")
                 self.write_message(data_uri)
 
+        def write_message(self, *args: Any, **kwargs: Any) -> Any:
+            # We need the websocket to remain alive if a message fails to write.
+            try:
+                super().write_message(*args, **kwargs)
+            except Exception:
+                pass
+
     def __init__(self, figure: Figure) -> None:
         self.figure = figure
         self.manager = new_figure_manager_given_figure(id(figure), figure)
@@ -218,9 +225,9 @@ class MatplotlibFigure(matplotlib.Figure):
         self._server = get_server(None, client_type="vue3")
         self._webagg = webagg
         if "classes" in kwargs:
-            kwargs["classes"] += " h-100 w-100 overflow-hidden"
+            kwargs["classes"] += " flex-1-1"
         else:
-            kwargs["classes"] = "h-100 w-100 overflow-hidden"
+            kwargs["classes"] = "flex-1-1"
         if webagg:
             self._initial_resize = True
             if "id" in kwargs:
@@ -247,17 +254,28 @@ class MatplotlibFigure(matplotlib.Figure):
 
         self._query_selector = f"window.document.querySelector('#{self._id}')"
         self._trigger = (
+            f"if ({self._query_selector} === null) {{ return; }}"
+            # webagg figures receive a fixed width and height. This blocks the flexbox scaling, so I temporarily hide
+            # the figure to allow the container to grow/shrink naturally in flexbox.
+            f"window.document.querySelectorAll('.nova-mpl').forEach((item) => {{ item.style.display = 'none'; }});"
+            f"const height = {self._query_selector}.parentNode.offsetHeight;"
+            f"const width = {self._query_selector}.parentNode.offsetWidth;"
+            # Revert the display value to allow the figure to render again.
+            f"window.document.querySelectorAll('.nova-mpl').forEach((item) => {{ item.style.display = ''; }});"
             "window.trame.trigger("
             f"  '{self._id}_resize',"
-            f"  [{self._query_selector}.offsetHeight, {self._query_selector}.offsetWidth, window.devicePixelRatio]"
+            f"  [height, width, window.devicePixelRatio]"
             ");"
         )
         self._resize_figure = client.JSEval(exec=self._trigger).exec
         self._resize_listener = client.JSEval(
             exec=(
-                "window.addEventListener('resize', function() {"
+                # ResizeObserver is necessary to detect changes in size unrelated to the viewport size such as when
+                # content is conditionally rendered that changes the size of the figure's container.
+                "const resizeObserver = new window.ResizeObserver(() => {"
                 f"  window.delay_manager.debounce('{self._id}', function() {{ {self._trigger} }}, 500);"
                 "});"
+                f"resizeObserver.observe({self._query_selector}.parentNode);"
             )
         ).exec
 
@@ -278,10 +296,18 @@ class MatplotlibFigure(matplotlib.Figure):
                         height = int(height * device_pixel_ratio)
                         width = int(width * device_pixel_ratio)
 
+                if height <= 0 or width <= 0:
+                    return
+
+                if self._webagg:
                     self._initial_resize = False
 
                 self._figure.set_dpi(dpi)
-                self._figure.set_size_inches(width / dpi, height / dpi)
+                new_width = width / dpi
+                new_height = height / dpi
+                current_size = self._figure.get_size_inches()
+                if current_size[0] != new_width or current_size[1] != new_height:
+                    self._figure.set_size_inches(new_width, new_height)
 
                 self.update(skip_resize=True)
 

nova/trame/view/layouts/grid.py

@@ -1,6 +1,7 @@
 """Trame implementation of the GridLayout class."""
 
 from typing import Any, Optional, Union
+from warnings import warn
 
 from trame.widgets import html
 from trame_client.widgets.core import AbstractElement
@@ -39,7 +40,8 @@ class GridLayout(html.Div):
             <https://developer.mozilla.org/en-US/docs/Web/CSS/justify-items>`__ for available options.
         valign : optional[str]
             The vertical alignment of items in the grid. See `MDN
-            <https://developer.mozilla.org/en-US/docs/Web/CSS/align-items>`__ for available options.
+            <https://developer.mozilla.org/en-US/docs/Web/CSS/align-items>`__ for available options. Note that this
+            parameter is ignored when stretch=True.
         gap : optional[str]
             The gap to place between items (works both horizontally and vertically). Can be any CSS gap value (e.g.
             "4px" or "0.25em"). Defaults to no gap between items.
@@ -74,7 +76,12 @@ class GridLayout(html.Div):
             classes = " ".join(classes)
         classes += " d-grid"
         if stretch:
+            if valign:
+                warn("Ignoring valign parameter to GridLayout since stretch=True.", stacklevel=1)
+            valign = "stretch"
             classes += " flex-1-1 overflow-y-auto"
+        else:
+            classes += " flex-0-1"
 
         widget_style = self.get_root_styles(columns, height, width, halign, valign, gap)
         user_style = kwargs.pop("style", {})

nova/trame/view/layouts/hbox.py

@@ -66,6 +66,8 @@ class HBoxLayout(html.Div):
         classes += " d-flex flex-row"
         if stretch:
             classes += " flex-1-1 overflow-y-auto"
+        else:
+            classes += " flex-0-1"
 
         widget_style = self.get_root_styles(height, width, halign, valign, gap, vspace)
         user_style = kwargs.pop("style", {})

nova/trame/view/layouts/vbox.py

@@ -66,6 +66,8 @@ class VBoxLayout(html.Div):
         classes += " d-flex flex-column"
         if stretch:
             classes += " flex-1-1 overflow-y-auto"
+        else:
+            classes += " flex-0-1"
 
         widget_style = self.get_root_styles(height, width, halign, valign, gap, vspace)
         user_style = kwargs.pop("style", {})

nova/trame/view/theme/theme.py

@@ -259,13 +259,13 @@ class ThemedApp:
 
                     with vuetify.VMain(classes="align-stretch d-flex flex-column h-screen"):
                         # [slot override example]
-                        layout.pre_content = vuetify.VSheet(classes="bg-background flex-0-1 my-1 ")
+                        layout.pre_content = vuetify.VSheet(classes="bg-background flex-0-1 mt-1 ")
                         # [slot override example complete]
                         with vuetify.VContainer(classes="flex-1-1 overflow-hidden pt-0 pb-2", fluid=True):
                             layout.content = vuetify.VCard(
-                                classes="d-flex flex-column flex-1-1 h-100 my-1 overflow-y-auto pa-1 "
+                                classes="d-flex flex-column flex-1-1 h-100 overflow-y-auto pa-1 "
                             )
-                        layout.post_content = vuetify.VSheet(classes="bg-background flex-0-1 my-1 ")
+                        layout.post_content = vuetify.VSheet(classes="bg-background flex-0-1 mb-1 ")
 
                     with vuetify.VFooter(
                         app=True,

{nova_trame-1.0.0rc2.dist-info → nova_trame-1.0.0rc4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nova-trame
-Version: 1.0.0rc2
+Version: 1.0.0rc4
 Summary: A Python Package for injecting curated themes and custom components into Trame applications
 License-Expression: MIT
 License-File: LICENSE

{nova_trame-1.0.0rc2.dist-info → nova_trame-1.0.0rc4.dist-info}/RECORD

@@ -18,12 +18,12 @@ nova/trame/view/components/remote_file_input.py,sha256=mcz_bmI2rD8gdmIOKLhlzfj-X
 nova/trame/view/components/tool_outputs.py,sha256=IbYV4VjrkWAE354Bh5KH76SPsxGLIkOXChijS4-ce_Y,2408
 nova/trame/view/components/visualization/__init__.py,sha256=reqkkbhD5uSksHHlhVMy1qNUCwSekS5HlXk6wCREYxU,152
 nova/trame/view/components/visualization/interactive_2d_plot.py,sha256=z2s1janxAclpMEdDJk3z-CQ6r3KPNoR_SXPx9ppWnuQ,3481
-nova/trame/view/components/visualization/matplotlib_figure.py,sha256=PhLZ95ofl78M2I5JMRdQeJZit9du-rW2H_km0jWF3Rg,14756
+nova/trame/view/components/visualization/matplotlib_figure.py,sha256=GYfX7hlEWQ4Dghk8Z1dmUQr6jgktWirhOYb0drtonM4,16297
 nova/trame/view/layouts/__init__.py,sha256=cMrlB5YMUoK8EGB83b34UU0kPTVrH8AxsYvKRtpUNEc,141
-nova/trame/view/layouts/grid.py,sha256=lQVLnpmOvT2y6-gUEgmdE1VvodLxlul6i5Hov202uOo,5816
-nova/trame/view/layouts/hbox.py,sha256=RJphvkcdvcke1y_R85BR_DI54zPVRQFiU-S1m7U56LI,3801
+nova/trame/view/layouts/grid.py,sha256=DU5u5JTE0ulzCaJsEWyTenBH9lOQD7mtoC6RZXxDTPE,6110
+nova/trame/view/layouts/hbox.py,sha256=w6ow7Qzmq4slODz_9f7kEigCVPE2PhUmPODedYH34f4,3850
 nova/trame/view/layouts/utils.py,sha256=Hg34VQWTG3yHBsgNvmfatR4J-uL3cko7UxSJpT-h3JI,376
-nova/trame/view/layouts/vbox.py,sha256=V7bzDjznUNruHd5RDlbbS8eLKxfJvS9iUHTRW8twSVM,3802
+nova/trame/view/layouts/vbox.py,sha256=Kkci79zDKF6qNH4HeDPYquJcixXx3BS63NVmS3FlOiw,3851
 nova/trame/view/theme/__init__.py,sha256=70_marDlTigIcPEOGiJb2JTs-8b2sGM5SlY7XBPtBDM,54
 nova/trame/view/theme/assets/core_style.scss,sha256=lZK8zghy4ExmNuFI-rfq7qt2S7bqObzM_MBviOlWP5c,4481
 nova/trame/view/theme/assets/favicon.png,sha256=Xbp1nUmhcBDeObjsebEbEAraPDZ_M163M_ZLtm5AbQc,1927
@@ -32,7 +32,7 @@ nova/trame/view/theme/assets/js/lodash.min.js,sha256=KCyAYJ-fsqtp_HMwbjhy6IKjlA5
 nova/trame/view/theme/assets/js/revo_grid.js,sha256=fbuEWO8etw-xgo9tjJGjJXdd5wL8qpgabPmrnU6Jp8k,4081
 nova/trame/view/theme/assets/vuetify_config.json,sha256=a0FSgpLYWGFlRGSMhMq61MyDFBEBwvz55G4qjkM08cs,5627
 nova/trame/view/theme/exit_button.py,sha256=Kqv1GVJZGrSsj6_JFjGU3vm3iNuMolLC2T1x2IsdmV0,3094
-nova/trame/view/theme/theme.py,sha256=gdmHWyYgLThv8_UHwstbSpBhHnlvIHdADIepxgqVy9Q,13274
+nova/trame/view/theme/theme.py,sha256=Jeoi-qrokSO-dDYpEvicbqfwzalhhbG-4HplD8NFj6s,13269
 nova/trame/view/utilities/local_storage.py,sha256=vD8f2VZIpxhIKjZwEaD7siiPCTZO4cw9AfhwdawwYLY,3218
 nova/trame/view_model/data_selector.py,sha256=jAtq5hpohQ6YiLBbgLJfNUzWZBpN2bjCG_c_FCJu2ns,3186
 nova/trame/view_model/execution_buttons.py,sha256=MfKSp95D92EqpD48C15cBo6dLO0Yld4FeRZMJNxJf7Y,3551
@@ -40,8 +40,8 @@ nova/trame/view_model/ornl/neutron_data_selector.py,sha256=PIKQyzcHpwu81DNk3d8Af
 nova/trame/view_model/progress_bar.py,sha256=6AUKHF3hfzbdsHqNEnmHRgDcBKY5TT8ywDx9S6ovnsc,2854
 nova/trame/view_model/remote_file_input.py,sha256=zWOflmCDJYYR_pacHphwzricV667GSRokh-mlxpBAOo,3646
 nova/trame/view_model/tool_outputs.py,sha256=ev6LY7fJ0H2xAJn9f5ww28c8Kpom2SYc2FbvFcoN4zg,829
-nova_trame-1.0.0rc2.dist-info/METADATA,sha256=4pMFtoku0PIb83aIpNWcb_OObxTfWoqW_CTF_BcSUz8,1798
-nova_trame-1.0.0rc2.dist-info/WHEEL,sha256=zp0Cn7JsFoX2ATtOhtaFYIiE2rmFAD4OcMhtUki8W3U,88
-nova_trame-1.0.0rc2.dist-info/entry_points.txt,sha256=J2AmeSwiTYZ4ZqHHp9HO6v4MaYQTTBPbNh6WtoqOT58,42
-nova_trame-1.0.0rc2.dist-info/licenses/LICENSE,sha256=Iu5QiDbwNbREg75iYaxIJ_V-zppuv4QFuBhAW-qiAlM,1061
-nova_trame-1.0.0rc2.dist-info/RECORD,,
+nova_trame-1.0.0rc4.dist-info/METADATA,sha256=ullsD538VJU9i_HleHEUd0U5NytxWHl7gKY8hk7XIYI,1798
+nova_trame-1.0.0rc4.dist-info/WHEEL,sha256=zp0Cn7JsFoX2ATtOhtaFYIiE2rmFAD4OcMhtUki8W3U,88
+nova_trame-1.0.0rc4.dist-info/entry_points.txt,sha256=J2AmeSwiTYZ4ZqHHp9HO6v4MaYQTTBPbNh6WtoqOT58,42
+nova_trame-1.0.0rc4.dist-info/licenses/LICENSE,sha256=Iu5QiDbwNbREg75iYaxIJ_V-zppuv4QFuBhAW-qiAlM,1061
+nova_trame-1.0.0rc4.dist-info/RECORD,,