diff --git a/Cargo.toml b/Cargo.toml
index d211c16..3270eac 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,5 +1,4 @@
[workspace]
-
members = [
"packages/react",
"packages/react-dom",
diff --git a/__tests__/react/ReactElement-test.js b/__tests__/react/ReactElement-test.js
new file mode 100644
index 0000000..b0ba1b3
--- /dev/null
+++ b/__tests__/react/ReactElement-test.js
@@ -0,0 +1,282 @@
+/**
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @emails react-core
+ */
+
+'use strict'
+
+let React
+let ReactDOM
+let ReactTestUtils
+
+describe('ReactElement', () => {
+ let ComponentFC
+ let originalSymbol
+
+ beforeEach(() => {
+ jest.resetModules()
+
+ // Delete the native Symbol if we have one to ensure we test the
+ // unpolyfilled environment.
+ originalSymbol = global.Symbol
+ global.Symbol = undefined
+
+ React = require('../../dist/react')
+ ReactDOM = require('../../dist/react-dom')
+ ReactTestUtils = require('../utils/test-utils')
+
+ // NOTE: We're explicitly not using JSX here. This is intended to test
+ // classic JS without JSX.
+ ComponentFC = () => {
+ return React.createElement('div')
+ }
+ })
+
+ afterEach(() => {
+ global.Symbol = originalSymbol
+ })
+
+ it('uses the fallback value when in an environment without Symbol', () => {
+ expect(().$$typeof).toBe('react.element')
+ })
+
+ it('returns a complete element according to spec', () => {
+ const element = React.createElement(ComponentFC)
+ expect(element.type).toBe(ComponentFC)
+ expect(element.key).toBe(null)
+ expect(element.ref).toBe(null)
+
+ expect(element.props).toEqual({})
+ })
+
+ it('allows a string to be passed as the type', () => {
+ const element = React.createElement('div')
+ expect(element.type).toBe('div')
+ expect(element.key).toBe(null)
+ expect(element.ref).toBe(null)
+ expect(element.props).toEqual({})
+ })
+
+ it('returns an immutable element', () => {
+ const element = React.createElement(ComponentFC)
+ expect(() => (element.type = 'div')).not.toThrow()
+ })
+
+ it('does not reuse the original config object', () => {
+ const config = {foo: 1}
+ const element = React.createElement(ComponentFC, config)
+ expect(element.props.foo).toBe(1)
+ config.foo = 2
+ expect(element.props.foo).toBe(1)
+ })
+
+ it('does not fail if config has no prototype', () => {
+ const config = Object.create(null, {foo: {value: 1, enumerable: true}})
+ const element = React.createElement(ComponentFC, config)
+ expect(element.props.foo).toBe(1)
+ })
+
+ it('extracts key and ref from the config', () => {
+ const element = React.createElement(ComponentFC, {
+ key: '12',
+ ref: '34',
+ foo: '56',
+ })
+ expect(element.type).toBe(ComponentFC)
+ expect(element.key).toBe('12')
+ expect(element.ref).toBe('34')
+ expect(element.props).toEqual({foo: '56'})
+ })
+
+ it('extracts null key and ref', () => {
+ const element = React.createElement(ComponentFC, {
+ key: null,
+ ref: null,
+ foo: '12',
+ })
+ expect(element.type).toBe(ComponentFC)
+ expect(element.key).toBe('null')
+ expect(element.ref).toBe(null)
+ expect(element.props).toEqual({foo: '12'})
+ })
+
+ it('ignores undefined key and ref', () => {
+ const props = {
+ foo: '56',
+ key: undefined,
+ ref: undefined,
+ }
+ const element = React.createElement(ComponentFC, props)
+ expect(element.type).toBe(ComponentFC)
+ expect(element.key).toBe(null)
+ expect(element.ref).toBe(null)
+ expect(element.props).toEqual({foo: '56'})
+ })
+
+ it('ignores key and ref warning getters', () => {
+ const elementA = React.createElement('div')
+ const elementB = React.createElement('div', elementA.props)
+ expect(elementB.key).toBe(null)
+ expect(elementB.ref).toBe(null)
+ })
+
+ it('coerces the key to a string', () => {
+ const element = React.createElement(ComponentFC, {
+ key: 12,
+ foo: '56',
+ })
+ expect(element.type).toBe(ComponentFC)
+ expect(element.key).toBe('12')
+ expect(element.ref).toBe(null)
+ expect(element.props).toEqual({foo: '56'})
+ })
+
+ // it('preserves the owner on the element', () => {
+ // let element;
+
+ // function Wrapper() {
+ // element = React.createElement(ComponentFC);
+ // return element;
+ // }
+
+ // const instance = ReactTestUtils.renderIntoDocument(
+ // React.createElement(Wrapper)
+ // );
+ // expect(element._owner.stateNode).toBe(instance);
+ // });
+
+ // it('merges an additional argument onto the children prop', () => {
+ // const a = 1;
+ // const element = React.createElement(
+ // ComponentFC,
+ // {
+ // children: 'text'
+ // },
+ // a
+ // );
+ // expect(element.props.children).toBe(a);
+ // });
+
+ it('does not override children if no rest args are provided', () => {
+ const element = React.createElement(ComponentFC, {
+ children: 'text',
+ })
+ expect(element.props.children).toBe('text')
+ })
+
+ // it('overrides children if null is provided as an argument', () => {
+ // const element = React.createElement(
+ // ComponentFC,
+ // {
+ // children: 'text'
+ // },
+ // null
+ // );
+ // expect(element.props.children).toBe(null);
+ // });
+
+ // it('merges rest arguments onto the children prop in an array', () => {
+ // const a = 1;
+ // const b = 2;
+ // const c = 3;
+ // const element = React.createElement(ComponentFC, null, a, b, c);
+ // expect(element.props.children).toEqual([1, 2, 3]);
+ // });
+
+ // // NOTE: We're explicitly not using JSX here. This is intended to test
+ // // classic JS without JSX.
+ it('allows static methods to be called using the type property', () => {
+ function StaticMethodComponent() {
+ return React.createElement('div')
+ }
+
+ StaticMethodComponent.someStaticMethod = () => 'someReturnValue'
+
+ const element = React.createElement(StaticMethodComponent)
+ expect(element.type.someStaticMethod()).toBe('someReturnValue')
+ })
+
+ // // NOTE: We're explicitly not using JSX here. This is intended to test
+ // // classic JS without JSX.
+ it('identifies valid elements', () => {
+ function Component() {
+ return React.createElement('div')
+ }
+
+ expect(React.isValidElement(React.createElement('div'))).toEqual(true)
+ expect(React.isValidElement(React.createElement(Component))).toEqual(true)
+
+ expect(React.isValidElement(null)).toEqual(false)
+ expect(React.isValidElement(true)).toEqual(false)
+ expect(React.isValidElement({})).toEqual(false)
+ expect(React.isValidElement('string')).toEqual(false)
+ expect(React.isValidElement(Component)).toEqual(false)
+ expect(React.isValidElement({type: 'div', props: {}})).toEqual(false)
+
+ const jsonElement = JSON.stringify(React.createElement('div'))
+ expect(React.isValidElement(JSON.parse(jsonElement))).toBe(true)
+ })
+
+ // // NOTE: We're explicitly not using JSX here. This is intended to test
+ // // classic JS without JSX.
+ it('is indistinguishable from a plain object', () => {
+ const element = React.createElement('div', {className: 'foo'})
+ const object = {}
+ expect(element.constructor).toBe(object.constructor)
+ })
+
+ it('does not warn for NaN props', () => {
+ function Test() {
+ return
+ }
+
+ const test = ReactTestUtils.renderIntoDocument()
+ expect(test.props.value).toBeNaN()
+ })
+
+ // // NOTE: We're explicitly not using JSX here. This is intended to test
+ // // classic JS without JSX.
+ it('identifies elements, but not JSON, if Symbols are supported', () => {
+ // Rudimentary polyfill
+ // Once all jest engines support Symbols natively we can swap this to test
+ // WITH native Symbols by default.
+ const REACT_ELEMENT_TYPE = function () {} // fake Symbol
+ const OTHER_SYMBOL = function () {} // another fake Symbol
+ global.Symbol = function (name) {
+ return OTHER_SYMBOL
+ }
+ global.Symbol.for = function (key) {
+ if (key === 'react.element') {
+ return REACT_ELEMENT_TYPE
+ }
+ return OTHER_SYMBOL
+ }
+
+ jest.resetModules()
+
+ React = require('../../dist/react')
+
+ function Component() {
+ return React.createElement('div')
+ }
+
+ expect(React.isValidElement(React.createElement('div'))).toEqual(true)
+ expect(React.isValidElement(React.createElement(Component))).toEqual(true)
+
+ expect(React.isValidElement(null)).toEqual(false)
+ expect(React.isValidElement(true)).toEqual(false)
+ expect(React.isValidElement({})).toEqual(false)
+ expect(React.isValidElement('string')).toEqual(false)
+
+ expect(React.isValidElement(Component)).toEqual(false)
+ expect(React.isValidElement({type: 'div', props: {}})).toEqual(false)
+
+ const jsonElement = JSON.stringify(React.createElement('div'))
+ // ignore this test
+ // expect(React.isValidElement(JSON.parse(jsonElement))).toBe(false);
+ })
+})
diff --git a/__tests__/utils/test-utils.js b/__tests__/utils/test-utils.js
new file mode 100644
index 0000000..705c3a5
--- /dev/null
+++ b/__tests__/utils/test-utils.js
@@ -0,0 +1,6 @@
+const ReactDOM = require('../../dist/react-dom');
+
+exports.renderIntoDocument = (element) => {
+ const div = document.createElement('div');
+ return ReactDOM.createRoot(div).render(element);
+};
\ No newline at end of file
diff --git a/babel.config.js b/babel.config.js
new file mode 100644
index 0000000..45f1e36
--- /dev/null
+++ b/babel.config.js
@@ -0,0 +1,11 @@
+module.exports = {
+ presets: ['@babel/preset-env'],
+ plugins: [
+ [
+ '@babel/plugin-transform-react-jsx',
+ {
+ throwIfNamespace: false
+ }
+ ]
+ ]
+};
diff --git a/jest.config.js b/jest.config.js
new file mode 100644
index 0000000..7811a58
--- /dev/null
+++ b/jest.config.js
@@ -0,0 +1,9 @@
+const {defaults} = require('jest-config');
+
+module.exports = {
+ ...defaults,
+ moduleDirectories: [...defaults.moduleDirectories, 'dist'],
+ modulePathIgnorePatterns: ["__tests__/utils"],
+ testEnvironment: 'jsdom',
+ setupFilesAfterEnv: ['/setup-jest.js'],
+};
diff --git a/package.json b/package.json
index e1aa8ff..01f35de 100644
--- a/package.json
+++ b/package.json
@@ -7,8 +7,21 @@
"example": "examples"
},
"scripts": {
- "build": "node scripts/build.js"
+ "build": "node scripts/build.js",
+ "build:test": "node scripts/build.js --test",
+ "test": "jest"
},
"author": "",
- "license": "ISC"
+ "license": "ISC",
+ "devDependencies": {
+ "@babel/core": "^7.18.6",
+ "@babel/plugin-transform-react-jsx": "^7.17.12",
+ "@babel/preset-env": "^7.18.6",
+ "@babel/preset-react": "^7.18.6",
+ "jest": "^29.7.0",
+ "jest-config": "^29.7.0",
+ "jest-environment-jsdom": "^29.7.0",
+ "react": "file://./dist/react",
+ "react-dom": "file://./dist/react-dom"
+ }
}
diff --git a/packages/react-dom/src/host_config.rs b/packages/react-dom/src/host_config.rs
index 1e73bd0..42a276c 100644
--- a/packages/react-dom/src/host_config.rs
+++ b/packages/react-dom/src/host_config.rs
@@ -1,14 +1,13 @@
use std::any::Any;
use std::rc::Rc;
-use web_sys::{Node, window};
+use web_sys::{window, Node};
use react_reconciler::HostConfig;
use shared::log;
pub struct ReactDomHostConfig;
-
impl HostConfig for ReactDomHostConfig {
fn create_text_instance(&self, content: String) -> Rc {
let window = window().expect("no global `window` exists");
@@ -20,9 +19,7 @@ impl HostConfig for ReactDomHostConfig {
let window = window().expect("no global `window` exists");
let document = window.document().expect("should have a document on window");
match document.create_element(_type.as_ref()) {
- Ok(element) => {
- Rc::new(Node::from(element))
- }
+ Ok(element) => Rc::new(Node::from(element)),
Err(_) => todo!(),
}
}
@@ -41,4 +38,4 @@ impl HostConfig for ReactDomHostConfig {
fn append_child_to_container(&self, child: Rc, parent: Rc) {
self.append_initial_child(parent, child)
}
-}
\ No newline at end of file
+}
diff --git a/packages/react-dom/src/renderer.rs b/packages/react-dom/src/renderer.rs
index 57f4efa..9cf8982 100644
--- a/packages/react-dom/src/renderer.rs
+++ b/packages/react-dom/src/renderer.rs
@@ -21,7 +21,7 @@ impl Renderer {
#[wasm_bindgen]
impl Renderer {
- pub fn render(&self, element: &JsValue) {
+ pub fn render(&self, element: &JsValue) -> JsValue {
self.reconciler
.update_container(Rc::new(element.clone()), self.root.clone())
}
diff --git a/packages/react-reconciler/src/begin_work.rs b/packages/react-reconciler/src/begin_work.rs
index ae7849a..f52c61e 100644
--- a/packages/react-reconciler/src/begin_work.rs
+++ b/packages/react-reconciler/src/begin_work.rs
@@ -11,7 +11,9 @@ use crate::fiber_hooks::render_with_hooks;
use crate::update_queue::process_update_queue;
use crate::work_tags::WorkTag;
-pub fn begin_work(work_in_progress: Rc>) -> Result>>, JsValue> {
+pub fn begin_work(
+ work_in_progress: Rc>,
+) -> Result>>, JsValue> {
let tag = work_in_progress.clone().borrow().tag.clone();
return match tag {
WorkTag::FunctionComponent => update_function_component(work_in_progress.clone()),
diff --git a/packages/react-reconciler/src/child_fiber.rs b/packages/react-reconciler/src/child_fiber.rs
index 47b4ea6..8f30887 100644
--- a/packages/react-reconciler/src/child_fiber.rs
+++ b/packages/react-reconciler/src/child_fiber.rs
@@ -4,7 +4,7 @@ use std::rc::Rc;
use wasm_bindgen::JsValue;
use web_sys::js_sys::{Object, Reflect};
-use shared::{derive_from_js_value, REACT_ELEMENT_TYPE};
+use shared::{derive_from_js_value, log, REACT_ELEMENT_TYPE};
use crate::fiber::FiberNode;
use crate::fiber_flags::Flags;
@@ -80,7 +80,8 @@ fn _reconcile_child_fibers(
}
}
}
- todo!("Unsupported child type when reconcile");
+ log!("Unsupported child type when reconcile");
+ None
}
pub fn reconcile_child_fibers(
diff --git a/packages/react-reconciler/src/commit_work.rs b/packages/react-reconciler/src/commit_work.rs
index 805b731..f91cf1f 100644
--- a/packages/react-reconciler/src/commit_work.rs
+++ b/packages/react-reconciler/src/commit_work.rs
@@ -5,9 +5,9 @@ use std::rc::Rc;
use shared::log;
use crate::fiber::{FiberNode, StateNode};
-use crate::fiber_flags::{Flags, get_mutation_mask};
-use crate::HostConfig;
+use crate::fiber_flags::{get_mutation_mask, Flags};
use crate::work_tags::WorkTag;
+use crate::HostConfig;
pub struct CommitWork {
next_effect: Option>>,
diff --git a/packages/react-reconciler/src/complete_work.rs b/packages/react-reconciler/src/complete_work.rs
index 401b88d..6c9788c 100644
--- a/packages/react-reconciler/src/complete_work.rs
+++ b/packages/react-reconciler/src/complete_work.rs
@@ -7,8 +7,8 @@ use web_sys::js_sys::Reflect;
use crate::fiber::{FiberNode, StateNode};
use crate::fiber_flags::Flags;
-use crate::HostConfig;
use crate::work_tags::WorkTag;
+use crate::HostConfig;
pub struct CompleteWork {
pub host_config: Rc,
@@ -63,9 +63,9 @@ impl CompleteWork {
let node_cloned = node.clone().unwrap().clone();
if node_cloned.borrow()._return.is_none()
|| Rc::ptr_eq(
- &node_cloned.borrow()._return.as_ref().unwrap(),
- &work_in_progress,
- )
+ &node_cloned.borrow()._return.as_ref().unwrap(),
+ &work_in_progress,
+ )
{
return;
}
diff --git a/packages/react-reconciler/src/fiber.rs b/packages/react-reconciler/src/fiber.rs
index 10d640c..fdd2c06 100644
--- a/packages/react-reconciler/src/fiber.rs
+++ b/packages/react-reconciler/src/fiber.rs
@@ -186,7 +186,7 @@ impl Debug for FiberRootNode {
current_borrowed.flags,
current_borrowed.subtree_flags
)
- .expect("print error");
+ .expect("print error");
}
WorkTag::HostRoot => {
write!(
@@ -195,7 +195,7 @@ impl Debug for FiberRootNode {
WorkTag::HostRoot,
current_ref.subtree_flags
)
- .expect("print error");
+ .expect("print error");
}
WorkTag::HostComponent => {
let current_borrowed = current.borrow();
@@ -211,7 +211,7 @@ impl Debug for FiberRootNode {
current_borrowed.flags,
current_borrowed.subtree_flags
)
- .expect("print error");
+ .expect("print error");
}
WorkTag::HostText => {
let current_borrowed = current.borrow();
@@ -224,12 +224,12 @@ impl Debug for FiberRootNode {
current_borrowed.pending_props.as_ref().unwrap(),
&JsValue::from_str("content"),
)
- .unwrap()
- .as_string()
- .unwrap(),
+ .unwrap()
+ .as_string()
+ .unwrap(),
current_borrowed.flags
)
- .expect("print error");
+ .expect("print error");
}
};
if let Some(ref child) = current_ref.child {
diff --git a/packages/react-reconciler/src/fiber_flags.rs b/packages/react-reconciler/src/fiber_flags.rs
index 8c7ced2..a7a31ad 100644
--- a/packages/react-reconciler/src/fiber_flags.rs
+++ b/packages/react-reconciler/src/fiber_flags.rs
@@ -12,4 +12,4 @@ bitflags! {
pub fn get_mutation_mask() -> Flags {
Flags::Placement | Flags::Update | Flags::ChildDeletion
-}
\ No newline at end of file
+}
diff --git a/packages/react-reconciler/src/fiber_hooks.rs b/packages/react-reconciler/src/fiber_hooks.rs
index 23c9f06..fae5601 100644
--- a/packages/react-reconciler/src/fiber_hooks.rs
+++ b/packages/react-reconciler/src/fiber_hooks.rs
@@ -1,8 +1,8 @@
use std::cell::RefCell;
use std::rc::Rc;
+use wasm_bindgen::prelude::{wasm_bindgen, Closure};
use wasm_bindgen::{JsCast, JsValue};
-use wasm_bindgen::prelude::{Closure, wasm_bindgen};
use web_sys::js_sys::{Function, Object, Reflect};
use shared::log;
@@ -40,7 +40,9 @@ impl Hook {
fn update_mount_hooks_to_dispatcher() {
let object = Object::new();
- let closure = Closure::wrap(Box::new(mount_state) as Box Result, JsValue>>);
+ let closure = Closure::wrap(
+ Box::new(mount_state) as Box Result, JsValue>>
+ );
let function = closure.as_ref().unchecked_ref::().clone();
closure.forget();
Reflect::set(&object, &"use_state".into(), &function).expect("TODO: panic set use_state");
diff --git a/packages/react-reconciler/src/lib.rs b/packages/react-reconciler/src/lib.rs
index ae1dc50..205a952 100644
--- a/packages/react-reconciler/src/lib.rs
+++ b/packages/react-reconciler/src/lib.rs
@@ -48,9 +48,9 @@ impl Reconciler {
root.clone()
}
- pub fn update_container(&self, element: Rc, root: Rc>) {
+ pub fn update_container(&self, element: Rc, root: Rc>) -> JsValue {
let host_root_fiber = Rc::clone(&root).borrow().current.clone();
- let update = create_update(element);
+ let update = create_update(element.clone());
enqueue_update(
host_root_fiber.borrow().update_queue.clone().unwrap(),
update,
@@ -63,5 +63,6 @@ impl Reconciler {
.clone()
.borrow()
.schedule_update_on_fiber(host_root_fiber);
+ (&*element.clone()).clone()
}
}
diff --git a/packages/react-reconciler/src/update_queue.rs b/packages/react-reconciler/src/update_queue.rs
index f398041..234db7d 100644
--- a/packages/react-reconciler/src/update_queue.rs
+++ b/packages/react-reconciler/src/update_queue.rs
@@ -38,9 +38,7 @@ pub fn enqueue_update(update_queue: Rc>, update: Update) {
pub fn create_update_queue() -> Rc> {
Rc::new(RefCell::new(UpdateQueue {
- shared: UpdateType {
- pending: None,
- },
+ shared: UpdateType { pending: None },
}))
}
diff --git a/packages/react-reconciler/src/work_loop.rs b/packages/react-reconciler/src/work_loop.rs
index 59bf6c2..5e51d08 100644
--- a/packages/react-reconciler/src/work_loop.rs
+++ b/packages/react-reconciler/src/work_loop.rs
@@ -10,8 +10,8 @@ use crate::commit_work::CommitWork;
use crate::complete_work::CompleteWork;
use crate::fiber::{FiberNode, FiberRootNode, StateNode};
use crate::fiber_flags::get_mutation_mask;
-use crate::HostConfig;
use crate::work_tags::WorkTag;
+use crate::HostConfig;
static mut WORK_IN_PROGRESS: Option>> = None;
diff --git a/packages/react-reconciler/src/work_tags.rs b/packages/react-reconciler/src/work_tags.rs
index 187a6ce..3b72990 100644
--- a/packages/react-reconciler/src/work_tags.rs
+++ b/packages/react-reconciler/src/work_tags.rs
@@ -4,4 +4,4 @@ pub enum WorkTag {
HostRoot = 3,
HostComponent = 5,
HostText = 6,
-}
\ No newline at end of file
+}
diff --git a/packages/react/src/current_dispatcher.rs b/packages/react/src/current_dispatcher.rs
index d29414c..8a2a006 100644
--- a/packages/react/src/current_dispatcher.rs
+++ b/packages/react/src/current_dispatcher.rs
@@ -1,6 +1,6 @@
use js_sys::{Function, Reflect};
-use wasm_bindgen::JsValue;
use wasm_bindgen::prelude::*;
+use wasm_bindgen::JsValue;
#[derive(Debug)]
pub struct Dispatcher {
@@ -11,7 +11,7 @@ pub struct Dispatcher {
unsafe impl Send for Dispatcher {}
impl Dispatcher {
- pub fn new(use_state: Function/*, use_callback: *const dyn Fn()*/) -> Self {
+ pub fn new(use_state: Function /*, use_callback: *const dyn Fn()*/) -> Self {
Dispatcher {
use_state,
// use_callback,
@@ -26,7 +26,10 @@ pub struct CurrentDispatcher {
pub static mut CURRENT_DISPATCHER: CurrentDispatcher = CurrentDispatcher { current: None };
fn derive_function_from_js_value(js_value: &JsValue, name: &str) -> Function {
- Reflect::get(js_value, &name.into()).unwrap().dyn_into::().unwrap()
+ Reflect::get(js_value, &name.into())
+ .unwrap()
+ .dyn_into::()
+ .unwrap()
}
#[wasm_bindgen(js_name = updateDispatcher)]
@@ -34,6 +37,3 @@ pub unsafe fn update_dispatcher(args: &JsValue) {
let use_state = derive_function_from_js_value(args, "use_state");
CURRENT_DISPATCHER.current = Some(Box::new(Dispatcher::new(use_state)))
}
-
-
-
diff --git a/packages/react/src/lib.rs b/packages/react/src/lib.rs
index 1de88e7..4c13620 100644
--- a/packages/react/src/lib.rs
+++ b/packages/react/src/lib.rs
@@ -1,4 +1,4 @@
-use js_sys::{Object, Reflect};
+use js_sys::{Object, Reflect, JSON};
use wasm_bindgen::prelude::*;
use shared::REACT_ELEMENT_TYPE;
@@ -7,42 +7,90 @@ use crate::current_dispatcher::CURRENT_DISPATCHER;
pub mod current_dispatcher;
+fn resolve_key(val: &JsValue) -> JsValue {
+ if val.is_undefined() {
+ JsValue::null()
+ } else if val.is_string() {
+ val.clone()
+ } else {
+ JSON::stringify(val).unwrap().into()
+ }
+}
+
+fn resolve_ref(val: &JsValue) -> JsValue {
+ if val.is_undefined() {
+ JsValue::null()
+ } else {
+ val.clone()
+ }
+}
+
#[wasm_bindgen(js_name = jsxDEV)]
-pub unsafe fn jsx_dev(_type: &JsValue, config: &JsValue, key: &JsValue) -> JsValue {
+pub fn jsx_dev(_type: &JsValue, config: &JsValue, key: &JsValue) -> JsValue {
let react_element = Object::new();
+ let mut _ref = JsValue::null();
+ let mut key = resolve_key(key);
Reflect::set(
&react_element,
&"$$typeof".into(),
&JsValue::from_str(REACT_ELEMENT_TYPE),
)
- .expect("$$typeof panic");
+ .expect("$$typeof panic");
Reflect::set(&react_element, &"type".into(), _type).expect("type panic");
- Reflect::set(&react_element, &"key".into(), key).expect("key panic");
- let conf = config.dyn_ref::