diff --git a/altair/.gitignore b/altair/.gitignore index 41db59b..4638dd3 100644 --- a/altair/.gitignore +++ b/altair/.gitignore @@ -2,3 +2,10 @@ *.py[cod] __pycache__/ dist/ +.states +*.db +.idea +.idea/**/* +.web +/venv/ +assets/external/ diff --git a/altair/altair_demo/.gitignore b/altair/altair_demo/.gitignore deleted file mode 100644 index fc7aa1e..0000000 --- a/altair/altair_demo/.gitignore +++ /dev/null @@ -1,8 +0,0 @@ -*.db -*.py[cod] -.idea -.idea/**/* -.web -/venv/ -__pycache__/ -assets/external/ diff --git a/altair/altair_demo/altair_demo/altair/us_airport.py b/altair/altair_demo/altair_demo/altair/us_airport.py index 7d65019..66ab375 100644 --- a/altair/altair_demo/altair_demo/altair/us_airport.py +++ b/altair/altair_demo/altair_demo/altair/us_airport.py @@ -1,4 +1,4 @@ -SPEC = {'$schema': 'https://vega.github.io/schema/vega-lite/v5.json', +SPEC = {'$schema': 'https://vega.github.io/schema/vega-lite/v6.1.json', 'description': 'An interactive visualization of connections among major U.S. ' 'airports in 2008. Based on a U.S. airports example by Mike ' 'Bostock.', diff --git a/altair/altair_demo/altair_demo/altair_demo.py b/altair/altair_demo/altair_demo/altair_demo.py index 6170cb5..88cda78 100644 --- a/altair/altair_demo/altair_demo/altair_demo.py +++ b/altair/altair_demo/altair_demo/altair_demo.py @@ -36,10 +36,10 @@ def monaco_edit(self, value): def json_spec_2(self) -> str: return json.dumps(self.spec_airport, indent=2) - @rx.event(background=True) - async def test_log(self, value): + @rx.event + async def test_log(self, value: List[Any]) -> rx.Component: print(value) - return rx.toast(value) + return rx.toast(str(value)) def theme_dropdown() -> rx.Component: @@ -110,6 +110,5 @@ def index() -> rx.Component: ) - app = rx.App() app.add_page(index) diff --git a/altair/altair_demo/reflex_altair/component.py b/altair/altair_demo/reflex_altair/component.py index 12957ad..5f2bba1 100644 --- a/altair/altair_demo/reflex_altair/component.py +++ b/altair/altair_demo/reflex_altair/component.py @@ -9,7 +9,7 @@ SIGNAL_PROPS = {"onNewView" + e.title(): e for e in AltairSignal.__args__} -class AltairChart(rx.Component): +class AltairChart(rx.NoSSRComponent): library = "react-vega" tag = "Vega" alias = "Altair" diff --git a/altair/altair_demo/reflex_altair/type.py b/altair/altair_demo/reflex_altair/type.py index 0986986..f2c9fe5 100644 --- a/altair/altair_demo/reflex_altair/type.py +++ b/altair/altair_demo/reflex_altair/type.py @@ -1,4 +1,4 @@ -from typing import Union, Literal, Optional, Dict +from typing import Union, Literal, Mapping import altair as alt AltairChartType = Union[ @@ -61,8 +61,5 @@ 'none' ] -AltairAction = Union[ - bool, - Dict[Literal['export', 'source', 'compiled', 'editor'], bool], - Dict[Literal['export'], Dict[Literal['svg', 'png'], Optional[bool]]] -] +AltairAction = Mapping[str, Union[Mapping[str, bool], bool]] + diff --git a/altair/custom_components/reflex_altair/component.py b/altair/custom_components/reflex_altair/component.py index 12957ad..5f2bba1 100644 --- a/altair/custom_components/reflex_altair/component.py +++ b/altair/custom_components/reflex_altair/component.py @@ -9,7 +9,7 @@ SIGNAL_PROPS = {"onNewView" + e.title(): e for e in AltairSignal.__args__} -class AltairChart(rx.Component): +class AltairChart(rx.NoSSRComponent): library = "react-vega" tag = "Vega" alias = "Altair" diff --git a/altair/custom_components/reflex_altair/type.py b/altair/custom_components/reflex_altair/type.py index 0986986..f2c9fe5 100644 --- a/altair/custom_components/reflex_altair/type.py +++ b/altair/custom_components/reflex_altair/type.py @@ -1,4 +1,4 @@ -from typing import Union, Literal, Optional, Dict +from typing import Union, Literal, Mapping import altair as alt AltairChartType = Union[ @@ -61,8 +61,5 @@ 'none' ] -AltairAction = Union[ - bool, - Dict[Literal['export', 'source', 'compiled', 'editor'], bool], - Dict[Literal['export'], Dict[Literal['svg', 'png'], Optional[bool]]] -] +AltairAction = Mapping[str, Union[Mapping[str, bool], bool]] + diff --git a/altair/pyproject.toml b/altair/pyproject.toml index daede39..12ef227 100644 --- a/altair/pyproject.toml +++ b/altair/pyproject.toml @@ -18,7 +18,7 @@ build-backend = "setuptools.build_meta" name = "reflex-altair" -version = "0.1.1" +version = "0.1.2" description = "Reflex custom component to render altair/vega" @@ -32,11 +32,11 @@ license = { text = "Apache-2.0" } -requires-python = ">=3.9" +requires-python = ">=3.12" -authors = [{ name = "L�opold Grosjean", email = "leo.grosjean@gmail.com" }] +authors = [{ name = "Léopold Grosjean", email = "leo.grosjean@gmail.com" }] @@ -56,7 +56,7 @@ keywords = [ dependencies = [ - "reflex>=0.6.0" + "reflex>=0.7.9" ] @@ -88,4 +88,3 @@ dev = ["build", "twine"] [tool.setuptools.packages.find] where = ["custom_components"] -