fh-matui 0.9.10__py3-none-any.whl → 0.9.12__py3-none-any.whl

fh_matui/__init__.py

@@ -1 +1 @@
-__version__ = "0.9.9"
+__version__ = "0.9.11"

fh_matui/components.py

@@ -4,7 +4,7 @@
 
 # %% auto 0
 __all__ = ['BUTTON_SPECIALS', 'ButtonT', 'ANCHOR_SPECIALS', 'AT', 'NavToggleButton', 'SpaceT', 'GridSpanT', 'GridCell', 'Grid',
-           'DivLAligned', 'DivVStacked', 'DivHStacked', 'DivRAligned', 'DivCentered', 'DivFullySpaced', 'Icon',
+           'DivHStacked', 'DivLAligned', 'DivVStacked', 'DivRAligned', 'DivCentered', 'DivFullySpaced', 'Icon',
            'NavBar', 'Modal', 'ModalButton', 'ModalCancel', 'ModalConfirm', 'ModalTitle', 'ModalBody', 'ModalFooter',
            'Field', 'LabelInput', 'FormLabel', 'CheckboxX', 'Radio', 'Switch', 'TextArea', 'Range', 'Select',
            'FormGrid', 'Progress', 'LoadingIndicator', 'Table', 'Td', 'Th', 'Thead', 'Tbody', 'Tfoot', 'TableFromLists',
@@ -225,19 +225,8 @@ def Grid(*cells, space=SpaceT.medium_space,
     return Div(*wrapped_cells, cls=stringify(dedupe_preserve_order(grid_cls)), **kwargs)
 
 # %% ../nbs/02_components.ipynb 16
-def DivLAligned(*c, cls='', **kwargs):
-    """MonsterUI-compatible left-aligned row using BeerCSS tokens."""
-    cls_tokens = normalize_tokens(cls)
-    tokens = ['left-align']
-    tokens.extend(cls_tokens)
-    tokens = [t for t in tokens if t]
-    return DivHStacked(*c, cls=stringify(dedupe_preserve_order(tokens)), **kwargs)
-
-
-
-# %% ../nbs/02_components.ipynb 18
-def DivVStacked(*c, responsive=True, padding=True, cls='', **kwargs):
-    """Responsive vertical stack with padding and mobile compatibility."""
+def DivHStacked(*c, responsive=True, padding=True, cls='', **kwargs):
+    """Responsive horizontal stack with padding and mobile compatibility."""
     cls_tokens = normalize_tokens(cls)
     tokens = []
     if responsive and 'responsive' not in cls_tokens:
@@ -245,7 +234,7 @@ def DivVStacked(*c, responsive=True, padding=True, cls='', **kwargs):
     if padding and 'padding' not in cls_tokens and 'no-padding' not in cls_tokens:
         tokens.append('padding')
     if 'grid' not in cls_tokens:
-        tokens.extend(['row', 'vertical'])
+        tokens.extend(['row', 'middle-align'])
     if not _has_space_token(cls_tokens):
         tokens.append(SpaceT.medium_space)
     tokens.extend(cls_tokens)
@@ -253,9 +242,20 @@ def DivVStacked(*c, responsive=True, padding=True, cls='', **kwargs):
     return Div(*c, cls=stringify(dedupe_preserve_order(tokens)), **kwargs)
 
 
-# %% ../nbs/02_components.ipynb 20
-def DivHStacked(*c, responsive=True, padding=True, cls='', **kwargs):
-    """Responsive horizontal stack with padding and mobile compatibility."""
+# %% ../nbs/02_components.ipynb 17
+def DivLAligned(*c, cls='', **kwargs):
+    """MonsterUI-compatible left-aligned row using BeerCSS tokens."""
+    cls_tokens = normalize_tokens(cls)
+    tokens = ['left-align']
+    tokens.extend(cls_tokens)
+    tokens = [t for t in tokens if t]
+    return DivHStacked(*c, cls=stringify(dedupe_preserve_order(tokens)), **kwargs)
+
+
+
+# %% ../nbs/02_components.ipynb 19
+def DivVStacked(*c, responsive=True, padding=True, cls='', **kwargs):
+    """Responsive vertical stack with padding and mobile compatibility."""
     cls_tokens = normalize_tokens(cls)
     tokens = []
     if responsive and 'responsive' not in cls_tokens:
@@ -263,7 +263,7 @@ def DivHStacked(*c, responsive=True, padding=True, cls='', **kwargs):
     if padding and 'padding' not in cls_tokens and 'no-padding' not in cls_tokens:
         tokens.append('padding')
     if 'grid' not in cls_tokens:
-        tokens.extend(['row', 'middle-align'])
+        tokens.extend(['row', 'vertical'])
     if not _has_space_token(cls_tokens):
         tokens.append(SpaceT.medium_space)
     tokens.extend(cls_tokens)
@@ -332,7 +332,24 @@ def NavBar(*children, brand=None, sticky=False, cls='', **kwargs):
 
 # %% ../nbs/02_components.ipynb 35
 def Modal(*c, id=None, footer=None, active=False, overlay='default', position=None, cls=(), **kwargs):
-    """BeerCSS modal dialog with position and overlay options."""
+    """BeerCSS modal dialog with position and overlay options.
+    
+    Always returns a list for consistent unpacking with *Modal(...).
+    When overlay is enabled, clicking the overlay closes the modal.
+    
+    Args:
+        *c: Modal content (title, body, etc.)
+        id: Modal ID for data-ui targeting
+        footer: Footer content (auto-wrapped in Nav if not already)
+        active: Whether modal starts active/visible
+        overlay: Overlay style - 'default' (plain), 'blur', 'small-blur', 
+                 'medium-blur', 'large-blur', or False/None (no overlay)
+        position: Position - None (center), 'left', 'right', 'top', 'bottom'
+        cls: Additional CSS classes
+    
+    Returns:
+        List of elements (overlay + dialog, or just [dialog] if no overlay)
+    """
     modal_cls = normalize_tokens(cls)
     
     # Add position class if specified
@@ -354,7 +371,7 @@ def Modal(*c, id=None, footer=None, active=False, overlay='default', position=No
     # Create the dialog
     dialog = Dialog(*children, id=id, cls=cls_str, **kwargs)
     
-    # Handle overlay
+    # Handle overlay - always return a list for consistent *Modal(...) unpacking
     if overlay and overlay not in [False, None]:
         overlay_classes = ['overlay']
         
@@ -372,14 +389,14 @@ def Modal(*c, id=None, footer=None, active=False, overlay='default', position=No
         overlay_cls = ' '.join(overlay_classes)
         if active:
             overlay_cls += " active"
-            
-        # Return as a list - both elements need to be at same DOM level
-        return [
-            Div(cls=overlay_cls),
-            dialog
-        ]
-    
-    return dialog
+        
+        # Overlay with data-ui to close modal on click (click-outside-to-close)
+        overlay_el = Div(cls=overlay_cls, data_ui=f"#{id}" if id else None)
+        
+        return [overlay_el, dialog]
+    
+    # No overlay - still return as list for consistent unpacking
+    return [dialog]
 
 def ModalButton(text: str, id: str, icon: str = None, cls=(), **kwargs):
     """Button that opens a modal via data-ui attribute."""

fh_matui/datatable.py

@@ -280,31 +280,15 @@ def DataTable(
             cls=ButtonT.primary
         )
     
-    # Pagination controls
+    # Pagination controls (using reusable Pagination component)
     pagination = None
     if total_pages > 1:
-        prev_params = urlencode({"search": search, "page": max(1, page - 1), "page_size": page_size})
-        next_params = urlencode({"search": search, "page": min(total_pages, page + 1), "page_size": page_size})
-        
-        pagination = Div(
-            Button(
-                Icon("navigate_before"),
-                hx_get=f"{base_route}?{prev_params}",
-                hx_target=f"#{container_id}",
-                hx_push_url="true",
-                disabled=page == 1,
-                cls="circle"
-            ),
-            Span(f"Page {page} of {total_pages}", cls="middle"),
-            Button(
-                Icon("navigate_next"),
-                hx_get=f"{base_route}?{next_params}",
-                hx_target=f"#{container_id}",
-                hx_push_url="true",
-                disabled=page == total_pages,
-                cls="circle"
-            ),
-            cls="row center-align"
+        pagination_params = urlencode({"search": search, "page_size": page_size})
+        pagination = Pagination(
+            current_page=page,
+            total_pages=total_pages,
+            hx_get=f"{base_route}?{pagination_params}",
+            hx_target=f"#{container_id}"
         )
     
     # Search form

{fh_matui-0.9.10.dist-info → fh_matui-0.9.12.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fh-matui
-Version: 0.9.10
+Version: 0.9.12
 Summary: material-ui for fasthtml
 Home-page: https://github.com/abhisheksreesaila/fh-matui
 Author: abhishek sreesaila

fh_matui-0.9.12.dist-info/RECORD

@@ -0,0 +1,14 @@
+fh_matui/__init__.py,sha256=4-YPRncYVIx_LEaOTQQk2IcNM-ASQoM7kDmtXA8kaRQ,24
+fh_matui/_modidx.py,sha256=naHwPQ4kCo-5saE_uozmdPA881kp1gnqvKhmaG-Ya-4,23914
+fh_matui/app_pages.py,sha256=Sn9-tgBpaPNbR-0nZtPLoSCmAWLOGB4UQ88IkFvzBRY,10361
+fh_matui/components.py,sha256=5CBhmcStL88vyrbkThDBTRnj5rwCfvtvgZ0vbnljvVE,50418
+fh_matui/core.py,sha256=xtVBN8CtC50ZJ4Iu7o-mUhaA87tWdnz8gBfKRk63Zhs,10680
+fh_matui/datatable.py,sha256=LsVwuTuoFOh3rIvETXefsqZOqxos4xi9ct2F7YPIIv8,39266
+fh_matui/foundations.py,sha256=b7PnObJpKN8ZAU9NzCm9xpfnHzFjjAROU7E2YvA_tj4,1820
+fh_matui/web_pages.py,sha256=4mF-jpfVcZTVepfQ-aMGgIUp-nBp0YCkvcdsWhUYeaA,34879
+fh_matui-0.9.12.dist-info/licenses/LICENSE,sha256=xV8xoN4VOL0uw9X8RSs2IMuD_Ss_a9yAbtGNeBWZwnw,11337
+fh_matui-0.9.12.dist-info/METADATA,sha256=KbTK3cooiJMUGCYaVaFg1JbgEB7UvKHhpKvlo0AxE-s,10491
+fh_matui-0.9.12.dist-info/WHEEL,sha256=qELbo2s1Yzl39ZmrAibXA2jjPLUYfnVhUNTlyF1rq0Y,92
+fh_matui-0.9.12.dist-info/entry_points.txt,sha256=zn4CR4gNTiAAxbFsCxHAf2tQhtW29_YOffjbUTgeoWI,38
+fh_matui-0.9.12.dist-info/top_level.txt,sha256=l80d5eoA2ZjqtPYwAorLMS5PiHxUxz3zKzxMJ41Xoso,9
+fh_matui-0.9.12.dist-info/RECORD,,

fh_matui-0.9.10.dist-info/RECORD

@@ -1,14 +0,0 @@
-fh_matui/__init__.py,sha256=u_KIWOO-wJql3tmQezwk81ys0s3hKSCZ705RpLSz6vI,23
-fh_matui/_modidx.py,sha256=naHwPQ4kCo-5saE_uozmdPA881kp1gnqvKhmaG-Ya-4,23914
-fh_matui/app_pages.py,sha256=Sn9-tgBpaPNbR-0nZtPLoSCmAWLOGB4UQ88IkFvzBRY,10361
-fh_matui/components.py,sha256=Q-koxO-BCxG9Dse2QUpP5WrGSrbDyzBSLoqIGatUAg8,49503
-fh_matui/core.py,sha256=xtVBN8CtC50ZJ4Iu7o-mUhaA87tWdnz8gBfKRk63Zhs,10680
-fh_matui/datatable.py,sha256=vtkk7D8GrlDFCHilKxLi8SrncqxPW5n-ErrCJcI7OS4,39875
-fh_matui/foundations.py,sha256=b7PnObJpKN8ZAU9NzCm9xpfnHzFjjAROU7E2YvA_tj4,1820
-fh_matui/web_pages.py,sha256=4mF-jpfVcZTVepfQ-aMGgIUp-nBp0YCkvcdsWhUYeaA,34879
-fh_matui-0.9.10.dist-info/licenses/LICENSE,sha256=xV8xoN4VOL0uw9X8RSs2IMuD_Ss_a9yAbtGNeBWZwnw,11337
-fh_matui-0.9.10.dist-info/METADATA,sha256=Cpydwe7SXoRz7urHUG1fxM70zskIs9F_cvBGdoB76_c,10491
-fh_matui-0.9.10.dist-info/WHEEL,sha256=qELbo2s1Yzl39ZmrAibXA2jjPLUYfnVhUNTlyF1rq0Y,92
-fh_matui-0.9.10.dist-info/entry_points.txt,sha256=zn4CR4gNTiAAxbFsCxHAf2tQhtW29_YOffjbUTgeoWI,38
-fh_matui-0.9.10.dist-info/top_level.txt,sha256=l80d5eoA2ZjqtPYwAorLMS5PiHxUxz3zKzxMJ41Xoso,9
-fh_matui-0.9.10.dist-info/RECORD,,