laipeng/reflex
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "move state.js to jinja, related to #3738"

Browse Source 
This reverts commit 4d2a72c4e86be3c8466cc701daf173ea70cba90d.
This commit is contained in:
Benedikt Bartscher 2024-08-05 21:57:30 +02:00 committed by Masen Furer
parent 79fc10957d
commit c26d626bf2
No known key found for this signature in database
GPG Key ID: B0008AD22B3B3A95
5 changed files with 2 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
reflex/.templates/jinja/web/utils/state.js.jinja2 → reflex/.templates/web/utils/state.js
View File

@ -810,7 +810,7 @@ export const useEventLoop = (
const vars = {};
vars[storage_to_state_map[e.key]] = e.newValue;
const event = Event(
`${state_name}.{{ const.update_vars_internal }}`,
`${state_name}.{{ update_vars_internal }}`,
{ vars: vars }
);
addEvents([event], e);
@ -824,7 +824,7 @@ export const useEventLoop = (
// Route after the initial page hydration.
useEffect(() => {
const change_start = () => {
const main_state_dispatch = dispatch["{{ const.state_name }}"];
const main_state_dispatch = dispatch["state"];
if (main_state_dispatch !== undefined) {
main_state_dispatch({ is_hydrated: false });
}

21
reflex/compiler/compiler.py
View File

@ -126,15 +126,6 @@ def _compile_contexts(state: Optional[Type[BaseState]], theme: Component | None)
)
def _compile_state() -> str:
"""Compile the state.
Returns:
The compiled state.
"""
return templates.state().render()
def _compile_page(
component: BaseComponent,
state: Type[BaseState] | None,
@ -433,18 +424,6 @@ def compile_contexts(
return output_path, _compile_contexts(state, theme)
def compile_state() -> tuple[str, str]:
"""Compile the state.
Returns:
The path and code of the compiled state.
"""
output_path = utils.get_state_path()
code = _compile_state()
return output_path, code
def compile_page(
path: str, component: BaseComponent, state: Type[BaseState] | None
) -> tuple[str, str]:

11
reflex/compiler/templates.py
View File

@ -14,7 +14,6 @@ class ReflexJinjaEnvironment(Environment):
from reflex.state import (
FrontendEventExceptionState,
OnLoadInternalState,
State,
UpdateVarsInternalState,
)
@ -49,7 +48,6 @@ class ReflexJinjaEnvironment(Environment):
"set_color_mode": constants.ColorMode.SET,
"use_color_mode": constants.ColorMode.USE,
"hydrate": constants.CompileVars.HYDRATE,
"state_name": State.get_name(),
"on_load_internal": f"{OnLoadInternalState.get_name()}.on_load_internal",
"update_vars_internal": f"{UpdateVarsInternalState.get_name()}.update_vars_internal",
"frontend_exception_state": FrontendEventExceptionState.get_full_name(),
@ -113,15 +111,6 @@ def context():
return get_template("web/utils/context.js.jinja2")
def state():
"""Template for the state file.
Returns:
Template: The template for the state file.
"""
return get_template("web/utils/state.js.jinja2")
def tailwind_config():
"""Template for Tailwind config.

9
reflex/compiler/utils.py
View File

@ -399,15 +399,6 @@ def get_context_path() -> str:
return str(get_web_dir() / (constants.Dirs.CONTEXTS_PATH + constants.Ext.JS))
def get_state_path() -> str:
"""Get the path of the state file.
Returns:
The path of the state module.
"""
return str(get_web_dir() / (constants.Dirs.STATES_PATH + constants.Ext.JS))
def get_components_path() -> str:
"""Get the path of the compiled components.

2
reflex/constants/base.py
View File

@ -35,8 +35,6 @@ class Dirs(SimpleNamespace):
COMPONENTS_PATH = "/".join([UTILS, "components"])
# The name of the contexts file.
CONTEXTS_PATH = "/".join([UTILS, "context"])
# The name of the states file.
STATES_PATH = "/".join([UTILS, "state"])
# The name of the output static directory.
STATIC = "_static"
# The name of the public html directory served at "/"