From 977a9d632b020bfa962d8973f64d5878ffaa8f71 Mon Sep 17 00:00:00 2001 From: Brandon Hsiao Date: Mon, 12 Feb 2024 18:38:34 -0800 Subject: [PATCH 1/3] add fixes to rx.progress --- reflex/components/radix/primitives/progress.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/reflex/components/radix/primitives/progress.py b/reflex/components/radix/primitives/progress.py index 486ad2148..8d502577a 100644 --- a/reflex/components/radix/primitives/progress.py +++ b/reflex/components/radix/primitives/progress.py @@ -65,7 +65,7 @@ class ProgressIndicator(ProgressComponent): "&[data_state='loading']": { "transition": f"transform {DEFAULT_ANIMATION_DURATION}ms linear", }, - "transform": f"translateX(-{100 - self.value}%)", # type: ignore + "transform": f"translateX(calc(-100% + {self.value}%))", # type: ignore "boxShadow": "inset 0 0 0 1px var(--gray-a5)", } ) @@ -78,7 +78,7 @@ class Progress(SimpleNamespace): indicator = staticmethod(ProgressIndicator.create) @staticmethod - def __call__(**props) -> Component: + def __call__(width: Optional[str] = "100%", **props) -> Component: """High level API for progress bar. Args: @@ -88,7 +88,7 @@ class Progress(SimpleNamespace): The progress bar. """ return ProgressRoot.create( - ProgressIndicator.create(value=props.get("value")), + ProgressIndicator.create(width=width, value=props.get("value")), **props, ) From 481c9d9dbd816227fc75a702cfb1aac667d61bf3 Mon Sep 17 00:00:00 2001 From: Brandon Hsiao Date: Mon, 12 Feb 2024 18:57:52 -0800 Subject: [PATCH 2/3] fix, lint --- reflex/components/radix/primitives/progress.py | 7 ++++++- reflex/components/radix/primitives/progress.pyi | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/reflex/components/radix/primitives/progress.py b/reflex/components/radix/primitives/progress.py index 8d502577a..08c79bbed 100644 --- a/reflex/components/radix/primitives/progress.py +++ b/reflex/components/radix/primitives/progress.py @@ -82,13 +82,18 @@ class Progress(SimpleNamespace): """High level API for progress bar. Args: + width: The width of the progerss bar **props: The props of the progress bar Returns: The progress bar. """ + + style = props.setdefault("style", {}) + style.update({"width": width}) + return ProgressRoot.create( - ProgressIndicator.create(width=width, value=props.get("value")), + ProgressIndicator.create(value=props.get("value")), **props, ) diff --git a/reflex/components/radix/primitives/progress.pyi b/reflex/components/radix/primitives/progress.pyi index bc4a82b3c..61186c33b 100644 --- a/reflex/components/radix/primitives/progress.pyi +++ b/reflex/components/radix/primitives/progress.pyi @@ -275,6 +275,6 @@ class Progress(SimpleNamespace): indicator = staticmethod(ProgressIndicator.create) @staticmethod - def __call__(**props) -> Component: ... + def __call__(width: Optional[str] = "100%", **props) -> Component: ... progress = Progress() From de6835f4643bdd8ef7b1d528824335e9dbdda360 Mon Sep 17 00:00:00 2001 From: Brandon Hsiao Date: Mon, 12 Feb 2024 19:16:20 -0800 Subject: [PATCH 3/3] ruff --- reflex/components/radix/primitives/progress.py | 1 - 1 file changed, 1 deletion(-) diff --git a/reflex/components/radix/primitives/progress.py b/reflex/components/radix/primitives/progress.py index 08c79bbed..5854c9e54 100644 --- a/reflex/components/radix/primitives/progress.py +++ b/reflex/components/radix/primitives/progress.py @@ -88,7 +88,6 @@ class Progress(SimpleNamespace): Returns: The progress bar. """ - style = props.setdefault("style", {}) style.update({"width": width})