Merge pull request #64 from Declow/partial-ui-libs

Made it possible to fetch aggrid without prior instantiation.

uiwiz/app.py

@@ -217,9 +217,9 @@ async def decorated(*dec_args, **dec_kwargs) -> Response:
                 for key, value in response.headers.items():
                     standard_headers[key] = value
 
-                return self.return_funtion_response(
-                    HTMLResponse(content=Frame.get_stack().render(), headers=standard_headers)
-                )
+                content = "".join([Frame.get_stack().render(), Frame.get_stack().render_ext()])
+
+                return self.return_funtion_response(HTMLResponse(content=content, headers=standard_headers))
 
             self.__ensure_request_response_signature__(decorated)
 

uiwiz/element.py

@@ -228,12 +228,12 @@ def get_target(self, target: Union[Callable, str, "Element", None]) -> str:
         return target
 
     def render_libs(self, lst_libs: list[str]) -> str:
-        lst = set()
+        lst = []
         for lib in lst_libs:
             if lib.endswith("css"):
-                lst.add('<link href="%s" rel="stylesheet" type="text/css" />' % lib)
+                lst.insert(0, '<link href="%s" rel="stylesheet" type="text/css" />' % lib)
             elif lib.endswith("js"):
-                lst.add('<script src="%s"></script>' % lib)
+                lst.append('<script src="%s"></script>' % lib)
             else:
                 raise Exception("lib type not supported, supported types css, js")
         return "".join(lst)

uiwiz/elements/aggrid/aggrid.js

@@ -1,12 +1,6 @@
 
 htmx.defineExtension("hx-aggrid", {
     onEvent: function (name, evt) {
-        if (name === "htmx:afterProcessNode") {
-            console.log(evt);
-            const element = evt.detail.elt;
-            gridHandler(element, null, null);
-        }
-
         if (name === "htmx:afterSettle") {
             const response = JSON.parse(evt.detail.xhr.response);
             const cols = response["cols"];
@@ -52,4 +46,10 @@ function createOrGetCurrentGrid(element, cols, rows) {
         _uiWizardGrids[element.id] = gridApi;
     }
     return gridApi;
-}
+}
+
+elements = document.querySelectorAll("[hx-aggrid]");
+
+elements.forEach((element) => {
+    gridHandler(element, null, null);
+});

uiwiz/elements/aggrid/aggrid.py

@@ -15,7 +15,7 @@
 JS_PATH = Path(__file__).parent / "aggrid.js"
 
 
-class Aggrid(Element, extensions=[CSS_PATH, JS_PATH, LIB_PATH]):
+class Aggrid(Element, extensions=[CSS_PATH, LIB_PATH, JS_PATH]):
     class OPTIONS(str, Enum):
         autoSizeColumn = "autoSizeAll"
         fitColumnContent = "sizeToFit"

uiwiz/frame.py

@@ -3,7 +3,7 @@
 import asyncio
 import os
 from pathlib import Path
-from typing import TYPE_CHECKING, Optional, Union
+from typing import TYPE_CHECKING, List, Optional, Union
 from uuid import uuid4
 
 from uiwiz.asgi_request_middelware import get_request
@@ -28,7 +28,7 @@ def __init__(self) -> None:
         self.oob_elements: list[Element] = []
         self.id_count: int = 0  # used for element id
         self.scripts: list[str] = []
-        self.extensions: set[str] = set()
+        self.extensions: List[str] = []
         self.app = get_request().app
         self.last_id = None
         self.title: Optional[str] = None
@@ -85,7 +85,8 @@ def add_extension(self, cls, extensions: Optional[Union[list[Path], Path]]) -> N
             _, filename = os.path.split(extension)
             prefix = f"/_static/extension/{cls.__name__}/"
             endpoint = prefix + filename
-            self.extensions.add(endpoint)
+            if extension not in self.extensions:
+                self.extensions.append(endpoint)
 
     @classmethod
     def get_stack(cls) -> "Frame":