Add new Renderer class

.examples/shiny_express/app.py

@@ -0,0 +1,10 @@
+from maplibre import Map
+from maplibre.shiny import render_maplibre
+from shiny.express import ui
+
+ui.h1("Hello world!")
+
+
+@render_maplibre
+def mapylibre():
+    return Map()

docs/examples/every_person_in_manhattan/app.py

@@ -14,6 +14,9 @@
 )
 from maplibre.basemaps import Carto
 from maplibre.controls import ScaleControl
+
+# New since Shiny v0.7.0
+from maplibre.shiny import render_maplibre
 from maplibre.sources import GeoJSONSource
 from maplibre.utils import df_to_geojson
 from shiny import App, reactive, ui
@@ -69,7 +72,7 @@ def create_map() -> Map:
 
 
 def server(input, output, session):
-    @render_maplibregl
+    @render_maplibre
     def maplibre():
         return create_map()
 

maplibre/server.py

@@ -1,3 +1,5 @@
+### DEPRECATED: see 'shiny.py'
+
 from __future__ import annotations
 
 from shiny.render.transformer import (

maplibre/shiny.py

@@ -0,0 +1,14 @@
+from htmltools import Tag
+
+from shiny.render.renderer import Renderer
+
+from .map import Map
+from .ui import output_maplibregl
+
+
+class render_maplibre(Renderer[Map]):
+    def auto_output_ui(self) -> Tag:
+        return output_maplibregl(self.output_id, height=600)
+
+    async def transform(self, value: Map) -> dict:
+        return {"mapData": value.to_dict()}

maplibre/ui.py

@@ -1,6 +1,9 @@
+### TODO: move to 'shiny.py'
+
 from __future__ import annotations
 
-from htmltools import HTMLDependency
+from htmltools import HTMLDependency, Tag
+
 from shiny import ui
 from shiny.module import resolve_id
 
@@ -24,7 +27,7 @@
 )
 
 
-def output_maplibregl(id_: str, height: [int | str] = 200):
+def output_maplibregl(id_: str, height: [int | str] = 200) -> Tag:
     if isinstance(height, int):
         height = f"{height}px"
 

pyproject.toml

@@ -11,7 +11,7 @@ include = [
 
 [tool.poetry.dependencies]
 python = ">=3.9,<4"
-shiny = "^0.6.1"
+shiny = "0.7.0"
 htmltools = "^0.5.1"
 jinja2 = "^3.1.3"
 pydantic = "^2.5.3"