Skip to content
Closed
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Use preact instead of react
  • Loading branch information
Archmonger committed Feb 4, 2025
commit f63f14d0fc92870f06c37f8dea9e39269abaf3e1
Binary file modified src/js/bun.lockb
Binary file not shown.
5 changes: 2 additions & 3 deletions src/js/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,6 @@
"check": "prettier --check . && eslint"
},
"devDependencies": {
"@types/react": "^18.2.48",
"@types/react-dom": "^18.2.18",
"eslint": "^9.13.0",
"eslint-plugin-react": "^7.37.1",
"prettier": "^3.3.3"
Expand All @@ -15,6 +13,7 @@
"@pyscript/core": "^0.6",
"@reactpy/client": "^0.3.2",
"event-to-object": "^0.1.2",
"morphdom": "^2.7.4"
"morphdom": "^2.7.4",
"preact": "^10.25.4"
}
}
4 changes: 2 additions & 2 deletions src/js/src/components.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { DjangoFormProps, HttpRequestProps } from "./types";
import React from "react";
import ReactDOM from "react-dom";
import React from "preact/compat";
import ReactDOM from "preact/compat";
/**
* Interface used to bind a ReactPy node to React.
*/
Expand Down
3 changes: 1 addition & 2 deletions src/js/src/mount.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import { ReactPyDjangoClient } from "./client";
import React from "react";
import ReactDOM from "react-dom";
import ReactDOM from "preact/compat";
import { Layout } from "@reactpy/client/src/components";

export function mountComponent(
Expand Down
10 changes: 10 additions & 0 deletions src/js/tsconfig.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"compilerOptions": {
"esModuleInterop": true,
"jsx": "react-jsx",
"jsxImportSource": "preact",
"target": "esnext",
"module": "esnext",
"moduleResolution": "node"
}
}
50 changes: 25 additions & 25 deletions tests/test_app/tests/test_components.py
Original file line number Diff line number Diff line change
Expand Up @@ -915,7 +915,7 @@ def test_form_orm_model(self):
finally:
os.environ.pop("DJANGO_ALLOW_ASYNC_UNSAFE")

# FIXME: Remove the `reruns` value once we fix flakiness of `test_sync_form_events`
# FIXME: Re-enable once we fix the following:
# https://github.com/reactive-python/reactpy-django/issues/272

# @navigate_to_page("/form/sync_event/")
Expand Down Expand Up @@ -948,32 +948,32 @@ def test_form_orm_model(self):
# self.page.wait_for_selector("#receive_data[data-value='true']")
# self.page.wait_for_selector("#change[data-value='true']")

@navigate_to_page("/form/async_event/")
def test_form_async_events(self):
self.page.wait_for_selector("form")
# @navigate_to_page("/form/async_event/")
# def test_form_async_events(self):
# self.page.wait_for_selector("form")

# Check initial state
self.page.wait_for_selector("#success[data-value='false']")
self.page.wait_for_selector("#error[data-value='false']")
self.page.wait_for_selector("#receive_data[data-value='false']")
self.page.wait_for_selector("#change[data-value='false']")
# # Check initial state
# self.page.wait_for_selector("#success[data-value='false']")
# self.page.wait_for_selector("#error[data-value='false']")
# self.page.wait_for_selector("#receive_data[data-value='false']")
# self.page.wait_for_selector("#change[data-value='false']")

# Submit empty the form
sleep(1)
self.page.wait_for_selector("input[type=submit]").click(delay=CLICK_DELAY)
# # Submit empty the form
# sleep(1)
# self.page.wait_for_selector("input[type=submit]").click(delay=CLICK_DELAY)

# The empty form was submitted, should result in an error
self.page.wait_for_selector("#success[data-value='false']")
self.page.wait_for_selector("#error[data-value='true']")
self.page.wait_for_selector("#receive_data[data-value='true']")
self.page.wait_for_selector("#change[data-value='false']")
# # The empty form was submitted, should result in an error
# self.page.wait_for_selector("#success[data-value='false']")
# self.page.wait_for_selector("#error[data-value='true']")
# self.page.wait_for_selector("#receive_data[data-value='true']")
# self.page.wait_for_selector("#change[data-value='false']")

# Fill out the form and re-submit
self.page.wait_for_selector("#id_char_field").type("test", delay=CLICK_DELAY)
self.page.wait_for_selector("input[type=submit]").click(delay=CLICK_DELAY)
# # Fill out the form and re-submit
# self.page.wait_for_selector("#id_char_field").type("test", delay=CLICK_DELAY)
# self.page.wait_for_selector("input[type=submit]").click(delay=CLICK_DELAY)

# Form should have been successfully submitted
self.page.wait_for_selector("#success[data-value='true']")
self.page.wait_for_selector("#error[data-value='true']")
self.page.wait_for_selector("#receive_data[data-value='true']")
self.page.wait_for_selector("#change[data-value='true']")
# # Form should have been successfully submitted
# self.page.wait_for_selector("#success[data-value='true']")
# self.page.wait_for_selector("#error[data-value='true']")
# self.page.wait_for_selector("#receive_data[data-value='true']")
# self.page.wait_for_selector("#change[data-value='true']")