fh-pydantic-form 0.2.2__tar.gz → 0.2.3__tar.gz

{fh_pydantic_form-0.2.2 → fh_pydantic_form-0.2.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fh-pydantic-form
-Version: 0.2.2
+Version: 0.2.3
 Summary: a library to turn any pydantic BaseModel object into a fasthtml/monsterui input form
 Project-URL: Homepage, https://github.com/Marcura/fh-pydantic-form
 Project-URL: Repository, https://github.com/Marcura/fh-pydantic-form

{fh_pydantic_form-0.2.2 → fh_pydantic_form-0.2.3}/RELEASE_NOTES.md

@@ -1,5 +1,10 @@
 # Release Notes
 
+## Version 0.2.3 (2025-06-16 )
+
+- Removed the custom css injection for compact spacing. Instead applying to components directly. 
+
+
 ## Version 0.2.2 (2025-06-16 )
 
 - fix left alignment issue with inputs in the presence of outside css influences

{fh_pydantic_form-0.2.2 → fh_pydantic_form-0.2.3}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "fh-pydantic-form"
-version = "0.2.2"
+version = "0.2.3"
 description = "a library to turn any pydantic BaseModel object into a fasthtml/monsterui input form"
 readme = "README.md"
 requires-python = ">=3.10"

{fh_pydantic_form-0.2.2 → fh_pydantic_form-0.2.3}/src/fh_pydantic_form/__init__.py

@@ -24,7 +24,7 @@ from fh_pydantic_form.ui_style import (
     SpacingTheme,
     SpacingValue,
     spacing,
-    COMPACT_EXTRA_CSS,
+    spacing_many,
 )
 from fh_pydantic_form.defaults import (
     default_dict_for_model,
@@ -119,7 +119,7 @@ __all__ = [
     "SpacingTheme",
     "SpacingValue",
     "spacing",
-    "COMPACT_EXTRA_CSS",
+    "spacing_many",
     "default_dict_for_model",
     "default_for_annotation",
 ]

{fh_pydantic_form-0.2.2 → fh_pydantic_form-0.2.3}/src/fh_pydantic_form/field_renderers.py

@@ -27,6 +27,7 @@ from fh_pydantic_form.ui_style import (
     SpacingValue,
     _normalize_spacing,
     spacing,
+    spacing_many,
 )
 
 logger = logging.getLogger(__name__)
@@ -252,6 +253,14 @@ class StringFieldRenderer(BaseFieldRenderer):
         if self.is_optional:
             placeholder_text += " (Optional)"
 
+        input_cls_parts = ["w-full"]
+        input_spacing_cls = spacing_many(
+            ["input_size", "input_padding", "input_line_height", "input_font_size"],
+            self.spacing,
+        )
+        if input_spacing_cls:
+            input_cls_parts.append(input_spacing_cls)
+
         input_attrs = {
             "value": self.value or "",
             "id": self.field_name,
@@ -259,10 +268,7 @@ class StringFieldRenderer(BaseFieldRenderer):
             "type": "text",
             "placeholder": placeholder_text,
             "required": is_field_required,
-            "cls": _merge_cls(
-                "w-full",
-                f"{spacing('input_size', self.spacing)} {spacing('input_padding', self.spacing)}".strip(),
-            ),
+            "cls": " ".join(input_cls_parts),
         }
 
         # Only add the disabled attribute if the field should actually be disabled
@@ -290,6 +296,14 @@ class NumberFieldRenderer(BaseFieldRenderer):
         if self.is_optional:
             placeholder_text += " (Optional)"
 
+        input_cls_parts = ["w-full"]
+        input_spacing_cls = spacing_many(
+            ["input_size", "input_padding", "input_line_height", "input_font_size"],
+            self.spacing,
+        )
+        if input_spacing_cls:
+            input_cls_parts.append(input_spacing_cls)
+
         input_attrs = {
             "value": str(self.value) if self.value is not None else "",
             "id": self.field_name,
@@ -297,10 +311,7 @@ class NumberFieldRenderer(BaseFieldRenderer):
             "type": "number",
             "placeholder": placeholder_text,
             "required": is_field_required,
-            "cls": _merge_cls(
-                "w-full",
-                f"{spacing('input_size', self.spacing)} {spacing('input_padding', self.spacing)}".strip(),
-            ),
+            "cls": " ".join(input_cls_parts),
             "step": "any"
             if self.field_info.annotation is float
             or get_origin(self.field_info.annotation) is float
@@ -386,6 +397,14 @@ class DateFieldRenderer(BaseFieldRenderer):
         if self.is_optional:
             placeholder_text += " (Optional)"
 
+        input_cls_parts = ["w-full"]
+        input_spacing_cls = spacing_many(
+            ["input_size", "input_padding", "input_line_height", "input_font_size"],
+            self.spacing,
+        )
+        if input_spacing_cls:
+            input_cls_parts.append(input_spacing_cls)
+
         input_attrs = {
             "value": formatted_value,
             "id": self.field_name,
@@ -393,10 +412,7 @@ class DateFieldRenderer(BaseFieldRenderer):
             "type": "date",
             "placeholder": placeholder_text,
             "required": is_field_required,
-            "cls": _merge_cls(
-                "w-full",
-                f"{spacing('input_size', self.spacing)} {spacing('input_padding', self.spacing)}".strip(),
-            ),
+            "cls": " ".join(input_cls_parts),
         }
 
         # Only add the disabled attribute if the field should actually be disabled
@@ -433,6 +449,14 @@ class TimeFieldRenderer(BaseFieldRenderer):
         if self.is_optional:
             placeholder_text += " (Optional)"
 
+        input_cls_parts = ["w-full"]
+        input_spacing_cls = spacing_many(
+            ["input_size", "input_padding", "input_line_height", "input_font_size"],
+            self.spacing,
+        )
+        if input_spacing_cls:
+            input_cls_parts.append(input_spacing_cls)
+
         input_attrs = {
             "value": formatted_value,
             "id": self.field_name,
@@ -440,10 +464,7 @@ class TimeFieldRenderer(BaseFieldRenderer):
             "type": "time",
             "placeholder": placeholder_text,
             "required": is_field_required,
-            "cls": _merge_cls(
-                "w-full",
-                f"{spacing('input_size', self.spacing)} {spacing('input_padding', self.spacing)}".strip(),
-            ),
+            "cls": " ".join(input_cls_parts),
         }
 
         # Only add the disabled attribute if the field should actually be disabled
@@ -503,18 +524,22 @@ class LiteralFieldRenderer(BaseFieldRenderer):
             placeholder_text += " (Optional)"
 
         # Prepare attributes dictionary
+        select_cls_parts = ["w-full"]
+        select_spacing_cls = spacing_many(
+            ["input_size", "input_padding", "input_line_height", "input_font_size"],
+            self.spacing,
+        )
+        if select_spacing_cls:
+            select_cls_parts.append(select_spacing_cls)
+
         select_attrs = {
             "id": self.field_name,
             "name": self.field_name,
             "required": is_field_required,
             "placeholder": placeholder_text,
-            "cls": _merge_cls(
-                "w-full",
-                f"{spacing('input_size', self.spacing)} {spacing('input_padding', self.spacing)}".strip(),
-            ),
+            "cls": " ".join(select_cls_parts),
         }
 
-        # Only add the disabled attribute if the field should actually be disabled
         if self.disabled:
             select_attrs["disabled"] = True
 
@@ -667,12 +692,15 @@ class BaseModelFieldRenderer(BaseFieldRenderer):
         )
 
         # 5. Wrap the single AccordionItem in an Accordion container
+        accordion_cls = spacing_many(
+            ["accordion_divider", "accordion_content"], self.spacing
+        )
         accordion_container = mui.Accordion(
             accordion_item,  # The single item to include
             id=accordion_id,  # ID for the accordion container (ul)
             multiple=True,  # Allow multiple open (though only one exists)
             collapsible=True,  # Allow toggling
-            cls=f"{spacing('accordion_divider', self.spacing)} {spacing('accordion_content', self.spacing)} w-full".strip(),
+            cls=f"{accordion_cls} w-full".strip(),
         )
 
         return accordion_container
@@ -987,12 +1015,15 @@ class ListFieldRenderer(BaseFieldRenderer):
         container_id = self._container_id()
 
         # Use mui.Accordion component
+        accordion_cls = spacing_many(
+            ["inner_gap_small", "accordion_content", "accordion_divider"], self.spacing
+        )
         accordion = mui.Accordion(
             *item_elements,
             id=container_id,
             multiple=True,  # Allow multiple items to be open at once
             collapsible=True,  # Make it collapsible
-            cls=f"{spacing('inner_gap_small', self.spacing)} {spacing('accordion_content', self.spacing)}".strip(),  # Add space between items and accordion content styling
+            cls=accordion_cls.strip(),  # Add space between items and accordion content styling
         )
 
         # Empty state message if no items
@@ -1344,10 +1375,19 @@ class ListFieldRenderer(BaseFieldRenderer):
             )
             li_attrs = {"id": full_card_id}
 
-            # Build card classes conditionally based on spacing theme
-            card_cls = "uk-card uk-margin-small-bottom"
+            # Build card classes using spacing tokens
+            card_cls_parts = ["uk-card"]
             if self.spacing == SpacingTheme.NORMAL:
-                card_cls += " uk-card-default"
+                card_cls_parts.append("uk-card-default")
+
+            # Add spacing-based classes
+            card_spacing_cls = spacing_many(
+                ["accordion_item_margin", "card_border_thin"], self.spacing
+            )
+            if card_spacing_cls:
+                card_cls_parts.append(card_spacing_cls)
+
+            card_cls = " ".join(card_cls_parts)
 
             return mui.AccordionItem(
                 title_component,  # Title as first positional argument
@@ -1370,10 +1410,19 @@ class ListFieldRenderer(BaseFieldRenderer):
             t = self.spacing
             content_wrapper = fh.Div(content_component, cls=spacing("card_body_pad", t))
 
-            # Build card classes conditionally based on spacing theme
-            card_cls = "uk-card uk-margin-small-bottom"
+            # Build card classes using spacing tokens
+            card_cls_parts = ["uk-card"]
             if self.spacing == SpacingTheme.NORMAL:
-                card_cls += " uk-card-default"
+                card_cls_parts.append("uk-card-default")
+
+            # Add spacing-based classes
+            card_spacing_cls = spacing_many(
+                ["accordion_item_margin", "card_border_thin"], self.spacing
+            )
+            if card_spacing_cls:
+                card_cls_parts.append(card_spacing_cls)
+
+            card_cls = " ".join(card_cls_parts)
 
             return mui.AccordionItem(
                 title_component,  # Title as first positional argument

{fh_pydantic_form-0.2.2 → fh_pydantic_form-0.2.3}/src/fh_pydantic_form/form_renderer.py

@@ -32,7 +32,6 @@ from fh_pydantic_form.list_path import walk_path
 from fh_pydantic_form.registry import FieldRendererRegistry
 from fh_pydantic_form.type_helpers import _UNSET, get_default
 from fh_pydantic_form.ui_style import (
-    COMPACT_EXTRA_CSS,
     SpacingTheme,
     SpacingValue,
     _normalize_spacing,
@@ -213,19 +212,10 @@ class PydanticForm(Generic[ModelType]):
 
     def _compact_wrapper(self, inner: FT) -> FT:
         """
-        Wrap inner markup in a namespaced div.
-        Auto-inject the compact CSS the *first* time any compact form is rendered.
+        Wrap inner markup in a wrapper div.
         """
         wrapper_cls = "fhpf-wrapper w-full flex-1"
-
-        if self.spacing != SpacingTheme.COMPACT:
-            return fh.Div(inner, cls=wrapper_cls)
-
-        return fh.Div(
-            COMPACT_EXTRA_CSS,
-            fh.Div(inner, cls="fhpf-fields fhpf-compact"),
-            cls=wrapper_cls,
-        )
+        return fh.Div(inner, cls=wrapper_cls)
 
     def _clone_with_values(self, values: Dict[str, Any]) -> "PydanticForm":
         """

{fh_pydantic_form-0.2.2 → fh_pydantic_form-0.2.3}/src/fh_pydantic_form/ui_style.py

@@ -1,8 +1,6 @@
 from enum import Enum, auto
 from typing import Dict, Literal, Union
 
-import fasthtml.common as fh
-
 
 class SpacingTheme(Enum):
     NORMAL = auto()
@@ -44,13 +42,19 @@ SPACING_MAP: Dict[SpacingTheme, Dict[str, str]] = {
         "padding_sm": "p-3",
         "padding_card": "px-4 py-3",
         "card_border": "border",
+        "card_border_thin": "",
         "section_divider": "border-t border-gray-200",
         "accordion_divider": "uk-accordion-divider",
+        "accordion_title_pad": "",
+        "accordion_content_pad": "",
+        "accordion_item_margin": "uk-margin-small-bottom",
         "label_gap": "mb-1",
         "card_body_pad": "px-4 py-3",
         "accordion_content": "",
         "input_size": "",
         "input_padding": "",
+        "input_line_height": "",
+        "input_font_size": "",
         "horizontal_gap": "gap-3",
         "label_align": "items-start",
     },
@@ -64,13 +68,19 @@ SPACING_MAP: Dict[SpacingTheme, Dict[str, str]] = {
         "padding_sm": "p-0.5",
         "padding_card": "px-2 py-1",
         "card_border": "",
+        "card_border_thin": "",
         "section_divider": "",
         "accordion_divider": "",
+        "accordion_title_pad": "py-1",
+        "accordion_content_pad": "py-1",
+        "accordion_item_margin": "mb-0",
         "label_gap": "mb-0",
         "card_body_pad": "px-2 py-0.5",
         "accordion_content": "uk-padding-remove-vertical",
         "input_size": "uk-form-small",
-        "input_padding": "p-1",
+        "input_padding": "py-0.5 px-1",
+        "input_line_height": "leading-tight",
+        "input_font_size": "text-sm",
         "horizontal_gap": "gap-2",
         "label_align": "items-start",
     },
@@ -83,72 +93,21 @@ def spacing(token: str, spacing: SpacingValue) -> str:
     return SPACING_MAP[theme][token]
 
 
-# Optional minimal CSS for compact mode - affects only form inputs, not layout
-# Host applications can optionally inject this once at app level if desired
-COMPACT_EXTRA_CSS = fh.Style("""
-/* Compact polish – applies ONLY inside .fhpf-compact ------------------- */
-.fhpf-compact {
-  /* Force full width and left alignment */
-  width: 100% !important;
-  
-  /* Ensure all direct children are full width and left aligned */
-  & > * {
-    width: 100% !important;
-    justify-content: flex-start !important;
-    align-items: flex-start !important;
-  }
-  
-  /* Target the field containers specifically */
-  & > div > div {
-    width: 100% !important;
-    justify-content: flex-start !important;
-  }
-  
-  /* Ensure flex containers don't center */
-  .flex {
-    justify-content: flex-start !important;
-  }
-
-  /* Accordion chrome: remove border and default 20 px gap */
-  .uk-accordion > li,
-  .uk-accordion > li + li {          /* second & later items */
-        border-top: 0 !important;
-        margin-top: 0 !important;
-  }
-  .uk-accordion-title::after {       /* the hair-line we still see */
-        border-top: 0 !important;
-  }
-
-  /* Tighter title and content padding */
-  li > a.uk-accordion-title,
-  .uk-accordion-content {
-        padding-top: 0.25rem !important;
-        padding-bottom: 0.25rem !important;
-  }
-
-  /* Remove residual card outline */
-  .uk-card,
-  .uk-card-body { border: 0 !important; }
+def spacing_many(tokens: list[str], spacing: SpacingValue) -> str:
+    """
+    Return combined Tailwind utility classes for multiple semantic tokens.
 
-  /* Small-size inputs */
-  input, select, textarea {
-        line-height: 1.25rem !important;
-        font-size: 0.8125rem !important;
-        padding-top: 0.25rem !important;
-        padding-bottom: 0.25rem !important;
-  }
+    Args:
+        tokens: List of spacing token names
+        spacing: Spacing theme to use
 
-  /* Legacy uk-form-small support */
-  input.uk-form-small,
-  select.uk-form-small,
-  textarea.uk-textarea-small {
-        padding-top: 2px !important;
-        padding-bottom: 2px !important;
-  }
-
-  /* Kill generic uk-margin utilities inside the form */
-  .uk-margin-small-bottom,
-  .uk-margin,
-  .uk-margin-bottom { margin-bottom: 2px !important; }
-}
-""")
+    Returns:
+        String of space-separated CSS classes
+    """
+    theme = _normalize_spacing(spacing)
+    classes = []
+    for token in tokens:
+        class_value = SPACING_MAP[theme].get(token, "")
+        if class_value:  # Only add non-empty class values
+            classes.append(class_value)
+    return " ".join(classes)