From 93c97383d90450a7f0b5a20a16295a065a1f917c Mon Sep 17 00:00:00 2001 From: Nikhil Rao Date: Thu, 21 Dec 2023 09:52:08 -0800 Subject: [PATCH] Refactor chakra components into separate folder (#2315) --- .gitignore | 1 + reflex/__init__.py | 4 +- reflex/__init__.pyi | 4 +- reflex/app.py | 4 +- reflex/app.pyi | 2 +- reflex/components/__init__.py | 241 +----------------- reflex/components/base/__init__.py | 6 +- reflex/components/base/app_wrap.py | 2 +- reflex/components/base/app_wrap.pyi | 2 +- reflex/components/base/document.py | 8 - reflex/components/base/document.pyi | 80 ------ .../components/{layout => base}/fragment.py | 0 .../components/{layout => base}/fragment.pyi | 2 +- reflex/components/chakra/__init__.py | 220 ++++++++++++++-- .../{libs/chakra.py => chakra/base.py} | 0 .../{libs/chakra.pyi => chakra/base.pyi} | 2 +- .../components/chakra/datadisplay/__init__.py | 12 + .../{ => chakra}/datadisplay/badge.py | 2 +- .../{ => chakra}/datadisplay/badge.pyi | 4 +- .../{ => chakra}/datadisplay/code.py | 10 +- .../{ => chakra}/datadisplay/code.pyi | 10 +- .../{ => chakra}/datadisplay/divider.py | 6 +- .../{ => chakra}/datadisplay/divider.pyi | 8 +- .../{ => chakra}/datadisplay/keyboard_key.py | 2 +- .../{ => chakra}/datadisplay/keyboard_key.pyi | 4 +- .../{ => chakra}/datadisplay/list.py | 6 +- .../{ => chakra}/datadisplay/list.pyi | 8 +- .../{ => chakra}/datadisplay/stat.py | 2 +- .../{ => chakra}/datadisplay/stat.pyi | 4 +- .../{ => chakra}/datadisplay/table.py | 4 +- .../{ => chakra}/datadisplay/table.pyi | 6 +- .../{ => chakra}/datadisplay/tag.py | 4 +- .../{ => chakra}/datadisplay/tag.pyi | 6 +- .../{ => chakra}/disclosure/__init__.py | 0 .../{ => chakra}/disclosure/accordion.py | 2 +- .../{ => chakra}/disclosure/accordion.pyi | 4 +- .../{ => chakra}/disclosure/tabs.py | 4 +- .../{ => chakra}/disclosure/tabs.pyi | 6 +- .../{ => chakra}/disclosure/transition.py | 2 +- .../{ => chakra}/disclosure/transition.pyi | 4 +- .../{ => chakra}/disclosure/visuallyhidden.py | 2 +- .../disclosure/visuallyhidden.pyi | 4 +- .../{ => chakra}/feedback/__init__.py | 0 .../components/{ => chakra}/feedback/alert.py | 4 +- .../{ => chakra}/feedback/alert.pyi | 8 +- .../{ => chakra}/feedback/circularprogress.py | 2 +- .../feedback/circularprogress.pyi | 4 +- .../{ => chakra}/feedback/progress.py | 2 +- .../{ => chakra}/feedback/progress.pyi | 4 +- .../{ => chakra}/feedback/skeleton.py | 2 +- .../{ => chakra}/feedback/skeleton.pyi | 4 +- .../{ => chakra}/feedback/spinner.py | 2 +- .../{ => chakra}/feedback/spinner.pyi | 4 +- .../components/{ => chakra}/forms/__init__.py | 12 +- .../components/{ => chakra}/forms/button.py | 4 +- .../components/{ => chakra}/forms/button.pyi | 4 +- .../components/{ => chakra}/forms/checkbox.py | 2 +- .../{ => chakra}/forms/checkbox.pyi | 8 +- .../{ => chakra}/forms/colormodeswitch.py | 12 +- .../{ => chakra}/forms/colormodeswitch.pyi | 86 ++++++- .../{ => chakra}/forms/date_picker.py | 2 +- .../{ => chakra}/forms/date_picker.pyi | 4 +- .../{ => chakra}/forms/date_time_picker.py | 2 +- .../{ => chakra}/forms/date_time_picker.pyi | 4 +- .../components/{ => chakra}/forms/editable.py | 2 +- .../{ => chakra}/forms/editable.pyi | 4 +- reflex/components/{ => chakra}/forms/email.py | 2 +- .../components/{ => chakra}/forms/email.pyi | 4 +- reflex/components/{ => chakra}/forms/form.py | 2 +- reflex/components/{ => chakra}/forms/form.pyi | 4 +- .../{ => chakra}/forms/iconbutton.py | 2 +- .../{ => chakra}/forms/iconbutton.pyi | 4 +- reflex/components/{ => chakra}/forms/input.py | 6 +- .../components/{ => chakra}/forms/input.pyi | 8 +- .../{ => chakra}/forms/multiselect.py | 0 .../{ => chakra}/forms/numberinput.py | 4 +- .../{ => chakra}/forms/numberinput.pyi | 6 +- .../components/{ => chakra}/forms/password.py | 2 +- .../{ => chakra}/forms/password.pyi | 4 +- .../components/{ => chakra}/forms/pininput.py | 2 +- .../{ => chakra}/forms/pininput.pyi | 4 +- reflex/components/{ => chakra}/forms/radio.py | 6 +- .../components/{ => chakra}/forms/radio.pyi | 8 +- .../{ => chakra}/forms/rangeslider.py | 2 +- .../{ => chakra}/forms/rangeslider.pyi | 4 +- .../components/{ => chakra}/forms/select.py | 6 +- .../components/{ => chakra}/forms/select.pyi | 8 +- .../components/{ => chakra}/forms/slider.py | 7 +- .../components/{ => chakra}/forms/slider.pyi | 9 +- .../components/{ => chakra}/forms/switch.py | 2 +- .../components/{ => chakra}/forms/switch.pyi | 4 +- .../components/{ => chakra}/forms/textarea.py | 4 +- .../{ => chakra}/forms/textarea.pyi | 6 +- .../{ => chakra}/layout/__init__.py | 21 +- .../{ => chakra}/layout/aspect_ratio.py | 2 +- .../{ => chakra}/layout/aspect_ratio.pyi | 4 +- reflex/components/{ => chakra}/layout/box.py | 2 +- reflex/components/{ => chakra}/layout/box.pyi | 4 +- reflex/components/{ => chakra}/layout/card.py | 4 +- .../components/{ => chakra}/layout/card.pyi | 6 +- .../components/{ => chakra}/layout/center.py | 2 +- .../components/{ => chakra}/layout/center.pyi | 4 +- .../{ => chakra}/layout/container.py | 2 +- .../{ => chakra}/layout/container.pyi | 4 +- reflex/components/{ => chakra}/layout/flex.py | 2 +- .../components/{ => chakra}/layout/flex.pyi | 4 +- reflex/components/{ => chakra}/layout/grid.py | 2 +- .../components/{ => chakra}/layout/grid.pyi | 4 +- reflex/components/{ => chakra}/layout/html.py | 2 +- .../components/{ => chakra}/layout/html.pyi | 4 +- .../components/{ => chakra}/layout/spacer.py | 2 +- .../components/{ => chakra}/layout/spacer.pyi | 4 +- .../components/{ => chakra}/layout/stack.py | 2 +- .../components/{ => chakra}/layout/stack.pyi | 4 +- reflex/components/{ => chakra}/layout/wrap.py | 2 +- .../components/{ => chakra}/layout/wrap.pyi | 4 +- reflex/components/chakra/media/__init__.py | 7 + .../components/{ => chakra}/media/avatar.py | 2 +- .../components/{ => chakra}/media/avatar.pyi | 4 +- reflex/components/chakra/media/icon.py | 110 ++++++++ reflex/components/{ => chakra}/media/icon.pyi | 4 +- reflex/components/chakra/media/image.py | 2 +- reflex/components/chakra/media/image.pyi | 2 +- .../{ => chakra}/navigation/__init__.py | 1 - .../{ => chakra}/navigation/breadcrumb.py | 6 +- .../{ => chakra}/navigation/breadcrumb.pyi | 8 +- .../{ => chakra}/navigation/link.py | 4 +- .../{ => chakra}/navigation/link.pyi | 6 +- .../{ => chakra}/navigation/linkoverlay.py | 2 +- .../{ => chakra}/navigation/linkoverlay.pyi | 4 +- .../{ => chakra}/navigation/stepper.py | 2 +- .../{ => chakra}/navigation/stepper.pyi | 4 +- .../{ => chakra}/overlay/__init__.py | 1 - .../{ => chakra}/overlay/alertdialog.py | 4 +- .../{ => chakra}/overlay/alertdialog.pyi | 6 +- .../components/{ => chakra}/overlay/drawer.py | 6 +- .../{ => chakra}/overlay/drawer.pyi | 8 +- .../components/{ => chakra}/overlay/menu.py | 10 +- .../components/{ => chakra}/overlay/menu.pyi | 8 +- .../components/{ => chakra}/overlay/modal.py | 4 +- .../components/{ => chakra}/overlay/modal.pyi | 6 +- .../{ => chakra}/overlay/popover.py | 4 +- .../{ => chakra}/overlay/popover.pyi | 6 +- .../{ => chakra}/overlay/tooltip.py | 2 +- .../{ => chakra}/overlay/tooltip.pyi | 4 +- .../{ => chakra}/typography/__init__.py | 1 - .../{ => chakra}/typography/heading.py | 2 +- .../{ => chakra}/typography/heading.pyi | 4 +- .../{ => chakra}/typography/highlight.py | 2 +- .../{ => chakra}/typography/highlight.pyi | 4 +- .../{ => chakra}/typography/span.py | 2 +- .../{ => chakra}/typography/span.pyi | 4 +- .../{ => chakra}/typography/text.py | 2 +- .../{ => chakra}/typography/text.pyi | 4 +- reflex/components/component.py | 6 +- reflex/components/core/__init__.py | 20 ++ reflex/components/{overlay => core}/banner.py | 7 +- .../components/{overlay => core}/banner.pyi | 9 +- .../client_side_routing.py | 2 +- .../client_side_routing.pyi | 4 +- reflex/components/{layout => core}/cond.py | 2 +- reflex/components/{forms => core}/debounce.py | 2 +- .../components/{forms => core}/debounce.pyi | 4 +- reflex/components/{layout => core}/foreach.py | 2 +- .../components/{layout => core}/responsive.py | 2 +- reflex/components/{forms => core}/upload.py | 4 +- reflex/components/{forms => core}/upload.pyi | 6 +- reflex/components/datadisplay/__init__.py | 17 +- reflex/components/graphing/__init__.py | 5 - reflex/components/gridjs/__init__.py | 5 + .../{datadisplay => gridjs}/datatable.py | 0 .../{datadisplay => gridjs}/datatable.pyi | 2 +- reflex/components/libs/__init__.py | 31 --- reflex/components/markdown/__init__.py | 5 + .../{typography => markdown}/markdown.py | 16 +- .../{typography => markdown}/markdown.pyi | 14 +- reflex/components/media/__init__.py | 9 +- reflex/components/media/audio.py | 8 - reflex/components/media/icon.py | 112 +------- reflex/components/media/image.pyi | 123 --------- reflex/components/media/video.py | 8 - reflex/components/moment/__init__.py | 5 + .../{datadisplay => moment}/moment.py | 0 .../{datadisplay => moment}/moment.pyi | 2 +- reflex/components/next/__init__.py | 2 + .../{navigation/nextlink.py => next/link.py} | 0 .../nextlink.pyi => next/link.pyi} | 2 +- reflex/components/plotly/__init__.py | 5 + .../components/{graphing => plotly}/plotly.py | 0 .../{graphing => plotly}/plotly.pyi | 2 +- .../radix/themes/components/textarea.py | 2 +- .../radix/themes/components/textarea.pyi | 2 +- .../radix/themes/components/textfield.py | 2 +- .../radix/themes/components/textfield.pyi | 2 +- reflex/components/react_player/__init__.py | 7 + reflex/components/react_player/audio.py | 8 + .../{media => react_player}/audio.pyi | 6 +- .../{libs => react_player}/react_player.py | 2 +- .../{libs => react_player}/react_player.pyi | 6 +- reflex/components/react_player/video.py | 8 + .../{media => react_player}/video.pyi | 6 +- .../{graphing => }/recharts/__init__.py | 0 .../{graphing => }/recharts/cartesian.py | 0 .../{graphing => }/recharts/cartesian.pyi | 2 +- .../{graphing => }/recharts/charts.py | 2 +- .../{graphing => }/recharts/charts.pyi | 4 +- .../{graphing => }/recharts/general.py | 0 .../{graphing => }/recharts/general.pyi | 2 +- .../{graphing => }/recharts/polar.py | 0 .../{graphing => }/recharts/polar.pyi | 2 +- .../{graphing => }/recharts/recharts.py | 0 .../{graphing => }/recharts/recharts.pyi | 2 +- reflex/components/suneditor/__init__.py | 5 + .../components/{forms => suneditor}/editor.py | 0 .../{forms => suneditor}/editor.pyi | 2 +- reflex/components/tags/iter_tag.py | 6 +- reflex/event.py | 2 +- tests/components/datadisplay/test_code.py | 2 +- .../components/datadisplay/test_datatable.py | 4 +- tests/components/datadisplay/test_table.py | 2 +- tests/components/forms/test_form.py | 2 +- tests/components/layout/test_cond.py | 10 +- tests/components/layout/test_foreach.py | 2 +- tests/components/media/test_icon.py | 2 +- tests/components/test_component.py | 2 +- tests/components/typography/test_markdown.py | 2 +- 226 files changed, 874 insertions(+), 1036 deletions(-) rename reflex/components/{layout => base}/fragment.py (100%) rename reflex/components/{layout => base}/fragment.pyi (98%) rename reflex/components/{libs/chakra.py => chakra/base.py} (100%) rename reflex/components/{libs/chakra.pyi => chakra/base.pyi} (99%) create mode 100644 reflex/components/chakra/datadisplay/__init__.py rename reflex/components/{ => chakra}/datadisplay/badge.py (79%) rename reflex/components/{ => chakra}/datadisplay/badge.pyi (96%) rename reflex/components/{ => chakra}/datadisplay/code.py (98%) rename reflex/components/{ => chakra}/datadisplay/code.pyi (99%) rename reflex/components/{ => chakra}/datadisplay/divider.py (76%) rename reflex/components/{ => chakra}/datadisplay/divider.pyi (94%) rename reflex/components/{ => chakra}/datadisplay/keyboard_key.py (68%) rename reflex/components/{ => chakra}/datadisplay/keyboard_key.pyi (96%) rename reflex/components/{ => chakra}/datadisplay/list.py (89%) rename reflex/components/{ => chakra}/datadisplay/list.pyi (98%) rename reflex/components/{ => chakra}/datadisplay/stat.py (97%) rename reflex/components/{ => chakra}/datadisplay/stat.pyi (99%) rename reflex/components/{ => chakra}/datadisplay/table.py (98%) rename reflex/components/{ => chakra}/datadisplay/table.pyi (99%) rename reflex/components/{ => chakra}/datadisplay/tag.py (98%) rename reflex/components/{ => chakra}/datadisplay/tag.pyi (99%) rename reflex/components/{ => chakra}/disclosure/__init__.py (100%) rename reflex/components/{ => chakra}/disclosure/accordion.py (98%) rename reflex/components/{ => chakra}/disclosure/accordion.pyi (99%) rename reflex/components/{ => chakra}/disclosure/tabs.py (98%) rename reflex/components/{ => chakra}/disclosure/tabs.pyi (99%) rename reflex/components/{ => chakra}/disclosure/transition.py (96%) rename reflex/components/{ => chakra}/disclosure/transition.pyi (99%) rename reflex/components/{ => chakra}/disclosure/visuallyhidden.py (79%) rename reflex/components/{ => chakra}/disclosure/visuallyhidden.pyi (96%) rename reflex/components/{ => chakra}/feedback/__init__.py (100%) rename reflex/components/{ => chakra}/feedback/alert.py (97%) rename reflex/components/{ => chakra}/feedback/alert.pyi (98%) rename reflex/components/{ => chakra}/feedback/circularprogress.py (97%) rename reflex/components/{ => chakra}/feedback/circularprogress.pyi (98%) rename reflex/components/{ => chakra}/feedback/progress.py (93%) rename reflex/components/{ => chakra}/feedback/progress.pyi (97%) rename reflex/components/{ => chakra}/feedback/skeleton.py (96%) rename reflex/components/{ => chakra}/feedback/skeleton.pyi (98%) rename reflex/components/{ => chakra}/feedback/spinner.py (88%) rename reflex/components/{ => chakra}/feedback/spinner.pyi (96%) rename reflex/components/{ => chakra}/forms/__init__.py (84%) rename reflex/components/{ => chakra}/forms/button.py (98%) rename reflex/components/{ => chakra}/forms/button.pyi (99%) rename reflex/components/{ => chakra}/forms/checkbox.py (98%) rename reflex/components/{ => chakra}/forms/checkbox.pyi (98%) rename reflex/components/{ => chakra}/forms/colormodeswitch.py (91%) rename reflex/components/{ => chakra}/forms/colormodeswitch.pyi (83%) rename reflex/components/{ => chakra}/forms/date_picker.py (77%) rename reflex/components/{ => chakra}/forms/date_picker.pyi (97%) rename reflex/components/{ => chakra}/forms/date_time_picker.py (80%) rename reflex/components/{ => chakra}/forms/date_time_picker.pyi (97%) rename reflex/components/{ => chakra}/forms/editable.py (97%) rename reflex/components/{ => chakra}/forms/editable.pyi (99%) rename reflex/components/{ => chakra}/forms/email.py (77%) rename reflex/components/{ => chakra}/forms/email.pyi (98%) rename reflex/components/{ => chakra}/forms/form.py (99%) rename reflex/components/{ => chakra}/forms/form.pyi (99%) rename reflex/components/{ => chakra}/forms/iconbutton.py (93%) rename reflex/components/{ => chakra}/forms/iconbutton.pyi (97%) rename reflex/components/{ => chakra}/forms/input.py (97%) rename reflex/components/{ => chakra}/forms/input.pyi (99%) rename reflex/components/{ => chakra}/forms/multiselect.py (100%) rename reflex/components/{ => chakra}/forms/numberinput.py (98%) rename reflex/components/{ => chakra}/forms/numberinput.pyi (99%) rename reflex/components/{ => chakra}/forms/password.py (78%) rename reflex/components/{ => chakra}/forms/password.pyi (97%) rename reflex/components/{ => chakra}/forms/pininput.py (98%) rename reflex/components/{ => chakra}/forms/pininput.pyi (98%) rename reflex/components/{ => chakra}/forms/radio.py (94%) rename reflex/components/{ => chakra}/forms/radio.pyi (97%) rename reflex/components/{ => chakra}/forms/rangeslider.py (98%) rename reflex/components/{ => chakra}/forms/rangeslider.pyi (98%) rename reflex/components/{ => chakra}/forms/select.py (94%) rename reflex/components/{ => chakra}/forms/select.pyi (97%) rename reflex/components/{ => chakra}/forms/slider.py (94%) rename reflex/components/{ => chakra}/forms/slider.pyi (98%) rename reflex/components/{ => chakra}/forms/switch.py (95%) rename reflex/components/{ => chakra}/forms/switch.pyi (97%) rename reflex/components/{ => chakra}/forms/textarea.py (94%) rename reflex/components/{ => chakra}/forms/textarea.pyi (96%) rename reflex/components/{ => chakra}/layout/__init__.py (51%) rename reflex/components/{ => chakra}/layout/aspect_ratio.py (81%) rename reflex/components/{ => chakra}/layout/aspect_ratio.pyi (96%) rename reflex/components/{ => chakra}/layout/box.py (92%) rename reflex/components/{ => chakra}/layout/box.pyi (96%) rename reflex/components/{ => chakra}/layout/card.py (98%) rename reflex/components/{ => chakra}/layout/card.pyi (99%) rename reflex/components/{ => chakra}/layout/center.py (85%) rename reflex/components/{ => chakra}/layout/center.pyi (98%) rename reflex/components/{ => chakra}/layout/container.py (83%) rename reflex/components/{ => chakra}/layout/container.pyi (96%) rename reflex/components/{ => chakra}/layout/flex.py (91%) rename reflex/components/{ => chakra}/layout/flex.pyi (97%) rename reflex/components/{ => chakra}/layout/grid.py (98%) rename reflex/components/{ => chakra}/layout/grid.pyi (99%) rename reflex/components/{ => chakra}/layout/html.py (94%) rename reflex/components/{ => chakra}/layout/html.pyi (97%) rename reflex/components/{ => chakra}/layout/spacer.py (68%) rename reflex/components/{ => chakra}/layout/spacer.pyi (96%) rename reflex/components/{ => chakra}/layout/stack.py (92%) rename reflex/components/{ => chakra}/layout/stack.pyi (98%) rename reflex/components/{ => chakra}/layout/wrap.py (96%) rename reflex/components/{ => chakra}/layout/wrap.pyi (98%) create mode 100644 reflex/components/chakra/media/__init__.py rename reflex/components/{ => chakra}/media/avatar.py (95%) rename reflex/components/{ => chakra}/media/avatar.pyi (98%) create mode 100644 reflex/components/chakra/media/icon.py rename reflex/components/{ => chakra}/media/icon.pyi (98%) rename reflex/components/{ => chakra}/navigation/__init__.py (93%) rename reflex/components/{ => chakra}/navigation/breadcrumb.py (94%) rename reflex/components/{ => chakra}/navigation/breadcrumb.pyi (98%) rename reflex/components/{ => chakra}/navigation/link.py (92%) rename reflex/components/{ => chakra}/navigation/link.pyi (95%) rename reflex/components/{ => chakra}/navigation/linkoverlay.py (88%) rename reflex/components/{ => chakra}/navigation/linkoverlay.pyi (98%) rename reflex/components/{ => chakra}/navigation/stepper.py (97%) rename reflex/components/{ => chakra}/navigation/stepper.pyi (99%) rename reflex/components/{ => chakra}/overlay/__init__.py (94%) rename reflex/components/{ => chakra}/overlay/alertdialog.py (97%) rename reflex/components/{ => chakra}/overlay/alertdialog.pyi (99%) rename reflex/components/{ => chakra}/overlay/drawer.py (98%) rename reflex/components/{ => chakra}/overlay/drawer.pyi (99%) rename reflex/components/{ => chakra}/overlay/menu.py (97%) rename reflex/components/{ => chakra}/overlay/menu.pyi (99%) rename reflex/components/{ => chakra}/overlay/modal.py (98%) rename reflex/components/{ => chakra}/overlay/modal.pyi (99%) rename reflex/components/{ => chakra}/overlay/popover.py (99%) rename reflex/components/{ => chakra}/overlay/popover.pyi (99%) rename reflex/components/{ => chakra}/overlay/tooltip.py (96%) rename reflex/components/{ => chakra}/overlay/tooltip.pyi (97%) rename reflex/components/{ => chakra}/typography/__init__.py (89%) rename reflex/components/{ => chakra}/typography/heading.py (79%) rename reflex/components/{ => chakra}/typography/heading.pyi (96%) rename reflex/components/{ => chakra}/typography/highlight.py (91%) rename reflex/components/{ => chakra}/typography/highlight.pyi (96%) rename reflex/components/{ => chakra}/typography/span.py (82%) rename reflex/components/{ => chakra}/typography/span.pyi (96%) rename reflex/components/{ => chakra}/typography/text.py (87%) rename reflex/components/{ => chakra}/typography/text.pyi (96%) create mode 100644 reflex/components/core/__init__.py rename reflex/components/{overlay => core}/banner.py (93%) rename reflex/components/{overlay => core}/banner.pyi (96%) rename reflex/components/{navigation => core}/client_side_routing.py (97%) rename reflex/components/{navigation => core}/client_side_routing.pyi (98%) rename reflex/components/{layout => core}/cond.py (98%) rename reflex/components/{forms => core}/debounce.py (98%) rename reflex/components/{forms => core}/debounce.pyi (97%) rename reflex/components/{layout => core}/foreach.py (98%) rename reflex/components/{layout => core}/responsive.py (97%) rename reflex/components/{forms => core}/upload.py (98%) rename reflex/components/{forms => core}/upload.pyi (98%) delete mode 100644 reflex/components/graphing/__init__.py create mode 100644 reflex/components/gridjs/__init__.py rename reflex/components/{datadisplay => gridjs}/datatable.py (100%) rename reflex/components/{datadisplay => gridjs}/datatable.pyi (99%) delete mode 100644 reflex/components/libs/__init__.py create mode 100644 reflex/components/markdown/__init__.py rename reflex/components/{typography => markdown}/markdown.py (95%) rename reflex/components/{typography => markdown}/markdown.pyi (93%) delete mode 100644 reflex/components/media/audio.py delete mode 100644 reflex/components/media/image.pyi delete mode 100644 reflex/components/media/video.py create mode 100644 reflex/components/moment/__init__.py rename reflex/components/{datadisplay => moment}/moment.py (100%) rename reflex/components/{datadisplay => moment}/moment.pyi (99%) rename reflex/components/{navigation/nextlink.py => next/link.py} (100%) rename reflex/components/{navigation/nextlink.pyi => next/link.pyi} (98%) create mode 100644 reflex/components/plotly/__init__.py rename reflex/components/{graphing => plotly}/plotly.py (100%) rename reflex/components/{graphing => plotly}/plotly.pyi (99%) create mode 100644 reflex/components/react_player/__init__.py create mode 100644 reflex/components/react_player/audio.py rename reflex/components/{media => react_player}/audio.pyi (96%) rename reflex/components/{libs => react_player}/react_player.py (95%) rename reflex/components/{libs => react_player}/react_player.pyi (96%) create mode 100644 reflex/components/react_player/video.py rename reflex/components/{media => react_player}/video.pyi (96%) rename reflex/components/{graphing => }/recharts/__init__.py (100%) rename reflex/components/{graphing => }/recharts/cartesian.py (100%) rename reflex/components/{graphing => }/recharts/cartesian.pyi (99%) rename reflex/components/{graphing => }/recharts/charts.py (99%) rename reflex/components/{graphing => }/recharts/charts.pyi (99%) rename reflex/components/{graphing => }/recharts/general.py (100%) rename reflex/components/{graphing => }/recharts/general.pyi (99%) rename reflex/components/{graphing => }/recharts/polar.py (100%) rename reflex/components/{graphing => }/recharts/polar.pyi (99%) rename reflex/components/{graphing => }/recharts/recharts.py (100%) rename reflex/components/{graphing => }/recharts/recharts.pyi (99%) create mode 100644 reflex/components/suneditor/__init__.py rename reflex/components/{forms => suneditor}/editor.py (100%) rename reflex/components/{forms => suneditor}/editor.pyi (99%) diff --git a/.gitignore b/.gitignore index 0e93a4a1b..ed4a7625d 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ examples/ .coverage.* .venv venv +requirements.txt diff --git a/reflex/__init__.py b/reflex/__init__.py index c2aef8a66..012bdf196 100644 --- a/reflex/__init__.py +++ b/reflex/__init__.py @@ -251,8 +251,8 @@ _MAPPING = { "reflex.compiler.utils": ["get_asset_path"], "reflex.components": _ALL_COMPONENTS + ["chakra", "next"], "reflex.components.component": ["memo"], - "reflex.components.graphing": ["recharts"], - "reflex.components.datadisplay.moment": ["MomentDelta"], + "reflex.components.recharts": ["recharts"], + "reflex.components.moment.moment": ["MomentDelta"], "reflex.config": ["config", "Config", "DBConfig"], "reflex.constants": ["constants", "Env"], "reflex.components.el": ["el"], diff --git a/reflex/__init__.pyi b/reflex/__init__.pyi index 48c7e18bf..482de65ac 100644 --- a/reflex/__init__.pyi +++ b/reflex/__init__.pyi @@ -443,8 +443,8 @@ from reflex.components import NoSSRComponent as NoSSRComponent from reflex.components import chakra as chakra from reflex.components import next as next from reflex.components.component import memo as memo -from reflex.components.graphing import recharts as recharts -from reflex.components.datadisplay.moment import MomentDelta as MomentDelta +from reflex.components import recharts as recharts +from reflex.components.moment.moment import MomentDelta as MomentDelta from reflex import config as config from reflex.config import Config as Config from reflex.config import DBConfig as DBConfig diff --git a/reflex/app.py b/reflex/app.py index 55948316b..d61e5aebb 100644 --- a/reflex/app.py +++ b/reflex/app.py @@ -37,9 +37,9 @@ from reflex.compiler import compiler from reflex.compiler import utils as compiler_utils from reflex.components import connection_modal from reflex.components.base.app_wrap import AppWrap +from reflex.components.base.fragment import Fragment from reflex.components.component import Component, ComponentStyle -from reflex.components.layout.fragment import Fragment -from reflex.components.navigation.client_side_routing import ( +from reflex.components.core.client_side_routing import ( Default404Page, wait_for_client_redirect, ) diff --git a/reflex/app.pyi b/reflex/app.pyi index 38175ca28..d826a5033 100644 --- a/reflex/app.pyi +++ b/reflex/app.pyi @@ -12,7 +12,7 @@ from reflex.components.component import ( Component as Component, ComponentStyle as ComponentStyle, ) -from reflex.components.layout.fragment import Fragment as Fragment +from reflex.components.base.fragment import Fragment as Fragment from reflex.config import get_config as get_config from reflex.event import ( Event as Event, diff --git a/reflex/components/__init__.py b/reflex/components/__init__.py index 9426ba8fa..8dbf5c406 100644 --- a/reflex/components/__init__.py +++ b/reflex/components/__init__.py @@ -1,239 +1,16 @@ """Import all the components.""" from __future__ import annotations -from . import next as next -from .base import Script +from .base import Fragment, Script, fragment, script from .chakra import * from .component import Component from .component import NoSSRComponent as NoSSRComponent +from .core import * from .datadisplay import * -from .disclosure import * -from .feedback import * -from .forms import * -from .graphing import * -from .layout import * -from .media import * -from .navigation import * -from .overlay import * -from .typography import * - -# Add the convenience methods for all the components. -# locals().update( -# { -# utils.to_snake_case(name): value.create -# for name, value in locals().items() -# if isinstance(value, type) and issubclass(value, Component) -# } -# ) - -# Add the convenience methods for all the components manually. -# This is necessary for static type checking to work. -accordion = Accordion.create -accordion_button = AccordionButton.create -accordion_icon = AccordionIcon.create -accordion_item = AccordionItem.create -accordion_panel = AccordionPanel.create -alert = Alert.create -alert_description = AlertDescription.create -alert_dialog = AlertDialog.create -alert_dialog_body = AlertDialogBody.create -alert_dialog_content = AlertDialogContent.create -alert_dialog_footer = AlertDialogFooter.create -alert_dialog_header = AlertDialogHeader.create -alert_dialog_overlay = AlertDialogOverlay.create -alert_icon = AlertIcon.create -alert_title = AlertTitle.create -aspect_ratio = AspectRatio.create -audio = Audio.create -avatar = Avatar.create -avatar_badge = AvatarBadge.create -avatar_group = AvatarGroup.create -badge = Badge.create -box = Box.create -breadcrumb = Breadcrumb.create -breadcrumb_item = BreadcrumbItem.create -breadcrumb_link = BreadcrumbLink.create -breadcrumb_separator = BreadcrumbSeparator.create -button = Button.create -button_group = ButtonGroup.create -card = Card.create -card_body = CardBody.create -card_footer = CardFooter.create -card_header = CardHeader.create -center = Center.create -checkbox = Checkbox.create -checkbox_group = CheckboxGroup.create -circle = Circle.create -circular_progress = CircularProgress.create -circular_progress_label = CircularProgressLabel.create -code = Code.create -code_block = CodeBlock.create -collapse = Collapse.create -color_mode_button = ColorModeButton.create -color_mode_icon = ColorModeIcon.create -color_mode_switch = ColorModeSwitch.create -component = Component.create -connection_banner = ConnectionBanner.create -connection_modal = ConnectionModal.create -container = Container.create -data_editor = DataEditor.create -data_editor_theme = DataEditorTheme -data_table = DataTable.create -date_picker = DatePicker.create -date_time_picker = DateTimePicker.create -debounce_input = DebounceInput.create -divider = Divider.create -drawer = Drawer.create -drawer_body = DrawerBody.create -drawer_close_button = DrawerCloseButton.create -drawer_content = DrawerContent.create -drawer_footer = DrawerFooter.create -drawer_header = DrawerHeader.create -drawer_overlay = DrawerOverlay.create -editable = Editable.create -editable_input = EditableInput.create -editable_preview = EditablePreview.create -editable_textarea = EditableTextarea.create -editor = Editor.create -email = Email.create -fade = Fade.create -flex = Flex.create -foreach = Foreach.create -form = Form.create -form_control = FormControl.create -form_error_message = FormErrorMessage.create -form_helper_text = FormHelperText.create -form_label = FormLabel.create -fragment = Fragment.create -grid = Grid.create -grid_item = GridItem.create -heading = Heading.create -highlight = Highlight.create -hstack = Hstack.create -html = Html.create -icon = Icon.create -icon_button = IconButton.create -image = Image.create -input = Input.create -input_group = InputGroup.create -input_left_addon = InputLeftAddon.create -input_left_element = InputLeftElement.create -input_right_addon = InputRightAddon.create -input_right_element = InputRightElement.create -kbd = Kbd.create -link = Link.create -link_box = LinkBox.create -link_overlay = LinkOverlay.create -list = List.create -list_item = ListItem.create -markdown = Markdown.create -menu = Menu.create -menu_button = MenuButton.create -menu_divider = MenuDivider.create -menu_group = MenuGroup.create -menu_item = MenuItem.create -menu_item_option = MenuItemOption.create -menu_list = MenuList.create -menu_option_group = MenuOptionGroup.create -modal = Modal.create -modal_body = ModalBody.create -modal_close_button = ModalCloseButton.create -modal_content = ModalContent.create -modal_footer = ModalFooter.create -modal_header = ModalHeader.create -modal_overlay = ModalOverlay.create -moment = Moment.create -multi_select = MultiSelect.create -multi_select_option = MultiSelectOption -next_link = NextLink.create -number_decrement_stepper = NumberDecrementStepper.create -number_increment_stepper = NumberIncrementStepper.create -number_input = NumberInput.create -number_input_field = NumberInputField.create -number_input_stepper = NumberInputStepper.create -option = Option.create -ordered_list = OrderedList.create -password = Password.create -pin_input = PinInput.create -pin_input_field = PinInputField.create -plotly = Plotly.create -popover = Popover.create -popover_anchor = PopoverAnchor.create -popover_arrow = PopoverArrow.create -popover_body = PopoverBody.create -popover_close_button = PopoverCloseButton.create -popover_content = PopoverContent.create -popover_footer = PopoverFooter.create -popover_header = PopoverHeader.create -popover_trigger = PopoverTrigger.create -progress = Progress.create -radio = Radio.create -radio_group = RadioGroup.create -range_slider = RangeSlider.create -range_slider_filled_track = RangeSliderFilledTrack.create -range_slider_thumb = RangeSliderThumb.create -range_slider_track = RangeSliderTrack.create -responsive_grid = ResponsiveGrid.create -scale_fade = ScaleFade.create -script = Script.create -select = Select.create -skeleton = Skeleton.create -skeleton_circle = SkeletonCircle.create -skeleton_text = SkeletonText.create -slide = Slide.create -slide_fade = SlideFade.create -slider = Slider.create -slider_filled_track = SliderFilledTrack.create -slider_mark = SliderMark.create -slider_thumb = SliderThumb.create -slider_track = SliderTrack.create -spacer = Spacer.create -span = Span.create -spinner = Spinner.create -square = Square.create -stack = Stack.create -stat = Stat.create -stat_arrow = StatArrow.create -stat_group = StatGroup.create -stat_help_text = StatHelpText.create -stat_label = StatLabel.create -stat_number = StatNumber.create -step = Step.create -step_description = StepDescription.create -step_icon = StepIcon.create -step_indicator = StepIndicator.create -step_number = StepNumber.create -step_separator = StepSeparator.create -step_status = StepStatus.create -step_title = StepTitle.create -stepper = Stepper.create -switch = Switch.create -tab = Tab.create -tab_list = TabList.create -tab_panel = TabPanel.create -tab_panels = TabPanels.create -table = Table.create -table_caption = TableCaption.create -table_container = TableContainer.create -tabs = Tabs.create -tag = Tag.create -tag_close_button = TagCloseButton.create -tag_label = TagLabel.create -tag_left_icon = TagLeftIcon.create -tag_right_icon = TagRightIcon.create -tbody = Tbody.create -td = Td.create -text = Text.create -text_area = TextArea.create -tfoot = Tfoot.create -th = Th.create -thead = Thead.create -tooltip = Tooltip.create -tr = Tr.create -unordered_list = UnorderedList.create -upload = Upload.create -video = Video.create -visually_hidden = VisuallyHidden.create -vstack = Vstack.create -wrap = Wrap.create -wrap_item = WrapItem.create +from .gridjs import * +from .markdown import * +from .moment import * +from .next import NextLink, next_link +from .plotly import * +from .react_player import * +from .suneditor import * diff --git a/reflex/components/base/__init__.py b/reflex/components/base/__init__.py index b21f59115..58a0f6a55 100644 --- a/reflex/components/base/__init__.py +++ b/reflex/components/base/__init__.py @@ -1,8 +1,12 @@ """Base components.""" from .body import Body -from .document import ColorModeScript, DocumentHead, Html, Main, NextScript +from .document import DocumentHead, Html, Main, NextScript +from .fragment import Fragment from .head import Head from .link import RawLink, ScriptTag from .meta import Description, Image, Meta, Title from .script import Script + +fragment = Fragment.create +script = Script.create diff --git a/reflex/components/base/app_wrap.py b/reflex/components/base/app_wrap.py index eb6d04775..32f9f3522 100644 --- a/reflex/components/base/app_wrap.py +++ b/reflex/components/base/app_wrap.py @@ -1,6 +1,6 @@ """Top-level component that wraps the entire app.""" +from reflex.components.base.fragment import Fragment from reflex.components.component import Component -from reflex.components.layout.fragment import Fragment from reflex.vars import Var diff --git a/reflex/components/base/app_wrap.pyi b/reflex/components/base/app_wrap.pyi index 6bd51e5cb..63302bcc9 100644 --- a/reflex/components/base/app_wrap.pyi +++ b/reflex/components/base/app_wrap.pyi @@ -7,8 +7,8 @@ from typing import Any, Dict, Literal, Optional, Union, overload from reflex.vars import Var, BaseVar, ComputedVar from reflex.event import EventChain, EventHandler, EventSpec from reflex.style import Style +from reflex.components.base.fragment import Fragment from reflex.components.component import Component -from reflex.components.layout.fragment import Fragment from reflex.vars import Var class AppWrap(Fragment): diff --git a/reflex/components/base/document.py b/reflex/components/base/document.py index 5cdba585d..b867e05c2 100644 --- a/reflex/components/base/document.py +++ b/reflex/components/base/document.py @@ -1,7 +1,6 @@ """Document components.""" from reflex.components.component import Component -from reflex.components.libs.chakra import ChakraComponent class NextDocumentLib(Component): @@ -32,10 +31,3 @@ class NextScript(NextDocumentLib): """The document main scripts.""" tag = "NextScript" - - -class ColorModeScript(ChakraComponent): - """Chakra color mode script.""" - - tag = "ColorModeScript" - initialColorMode = "light" diff --git a/reflex/components/base/document.pyi b/reflex/components/base/document.pyi index f37857b9d..746a2f18b 100644 --- a/reflex/components/base/document.pyi +++ b/reflex/components/base/document.pyi @@ -8,7 +8,6 @@ from reflex.vars import Var, BaseVar, ComputedVar from reflex.event import EventChain, EventHandler, EventSpec from reflex.style import Style from reflex.components.component import Component -from reflex.components.libs.chakra import ChakraComponent class NextDocumentLib(Component): @overload @@ -404,82 +403,3 @@ class NextScript(NextDocumentLib): TypeError: If an invalid child is passed. """ ... - -class ColorModeScript(ChakraComponent): - @overload - @classmethod - def create( # type: ignore - cls, - *children, - style: Optional[Style] = None, - key: Optional[Any] = None, - id: Optional[Any] = None, - class_name: Optional[Any] = None, - autofocus: Optional[bool] = None, - custom_attrs: Optional[Dict[str, Union[Var, str]]] = None, - on_blur: Optional[ - Union[EventHandler, EventSpec, list, function, BaseVar] - ] = None, - on_click: Optional[ - Union[EventHandler, EventSpec, list, function, BaseVar] - ] = None, - on_context_menu: Optional[ - Union[EventHandler, EventSpec, list, function, BaseVar] - ] = None, - on_double_click: Optional[ - Union[EventHandler, EventSpec, list, function, BaseVar] - ] = None, - on_focus: Optional[ - Union[EventHandler, EventSpec, list, function, BaseVar] - ] = None, - on_mount: Optional[ - Union[EventHandler, EventSpec, list, function, BaseVar] - ] = None, - on_mouse_down: Optional[ - Union[EventHandler, EventSpec, list, function, BaseVar] - ] = None, - on_mouse_enter: Optional[ - Union[EventHandler, EventSpec, list, function, BaseVar] - ] = None, - on_mouse_leave: Optional[ - Union[EventHandler, EventSpec, list, function, BaseVar] - ] = None, - on_mouse_move: Optional[ - Union[EventHandler, EventSpec, list, function, BaseVar] - ] = None, - on_mouse_out: Optional[ - Union[EventHandler, EventSpec, list, function, BaseVar] - ] = None, - on_mouse_over: Optional[ - Union[EventHandler, EventSpec, list, function, BaseVar] - ] = None, - on_mouse_up: Optional[ - Union[EventHandler, EventSpec, list, function, BaseVar] - ] = None, - on_scroll: Optional[ - Union[EventHandler, EventSpec, list, function, BaseVar] - ] = None, - on_unmount: Optional[ - Union[EventHandler, EventSpec, list, function, BaseVar] - ] = None, - **props - ) -> "ColorModeScript": - """Create the component. - - Args: - *children: The children of the component. - style: The style of the component. - key: A unique key for the component. - id: The id for the component. - class_name: The class name for the component. - autofocus: Whether the component should take the focus once the page is loaded - custom_attrs: custom attribute - **props: The props of the component. - - Returns: - The component. - - Raises: - TypeError: If an invalid child is passed. - """ - ... diff --git a/reflex/components/layout/fragment.py b/reflex/components/base/fragment.py similarity index 100% rename from reflex/components/layout/fragment.py rename to reflex/components/base/fragment.py diff --git a/reflex/components/layout/fragment.pyi b/reflex/components/base/fragment.pyi similarity index 98% rename from reflex/components/layout/fragment.pyi rename to reflex/components/base/fragment.pyi index 808dc5da8..83014e20a 100644 --- a/reflex/components/layout/fragment.pyi +++ b/reflex/components/base/fragment.pyi @@ -1,4 +1,4 @@ -"""Stub file for reflex/components/layout/fragment.py""" +"""Stub file for reflex/components/base/fragment.py""" # ------------------- DO NOT EDIT ---------------------- # This file was generated by `scripts/pyi_generator.py`! # ------------------------------------------------------ diff --git a/reflex/components/chakra/__init__.py b/reflex/components/chakra/__init__.py index 490d479f7..05e49e793 100644 --- a/reflex/components/chakra/__init__.py +++ b/reflex/components/chakra/__init__.py @@ -1,23 +1,205 @@ """Chakra components.""" +from .base import * +from .datadisplay import * +from .disclosure import * +from .feedback import * +from .forms import * +from .layout import * +from .media import * +from .navigation import * +from .overlay import * +from .typography import * -import importlib -from typing import Type - -from .media.image import Image - +accordion = Accordion.create +accordion_button = AccordionButton.create +accordion_icon = AccordionIcon.create +accordion_item = AccordionItem.create +accordion_panel = AccordionPanel.create +alert = Alert.create +alert_description = AlertDescription.create +alert_dialog = AlertDialog.create +alert_dialog_body = AlertDialogBody.create +alert_dialog_content = AlertDialogContent.create +alert_dialog_footer = AlertDialogFooter.create +alert_dialog_header = AlertDialogHeader.create +alert_dialog_overlay = AlertDialogOverlay.create +alert_icon = AlertIcon.create +alert_title = AlertTitle.create +aspect_ratio = AspectRatio.create +avatar = Avatar.create +avatar_badge = AvatarBadge.create +avatar_group = AvatarGroup.create +badge = Badge.create +box = Box.create +breadcrumb = Breadcrumb.create +breadcrumb_item = BreadcrumbItem.create +breadcrumb_link = BreadcrumbLink.create +breadcrumb_separator = BreadcrumbSeparator.create +button = Button.create +button_group = ButtonGroup.create +card = Card.create +card_body = CardBody.create +card_footer = CardFooter.create +card_header = CardHeader.create +center = Center.create +checkbox = Checkbox.create +checkbox_group = CheckboxGroup.create +circle = Circle.create +circular_progress = CircularProgress.create +circular_progress_label = CircularProgressLabel.create +code = Code.create +code_block = CodeBlock.create +collapse = Collapse.create +color_mode_button = ColorModeButton.create +color_mode_icon = ColorModeIcon.create +color_mode_switch = ColorModeSwitch.create +component = Component.create +container = Container.create +date_picker = DatePicker.create +date_time_picker = DateTimePicker.create +divider = Divider.create +drawer = Drawer.create +drawer_body = DrawerBody.create +drawer_close_button = DrawerCloseButton.create +drawer_content = DrawerContent.create +drawer_footer = DrawerFooter.create +drawer_header = DrawerHeader.create +drawer_overlay = DrawerOverlay.create +editable = Editable.create +editable_input = EditableInput.create +editable_preview = EditablePreview.create +editable_textarea = EditableTextarea.create +email = Email.create +fade = Fade.create +flex = Flex.create +form = Form.create +form_control = FormControl.create +form_error_message = FormErrorMessage.create +form_helper_text = FormHelperText.create +form_label = FormLabel.create +grid = Grid.create +grid_item = GridItem.create +heading = Heading.create +highlight = Highlight.create +hstack = Hstack.create +html = Html.create +icon = Icon.create +icon_button = IconButton.create image = Image.create - -# _MAPPING = { -# "image": "media", -# } - - -# def __getattr__(name: str) -> Type: -# print(f"importing {name}") -# if name not in _MAPPING: -# return importlib.import_module(name) - -# module = importlib.import_module(_MAPPING[name], package=".") - -# return getattr(module, name) if name != _MAPPING[name].rsplit(".")[-1] else module +input = Input.create +input_group = InputGroup.create +input_left_addon = InputLeftAddon.create +input_left_element = InputLeftElement.create +input_right_addon = InputRightAddon.create +input_right_element = InputRightElement.create +kbd = Kbd.create +link = Link.create +link_box = LinkBox.create +link_overlay = LinkOverlay.create +list = List.create +list_item = ListItem.create +menu = Menu.create +menu_button = MenuButton.create +menu_divider = MenuDivider.create +menu_group = MenuGroup.create +menu_item = MenuItem.create +menu_item_option = MenuItemOption.create +menu_list = MenuList.create +menu_option_group = MenuOptionGroup.create +modal = Modal.create +modal_body = ModalBody.create +modal_close_button = ModalCloseButton.create +modal_content = ModalContent.create +modal_footer = ModalFooter.create +modal_header = ModalHeader.create +modal_overlay = ModalOverlay.create +multi_select = MultiSelect.create +multi_select_option = MultiSelectOption +number_decrement_stepper = NumberDecrementStepper.create +number_increment_stepper = NumberIncrementStepper.create +number_input = NumberInput.create +number_input_field = NumberInputField.create +number_input_stepper = NumberInputStepper.create +option = Option.create +ordered_list = OrderedList.create +password = Password.create +pin_input = PinInput.create +pin_input_field = PinInputField.create +popover = Popover.create +popover_anchor = PopoverAnchor.create +popover_arrow = PopoverArrow.create +popover_body = PopoverBody.create +popover_close_button = PopoverCloseButton.create +popover_content = PopoverContent.create +popover_footer = PopoverFooter.create +popover_header = PopoverHeader.create +popover_trigger = PopoverTrigger.create +progress = Progress.create +radio = Radio.create +radio_group = RadioGroup.create +range_slider = RangeSlider.create +range_slider_filled_track = RangeSliderFilledTrack.create +range_slider_thumb = RangeSliderThumb.create +range_slider_track = RangeSliderTrack.create +responsive_grid = ResponsiveGrid.create +scale_fade = ScaleFade.create +select = Select.create +skeleton = Skeleton.create +skeleton_circle = SkeletonCircle.create +skeleton_text = SkeletonText.create +slide = Slide.create +slide_fade = SlideFade.create +slider = Slider.create +slider_filled_track = SliderFilledTrack.create +slider_mark = SliderMark.create +slider_thumb = SliderThumb.create +slider_track = SliderTrack.create +spacer = Spacer.create +span = Span.create +spinner = Spinner.create +square = Square.create +stack = Stack.create +stat = Stat.create +stat_arrow = StatArrow.create +stat_group = StatGroup.create +stat_help_text = StatHelpText.create +stat_label = StatLabel.create +stat_number = StatNumber.create +step = Step.create +step_description = StepDescription.create +step_icon = StepIcon.create +step_indicator = StepIndicator.create +step_number = StepNumber.create +step_separator = StepSeparator.create +step_status = StepStatus.create +step_title = StepTitle.create +stepper = Stepper.create +switch = Switch.create +tab = Tab.create +tab_list = TabList.create +tab_panel = TabPanel.create +tab_panels = TabPanels.create +table = Table.create +table_caption = TableCaption.create +table_container = TableContainer.create +tabs = Tabs.create +tag = Tag.create +tag_close_button = TagCloseButton.create +tag_label = TagLabel.create +tag_left_icon = TagLeftIcon.create +tag_right_icon = TagRightIcon.create +tbody = Tbody.create +td = Td.create +text = Text.create +text_area = TextArea.create +tfoot = Tfoot.create +th = Th.create +thead = Thead.create +tooltip = Tooltip.create +tr = Tr.create +unordered_list = UnorderedList.create +visually_hidden = VisuallyHidden.create +vstack = Vstack.create +wrap = Wrap.create +wrap_item = WrapItem.create diff --git a/reflex/components/libs/chakra.py b/reflex/components/chakra/base.py similarity index 100% rename from reflex/components/libs/chakra.py rename to reflex/components/chakra/base.py diff --git a/reflex/components/libs/chakra.pyi b/reflex/components/chakra/base.pyi similarity index 99% rename from reflex/components/libs/chakra.pyi rename to reflex/components/chakra/base.pyi index 792d459fe..0cd6485d8 100644 --- a/reflex/components/libs/chakra.pyi +++ b/reflex/components/chakra/base.pyi @@ -1,4 +1,4 @@ -"""Stub file for reflex/components/libs/chakra.py""" +"""Stub file for reflex/components/chakra/base.py""" # ------------------- DO NOT EDIT ---------------------- # This file was generated by `scripts/pyi_generator.py`! # ------------------------------------------------------ diff --git a/reflex/components/chakra/datadisplay/__init__.py b/reflex/components/chakra/datadisplay/__init__.py new file mode 100644 index 000000000..64d0d370d --- /dev/null +++ b/reflex/components/chakra/datadisplay/__init__.py @@ -0,0 +1,12 @@ +"""Data display components.""" + +from .badge import Badge +from .code import Code, CodeBlock +from .code import LiteralCodeBlockTheme as LiteralCodeBlockTheme +from .code import LiteralCodeLanguage as LiteralCodeLanguage +from .divider import Divider +from .keyboard_key import KeyboardKey as Kbd +from .list import List, ListItem, OrderedList, UnorderedList +from .stat import Stat, StatArrow, StatGroup, StatHelpText, StatLabel, StatNumber +from .table import Table, TableCaption, TableContainer, Tbody, Td, Tfoot, Th, Thead, Tr +from .tag import Tag, TagCloseButton, TagLabel, TagLeftIcon, TagRightIcon diff --git a/reflex/components/datadisplay/badge.py b/reflex/components/chakra/datadisplay/badge.py similarity index 79% rename from reflex/components/datadisplay/badge.py rename to reflex/components/chakra/datadisplay/badge.py index f1216782f..52d36fe7c 100644 --- a/reflex/components/datadisplay/badge.py +++ b/reflex/components/chakra/datadisplay/badge.py @@ -1,6 +1,6 @@ """Badge component.""" -from reflex.components.libs.chakra import ChakraComponent, LiteralVariant +from reflex.components.chakra import ChakraComponent, LiteralVariant from reflex.vars import Var diff --git a/reflex/components/datadisplay/badge.pyi b/reflex/components/chakra/datadisplay/badge.pyi similarity index 96% rename from reflex/components/datadisplay/badge.pyi rename to reflex/components/chakra/datadisplay/badge.pyi index 2c22630f5..8480b89de 100644 --- a/reflex/components/datadisplay/badge.pyi +++ b/reflex/components/chakra/datadisplay/badge.pyi @@ -1,4 +1,4 @@ -"""Stub file for reflex/components/datadisplay/badge.py""" +"""Stub file for reflex/components/chakra/datadisplay/badge.py""" # ------------------- DO NOT EDIT ---------------------- # This file was generated by `scripts/pyi_generator.py`! # ------------------------------------------------------ @@ -7,7 +7,7 @@ from typing import Any, Dict, Literal, Optional, Union, overload from reflex.vars import Var, BaseVar, ComputedVar from reflex.event import EventChain, EventHandler, EventSpec from reflex.style import Style -from reflex.components.libs.chakra import ChakraComponent, LiteralVariant +from reflex.components.chakra import ChakraComponent, LiteralVariant from reflex.vars import Var class Badge(ChakraComponent): diff --git a/reflex/components/datadisplay/code.py b/reflex/components/chakra/datadisplay/code.py similarity index 98% rename from reflex/components/datadisplay/code.py rename to reflex/components/chakra/datadisplay/code.py index 72918fcac..9bec7271f 100644 --- a/reflex/components/datadisplay/code.py +++ b/reflex/components/chakra/datadisplay/code.py @@ -2,13 +2,13 @@ import re from typing import Dict, Literal, Optional, Union -from reflex.components.component import Component -from reflex.components.forms import Button, color_mode_cond -from reflex.components.layout import Box -from reflex.components.libs.chakra import ( +from reflex.components.chakra import ( ChakraComponent, ) -from reflex.components.media import Icon +from reflex.components.chakra.forms import Button, color_mode_cond +from reflex.components.chakra.layout import Box +from reflex.components.chakra.media import Icon +from reflex.components.component import Component from reflex.event import set_clipboard from reflex.style import Style from reflex.utils import format, imports diff --git a/reflex/components/datadisplay/code.pyi b/reflex/components/chakra/datadisplay/code.pyi similarity index 99% rename from reflex/components/datadisplay/code.pyi rename to reflex/components/chakra/datadisplay/code.pyi index 4cfc78d79..2b0a855d0 100644 --- a/reflex/components/datadisplay/code.pyi +++ b/reflex/components/chakra/datadisplay/code.pyi @@ -1,4 +1,4 @@ -"""Stub file for reflex/components/datadisplay/code.py""" +"""Stub file for reflex/components/chakra/datadisplay/code.py""" # ------------------- DO NOT EDIT ---------------------- # This file was generated by `scripts/pyi_generator.py`! # ------------------------------------------------------ @@ -9,11 +9,11 @@ from reflex.event import EventChain, EventHandler, EventSpec from reflex.style import Style import re from typing import Dict, Literal, Optional, Union +from reflex.components.chakra import ChakraComponent +from reflex.components.chakra.forms import Button, color_mode_cond +from reflex.components.chakra.layout import Box +from reflex.components.chakra.media import Icon from reflex.components.component import Component -from reflex.components.forms import Button, color_mode_cond -from reflex.components.layout import Box -from reflex.components.libs.chakra import ChakraComponent -from reflex.components.media import Icon from reflex.event import set_clipboard from reflex.style import Style from reflex.utils import format, imports diff --git a/reflex/components/datadisplay/divider.py b/reflex/components/chakra/datadisplay/divider.py similarity index 76% rename from reflex/components/datadisplay/divider.py rename to reflex/components/chakra/datadisplay/divider.py index 3b481eb7e..de33e4ec0 100644 --- a/reflex/components/datadisplay/divider.py +++ b/reflex/components/chakra/datadisplay/divider.py @@ -1,9 +1,11 @@ """A line to divide parts of the layout.""" +from typing import Literal -from reflex.components.graphing.recharts.recharts import LiteralLayout -from reflex.components.libs.chakra import ChakraComponent, LiteralDividerVariant +from reflex.components.chakra import ChakraComponent, LiteralDividerVariant from reflex.vars import Var +LiteralLayout = Literal["horizontal", "vertical"] + class Divider(ChakraComponent): """Dividers are used to visually separate content in a list or group.""" diff --git a/reflex/components/datadisplay/divider.pyi b/reflex/components/chakra/datadisplay/divider.pyi similarity index 94% rename from reflex/components/datadisplay/divider.pyi rename to reflex/components/chakra/datadisplay/divider.pyi index a2dfcb98f..174234e5a 100644 --- a/reflex/components/datadisplay/divider.pyi +++ b/reflex/components/chakra/datadisplay/divider.pyi @@ -1,4 +1,4 @@ -"""Stub file for reflex/components/datadisplay/divider.py""" +"""Stub file for reflex/components/chakra/datadisplay/divider.py""" # ------------------- DO NOT EDIT ---------------------- # This file was generated by `scripts/pyi_generator.py`! # ------------------------------------------------------ @@ -7,10 +7,12 @@ from typing import Any, Dict, Literal, Optional, Union, overload from reflex.vars import Var, BaseVar, ComputedVar from reflex.event import EventChain, EventHandler, EventSpec from reflex.style import Style -from reflex.components.graphing.recharts.recharts import LiteralLayout -from reflex.components.libs.chakra import ChakraComponent, LiteralDividerVariant +from typing import Literal +from reflex.components.chakra import ChakraComponent, LiteralDividerVariant from reflex.vars import Var +LiteralLayout = Literal["horizontal", "vertical"] + class Divider(ChakraComponent): @overload @classmethod diff --git a/reflex/components/datadisplay/keyboard_key.py b/reflex/components/chakra/datadisplay/keyboard_key.py similarity index 68% rename from reflex/components/datadisplay/keyboard_key.py rename to reflex/components/chakra/datadisplay/keyboard_key.py index f8abdfdd1..f9068284d 100644 --- a/reflex/components/datadisplay/keyboard_key.py +++ b/reflex/components/chakra/datadisplay/keyboard_key.py @@ -1,6 +1,6 @@ """A Keyboard Key Component.""" -from reflex.components.libs.chakra import ChakraComponent +from reflex.components.chakra import ChakraComponent class KeyboardKey(ChakraComponent): diff --git a/reflex/components/datadisplay/keyboard_key.pyi b/reflex/components/chakra/datadisplay/keyboard_key.pyi similarity index 96% rename from reflex/components/datadisplay/keyboard_key.pyi rename to reflex/components/chakra/datadisplay/keyboard_key.pyi index 69441c0c0..a3e7dcff0 100644 --- a/reflex/components/datadisplay/keyboard_key.pyi +++ b/reflex/components/chakra/datadisplay/keyboard_key.pyi @@ -1,4 +1,4 @@ -"""Stub file for reflex/components/datadisplay/keyboard_key.py""" +"""Stub file for reflex/components/chakra/datadisplay/keyboard_key.py""" # ------------------- DO NOT EDIT ---------------------- # This file was generated by `scripts/pyi_generator.py`! # ------------------------------------------------------ @@ -7,7 +7,7 @@ from typing import Any, Dict, Literal, Optional, Union, overload from reflex.vars import Var, BaseVar, ComputedVar from reflex.event import EventChain, EventHandler, EventSpec from reflex.style import Style -from reflex.components.libs.chakra import ChakraComponent +from reflex.components.chakra import ChakraComponent class KeyboardKey(ChakraComponent): @overload diff --git a/reflex/components/datadisplay/list.py b/reflex/components/chakra/datadisplay/list.py similarity index 89% rename from reflex/components/datadisplay/list.py rename to reflex/components/chakra/datadisplay/list.py index a3d725291..4c78b56e3 100644 --- a/reflex/components/datadisplay/list.py +++ b/reflex/components/chakra/datadisplay/list.py @@ -2,9 +2,9 @@ from __future__ import annotations -from reflex.components import Component -from reflex.components.layout.foreach import Foreach -from reflex.components.libs.chakra import ChakraComponent +from reflex.components.chakra import ChakraComponent +from reflex.components.component import Component +from reflex.components.core.foreach import Foreach from reflex.vars import Var diff --git a/reflex/components/datadisplay/list.pyi b/reflex/components/chakra/datadisplay/list.pyi similarity index 98% rename from reflex/components/datadisplay/list.pyi rename to reflex/components/chakra/datadisplay/list.pyi index c7d7f6703..a246c3f02 100644 --- a/reflex/components/datadisplay/list.pyi +++ b/reflex/components/chakra/datadisplay/list.pyi @@ -1,4 +1,4 @@ -"""Stub file for reflex/components/datadisplay/list.py""" +"""Stub file for reflex/components/chakra/datadisplay/list.py""" # ------------------- DO NOT EDIT ---------------------- # This file was generated by `scripts/pyi_generator.py`! # ------------------------------------------------------ @@ -7,9 +7,9 @@ from typing import Any, Dict, Literal, Optional, Union, overload from reflex.vars import Var, BaseVar, ComputedVar from reflex.event import EventChain, EventHandler, EventSpec from reflex.style import Style -from reflex.components import Component -from reflex.components.layout.foreach import Foreach -from reflex.components.libs.chakra import ChakraComponent +from reflex.components.chakra import ChakraComponent +from reflex.components.component import Component +from reflex.components.core.foreach import Foreach from reflex.vars import Var class List(ChakraComponent): diff --git a/reflex/components/datadisplay/stat.py b/reflex/components/chakra/datadisplay/stat.py similarity index 97% rename from reflex/components/datadisplay/stat.py rename to reflex/components/chakra/datadisplay/stat.py index 814a313c4..b9fe7f332 100644 --- a/reflex/components/datadisplay/stat.py +++ b/reflex/components/chakra/datadisplay/stat.py @@ -1,7 +1,7 @@ """Statistics components.""" +from reflex.components.chakra import ChakraComponent from reflex.components.component import Component -from reflex.components.libs.chakra import ChakraComponent from reflex.vars import Var diff --git a/reflex/components/datadisplay/stat.pyi b/reflex/components/chakra/datadisplay/stat.pyi similarity index 99% rename from reflex/components/datadisplay/stat.pyi rename to reflex/components/chakra/datadisplay/stat.pyi index b70e8d5a6..09b123fac 100644 --- a/reflex/components/datadisplay/stat.pyi +++ b/reflex/components/chakra/datadisplay/stat.pyi @@ -1,4 +1,4 @@ -"""Stub file for reflex/components/datadisplay/stat.py""" +"""Stub file for reflex/components/chakra/datadisplay/stat.py""" # ------------------- DO NOT EDIT ---------------------- # This file was generated by `scripts/pyi_generator.py`! # ------------------------------------------------------ @@ -7,8 +7,8 @@ from typing import Any, Dict, Literal, Optional, Union, overload from reflex.vars import Var, BaseVar, ComputedVar from reflex.event import EventChain, EventHandler, EventSpec from reflex.style import Style +from reflex.components.chakra import ChakraComponent from reflex.components.component import Component -from reflex.components.libs.chakra import ChakraComponent from reflex.vars import Var class Stat(ChakraComponent): diff --git a/reflex/components/datadisplay/table.py b/reflex/components/chakra/datadisplay/table.py similarity index 98% rename from reflex/components/datadisplay/table.py rename to reflex/components/chakra/datadisplay/table.py index cf4160133..cdc5c1fea 100644 --- a/reflex/components/datadisplay/table.py +++ b/reflex/components/chakra/datadisplay/table.py @@ -1,9 +1,9 @@ """Table components.""" from typing import List, Tuple +from reflex.components.chakra import ChakraComponent from reflex.components.component import Component -from reflex.components.layout.foreach import Foreach -from reflex.components.libs.chakra import ChakraComponent +from reflex.components.core.foreach import Foreach from reflex.utils import types from reflex.vars import Var diff --git a/reflex/components/datadisplay/table.pyi b/reflex/components/chakra/datadisplay/table.pyi similarity index 99% rename from reflex/components/datadisplay/table.pyi rename to reflex/components/chakra/datadisplay/table.pyi index 8b9093802..bd9774b7e 100644 --- a/reflex/components/datadisplay/table.pyi +++ b/reflex/components/chakra/datadisplay/table.pyi @@ -1,4 +1,4 @@ -"""Stub file for reflex/components/datadisplay/table.py""" +"""Stub file for reflex/components/chakra/datadisplay/table.py""" # ------------------- DO NOT EDIT ---------------------- # This file was generated by `scripts/pyi_generator.py`! # ------------------------------------------------------ @@ -8,9 +8,9 @@ from reflex.vars import Var, BaseVar, ComputedVar from reflex.event import EventChain, EventHandler, EventSpec from reflex.style import Style from typing import List, Tuple +from reflex.components.chakra import ChakraComponent from reflex.components.component import Component -from reflex.components.layout.foreach import Foreach -from reflex.components.libs.chakra import ChakraComponent +from reflex.components.core.foreach import Foreach from reflex.utils import types from reflex.vars import Var diff --git a/reflex/components/datadisplay/tag.py b/reflex/components/chakra/datadisplay/tag.py similarity index 98% rename from reflex/components/datadisplay/tag.py rename to reflex/components/chakra/datadisplay/tag.py index dff02eac1..4a02d22d9 100644 --- a/reflex/components/datadisplay/tag.py +++ b/reflex/components/chakra/datadisplay/tag.py @@ -1,13 +1,13 @@ """Chakra Tag Component.""" from typing import Optional -from reflex.components.component import Component -from reflex.components.libs.chakra import ( +from reflex.components.chakra import ( ChakraComponent, LiteralTagColorScheme, LiteralTagSize, LiteralVariant, ) +from reflex.components.component import Component from reflex.vars import Var diff --git a/reflex/components/datadisplay/tag.pyi b/reflex/components/chakra/datadisplay/tag.pyi similarity index 99% rename from reflex/components/datadisplay/tag.pyi rename to reflex/components/chakra/datadisplay/tag.pyi index 8593afc3f..3f4171958 100644 --- a/reflex/components/datadisplay/tag.pyi +++ b/reflex/components/chakra/datadisplay/tag.pyi @@ -1,4 +1,4 @@ -"""Stub file for reflex/components/datadisplay/tag.py""" +"""Stub file for reflex/components/chakra/datadisplay/tag.py""" # ------------------- DO NOT EDIT ---------------------- # This file was generated by `scripts/pyi_generator.py`! # ------------------------------------------------------ @@ -8,13 +8,13 @@ from reflex.vars import Var, BaseVar, ComputedVar from reflex.event import EventChain, EventHandler, EventSpec from reflex.style import Style from typing import Optional -from reflex.components.component import Component -from reflex.components.libs.chakra import ( +from reflex.components.chakra import ( ChakraComponent, LiteralTagColorScheme, LiteralTagSize, LiteralVariant, ) +from reflex.components.component import Component from reflex.vars import Var class TagLabel(ChakraComponent): diff --git a/reflex/components/disclosure/__init__.py b/reflex/components/chakra/disclosure/__init__.py similarity index 100% rename from reflex/components/disclosure/__init__.py rename to reflex/components/chakra/disclosure/__init__.py diff --git a/reflex/components/disclosure/accordion.py b/reflex/components/chakra/disclosure/accordion.py similarity index 98% rename from reflex/components/disclosure/accordion.py rename to reflex/components/chakra/disclosure/accordion.py index 007aafc7d..7fd61ca61 100644 --- a/reflex/components/disclosure/accordion.py +++ b/reflex/components/chakra/disclosure/accordion.py @@ -2,8 +2,8 @@ from typing import List, Optional, Union +from reflex.components.chakra import ChakraComponent from reflex.components.component import Component -from reflex.components.libs.chakra import ChakraComponent from reflex.vars import Var diff --git a/reflex/components/disclosure/accordion.pyi b/reflex/components/chakra/disclosure/accordion.pyi similarity index 99% rename from reflex/components/disclosure/accordion.pyi rename to reflex/components/chakra/disclosure/accordion.pyi index f10c7a78b..c18f02a15 100644 --- a/reflex/components/disclosure/accordion.pyi +++ b/reflex/components/chakra/disclosure/accordion.pyi @@ -1,4 +1,4 @@ -"""Stub file for reflex/components/disclosure/accordion.py""" +"""Stub file for reflex/components/chakra/disclosure/accordion.py""" # ------------------- DO NOT EDIT ---------------------- # This file was generated by `scripts/pyi_generator.py`! # ------------------------------------------------------ @@ -8,8 +8,8 @@ from reflex.vars import Var, BaseVar, ComputedVar from reflex.event import EventChain, EventHandler, EventSpec from reflex.style import Style from typing import List, Optional, Union +from reflex.components.chakra import ChakraComponent from reflex.components.component import Component -from reflex.components.libs.chakra import ChakraComponent from reflex.vars import Var class Accordion(ChakraComponent): diff --git a/reflex/components/disclosure/tabs.py b/reflex/components/chakra/disclosure/tabs.py similarity index 98% rename from reflex/components/disclosure/tabs.py rename to reflex/components/chakra/disclosure/tabs.py index 3071d07e2..4e573281f 100644 --- a/reflex/components/disclosure/tabs.py +++ b/reflex/components/chakra/disclosure/tabs.py @@ -2,13 +2,13 @@ from typing import List, Optional, Tuple -from reflex.components.component import Component -from reflex.components.libs.chakra import ( +from reflex.components.chakra import ( ChakraComponent, LiteralColorScheme, LiteralTabsVariant, LiteralTagAlign, ) +from reflex.components.component import Component from reflex.vars import Var diff --git a/reflex/components/disclosure/tabs.pyi b/reflex/components/chakra/disclosure/tabs.pyi similarity index 99% rename from reflex/components/disclosure/tabs.pyi rename to reflex/components/chakra/disclosure/tabs.pyi index 49b02cf78..097185aa3 100644 --- a/reflex/components/disclosure/tabs.pyi +++ b/reflex/components/chakra/disclosure/tabs.pyi @@ -1,4 +1,4 @@ -"""Stub file for reflex/components/disclosure/tabs.py""" +"""Stub file for reflex/components/chakra/disclosure/tabs.py""" # ------------------- DO NOT EDIT ---------------------- # This file was generated by `scripts/pyi_generator.py`! # ------------------------------------------------------ @@ -8,13 +8,13 @@ from reflex.vars import Var, BaseVar, ComputedVar from reflex.event import EventChain, EventHandler, EventSpec from reflex.style import Style from typing import List, Optional, Tuple -from reflex.components.component import Component -from reflex.components.libs.chakra import ( +from reflex.components.chakra import ( ChakraComponent, LiteralColorScheme, LiteralTabsVariant, LiteralTagAlign, ) +from reflex.components.component import Component from reflex.vars import Var class Tabs(ChakraComponent): diff --git a/reflex/components/disclosure/transition.py b/reflex/components/chakra/disclosure/transition.py similarity index 96% rename from reflex/components/disclosure/transition.py rename to reflex/components/chakra/disclosure/transition.py index d934df403..f24afa827 100644 --- a/reflex/components/disclosure/transition.py +++ b/reflex/components/chakra/disclosure/transition.py @@ -1,7 +1,7 @@ """A transition Component.""" from typing import Union -from reflex.components.libs.chakra import ChakraComponent +from reflex.components.chakra import ChakraComponent from reflex.vars import Var diff --git a/reflex/components/disclosure/transition.pyi b/reflex/components/chakra/disclosure/transition.pyi similarity index 99% rename from reflex/components/disclosure/transition.pyi rename to reflex/components/chakra/disclosure/transition.pyi index ad330bfda..52092e502 100644 --- a/reflex/components/disclosure/transition.pyi +++ b/reflex/components/chakra/disclosure/transition.pyi @@ -1,4 +1,4 @@ -"""Stub file for reflex/components/disclosure/transition.py""" +"""Stub file for reflex/components/chakra/disclosure/transition.py""" # ------------------- DO NOT EDIT ---------------------- # This file was generated by `scripts/pyi_generator.py`! # ------------------------------------------------------ @@ -8,7 +8,7 @@ from reflex.vars import Var, BaseVar, ComputedVar from reflex.event import EventChain, EventHandler, EventSpec from reflex.style import Style from typing import Union -from reflex.components.libs.chakra import ChakraComponent +from reflex.components.chakra import ChakraComponent from reflex.vars import Var class Transition(ChakraComponent): diff --git a/reflex/components/disclosure/visuallyhidden.py b/reflex/components/chakra/disclosure/visuallyhidden.py similarity index 79% rename from reflex/components/disclosure/visuallyhidden.py rename to reflex/components/chakra/disclosure/visuallyhidden.py index 631191a4c..161b130b2 100644 --- a/reflex/components/disclosure/visuallyhidden.py +++ b/reflex/components/chakra/disclosure/visuallyhidden.py @@ -1,6 +1,6 @@ """A component to display visually hidden text.""" -from reflex.components.libs.chakra import ChakraComponent +from reflex.components.chakra import ChakraComponent class VisuallyHidden(ChakraComponent): diff --git a/reflex/components/disclosure/visuallyhidden.pyi b/reflex/components/chakra/disclosure/visuallyhidden.pyi similarity index 96% rename from reflex/components/disclosure/visuallyhidden.pyi rename to reflex/components/chakra/disclosure/visuallyhidden.pyi index 396c6b481..b8717da83 100644 --- a/reflex/components/disclosure/visuallyhidden.pyi +++ b/reflex/components/chakra/disclosure/visuallyhidden.pyi @@ -1,4 +1,4 @@ -"""Stub file for reflex/components/disclosure/visuallyhidden.py""" +"""Stub file for reflex/components/chakra/disclosure/visuallyhidden.py""" # ------------------- DO NOT EDIT ---------------------- # This file was generated by `scripts/pyi_generator.py`! # ------------------------------------------------------ @@ -7,7 +7,7 @@ from typing import Any, Dict, Literal, Optional, Union, overload from reflex.vars import Var, BaseVar, ComputedVar from reflex.event import EventChain, EventHandler, EventSpec from reflex.style import Style -from reflex.components.libs.chakra import ChakraComponent +from reflex.components.chakra import ChakraComponent class VisuallyHidden(ChakraComponent): @overload diff --git a/reflex/components/feedback/__init__.py b/reflex/components/chakra/feedback/__init__.py similarity index 100% rename from reflex/components/feedback/__init__.py rename to reflex/components/chakra/feedback/__init__.py diff --git a/reflex/components/feedback/alert.py b/reflex/components/chakra/feedback/alert.py similarity index 97% rename from reflex/components/feedback/alert.py rename to reflex/components/chakra/feedback/alert.py index 6553d0023..57f99817f 100644 --- a/reflex/components/feedback/alert.py +++ b/reflex/components/chakra/feedback/alert.py @@ -1,11 +1,11 @@ """Alert components.""" -from reflex.components.component import Component -from reflex.components.libs.chakra import ( +from reflex.components.chakra import ( ChakraComponent, LiteralAlertVariant, LiteralStatus, ) +from reflex.components.component import Component from reflex.vars import Var diff --git a/reflex/components/feedback/alert.pyi b/reflex/components/chakra/feedback/alert.pyi similarity index 98% rename from reflex/components/feedback/alert.pyi rename to reflex/components/chakra/feedback/alert.pyi index 98bf48664..aae57c1f7 100644 --- a/reflex/components/feedback/alert.pyi +++ b/reflex/components/chakra/feedback/alert.pyi @@ -1,4 +1,4 @@ -"""Stub file for reflex/components/feedback/alert.py""" +"""Stub file for reflex/components/chakra/feedback/alert.py""" # ------------------- DO NOT EDIT ---------------------- # This file was generated by `scripts/pyi_generator.py`! # ------------------------------------------------------ @@ -7,12 +7,8 @@ from typing import Any, Dict, Literal, Optional, Union, overload from reflex.vars import Var, BaseVar, ComputedVar from reflex.event import EventChain, EventHandler, EventSpec from reflex.style import Style +from reflex.components.chakra import ChakraComponent, LiteralAlertVariant, LiteralStatus from reflex.components.component import Component -from reflex.components.libs.chakra import ( - ChakraComponent, - LiteralAlertVariant, - LiteralStatus, -) from reflex.vars import Var class Alert(ChakraComponent): diff --git a/reflex/components/feedback/circularprogress.py b/reflex/components/chakra/feedback/circularprogress.py similarity index 97% rename from reflex/components/feedback/circularprogress.py rename to reflex/components/chakra/feedback/circularprogress.py index e0e9ad92b..45a0877eb 100644 --- a/reflex/components/feedback/circularprogress.py +++ b/reflex/components/chakra/feedback/circularprogress.py @@ -1,8 +1,8 @@ """Container to stack elements with spacing.""" from typing import Union +from reflex.components.chakra import ChakraComponent from reflex.components.component import Component -from reflex.components.libs.chakra import ChakraComponent from reflex.vars import Var diff --git a/reflex/components/feedback/circularprogress.pyi b/reflex/components/chakra/feedback/circularprogress.pyi similarity index 98% rename from reflex/components/feedback/circularprogress.pyi rename to reflex/components/chakra/feedback/circularprogress.pyi index 429c0367a..4f1582041 100644 --- a/reflex/components/feedback/circularprogress.pyi +++ b/reflex/components/chakra/feedback/circularprogress.pyi @@ -1,4 +1,4 @@ -"""Stub file for reflex/components/feedback/circularprogress.py""" +"""Stub file for reflex/components/chakra/feedback/circularprogress.py""" # ------------------- DO NOT EDIT ---------------------- # This file was generated by `scripts/pyi_generator.py`! # ------------------------------------------------------ @@ -8,8 +8,8 @@ from reflex.vars import Var, BaseVar, ComputedVar from reflex.event import EventChain, EventHandler, EventSpec from reflex.style import Style from typing import Union +from reflex.components.chakra import ChakraComponent from reflex.components.component import Component -from reflex.components.libs.chakra import ChakraComponent from reflex.vars import Var class CircularProgress(ChakraComponent): diff --git a/reflex/components/feedback/progress.py b/reflex/components/chakra/feedback/progress.py similarity index 93% rename from reflex/components/feedback/progress.py rename to reflex/components/chakra/feedback/progress.py index 17406c8db..6dbaf1e94 100644 --- a/reflex/components/feedback/progress.py +++ b/reflex/components/chakra/feedback/progress.py @@ -2,7 +2,7 @@ from typing import Union -from reflex.components.libs.chakra import ChakraComponent +from reflex.components.chakra import ChakraComponent from reflex.vars import Var diff --git a/reflex/components/feedback/progress.pyi b/reflex/components/chakra/feedback/progress.pyi similarity index 97% rename from reflex/components/feedback/progress.pyi rename to reflex/components/chakra/feedback/progress.pyi index 044ccab71..c6c7b1aa4 100644 --- a/reflex/components/feedback/progress.pyi +++ b/reflex/components/chakra/feedback/progress.pyi @@ -1,4 +1,4 @@ -"""Stub file for reflex/components/feedback/progress.py""" +"""Stub file for reflex/components/chakra/feedback/progress.py""" # ------------------- DO NOT EDIT ---------------------- # This file was generated by `scripts/pyi_generator.py`! # ------------------------------------------------------ @@ -8,7 +8,7 @@ from reflex.vars import Var, BaseVar, ComputedVar from reflex.event import EventChain, EventHandler, EventSpec from reflex.style import Style from typing import Union -from reflex.components.libs.chakra import ChakraComponent +from reflex.components.chakra import ChakraComponent from reflex.vars import Var class Progress(ChakraComponent): diff --git a/reflex/components/feedback/skeleton.py b/reflex/components/chakra/feedback/skeleton.py similarity index 96% rename from reflex/components/feedback/skeleton.py rename to reflex/components/chakra/feedback/skeleton.py index e3d867412..ef71cd514 100644 --- a/reflex/components/feedback/skeleton.py +++ b/reflex/components/chakra/feedback/skeleton.py @@ -1,6 +1,6 @@ """Container to stack elements with spacing.""" -from reflex.components.libs.chakra import ChakraComponent +from reflex.components.chakra import ChakraComponent from reflex.vars import Var diff --git a/reflex/components/feedback/skeleton.pyi b/reflex/components/chakra/feedback/skeleton.pyi similarity index 98% rename from reflex/components/feedback/skeleton.pyi rename to reflex/components/chakra/feedback/skeleton.pyi index 5374c7c1f..a393e5899 100644 --- a/reflex/components/feedback/skeleton.pyi +++ b/reflex/components/chakra/feedback/skeleton.pyi @@ -1,4 +1,4 @@ -"""Stub file for reflex/components/feedback/skeleton.py""" +"""Stub file for reflex/components/chakra/feedback/skeleton.py""" # ------------------- DO NOT EDIT ---------------------- # This file was generated by `scripts/pyi_generator.py`! # ------------------------------------------------------ @@ -7,7 +7,7 @@ from typing import Any, Dict, Literal, Optional, Union, overload from reflex.vars import Var, BaseVar, ComputedVar from reflex.event import EventChain, EventHandler, EventSpec from reflex.style import Style -from reflex.components.libs.chakra import ChakraComponent +from reflex.components.chakra import ChakraComponent from reflex.vars import Var class Skeleton(ChakraComponent): diff --git a/reflex/components/feedback/spinner.py b/reflex/components/chakra/feedback/spinner.py similarity index 88% rename from reflex/components/feedback/spinner.py rename to reflex/components/chakra/feedback/spinner.py index ef3de5498..eed335ce1 100644 --- a/reflex/components/feedback/spinner.py +++ b/reflex/components/chakra/feedback/spinner.py @@ -1,6 +1,6 @@ """Container to stack elements with spacing.""" -from reflex.components.libs.chakra import ChakraComponent, LiteralSpinnerSize +from reflex.components.chakra import ChakraComponent, LiteralSpinnerSize from reflex.vars import Var diff --git a/reflex/components/feedback/spinner.pyi b/reflex/components/chakra/feedback/spinner.pyi similarity index 96% rename from reflex/components/feedback/spinner.pyi rename to reflex/components/chakra/feedback/spinner.pyi index 760851f17..6bd414911 100644 --- a/reflex/components/feedback/spinner.pyi +++ b/reflex/components/chakra/feedback/spinner.pyi @@ -1,4 +1,4 @@ -"""Stub file for reflex/components/feedback/spinner.py""" +"""Stub file for reflex/components/chakra/feedback/spinner.py""" # ------------------- DO NOT EDIT ---------------------- # This file was generated by `scripts/pyi_generator.py`! # ------------------------------------------------------ @@ -7,7 +7,7 @@ from typing import Any, Dict, Literal, Optional, Union, overload from reflex.vars import Var, BaseVar, ComputedVar from reflex.event import EventChain, EventHandler, EventSpec from reflex.style import Style -from reflex.components.libs.chakra import ChakraComponent, LiteralSpinnerSize +from reflex.components.chakra import ChakraComponent, LiteralSpinnerSize from reflex.vars import Var class Spinner(ChakraComponent): diff --git a/reflex/components/forms/__init__.py b/reflex/components/chakra/forms/__init__.py similarity index 84% rename from reflex/components/forms/__init__.py rename to reflex/components/chakra/forms/__init__.py index 05b7a2c12..dd6ec440a 100644 --- a/reflex/components/forms/__init__.py +++ b/reflex/components/chakra/forms/__init__.py @@ -5,14 +5,13 @@ from .checkbox import Checkbox, CheckboxGroup from .colormodeswitch import ( ColorModeButton, ColorModeIcon, + ColorModeScript, ColorModeSwitch, color_mode_cond, ) from .date_picker import DatePicker from .date_time_picker import DateTimePicker -from .debounce import DebounceInput from .editable import Editable, EditableInput, EditablePreview, EditableTextarea -from .editor import Editor, EditorButtonList, EditorOptions from .email import Email from .form import Form, FormControl, FormErrorMessage, FormHelperText, FormLabel from .iconbutton import IconButton @@ -46,18 +45,9 @@ from .select import Option, Select from .slider import Slider, SliderFilledTrack, SliderMark, SliderThumb, SliderTrack from .switch import Switch from .textarea import TextArea -from .upload import ( - Upload, - cancel_upload, - clear_selected_files, - selected_files, -) helpers = [ "color_mode_cond", - "cancel_upload", - "clear_selected_files", - "selected_files", ] __all__ = [f for f in dir() if f[0].isupper()] + helpers # type: ignore diff --git a/reflex/components/forms/button.py b/reflex/components/chakra/forms/button.py similarity index 98% rename from reflex/components/forms/button.py rename to reflex/components/chakra/forms/button.py index 63c34ffae..bbadbf73d 100644 --- a/reflex/components/forms/button.py +++ b/reflex/components/chakra/forms/button.py @@ -1,7 +1,7 @@ """A button component.""" from typing import List -from reflex.components.libs.chakra import ( +from reflex.components.chakra import ( ChakraComponent, LiteralButtonSize, LiteralButtonVariant, @@ -36,6 +36,7 @@ class Button(ChakraComponent): # "lg" | "md" | "sm" | "xs" size: Var[LiteralButtonSize] + # "ghost" | "outline" | "solid" | "link" | "unstyled" variant: Var[LiteralButtonVariant] @@ -76,5 +77,6 @@ class ButtonGroup(ChakraComponent): # "lg" | "md" | "sm" | "xs" size: Var[LiteralButtonSize] + # "ghost" | "outline" | "solid" | "link" | "unstyled" variant: Var[LiteralButtonVariant] diff --git a/reflex/components/forms/button.pyi b/reflex/components/chakra/forms/button.pyi similarity index 99% rename from reflex/components/forms/button.pyi rename to reflex/components/chakra/forms/button.pyi index 1a9f97600..47f2f9222 100644 --- a/reflex/components/forms/button.pyi +++ b/reflex/components/chakra/forms/button.pyi @@ -1,4 +1,4 @@ -"""Stub file for reflex/components/forms/button.py""" +"""Stub file for reflex/components/chakra/forms/button.py""" # ------------------- DO NOT EDIT ---------------------- # This file was generated by `scripts/pyi_generator.py`! # ------------------------------------------------------ @@ -8,7 +8,7 @@ from reflex.vars import Var, BaseVar, ComputedVar from reflex.event import EventChain, EventHandler, EventSpec from reflex.style import Style from typing import List -from reflex.components.libs.chakra import ( +from reflex.components.chakra import ( ChakraComponent, LiteralButtonSize, LiteralButtonVariant, diff --git a/reflex/components/forms/checkbox.py b/reflex/components/chakra/forms/checkbox.py similarity index 98% rename from reflex/components/forms/checkbox.py rename to reflex/components/chakra/forms/checkbox.py index 3f0c5d327..b0e29ea16 100644 --- a/reflex/components/forms/checkbox.py +++ b/reflex/components/chakra/forms/checkbox.py @@ -3,7 +3,7 @@ from __future__ import annotations from typing import Any, Union -from reflex.components.libs.chakra import ( +from reflex.components.chakra import ( ChakraComponent, LiteralColorScheme, LiteralTagSize, diff --git a/reflex/components/forms/checkbox.pyi b/reflex/components/chakra/forms/checkbox.pyi similarity index 98% rename from reflex/components/forms/checkbox.pyi rename to reflex/components/chakra/forms/checkbox.pyi index 84009769d..024066d01 100644 --- a/reflex/components/forms/checkbox.pyi +++ b/reflex/components/chakra/forms/checkbox.pyi @@ -1,4 +1,4 @@ -"""Stub file for reflex/components/forms/checkbox.py""" +"""Stub file for reflex/components/chakra/forms/checkbox.py""" # ------------------- DO NOT EDIT ---------------------- # This file was generated by `scripts/pyi_generator.py`! # ------------------------------------------------------ @@ -8,11 +8,7 @@ from reflex.vars import Var, BaseVar, ComputedVar from reflex.event import EventChain, EventHandler, EventSpec from reflex.style import Style from typing import Any, Union -from reflex.components.libs.chakra import ( - ChakraComponent, - LiteralColorScheme, - LiteralTagSize, -) +from reflex.components.chakra import ChakraComponent, LiteralColorScheme, LiteralTagSize from reflex.constants import EventTriggers from reflex.vars import Var diff --git a/reflex/components/forms/colormodeswitch.py b/reflex/components/chakra/forms/colormodeswitch.py similarity index 91% rename from reflex/components/forms/colormodeswitch.py rename to reflex/components/chakra/forms/colormodeswitch.py index 443e680f9..10de7a5a2 100644 --- a/reflex/components/forms/colormodeswitch.py +++ b/reflex/components/chakra/forms/colormodeswitch.py @@ -18,9 +18,10 @@ from __future__ import annotations from typing import Any +from reflex.components.chakra import ChakraComponent +from reflex.components.chakra.media.icon import Icon from reflex.components.component import BaseComponent, Component -from reflex.components.layout.cond import Cond, cond -from reflex.components.media.icon import Icon +from reflex.components.core.cond import Cond, cond from reflex.style import color_mode, toggle_color_mode from reflex.vars import Var @@ -114,3 +115,10 @@ class ColorModeButton(Button): on_click=toggle_color_mode, **props, ) + + +class ColorModeScript(ChakraComponent): + """Chakra color mode script.""" + + tag = "ColorModeScript" + initialColorMode = "light" diff --git a/reflex/components/forms/colormodeswitch.pyi b/reflex/components/chakra/forms/colormodeswitch.pyi similarity index 83% rename from reflex/components/forms/colormodeswitch.pyi rename to reflex/components/chakra/forms/colormodeswitch.pyi index 2b64eb067..e70ea42dd 100644 --- a/reflex/components/forms/colormodeswitch.pyi +++ b/reflex/components/chakra/forms/colormodeswitch.pyi @@ -1,4 +1,4 @@ -"""Stub file for reflex/components/forms/colormodeswitch.py""" +"""Stub file for reflex/components/chakra/forms/colormodeswitch.py""" # ------------------- DO NOT EDIT ---------------------- # This file was generated by `scripts/pyi_generator.py`! # ------------------------------------------------------ @@ -8,9 +8,10 @@ from reflex.vars import Var, BaseVar, ComputedVar from reflex.event import EventChain, EventHandler, EventSpec from reflex.style import Style from typing import Any +from reflex.components.chakra import ChakraComponent +from reflex.components.chakra.media.icon import Icon from reflex.components.component import BaseComponent, Component -from reflex.components.layout.cond import Cond, cond -from reflex.components.media.icon import Icon +from reflex.components.core.cond import Cond, cond from reflex.style import color_mode, toggle_color_mode from reflex.vars import Var from .button import Button @@ -398,3 +399,82 @@ class ColorModeButton(Button): The switch component. """ ... + +class ColorModeScript(ChakraComponent): + @overload + @classmethod + def create( # type: ignore + cls, + *children, + style: Optional[Style] = None, + key: Optional[Any] = None, + id: Optional[Any] = None, + class_name: Optional[Any] = None, + autofocus: Optional[bool] = None, + custom_attrs: Optional[Dict[str, Union[Var, str]]] = None, + on_blur: Optional[ + Union[EventHandler, EventSpec, list, function, BaseVar] + ] = None, + on_click: Optional[ + Union[EventHandler, EventSpec, list, function, BaseVar] + ] = None, + on_context_menu: Optional[ + Union[EventHandler, EventSpec, list, function, BaseVar] + ] = None, + on_double_click: Optional[ + Union[EventHandler, EventSpec, list, function, BaseVar] + ] = None, + on_focus: Optional[ + Union[EventHandler, EventSpec, list, function, BaseVar] + ] = None, + on_mount: Optional[ + Union[EventHandler, EventSpec, list, function, BaseVar] + ] = None, + on_mouse_down: Optional[ + Union[EventHandler, EventSpec, list, function, BaseVar] + ] = None, + on_mouse_enter: Optional[ + Union[EventHandler, EventSpec, list, function, BaseVar] + ] = None, + on_mouse_leave: Optional[ + Union[EventHandler, EventSpec, list, function, BaseVar] + ] = None, + on_mouse_move: Optional[ + Union[EventHandler, EventSpec, list, function, BaseVar] + ] = None, + on_mouse_out: Optional[ + Union[EventHandler, EventSpec, list, function, BaseVar] + ] = None, + on_mouse_over: Optional[ + Union[EventHandler, EventSpec, list, function, BaseVar] + ] = None, + on_mouse_up: Optional[ + Union[EventHandler, EventSpec, list, function, BaseVar] + ] = None, + on_scroll: Optional[ + Union[EventHandler, EventSpec, list, function, BaseVar] + ] = None, + on_unmount: Optional[ + Union[EventHandler, EventSpec, list, function, BaseVar] + ] = None, + **props + ) -> "ColorModeScript": + """Create the component. + + Args: + *children: The children of the component. + style: The style of the component. + key: A unique key for the component. + id: The id for the component. + class_name: The class name for the component. + autofocus: Whether the component should take the focus once the page is loaded + custom_attrs: custom attribute + **props: The props of the component. + + Returns: + The component. + + Raises: + TypeError: If an invalid child is passed. + """ + ... diff --git a/reflex/components/forms/date_picker.py b/reflex/components/chakra/forms/date_picker.py similarity index 77% rename from reflex/components/forms/date_picker.py rename to reflex/components/chakra/forms/date_picker.py index 223630178..350e700b6 100644 --- a/reflex/components/forms/date_picker.py +++ b/reflex/components/chakra/forms/date_picker.py @@ -1,6 +1,6 @@ """A date input component.""" -from reflex.components.forms.input import Input +from reflex.components.chakra.forms.input import Input from reflex.vars import Var diff --git a/reflex/components/forms/date_picker.pyi b/reflex/components/chakra/forms/date_picker.pyi similarity index 97% rename from reflex/components/forms/date_picker.pyi rename to reflex/components/chakra/forms/date_picker.pyi index 537c349d1..e59fa43d4 100644 --- a/reflex/components/forms/date_picker.pyi +++ b/reflex/components/chakra/forms/date_picker.pyi @@ -1,4 +1,4 @@ -"""Stub file for reflex/components/forms/date_picker.py""" +"""Stub file for reflex/components/chakra/forms/date_picker.py""" # ------------------- DO NOT EDIT ---------------------- # This file was generated by `scripts/pyi_generator.py`! # ------------------------------------------------------ @@ -7,7 +7,7 @@ from typing import Any, Dict, Literal, Optional, Union, overload from reflex.vars import Var, BaseVar, ComputedVar from reflex.event import EventChain, EventHandler, EventSpec from reflex.style import Style -from reflex.components.forms.input import Input +from reflex.components.chakra.forms.input import Input from reflex.vars import Var class DatePicker(Input): diff --git a/reflex/components/forms/date_time_picker.py b/reflex/components/chakra/forms/date_time_picker.py similarity index 80% rename from reflex/components/forms/date_time_picker.py rename to reflex/components/chakra/forms/date_time_picker.py index 5879d4f10..ae245a907 100644 --- a/reflex/components/forms/date_time_picker.py +++ b/reflex/components/chakra/forms/date_time_picker.py @@ -1,6 +1,6 @@ """A datetime-local input component.""" -from reflex.components.forms.input import Input +from reflex.components.chakra.forms.input import Input from reflex.vars import Var diff --git a/reflex/components/forms/date_time_picker.pyi b/reflex/components/chakra/forms/date_time_picker.pyi similarity index 97% rename from reflex/components/forms/date_time_picker.pyi rename to reflex/components/chakra/forms/date_time_picker.pyi index 4aa99df83..f205749c0 100644 --- a/reflex/components/forms/date_time_picker.pyi +++ b/reflex/components/chakra/forms/date_time_picker.pyi @@ -1,4 +1,4 @@ -"""Stub file for reflex/components/forms/date_time_picker.py""" +"""Stub file for reflex/components/chakra/forms/date_time_picker.py""" # ------------------- DO NOT EDIT ---------------------- # This file was generated by `scripts/pyi_generator.py`! # ------------------------------------------------------ @@ -7,7 +7,7 @@ from typing import Any, Dict, Literal, Optional, Union, overload from reflex.vars import Var, BaseVar, ComputedVar from reflex.event import EventChain, EventHandler, EventSpec from reflex.style import Style -from reflex.components.forms.input import Input +from reflex.components.chakra.forms.input import Input from reflex.vars import Var class DateTimePicker(Input): diff --git a/reflex/components/forms/editable.py b/reflex/components/chakra/forms/editable.py similarity index 97% rename from reflex/components/forms/editable.py rename to reflex/components/chakra/forms/editable.py index e963be2ad..d09a90a3f 100644 --- a/reflex/components/forms/editable.py +++ b/reflex/components/chakra/forms/editable.py @@ -3,7 +3,7 @@ from __future__ import annotations from typing import Any, Union -from reflex.components.libs.chakra import ChakraComponent +from reflex.components.chakra import ChakraComponent from reflex.constants import EventTriggers from reflex.vars import Var diff --git a/reflex/components/forms/editable.pyi b/reflex/components/chakra/forms/editable.pyi similarity index 99% rename from reflex/components/forms/editable.pyi rename to reflex/components/chakra/forms/editable.pyi index bfef91b3b..26bb23e5b 100644 --- a/reflex/components/forms/editable.pyi +++ b/reflex/components/chakra/forms/editable.pyi @@ -1,4 +1,4 @@ -"""Stub file for reflex/components/forms/editable.py""" +"""Stub file for reflex/components/chakra/forms/editable.py""" # ------------------- DO NOT EDIT ---------------------- # This file was generated by `scripts/pyi_generator.py`! # ------------------------------------------------------ @@ -8,7 +8,7 @@ from reflex.vars import Var, BaseVar, ComputedVar from reflex.event import EventChain, EventHandler, EventSpec from reflex.style import Style from typing import Any, Union -from reflex.components.libs.chakra import ChakraComponent +from reflex.components.chakra import ChakraComponent from reflex.constants import EventTriggers from reflex.vars import Var diff --git a/reflex/components/forms/email.py b/reflex/components/chakra/forms/email.py similarity index 77% rename from reflex/components/forms/email.py rename to reflex/components/chakra/forms/email.py index c544851f5..18fadef2d 100644 --- a/reflex/components/forms/email.py +++ b/reflex/components/chakra/forms/email.py @@ -1,6 +1,6 @@ """An email input component.""" -from reflex.components.forms.input import Input +from reflex.components.chakra.forms.input import Input from reflex.vars import Var diff --git a/reflex/components/forms/email.pyi b/reflex/components/chakra/forms/email.pyi similarity index 98% rename from reflex/components/forms/email.pyi rename to reflex/components/chakra/forms/email.pyi index d15a09181..51f90957d 100644 --- a/reflex/components/forms/email.pyi +++ b/reflex/components/chakra/forms/email.pyi @@ -1,4 +1,4 @@ -"""Stub file for reflex/components/forms/email.py""" +"""Stub file for reflex/components/chakra/forms/email.py""" # ------------------- DO NOT EDIT ---------------------- # This file was generated by `scripts/pyi_generator.py`! # ------------------------------------------------------ @@ -7,7 +7,7 @@ from typing import Any, Dict, Literal, Optional, Union, overload from reflex.vars import Var, BaseVar, ComputedVar from reflex.event import EventChain, EventHandler, EventSpec from reflex.style import Style -from reflex.components.forms.input import Input +from reflex.components.chakra.forms.input import Input from reflex.vars import Var class Email(Input): diff --git a/reflex/components/forms/form.py b/reflex/components/chakra/forms/form.py similarity index 99% rename from reflex/components/forms/form.py rename to reflex/components/chakra/forms/form.py index cf4124a49..5d38f66b4 100644 --- a/reflex/components/forms/form.py +++ b/reflex/components/chakra/forms/form.py @@ -6,8 +6,8 @@ from typing import Any, Dict, Iterator from jinja2 import Environment +from reflex.components.chakra import ChakraComponent from reflex.components.component import Component -from reflex.components.libs.chakra import ChakraComponent from reflex.components.tags import Tag from reflex.constants import Dirs, EventTriggers from reflex.event import EventChain diff --git a/reflex/components/forms/form.pyi b/reflex/components/chakra/forms/form.pyi similarity index 99% rename from reflex/components/forms/form.pyi rename to reflex/components/chakra/forms/form.pyi index 5af7df927..fd915a736 100644 --- a/reflex/components/forms/form.pyi +++ b/reflex/components/chakra/forms/form.pyi @@ -1,4 +1,4 @@ -"""Stub file for reflex/components/forms/form.py""" +"""Stub file for reflex/components/chakra/forms/form.py""" # ------------------- DO NOT EDIT ---------------------- # This file was generated by `scripts/pyi_generator.py`! # ------------------------------------------------------ @@ -10,8 +10,8 @@ from reflex.style import Style from hashlib import md5 from typing import Any, Dict, Iterator from jinja2 import Environment +from reflex.components.chakra import ChakraComponent from reflex.components.component import Component -from reflex.components.libs.chakra import ChakraComponent from reflex.components.tags import Tag from reflex.constants import Dirs, EventTriggers from reflex.event import EventChain diff --git a/reflex/components/forms/iconbutton.py b/reflex/components/chakra/forms/iconbutton.py similarity index 93% rename from reflex/components/forms/iconbutton.py rename to reflex/components/chakra/forms/iconbutton.py index ac5549c12..1a6571175 100644 --- a/reflex/components/forms/iconbutton.py +++ b/reflex/components/chakra/forms/iconbutton.py @@ -2,8 +2,8 @@ from typing import Optional +from reflex.components.chakra.typography.text import Text from reflex.components.component import Component -from reflex.components.typography.text import Text from reflex.vars import Var diff --git a/reflex/components/forms/iconbutton.pyi b/reflex/components/chakra/forms/iconbutton.pyi similarity index 97% rename from reflex/components/forms/iconbutton.pyi rename to reflex/components/chakra/forms/iconbutton.pyi index 1e2f20203..245f7b2f0 100644 --- a/reflex/components/forms/iconbutton.pyi +++ b/reflex/components/chakra/forms/iconbutton.pyi @@ -1,4 +1,4 @@ -"""Stub file for reflex/components/forms/iconbutton.py""" +"""Stub file for reflex/components/chakra/forms/iconbutton.py""" # ------------------- DO NOT EDIT ---------------------- # This file was generated by `scripts/pyi_generator.py`! # ------------------------------------------------------ @@ -8,8 +8,8 @@ from reflex.vars import Var, BaseVar, ComputedVar from reflex.event import EventChain, EventHandler, EventSpec from reflex.style import Style from typing import Optional +from reflex.components.chakra.typography.text import Text from reflex.components.component import Component -from reflex.components.typography.text import Text from reflex.vars import Var class IconButton(Text): diff --git a/reflex/components/forms/input.py b/reflex/components/chakra/forms/input.py similarity index 97% rename from reflex/components/forms/input.py rename to reflex/components/chakra/forms/input.py index 48f6009fc..9b6edb369 100644 --- a/reflex/components/forms/input.py +++ b/reflex/components/chakra/forms/input.py @@ -2,13 +2,13 @@ from typing import Any, Dict -from reflex.components.component import Component -from reflex.components.forms.debounce import DebounceInput -from reflex.components.libs.chakra import ( +from reflex.components.chakra import ( ChakraComponent, LiteralButtonSize, LiteralInputVariant, ) +from reflex.components.component import Component +from reflex.components.core.debounce import DebounceInput from reflex.components.literals import LiteralInputType from reflex.constants import EventTriggers, MemoizationMode from reflex.utils import imports diff --git a/reflex/components/forms/input.pyi b/reflex/components/chakra/forms/input.pyi similarity index 99% rename from reflex/components/forms/input.pyi rename to reflex/components/chakra/forms/input.pyi index a0266c5a0..3c7ee8826 100644 --- a/reflex/components/forms/input.pyi +++ b/reflex/components/chakra/forms/input.pyi @@ -1,4 +1,4 @@ -"""Stub file for reflex/components/forms/input.py""" +"""Stub file for reflex/components/chakra/forms/input.py""" # ------------------- DO NOT EDIT ---------------------- # This file was generated by `scripts/pyi_generator.py`! # ------------------------------------------------------ @@ -8,13 +8,13 @@ from reflex.vars import Var, BaseVar, ComputedVar from reflex.event import EventChain, EventHandler, EventSpec from reflex.style import Style from typing import Any, Dict -from reflex.components.component import Component -from reflex.components.forms.debounce import DebounceInput -from reflex.components.libs.chakra import ( +from reflex.components.chakra import ( ChakraComponent, LiteralButtonSize, LiteralInputVariant, ) +from reflex.components.component import Component +from reflex.components.core.debounce import DebounceInput from reflex.components.literals import LiteralInputType from reflex.constants import EventTriggers, MemoizationMode from reflex.utils import imports diff --git a/reflex/components/forms/multiselect.py b/reflex/components/chakra/forms/multiselect.py similarity index 100% rename from reflex/components/forms/multiselect.py rename to reflex/components/chakra/forms/multiselect.py diff --git a/reflex/components/forms/numberinput.py b/reflex/components/chakra/forms/numberinput.py similarity index 98% rename from reflex/components/forms/numberinput.py rename to reflex/components/chakra/forms/numberinput.py index 1dd58d192..c6ed8df6d 100644 --- a/reflex/components/forms/numberinput.py +++ b/reflex/components/chakra/forms/numberinput.py @@ -3,12 +3,12 @@ from numbers import Number from typing import Any, Dict -from reflex.components.component import Component -from reflex.components.libs.chakra import ( +from reflex.components.chakra import ( ChakraComponent, LiteralButtonSize, LiteralInputVariant, ) +from reflex.components.component import Component from reflex.constants import EventTriggers from reflex.vars import Var diff --git a/reflex/components/forms/numberinput.pyi b/reflex/components/chakra/forms/numberinput.pyi similarity index 99% rename from reflex/components/forms/numberinput.pyi rename to reflex/components/chakra/forms/numberinput.pyi index 1fe3eb8af..017040989 100644 --- a/reflex/components/forms/numberinput.pyi +++ b/reflex/components/chakra/forms/numberinput.pyi @@ -1,4 +1,4 @@ -"""Stub file for reflex/components/forms/numberinput.py""" +"""Stub file for reflex/components/chakra/forms/numberinput.py""" # ------------------- DO NOT EDIT ---------------------- # This file was generated by `scripts/pyi_generator.py`! # ------------------------------------------------------ @@ -9,12 +9,12 @@ from reflex.event import EventChain, EventHandler, EventSpec from reflex.style import Style from numbers import Number from typing import Any, Dict -from reflex.components.component import Component -from reflex.components.libs.chakra import ( +from reflex.components.chakra import ( ChakraComponent, LiteralButtonSize, LiteralInputVariant, ) +from reflex.components.component import Component from reflex.constants import EventTriggers from reflex.vars import Var diff --git a/reflex/components/forms/password.py b/reflex/components/chakra/forms/password.py similarity index 78% rename from reflex/components/forms/password.py rename to reflex/components/chakra/forms/password.py index 98fc0a463..100bb6151 100644 --- a/reflex/components/forms/password.py +++ b/reflex/components/chakra/forms/password.py @@ -1,6 +1,6 @@ """A password input component.""" -from reflex.components.forms.input import Input +from reflex.components.chakra.forms.input import Input from reflex.vars import Var diff --git a/reflex/components/forms/password.pyi b/reflex/components/chakra/forms/password.pyi similarity index 97% rename from reflex/components/forms/password.pyi rename to reflex/components/chakra/forms/password.pyi index 334e9f1a9..c9a4ec026 100644 --- a/reflex/components/forms/password.pyi +++ b/reflex/components/chakra/forms/password.pyi @@ -1,4 +1,4 @@ -"""Stub file for reflex/components/forms/password.py""" +"""Stub file for reflex/components/chakra/forms/password.py""" # ------------------- DO NOT EDIT ---------------------- # This file was generated by `scripts/pyi_generator.py`! # ------------------------------------------------------ @@ -7,7 +7,7 @@ from typing import Any, Dict, Literal, Optional, Union, overload from reflex.vars import Var, BaseVar, ComputedVar from reflex.event import EventChain, EventHandler, EventSpec from reflex.style import Style -from reflex.components.forms.input import Input +from reflex.components.chakra.forms.input import Input from reflex.vars import Var class Password(Input): diff --git a/reflex/components/forms/pininput.py b/reflex/components/chakra/forms/pininput.py similarity index 98% rename from reflex/components/forms/pininput.py rename to reflex/components/chakra/forms/pininput.py index 35e27f6f9..d57c9acaf 100644 --- a/reflex/components/forms/pininput.py +++ b/reflex/components/chakra/forms/pininput.py @@ -3,8 +3,8 @@ from __future__ import annotations from typing import Any, Optional, Union +from reflex.components.chakra import ChakraComponent, LiteralInputVariant from reflex.components.component import Component -from reflex.components.libs.chakra import ChakraComponent, LiteralInputVariant from reflex.components.tags.tag import Tag from reflex.constants import EventTriggers from reflex.utils import format diff --git a/reflex/components/forms/pininput.pyi b/reflex/components/chakra/forms/pininput.pyi similarity index 98% rename from reflex/components/forms/pininput.pyi rename to reflex/components/chakra/forms/pininput.pyi index 9aa24d22a..f255b7db1 100644 --- a/reflex/components/forms/pininput.pyi +++ b/reflex/components/chakra/forms/pininput.pyi @@ -1,4 +1,4 @@ -"""Stub file for reflex/components/forms/pininput.py""" +"""Stub file for reflex/components/chakra/forms/pininput.py""" # ------------------- DO NOT EDIT ---------------------- # This file was generated by `scripts/pyi_generator.py`! # ------------------------------------------------------ @@ -8,8 +8,8 @@ from reflex.vars import Var, BaseVar, ComputedVar from reflex.event import EventChain, EventHandler, EventSpec from reflex.style import Style from typing import Any, Optional, Union +from reflex.components.chakra import ChakraComponent, LiteralInputVariant from reflex.components.component import Component -from reflex.components.libs.chakra import ChakraComponent, LiteralInputVariant from reflex.components.tags.tag import Tag from reflex.constants import EventTriggers from reflex.utils import format diff --git a/reflex/components/forms/radio.py b/reflex/components/chakra/forms/radio.py similarity index 94% rename from reflex/components/forms/radio.py rename to reflex/components/chakra/forms/radio.py index ecf5afa52..67ad9200b 100644 --- a/reflex/components/forms/radio.py +++ b/reflex/components/chakra/forms/radio.py @@ -3,10 +3,10 @@ from typing import Any, Dict, List, Union +from reflex.components.chakra import ChakraComponent +from reflex.components.chakra.typography.text import Text from reflex.components.component import Component -from reflex.components.layout.foreach import Foreach -from reflex.components.libs.chakra import ChakraComponent -from reflex.components.typography.text import Text +from reflex.components.core.foreach import Foreach from reflex.constants import EventTriggers from reflex.utils.types import _issubclass from reflex.vars import Var diff --git a/reflex/components/forms/radio.pyi b/reflex/components/chakra/forms/radio.pyi similarity index 97% rename from reflex/components/forms/radio.pyi rename to reflex/components/chakra/forms/radio.pyi index dd1ab7eea..d48cb6c33 100644 --- a/reflex/components/forms/radio.pyi +++ b/reflex/components/chakra/forms/radio.pyi @@ -1,4 +1,4 @@ -"""Stub file for reflex/components/forms/radio.py""" +"""Stub file for reflex/components/chakra/forms/radio.py""" # ------------------- DO NOT EDIT ---------------------- # This file was generated by `scripts/pyi_generator.py`! # ------------------------------------------------------ @@ -8,10 +8,10 @@ from reflex.vars import Var, BaseVar, ComputedVar from reflex.event import EventChain, EventHandler, EventSpec from reflex.style import Style from typing import Any, Dict, List, Union +from reflex.components.chakra import ChakraComponent +from reflex.components.chakra.typography.text import Text from reflex.components.component import Component -from reflex.components.layout.foreach import Foreach -from reflex.components.libs.chakra import ChakraComponent -from reflex.components.typography.text import Text +from reflex.components.core.foreach import Foreach from reflex.constants import EventTriggers from reflex.utils.types import _issubclass from reflex.vars import Var diff --git a/reflex/components/forms/rangeslider.py b/reflex/components/chakra/forms/rangeslider.py similarity index 98% rename from reflex/components/forms/rangeslider.py rename to reflex/components/chakra/forms/rangeslider.py index 44f600bab..6179f3646 100644 --- a/reflex/components/forms/rangeslider.py +++ b/reflex/components/chakra/forms/rangeslider.py @@ -3,8 +3,8 @@ from __future__ import annotations from typing import Any, List, Optional, Union +from reflex.components.chakra import ChakraComponent, LiteralChakraDirection from reflex.components.component import Component -from reflex.components.libs.chakra import ChakraComponent, LiteralChakraDirection from reflex.constants import EventTriggers from reflex.utils import format from reflex.vars import Var diff --git a/reflex/components/forms/rangeslider.pyi b/reflex/components/chakra/forms/rangeslider.pyi similarity index 98% rename from reflex/components/forms/rangeslider.pyi rename to reflex/components/chakra/forms/rangeslider.pyi index c19d8d902..cb76cfbe8 100644 --- a/reflex/components/forms/rangeslider.pyi +++ b/reflex/components/chakra/forms/rangeslider.pyi @@ -1,4 +1,4 @@ -"""Stub file for reflex/components/forms/rangeslider.py""" +"""Stub file for reflex/components/chakra/forms/rangeslider.py""" # ------------------- DO NOT EDIT ---------------------- # This file was generated by `scripts/pyi_generator.py`! # ------------------------------------------------------ @@ -8,8 +8,8 @@ from reflex.vars import Var, BaseVar, ComputedVar from reflex.event import EventChain, EventHandler, EventSpec from reflex.style import Style from typing import Any, List, Optional, Union +from reflex.components.chakra import ChakraComponent, LiteralChakraDirection from reflex.components.component import Component -from reflex.components.libs.chakra import ChakraComponent, LiteralChakraDirection from reflex.constants import EventTriggers from reflex.utils import format from reflex.vars import Var diff --git a/reflex/components/forms/select.py b/reflex/components/chakra/forms/select.py similarity index 94% rename from reflex/components/forms/select.py rename to reflex/components/chakra/forms/select.py index 61c3dd28a..c898f40d9 100644 --- a/reflex/components/forms/select.py +++ b/reflex/components/chakra/forms/select.py @@ -2,10 +2,10 @@ from typing import Any, Dict, List, Union +from reflex.components.chakra import ChakraComponent, LiteralInputVariant +from reflex.components.chakra.typography.text import Text from reflex.components.component import Component -from reflex.components.layout.foreach import Foreach -from reflex.components.libs.chakra import ChakraComponent, LiteralInputVariant -from reflex.components.typography.text import Text +from reflex.components.core.foreach import Foreach from reflex.constants import EventTriggers from reflex.utils.types import _issubclass from reflex.vars import Var diff --git a/reflex/components/forms/select.pyi b/reflex/components/chakra/forms/select.pyi similarity index 97% rename from reflex/components/forms/select.pyi rename to reflex/components/chakra/forms/select.pyi index 33148dfe7..a443896e4 100644 --- a/reflex/components/forms/select.pyi +++ b/reflex/components/chakra/forms/select.pyi @@ -1,4 +1,4 @@ -"""Stub file for reflex/components/forms/select.py""" +"""Stub file for reflex/components/chakra/forms/select.py""" # ------------------- DO NOT EDIT ---------------------- # This file was generated by `scripts/pyi_generator.py`! # ------------------------------------------------------ @@ -8,10 +8,10 @@ from reflex.vars import Var, BaseVar, ComputedVar from reflex.event import EventChain, EventHandler, EventSpec from reflex.style import Style from typing import Any, Dict, List, Union +from reflex.components.chakra import ChakraComponent, LiteralInputVariant +from reflex.components.chakra.typography.text import Text from reflex.components.component import Component -from reflex.components.layout.foreach import Foreach -from reflex.components.libs.chakra import ChakraComponent, LiteralInputVariant -from reflex.components.typography.text import Text +from reflex.components.core.foreach import Foreach from reflex.constants import EventTriggers from reflex.utils.types import _issubclass from reflex.vars import Var diff --git a/reflex/components/forms/slider.py b/reflex/components/chakra/forms/slider.py similarity index 94% rename from reflex/components/forms/slider.py rename to reflex/components/chakra/forms/slider.py index ebf21ce14..69eb6ac9f 100644 --- a/reflex/components/forms/slider.py +++ b/reflex/components/chakra/forms/slider.py @@ -1,14 +1,15 @@ """A slider component.""" from __future__ import annotations -from typing import Any, Union +from typing import Any, Literal, Union +from reflex.components.chakra import ChakraComponent, LiteralChakraDirection from reflex.components.component import Component -from reflex.components.graphing.recharts.recharts import LiteralLayout -from reflex.components.libs.chakra import ChakraComponent, LiteralChakraDirection from reflex.constants import EventTriggers from reflex.vars import Var +LiteralLayout = Literal["horizontal", "vertical"] + class Slider(ChakraComponent): """The wrapper that provides context and functionality for all children.""" diff --git a/reflex/components/forms/slider.pyi b/reflex/components/chakra/forms/slider.pyi similarity index 98% rename from reflex/components/forms/slider.pyi rename to reflex/components/chakra/forms/slider.pyi index 3304d6850..5bc500930 100644 --- a/reflex/components/forms/slider.pyi +++ b/reflex/components/chakra/forms/slider.pyi @@ -1,4 +1,4 @@ -"""Stub file for reflex/components/forms/slider.py""" +"""Stub file for reflex/components/chakra/forms/slider.py""" # ------------------- DO NOT EDIT ---------------------- # This file was generated by `scripts/pyi_generator.py`! # ------------------------------------------------------ @@ -7,13 +7,14 @@ from typing import Any, Dict, Literal, Optional, Union, overload from reflex.vars import Var, BaseVar, ComputedVar from reflex.event import EventChain, EventHandler, EventSpec from reflex.style import Style -from typing import Any, Union +from typing import Any, Literal, Union +from reflex.components.chakra import ChakraComponent, LiteralChakraDirection from reflex.components.component import Component -from reflex.components.graphing.recharts.recharts import LiteralLayout -from reflex.components.libs.chakra import ChakraComponent, LiteralChakraDirection from reflex.constants import EventTriggers from reflex.vars import Var +LiteralLayout = Literal["horizontal", "vertical"] + class Slider(ChakraComponent): def get_event_triggers(self) -> dict[str, Union[Var, Any]]: ... @overload diff --git a/reflex/components/forms/switch.py b/reflex/components/chakra/forms/switch.py similarity index 95% rename from reflex/components/forms/switch.py rename to reflex/components/chakra/forms/switch.py index 301a0bcec..6079de2bb 100644 --- a/reflex/components/forms/switch.py +++ b/reflex/components/chakra/forms/switch.py @@ -3,7 +3,7 @@ from __future__ import annotations from typing import Any, Union -from reflex.components.libs.chakra import ChakraComponent, LiteralColorScheme +from reflex.components.chakra import ChakraComponent, LiteralColorScheme from reflex.constants import EventTriggers from reflex.vars import Var diff --git a/reflex/components/forms/switch.pyi b/reflex/components/chakra/forms/switch.pyi similarity index 97% rename from reflex/components/forms/switch.pyi rename to reflex/components/chakra/forms/switch.pyi index d1bd61cc7..1af43b2f1 100644 --- a/reflex/components/forms/switch.pyi +++ b/reflex/components/chakra/forms/switch.pyi @@ -1,4 +1,4 @@ -"""Stub file for reflex/components/forms/switch.py""" +"""Stub file for reflex/components/chakra/forms/switch.py""" # ------------------- DO NOT EDIT ---------------------- # This file was generated by `scripts/pyi_generator.py`! # ------------------------------------------------------ @@ -8,7 +8,7 @@ from reflex.vars import Var, BaseVar, ComputedVar from reflex.event import EventChain, EventHandler, EventSpec from reflex.style import Style from typing import Any, Union -from reflex.components.libs.chakra import ChakraComponent, LiteralColorScheme +from reflex.components.chakra import ChakraComponent, LiteralColorScheme from reflex.constants import EventTriggers from reflex.vars import Var diff --git a/reflex/components/forms/textarea.py b/reflex/components/chakra/forms/textarea.py similarity index 94% rename from reflex/components/forms/textarea.py rename to reflex/components/chakra/forms/textarea.py index a7f3a9b3d..1591a35ea 100644 --- a/reflex/components/forms/textarea.py +++ b/reflex/components/chakra/forms/textarea.py @@ -3,9 +3,9 @@ from __future__ import annotations from typing import Any, Union +from reflex.components.chakra import ChakraComponent, LiteralInputVariant from reflex.components.component import Component -from reflex.components.forms.debounce import DebounceInput -from reflex.components.libs.chakra import ChakraComponent, LiteralInputVariant +from reflex.components.core.debounce import DebounceInput from reflex.constants import EventTriggers from reflex.vars import Var diff --git a/reflex/components/forms/textarea.pyi b/reflex/components/chakra/forms/textarea.pyi similarity index 96% rename from reflex/components/forms/textarea.pyi rename to reflex/components/chakra/forms/textarea.pyi index 4f3844e78..48358e2ad 100644 --- a/reflex/components/forms/textarea.pyi +++ b/reflex/components/chakra/forms/textarea.pyi @@ -1,4 +1,4 @@ -"""Stub file for reflex/components/forms/textarea.py""" +"""Stub file for reflex/components/chakra/forms/textarea.py""" # ------------------- DO NOT EDIT ---------------------- # This file was generated by `scripts/pyi_generator.py`! # ------------------------------------------------------ @@ -8,9 +8,9 @@ from reflex.vars import Var, BaseVar, ComputedVar from reflex.event import EventChain, EventHandler, EventSpec from reflex.style import Style from typing import Any, Union +from reflex.components.chakra import ChakraComponent, LiteralInputVariant from reflex.components.component import Component -from reflex.components.forms.debounce import DebounceInput -from reflex.components.libs.chakra import ChakraComponent, LiteralInputVariant +from reflex.components.core.debounce import DebounceInput from reflex.constants import EventTriggers from reflex.vars import Var diff --git a/reflex/components/layout/__init__.py b/reflex/components/chakra/layout/__init__.py similarity index 51% rename from reflex/components/layout/__init__.py rename to reflex/components/chakra/layout/__init__.py index fe18a6716..1f49d98ea 100644 --- a/reflex/components/layout/__init__.py +++ b/reflex/components/chakra/layout/__init__.py @@ -4,31 +4,12 @@ from .aspect_ratio import AspectRatio from .box import Box from .card import Card, CardBody, CardFooter, CardHeader from .center import Center, Circle, Square -from .cond import Cond, cond from .container import Container from .flex import Flex -from .foreach import Foreach -from .fragment import Fragment from .grid import Grid, GridItem, ResponsiveGrid from .html import Html -from .responsive import ( - desktop_only, - mobile_and_tablet, - mobile_only, - tablet_and_desktop, - tablet_only, -) from .spacer import Spacer from .stack import Hstack, Stack, Vstack from .wrap import Wrap, WrapItem -helpers = [ - "cond", - "desktop_only", - "mobile_and_tablet", - "mobile_only", - "tablet_and_desktop", - "tablet_only", -] - -__all__ = [f for f in dir() if f[0].isupper()] + helpers # type: ignore +__all__ = [f for f in dir() if f[0].isupper()] # type: ignore diff --git a/reflex/components/layout/aspect_ratio.py b/reflex/components/chakra/layout/aspect_ratio.py similarity index 81% rename from reflex/components/layout/aspect_ratio.py rename to reflex/components/chakra/layout/aspect_ratio.py index c12101632..5d0328d7e 100644 --- a/reflex/components/layout/aspect_ratio.py +++ b/reflex/components/chakra/layout/aspect_ratio.py @@ -1,6 +1,6 @@ """A AspectRatio component.""" -from reflex.components.libs.chakra import ChakraComponent +from reflex.components.chakra import ChakraComponent from reflex.vars import Var diff --git a/reflex/components/layout/aspect_ratio.pyi b/reflex/components/chakra/layout/aspect_ratio.pyi similarity index 96% rename from reflex/components/layout/aspect_ratio.pyi rename to reflex/components/chakra/layout/aspect_ratio.pyi index b8203467c..1cd574abc 100644 --- a/reflex/components/layout/aspect_ratio.pyi +++ b/reflex/components/chakra/layout/aspect_ratio.pyi @@ -1,4 +1,4 @@ -"""Stub file for reflex/components/layout/aspect_ratio.py""" +"""Stub file for reflex/components/chakra/layout/aspect_ratio.py""" # ------------------- DO NOT EDIT ---------------------- # This file was generated by `scripts/pyi_generator.py`! # ------------------------------------------------------ @@ -7,7 +7,7 @@ from typing import Any, Dict, Literal, Optional, Union, overload from reflex.vars import Var, BaseVar, ComputedVar from reflex.event import EventChain, EventHandler, EventSpec from reflex.style import Style -from reflex.components.libs.chakra import ChakraComponent +from reflex.components.chakra import ChakraComponent from reflex.vars import Var class AspectRatio(ChakraComponent): diff --git a/reflex/components/layout/box.py b/reflex/components/chakra/layout/box.py similarity index 92% rename from reflex/components/layout/box.py rename to reflex/components/chakra/layout/box.py index 6ba2a53b2..497e514b8 100644 --- a/reflex/components/layout/box.py +++ b/reflex/components/chakra/layout/box.py @@ -1,6 +1,6 @@ """A box component that can contain other components.""" -from reflex.components.libs.chakra import ChakraComponent +from reflex.components.chakra import ChakraComponent from reflex.components.tags import Tag from reflex.vars import Var diff --git a/reflex/components/layout/box.pyi b/reflex/components/chakra/layout/box.pyi similarity index 96% rename from reflex/components/layout/box.pyi rename to reflex/components/chakra/layout/box.pyi index d2b7a9c7b..ba1f769b8 100644 --- a/reflex/components/layout/box.pyi +++ b/reflex/components/chakra/layout/box.pyi @@ -1,4 +1,4 @@ -"""Stub file for reflex/components/layout/box.py""" +"""Stub file for reflex/components/chakra/layout/box.py""" # ------------------- DO NOT EDIT ---------------------- # This file was generated by `scripts/pyi_generator.py`! # ------------------------------------------------------ @@ -7,7 +7,7 @@ from typing import Any, Dict, Literal, Optional, Union, overload from reflex.vars import Var, BaseVar, ComputedVar from reflex.event import EventChain, EventHandler, EventSpec from reflex.style import Style -from reflex.components.libs.chakra import ChakraComponent +from reflex.components.chakra import ChakraComponent from reflex.components.tags import Tag from reflex.vars import Var diff --git a/reflex/components/layout/card.py b/reflex/components/chakra/layout/card.py similarity index 98% rename from reflex/components/layout/card.py rename to reflex/components/chakra/layout/card.py index 0d382dc73..595c5327f 100644 --- a/reflex/components/layout/card.py +++ b/reflex/components/chakra/layout/card.py @@ -2,13 +2,13 @@ from typing import Optional -from reflex.components.component import Component -from reflex.components.libs.chakra import ( +from reflex.components.chakra import ( ChakraComponent, LiteralCardVariant, LiteralColorScheme, LiteralTagSize, ) +from reflex.components.component import Component from reflex.vars import Var diff --git a/reflex/components/layout/card.pyi b/reflex/components/chakra/layout/card.pyi similarity index 99% rename from reflex/components/layout/card.pyi rename to reflex/components/chakra/layout/card.pyi index e8532894c..6ec404acd 100644 --- a/reflex/components/layout/card.pyi +++ b/reflex/components/chakra/layout/card.pyi @@ -1,4 +1,4 @@ -"""Stub file for reflex/components/layout/card.py""" +"""Stub file for reflex/components/chakra/layout/card.py""" # ------------------- DO NOT EDIT ---------------------- # This file was generated by `scripts/pyi_generator.py`! # ------------------------------------------------------ @@ -8,13 +8,13 @@ from reflex.vars import Var, BaseVar, ComputedVar from reflex.event import EventChain, EventHandler, EventSpec from reflex.style import Style from typing import Optional -from reflex.components.component import Component -from reflex.components.libs.chakra import ( +from reflex.components.chakra import ( ChakraComponent, LiteralCardVariant, LiteralColorScheme, LiteralTagSize, ) +from reflex.components.component import Component from reflex.vars import Var class CardHeader(ChakraComponent): diff --git a/reflex/components/layout/center.py b/reflex/components/chakra/layout/center.py similarity index 85% rename from reflex/components/layout/center.py rename to reflex/components/chakra/layout/center.py index bae35e88c..bc3ced1aa 100644 --- a/reflex/components/layout/center.py +++ b/reflex/components/chakra/layout/center.py @@ -1,6 +1,6 @@ """A box that centers its contents.""" -from reflex.components.libs.chakra import ChakraComponent +from reflex.components.chakra import ChakraComponent class Center(ChakraComponent): diff --git a/reflex/components/layout/center.pyi b/reflex/components/chakra/layout/center.pyi similarity index 98% rename from reflex/components/layout/center.pyi rename to reflex/components/chakra/layout/center.pyi index e1f9192b8..98fbbb84b 100644 --- a/reflex/components/layout/center.pyi +++ b/reflex/components/chakra/layout/center.pyi @@ -1,4 +1,4 @@ -"""Stub file for reflex/components/layout/center.py""" +"""Stub file for reflex/components/chakra/layout/center.py""" # ------------------- DO NOT EDIT ---------------------- # This file was generated by `scripts/pyi_generator.py`! # ------------------------------------------------------ @@ -7,7 +7,7 @@ from typing import Any, Dict, Literal, Optional, Union, overload from reflex.vars import Var, BaseVar, ComputedVar from reflex.event import EventChain, EventHandler, EventSpec from reflex.style import Style -from reflex.components.libs.chakra import ChakraComponent +from reflex.components.chakra import ChakraComponent class Center(ChakraComponent): @overload diff --git a/reflex/components/layout/container.py b/reflex/components/chakra/layout/container.py similarity index 83% rename from reflex/components/layout/container.py rename to reflex/components/chakra/layout/container.py index b57d5813e..26863d018 100644 --- a/reflex/components/layout/container.py +++ b/reflex/components/chakra/layout/container.py @@ -1,6 +1,6 @@ """A flexbox container.""" -from reflex.components.libs.chakra import ChakraComponent +from reflex.components.chakra import ChakraComponent from reflex.vars import Var diff --git a/reflex/components/layout/container.pyi b/reflex/components/chakra/layout/container.pyi similarity index 96% rename from reflex/components/layout/container.pyi rename to reflex/components/chakra/layout/container.pyi index 7b459c8df..22594f4af 100644 --- a/reflex/components/layout/container.pyi +++ b/reflex/components/chakra/layout/container.pyi @@ -1,4 +1,4 @@ -"""Stub file for reflex/components/layout/container.py""" +"""Stub file for reflex/components/chakra/layout/container.py""" # ------------------- DO NOT EDIT ---------------------- # This file was generated by `scripts/pyi_generator.py`! # ------------------------------------------------------ @@ -7,7 +7,7 @@ from typing import Any, Dict, Literal, Optional, Union, overload from reflex.vars import Var, BaseVar, ComputedVar from reflex.event import EventChain, EventHandler, EventSpec from reflex.style import Style -from reflex.components.libs.chakra import ChakraComponent +from reflex.components.chakra import ChakraComponent from reflex.vars import Var class Container(ChakraComponent): diff --git a/reflex/components/layout/flex.py b/reflex/components/chakra/layout/flex.py similarity index 91% rename from reflex/components/layout/flex.py rename to reflex/components/chakra/layout/flex.py index 73cd01e32..ff6e5abce 100644 --- a/reflex/components/layout/flex.py +++ b/reflex/components/chakra/layout/flex.py @@ -2,7 +2,7 @@ from typing import List, Union -from reflex.components.libs.chakra import ChakraComponent +from reflex.components.chakra import ChakraComponent from reflex.vars import Var diff --git a/reflex/components/layout/flex.pyi b/reflex/components/chakra/layout/flex.pyi similarity index 97% rename from reflex/components/layout/flex.pyi rename to reflex/components/chakra/layout/flex.pyi index 85cd6d777..dbb3b36dc 100644 --- a/reflex/components/layout/flex.pyi +++ b/reflex/components/chakra/layout/flex.pyi @@ -1,4 +1,4 @@ -"""Stub file for reflex/components/layout/flex.py""" +"""Stub file for reflex/components/chakra/layout/flex.py""" # ------------------- DO NOT EDIT ---------------------- # This file was generated by `scripts/pyi_generator.py`! # ------------------------------------------------------ @@ -8,7 +8,7 @@ from reflex.vars import Var, BaseVar, ComputedVar from reflex.event import EventChain, EventHandler, EventSpec from reflex.style import Style from typing import List, Union -from reflex.components.libs.chakra import ChakraComponent +from reflex.components.chakra import ChakraComponent from reflex.vars import Var class Flex(ChakraComponent): diff --git a/reflex/components/layout/grid.py b/reflex/components/chakra/layout/grid.py similarity index 98% rename from reflex/components/layout/grid.py rename to reflex/components/chakra/layout/grid.py index 8e62166cc..ee1d8aa33 100644 --- a/reflex/components/layout/grid.py +++ b/reflex/components/chakra/layout/grid.py @@ -2,7 +2,7 @@ from typing import List -from reflex.components.libs.chakra import ChakraComponent +from reflex.components.chakra import ChakraComponent from reflex.vars import Var diff --git a/reflex/components/layout/grid.pyi b/reflex/components/chakra/layout/grid.pyi similarity index 99% rename from reflex/components/layout/grid.pyi rename to reflex/components/chakra/layout/grid.pyi index 4720f2cd5..7195a1579 100644 --- a/reflex/components/layout/grid.pyi +++ b/reflex/components/chakra/layout/grid.pyi @@ -1,4 +1,4 @@ -"""Stub file for reflex/components/layout/grid.py""" +"""Stub file for reflex/components/chakra/layout/grid.py""" # ------------------- DO NOT EDIT ---------------------- # This file was generated by `scripts/pyi_generator.py`! # ------------------------------------------------------ @@ -8,7 +8,7 @@ from reflex.vars import Var, BaseVar, ComputedVar from reflex.event import EventChain, EventHandler, EventSpec from reflex.style import Style from typing import List -from reflex.components.libs.chakra import ChakraComponent +from reflex.components.chakra import ChakraComponent from reflex.vars import Var class Grid(ChakraComponent): diff --git a/reflex/components/layout/html.py b/reflex/components/chakra/layout/html.py similarity index 94% rename from reflex/components/layout/html.py rename to reflex/components/chakra/layout/html.py index 3a4ba76ad..1069bc7e5 100644 --- a/reflex/components/layout/html.py +++ b/reflex/components/chakra/layout/html.py @@ -1,7 +1,7 @@ """A html component.""" from typing import Dict -from reflex.components.layout.box import Box +from reflex.components.chakra.layout.box import Box from reflex.vars import Var diff --git a/reflex/components/layout/html.pyi b/reflex/components/chakra/layout/html.pyi similarity index 97% rename from reflex/components/layout/html.pyi rename to reflex/components/chakra/layout/html.pyi index 34e57ca96..3214bbb8e 100644 --- a/reflex/components/layout/html.pyi +++ b/reflex/components/chakra/layout/html.pyi @@ -1,4 +1,4 @@ -"""Stub file for reflex/components/layout/html.py""" +"""Stub file for reflex/components/chakra/layout/html.py""" # ------------------- DO NOT EDIT ---------------------- # This file was generated by `scripts/pyi_generator.py`! # ------------------------------------------------------ @@ -8,7 +8,7 @@ from reflex.vars import Var, BaseVar, ComputedVar from reflex.event import EventChain, EventHandler, EventSpec from reflex.style import Style from typing import Dict -from reflex.components.layout.box import Box +from reflex.components.chakra.layout.box import Box from reflex.vars import Var class Html(Box): diff --git a/reflex/components/layout/spacer.py b/reflex/components/chakra/layout/spacer.py similarity index 68% rename from reflex/components/layout/spacer.py rename to reflex/components/chakra/layout/spacer.py index 18a6a34af..3888f3726 100644 --- a/reflex/components/layout/spacer.py +++ b/reflex/components/chakra/layout/spacer.py @@ -1,6 +1,6 @@ """A flexible space component.""" -from reflex.components.libs.chakra import ChakraComponent +from reflex.components.chakra import ChakraComponent class Spacer(ChakraComponent): diff --git a/reflex/components/layout/spacer.pyi b/reflex/components/chakra/layout/spacer.pyi similarity index 96% rename from reflex/components/layout/spacer.pyi rename to reflex/components/chakra/layout/spacer.pyi index f1db9e89a..6a793ce19 100644 --- a/reflex/components/layout/spacer.pyi +++ b/reflex/components/chakra/layout/spacer.pyi @@ -1,4 +1,4 @@ -"""Stub file for reflex/components/layout/spacer.py""" +"""Stub file for reflex/components/chakra/layout/spacer.py""" # ------------------- DO NOT EDIT ---------------------- # This file was generated by `scripts/pyi_generator.py`! # ------------------------------------------------------ @@ -7,7 +7,7 @@ from typing import Any, Dict, Literal, Optional, Union, overload from reflex.vars import Var, BaseVar, ComputedVar from reflex.event import EventChain, EventHandler, EventSpec from reflex.style import Style -from reflex.components.libs.chakra import ChakraComponent +from reflex.components.chakra import ChakraComponent class Spacer(ChakraComponent): @overload diff --git a/reflex/components/layout/stack.py b/reflex/components/chakra/layout/stack.py similarity index 92% rename from reflex/components/layout/stack.py rename to reflex/components/chakra/layout/stack.py index e2b39e66a..8e2ab34e6 100644 --- a/reflex/components/layout/stack.py +++ b/reflex/components/chakra/layout/stack.py @@ -2,7 +2,7 @@ from typing import List, Union -from reflex.components.libs.chakra import ChakraComponent, LiteralStackDirection +from reflex.components.chakra import ChakraComponent, LiteralStackDirection from reflex.vars import Var diff --git a/reflex/components/layout/stack.pyi b/reflex/components/chakra/layout/stack.pyi similarity index 98% rename from reflex/components/layout/stack.pyi rename to reflex/components/chakra/layout/stack.pyi index 400c47bde..28d110979 100644 --- a/reflex/components/layout/stack.pyi +++ b/reflex/components/chakra/layout/stack.pyi @@ -1,4 +1,4 @@ -"""Stub file for reflex/components/layout/stack.py""" +"""Stub file for reflex/components/chakra/layout/stack.py""" # ------------------- DO NOT EDIT ---------------------- # This file was generated by `scripts/pyi_generator.py`! # ------------------------------------------------------ @@ -8,7 +8,7 @@ from reflex.vars import Var, BaseVar, ComputedVar from reflex.event import EventChain, EventHandler, EventSpec from reflex.style import Style from typing import List, Union -from reflex.components.libs.chakra import ChakraComponent, LiteralStackDirection +from reflex.components.chakra import ChakraComponent, LiteralStackDirection from reflex.vars import Var class Stack(ChakraComponent): diff --git a/reflex/components/layout/wrap.py b/reflex/components/chakra/layout/wrap.py similarity index 96% rename from reflex/components/layout/wrap.py rename to reflex/components/chakra/layout/wrap.py index 0a8d9864b..5d436c5b2 100644 --- a/reflex/components/layout/wrap.py +++ b/reflex/components/chakra/layout/wrap.py @@ -1,7 +1,7 @@ """Container to stack elements with spacing.""" +from reflex.components.chakra import ChakraComponent from reflex.components.component import Component -from reflex.components.libs.chakra import ChakraComponent from reflex.vars import Var diff --git a/reflex/components/layout/wrap.pyi b/reflex/components/chakra/layout/wrap.pyi similarity index 98% rename from reflex/components/layout/wrap.pyi rename to reflex/components/chakra/layout/wrap.pyi index 947b3af5d..ba54d9431 100644 --- a/reflex/components/layout/wrap.pyi +++ b/reflex/components/chakra/layout/wrap.pyi @@ -1,4 +1,4 @@ -"""Stub file for reflex/components/layout/wrap.py""" +"""Stub file for reflex/components/chakra/layout/wrap.py""" # ------------------- DO NOT EDIT ---------------------- # This file was generated by `scripts/pyi_generator.py`! # ------------------------------------------------------ @@ -7,8 +7,8 @@ from typing import Any, Dict, Literal, Optional, Union, overload from reflex.vars import Var, BaseVar, ComputedVar from reflex.event import EventChain, EventHandler, EventSpec from reflex.style import Style +from reflex.components.chakra import ChakraComponent from reflex.components.component import Component -from reflex.components.libs.chakra import ChakraComponent from reflex.vars import Var class Wrap(ChakraComponent): diff --git a/reflex/components/chakra/media/__init__.py b/reflex/components/chakra/media/__init__.py new file mode 100644 index 000000000..8346a37a6 --- /dev/null +++ b/reflex/components/chakra/media/__init__.py @@ -0,0 +1,7 @@ +"""Media components.""" + +from .avatar import Avatar, AvatarBadge, AvatarGroup +from .icon import Icon +from .image import Image + +__all__ = [f for f in dir() if f[0].isupper()] # type: ignore diff --git a/reflex/components/media/avatar.py b/reflex/components/chakra/media/avatar.py similarity index 95% rename from reflex/components/media/avatar.py rename to reflex/components/chakra/media/avatar.py index 40c4040e0..80a0b7174 100644 --- a/reflex/components/media/avatar.py +++ b/reflex/components/chakra/media/avatar.py @@ -3,7 +3,7 @@ from __future__ import annotations from typing import Any, Union -from reflex.components.libs.chakra import ChakraComponent, LiteralAvatarSize +from reflex.components.chakra import ChakraComponent, LiteralAvatarSize from reflex.vars import Var diff --git a/reflex/components/media/avatar.pyi b/reflex/components/chakra/media/avatar.pyi similarity index 98% rename from reflex/components/media/avatar.pyi rename to reflex/components/chakra/media/avatar.pyi index 1becbdcb7..69b017801 100644 --- a/reflex/components/media/avatar.pyi +++ b/reflex/components/chakra/media/avatar.pyi @@ -1,4 +1,4 @@ -"""Stub file for reflex/components/media/avatar.py""" +"""Stub file for reflex/components/chakra/media/avatar.py""" # ------------------- DO NOT EDIT ---------------------- # This file was generated by `scripts/pyi_generator.py`! # ------------------------------------------------------ @@ -8,7 +8,7 @@ from reflex.vars import Var, BaseVar, ComputedVar from reflex.event import EventChain, EventHandler, EventSpec from reflex.style import Style from typing import Any, Union -from reflex.components.libs.chakra import ChakraComponent, LiteralAvatarSize +from reflex.components.chakra import ChakraComponent, LiteralAvatarSize from reflex.vars import Var class Avatar(ChakraComponent): diff --git a/reflex/components/chakra/media/icon.py b/reflex/components/chakra/media/icon.py new file mode 100644 index 000000000..8b4fb3581 --- /dev/null +++ b/reflex/components/chakra/media/icon.py @@ -0,0 +1,110 @@ +"""An icon component.""" +from typing import List + +from reflex.components.chakra import ChakraComponent +from reflex.utils import format + + +class ChakraIconComponent(ChakraComponent): + """A component that wraps a Chakra icon component.""" + + library = "@chakra-ui/icons@2.0.19" + + +class Icon(ChakraIconComponent): + """An image icon.""" + + tag = "None" + + @classmethod + def create(cls, *children, **props): + """Initialize the Icon component. + + Run some additional checks on Icon component. + + Args: + *children: The positional arguments + **props: The keyword arguments + + Raises: + AttributeError: The errors tied to bad usage of the Icon component. + ValueError: If the icon tag is invalid. + + Returns: + The created component. + """ + if children: + raise AttributeError( + f"Passing children to Icon component is not allowed: remove positional arguments {children} to fix" + ) + if "tag" not in props.keys(): + raise AttributeError("Missing 'tag' keyword-argument for Icon") + if type(props["tag"]) != str or props["tag"].lower() not in ICON_LIST: + raise ValueError( + f"Invalid icon tag: {props['tag']}. Please use one of the following: {sorted(ICON_LIST)}" + ) + props["tag"] = format.to_title_case(props["tag"]) + "Icon" + return super().create(*children, **props) + + +# List of all icons. +ICON_LIST: List[str] = [ + "add", + "arrow_back", + "arrow_down", + "arrow_forward", + "arrow_left", + "arrow_right", + "arrow_up", + "arrow_up_down", + "at_sign", + "attachment", + "bell", + "calendar", + "chat", + "check_circle", + "check", + "chevron_down", + "chevron_left", + "chevron_right", + "chevron_up", + "close", + "copy", + "delete", + "download", + "drag_handle", + "edit", + "email", + "external_link", + "hamburger", + "info", + "info_outline", + "link", + "lock", + "minus", + "moon", + "not_allowed", + "phone", + "plus_square", + "question", + "question_outline", + "repeat", + "repeat_clock", + "search", + "search2", + "settings", + "small_add", + "small_close", + "spinner", + "star", + "sun", + "time", + "triangle_down", + "triangle_up", + "unlock", + "up_down", + "view", + "view_off", + "warning", + "warning_two", +] diff --git a/reflex/components/media/icon.pyi b/reflex/components/chakra/media/icon.pyi similarity index 98% rename from reflex/components/media/icon.pyi rename to reflex/components/chakra/media/icon.pyi index af7f470d2..987722c01 100644 --- a/reflex/components/media/icon.pyi +++ b/reflex/components/chakra/media/icon.pyi @@ -1,4 +1,4 @@ -"""Stub file for reflex/components/media/icon.py""" +"""Stub file for reflex/components/chakra/media/icon.py""" # ------------------- DO NOT EDIT ---------------------- # This file was generated by `scripts/pyi_generator.py`! # ------------------------------------------------------ @@ -8,7 +8,7 @@ from reflex.vars import Var, BaseVar, ComputedVar from reflex.event import EventChain, EventHandler, EventSpec from reflex.style import Style from typing import List -from reflex.components.libs.chakra import ChakraComponent +from reflex.components.chakra import ChakraComponent from reflex.utils import format class ChakraIconComponent(ChakraComponent): diff --git a/reflex/components/chakra/media/image.py b/reflex/components/chakra/media/image.py index fed382d56..2b1a4e26f 100644 --- a/reflex/components/chakra/media/image.py +++ b/reflex/components/chakra/media/image.py @@ -3,8 +3,8 @@ from __future__ import annotations from typing import Any, Optional, Union +from reflex.components.chakra import ChakraComponent, LiteralImageLoading from reflex.components.component import Component -from reflex.components.libs.chakra import ChakraComponent, LiteralImageLoading from reflex.vars import Var diff --git a/reflex/components/chakra/media/image.pyi b/reflex/components/chakra/media/image.pyi index a5c05d1bc..e20e3a871 100644 --- a/reflex/components/chakra/media/image.pyi +++ b/reflex/components/chakra/media/image.pyi @@ -8,8 +8,8 @@ from reflex.vars import Var, BaseVar, ComputedVar from reflex.event import EventChain, EventHandler, EventSpec from reflex.style import Style from typing import Any, Optional, Union +from reflex.components.chakra import ChakraComponent, LiteralImageLoading from reflex.components.component import Component -from reflex.components.libs.chakra import ChakraComponent, LiteralImageLoading from reflex.vars import Var class Image(ChakraComponent): diff --git a/reflex/components/navigation/__init__.py b/reflex/components/chakra/navigation/__init__.py similarity index 93% rename from reflex/components/navigation/__init__.py rename to reflex/components/chakra/navigation/__init__.py index 250eb6aa9..4b61ad8db 100644 --- a/reflex/components/navigation/__init__.py +++ b/reflex/components/chakra/navigation/__init__.py @@ -3,7 +3,6 @@ from .breadcrumb import Breadcrumb, BreadcrumbItem, BreadcrumbLink, BreadcrumbSeparator from .link import Link from .linkoverlay import LinkBox, LinkOverlay -from .nextlink import NextLink from .stepper import ( Step, StepDescription, diff --git a/reflex/components/navigation/breadcrumb.py b/reflex/components/chakra/navigation/breadcrumb.py similarity index 94% rename from reflex/components/navigation/breadcrumb.py rename to reflex/components/chakra/navigation/breadcrumb.py index 21f8fb432..7c902bf1a 100644 --- a/reflex/components/navigation/breadcrumb.py +++ b/reflex/components/chakra/navigation/breadcrumb.py @@ -1,9 +1,9 @@ """Breadcrumb components.""" +from reflex.components.chakra import ChakraComponent +from reflex.components.chakra.navigation.link import Link from reflex.components.component import Component -from reflex.components.layout.foreach import Foreach -from reflex.components.libs.chakra import ChakraComponent -from reflex.components.navigation.link import Link +from reflex.components.core.foreach import Foreach from reflex.vars import Var diff --git a/reflex/components/navigation/breadcrumb.pyi b/reflex/components/chakra/navigation/breadcrumb.pyi similarity index 98% rename from reflex/components/navigation/breadcrumb.pyi rename to reflex/components/chakra/navigation/breadcrumb.pyi index 9c4b4fbc6..e7993cd52 100644 --- a/reflex/components/navigation/breadcrumb.pyi +++ b/reflex/components/chakra/navigation/breadcrumb.pyi @@ -1,4 +1,4 @@ -"""Stub file for reflex/components/navigation/breadcrumb.py""" +"""Stub file for reflex/components/chakra/navigation/breadcrumb.py""" # ------------------- DO NOT EDIT ---------------------- # This file was generated by `scripts/pyi_generator.py`! # ------------------------------------------------------ @@ -7,10 +7,10 @@ from typing import Any, Dict, Literal, Optional, Union, overload from reflex.vars import Var, BaseVar, ComputedVar from reflex.event import EventChain, EventHandler, EventSpec from reflex.style import Style +from reflex.components.chakra import ChakraComponent +from reflex.components.chakra.navigation.link import Link from reflex.components.component import Component -from reflex.components.layout.foreach import Foreach -from reflex.components.libs.chakra import ChakraComponent -from reflex.components.navigation.link import Link +from reflex.components.core.foreach import Foreach from reflex.vars import Var class Breadcrumb(ChakraComponent): diff --git a/reflex/components/navigation/link.py b/reflex/components/chakra/navigation/link.py similarity index 92% rename from reflex/components/navigation/link.py rename to reflex/components/chakra/navigation/link.py index 3894a00b3..a524202df 100644 --- a/reflex/components/navigation/link.py +++ b/reflex/components/chakra/navigation/link.py @@ -1,9 +1,9 @@ """A link component.""" +from reflex.components.chakra import ChakraComponent from reflex.components.component import Component -from reflex.components.libs.chakra import ChakraComponent -from reflex.components.navigation.nextlink import NextLink +from reflex.components.next.link import NextLink from reflex.utils import imports from reflex.vars import BaseVar, Var diff --git a/reflex/components/navigation/link.pyi b/reflex/components/chakra/navigation/link.pyi similarity index 95% rename from reflex/components/navigation/link.pyi rename to reflex/components/chakra/navigation/link.pyi index 011037a69..a5b3db0e0 100644 --- a/reflex/components/navigation/link.pyi +++ b/reflex/components/chakra/navigation/link.pyi @@ -1,4 +1,4 @@ -"""Stub file for reflex/components/navigation/link.py""" +"""Stub file for reflex/components/chakra/navigation/link.py""" # ------------------- DO NOT EDIT ---------------------- # This file was generated by `scripts/pyi_generator.py`! # ------------------------------------------------------ @@ -7,9 +7,9 @@ from typing import Any, Dict, Literal, Optional, Union, overload from reflex.vars import Var, BaseVar, ComputedVar from reflex.event import EventChain, EventHandler, EventSpec from reflex.style import Style +from reflex.components.chakra import ChakraComponent from reflex.components.component import Component -from reflex.components.libs.chakra import ChakraComponent -from reflex.components.navigation.nextlink import NextLink +from reflex.components.next.link import NextLink from reflex.utils import imports from reflex.vars import BaseVar, Var diff --git a/reflex/components/navigation/linkoverlay.py b/reflex/components/chakra/navigation/linkoverlay.py similarity index 88% rename from reflex/components/navigation/linkoverlay.py rename to reflex/components/chakra/navigation/linkoverlay.py index 969ddd239..370e3df48 100644 --- a/reflex/components/navigation/linkoverlay.py +++ b/reflex/components/chakra/navigation/linkoverlay.py @@ -1,6 +1,6 @@ """Link overlay components.""" -from reflex.components.libs.chakra import ChakraComponent +from reflex.components.chakra import ChakraComponent from reflex.vars import Var diff --git a/reflex/components/navigation/linkoverlay.pyi b/reflex/components/chakra/navigation/linkoverlay.pyi similarity index 98% rename from reflex/components/navigation/linkoverlay.pyi rename to reflex/components/chakra/navigation/linkoverlay.pyi index 749980403..7daaf1924 100644 --- a/reflex/components/navigation/linkoverlay.pyi +++ b/reflex/components/chakra/navigation/linkoverlay.pyi @@ -1,4 +1,4 @@ -"""Stub file for reflex/components/navigation/linkoverlay.py""" +"""Stub file for reflex/components/chakra/navigation/linkoverlay.py""" # ------------------- DO NOT EDIT ---------------------- # This file was generated by `scripts/pyi_generator.py`! # ------------------------------------------------------ @@ -7,7 +7,7 @@ from typing import Any, Dict, Literal, Optional, Union, overload from reflex.vars import Var, BaseVar, ComputedVar from reflex.event import EventChain, EventHandler, EventSpec from reflex.style import Style -from reflex.components.libs.chakra import ChakraComponent +from reflex.components.chakra import ChakraComponent from reflex.vars import Var class LinkOverlay(ChakraComponent): diff --git a/reflex/components/navigation/stepper.py b/reflex/components/chakra/navigation/stepper.py similarity index 97% rename from reflex/components/navigation/stepper.py rename to reflex/components/chakra/navigation/stepper.py index 2ca6d1cf2..7c47760e5 100644 --- a/reflex/components/navigation/stepper.py +++ b/reflex/components/chakra/navigation/stepper.py @@ -2,8 +2,8 @@ from typing import List, Literal, Optional, Tuple +from reflex.components.chakra import ChakraComponent, LiteralColorScheme from reflex.components.component import Component -from reflex.components.libs.chakra import ChakraComponent, LiteralColorScheme from reflex.vars import Var diff --git a/reflex/components/navigation/stepper.pyi b/reflex/components/chakra/navigation/stepper.pyi similarity index 99% rename from reflex/components/navigation/stepper.pyi rename to reflex/components/chakra/navigation/stepper.pyi index d4176348e..a4020d1cf 100644 --- a/reflex/components/navigation/stepper.pyi +++ b/reflex/components/chakra/navigation/stepper.pyi @@ -1,4 +1,4 @@ -"""Stub file for reflex/components/navigation/stepper.py""" +"""Stub file for reflex/components/chakra/navigation/stepper.py""" # ------------------- DO NOT EDIT ---------------------- # This file was generated by `scripts/pyi_generator.py`! # ------------------------------------------------------ @@ -8,8 +8,8 @@ from reflex.vars import Var, BaseVar, ComputedVar from reflex.event import EventChain, EventHandler, EventSpec from reflex.style import Style from typing import List, Literal, Optional, Tuple +from reflex.components.chakra import ChakraComponent, LiteralColorScheme from reflex.components.component import Component -from reflex.components.libs.chakra import ChakraComponent, LiteralColorScheme from reflex.vars import Var class Stepper(ChakraComponent): diff --git a/reflex/components/overlay/__init__.py b/reflex/components/chakra/overlay/__init__.py similarity index 94% rename from reflex/components/overlay/__init__.py rename to reflex/components/chakra/overlay/__init__.py index 9482d003f..322d09318 100644 --- a/reflex/components/overlay/__init__.py +++ b/reflex/components/chakra/overlay/__init__.py @@ -8,7 +8,6 @@ from .alertdialog import ( AlertDialogHeader, AlertDialogOverlay, ) -from .banner import ConnectionBanner, ConnectionModal from .drawer import ( Drawer, DrawerBody, diff --git a/reflex/components/overlay/alertdialog.py b/reflex/components/chakra/overlay/alertdialog.py similarity index 97% rename from reflex/components/overlay/alertdialog.py rename to reflex/components/chakra/overlay/alertdialog.py index 47d6f343f..48829c5ff 100644 --- a/reflex/components/overlay/alertdialog.py +++ b/reflex/components/chakra/overlay/alertdialog.py @@ -3,9 +3,9 @@ from __future__ import annotations from typing import Any, Union +from reflex.components.chakra import ChakraComponent, LiteralAlertDialogSize +from reflex.components.chakra.media.icon import Icon from reflex.components.component import Component -from reflex.components.libs.chakra import ChakraComponent, LiteralAlertDialogSize -from reflex.components.media.icon import Icon from reflex.vars import Var diff --git a/reflex/components/overlay/alertdialog.pyi b/reflex/components/chakra/overlay/alertdialog.pyi similarity index 99% rename from reflex/components/overlay/alertdialog.pyi rename to reflex/components/chakra/overlay/alertdialog.pyi index b9b96ae06..01fd6240e 100644 --- a/reflex/components/overlay/alertdialog.pyi +++ b/reflex/components/chakra/overlay/alertdialog.pyi @@ -1,4 +1,4 @@ -"""Stub file for reflex/components/overlay/alertdialog.py""" +"""Stub file for reflex/components/chakra/overlay/alertdialog.py""" # ------------------- DO NOT EDIT ---------------------- # This file was generated by `scripts/pyi_generator.py`! # ------------------------------------------------------ @@ -8,9 +8,9 @@ from reflex.vars import Var, BaseVar, ComputedVar from reflex.event import EventChain, EventHandler, EventSpec from reflex.style import Style from typing import Any, Union +from reflex.components.chakra import ChakraComponent, LiteralAlertDialogSize +from reflex.components.chakra.media.icon import Icon from reflex.components.component import Component -from reflex.components.libs.chakra import ChakraComponent, LiteralAlertDialogSize -from reflex.components.media.icon import Icon from reflex.vars import Var class AlertDialog(ChakraComponent): diff --git a/reflex/components/overlay/drawer.py b/reflex/components/chakra/overlay/drawer.py similarity index 98% rename from reflex/components/overlay/drawer.py rename to reflex/components/chakra/overlay/drawer.py index 15dee7001..7d317fe9c 100644 --- a/reflex/components/overlay/drawer.py +++ b/reflex/components/chakra/overlay/drawer.py @@ -3,13 +3,13 @@ from __future__ import annotations from typing import Any, Union -from reflex.components.component import Component -from reflex.components.libs.chakra import ( +from reflex.components.chakra import ( ChakraComponent, LiteralColorScheme, LiteralDrawerSize, ) -from reflex.components.media.icon import Icon +from reflex.components.chakra.media.icon import Icon +from reflex.components.component import Component from reflex.vars import Var diff --git a/reflex/components/overlay/drawer.pyi b/reflex/components/chakra/overlay/drawer.pyi similarity index 99% rename from reflex/components/overlay/drawer.pyi rename to reflex/components/chakra/overlay/drawer.pyi index 612c911b4..be6c3830b 100644 --- a/reflex/components/overlay/drawer.pyi +++ b/reflex/components/chakra/overlay/drawer.pyi @@ -1,4 +1,4 @@ -"""Stub file for reflex/components/overlay/drawer.py""" +"""Stub file for reflex/components/chakra/overlay/drawer.py""" # ------------------- DO NOT EDIT ---------------------- # This file was generated by `scripts/pyi_generator.py`! # ------------------------------------------------------ @@ -8,13 +8,13 @@ from reflex.vars import Var, BaseVar, ComputedVar from reflex.event import EventChain, EventHandler, EventSpec from reflex.style import Style from typing import Any, Union -from reflex.components.component import Component -from reflex.components.libs.chakra import ( +from reflex.components.chakra import ( ChakraComponent, LiteralColorScheme, LiteralDrawerSize, ) -from reflex.components.media.icon import Icon +from reflex.components.chakra.media.icon import Icon +from reflex.components.component import Component from reflex.vars import Var class Drawer(ChakraComponent): diff --git a/reflex/components/overlay/menu.py b/reflex/components/chakra/overlay/menu.py similarity index 97% rename from reflex/components/overlay/menu.py rename to reflex/components/chakra/overlay/menu.py index 2c38afa13..1401fce7c 100644 --- a/reflex/components/overlay/menu.py +++ b/reflex/components/chakra/overlay/menu.py @@ -3,14 +3,14 @@ from __future__ import annotations from typing import Any, List, Optional, Union -from reflex.components.component import Component -from reflex.components.forms.button import Button -from reflex.components.libs.chakra import ( +from reflex.components.chakra import ( ChakraComponent, LiteralChakraDirection, LiteralMenuOption, LiteralMenuStrategy, ) +from reflex.components.chakra.forms.button import Button +from reflex.components.component import Component from reflex.vars import Var @@ -133,9 +133,7 @@ class MenuList(ChakraComponent): tag = "MenuList" @classmethod - def create( - cls, *children, items: Optional[list] = None, **props - ) -> ChakraComponent: + def create(cls, *children, items: Optional[list] = None, **props) -> Component: """Create a MenuList component, and automatically wrap in MenuItem if not already one. Args: diff --git a/reflex/components/overlay/menu.pyi b/reflex/components/chakra/overlay/menu.pyi similarity index 99% rename from reflex/components/overlay/menu.pyi rename to reflex/components/chakra/overlay/menu.pyi index 8da41cfd4..3450cfde9 100644 --- a/reflex/components/overlay/menu.pyi +++ b/reflex/components/chakra/overlay/menu.pyi @@ -1,4 +1,4 @@ -"""Stub file for reflex/components/overlay/menu.py""" +"""Stub file for reflex/components/chakra/overlay/menu.py""" # ------------------- DO NOT EDIT ---------------------- # This file was generated by `scripts/pyi_generator.py`! # ------------------------------------------------------ @@ -8,14 +8,14 @@ from reflex.vars import Var, BaseVar, ComputedVar from reflex.event import EventChain, EventHandler, EventSpec from reflex.style import Style from typing import Any, List, Optional, Union -from reflex.components.component import Component -from reflex.components.forms.button import Button -from reflex.components.libs.chakra import ( +from reflex.components.chakra import ( ChakraComponent, LiteralChakraDirection, LiteralMenuOption, LiteralMenuStrategy, ) +from reflex.components.chakra.forms.button import Button +from reflex.components.component import Component from reflex.vars import Var class Menu(ChakraComponent): diff --git a/reflex/components/overlay/modal.py b/reflex/components/chakra/overlay/modal.py similarity index 98% rename from reflex/components/overlay/modal.py rename to reflex/components/chakra/overlay/modal.py index 43d7acb53..78b8a8164 100644 --- a/reflex/components/overlay/modal.py +++ b/reflex/components/chakra/overlay/modal.py @@ -3,9 +3,9 @@ from __future__ import annotations from typing import Any, Literal, Optional, Union +from reflex.components.chakra import ChakraComponent +from reflex.components.chakra.media import Icon from reflex.components.component import Component -from reflex.components.libs.chakra import ChakraComponent -from reflex.components.media import Icon from reflex.vars import Var ModalSizes = Literal["xs", "sm", "md", "lg", "xl", "full"] diff --git a/reflex/components/overlay/modal.pyi b/reflex/components/chakra/overlay/modal.pyi similarity index 99% rename from reflex/components/overlay/modal.pyi rename to reflex/components/chakra/overlay/modal.pyi index c6cca2d54..5550f6d42 100644 --- a/reflex/components/overlay/modal.pyi +++ b/reflex/components/chakra/overlay/modal.pyi @@ -1,4 +1,4 @@ -"""Stub file for reflex/components/overlay/modal.py""" +"""Stub file for reflex/components/chakra/overlay/modal.py""" # ------------------- DO NOT EDIT ---------------------- # This file was generated by `scripts/pyi_generator.py`! # ------------------------------------------------------ @@ -8,9 +8,9 @@ from reflex.vars import Var, BaseVar, ComputedVar from reflex.event import EventChain, EventHandler, EventSpec from reflex.style import Style from typing import Any, Literal, Optional, Union +from reflex.components.chakra import ChakraComponent +from reflex.components.chakra.media import Icon from reflex.components.component import Component -from reflex.components.libs.chakra import ChakraComponent -from reflex.components.media import Icon from reflex.vars import Var ModalSizes = Literal["xs", "sm", "md", "lg", "xl", "full"] diff --git a/reflex/components/overlay/popover.py b/reflex/components/chakra/overlay/popover.py similarity index 99% rename from reflex/components/overlay/popover.py rename to reflex/components/chakra/overlay/popover.py index 8b0f5d67d..7e1fa3e99 100644 --- a/reflex/components/overlay/popover.py +++ b/reflex/components/chakra/overlay/popover.py @@ -3,13 +3,13 @@ from __future__ import annotations from typing import Any, Union -from reflex.components.component import Component -from reflex.components.libs.chakra import ( +from reflex.components.chakra import ( ChakraComponent, LiteralChakraDirection, LiteralMenuStrategy, LiteralPopOverTrigger, ) +from reflex.components.component import Component from reflex.vars import Var diff --git a/reflex/components/overlay/popover.pyi b/reflex/components/chakra/overlay/popover.pyi similarity index 99% rename from reflex/components/overlay/popover.pyi rename to reflex/components/chakra/overlay/popover.pyi index 295886416..2f39860d3 100644 --- a/reflex/components/overlay/popover.pyi +++ b/reflex/components/chakra/overlay/popover.pyi @@ -1,4 +1,4 @@ -"""Stub file for reflex/components/overlay/popover.py""" +"""Stub file for reflex/components/chakra/overlay/popover.py""" # ------------------- DO NOT EDIT ---------------------- # This file was generated by `scripts/pyi_generator.py`! # ------------------------------------------------------ @@ -8,13 +8,13 @@ from reflex.vars import Var, BaseVar, ComputedVar from reflex.event import EventChain, EventHandler, EventSpec from reflex.style import Style from typing import Any, Union -from reflex.components.component import Component -from reflex.components.libs.chakra import ( +from reflex.components.chakra import ( ChakraComponent, LiteralChakraDirection, LiteralMenuStrategy, LiteralPopOverTrigger, ) +from reflex.components.component import Component from reflex.vars import Var class Popover(ChakraComponent): diff --git a/reflex/components/overlay/tooltip.py b/reflex/components/chakra/overlay/tooltip.py similarity index 96% rename from reflex/components/overlay/tooltip.py rename to reflex/components/chakra/overlay/tooltip.py index 98918fc7c..bd3a062c6 100644 --- a/reflex/components/overlay/tooltip.py +++ b/reflex/components/chakra/overlay/tooltip.py @@ -3,7 +3,7 @@ from __future__ import annotations from typing import Any, Union -from reflex.components.libs.chakra import ChakraComponent, LiteralChakraDirection +from reflex.components.chakra import ChakraComponent, LiteralChakraDirection from reflex.vars import Var diff --git a/reflex/components/overlay/tooltip.pyi b/reflex/components/chakra/overlay/tooltip.pyi similarity index 97% rename from reflex/components/overlay/tooltip.pyi rename to reflex/components/chakra/overlay/tooltip.pyi index 39297602e..e7aad7f50 100644 --- a/reflex/components/overlay/tooltip.pyi +++ b/reflex/components/chakra/overlay/tooltip.pyi @@ -1,4 +1,4 @@ -"""Stub file for reflex/components/overlay/tooltip.py""" +"""Stub file for reflex/components/chakra/overlay/tooltip.py""" # ------------------- DO NOT EDIT ---------------------- # This file was generated by `scripts/pyi_generator.py`! # ------------------------------------------------------ @@ -8,7 +8,7 @@ from reflex.vars import Var, BaseVar, ComputedVar from reflex.event import EventChain, EventHandler, EventSpec from reflex.style import Style from typing import Any, Union -from reflex.components.libs.chakra import ChakraComponent, LiteralChakraDirection +from reflex.components.chakra import ChakraComponent, LiteralChakraDirection from reflex.vars import Var class Tooltip(ChakraComponent): diff --git a/reflex/components/typography/__init__.py b/reflex/components/chakra/typography/__init__.py similarity index 89% rename from reflex/components/typography/__init__.py rename to reflex/components/chakra/typography/__init__.py index ecc2b374a..be06b137b 100644 --- a/reflex/components/typography/__init__.py +++ b/reflex/components/chakra/typography/__init__.py @@ -4,7 +4,6 @@ from reflex.components.component import Component from .heading import Heading from .highlight import Highlight -from .markdown import Markdown from .span import Span from .text import Text diff --git a/reflex/components/typography/heading.py b/reflex/components/chakra/typography/heading.py similarity index 79% rename from reflex/components/typography/heading.py rename to reflex/components/chakra/typography/heading.py index 0c25ccdef..d681802fa 100644 --- a/reflex/components/typography/heading.py +++ b/reflex/components/chakra/typography/heading.py @@ -1,7 +1,7 @@ """A heading component.""" -from reflex.components.libs.chakra import ChakraComponent, LiteralHeadingSize +from reflex.components.chakra import ChakraComponent, LiteralHeadingSize from reflex.vars import Var diff --git a/reflex/components/typography/heading.pyi b/reflex/components/chakra/typography/heading.pyi similarity index 96% rename from reflex/components/typography/heading.pyi rename to reflex/components/chakra/typography/heading.pyi index 1810b0278..e6cfa6b11 100644 --- a/reflex/components/typography/heading.pyi +++ b/reflex/components/chakra/typography/heading.pyi @@ -1,4 +1,4 @@ -"""Stub file for reflex/components/typography/heading.py""" +"""Stub file for reflex/components/chakra/typography/heading.py""" # ------------------- DO NOT EDIT ---------------------- # This file was generated by `scripts/pyi_generator.py`! # ------------------------------------------------------ @@ -7,7 +7,7 @@ from typing import Any, Dict, Literal, Optional, Union, overload from reflex.vars import Var, BaseVar, ComputedVar from reflex.event import EventChain, EventHandler, EventSpec from reflex.style import Style -from reflex.components.libs.chakra import ChakraComponent, LiteralHeadingSize +from reflex.components.chakra import ChakraComponent, LiteralHeadingSize from reflex.vars import Var class Heading(ChakraComponent): diff --git a/reflex/components/typography/highlight.py b/reflex/components/chakra/typography/highlight.py similarity index 91% rename from reflex/components/typography/highlight.py rename to reflex/components/chakra/typography/highlight.py index 8b97aa18a..0308c091e 100644 --- a/reflex/components/typography/highlight.py +++ b/reflex/components/chakra/typography/highlight.py @@ -2,7 +2,7 @@ from typing import Dict, List -from reflex.components.libs.chakra import ChakraComponent +from reflex.components.chakra import ChakraComponent from reflex.components.tags import Tag from reflex.vars import Var diff --git a/reflex/components/typography/highlight.pyi b/reflex/components/chakra/typography/highlight.pyi similarity index 96% rename from reflex/components/typography/highlight.pyi rename to reflex/components/chakra/typography/highlight.pyi index 87d19ac50..0d935a7e8 100644 --- a/reflex/components/typography/highlight.pyi +++ b/reflex/components/chakra/typography/highlight.pyi @@ -1,4 +1,4 @@ -"""Stub file for reflex/components/typography/highlight.py""" +"""Stub file for reflex/components/chakra/typography/highlight.py""" # ------------------- DO NOT EDIT ---------------------- # This file was generated by `scripts/pyi_generator.py`! # ------------------------------------------------------ @@ -8,7 +8,7 @@ from reflex.vars import Var, BaseVar, ComputedVar from reflex.event import EventChain, EventHandler, EventSpec from reflex.style import Style from typing import Dict, List -from reflex.components.libs.chakra import ChakraComponent +from reflex.components.chakra import ChakraComponent from reflex.components.tags import Tag from reflex.vars import Var diff --git a/reflex/components/typography/span.py b/reflex/components/chakra/typography/span.py similarity index 82% rename from reflex/components/typography/span.py rename to reflex/components/chakra/typography/span.py index 65d53140e..e4bc698e6 100644 --- a/reflex/components/typography/span.py +++ b/reflex/components/chakra/typography/span.py @@ -1,7 +1,7 @@ """A span component.""" from __future__ import annotations -from reflex.components.libs.chakra import ChakraComponent +from reflex.components.chakra import ChakraComponent from reflex.vars import Var diff --git a/reflex/components/typography/span.pyi b/reflex/components/chakra/typography/span.pyi similarity index 96% rename from reflex/components/typography/span.pyi rename to reflex/components/chakra/typography/span.pyi index 98bca50ae..5cb16e319 100644 --- a/reflex/components/typography/span.pyi +++ b/reflex/components/chakra/typography/span.pyi @@ -1,4 +1,4 @@ -"""Stub file for reflex/components/typography/span.py""" +"""Stub file for reflex/components/chakra/typography/span.py""" # ------------------- DO NOT EDIT ---------------------- # This file was generated by `scripts/pyi_generator.py`! # ------------------------------------------------------ @@ -7,7 +7,7 @@ from typing import Any, Dict, Literal, Optional, Union, overload from reflex.vars import Var, BaseVar, ComputedVar from reflex.event import EventChain, EventHandler, EventSpec from reflex.style import Style -from reflex.components.libs.chakra import ChakraComponent +from reflex.components.chakra import ChakraComponent from reflex.vars import Var class Span(ChakraComponent): diff --git a/reflex/components/typography/text.py b/reflex/components/chakra/typography/text.py similarity index 87% rename from reflex/components/typography/text.py rename to reflex/components/chakra/typography/text.py index b9c99b25b..e211c4d64 100644 --- a/reflex/components/typography/text.py +++ b/reflex/components/chakra/typography/text.py @@ -1,7 +1,7 @@ """A text component.""" from __future__ import annotations -from reflex.components.libs.chakra import ChakraComponent +from reflex.components.chakra import ChakraComponent from reflex.vars import Var diff --git a/reflex/components/typography/text.pyi b/reflex/components/chakra/typography/text.pyi similarity index 96% rename from reflex/components/typography/text.pyi rename to reflex/components/chakra/typography/text.pyi index b659da68d..ca81acc24 100644 --- a/reflex/components/typography/text.pyi +++ b/reflex/components/chakra/typography/text.pyi @@ -1,4 +1,4 @@ -"""Stub file for reflex/components/typography/text.py""" +"""Stub file for reflex/components/chakra/typography/text.py""" # ------------------- DO NOT EDIT ---------------------- # This file was generated by `scripts/pyi_generator.py`! # ------------------------------------------------------ @@ -7,7 +7,7 @@ from typing import Any, Dict, Literal, Optional, Union, overload from reflex.vars import Var, BaseVar, ComputedVar from reflex.event import EventChain, EventHandler, EventSpec from reflex.style import Style -from reflex.components.libs.chakra import ChakraComponent +from reflex.components.chakra import ChakraComponent from reflex.vars import Var class Text(ChakraComponent): diff --git a/reflex/components/component.py b/reflex/components/component.py index 22e59a72e..33ae3e1f1 100644 --- a/reflex/components/component.py +++ b/reflex/components/component.py @@ -1388,7 +1388,7 @@ class StatefulComponent(BaseComponent): Returns: The stateful component or None if the component should not be memoized. """ - from reflex.components.layout.foreach import Foreach + from reflex.components.core.foreach import Foreach if component._memoization_mode.disposition == MemoizationDisposition.NEVER: # Never memoize this component. @@ -1471,8 +1471,8 @@ class StatefulComponent(BaseComponent): The Var from the child component or the child itself (for regular cases). """ from reflex.components.base.bare import Bare - from reflex.components.layout.cond import Cond - from reflex.components.layout.foreach import Foreach + from reflex.components.core.cond import Cond + from reflex.components.core.foreach import Foreach if isinstance(child, Bare): return child.contents diff --git a/reflex/components/core/__init__.py b/reflex/components/core/__init__.py new file mode 100644 index 000000000..b83e94c99 --- /dev/null +++ b/reflex/components/core/__init__.py @@ -0,0 +1,20 @@ +"""Core Reflex components.""" + +from .banner import ConnectionBanner, ConnectionModal +from .cond import Cond, cond +from .debounce import DebounceInput +from .foreach import Foreach +from .responsive import ( + desktop_only, + mobile_and_tablet, + mobile_only, + tablet_and_desktop, + tablet_only, +) +from .upload import Upload, cancel_upload, clear_selected_files, selected_files + +connection_banner = ConnectionBanner.create +connection_modal = ConnectionModal.create +debounce_input = DebounceInput.create +foreach = Foreach.create +upload = Upload.create diff --git a/reflex/components/overlay/banner.py b/reflex/components/core/banner.py similarity index 93% rename from reflex/components/overlay/banner.py rename to reflex/components/core/banner.py index d690f3a9c..8e14d530a 100644 --- a/reflex/components/overlay/banner.py +++ b/reflex/components/core/banner.py @@ -4,10 +4,11 @@ from __future__ import annotations from typing import Optional from reflex.components.base.bare import Bare +from reflex.components.chakra.layout import Box +from reflex.components.chakra.overlay.modal import Modal +from reflex.components.chakra.typography import Text from reflex.components.component import Component -from reflex.components.layout import Box, cond -from reflex.components.overlay.modal import Modal -from reflex.components.typography import Text +from reflex.components.core.cond import cond from reflex.constants import Hooks, Imports from reflex.utils import imports from reflex.vars import Var, VarData diff --git a/reflex/components/overlay/banner.pyi b/reflex/components/core/banner.pyi similarity index 96% rename from reflex/components/overlay/banner.pyi rename to reflex/components/core/banner.pyi index e86e5d16a..5d06be5d2 100644 --- a/reflex/components/overlay/banner.pyi +++ b/reflex/components/core/banner.pyi @@ -1,4 +1,4 @@ -"""Stub file for reflex/components/overlay/banner.py""" +"""Stub file for reflex/components/core/banner.py""" # ------------------- DO NOT EDIT ---------------------- # This file was generated by `scripts/pyi_generator.py`! # ------------------------------------------------------ @@ -9,10 +9,11 @@ from reflex.event import EventChain, EventHandler, EventSpec from reflex.style import Style from typing import Optional from reflex.components.base.bare import Bare +from reflex.components.chakra.layout import Box +from reflex.components.chakra.overlay.modal import Modal +from reflex.components.chakra.typography import Text from reflex.components.component import Component -from reflex.components.layout import Box, cond -from reflex.components.overlay.modal import Modal -from reflex.components.typography import Text +from reflex.components.core.cond import cond from reflex.constants import Hooks, Imports from reflex.utils import imports from reflex.vars import Var, VarData diff --git a/reflex/components/navigation/client_side_routing.py b/reflex/components/core/client_side_routing.py similarity index 97% rename from reflex/components/navigation/client_side_routing.py rename to reflex/components/core/client_side_routing.py index 99f0f6cfd..3d2090cd3 100644 --- a/reflex/components/navigation/client_side_routing.py +++ b/reflex/components/core/client_side_routing.py @@ -11,7 +11,7 @@ from __future__ import annotations from reflex import constants from reflex.components.component import Component -from reflex.components.layout.cond import cond +from reflex.components.core.cond import cond from reflex.vars import Var route_not_found: Var = Var.create_safe(constants.ROUTE_NOT_FOUND) diff --git a/reflex/components/navigation/client_side_routing.pyi b/reflex/components/core/client_side_routing.pyi similarity index 98% rename from reflex/components/navigation/client_side_routing.pyi rename to reflex/components/core/client_side_routing.pyi index d6de0d1a6..53bf90043 100644 --- a/reflex/components/navigation/client_side_routing.pyi +++ b/reflex/components/core/client_side_routing.pyi @@ -1,4 +1,4 @@ -"""Stub file for reflex/components/navigation/client_side_routing.py""" +"""Stub file for reflex/components/core/client_side_routing.py""" # ------------------- DO NOT EDIT ---------------------- # This file was generated by `scripts/pyi_generator.py`! # ------------------------------------------------------ @@ -9,7 +9,7 @@ from reflex.event import EventChain, EventHandler, EventSpec from reflex.style import Style from reflex import constants from reflex.components.component import Component -from reflex.components.layout.cond import cond +from reflex.components.core.cond import cond from reflex.vars import Var route_not_found: Var diff --git a/reflex/components/layout/cond.py b/reflex/components/core/cond.py similarity index 98% rename from reflex/components/layout/cond.py rename to reflex/components/core/cond.py index 91ef389d5..1564f3cf0 100644 --- a/reflex/components/layout/cond.py +++ b/reflex/components/core/cond.py @@ -3,8 +3,8 @@ from __future__ import annotations from typing import Any, Dict, Optional, overload +from reflex.components.base.fragment import Fragment from reflex.components.component import BaseComponent, Component, MemoizationLeaf -from reflex.components.layout.fragment import Fragment from reflex.components.tags import CondTag, Tag from reflex.constants import Dirs from reflex.utils import format, imports diff --git a/reflex/components/forms/debounce.py b/reflex/components/core/debounce.py similarity index 98% rename from reflex/components/forms/debounce.py rename to reflex/components/core/debounce.py index 076eb8510..21cfcc91a 100644 --- a/reflex/components/forms/debounce.py +++ b/reflex/components/core/debounce.py @@ -3,7 +3,7 @@ from __future__ import annotations from typing import Any, Type -from reflex.components import Component +from reflex.components.component import Component from reflex.constants import EventTriggers from reflex.vars import Var, VarData diff --git a/reflex/components/forms/debounce.pyi b/reflex/components/core/debounce.pyi similarity index 97% rename from reflex/components/forms/debounce.pyi rename to reflex/components/core/debounce.pyi index 5fed96e4d..63daadb60 100644 --- a/reflex/components/forms/debounce.pyi +++ b/reflex/components/core/debounce.pyi @@ -1,4 +1,4 @@ -"""Stub file for reflex/components/forms/debounce.py""" +"""Stub file for reflex/components/core/debounce.py""" # ------------------- DO NOT EDIT ---------------------- # This file was generated by `scripts/pyi_generator.py`! # ------------------------------------------------------ @@ -8,7 +8,7 @@ from reflex.vars import Var, BaseVar, ComputedVar from reflex.event import EventChain, EventHandler, EventSpec from reflex.style import Style from typing import Any, Type -from reflex.components import Component +from reflex.components.component import Component from reflex.constants import EventTriggers from reflex.vars import Var, VarData diff --git a/reflex/components/layout/foreach.py b/reflex/components/core/foreach.py similarity index 98% rename from reflex/components/layout/foreach.py rename to reflex/components/core/foreach.py index ef61a1acc..0ef7aeefa 100644 --- a/reflex/components/layout/foreach.py +++ b/reflex/components/core/foreach.py @@ -5,8 +5,8 @@ import inspect from hashlib import md5 from typing import Any, Callable, Iterable, Optional +from reflex.components.base.fragment import Fragment from reflex.components.component import Component -from reflex.components.layout.fragment import Fragment from reflex.components.tags import IterTag from reflex.constants import MemoizationMode from reflex.vars import Var diff --git a/reflex/components/layout/responsive.py b/reflex/components/core/responsive.py similarity index 97% rename from reflex/components/layout/responsive.py rename to reflex/components/core/responsive.py index 0e07e2fbd..f4bf16227 100644 --- a/reflex/components/layout/responsive.py +++ b/reflex/components/core/responsive.py @@ -1,6 +1,6 @@ """Responsive components.""" -from reflex.components.layout.box import Box +from reflex.components.chakra.layout.box import Box # Add responsive styles shortcuts. diff --git a/reflex/components/forms/upload.py b/reflex/components/core/upload.py similarity index 98% rename from reflex/components/forms/upload.py rename to reflex/components/core/upload.py index ed644ed4e..1dab30083 100644 --- a/reflex/components/forms/upload.py +++ b/reflex/components/core/upload.py @@ -4,9 +4,9 @@ from __future__ import annotations from typing import Any, Dict, List, Optional, Union from reflex import constants +from reflex.components.chakra.forms.input import Input +from reflex.components.chakra.layout.box import Box from reflex.components.component import Component -from reflex.components.forms.input import Input -from reflex.components.layout.box import Box from reflex.constants import Dirs from reflex.event import CallableEventSpec, EventChain, EventSpec, call_script from reflex.utils import imports diff --git a/reflex/components/forms/upload.pyi b/reflex/components/core/upload.pyi similarity index 98% rename from reflex/components/forms/upload.pyi rename to reflex/components/core/upload.pyi index 6ab052af8..6984be09c 100644 --- a/reflex/components/forms/upload.pyi +++ b/reflex/components/core/upload.pyi @@ -1,4 +1,4 @@ -"""Stub file for reflex/components/forms/upload.py""" +"""Stub file for reflex/components/core/upload.py""" # ------------------- DO NOT EDIT ---------------------- # This file was generated by `scripts/pyi_generator.py`! # ------------------------------------------------------ @@ -9,9 +9,9 @@ from reflex.event import EventChain, EventHandler, EventSpec from reflex.style import Style from typing import Any, Dict, List, Optional, Union from reflex import constants +from reflex.components.chakra.forms.input import Input +from reflex.components.chakra.layout.box import Box from reflex.components.component import Component -from reflex.components.forms.input import Input -from reflex.components.layout.box import Box from reflex.constants import Dirs from reflex.event import CallableEventSpec, EventChain, EventSpec, call_script from reflex.utils import imports diff --git a/reflex/components/datadisplay/__init__.py b/reflex/components/datadisplay/__init__.py index 55935f0cd..0ef1619d1 100644 --- a/reflex/components/datadisplay/__init__.py +++ b/reflex/components/datadisplay/__init__.py @@ -1,15 +1,6 @@ -"""Data display components.""" +"""Data grid components.""" -from .badge import Badge -from .code import Code, CodeBlock -from .code import LiteralCodeBlockTheme as LiteralCodeBlockTheme -from .code import LiteralCodeLanguage as LiteralCodeLanguage from .dataeditor import DataEditor, DataEditorTheme -from .datatable import DataTable -from .divider import Divider -from .keyboard_key import KeyboardKey as Kbd -from .list import List, ListItem, OrderedList, UnorderedList -from .moment import Moment, MomentDelta -from .stat import Stat, StatArrow, StatGroup, StatHelpText, StatLabel, StatNumber -from .table import Table, TableCaption, TableContainer, Tbody, Td, Tfoot, Th, Thead, Tr -from .tag import Tag, TagCloseButton, TagLabel, TagLeftIcon, TagRightIcon + +data_editor = DataEditor.create +data_editor_theme = DataEditorTheme diff --git a/reflex/components/graphing/__init__.py b/reflex/components/graphing/__init__.py deleted file mode 100644 index 70727c408..000000000 --- a/reflex/components/graphing/__init__.py +++ /dev/null @@ -1,5 +0,0 @@ -"""Convenience functions to define layout components.""" - -from .plotly import Plotly - -__all__ = [f for f in dir() if f[0].isupper()] # type: ignore diff --git a/reflex/components/gridjs/__init__.py b/reflex/components/gridjs/__init__.py new file mode 100644 index 000000000..7085af084 --- /dev/null +++ b/reflex/components/gridjs/__init__.py @@ -0,0 +1,5 @@ +"""Grid components.""" + +from .datatable import DataTable + +data_table = DataTable.create diff --git a/reflex/components/datadisplay/datatable.py b/reflex/components/gridjs/datatable.py similarity index 100% rename from reflex/components/datadisplay/datatable.py rename to reflex/components/gridjs/datatable.py diff --git a/reflex/components/datadisplay/datatable.pyi b/reflex/components/gridjs/datatable.pyi similarity index 99% rename from reflex/components/datadisplay/datatable.pyi rename to reflex/components/gridjs/datatable.pyi index 5a68803a0..691c3d4bd 100644 --- a/reflex/components/datadisplay/datatable.pyi +++ b/reflex/components/gridjs/datatable.pyi @@ -1,4 +1,4 @@ -"""Stub file for reflex/components/datadisplay/datatable.py""" +"""Stub file for reflex/components/gridjs/datatable.py""" # ------------------- DO NOT EDIT ---------------------- # This file was generated by `scripts/pyi_generator.py`! # ------------------------------------------------------ diff --git a/reflex/components/libs/__init__.py b/reflex/components/libs/__init__.py deleted file mode 100644 index d7757833a..000000000 --- a/reflex/components/libs/__init__.py +++ /dev/null @@ -1,31 +0,0 @@ -"""React component libraries.""" -from .chakra import ( - LiteralAlertDialogSize, - LiteralAlertVariant, - LiteralAvatarSize, - LiteralButtonSize, - LiteralButtonVariant, - LiteralCardVariant, - LiteralChakraDirection, - LiteralColorScheme, - LiteralDividerVariant, - LiteralDrawerSize, - LiteralHeadingSize, - LiteralImageLoading, - LiteralInputNumberMode, - LiteralInputVariant, - LiteralLanguage, - LiteralMenuOption, - LiteralMenuStrategy, - LiteralPopOverTrigger, - LiteralSpinnerPlacement, - LiteralSpinnerSize, - LiteralStackDirection, - LiteralStatus, - LiteralTabsVariant, - LiteralTagAlign, - LiteralTagColorScheme, - LiteralTagSize, - LiteralTheme, - LiteralVariant, -) diff --git a/reflex/components/markdown/__init__.py b/reflex/components/markdown/__init__.py new file mode 100644 index 000000000..f7e479370 --- /dev/null +++ b/reflex/components/markdown/__init__.py @@ -0,0 +1,5 @@ +"""Markdown components.""" + +from .markdown import Markdown + +markdown = Markdown.create diff --git a/reflex/components/typography/markdown.py b/reflex/components/markdown/markdown.py similarity index 95% rename from reflex/components/typography/markdown.py rename to reflex/components/markdown/markdown.py index fc7f84a21..271be7ee0 100644 --- a/reflex/components/typography/markdown.py +++ b/reflex/components/markdown/markdown.py @@ -8,12 +8,16 @@ from hashlib import md5 from typing import Any, Callable, Dict, Union from reflex.compiler import utils +from reflex.components.chakra.datadisplay.list import ( + ListItem, + OrderedList, + UnorderedList, +) +from reflex.components.chakra.navigation import Link +from reflex.components.chakra.typography.heading import Heading +from reflex.components.chakra.typography.text import Text from reflex.components.component import Component, CustomComponent -from reflex.components.datadisplay.list import ListItem, OrderedList, UnorderedList -from reflex.components.navigation import Link from reflex.components.tags.tag import Tag -from reflex.components.typography.heading import Heading -from reflex.components.typography.text import Text from reflex.style import Style from reflex.utils import console, imports, types from reflex.utils.imports import ImportVar @@ -43,7 +47,7 @@ def get_base_component_map() -> dict[str, Callable]: Returns: The base component map. """ - from reflex.components.datadisplay.code import Code, CodeBlock + from reflex.components.chakra.datadisplay.code import Code, CodeBlock return { "h1": lambda value: Heading.create( @@ -157,7 +161,7 @@ class Markdown(Component): def _get_imports(self) -> imports.ImportDict: # Import here to avoid circular imports. - from reflex.components.datadisplay.code import Code, CodeBlock + from reflex.components.chakra.datadisplay.code import Code, CodeBlock imports = super()._get_imports() diff --git a/reflex/components/typography/markdown.pyi b/reflex/components/markdown/markdown.pyi similarity index 93% rename from reflex/components/typography/markdown.pyi rename to reflex/components/markdown/markdown.pyi index 995b96d74..bc5da9d72 100644 --- a/reflex/components/typography/markdown.pyi +++ b/reflex/components/markdown/markdown.pyi @@ -1,4 +1,4 @@ -"""Stub file for reflex/components/typography/markdown.py""" +"""Stub file for reflex/components/markdown/markdown.py""" # ------------------- DO NOT EDIT ---------------------- # This file was generated by `scripts/pyi_generator.py`! # ------------------------------------------------------ @@ -12,12 +12,16 @@ from functools import lru_cache from hashlib import md5 from typing import Any, Callable, Dict, Union from reflex.compiler import utils +from reflex.components.chakra.datadisplay.list import ( + ListItem, + OrderedList, + UnorderedList, +) +from reflex.components.chakra.navigation import Link +from reflex.components.chakra.typography.heading import Heading +from reflex.components.chakra.typography.text import Text from reflex.components.component import Component, CustomComponent -from reflex.components.datadisplay.list import ListItem, OrderedList, UnorderedList -from reflex.components.navigation import Link from reflex.components.tags.tag import Tag -from reflex.components.typography.heading import Heading -from reflex.components.typography.text import Text from reflex.style import Style from reflex.utils import console, imports, types from reflex.utils.imports import ImportVar diff --git a/reflex/components/media/__init__.py b/reflex/components/media/__init__.py index b37eccd6e..ee11c77e0 100644 --- a/reflex/components/media/__init__.py +++ b/reflex/components/media/__init__.py @@ -1,8 +1 @@ -"""Media components.""" - -from .audio import Audio -from .avatar import Avatar, AvatarBadge, AvatarGroup -from .icon import Icon -from .video import Video - -__all__ = [f for f in dir() if f[0].isupper()] # type: ignore +"""Temporary shim for Chakra icon class.""" diff --git a/reflex/components/media/audio.py b/reflex/components/media/audio.py deleted file mode 100644 index ddcaf4069..000000000 --- a/reflex/components/media/audio.py +++ /dev/null @@ -1,8 +0,0 @@ -"""A audio component.""" -from reflex.components.libs.react_player import ReactPlayerComponent - - -class Audio(ReactPlayerComponent): - """Audio component share with Video component.""" - - pass diff --git a/reflex/components/media/icon.py b/reflex/components/media/icon.py index c10e67896..c60905083 100644 --- a/reflex/components/media/icon.py +++ b/reflex/components/media/icon.py @@ -1,110 +1,2 @@ -"""An icon component.""" -from typing import List - -from reflex.components.libs.chakra import ChakraComponent -from reflex.utils import format - - -class ChakraIconComponent(ChakraComponent): - """A component that wraps a Chakra icon component.""" - - library = "@chakra-ui/icons@2.0.19" - - -class Icon(ChakraIconComponent): - """An image icon.""" - - tag = "None" - - @classmethod - def create(cls, *children, **props): - """Initialize the Icon component. - - Run some additional checks on Icon component. - - Args: - *children: The positional arguments - **props: The keyword arguments - - Raises: - AttributeError: The errors tied to bad usage of the Icon component. - ValueError: If the icon tag is invalid. - - Returns: - The created component. - """ - if children: - raise AttributeError( - f"Passing children to Icon component is not allowed: remove positional arguments {children} to fix" - ) - if "tag" not in props.keys(): - raise AttributeError("Missing 'tag' keyword-argument for Icon") - if type(props["tag"]) != str or props["tag"].lower() not in ICON_LIST: - raise ValueError( - f"Invalid icon tag: {props['tag']}. Please use one of the following: {sorted(ICON_LIST)}" - ) - props["tag"] = format.to_title_case(props["tag"]) + "Icon" - return super().create(*children, **props) - - -# List of all icons. -ICON_LIST: List[str] = [ - "add", - "arrow_back", - "arrow_down", - "arrow_forward", - "arrow_left", - "arrow_right", - "arrow_up", - "arrow_up_down", - "at_sign", - "attachment", - "bell", - "calendar", - "chat", - "check_circle", - "check", - "chevron_down", - "chevron_left", - "chevron_right", - "chevron_up", - "close", - "copy", - "delete", - "download", - "drag_handle", - "edit", - "email", - "external_link", - "hamburger", - "info", - "info_outline", - "link", - "lock", - "minus", - "moon", - "not_allowed", - "phone", - "plus_square", - "question", - "question_outline", - "repeat", - "repeat_clock", - "search", - "search2", - "settings", - "small_add", - "small_close", - "spinner", - "star", - "sun", - "time", - "triangle_down", - "triangle_up", - "unlock", - "up_down", - "view", - "view_off", - "warning", - "warning_two", -] +"""Shim for reflex.components.chakra.media.icon.""" +from reflex.components.chakra.media.icon import * diff --git a/reflex/components/media/image.pyi b/reflex/components/media/image.pyi deleted file mode 100644 index 395009453..000000000 --- a/reflex/components/media/image.pyi +++ /dev/null @@ -1,123 +0,0 @@ -"""Stub file for reflex/components/media/image.py""" -# ------------------- DO NOT EDIT ---------------------- -# This file was generated by `scripts/pyi_generator.py`! -# ------------------------------------------------------ - -from typing import Any, Dict, Literal, Optional, Union, overload -from reflex.vars import Var, BaseVar, ComputedVar -from reflex.event import EventChain, EventHandler, EventSpec -from reflex.style import Style -import base64 -import io -from typing import Any, Optional, Union -from reflex.components.component import Component -from reflex.components.libs.chakra import ChakraComponent, LiteralImageLoading -from reflex.utils.serializers import serializer -from reflex.vars import Var - -class Image(ChakraComponent): - def get_event_triggers(self) -> dict[str, Union[Var, Any]]: ... - @overload - @classmethod - def create( # type: ignore - cls, - *children, - align: Optional[Union[Var[str], str]] = None, - fallback: Optional[Component] = None, - fallback_src: Optional[Union[Var[str], str]] = None, - fit: Optional[Union[Var[str], str]] = None, - html_height: Optional[Union[Var[str], str]] = None, - html_width: Optional[Union[Var[str], str]] = None, - ignore_fallback: Optional[Union[Var[bool], bool]] = None, - loading: Optional[ - Union[Var[Literal["eager", "lazy"]], Literal["eager", "lazy"]] - ] = None, - src: Optional[Union[Var[Any], Any]] = None, - alt: Optional[Union[Var[str], str]] = None, - src_set: Optional[Union[Var[str], str]] = None, - style: Optional[Style] = None, - key: Optional[Any] = None, - id: Optional[Any] = None, - class_name: Optional[Any] = None, - autofocus: Optional[bool] = None, - custom_attrs: Optional[Dict[str, Union[Var, str]]] = None, - on_blur: Optional[ - Union[EventHandler, EventSpec, list, function, BaseVar] - ] = None, - on_click: Optional[ - Union[EventHandler, EventSpec, list, function, BaseVar] - ] = None, - on_context_menu: Optional[ - Union[EventHandler, EventSpec, list, function, BaseVar] - ] = None, - on_double_click: Optional[ - Union[EventHandler, EventSpec, list, function, BaseVar] - ] = None, - on_error: Optional[ - Union[EventHandler, EventSpec, list, function, BaseVar] - ] = None, - on_focus: Optional[ - Union[EventHandler, EventSpec, list, function, BaseVar] - ] = None, - on_load: Optional[ - Union[EventHandler, EventSpec, list, function, BaseVar] - ] = None, - on_mount: Optional[ - Union[EventHandler, EventSpec, list, function, BaseVar] - ] = None, - on_mouse_down: Optional[ - Union[EventHandler, EventSpec, list, function, BaseVar] - ] = None, - on_mouse_enter: Optional[ - Union[EventHandler, EventSpec, list, function, BaseVar] - ] = None, - on_mouse_leave: Optional[ - Union[EventHandler, EventSpec, list, function, BaseVar] - ] = None, - on_mouse_move: Optional[ - Union[EventHandler, EventSpec, list, function, BaseVar] - ] = None, - on_mouse_out: Optional[ - Union[EventHandler, EventSpec, list, function, BaseVar] - ] = None, - on_mouse_over: Optional[ - Union[EventHandler, EventSpec, list, function, BaseVar] - ] = None, - on_mouse_up: Optional[ - Union[EventHandler, EventSpec, list, function, BaseVar] - ] = None, - on_scroll: Optional[ - Union[EventHandler, EventSpec, list, function, BaseVar] - ] = None, - on_unmount: Optional[ - Union[EventHandler, EventSpec, list, function, BaseVar] - ] = None, - **props - ) -> "Image": - """Create an Image component. - - Args: - *children: The children of the image. - align: How to align the image within its bounds. It maps to css `object-position` property. - fallback: Fallback Reflex component to show if image is loading or image fails. - fallback_src: Fallback image src to show if image is loading or image fails. - fit: How the image to fit within its bounds. It maps to css `object-fit` property. - html_height: The native HTML height attribute to the passed to the img. - html_width: The native HTML width attribute to the passed to the img. - ignore_fallback: If true, opt out of the fallbackSrc logic and use as img. - loading: "eager" | "lazy" - src: The path/url to the image or PIL image object. - alt: The alt text of the image. - src_set: Provide multiple sources for an image, allowing the browser to select the most appropriate source based on factors like screen resolution and device capabilities. Learn more _[here](https://developer.mozilla.org/en-US/docs/Learn/HTML/Multimedia_and_embedding/Responsive_images)_ - style: The style of the component. - key: A unique key for the component. - id: The id for the component. - class_name: The class name for the component. - autofocus: Whether the component should take the focus once the page is loaded - custom_attrs: custom attribute - **props: The props of the image. - - Returns: - The Image component. - """ - ... diff --git a/reflex/components/media/video.py b/reflex/components/media/video.py deleted file mode 100644 index 99fb0f985..000000000 --- a/reflex/components/media/video.py +++ /dev/null @@ -1,8 +0,0 @@ -"""A video component.""" -from reflex.components.libs.react_player import ReactPlayerComponent - - -class Video(ReactPlayerComponent): - """Video component share with audio component.""" - - pass diff --git a/reflex/components/moment/__init__.py b/reflex/components/moment/__init__.py new file mode 100644 index 000000000..f144680fe --- /dev/null +++ b/reflex/components/moment/__init__.py @@ -0,0 +1,5 @@ +"""Moment.js component.""" + +from .moment import Moment + +moment = Moment.create diff --git a/reflex/components/datadisplay/moment.py b/reflex/components/moment/moment.py similarity index 100% rename from reflex/components/datadisplay/moment.py rename to reflex/components/moment/moment.py diff --git a/reflex/components/datadisplay/moment.pyi b/reflex/components/moment/moment.pyi similarity index 99% rename from reflex/components/datadisplay/moment.pyi rename to reflex/components/moment/moment.pyi index 0d19ff4ae..6eb780cda 100644 --- a/reflex/components/datadisplay/moment.pyi +++ b/reflex/components/moment/moment.pyi @@ -1,4 +1,4 @@ -"""Stub file for reflex/components/datadisplay/moment.py""" +"""Stub file for reflex/components/moment/moment.py""" # ------------------- DO NOT EDIT ---------------------- # This file was generated by `scripts/pyi_generator.py`! # ------------------------------------------------------ diff --git a/reflex/components/next/__init__.py b/reflex/components/next/__init__.py index 090d5c615..211f8d010 100644 --- a/reflex/components/next/__init__.py +++ b/reflex/components/next/__init__.py @@ -2,7 +2,9 @@ from .base import NextComponent from .image import Image +from .link import NextLink from .video import Video image = Image.create video = Video.create +next_link = NextLink.create diff --git a/reflex/components/navigation/nextlink.py b/reflex/components/next/link.py similarity index 100% rename from reflex/components/navigation/nextlink.py rename to reflex/components/next/link.py diff --git a/reflex/components/navigation/nextlink.pyi b/reflex/components/next/link.pyi similarity index 98% rename from reflex/components/navigation/nextlink.pyi rename to reflex/components/next/link.pyi index a204d3f03..3d8809968 100644 --- a/reflex/components/navigation/nextlink.pyi +++ b/reflex/components/next/link.pyi @@ -1,4 +1,4 @@ -"""Stub file for reflex/components/navigation/nextlink.py""" +"""Stub file for reflex/components/next/link.py""" # ------------------- DO NOT EDIT ---------------------- # This file was generated by `scripts/pyi_generator.py`! # ------------------------------------------------------ diff --git a/reflex/components/plotly/__init__.py b/reflex/components/plotly/__init__.py new file mode 100644 index 000000000..5620d5fc4 --- /dev/null +++ b/reflex/components/plotly/__init__.py @@ -0,0 +1,5 @@ +"""Plotly components.""" + +from .plotly import Plotly + +plotly = Plotly.create diff --git a/reflex/components/graphing/plotly.py b/reflex/components/plotly/plotly.py similarity index 100% rename from reflex/components/graphing/plotly.py rename to reflex/components/plotly/plotly.py diff --git a/reflex/components/graphing/plotly.pyi b/reflex/components/plotly/plotly.pyi similarity index 99% rename from reflex/components/graphing/plotly.pyi rename to reflex/components/plotly/plotly.pyi index 4a586fe31..2a0653aeb 100644 --- a/reflex/components/graphing/plotly.pyi +++ b/reflex/components/plotly/plotly.pyi @@ -1,4 +1,4 @@ -"""Stub file for reflex/components/graphing/plotly.py""" +"""Stub file for reflex/components/plotly/plotly.py""" # ------------------- DO NOT EDIT ---------------------- # This file was generated by `scripts/pyi_generator.py`! # ------------------------------------------------------ diff --git a/reflex/components/radix/themes/components/textarea.py b/reflex/components/radix/themes/components/textarea.py index f28aed35b..d24a65b32 100644 --- a/reflex/components/radix/themes/components/textarea.py +++ b/reflex/components/radix/themes/components/textarea.py @@ -3,7 +3,7 @@ from typing import Any, Dict, Literal from reflex import el from reflex.components.component import Component -from reflex.components.forms.debounce import DebounceInput +from reflex.components.core.debounce import DebounceInput from reflex.constants import EventTriggers from reflex.vars import Var diff --git a/reflex/components/radix/themes/components/textarea.pyi b/reflex/components/radix/themes/components/textarea.pyi index 5a0d8a04b..a78701520 100644 --- a/reflex/components/radix/themes/components/textarea.pyi +++ b/reflex/components/radix/themes/components/textarea.pyi @@ -10,7 +10,7 @@ from reflex.style import Style from typing import Any, Dict, Literal from reflex import el from reflex.components.component import Component -from reflex.components.forms.debounce import DebounceInput +from reflex.components.core.debounce import DebounceInput from reflex.constants import EventTriggers from reflex.vars import Var from ..base import CommonMarginProps, LiteralAccentColor, RadixThemesComponent diff --git a/reflex/components/radix/themes/components/textfield.py b/reflex/components/radix/themes/components/textfield.py index 2f8cb1892..89c1612f5 100644 --- a/reflex/components/radix/themes/components/textfield.py +++ b/reflex/components/radix/themes/components/textfield.py @@ -3,7 +3,7 @@ from typing import Any, Dict, Literal from reflex.components import el from reflex.components.component import Component -from reflex.components.forms.debounce import DebounceInput +from reflex.components.core.debounce import DebounceInput from reflex.constants import EventTriggers from reflex.vars import Var diff --git a/reflex/components/radix/themes/components/textfield.pyi b/reflex/components/radix/themes/components/textfield.pyi index 0bd852cc5..b9ae8bcaf 100644 --- a/reflex/components/radix/themes/components/textfield.pyi +++ b/reflex/components/radix/themes/components/textfield.pyi @@ -10,7 +10,7 @@ from reflex.style import Style from typing import Any, Dict, Literal from reflex.components import el from reflex.components.component import Component -from reflex.components.forms.debounce import DebounceInput +from reflex.components.core.debounce import DebounceInput from reflex.constants import EventTriggers from reflex.vars import Var from ..base import ( diff --git a/reflex/components/react_player/__init__.py b/reflex/components/react_player/__init__.py new file mode 100644 index 000000000..8c4a4486f --- /dev/null +++ b/reflex/components/react_player/__init__.py @@ -0,0 +1,7 @@ +"""React Player component for audio and video.""" + +from .audio import Audio +from .video import Video + +audio = Audio.create +video = Video.create diff --git a/reflex/components/react_player/audio.py b/reflex/components/react_player/audio.py new file mode 100644 index 000000000..359f37b74 --- /dev/null +++ b/reflex/components/react_player/audio.py @@ -0,0 +1,8 @@ +"""A audio component.""" +from reflex.components.react_player.react_player import ReactPlayer + + +class Audio(ReactPlayer): + """Audio component share with Video component.""" + + pass diff --git a/reflex/components/media/audio.pyi b/reflex/components/react_player/audio.pyi similarity index 96% rename from reflex/components/media/audio.pyi rename to reflex/components/react_player/audio.pyi index 1946877c6..d45dbcdaf 100644 --- a/reflex/components/media/audio.pyi +++ b/reflex/components/react_player/audio.pyi @@ -1,4 +1,4 @@ -"""Stub file for reflex/components/media/audio.py""" +"""Stub file for reflex/components/react_player/audio.py""" # ------------------- DO NOT EDIT ---------------------- # This file was generated by `scripts/pyi_generator.py`! # ------------------------------------------------------ @@ -7,9 +7,9 @@ from typing import Any, Dict, Literal, Optional, Union, overload from reflex.vars import Var, BaseVar, ComputedVar from reflex.event import EventChain, EventHandler, EventSpec from reflex.style import Style -from reflex.components.libs.react_player import ReactPlayerComponent +from reflex.components.react_player.react_player import ReactPlayer -class Audio(ReactPlayerComponent): +class Audio(ReactPlayer): pass @overload diff --git a/reflex/components/libs/react_player.py b/reflex/components/react_player/react_player.py similarity index 95% rename from reflex/components/libs/react_player.py rename to reflex/components/react_player/react_player.py index cb52337c5..2e09d4bf9 100644 --- a/reflex/components/libs/react_player.py +++ b/reflex/components/react_player/react_player.py @@ -6,7 +6,7 @@ from reflex.components.component import NoSSRComponent from reflex.vars import Var -class ReactPlayerComponent(NoSSRComponent): +class ReactPlayer(NoSSRComponent): """Using react-player and not implement all props and callback yet. reference: https://github.com/cookpete/react-player. """ diff --git a/reflex/components/libs/react_player.pyi b/reflex/components/react_player/react_player.pyi similarity index 96% rename from reflex/components/libs/react_player.pyi rename to reflex/components/react_player/react_player.pyi index 9d5ccf3cc..49ab91ab1 100644 --- a/reflex/components/libs/react_player.pyi +++ b/reflex/components/react_player/react_player.pyi @@ -1,4 +1,4 @@ -"""Stub file for reflex/components/libs/react_player.py""" +"""Stub file for reflex/components/react_player/react_player.py""" # ------------------- DO NOT EDIT ---------------------- # This file was generated by `scripts/pyi_generator.py`! # ------------------------------------------------------ @@ -10,7 +10,7 @@ from reflex.style import Style from reflex.components.component import NoSSRComponent from reflex.vars import Var -class ReactPlayerComponent(NoSSRComponent): +class ReactPlayer(NoSSRComponent): @overload @classmethod def create( # type: ignore @@ -77,7 +77,7 @@ class ReactPlayerComponent(NoSSRComponent): Union[EventHandler, EventSpec, list, function, BaseVar] ] = None, **props - ) -> "ReactPlayerComponent": + ) -> "ReactPlayer": """Create the component. Args: diff --git a/reflex/components/react_player/video.py b/reflex/components/react_player/video.py new file mode 100644 index 000000000..834d1a9ae --- /dev/null +++ b/reflex/components/react_player/video.py @@ -0,0 +1,8 @@ +"""A video component.""" +from reflex.components.react_player.react_player import ReactPlayer + + +class Video(ReactPlayer): + """Video component share with audio component.""" + + pass diff --git a/reflex/components/media/video.pyi b/reflex/components/react_player/video.pyi similarity index 96% rename from reflex/components/media/video.pyi rename to reflex/components/react_player/video.pyi index 59f6b3f05..a3c447cb0 100644 --- a/reflex/components/media/video.pyi +++ b/reflex/components/react_player/video.pyi @@ -1,4 +1,4 @@ -"""Stub file for reflex/components/media/video.py""" +"""Stub file for reflex/components/react_player/video.py""" # ------------------- DO NOT EDIT ---------------------- # This file was generated by `scripts/pyi_generator.py`! # ------------------------------------------------------ @@ -7,9 +7,9 @@ from typing import Any, Dict, Literal, Optional, Union, overload from reflex.vars import Var, BaseVar, ComputedVar from reflex.event import EventChain, EventHandler, EventSpec from reflex.style import Style -from reflex.components.libs.react_player import ReactPlayerComponent +from reflex.components.react_player.react_player import ReactPlayer -class Video(ReactPlayerComponent): +class Video(ReactPlayer): pass @overload diff --git a/reflex/components/graphing/recharts/__init__.py b/reflex/components/recharts/__init__.py similarity index 100% rename from reflex/components/graphing/recharts/__init__.py rename to reflex/components/recharts/__init__.py diff --git a/reflex/components/graphing/recharts/cartesian.py b/reflex/components/recharts/cartesian.py similarity index 100% rename from reflex/components/graphing/recharts/cartesian.py rename to reflex/components/recharts/cartesian.py diff --git a/reflex/components/graphing/recharts/cartesian.pyi b/reflex/components/recharts/cartesian.pyi similarity index 99% rename from reflex/components/graphing/recharts/cartesian.pyi rename to reflex/components/recharts/cartesian.pyi index dacae8971..3af7849a2 100644 --- a/reflex/components/graphing/recharts/cartesian.pyi +++ b/reflex/components/recharts/cartesian.pyi @@ -1,4 +1,4 @@ -"""Stub file for reflex/components/graphing/recharts/cartesian.py""" +"""Stub file for reflex/components/recharts/cartesian.py""" # ------------------- DO NOT EDIT ---------------------- # This file was generated by `scripts/pyi_generator.py`! # ------------------------------------------------------ diff --git a/reflex/components/graphing/recharts/charts.py b/reflex/components/recharts/charts.py similarity index 99% rename from reflex/components/graphing/recharts/charts.py rename to reflex/components/recharts/charts.py index b0150cc34..5a29cc2aa 100644 --- a/reflex/components/graphing/recharts/charts.py +++ b/reflex/components/recharts/charts.py @@ -4,7 +4,7 @@ from __future__ import annotations from typing import Any, Dict, List, Union from reflex.components.component import Component -from reflex.components.graphing.recharts.general import ResponsiveContainer +from reflex.components.recharts.general import ResponsiveContainer from reflex.constants import EventTriggers from reflex.vars import Var diff --git a/reflex/components/graphing/recharts/charts.pyi b/reflex/components/recharts/charts.pyi similarity index 99% rename from reflex/components/graphing/recharts/charts.pyi rename to reflex/components/recharts/charts.pyi index ddbbff231..2d133cba7 100644 --- a/reflex/components/graphing/recharts/charts.pyi +++ b/reflex/components/recharts/charts.pyi @@ -1,4 +1,4 @@ -"""Stub file for reflex/components/graphing/recharts/charts.py""" +"""Stub file for reflex/components/recharts/charts.py""" # ------------------- DO NOT EDIT ---------------------- # This file was generated by `scripts/pyi_generator.py`! # ------------------------------------------------------ @@ -9,7 +9,7 @@ from reflex.event import EventChain, EventHandler, EventSpec from reflex.style import Style from typing import Any, Dict, List, Union from reflex.components.component import Component -from reflex.components.graphing.recharts.general import ResponsiveContainer +from reflex.components.recharts.general import ResponsiveContainer from reflex.constants import EventTriggers from reflex.vars import Var from .recharts import ( diff --git a/reflex/components/graphing/recharts/general.py b/reflex/components/recharts/general.py similarity index 100% rename from reflex/components/graphing/recharts/general.py rename to reflex/components/recharts/general.py diff --git a/reflex/components/graphing/recharts/general.pyi b/reflex/components/recharts/general.pyi similarity index 99% rename from reflex/components/graphing/recharts/general.pyi rename to reflex/components/recharts/general.pyi index 5643588b5..8b5cb5c62 100644 --- a/reflex/components/graphing/recharts/general.pyi +++ b/reflex/components/recharts/general.pyi @@ -1,4 +1,4 @@ -"""Stub file for reflex/components/graphing/recharts/general.py""" +"""Stub file for reflex/components/recharts/general.py""" # ------------------- DO NOT EDIT ---------------------- # This file was generated by `scripts/pyi_generator.py`! # ------------------------------------------------------ diff --git a/reflex/components/graphing/recharts/polar.py b/reflex/components/recharts/polar.py similarity index 100% rename from reflex/components/graphing/recharts/polar.py rename to reflex/components/recharts/polar.py diff --git a/reflex/components/graphing/recharts/polar.pyi b/reflex/components/recharts/polar.pyi similarity index 99% rename from reflex/components/graphing/recharts/polar.pyi rename to reflex/components/recharts/polar.pyi index 8d9d45295..8270f1cde 100644 --- a/reflex/components/graphing/recharts/polar.pyi +++ b/reflex/components/recharts/polar.pyi @@ -1,4 +1,4 @@ -"""Stub file for reflex/components/graphing/recharts/polar.py""" +"""Stub file for reflex/components/recharts/polar.py""" # ------------------- DO NOT EDIT ---------------------- # This file was generated by `scripts/pyi_generator.py`! # ------------------------------------------------------ diff --git a/reflex/components/graphing/recharts/recharts.py b/reflex/components/recharts/recharts.py similarity index 100% rename from reflex/components/graphing/recharts/recharts.py rename to reflex/components/recharts/recharts.py diff --git a/reflex/components/graphing/recharts/recharts.pyi b/reflex/components/recharts/recharts.pyi similarity index 99% rename from reflex/components/graphing/recharts/recharts.pyi rename to reflex/components/recharts/recharts.pyi index eb9dd8ceb..1eb3a2203 100644 --- a/reflex/components/graphing/recharts/recharts.pyi +++ b/reflex/components/recharts/recharts.pyi @@ -1,4 +1,4 @@ -"""Stub file for reflex/components/graphing/recharts/recharts.py""" +"""Stub file for reflex/components/recharts/recharts.py""" # ------------------- DO NOT EDIT ---------------------- # This file was generated by `scripts/pyi_generator.py`! # ------------------------------------------------------ diff --git a/reflex/components/suneditor/__init__.py b/reflex/components/suneditor/__init__.py new file mode 100644 index 000000000..3f7a73382 --- /dev/null +++ b/reflex/components/suneditor/__init__.py @@ -0,0 +1,5 @@ +"""Editor component.""" + +from .editor import Editor, EditorButtonList, EditorOptions + +editor = Editor.create diff --git a/reflex/components/forms/editor.py b/reflex/components/suneditor/editor.py similarity index 100% rename from reflex/components/forms/editor.py rename to reflex/components/suneditor/editor.py diff --git a/reflex/components/forms/editor.pyi b/reflex/components/suneditor/editor.pyi similarity index 99% rename from reflex/components/forms/editor.pyi rename to reflex/components/suneditor/editor.pyi index 2dfbc78cd..867274434 100644 --- a/reflex/components/forms/editor.pyi +++ b/reflex/components/suneditor/editor.pyi @@ -1,4 +1,4 @@ -"""Stub file for reflex/components/forms/editor.py""" +"""Stub file for reflex/components/suneditor/editor.py""" # ------------------- DO NOT EDIT ---------------------- # This file was generated by `scripts/pyi_generator.py`! # ------------------------------------------------------ diff --git a/reflex/components/tags/iter_tag.py b/reflex/components/tags/iter_tag.py index 65050f620..a0797193c 100644 --- a/reflex/components/tags/iter_tag.py +++ b/reflex/components/tags/iter_tag.py @@ -102,9 +102,9 @@ class IterTag(Tag): The rendered component. """ # Import here to avoid circular imports. - from reflex.components.layout.cond import Cond - from reflex.components.layout.foreach import Foreach - from reflex.components.layout.fragment import Fragment + from reflex.components.base.fragment import Fragment + from reflex.components.core.cond import Cond + from reflex.components.core.foreach import Foreach # Get the render function arguments. args = inspect.getfullargspec(self.render_fn).args diff --git a/reflex/event.py b/reflex/event.py index da2b3a1e3..28d1f3ecc 100644 --- a/reflex/event.py +++ b/reflex/event.py @@ -329,7 +329,7 @@ class FileUpload(Base): Raises: ValueError: If the on_upload_progress is not a valid event handler. """ - from reflex.components.forms.upload import ( + from reflex.components.core.upload import ( DEFAULT_UPLOAD_ID, upload_files_context_var_data, ) diff --git a/tests/components/datadisplay/test_code.py b/tests/components/datadisplay/test_code.py index 64452e90c..1557cef84 100644 --- a/tests/components/datadisplay/test_code.py +++ b/tests/components/datadisplay/test_code.py @@ -1,6 +1,6 @@ import pytest -from reflex.components.datadisplay.code import CodeBlock +from reflex.components.chakra.datadisplay.code import CodeBlock @pytest.mark.parametrize( diff --git a/tests/components/datadisplay/test_datatable.py b/tests/components/datadisplay/test_datatable.py index 80ed3bef5..c755064ce 100644 --- a/tests/components/datadisplay/test_datatable.py +++ b/tests/components/datadisplay/test_datatable.py @@ -2,9 +2,7 @@ import pandas as pd import pytest import reflex as rx -from reflex.components.datadisplay.datatable import ( - DataTable, -) +from reflex.components.gridjs.datatable import DataTable from reflex.utils import types from reflex.utils.serializers import serialize, serialize_dataframe diff --git a/tests/components/datadisplay/test_table.py b/tests/components/datadisplay/test_table.py index 212f1fb59..1cec624e9 100644 --- a/tests/components/datadisplay/test_table.py +++ b/tests/components/datadisplay/test_table.py @@ -3,7 +3,7 @@ from typing import List, Tuple import pytest -from reflex.components.datadisplay.table import Tbody, Tfoot, Thead +from reflex.components.chakra.datadisplay.table import Tbody, Tfoot, Thead from reflex.state import BaseState PYTHON_GT_V38 = sys.version_info.major >= 3 and sys.version_info.minor > 8 diff --git a/tests/components/forms/test_form.py b/tests/components/forms/test_form.py index 0b0664050..b9eff2daf 100644 --- a/tests/components/forms/test_form.py +++ b/tests/components/forms/test_form.py @@ -1,4 +1,4 @@ -from reflex.components.forms.form import Form +from reflex.components.chakra.forms.form import Form from reflex.event import EventChain from reflex.vars import BaseVar diff --git a/tests/components/layout/test_cond.py b/tests/components/layout/test_cond.py index 08c6883c4..d60d65085 100644 --- a/tests/components/layout/test_cond.py +++ b/tests/components/layout/test_cond.py @@ -4,17 +4,17 @@ from typing import Any import pytest import reflex as rx -from reflex.components.layout.box import Box -from reflex.components.layout.cond import Cond, cond -from reflex.components.layout.fragment import Fragment -from reflex.components.layout.responsive import ( +from reflex.components.base.fragment import Fragment +from reflex.components.chakra.layout.box import Box +from reflex.components.chakra.typography.text import Text +from reflex.components.core.cond import Cond, cond +from reflex.components.core.responsive import ( desktop_only, mobile_and_tablet, mobile_only, tablet_and_desktop, tablet_only, ) -from reflex.components.typography.text import Text from reflex.state import BaseState from reflex.vars import Var diff --git a/tests/components/layout/test_foreach.py b/tests/components/layout/test_foreach.py index 71ae36b23..60ccd7660 100644 --- a/tests/components/layout/test_foreach.py +++ b/tests/components/layout/test_foreach.py @@ -3,7 +3,7 @@ from typing import Dict, List, Set, Tuple import pytest from reflex.components import box, foreach, text -from reflex.components.layout import Foreach +from reflex.components.core import Foreach from reflex.state import BaseState diff --git a/tests/components/media/test_icon.py b/tests/components/media/test_icon.py index bd4fc4d82..95dc8de28 100644 --- a/tests/components/media/test_icon.py +++ b/tests/components/media/test_icon.py @@ -1,6 +1,6 @@ import pytest -from reflex.components.media.icon import ICON_LIST, Icon +from reflex.components.chakra.media.icon import ICON_LIST, Icon from reflex.utils import format diff --git a/tests/components/test_component.py b/tests/components/test_component.py index ac5b23130..35deae8fb 100644 --- a/tests/components/test_component.py +++ b/tests/components/test_component.py @@ -5,13 +5,13 @@ import pytest import reflex as rx from reflex.base import Base from reflex.components.base.bare import Bare +from reflex.components.chakra.layout.box import Box from reflex.components.component import ( Component, CustomComponent, StatefulComponent, custom_component, ) -from reflex.components.layout.box import Box from reflex.constants import EventTriggers from reflex.event import EventChain, EventHandler from reflex.state import BaseState diff --git a/tests/components/typography/test_markdown.py b/tests/components/typography/test_markdown.py index 6836dc69e..69c8e4a0c 100644 --- a/tests/components/typography/test_markdown.py +++ b/tests/components/typography/test_markdown.py @@ -1,7 +1,7 @@ import pytest import reflex as rx -from reflex.components.typography.markdown import Markdown +from reflex.components.markdown import Markdown @pytest.mark.parametrize(