Skip to content

fix(switch): forward documented input attributes to the inner checkbox peer #38

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
elviskahoro wants to merge 1 commit into
base: main
Choose a base branch
from
+419 −40
Open

fix(switch): forward documented input attributes to the inner checkbox peer #38

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
53 changes: 33 additions & 20 deletions assets/docs/components/switch.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,14 +73,36 @@ class ClassNames:

INPUT = "peer sr-only"

KNOWN_INPUT_PROPS = (
"id",
"checked",
"default_checked",
"disabled",
"required",
"name",
"value",
"on_change",
"auto_focus",
"read_only",
"tab_index",
"access_key",
"form",
"form_action",
"form_enc_type",
"form_method",
"form_no_validate",
"form_target",
"custom_attrs",
)

TRACK = (
"relative rounded-full bg-muted "
"outline-none "
"group-data-[size=default]/switch:h-[18.4px] group-data-[size=default]/switch:w-[32px] "
"group-data-[size=sm]/switch:h-[14px] group-data-[size=sm]/switch:w-[24px] "
"group-has-[input:checked]/switch:bg-primary "
"peer-focus-visible:ring-3 peer-focus-visible:ring-ring/50 peer-focus-visible:outline-1 peer-focus-visible:outline-ring "
"group-aria-[invalid=true]/switch:border-destructive group-aria-[invalid=true]/switch:ring-3 group-aria-[invalid=true]/switch:ring-destructive/20 "
"peer-aria-[invalid=true]:border-destructive peer-aria-[invalid=true]:ring-3 peer-aria-[invalid=true]:ring-destructive/20 "
"group-has-[:disabled]/switch:opacity-50 group-has-[:disabled]/switch:pointer-events-none group-has-[:disabled]/switch:cursor-not-allowed"
)

Expand All @@ -100,33 +122,24 @@ class ClassNames:
class NativeSwitch(CoreComponent):
@classmethod
def create(cls, label_text: str = "", **props) -> rx.Component:
props["data-slot"] = "switch"

size = props.pop("size", "default")
props["data-size"] = size

invalid = props.pop("invalid", False)
if invalid:
props["aria-invalid"] = "true"

track_class_name = props.pop("track_class_name", "")
thumb_class_name = props.pop("thumb_class_name", "")

input_props = {}
for key in (
"id",
"checked",
"default_checked",
"disabled",
"required",
"name",
"value",
"on_change",
"custom_attrs",
):
if key in props:
for key in list(props.keys()):
if key in ClassNames.KNOWN_INPUT_PROPS or key.startswith(
("on_", "data-", "data_", "aria-", "aria_"),
):
input_props[key] = props.pop(key)

if invalid:
input_props["aria-invalid"] = "true"

props["data-slot"] = "switch"
props["data-size"] = size

cls.set_class_name(ClassNames.ROOT, props)

return rx.el.label(
Expand Down
53 changes: 33 additions & 20 deletions components/ui/switch.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,36 @@ class ClassNames:

INPUT = "peer sr-only"

KNOWN_INPUT_PROPS = (
"id",
"checked",
"default_checked",
"disabled",
"required",
"name",
"value",
"on_change",
"auto_focus",
"read_only",
"tab_index",
"access_key",
"form",
"form_action",
"form_enc_type",
"form_method",
"form_no_validate",
"form_target",
"custom_attrs",
)

TRACK = (
"relative rounded-full bg-muted "
"outline-none "
"group-data-[size=default]/switch:h-[18.4px] group-data-[size=default]/switch:w-[32px] "
"group-data-[size=sm]/switch:h-[14px] group-data-[size=sm]/switch:w-[24px] "
"group-has-[input:checked]/switch:bg-primary "
"peer-focus-visible:ring-3 peer-focus-visible:ring-ring/50 peer-focus-visible:outline-1 peer-focus-visible:outline-ring "
"group-aria-[invalid=true]/switch:border-destructive group-aria-[invalid=true]/switch:ring-3 group-aria-[invalid=true]/switch:ring-destructive/20 "
"peer-aria-[invalid=true]:border-destructive peer-aria-[invalid=true]:ring-3 peer-aria-[invalid=true]:ring-destructive/20 "
"group-has-[:disabled]/switch:opacity-50 group-has-[:disabled]/switch:pointer-events-none group-has-[:disabled]/switch:cursor-not-allowed"
)

Expand All @@ -36,33 +58,24 @@ class ClassNames:
class NativeSwitch(CoreComponent):
@classmethod
def create(cls, label_text: str = "", **props) -> rx.Component:
props["data-slot"] = "switch"

size = props.pop("size", "default")
props["data-size"] = size

invalid = props.pop("invalid", False)
if invalid:
props["aria-invalid"] = "true"

track_class_name = props.pop("track_class_name", "")
thumb_class_name = props.pop("thumb_class_name", "")

input_props = {}
for key in (
"id",
"checked",
"default_checked",
"disabled",
"required",
"name",
"value",
"on_change",
"custom_attrs",
):
if key in props:
for key in list(props.keys()):
if key in ClassNames.KNOWN_INPUT_PROPS or key.startswith(
("on_", "data-", "data_", "aria-", "aria_"),
):
input_props[key] = props.pop(key)

if invalid:
input_props["aria-invalid"] = "true"

props["data-slot"] = "switch"
props["data-size"] = size

cls.set_class_name(ClassNames.ROOT, props)

return rx.el.label(
Expand Down
Loading