Skip to content

Commit

Permalink
Move core components to radix namespace (reflex-dev#2506)
Browse files Browse the repository at this point in the history
  • Loading branch information
picklelo authored Feb 2, 2024
1 parent 8a3cec1 commit 05d1be2
Show file tree
Hide file tree
Showing 31 changed files with 337 additions and 768 deletions.
4 changes: 2 additions & 2 deletions .coveragerc
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ branch = true
[report]
show_missing = true
# TODO bump back to 79
fail_under = 70
fail_under = 69
precision = 2

# Regexes for lines to exclude from consideration
Expand All @@ -28,4 +28,4 @@ exclude_also =
ignore_errors = True

[html]
directory = coverage_html_report
directory = coverage_html_report
4 changes: 2 additions & 2 deletions integration/test_background_task.py
Original file line number Diff line number Diff line change
Expand Up @@ -59,11 +59,11 @@ async def non_blocking_pause(self):

def index() -> rx.Component:
return rx.vstack(
rx.input(
rx.chakra.input(
id="token", value=State.router.session.client_token, is_read_only=True
),
rx.heading(State.counter, id="counter"),
rx.input(
rx.chakra.input(
id="iterations",
placeholder="Iterations",
value=State.iterations.to_string(), # type: ignore
Expand Down
6 changes: 3 additions & 3 deletions integration/test_call_script.py
Original file line number Diff line number Diff line change
Expand Up @@ -142,17 +142,17 @@ def reset_(self):
@app.add_page
def index():
return rx.vstack(
rx.input(
rx.chakra.input(
value=CallScriptState.router.session.client_token,
is_read_only=True,
id="token",
),
rx.input(
rx.chakra.input(
value=CallScriptState.inline_counter.to(str), # type: ignore
id="inline_counter",
is_read_only=True,
),
rx.input(
rx.chakra.input(
value=CallScriptState.external_counter.to(str), # type: ignore
id="external_counter",
is_read_only=True,
Expand Down
6 changes: 3 additions & 3 deletions integration/test_client_storage.py
Original file line number Diff line number Diff line change
Expand Up @@ -55,18 +55,18 @@ def set_var(self):

def index():
return rx.fragment(
rx.input(
rx.chakra.input(
value=ClientSideState.router.session.client_token,
is_read_only=True,
id="token",
),
rx.input(
rx.chakra.input(
placeholder="state var",
value=ClientSideState.state_var,
on_change=ClientSideState.set_state_var, # type: ignore
id="state_var",
),
rx.input(
rx.chakra.input(
placeholder="input value",
value=ClientSideState.input_value,
on_change=ClientSideState.set_input_value, # type: ignore
Expand Down
12 changes: 7 additions & 5 deletions integration/test_dynamic_routes.py
Original file line number Diff line number Diff line change
Expand Up @@ -35,13 +35,15 @@ def next_page(self) -> str:

def index():
return rx.fragment(
rx.input(
rx.chakra.input(
value=DynamicState.router.session.client_token,
is_read_only=True,
id="token",
),
rx.input(value=DynamicState.page_id, is_read_only=True, id="page_id"),
rx.input(
rx.chakra.input(
value=DynamicState.page_id, is_read_only=True, id="page_id"
),
rx.chakra.input(
value=DynamicState.router.page.raw_path,
is_read_only=True,
id="raw_path",
Expand All @@ -52,8 +54,8 @@ def index():
"next", href="/page/" + DynamicState.next_page, id="link_page_next" # type: ignore
),
rx.link("missing", href="/missing", id="link_missing"),
rx.list(
rx.foreach(DynamicState.order, lambda i: rx.list_item(rx.text(i))), # type: ignore
rx.chakra.list(
rx.foreach(DynamicState.order, lambda i: rx.chakra.list_item(rx.text(i))), # type: ignore
),
)

Expand Down
6 changes: 3 additions & 3 deletions integration/test_event_actions.py
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ def get_event_triggers(self):

def index():
return rx.vstack(
rx.input(
rx.chakra.input(
value=EventActionState.router.session.client_token,
is_read_only=True,
id="token",
Expand Down Expand Up @@ -121,10 +121,10 @@ def index():
"custom-prevent-default"
).prevent_default,
),
rx.list(
rx.chakra.list(
rx.foreach(
EventActionState.order, # type: ignore
rx.list_item,
rx.chakra.list_item,
),
),
on_click=EventActionState.on_click("outer"), # type: ignore
Expand Down
6 changes: 4 additions & 2 deletions integration/test_event_chain.py
Original file line number Diff line number Diff line change
Expand Up @@ -124,15 +124,17 @@ def click_yield_interim_value(self):

app = rx.App(state=rx.State)

token_input = rx.input(
token_input = rx.chakra.input(
value=State.router.session.client_token, is_read_only=True, id="token"
)

@app.add_page
def index():
return rx.fragment(
token_input,
rx.input(value=State.interim_value, is_read_only=True, id="interim_value"),
rx.chakra.input(
value=State.interim_value, is_read_only=True, id="interim_value"
),
rx.button(
"Return Event",
id="return_event",
Expand Down
62 changes: 33 additions & 29 deletions integration/test_form_submit.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,28 +27,28 @@ def form_submit(self, form_data: dict):
@app.add_page
def index():
return rx.vstack(
rx.input(
rx.chakra.input(
value=FormState.router.session.client_token,
is_read_only=True,
id="token",
),
rx.form(
rx.form.root(
rx.vstack(
rx.input(id="name_input"),
rx.hstack(rx.pin_input(length=4, id="pin_input")),
rx.number_input(id="number_input"),
rx.chakra.input(id="name_input"),
rx.hstack(rx.chakra.pin_input(length=4, id="pin_input")),
rx.chakra.number_input(id="number_input"),
rx.checkbox(id="bool_input"),
rx.switch(id="bool_input2"),
rx.checkbox(id="bool_input3"),
rx.switch(id="bool_input4"),
rx.slider(id="slider_input"),
rx.range_slider(id="range_input"),
rx.slider(id="slider_input", default_value=[50], width="100%"),
rx.chakra.range_slider(id="range_input"),
rx.radio_group(["option1", "option2"], id="radio_input"),
rx.radio_group(FormState.var_options, id="radio_input_var"),
rx.select(["option1", "option2"], id="select_input"),
rx.select(FormState.var_options, id="select_input_var"),
rx.chakra.select(["option1", "option2"], id="select_input"),
rx.chakra.select(FormState.var_options, id="select_input_var"),
rx.text_area(id="text_area_input"),
rx.input(
rx.chakra.input(
id="debounce_input",
debounce_timeout=0,
on_change=rx.console_log,
Expand Down Expand Up @@ -80,37 +80,41 @@ def form_submit(self, form_data: dict):
@app.add_page
def index():
return rx.vstack(
rx.input(
rx.chakra.input(
value=FormState.router.session.client_token,
is_read_only=True,
id="token",
),
rx.form(
rx.form.root(
rx.vstack(
rx.input(name="name_input"),
rx.hstack(rx.pin_input(length=4, name="pin_input")),
rx.number_input(name="number_input"),
rx.chakra.input(name="name_input"),
rx.hstack(rx.chakra.pin_input(length=4, name="pin_input")),
rx.chakra.number_input(name="number_input"),
rx.checkbox(name="bool_input"),
rx.switch(name="bool_input2"),
rx.checkbox(name="bool_input3"),
rx.switch(name="bool_input4"),
rx.slider(name="slider_input"),
rx.range_slider(name="range_input"),
rx.slider(name="slider_input", default_value=[50], width="100%"),
rx.chakra.range_slider(name="range_input"),
rx.radio_group(FormState.options, name="radio_input"),
rx.select(FormState.options, name="select_input"),
rx.select(
FormState.options,
name="select_input",
default_value=FormState.options[0],
),
rx.text_area(name="text_area_input"),
rx.input_group(
rx.input_left_element(rx.icon(tag="chevron_right")),
rx.input(
rx.chakra.input_group(
rx.chakra.input_left_element(rx.icon(tag="chevron_right")),
rx.chakra.input(
name="debounce_input",
debounce_timeout=0,
on_change=rx.console_log,
),
rx.input_right_element(rx.icon(tag="chevron_left")),
rx.chakra.input_right_element(rx.icon(tag="chevron_left")),
),
rx.button_group(
rx.chakra.button_group(
rx.button("Submit", type_="submit"),
rx.icon_button(FormState.val, icon=rx.icon(tag="add")),
rx.icon_button(FormState.val, icon=rx.icon(tag="plus")),
variant="outline",
is_attached=True,
),
Expand Down Expand Up @@ -194,16 +198,16 @@ async def test_submit(driver, form_submit: AppHarness):
for _ in range(3):
buttons[1].click()

checkbox_input = driver.find_element(By.CLASS_NAME, "chakra-checkbox__control")
checkbox_input = driver.find_element(By.XPATH, "//button[@role='checkbox']")
checkbox_input.click()

switch_input = driver.find_element(By.CLASS_NAME, "chakra-switch__track")
switch_input = driver.find_element(By.XPATH, "//button[@role='switch']")
switch_input.click()

radio_buttons = driver.find_elements(By.CLASS_NAME, "chakra-radio__control")
radio_buttons = driver.find_elements(By.XPATH, "//button[@role='radio']")
radio_buttons[1].click()

textarea_input = driver.find_element(By.CLASS_NAME, "chakra-textarea")
textarea_input = driver.find_element(By.TAG_NAME, "textarea")
textarea_input.send_keys("Some", Keys.ENTER, "Text")

debounce_input = driver.find_element(by, "debounce_input")
Expand All @@ -213,7 +217,7 @@ async def test_submit(driver, form_submit: AppHarness):

prev_url = driver.current_url

submit_input = driver.find_element(By.CLASS_NAME, "chakra-button")
submit_input = driver.find_element(By.CLASS_NAME, "rt-Button")
submit_input.click()

async def get_form_data():
Expand Down
8 changes: 4 additions & 4 deletions integration/test_input.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,16 +21,16 @@ class State(rx.State):
@app.add_page
def index():
return rx.fragment(
rx.input(
rx.chakra.input(
value=State.router.session.client_token, is_read_only=True, id="token"
),
rx.input(
rx.chakra.input(
id="debounce_input_input",
on_change=State.set_text, # type: ignore
value=State.text,
),
rx.input(value=State.text, id="value_input", is_read_only=True),
rx.input(on_change=State.set_text, id="on_change_input"), # type: ignore
rx.chakra.input(value=State.text, id="value_input", is_read_only=True),
rx.chakra.input(on_change=State.set_text, id="on_change_input"), # type: ignore
rx.el.input(
value=State.text,
id="plain_value_input",
Expand Down
2 changes: 1 addition & 1 deletion integration/test_login_flow.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ def login(self):
yield rx.redirect("/")

def index():
return rx.Cond.create(
return rx.cond(
State.is_hydrated & State.auth_token, # type: ignore
rx.vstack(
rx.heading(State.auth_token, id="auth-token"),
Expand Down
8 changes: 4 additions & 4 deletions integration/test_server_side_event.py
Original file line number Diff line number Diff line change
Expand Up @@ -38,12 +38,12 @@ def set_value_return_c(self):
@app.add_page
def index():
return rx.fragment(
rx.input(
rx.chakra.input(
id="token", value=SSState.router.session.client_token, is_read_only=True
),
rx.input(default_value="a", id="a"),
rx.input(default_value="b", id="b"),
rx.input(default_value="c", id="c"),
rx.chakra.input(default_value="a", id="a"),
rx.chakra.input(default_value="b", id="b"),
rx.chakra.input(default_value="c", id="c"),
rx.button(
"Clear Immediate",
id="clear_immediate",
Expand Down
2 changes: 1 addition & 1 deletion integration/test_state_inheritance.py
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ def computed_childvar(self) -> str:

def index() -> rx.Component:
return rx.vstack(
rx.input(
rx.chakra.input(
id="token", value=Base1.router.session.client_token, is_read_only=True
),
rx.heading(Base1.computed_mixin, id="base1-computed_mixin"),
Expand Down
Loading

0 comments on commit 05d1be2

Please sign in to comment.