nicegui 2.4.0__tar.gz → 2.5.0__tar.gz

{nicegui-2.4.0 → nicegui-2.5.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: nicegui
-Version: 2.4.0
+Version: 2.5.0
 Summary: Create web-based user interfaces with Python. The nice way.
 Home-page: https://github.com/zauberzeug/nicegui
 License: MIT
@@ -160,9 +160,14 @@ because of their great performance and ease of use.
 Maintenance of this project is made possible by all the [contributors](https://github.com/zauberzeug/nicegui/graphs/contributors) and [sponsors](https://github.com/sponsors/zauberzeug).
 If you would like to support this project and have your avatar or company logo appear below, please [sponsor us](https://github.com/sponsors/zauberzeug). 💖
 
+<!-- SPONSORS -->
 <p align="center">
-   <a href="https://github.com/lechler-gmbh"><img src="https://github.com/lechler-gmbh.png" width="50px" alt="Lechler GmbH" /></a>
+  <a href="https://github.com/lechler-gmbh"><img src="https://github.com/lechler-gmbh.png" width="50px" alt="Lechler GmbH" /></a>
+  <a href="https://github.com/Zhifeng2019"><img src="https://github.com/Zhifeng2019.png" width="50px" alt="Zhifeng" /></a>
+  <a href="https://github.com/sereneturtlefox"><img src="https://github.com/sereneturtlefox.png" width="50px" alt="None" /></a>
+  <a href="https://github.com/daviborges666"><img src="https://github.com/daviborges666.png" width="50px" alt="Davi Borges" /></a>
 </p>
+<!-- SPONSORS -->
 
 Consider this low-barrier form of contribution yourself.
 Your [support](https://github.com/sponsors/zauberzeug) is much appreciated.

{nicegui-2.4.0 → nicegui-2.5.0}/README.md

@@ -109,9 +109,14 @@ because of their great performance and ease of use.
 Maintenance of this project is made possible by all the [contributors](https://github.com/zauberzeug/nicegui/graphs/contributors) and [sponsors](https://github.com/sponsors/zauberzeug).
 If you would like to support this project and have your avatar or company logo appear below, please [sponsor us](https://github.com/sponsors/zauberzeug). 💖
 
+<!-- SPONSORS -->
 <p align="center">
-   <a href="https://github.com/lechler-gmbh"><img src="https://github.com/lechler-gmbh.png" width="50px" alt="Lechler GmbH" /></a>
+  <a href="https://github.com/lechler-gmbh"><img src="https://github.com/lechler-gmbh.png" width="50px" alt="Lechler GmbH" /></a>
+  <a href="https://github.com/Zhifeng2019"><img src="https://github.com/Zhifeng2019.png" width="50px" alt="Zhifeng" /></a>
+  <a href="https://github.com/sereneturtlefox"><img src="https://github.com/sereneturtlefox.png" width="50px" alt="None" /></a>
+  <a href="https://github.com/daviborges666"><img src="https://github.com/daviborges666.png" width="50px" alt="Davi Borges" /></a>
 </p>
+<!-- SPONSORS -->
 
 Consider this low-barrier form of contribution yourself.
 Your [support](https://github.com/sponsors/zauberzeug) is much appreciated.

{nicegui-2.4.0 → nicegui-2.5.0}/nicegui/__init__.py

@@ -1,4 +1,4 @@
-from . import elements, run, ui
+from . import elements, html, run, ui
 from .api_router import APIRouter
 from .app.app import App
 from .client import Client
@@ -16,6 +16,7 @@ __all__ = [
     'context',
     'ElementFilter',
     'elements',
+    'html',
     'run',
     'Tailwind',
     'ui',

{nicegui-2.4.0 → nicegui-2.5.0}/nicegui/air.py

@@ -130,6 +130,8 @@ class Air:
                 return False
             client = Client.instances[client_id]
             client.environ = data['environ']
+            if data.get('old_tab_id'):
+                core.app.storage.copy_tab(data['old_tab_id'], data['tab_id'])
             client.tab_id = data['tab_id']
             client.on_air = True
             client.handle_handshake()

{nicegui-2.4.0 → nicegui-2.5.0}/nicegui/elements/image.py

@@ -5,6 +5,7 @@ from pathlib import Path
 from typing import Union
 
 from .. import optional_features
+from ..logging import log
 from .mixins.source_element import SourceElement
 
 try:
@@ -37,6 +38,9 @@ class Image(SourceElement, component='image.js'):
 
     def force_reload(self) -> None:
         """Force the image to reload from the source."""
+        if self._props['src'].startswith('data:'):
+            log.warning('ui.image: force_reload() only works with network sources (not base64)')
+            return
         self._props['t'] = time.time()
         self.update()
 

{nicegui-2.4.0 → nicegui-2.5.0}/nicegui/elements/interactive_image.py

@@ -8,6 +8,7 @@ from typing_extensions import Self
 
 from .. import optional_features
 from ..events import GenericEventArguments, Handler, MouseEventArguments, handle_event
+from ..logging import log
 from .image import pil_to_base64
 from .mixins.content_element import ContentElement
 from .mixins.source_element import SourceElement
@@ -95,5 +96,8 @@ class InteractiveImage(SourceElement, ContentElement, component='interactive_ima
 
     def force_reload(self) -> None:
         """Force the image to reload from the source."""
+        if self._props['src'].startswith('data:'):
+            log.warning('ui.interactive_image: force_reload() only works with network sources (not base64)')
+            return
         self._props['t'] = time.time()
         self.update()

{nicegui-2.4.0 → nicegui-2.5.0}/nicegui/elements/scene.js

@@ -452,6 +452,8 @@ export default {
           if (camera_up_changed) {
             this.controls.dispose();
             this.controls = new OrbitControls(this.camera, this.renderer.domElement);
+            this.controls.target.copy(this.look_at);
+            this.camera.lookAt(this.look_at);
           }
         })
         .start();

{nicegui-2.4.0 → nicegui-2.5.0}/nicegui/elements/tree.py

@@ -40,11 +40,13 @@ class Tree(FilterElement):
         self._props['node-key'] = node_key
         self._props['label-key'] = label_key
         self._props['children-key'] = children_key
-        self._props['selected'] = None
-        self._props['expanded'] = []
-        self._props['ticked'] = []
-        if tick_strategy is not None:
-            self._props['tick-strategy'] = tick_strategy
+        if on_select:
+            self._props['selected'] = None
+        if on_expand:
+            self._props['expanded'] = []
+        if on_tick or tick_strategy:
+            self._props['ticked'] = []
+            self._props['tick-strategy'] = tick_strategy or 'leaf'
         self._select_handlers = [on_select] if on_select else []
         self._expand_handlers = [on_expand] if on_expand else []
         self._tick_handlers = [on_tick] if on_tick else []
@@ -79,6 +81,7 @@ class Tree(FilterElement):
 
     def on_select(self, callback: Handler[ValueChangeEventArguments]) -> Self:
         """Add a callback to be invoked when the selection changes."""
+        self._props.setdefault('selected', None)
         self._select_handlers.append(callback)
         return self
 
@@ -87,6 +90,7 @@ class Tree(FilterElement):
 
         :param node_key: node key to select
         """
+        self._props.setdefault('selected', None)
         if self._props['selected'] != node_key:
             self._props['selected'] = node_key
             self.update()
@@ -98,11 +102,14 @@ class Tree(FilterElement):
 
     def on_expand(self, callback: Handler[ValueChangeEventArguments]) -> Self:
         """Add a callback to be invoked when the expansion changes."""
+        self._props.setdefault('expanded', [])
         self._expand_handlers.append(callback)
         return self
 
     def on_tick(self, callback: Handler[ValueChangeEventArguments]) -> Self:
         """Add a callback to be invoked when a node is ticked or unticked."""
+        self._props.setdefault('ticked', [])
+        self._props.setdefault('tick-strategy', 'leaf')
         self._tick_handlers.append(callback)
         return self
 
@@ -111,6 +118,7 @@ class Tree(FilterElement):
 
         :param node_keys: list of node keys to tick or ``None`` to tick all nodes (default: ``None``)
         """
+        self._props.setdefault('ticked', [])
         self._props['ticked'][:] = self._find_node_keys(node_keys).union(self._props['ticked'])
         self.update()
         return self
@@ -120,6 +128,7 @@ class Tree(FilterElement):
 
         :param node_keys: list of node keys to untick or ``None`` to untick all nodes (default: ``None``)
         """
+        self._props.setdefault('ticked', [])
         self._props['ticked'][:] = set(self._props['ticked']).difference(self._find_node_keys(node_keys))
         self.update()
         return self
@@ -129,6 +138,7 @@ class Tree(FilterElement):
 
         :param node_keys: list of node keys to expand (default: all nodes)
         """
+        self._props.setdefault('expanded', [])
         self._props['expanded'][:] = self._find_node_keys(node_keys).union(self._props['expanded'])
         self.update()
         return self
@@ -138,6 +148,7 @@ class Tree(FilterElement):
 
         :param node_keys: list of node keys to collapse (default: all nodes)
         """
+        self._props.setdefault('expanded', [])
         self._props['expanded'][:] = set(self._props['expanded']).difference(self._find_node_keys(node_keys))
         self.update()
         return self

nicegui-2.5.0/nicegui/html.py

@@ -0,0 +1,113 @@
+from typing import Optional
+
+from .element import Element
+
+
+def _create_html_element(tag: str):
+    class HTMLElement(Element):
+        def __init__(self, inner_html: Optional[str] = None, **kwargs) -> None:
+            super().__init__(tag)
+            self._text = inner_html
+            self.props.update(**kwargs)
+    return HTMLElement
+
+
+a = _create_html_element('a')
+abbr = _create_html_element('abbr')
+acronym = _create_html_element('acronym')
+address = _create_html_element('address')
+area = _create_html_element('area')
+article = _create_html_element('article')
+aside = _create_html_element('aside')
+audio = _create_html_element('audio')
+b = _create_html_element('b')
+basefont = _create_html_element('basefont')
+bdi = _create_html_element('bdi')
+bdo = _create_html_element('bdo')
+big = _create_html_element('big')
+blockquote = _create_html_element('blockquote')
+br = _create_html_element('br')
+button = _create_html_element('button')
+canvas = _create_html_element('canvas')
+caption = _create_html_element('caption')
+cite = _create_html_element('cite')
+code = _create_html_element('code')
+col = _create_html_element('col')
+colgroup = _create_html_element('colgroup')
+data = _create_html_element('data')
+datalist = _create_html_element('datalist')
+dd = _create_html_element('dd')
+del_ = _create_html_element('del')
+details = _create_html_element('details')
+dfn = _create_html_element('dfn')
+dialog = _create_html_element('dialog')
+div = _create_html_element('div')
+dl = _create_html_element('dl')
+dt = _create_html_element('dt')
+em = _create_html_element('em')
+embed = _create_html_element('embed')
+fieldset = _create_html_element('fieldset')
+figcaption = _create_html_element('figcaption')
+figure = _create_html_element('figure')
+footer = _create_html_element('footer')
+form = _create_html_element('form')
+h1 = _create_html_element('h1')
+hgroup = _create_html_element('hgroup')
+hr = _create_html_element('hr')
+i = _create_html_element('i')
+iframe = _create_html_element('iframe')
+img = _create_html_element('img')
+input_ = _create_html_element('input')
+ins = _create_html_element('ins')
+kbd = _create_html_element('kbd')
+label = _create_html_element('label')
+legend = _create_html_element('legend')
+li = _create_html_element('li')
+main = _create_html_element('main')
+map_ = _create_html_element('map')
+mark = _create_html_element('mark')
+menu = _create_html_element('menu')
+meter = _create_html_element('meter')
+nav = _create_html_element('nav')
+object_ = _create_html_element('object')
+ol = _create_html_element('ol')
+optgroup = _create_html_element('optgroup')
+option = _create_html_element('option')
+output = _create_html_element('output')
+p = _create_html_element('p')
+param = _create_html_element('param')
+picture = _create_html_element('picture')
+pre = _create_html_element('pre')
+progress = _create_html_element('progress')
+q = _create_html_element('q')
+rp = _create_html_element('rp')
+rt = _create_html_element('rt')
+ruby = _create_html_element('ruby')
+s = _create_html_element('s')
+samp = _create_html_element('samp')
+search = _create_html_element('search')
+section = _create_html_element('section')
+select = _create_html_element('select')
+small = _create_html_element('small')
+source = _create_html_element('source')
+span = _create_html_element('span')
+strong = _create_html_element('strong')
+sub = _create_html_element('sub')
+summary = _create_html_element('summary')
+sup = _create_html_element('sup')
+svg = _create_html_element('svg')
+table = _create_html_element('table')
+tbody = _create_html_element('tbody')
+td = _create_html_element('td')
+template = _create_html_element('template')
+textarea = _create_html_element('textarea')
+tfoot = _create_html_element('tfoot')
+th = _create_html_element('th')
+thead = _create_html_element('thead')
+time = _create_html_element('time')
+track = _create_html_element('track')
+u = _create_html_element('u')
+ul = _create_html_element('ul')
+var = _create_html_element('var')
+video = _create_html_element('video')
+wbr = _create_html_element('wbr')

{nicegui-2.4.0 → nicegui-2.5.0}/nicegui/nicegui.py

@@ -167,6 +167,8 @@ async def _on_handshake(sid: str, data: Dict[str, str]) -> bool:
     client = Client.instances.get(data['client_id'])
     if not client:
         return False
+    if data.get('old_tab_id'):
+        app.storage.copy_tab(data['old_tab_id'], data['tab_id'])
     client.tab_id = data['tab_id']
     if sid[:5].startswith('test-'):
         client.environ = {'asgi.scope': {'description': 'test client', 'type': 'test'}}

{nicegui-2.4.0 → nicegui-2.5.0}/nicegui/static/nicegui.js

@@ -294,6 +294,16 @@ function createRandomUUID() {
   }
 }
 
+const OLD_TAB_ID = sessionStorage.__nicegui_tab_closed === "false" ? sessionStorage.__nicegui_tab_id : null;
+const TAB_ID =
+  !sessionStorage.__nicegui_tab_id || sessionStorage.__nicegui_tab_closed === "false"
+    ? (sessionStorage.__nicegui_tab_id = createRandomUUID())
+    : sessionStorage.__nicegui_tab_id;
+sessionStorage.__nicegui_tab_closed = "false";
+window.onbeforeunload = function () {
+  sessionStorage.__nicegui_tab_closed = "true";
+};
+
 function createApp(elements, options) {
   replaceUndefinedAttributes(elements, 0);
   return (app = Vue.createApp({
@@ -319,12 +329,12 @@ function createApp(elements, options) {
       window.did_handshake = false;
       const messageHandlers = {
         connect: () => {
-          let tabId = sessionStorage.getItem("__nicegui_tab_id");
-          if (!tabId) {
-            tabId = createRandomUUID();
-            sessionStorage.setItem("__nicegui_tab_id", tabId);
-          }
-          window.socket.emit("handshake", { client_id: window.clientId, tab_id: tabId }, (ok) => {
+          const args = {
+            client_id: window.clientId,
+            tab_id: TAB_ID,
+            old_tab_id: OLD_TAB_ID,
+          };
+          window.socket.emit("handshake", args, (ok) => {
             if (!ok) {
               console.log("reloading because handshake failed for clientId " + window.clientId);
               window.location.reload();

{nicegui-2.4.0 → nicegui-2.5.0}/nicegui/storage.py

@@ -191,6 +191,11 @@ class Storage:
             self._tabs[client.tab_id] = observables.ObservableDict()
         return self._tabs[client.tab_id]
 
+    def copy_tab(self, old_tab_id: str, tab_id: str) -> None:
+        """Copy the tab storage to a new tab. (For internal use only.)"""
+        if old_tab_id in self._tabs:
+            self._tabs[tab_id] = observables.ObservableDict(self._tabs[old_tab_id].copy())
+
     async def prune_tab_storage(self) -> None:
         """Regularly prune tab storage that is older than the configured `max_tab_storage_age`."""
         while True:

{nicegui-2.4.0 → nicegui-2.5.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "nicegui"
-version = "v2.4.0"
+version = "v2.5.0"
 description = "Create web-based user interfaces with Python. The nice way."
 authors = ["Zauberzeug GmbH <info@zauberzeug.com>"]
 license = "MIT"
@@ -78,6 +78,7 @@ build-backend = "poetry.core.masonry.api"
 addopts = "--driver Chrome"
 asyncio_mode = "auto"
 testpaths = ["tests"]
+asyncio_default_fixture_loop_scope = "function"
 
 [tool.mypy]
 python_version = "3.8"