Hello !" })}/>'
+ == 'jsx("div",{className:"rx-Html",dangerouslySetInnerHTML:({ ["__html"] : "
Hello !
" })},)\n'
)
@@ -31,11 +31,13 @@ class TestState(State):
html = Html.create(f"
Hello {TestState.myvar}!
")
+ html_dangerouslySetInnerHTML = html.dangerouslySetInnerHTML # pyright: ignore [reportAttributeAccessIssue]
+
assert (
- str(html.dangerouslySetInnerHTML) # pyright: ignore [reportAttributeAccessIssue]
+ str(html_dangerouslySetInnerHTML)
== f'({{ ["__html"] : ("
Hello "+{TestState.myvar!s}+"!
") }})'
)
assert (
str(html)
- == f'
' # pyright: ignore [reportAttributeAccessIssue]
+ == f'jsx("div",{{className:"rx-Html",dangerouslySetInnerHTML:{html_dangerouslySetInnerHTML!s}}},)\n'
)
diff --git a/tests/units/components/core/test_match.py b/tests/units/components/core/test_match.py
index 502de558bc3..ce17f84f22b 100644
--- a/tests/units/components/core/test_match.py
+++ b/tests/units/components/core/test_match.py
@@ -1,3 +1,4 @@
+import re
from collections.abc import Mapping, Sequence
import pytest
@@ -47,7 +48,7 @@ def test_match_components():
assert match_cases[0][0]._var_type is int
first_return_value_render = match_cases[0][1]
assert first_return_value_render["name"] == "RadixThemesText"
- assert first_return_value_render["children"][0]["contents"] == '{"first value"}'
+ assert first_return_value_render["children"][0]["contents"] == '"first value"'
assert match_cases[1][0]._js_expr == "2"
assert match_cases[1][0]._var_type is int
@@ -55,36 +56,36 @@ def test_match_components():
assert match_cases[1][1]._var_type is int
second_return_value_render = match_cases[1][2]
assert second_return_value_render["name"] == "RadixThemesText"
- assert second_return_value_render["children"][0]["contents"] == '{"second value"}'
+ assert second_return_value_render["children"][0]["contents"] == '"second value"'
assert match_cases[2][0]._js_expr == "[1, 2]"
assert match_cases[2][0]._var_type == Sequence[int]
third_return_value_render = match_cases[2][1]
assert third_return_value_render["name"] == "RadixThemesText"
- assert third_return_value_render["children"][0]["contents"] == '{"third value"}'
+ assert third_return_value_render["children"][0]["contents"] == '"third value"'
assert match_cases[3][0]._js_expr == '"random"'
assert match_cases[3][0]._var_type is str
fourth_return_value_render = match_cases[3][1]
assert fourth_return_value_render["name"] == "RadixThemesText"
- assert fourth_return_value_render["children"][0]["contents"] == '{"fourth value"}'
+ assert fourth_return_value_render["children"][0]["contents"] == '"fourth value"'
assert match_cases[4][0]._js_expr == '({ ["foo"] : "bar" })'
assert match_cases[4][0]._var_type == Mapping[str, str]
fifth_return_value_render = match_cases[4][1]
assert fifth_return_value_render["name"] == "RadixThemesText"
- assert fifth_return_value_render["children"][0]["contents"] == '{"fifth value"}'
+ assert fifth_return_value_render["children"][0]["contents"] == '"fifth value"'
assert match_cases[5][0]._js_expr == f"({MatchState.get_name()}.num + 1)"
assert match_cases[5][0]._var_type is int
fifth_return_value_render = match_cases[5][1]
assert fifth_return_value_render["name"] == "RadixThemesText"
- assert fifth_return_value_render["children"][0]["contents"] == '{"sixth value"}'
+ assert fifth_return_value_render["children"][0]["contents"] == '"sixth value"'
default = match_child["default"]
assert default["name"] == "RadixThemesText"
- assert default["children"][0]["contents"] == '{"default value"}'
+ assert default["children"][0]["contents"] == '"default value"'
@pytest.mark.parametrize(
@@ -264,7 +265,7 @@ def test_match_case_tuple_elements(match_case):
([1, 2], rx.text("third value")),
rx.text("default value"),
),
- 'Match cases should have the same return types. Case 3 with return value ` {"first value"} ` '
+ 'Match cases should have the same return types. Case 3 with return value `jsx( RadixThemesText, {as:"p"}, "first value" ,)` '
"of type is not ",
),
],
@@ -276,7 +277,7 @@ def test_match_different_return_types(cases: tuple, error_msg: str):
cases: The match cases.
error_msg: Expected error message.
"""
- with pytest.raises(MatchTypeError, match=error_msg):
+ with pytest.raises(MatchTypeError, match=re.escape(error_msg)):
Match.create(MatchState.value, *cases)
diff --git a/tests/units/components/datadisplay/test_dataeditor.py b/tests/units/components/datadisplay/test_dataeditor.py
index 63b156e7488..6b0d3ac6103 100644
--- a/tests/units/components/datadisplay/test_dataeditor.py
+++ b/tests/units/components/datadisplay/test_dataeditor.py
@@ -4,8 +4,8 @@
def test_dataeditor():
editor_wrapper = DataEditor.create().render()
editor = editor_wrapper["children"][0]
- assert editor_wrapper["name"] == "div"
+ assert editor_wrapper["name"] == '"div"'
assert editor_wrapper["props"] == [
- 'css={({ ["width"] : "100%", ["height"] : "100%" })}'
+ 'css:({ ["width"] : "100%", ["height"] : "100%" })'
]
assert editor["name"] == "DataEditor"
diff --git a/tests/units/components/datadisplay/test_datatable.py b/tests/units/components/datadisplay/test_datatable.py
index 2dece464afa..2b47669222d 100644
--- a/tests/units/components/datadisplay/test_datatable.py
+++ b/tests/units/components/datadisplay/test_datatable.py
@@ -47,8 +47,8 @@ def test_validate_data_table(data_table_state: rx.State, expected):
expected = f"{state_name}.{expected}" if expected else state_name
assert data_table_dict["props"] == [
- f"columns={{{expected}.columns}}",
- f"data={{{expected}.data}}",
+ f"columns:{expected}.columns",
+ f"data:{expected}.data",
]
diff --git a/tests/units/components/el/test_svg.py b/tests/units/components/el/test_svg.py
index 29aaa96dd8f..e104c4e15b2 100644
--- a/tests/units/components/el/test_svg.py
+++ b/tests/units/components/el/test_svg.py
@@ -16,59 +16,59 @@
def test_circle():
circle = Circle.create().render()
- assert circle["name"] == "circle"
+ assert circle["name"] == '"circle"'
def test_defs():
defs = Defs.create().render()
- assert defs["name"] == "defs"
+ assert defs["name"] == '"defs"'
def test_ellipse():
ellipse = Ellipse.create().render()
- assert ellipse["name"] == "ellipse"
+ assert ellipse["name"] == '"ellipse"'
def test_line():
line = Line.create().render()
- assert line["name"] == "line"
+ assert line["name"] == '"line"'
def test_linear_gradient():
linear_gradient = LinearGradient.create().render()
- assert linear_gradient["name"] == "linearGradient"
+ assert linear_gradient["name"] == '"linearGradient"'
def test_path():
path = Path.create().render()
- assert path["name"] == "path"
+ assert path["name"] == '"path"'
def test_polygon():
polygon = Polygon.create().render()
- assert polygon["name"] == "polygon"
+ assert polygon["name"] == '"polygon"'
def test_radial_gradient():
radial_gradient = RadialGradient.create().render()
- assert radial_gradient["name"] == "radialGradient"
+ assert radial_gradient["name"] == '"radialGradient"'
def test_rect():
rect = Rect.create().render()
- assert rect["name"] == "rect"
+ assert rect["name"] == '"rect"'
def test_svg():
svg = Svg.create().render()
- assert svg["name"] == "svg"
+ assert svg["name"] == '"svg"'
def test_text():
text = Text.create().render()
- assert text["name"] == "text"
+ assert text["name"] == '"text"'
def test_stop():
stop = Stop.create().render()
- assert stop["name"] == "stop"
+ assert stop["name"] == '"stop"'
diff --git a/tests/units/components/forms/test_form.py b/tests/units/components/forms/test_form.py
index 4c05b4fe14b..6b3d4a06001 100644
--- a/tests/units/components/forms/test_form.py
+++ b/tests/units/components/forms/test_form.py
@@ -11,7 +11,7 @@ def test_render_on_submit():
)
f = Form.create(on_submit=submit_it)
exp_submit_name = f"handleSubmit_{f.handle_submit_unique_name}" # pyright: ignore [reportAttributeAccessIssue]
- assert f"onSubmit={{{exp_submit_name}}}" in f.render()["props"]
+ assert f"onSubmit:{exp_submit_name}" in f.render()["props"]
def test_render_no_on_submit():
diff --git a/tests/units/components/markdown/test_markdown.py b/tests/units/components/markdown/test_markdown.py
index 19fc32baf77..ce3c8f5b3a1 100644
--- a/tests/units/components/markdown/test_markdown.py
+++ b/tests/units/components/markdown/test_markdown.py
@@ -146,7 +146,7 @@ def test_create_map_fn_var_subclass(cls, fn_body, fn_args, explicit_return, expe
(
"code",
{},
- r"""(({node, inline, className, children, ...props}) => { const match = (className || '').match(/language-(?.*)/); let _language = match ? match[1] : ''; if (_language) { if (!["abap", "abnf", "actionscript", "ada", "agda", "al", "antlr4", "apacheconf", "apex", "apl", "applescript", "aql", "arduino", "arff", "asciidoc", "asm6502", "asmatmel", "aspnet", "autohotkey", "autoit", "avisynth", "avro-idl", "bash", "basic", "batch", "bbcode", "bicep", "birb", "bison", "bnf", "brainfuck", "brightscript", "bro", "bsl", "c", "cfscript", "chaiscript", "cil", "clike", "clojure", "cmake", "cobol", "coffeescript", "concurnas", "coq", "core", "cpp", "crystal", "csharp", "cshtml", "csp", "css", "css-extras", "csv", "cypher", "d", "dart", "dataweave", "dax", "dhall", "diff", "django", "dns-zone-file", "docker", "dot", "ebnf", "editorconfig", "eiffel", "ejs", "elixir", "elm", "erb", "erlang", "etlua", "excel-formula", "factor", "false", "firestore-security-rules", "flow", "fortran", "fsharp", "ftl", "gap", "gcode", "gdscript", "gedcom", "gherkin", "git", "glsl", "gml", "gn", "go", "go-module", "graphql", "groovy", "haml", "handlebars", "haskell", "haxe", "hcl", "hlsl", "hoon", "hpkp", "hsts", "http", "ichigojam", "icon", "icu-message-format", "idris", "iecst", "ignore", "index", "inform7", "ini", "io", "j", "java", "javadoc", "javadoclike", "javascript", "javastacktrace", "jexl", "jolie", "jq", "js-extras", "js-templates", "jsdoc", "json", "json5", "jsonp", "jsstacktrace", "jsx", "julia", "keepalived", "keyman", "kotlin", "kumir", "kusto", "latex", "latte", "less", "lilypond", "liquid", "lisp", "livescript", "llvm", "log", "lolcode", "lua", "magma", "makefile", "markdown", "markup", "markup-templating", "matlab", "maxscript", "mel", "mermaid", "mizar", "mongodb", "monkey", "moonscript", "n1ql", "n4js", "nand2tetris-hdl", "naniscript", "nasm", "neon", "nevod", "nginx", "nim", "nix", "nsis", "objectivec", "ocaml", "opencl", "openqasm", "oz", "parigp", "parser", "pascal", "pascaligo", "pcaxis", "peoplecode", "perl", "php", "php-extras", "phpdoc", "plsql", "powerquery", "powershell", "processing", "prolog", "promql", "properties", "protobuf", "psl", "pug", "puppet", "pure", "purebasic", "purescript", "python", "q", "qml", "qore", "qsharp", "r", "racket", "reason", "regex", "rego", "renpy", "rest", "rip", "roboconf", "robotframework", "ruby", "rust", "sas", "sass", "scala", "scheme", "scss", "shell-session", "smali", "smalltalk", "smarty", "sml", "solidity", "solution-file", "soy", "sparql", "splunk-spl", "sqf", "sql", "squirrel", "stan", "stylus", "swift", "systemd", "t4-cs", "t4-templating", "t4-vb", "tap", "tcl", "textile", "toml", "tremor", "tsx", "tt2", "turtle", "twig", "typescript", "typoscript", "unrealscript", "uorazor", "uri", "v", "vala", "vbnet", "velocity", "verilog", "vhdl", "vim", "visual-basic", "warpscript", "wasm", "web-idl", "wiki", "wolfram", "wren", "xeora", "xml-doc", "xojo", "xquery", "yaml", "yang", "zig"].includes(_language)) { console.warn(`Language \`${_language}\` is not supported for code blocks inside of markdown.`); _language = ''; } else { (async () => { try { const module = await import(`react-syntax-highlighter/dist/cjs/languages/prism/${_language}`); SyntaxHighlighter.registerLanguage(_language, module.default); } catch (error) { console.error(`Language ${_language} is not supported for code blocks inside of markdown: `, error); } })(); } } ; return inline ? ( {children} ) : ( ); })""",
+ r"""(({node, inline, className, children, ...props}) => { const match = (className || '').match(/language-(?.*)/); let _language = match ? match[1] : ''; if (_language) { if (!["abap", "abnf", "actionscript", "ada", "agda", "al", "antlr4", "apacheconf", "apex", "apl", "applescript", "aql", "arduino", "arff", "asciidoc", "asm6502", "asmatmel", "aspnet", "autohotkey", "autoit", "avisynth", "avro-idl", "bash", "basic", "batch", "bbcode", "bicep", "birb", "bison", "bnf", "brainfuck", "brightscript", "bro", "bsl", "c", "cfscript", "chaiscript", "cil", "clike", "clojure", "cmake", "cobol", "coffeescript", "concurnas", "coq", "core", "cpp", "crystal", "csharp", "cshtml", "csp", "css", "css-extras", "csv", "cypher", "d", "dart", "dataweave", "dax", "dhall", "diff", "django", "dns-zone-file", "docker", "dot", "ebnf", "editorconfig", "eiffel", "ejs", "elixir", "elm", "erb", "erlang", "etlua", "excel-formula", "factor", "false", "firestore-security-rules", "flow", "fortran", "fsharp", "ftl", "gap", "gcode", "gdscript", "gedcom", "gherkin", "git", "glsl", "gml", "gn", "go", "go-module", "graphql", "groovy", "haml", "handlebars", "haskell", "haxe", "hcl", "hlsl", "hoon", "hpkp", "hsts", "http", "ichigojam", "icon", "icu-message-format", "idris", "iecst", "ignore", "index", "inform7", "ini", "io", "j", "java", "javadoc", "javadoclike", "javascript", "javastacktrace", "jexl", "jolie", "jq", "js-extras", "js-templates", "jsdoc", "json", "json5", "jsonp", "jsstacktrace", "jsx", "julia", "keepalived", "keyman", "kotlin", "kumir", "kusto", "latex", "latte", "less", "lilypond", "liquid", "lisp", "livescript", "llvm", "log", "lolcode", "lua", "magma", "makefile", "markdown", "markup", "markup-templating", "matlab", "maxscript", "mel", "mermaid", "mizar", "mongodb", "monkey", "moonscript", "n1ql", "n4js", "nand2tetris-hdl", "naniscript", "nasm", "neon", "nevod", "nginx", "nim", "nix", "nsis", "objectivec", "ocaml", "opencl", "openqasm", "oz", "parigp", "parser", "pascal", "pascaligo", "pcaxis", "peoplecode", "perl", "php", "php-extras", "phpdoc", "plsql", "powerquery", "powershell", "processing", "prolog", "promql", "properties", "protobuf", "psl", "pug", "puppet", "pure", "purebasic", "purescript", "python", "q", "qml", "qore", "qsharp", "r", "racket", "reason", "regex", "rego", "renpy", "rest", "rip", "roboconf", "robotframework", "ruby", "rust", "sas", "sass", "scala", "scheme", "scss", "shell-session", "smali", "smalltalk", "smarty", "sml", "solidity", "solution-file", "soy", "sparql", "splunk-spl", "sqf", "sql", "squirrel", "stan", "stylus", "swift", "systemd", "t4-cs", "t4-templating", "t4-vb", "tap", "tcl", "textile", "toml", "tremor", "tsx", "tt2", "turtle", "twig", "typescript", "typoscript", "unrealscript", "uorazor", "uri", "v", "vala", "vbnet", "velocity", "verilog", "vhdl", "vim", "visual-basic", "warpscript", "wasm", "web-idl", "wiki", "wolfram", "wren", "xeora", "xml-doc", "xojo", "xquery", "yaml", "yang", "zig"].includes(_language)) { console.warn(`Language \`${_language}\` is not supported for code blocks inside of markdown.`); _language = ''; } else { (async () => { try { const module = await import(`react-syntax-highlighter/dist/cjs/languages/prism/${_language}`); SyntaxHighlighter.registerLanguage(_language, module.default); } catch (error) { console.error(`Language ${_language} is not supported for code blocks inside of markdown: `, error); } })(); } } ; return inline ? ( jsx(RadixThemesCode,{...props},children,) ) : ( jsx(SyntaxHighlighter,{children:((Array.isArray(children)) ? children.join("\n") : children),css:({ ["marginTop"] : "1em", ["marginBottom"] : "1em" }),customStyle:({ ["marginTop"] : "1em", ["marginBottom"] : "1em" }),language:_language,style:((resolvedColorMode === "light") ? oneLight : oneDark),wrapLongLines:true,...props},) ); })""",
),
(
"code",
@@ -155,7 +155,7 @@ def test_create_map_fn_var_subclass(cls, fn_body, fn_args, explicit_return, expe
value, **props
)
},
- r"""(({node, inline, className, children, ...props}) => { const match = (className || '').match(/language-(?.*)/); let _language = match ? match[1] : ''; ; return inline ? ( {children} ) : ( ); })""",
+ r"""(({node, inline, className, children, ...props}) => { const match = (className || '').match(/language-(?.*)/); let _language = match ? match[1] : ''; ; return inline ? ( jsx(RadixThemesCode,{...props},children,) ) : ( jsx(RadixThemesBox,{css:({ ["pre"] : ({ ["margin"] : "0", ["padding"] : "24px", ["background"] : "transparent", ["overflowX"] : "auto", ["borderRadius"] : "6px" }) }),...props},jsx(ShikiCode,{code:((Array.isArray(children)) ? children.join("\n") : children),decorations:[],language:_language,theme:((resolvedColorMode === "light") ? "one-light" : "one-dark-pro"),transformers:[]},),) ); })""",
),
(
"h1",
@@ -164,12 +164,12 @@ def test_create_map_fn_var_subclass(cls, fn_body, fn_args, explicit_return, expe
Heading.create(value, as_="h1", size="6", margin_y="0.5em")
)
},
- """(({custom_node, custom_children, custom_props}) => ({children}))""",
+ """(({custom_node, custom_children, custom_props}) => (jsx(CustomMarkdownComponent,{...props},jsx(RadixThemesHeading,{as:"h1",css:({ ["marginTop"] : "0.5em", ["marginBottom"] : "0.5em" }),size:"6"},children,),)))""",
),
(
"code",
{"codeblock": syntax_highlighter_memoized_component(CodeBlock)},
- r"""(({node, inline, className, children, ...props}) => { const match = (className || '').match(/language-(?.*)/); let _language = match ? match[1] : ''; if (_language) { if (!["abap", "abnf", "actionscript", "ada", "agda", "al", "antlr4", "apacheconf", "apex", "apl", "applescript", "aql", "arduino", "arff", "asciidoc", "asm6502", "asmatmel", "aspnet", "autohotkey", "autoit", "avisynth", "avro-idl", "bash", "basic", "batch", "bbcode", "bicep", "birb", "bison", "bnf", "brainfuck", "brightscript", "bro", "bsl", "c", "cfscript", "chaiscript", "cil", "clike", "clojure", "cmake", "cobol", "coffeescript", "concurnas", "coq", "core", "cpp", "crystal", "csharp", "cshtml", "csp", "css", "css-extras", "csv", "cypher", "d", "dart", "dataweave", "dax", "dhall", "diff", "django", "dns-zone-file", "docker", "dot", "ebnf", "editorconfig", "eiffel", "ejs", "elixir", "elm", "erb", "erlang", "etlua", "excel-formula", "factor", "false", "firestore-security-rules", "flow", "fortran", "fsharp", "ftl", "gap", "gcode", "gdscript", "gedcom", "gherkin", "git", "glsl", "gml", "gn", "go", "go-module", "graphql", "groovy", "haml", "handlebars", "haskell", "haxe", "hcl", "hlsl", "hoon", "hpkp", "hsts", "http", "ichigojam", "icon", "icu-message-format", "idris", "iecst", "ignore", "index", "inform7", "ini", "io", "j", "java", "javadoc", "javadoclike", "javascript", "javastacktrace", "jexl", "jolie", "jq", "js-extras", "js-templates", "jsdoc", "json", "json5", "jsonp", "jsstacktrace", "jsx", "julia", "keepalived", "keyman", "kotlin", "kumir", "kusto", "latex", "latte", "less", "lilypond", "liquid", "lisp", "livescript", "llvm", "log", "lolcode", "lua", "magma", "makefile", "markdown", "markup", "markup-templating", "matlab", "maxscript", "mel", "mermaid", "mizar", "mongodb", "monkey", "moonscript", "n1ql", "n4js", "nand2tetris-hdl", "naniscript", "nasm", "neon", "nevod", "nginx", "nim", "nix", "nsis", "objectivec", "ocaml", "opencl", "openqasm", "oz", "parigp", "parser", "pascal", "pascaligo", "pcaxis", "peoplecode", "perl", "php", "php-extras", "phpdoc", "plsql", "powerquery", "powershell", "processing", "prolog", "promql", "properties", "protobuf", "psl", "pug", "puppet", "pure", "purebasic", "purescript", "python", "q", "qml", "qore", "qsharp", "r", "racket", "reason", "regex", "rego", "renpy", "rest", "rip", "roboconf", "robotframework", "ruby", "rust", "sas", "sass", "scala", "scheme", "scss", "shell-session", "smali", "smalltalk", "smarty", "sml", "solidity", "solution-file", "soy", "sparql", "splunk-spl", "sqf", "sql", "squirrel", "stan", "stylus", "swift", "systemd", "t4-cs", "t4-templating", "t4-vb", "tap", "tcl", "textile", "toml", "tremor", "tsx", "tt2", "turtle", "twig", "typescript", "typoscript", "unrealscript", "uorazor", "uri", "v", "vala", "vbnet", "velocity", "verilog", "vhdl", "vim", "visual-basic", "warpscript", "wasm", "web-idl", "wiki", "wolfram", "wren", "xeora", "xml-doc", "xojo", "xquery", "yaml", "yang", "zig"].includes(_language)) { console.warn(`Language \`${_language}\` is not supported for code blocks inside of markdown.`); _language = ''; } else { (async () => { try { const module = await import(`react-syntax-highlighter/dist/cjs/languages/prism/${_language}`); SyntaxHighlighter.registerLanguage(_language, module.default); } catch (error) { console.error(`Language ${_language} is not supported for code blocks inside of markdown: `, error); } })(); } } ; return inline ? ( {children} ) : ( ); })""",
+ r"""(({node, inline, className, children, ...props}) => { const match = (className || '').match(/language-(?.*)/); let _language = match ? match[1] : ''; if (_language) { if (!["abap", "abnf", "actionscript", "ada", "agda", "al", "antlr4", "apacheconf", "apex", "apl", "applescript", "aql", "arduino", "arff", "asciidoc", "asm6502", "asmatmel", "aspnet", "autohotkey", "autoit", "avisynth", "avro-idl", "bash", "basic", "batch", "bbcode", "bicep", "birb", "bison", "bnf", "brainfuck", "brightscript", "bro", "bsl", "c", "cfscript", "chaiscript", "cil", "clike", "clojure", "cmake", "cobol", "coffeescript", "concurnas", "coq", "core", "cpp", "crystal", "csharp", "cshtml", "csp", "css", "css-extras", "csv", "cypher", "d", "dart", "dataweave", "dax", "dhall", "diff", "django", "dns-zone-file", "docker", "dot", "ebnf", "editorconfig", "eiffel", "ejs", "elixir", "elm", "erb", "erlang", "etlua", "excel-formula", "factor", "false", "firestore-security-rules", "flow", "fortran", "fsharp", "ftl", "gap", "gcode", "gdscript", "gedcom", "gherkin", "git", "glsl", "gml", "gn", "go", "go-module", "graphql", "groovy", "haml", "handlebars", "haskell", "haxe", "hcl", "hlsl", "hoon", "hpkp", "hsts", "http", "ichigojam", "icon", "icu-message-format", "idris", "iecst", "ignore", "index", "inform7", "ini", "io", "j", "java", "javadoc", "javadoclike", "javascript", "javastacktrace", "jexl", "jolie", "jq", "js-extras", "js-templates", "jsdoc", "json", "json5", "jsonp", "jsstacktrace", "jsx", "julia", "keepalived", "keyman", "kotlin", "kumir", "kusto", "latex", "latte", "less", "lilypond", "liquid", "lisp", "livescript", "llvm", "log", "lolcode", "lua", "magma", "makefile", "markdown", "markup", "markup-templating", "matlab", "maxscript", "mel", "mermaid", "mizar", "mongodb", "monkey", "moonscript", "n1ql", "n4js", "nand2tetris-hdl", "naniscript", "nasm", "neon", "nevod", "nginx", "nim", "nix", "nsis", "objectivec", "ocaml", "opencl", "openqasm", "oz", "parigp", "parser", "pascal", "pascaligo", "pcaxis", "peoplecode", "perl", "php", "php-extras", "phpdoc", "plsql", "powerquery", "powershell", "processing", "prolog", "promql", "properties", "protobuf", "psl", "pug", "puppet", "pure", "purebasic", "purescript", "python", "q", "qml", "qore", "qsharp", "r", "racket", "reason", "regex", "rego", "renpy", "rest", "rip", "roboconf", "robotframework", "ruby", "rust", "sas", "sass", "scala", "scheme", "scss", "shell-session", "smali", "smalltalk", "smarty", "sml", "solidity", "solution-file", "soy", "sparql", "splunk-spl", "sqf", "sql", "squirrel", "stan", "stylus", "swift", "systemd", "t4-cs", "t4-templating", "t4-vb", "tap", "tcl", "textile", "toml", "tremor", "tsx", "tt2", "turtle", "twig", "typescript", "typoscript", "unrealscript", "uorazor", "uri", "v", "vala", "vbnet", "velocity", "verilog", "vhdl", "vim", "visual-basic", "warpscript", "wasm", "web-idl", "wiki", "wolfram", "wren", "xeora", "xml-doc", "xojo", "xquery", "yaml", "yang", "zig"].includes(_language)) { console.warn(`Language \`${_language}\` is not supported for code blocks inside of markdown.`); _language = ''; } else { (async () => { try { const module = await import(`react-syntax-highlighter/dist/cjs/languages/prism/${_language}`); SyntaxHighlighter.registerLanguage(_language, module.default); } catch (error) { console.error(`Language ${_language} is not supported for code blocks inside of markdown: `, error); } })(); } } ; return inline ? ( jsx(RadixThemesCode,{...props},children,) ) : ( jsx(CodeBlock,{code:((Array.isArray(children)) ? children.join("\n") : children),language:_language,...props},) ); })""",
),
(
"code",
@@ -178,7 +178,7 @@ def test_create_map_fn_var_subclass(cls, fn_body, fn_args, explicit_return, expe
ShikiHighLevelCodeBlock
)
},
- r"""(({node, inline, className, children, ...props}) => { const match = (className || '').match(/language-(?.*)/); let _language = match ? match[1] : ''; ; return inline ? ( {children} ) : ( ); })""",
+ r"""(({node, inline, className, children, ...props}) => { const match = (className || '').match(/language-(?.*)/); let _language = match ? match[1] : ''; ; return inline ? ( jsx(RadixThemesCode,{...props},children,) ) : ( jsx(CodeBlock,{code:((Array.isArray(children)) ? children.join("\n") : children),language:_language,...props},) ); })""",
),
],
)
diff --git a/tests/units/components/test_component.py b/tests/units/components/test_component.py
index d6eb04848da..b8d1e68af34 100644
--- a/tests/units/components/test_component.py
+++ b/tests/units/components/test_component.py
@@ -686,14 +686,14 @@ def test_component_create_unallowed_types(children, test_component):
"children": [
{
"name": "RadixThemesText",
- "props": ['as={"p"}'],
+ "props": ['as:"p"'],
"contents": "",
"special_props": [],
"children": [
{
"name": "",
"props": [],
- "contents": '{"first_text"}',
+ "contents": '"first_text"',
"special_props": [],
"children": [],
"autofocus": False,
@@ -716,7 +716,7 @@ def test_component_create_unallowed_types(children, test_component):
{
"autofocus": False,
"children": [],
- "contents": '{"first_text"}',
+ "contents": '"first_text"',
"name": "",
"props": [],
"special_props": [],
@@ -724,7 +724,7 @@ def test_component_create_unallowed_types(children, test_component):
],
"contents": "",
"name": "RadixThemesText",
- "props": ['as={"p"}'],
+ "props": ['as:"p"'],
"special_props": [],
},
{
@@ -733,7 +733,7 @@ def test_component_create_unallowed_types(children, test_component):
{
"autofocus": False,
"children": [],
- "contents": '{"second_text"}',
+ "contents": '"second_text"',
"name": "",
"props": [],
"special_props": [],
@@ -741,7 +741,7 @@ def test_component_create_unallowed_types(children, test_component):
],
"contents": "",
"name": "RadixThemesText",
- "props": ['as={"p"}'],
+ "props": ['as:"p"'],
"special_props": [],
},
],
@@ -762,7 +762,7 @@ def test_component_create_unallowed_types(children, test_component):
{
"autofocus": False,
"children": [],
- "contents": '{"first_text"}',
+ "contents": '"first_text"',
"name": "",
"props": [],
"special_props": [],
@@ -770,7 +770,7 @@ def test_component_create_unallowed_types(children, test_component):
],
"contents": "",
"name": "RadixThemesText",
- "props": ['as={"p"}'],
+ "props": ['as:"p"'],
"special_props": [],
},
{
@@ -785,7 +785,7 @@ def test_component_create_unallowed_types(children, test_component):
{
"autofocus": False,
"children": [],
- "contents": '{"second_text"}',
+ "contents": '"second_text"',
"name": "",
"props": [],
"special_props": [],
@@ -793,7 +793,7 @@ def test_component_create_unallowed_types(children, test_component):
],
"contents": "",
"name": "RadixThemesText",
- "props": ['as={"p"}'],
+ "props": ['as:"p"'],
"special_props": [],
}
],
@@ -1163,10 +1163,10 @@ def test_component_with_only_valid_children(fixture, request):
@pytest.mark.parametrize(
"component,rendered",
[
- (rx.text("hi"), '\n\n{"hi"}\n'),
+ (rx.text("hi"), 'jsx(\nRadixThemesText,\n{as:"p"},\n"hi"\n,)'),
(
rx.box(rx.heading("test", size="3")),
- '\n\n\n\n{"test"}\n\n',
+ 'jsx(\nRadixThemesBox,\n{},\njsx(\nRadixThemesHeading,\n{size:"3"},\n"test"\n,),)',
),
],
)
@@ -1771,14 +1771,14 @@ class C2(C1):
c1 = C1.create(prop1="prop1_1", prop2="prop2_1")
rendered_c1 = c1.render()
- assert 'renamed_prop1={"prop1_1"}' in rendered_c1["props"]
- assert 'renamed_prop2={"prop2_1"}' in rendered_c1["props"]
+ assert 'renamed_prop1:"prop1_1"' in rendered_c1["props"]
+ assert 'renamed_prop2:"prop2_1"' in rendered_c1["props"]
c2 = C2.create(prop1="prop1_2", prop2="prop2_2", prop3="prop3_2")
rendered_c2 = c2.render()
- assert 'renamed_prop1={"prop1_2"}' in rendered_c2["props"]
- assert 'subclass_prop2={"prop2_2"}' in rendered_c2["props"]
- assert 'renamed_prop3={"prop3_2"}' in rendered_c2["props"]
+ assert 'renamed_prop1:"prop1_2"' in rendered_c2["props"]
+ assert 'subclass_prop2:"prop2_2"' in rendered_c2["props"]
+ assert 'renamed_prop3:"prop3_2"' in rendered_c2["props"]
def test_custom_component_get_imports():
@@ -2165,7 +2165,7 @@ def add_style(self): # pyright: ignore [reportIncompatibleMethodOverride]
assert "useParent" in page._get_all_hooks_internal()
assert (
str(page).count(
- f'css={{({{ ["fakeParent"] : "parent", ["color"] : "var(--plum-10)", ["fake"] : "text", ["margin"] : ({test_state.get_name()}.num+"%") }})}}'
+ f'css:({{ ["fakeParent"] : "parent", ["color"] : "var(--plum-10)", ["fake"] : "text", ["margin"] : ({test_state.get_name()}.num+"%") }})'
)
== 1
)
@@ -2186,10 +2186,10 @@ def add_style(self):
assert len(page.children[0].children) == 1
# Expect the style to be added to the child of the foreach
- assert 'css={({ ["color"] : "red" })}' in str(page.children[0].children[0])
+ assert 'css:({ ["color"] : "red" })' in str(page.children[0].children[0])
# Expect only one instance of this CSS dict in the rendered page
- assert str(page).count('css={({ ["color"] : "red" })}') == 1
+ assert str(page).count('css:({ ["color"] : "red" })') == 1
class TriggerState(rx.State):
diff --git a/tests/units/components/test_tag.py b/tests/units/components/test_tag.py
index c31f9157ee4..b3ff2b8edc7 100644
--- a/tests/units/components/test_tag.py
+++ b/tests/units/components/test_tag.py
@@ -8,10 +8,10 @@
"props,test_props",
[
({}, []),
- ({"key-hypen": 1}, ["key-hypen={1}"]),
- ({"key": 1}, ["key={1}"]),
- ({"key": "value"}, ['key={"value"}']),
- ({"key": True, "key2": "value2"}, ["key={true}", 'key2={"value2"}']),
+ ({"key-hypen": 1}, ['"key-hypen":1']),
+ ({"key": 1}, ["key:1"]),
+ ({"key": "value"}, ['key:"value"']),
+ ({"key": True, "key2": "value2"}, ["key:true", 'key2:"value2"']),
],
)
def test_format_props(props: dict[str, Var], test_props: list):
diff --git a/tests/units/test_app.py b/tests/units/test_app.py
index d42772622ef..98bba42516b 100644
--- a/tests/units/test_app.py
+++ b/tests/units/test_app.py
@@ -1364,24 +1364,23 @@ def test_app_wrap_compile_theme(
line.strip() for line in app_js_contents.splitlines() if line.strip()
]
lines = "".join(app_js_lines)
- assert (
+ expected = (
"function AppWrap({children}) {"
"return ("
- + ("" if react_strict_mode else "")
- + ""
- ""
- ""
- ""
- ""
- "{children}"
- ""
- ""
- ""
- ""
- + ("" if react_strict_mode else "")
- + ")"
+ + ("jsx(StrictMode,{}," if react_strict_mode else "")
+ + "jsx(RadixThemesColorModeProvider,{},"
+ "jsx(RadixThemesTheme,{accentColor:\"plum\",css:{...theme.styles.global[':root'], ...theme.styles.global.body}},"
+ "jsx(Fragment,{},"
+ "jsx(MemoizedToastProvider,{},),"
+ "jsx(Fragment,{},"
+ "children,"
+ "),"
+ "),"
+ "),"
+ ")" + (",)" if react_strict_mode else "") + ")"
"}"
- ) in lines
+ )
+ assert expected in lines
@pytest.mark.parametrize(
@@ -1431,23 +1430,21 @@ def page():
line.strip() for line in app_js_contents.splitlines() if line.strip()
]
lines = "".join(app_js_lines)
- assert (
+ expected = (
"function AppWrap({children}) {"
- "return (" + ("" if react_strict_mode else "") + ""
- ''
- ""
- ""
- ""
- ""
- ""
- "{children}"
- ""
- ""
- ""
- ""
- ""
- "" + ("" if react_strict_mode else "")
- ) in lines
+ "return ("
+ + ("jsx(StrictMode,{}," if react_strict_mode else "")
+ + "jsx(RadixThemesBox,{},"
+ 'jsx(RadixThemesText,{as:"p"},'
+ "jsx(RadixThemesColorModeProvider,{},"
+ "jsx(Fragment2,{},"
+ "jsx(Fragment,{},"
+ "jsx(MemoizedToastProvider,{},),"
+ "jsx(Fragment,{},"
+ "children"
+ ",),),),),)" + (",)" if react_strict_mode else "")
+ )
+ assert expected in lines
def test_app_state_determination():
diff --git a/tests/units/utils/test_format.py b/tests/units/utils/test_format.py
index 776613a21cb..e2387c60d87 100644
--- a/tests/units/utils/test_format.py
+++ b/tests/units/utils/test_format.py
@@ -457,7 +457,7 @@ def test_format_match(
_js_expr=f"(({{node, ...props}}) => )"
),
},
- '({ ["h1"] : (({node, ...props}) => ) })',
+ '({ ["h1"] : (({node, ...props}) => ) })',
),
],
)
@@ -475,9 +475,9 @@ def test_format_prop(prop: Var, formatted: str):
"single_props,key_value_props,output",
[
(
- [Var(_js_expr="{...props}")],
+ [Var(_js_expr="props")],
{"key": 42},
- ["key={42}", "{...props}"],
+ ["key:42", "...props"],
),
],
)