From 070e511a82be2bf0cb6374542390d5d1d7031744 Mon Sep 17 00:00:00 2001
From: Nikhil Sharma <niikkhilsharma@gmail.com>
Date: Sun, 10 Mar 2024 11:18:34 +0530
Subject: [PATCH 1/2] implemented a new input component that manage state on
the client side
---
.../jinja/web/pages/base_page.js.jinja2 | 1 +
nextpy/interfaces/web/components/component.py | 6 +++-
nextpy/utils/format.py | 29 ++++++++++++++++++-
3 files changed, 34 insertions(+), 2 deletions(-)
diff --git a/nextpy/interfaces/templates/jinja/web/pages/base_page.js.jinja2 b/nextpy/interfaces/templates/jinja/web/pages/base_page.js.jinja2
index 1af7bf8e..9231df51 100644
--- a/nextpy/interfaces/templates/jinja/web/pages/base_page.js.jinja2
+++ b/nextpy/interfaces/templates/jinja/web/pages/base_page.js.jinja2
@@ -13,6 +13,7 @@ Purpose:
{# ==============================
LIBRARY IMPORTS BLOCK
============================== #}
+import { DispatchContext } from 'utils/context'
{#
Purpose:
- Renders all required library imports for the current page or component.
diff --git a/nextpy/interfaces/web/components/component.py b/nextpy/interfaces/web/components/component.py
index 4dac6c16..97a5c39b 100644
--- a/nextpy/interfaces/web/components/component.py
+++ b/nextpy/interfaces/web/components/component.py
@@ -1589,6 +1589,9 @@ def _get_memoized_event_triggers(
rendered_chain = format.format_prop(event)
if isinstance(rendered_chain, str):
rendered_chain = rendered_chain.strip("{}")
+
+ if tag_name.startswith("Input_"):
+ rendered_chain = rendered_chain+'}'
# Hash the rendered EventChain to get a deterministic function name.
chain_hash = md5(str(rendered_chain).encode("utf-8")).hexdigest()
@@ -1613,7 +1616,8 @@ def _get_memoized_event_triggers(
Var.create_safe(memo_name)._replace(
_var_type=EventChain, merge_var_data=memo_var_data
),
- f"const {memo_name} = useCallback({rendered_chain}, [{', '.join(var_deps)}])",
+ # Move the dispatchers line to the right place.
+ f"const dispatchers = useContext(DispatchContext);const {memo_name} = useCallback({rendered_chain}, [{', '.join(var_deps)}])",
)
return trigger_memo
diff --git a/nextpy/utils/format.py b/nextpy/utils/format.py
index 466081e8..5745f339 100644
--- a/nextpy/utils/format.py
+++ b/nextpy/utils/format.py
@@ -311,6 +311,7 @@ def format_match(cond: str | Var, match_cases: List[BaseVar], default: Var) -> s
def format_prop(
prop: Union[Var, EventChain, ComponentStyle, str],
+ tag_name='',
) -> Union[int, float, str]:
"""Format a prop.
@@ -349,7 +350,33 @@ def format_prop(
chain = ",".join([format_event(event) for event in prop.events])
event = f"addEvents([{chain}], {arg_def}, {json_dumps(prop.event_actions)})"
- prop = f"{arg_def} => {event}"
+
+ if tag_name.startswith("Input_"):
+ if isinstance(event, str):
+ event = event.strip("{}")
+
+ parts = chain.split('.')
+ formatted_chain = f'{parts[0]}.{parts[1]}.{parts[2]}'
+
+ # Extract "_e0.target.value"
+ value_match = re.search(r"value:([^,)}]+)", event)
+ if value_match:
+ value = value_match.group(1)
+
+ # Extract "state.state"
+ message_match = re.search(r"addEvents\(\[\S+?\(\"([^.]+?\.[^.]+)", event)
+ if message_match:
+ message = message_match.group(1)
+
+ dispatcher_line = f"const dispatcher = dispatchers['{message}'];\n" \
+ f"dispatcher({{ message: {value} }});"
+
+ prop = f"{arg_def} =>{{ {dispatcher_line}\n{event} }}"
+
+ # Handle other types.
+ else:
+ # prop = f"{arg_def} =>{{ {dispatcher_line}\n{event} }}"
+ prop = f"{arg_def} => {event}"
# Handle other types.
elif isinstance(prop, str):
From 736b9fd096e7a66d9fc8dedebd829f2d4fe862f2 Mon Sep 17 00:00:00 2001
From: Nikhil Sharma <niikkhilsharma@gmail.com>
Date: Sun, 10 Mar 2024 13:13:47 +0530
Subject: [PATCH 2/2] indentation error fixed
---
nextpy/utils/format.py | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/nextpy/utils/format.py b/nextpy/utils/format.py
index 5745f339..0f9426e7 100644
--- a/nextpy/utils/format.py
+++ b/nextpy/utils/format.py
@@ -359,19 +359,19 @@ def format_prop(
formatted_chain = f'{parts[0]}.{parts[1]}.{parts[2]}'
# Extract "_e0.target.value"
- value_match = re.search(r"value:([^,)}]+)", event)
- if value_match:
- value = value_match.group(1)
+ value_match = re.search(r"value:([^,)}]+)", event)
+ if value_match:
+ value = value_match.group(1)
# Extract "state.state"
- message_match = re.search(r"addEvents\(\[\S+?\(\"([^.]+?\.[^.]+)", event)
- if message_match:
- message = message_match.group(1)
+ message_match = re.search(r"addEvents\(\[\S+?\(\"([^.]+?\.[^.]+)", event)
+ if message_match:
+ message = message_match.group(1)
- dispatcher_line = f"const dispatcher = dispatchers['{message}'];\n" \
- f"dispatcher({{ message: {value} }});"
+ dispatcher_line = f"const dispatcher = dispatchers['{message}'];\n" \
+ f"dispatcher({{ message: {value} }});"
- prop = f"{arg_def} =>{{ {dispatcher_line}\n{event} }}"
+ prop = f"{arg_def} =>{{ {dispatcher_line}\n{event} }}"
# Handle other types.
else: