update

Author: jstzwj

examples/incremental-rendering/incremental-rendering.py

@@ -75,11 +75,22 @@ def progress_bar(value: int) -> str:
     return ("█" * filled) + ("░" * empty)
 
 
+def truncate_text(text: str, max_length: int) -> str:
+    if max_length <= 0:
+        return ""
+    if len(text) <= max_length:
+        return text
+    if max_length <= 3:
+        return text[:max_length]
+    return f"{text[: max_length - 3]}..."
+
+
 def incremental_rendering_example():
     app = useApp()
-    _terminal_width, terminal_height = useWindowSize()
+    terminal_width, terminal_height = useWindowSize()
 
-    available_lines = max(terminal_height - 15, 10)
+    compact_mode = terminal_height < 20
+    available_lines = max(terminal_height - 15, 0)
     log_line_count = max(int(available_lines * 0.3), 3)
     service_count = min(max(int(available_lines * 0.7), 5), len(ROWS))
 
@@ -200,6 +211,49 @@ def on_input(input_char, key):
     useInput(on_input)
 
     visible_rows = ROWS[:service_count]
+    safe_selected_index = min(selected_index, max(len(visible_rows) - 1, 0))
+    selected_row = visible_rows[safe_selected_index] if visible_rows else ""
+
+    if compact_mode:
+        compact_service_count = min(max(terminal_height - 5, 1), len(ROWS))
+        compact_rows = ROWS[:compact_service_count]
+        compact_selected_index = min(selected_index, max(len(compact_rows) - 1, 0))
+        compact_selected_row = compact_rows[compact_selected_index] if compact_rows else ""
+        compact_label_width = max(terminal_width - 12, 20)
+
+        return Box(
+            Text(
+                "Incremental Rendering Demo",
+                bold=True,
+                color="cyan",
+            ),
+            Text(
+                f"FPS: {fps} • Time: {timestamp} • Updates: {counter} • Random: {random_value}",
+                dim_color=True,
+            ),
+            Text(
+                f"Services ({compact_service_count} of {len(ROWS)}):",
+                bold=True,
+                color="magenta",
+            ),
+            *[
+                Text(
+                    f"{'> ' if index == compact_selected_index else '  '}"
+                    f"{truncate_text(row, max(terminal_width - 4, 12))}",
+                    color="blue" if index == compact_selected_index else "white",
+                )
+                for index, row in enumerate(compact_rows)
+            ],
+            Text(
+                "Selected: ",
+                Text(
+                    truncate_text(compact_selected_row, compact_label_width),
+                    bold=True,
+                    color="magenta",
+                ),
+            ),
+            flexDirection="column",
+        )
 
     return Box(
         Box(
@@ -267,8 +321,8 @@ def on_input(input_char, key):
             ),
             *[
                 Text(
-                    f"{'> ' if index == selected_index else '  '}{row}",
-                    color="blue" if index == selected_index else "white",
+                    f"{'> ' if index == safe_selected_index else '  '}{row}",
+                    color="blue" if index == safe_selected_index else "white",
                 )
                 for index, row in enumerate(visible_rows)
             ],
@@ -283,15 +337,14 @@ def on_input(input_char, key):
         Box(
             Text(
                 "Selected: ",
-                Text(visible_rows[selected_index], bold=True, color="magenta"),
+                Text(selected_row, bold=True, color="magenta"),
             ),
             borderStyle="round",
             borderColor="magenta",
             paddingX=2,
             marginTop=1,
         ),
         flexDirection="column",
-        height="100%",
     )
 
 

src/pyinkcli/components/App.py

@@ -6,7 +6,12 @@
 from ..hooks.use_stdin import useStdin
 from .AppContext import AppContext, set_app_context_value
 from .StderrContext import StderrContext, set_stderr_context_value
-from .StdinContext import StdinContext, set_stdin_context_value
+from .StdinContext import (
+    StdinContext,
+    create_stdin_handle,
+    create_stdin_runtime_bridge,
+    set_stdin_context_value,
+)
 from .StdoutContext import StdoutContext, set_stdout_context_value
 
 
@@ -18,11 +23,7 @@ def App(*children, **props):
 
     def manage_runtime():
         def cleanup():
-            stdin._clear_pending_escape_flush()
-            while getattr(stdin, "_raw_mode_enabled_count", 0) > 0:
-                stdin.setRawMode(False)
-            while getattr(stdin, "_bracketed_paste_enabled_count", 0) > 0:
-                stdin.setBracketedPasteMode(False)
+            stdin.teardown()
 
         return cleanup
 
@@ -53,14 +54,28 @@ def create_app_tree(node, *, contexts):
 
 
 def create_runtime_contexts(*, app, stdin, stdout, stderr, interactive: bool, exit_on_ctrl_c: bool = True):
+    stdin_handle = create_stdin_handle(
+        stdin=stdin,
+        output_stream=stdout,
+        is_raw_mode_supported=bool(getattr(stdin, "isatty", lambda: False)()),
+        exit_on_ctrl_c=exit_on_ctrl_c,
+        on_exit=app.exit,
+    )
+    stdin_runtime = create_stdin_runtime_bridge(
+        stdin_handle,
+        exit_on_ctrl_c=exit_on_ctrl_c,
+        on_exit=app.exit,
+    )
     return {
         "app": set_app_context_value(app),
         "stdin": set_stdin_context_value(
-            stdin=stdin,
-            is_raw_mode_supported=bool(getattr(stdin, "isatty", lambda: False)()),
-            exit_on_ctrl_c=exit_on_ctrl_c,
+            handle=stdin_handle,
+            runtime=stdin_runtime,
             on_exit=app.exit,
+            exit_on_ctrl_c=exit_on_ctrl_c,
         ),
+        "stdin_handle": stdin_handle,
+        "stdin_runtime": stdin_runtime,
         "stdout": set_stdout_context_value(stdout=stdout, write=app._write_to_stdout),
         "stderr": set_stderr_context_value(stderr=stderr, write=app._write_to_stderr),
         "interactive": interactive,

src/pyinkcli/components/AppContext.py

@@ -27,6 +27,9 @@ def waitUntilRenderFlush(self, timeout=None):
     def exit(self, errorOrResult=None):
         return self._app.exit(errorOrResult)
 
+    def _call_on_render_thread(self, callback):
+        return self._app._call_on_render_thread(callback)
+
 
 def create_app_context_value(app=None):
     if app is None:
@@ -50,6 +53,10 @@ def wait_until_render_flush(self, timeout=None):
     def exit(self, error_or_result=None):
         return None
 
+    def _call_on_render_thread(self, callback):
+        callback()
+        return None
+
 
 AppContext = createContext(create_app_context_value())
 AppContext.displayName = "InternalAppContext"
@@ -60,4 +67,5 @@ def set_app_context_value(app=None):
     AppContext.current_value = value
     return value
 
+
 __all__ = ["AppContext", "Props"]

src/pyinkcli/components/StdinContext.py

@@ -2,44 +2,105 @@
 
 import sys
 
-from ..hooks.use_stdin import _StdinHandle
+from ..hooks.use_stdin import (
+    _StdinHandle,
+    create_default_stdin_context_value,
+    create_stdin_context_value,
+    create_stdin_runtime,
+    get_stdin_handle,
+    get_stdin_runtime,
+)
 from ..packages.react_context import createContext
 
 PublicProps = dict
 Props = dict
 
 
-def create_stdin_context_value(
+def create_stdin_handle(
     *,
     stdin=sys.stdin,
+    output_stream=None,
     is_raw_mode_supported: bool = False,
     exit_on_ctrl_c: bool = True,
     internal_event_emitter=None,
     on_exit=None,
 ):
-    return _StdinHandle(
+    return get_stdin_handle(
+        create_stdin_context_value(
+            stream=stdin,
+            output_stream=output_stream,
+            is_raw_mode_supported=is_raw_mode_supported,
+            exit_on_ctrl_c=exit_on_ctrl_c,
+            internal_event_emitter=internal_event_emitter,
+            on_exit=on_exit,
+        )
+    )
+
+
+def create_stdin_runtime_bridge(
+    handle: _StdinHandle,
+    *,
+    exit_on_ctrl_c: bool = True,
+    on_exit=None,
+):
+    return create_stdin_runtime(
+        handle,
+        exit_on_ctrl_c=exit_on_ctrl_c,
+        on_exit=on_exit,
+    )
+
+
+def build_stdin_context_value(
+    *,
+    handle: _StdinHandle | None = None,
+    runtime=None,
+    stdin=sys.stdin,
+    output_stream=None,
+    is_raw_mode_supported: bool = False,
+    exit_on_ctrl_c: bool = True,
+    internal_event_emitter=None,
+    on_exit=None,
+):
+    if handle is not None:
+        return create_stdin_context_value(
+            handle=handle,
+            runtime=runtime
+            or create_stdin_runtime_bridge(
+                handle,
+                exit_on_ctrl_c=exit_on_ctrl_c,
+                on_exit=on_exit,
+            ),
+        )
+    return create_stdin_context_value(
         stream=stdin,
+        output_stream=output_stream,
         is_raw_mode_supported=is_raw_mode_supported,
         exit_on_ctrl_c=exit_on_ctrl_c,
         internal_event_emitter=internal_event_emitter,
         on_exit=on_exit,
     )
 
 
-StdinContext = createContext(create_stdin_context_value())
+StdinContext = createContext(create_default_stdin_context_value())
 StdinContext.displayName = "InternalStdinContext"
 
 
 def set_stdin_context_value(
     *,
+    handle: _StdinHandle | None = None,
+    runtime=None,
     stdin=sys.stdin,
+    output_stream=None,
     is_raw_mode_supported: bool = False,
     exit_on_ctrl_c: bool = True,
     internal_event_emitter=None,
     on_exit=None,
 ):
-    value = create_stdin_context_value(
+    value = build_stdin_context_value(
+        handle=handle,
+        runtime=runtime,
         stdin=stdin,
+        output_stream=output_stream,
         is_raw_mode_supported=is_raw_mode_supported,
         exit_on_ctrl_c=exit_on_ctrl_c,
         internal_event_emitter=internal_event_emitter,
@@ -48,4 +109,10 @@ def set_stdin_context_value(
     StdinContext.current_value = value
     return value
 
-__all__ = ["StdinContext"]
+__all__ = [
+    "StdinContext",
+    "build_stdin_context_value",
+    "create_stdin_handle",
+    "create_stdin_runtime_bridge",
+    "set_stdin_context_value",
+]

src/pyinkcli/dom.py

@@ -21,6 +21,9 @@ class DOMNode:
     onComputeLayout: Any = None
     onRender: Any = None
     onImmediateRender: Any = None
+    isStaticDirty: bool = False
+    staticNode: DOMNode | None = None
+    _static_signature: Any = None
 
 
 @dataclass
@@ -104,4 +107,3 @@ def emitLayoutListeners(node: DOMNode) -> None:
     "emitLayoutListeners",
     "squashTextNodes",
 ]
-