flexablelib-components 3.5.0__tar.gz → 3.5.2__tar.gz

{flexablelib_components-3.5.0/flexablelib_components.egg-info → flexablelib_components-3.5.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: flexablelib-components
-Version: 3.5.0
+Version: 3.5.2
 Summary: Interactive terminal components for flexablelib: inputs, dates, tables, forms, menus, tabs, dialogs and more.
 Home-page: https://github.com/Opus-Perpetuus/flexablelib
 Author: Benjamin Ramirez
@@ -17,8 +17,8 @@ Classifier: Topic :: Software Development :: User Interfaces
 Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: flexablelib>=3.5.0
-Requires-Dist: flexablelib-tui>=3.5.0
+Requires-Dist: flexablelib>=3.5.2
+Requires-Dist: flexablelib-tui>=3.5.2
 Dynamic: author
 Dynamic: author-email
 Dynamic: classifier

{flexablelib_components-3.5.0 → flexablelib_components-3.5.2}/flexablelib_components/__init__.py

@@ -17,7 +17,7 @@ keys to the focused component) and also renders on its own with
 ``render(width)``. See docs/COMPONENTS.md.
 """
 
-__version__ = '3.5.0'
+__version__ = '3.5.2'
 
 from .base import Theme, DEFAULT_THEME, Input, Box, Button, frame
 from .inputs import (TextInput, PasswordInput, NumberInput, ExpressionInput,

{flexablelib_components-3.5.0 → flexablelib_components-3.5.2}/flexablelib_components/overlays.py

@@ -67,12 +67,23 @@ class Modal(_Themed):
 
     def open(self, app):
         app.push(self)
-        self.is_open = True
         return self
 
     def close(self):
-        if self.app is not None and self.is_open:
-            self.app.pop(self)
+        # Also when it was shown with app.push() rather than open(): what
+        # counts is being on the app's layers, not how it got there.
+        if self.app is not None and self in self.app.layers:
+            self.app.pop(self)  # calls _popped()
+        else:
+            self._popped()
+
+    def _pushed(self):
+        self.is_open = True
+
+    def _popped(self):
+        # The app took it off the screen (close(), Escape, a button, or a
+        # form's on_cancel calling app.pop()): keep is_open in step and run
+        # on_close once.
         self.is_open = False
         if self.on_close is not None:
             self.on_close()
@@ -226,7 +237,6 @@ class Popover(Modal):
 
     def open(self, app, position='center', modal=True):
         app.push(self, position=position, modal=modal)
-        self.is_open = True
         return self
 
 

{flexablelib_components-3.5.0 → flexablelib_components-3.5.2/flexablelib_components.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: flexablelib-components
-Version: 3.5.0
+Version: 3.5.2
 Summary: Interactive terminal components for flexablelib: inputs, dates, tables, forms, menus, tabs, dialogs and more.
 Home-page: https://github.com/Opus-Perpetuus/flexablelib
 Author: Benjamin Ramirez
@@ -17,8 +17,8 @@ Classifier: Topic :: Software Development :: User Interfaces
 Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: flexablelib>=3.5.0
-Requires-Dist: flexablelib-tui>=3.5.0
+Requires-Dist: flexablelib>=3.5.2
+Requires-Dist: flexablelib-tui>=3.5.2
 Dynamic: author
 Dynamic: author-email
 Dynamic: classifier

flexablelib_components-3.5.2/flexablelib_components.egg-info/requires.txt

@@ -0,0 +1,2 @@
+flexablelib>=3.5.2
+flexablelib-tui>=3.5.2

flexablelib_components-3.5.0/flexablelib_components.egg-info/requires.txt

@@ -1,2 +0,0 @@
-flexablelib>=3.5.0
-flexablelib-tui>=3.5.0