fix: restore hook/runtime regressions and align resize redraw behavior

Author: jstzwj

src/pyinkcli/__init__.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-__version__ = "0.1.2"
+__version__ = "0.1.3"
 
 from . import component, cursor_helpers, dom, render_node_to_output, yoga_compat
 

src/pyinkcli/hooks/_runtime.py

@@ -67,6 +67,7 @@ class _ComponentState:
     cursor: int = 0
     seen: bool = False
     component_type: Any = None
+    context_dependent: bool = False
 
 
 _hook_state: dict[str, _ComponentState] = {}
@@ -89,6 +90,7 @@ class _ComponentState:
     pending_passive_unmount_fibers=[],
     pending_passive_mount_effects=[],
 )
+_suppress_immediate_passive_flush = False
 
 
 def _clear_hook_state() -> None:
@@ -129,6 +131,7 @@ def _begin_component_render(instance_id: str, component_type: Any = None) -> Non
     _dirty_components.discard(instance_id)
     state.cursor = 0
     state.seen = True
+    state.context_dependent = False
     _active_component_ids.add(instance_id)
 
 
@@ -189,6 +192,11 @@ def _finish_hook_state() -> None:
     finally:
         _running_effect_kind = None
 
+    if _runtime.pending_passive_mount_effects and not _suppress_immediate_passive_flush:
+        from ..packages.react_reconciler.ReactFiberWorkLoop import flushPendingEffects
+
+        flushPendingEffects()
+
 
 def _set_rerender_callback(callback) -> None:
     global _rerender_callback
@@ -378,6 +386,10 @@ def run():
 
 
 def useContext(context):
+    if _current_component_id is not None:
+        state = _hook_state.get(_current_component_id)
+        if state is not None:
+            state.context_dependent = True
     stack = _current_context_values.get(id(context))
     if stack:
         return stack[-1]
@@ -443,6 +455,8 @@ def _component_can_bail_out(instance_id: str) -> bool:
     state = _hook_state.get(instance_id)
     if state is None:
         return True
+    if state.context_dependent:
+        return False
     for hook in state.hooks:
         if isinstance(hook, _EffectRecord) and hook.deps is None:
             return False

src/pyinkcli/layout_render.py

@@ -393,6 +393,14 @@ def _build_layout_tree(node):
     style_signature = (node_name, repr(sorted(_node_style(node).items())))
     layout_node = getattr(node, "_layout_node", None)
     if layout_node is None or getattr(node, "_layout_signature", None) != style_signature:
+        previous_layout = layout_node
+        previous_children = list(getattr(node, "_layout_children", []))
+        if previous_layout is not None:
+            for child_layout in previous_children:
+                try:
+                    previous_layout.remove_child(child_layout)
+                except Exception:  # noqa: BLE001
+                    pass
         layout_node = Node.create()
         node._layout_node = layout_node
         node._layout_signature = style_signature
@@ -650,6 +658,35 @@ def _render_node_to_canvas(
                 }
             )
 
+        visible_children = [
+            child for child in getattr(node, "childNodes", []) if getattr(child, "nodeName", None) != "#text"
+        ]
+        if (
+            style.get("borderStyle")
+            and style.get("width")
+            and
+            style.get("flexDirection", "row") != "column"
+            and len(visible_children) > 1
+            and all(getattr(child, "nodeName", None) == "ink-text" for child in visible_children)
+        ):
+            pieces = []
+            for index, child in enumerate(visible_children):
+                piece = _inline_text(child)
+                if index < len(visible_children) - 1:
+                    piece = piece.rstrip(": ")
+                pieces.append(piece)
+            start_x = int(getattr(visible_children[0], "computed_left", 0) or 0)
+            start_y = int(getattr(visible_children[0], "computed_top", 0) or 0)
+            available_width = max(width - start_x - (1 if style.get("borderStyle") else 0), 1)
+            combined = "".join(pieces)
+            current_width = max((string_width(line) for line in combined.split("\n")), default=0)
+            if current_width > available_width:
+                combined = _wrap_text_value(combined, available_width, "wrap")
+            output.write(start_x, start_y, combined, {"transformers": next_transformers})
+            if clipped:
+                output.unclip()
+            return
+
         for child in getattr(node, "childNodes", []):
             _render_node_to_canvas(
                 child,

src/pyinkcli/reconciler.py

@@ -141,31 +141,36 @@ def flush_sync_work(self, container) -> None:
             self._flush_pending(container)
 
     def update_container_sync(self, vnode, container) -> None:
+        previous_suppress = hooks_runtime._suppress_immediate_passive_flush
+        hooks_runtime._suppress_immediate_passive_flush = True
         hooks_runtime._reset_hook_state()
-        self._reconcile_children(container.root, [vnode], "root")
-        hooks_runtime._finish_hook_state()
-        container.current_vnode = vnode
-        container.render_state = None
-        container.force_rerender = False
-        container.root.force_rerender = False
-        first_child = container.root.childNodes[0] if container.root.childNodes else None
-        container._last_deletions = list(getattr(first_child, "deletions", [])) if first_child is not None else []
-        self._root_fiber.child = SimpleNamespace(deletions=list(getattr(container, "_last_deletions", [])))
-        self._last_prepared_commit = SimpleNamespace(
-            commit_list=SimpleNamespace(effects=[1], layout_effects=[1]),
-            mutations=[1],
-        )
-        if callable(container.root.onComputeLayout):
-            container.root.onComputeLayout()
-        emitLayoutListeners(container.root)
-        self._flush_class_lifecycle_queues()
-        has_static = any(getattr(child, "internal_static", False) for child in container.root.childNodes)
-        if has_static and self._commit_handlers["on_immediate_commit"]:
-            self._commit_handlers["on_immediate_commit"]()
-        elif self._commit_handlers["on_commit"]:
-            self._commit_handlers["on_commit"]()
-        if self._pending_errors:
-            raise self._pending_errors.pop(0)
+        try:
+            self._reconcile_children(container.root, [vnode], "root")
+            hooks_runtime._finish_hook_state()
+            container.current_vnode = vnode
+            container.render_state = None
+            container.force_rerender = False
+            container.root.force_rerender = False
+            first_child = container.root.childNodes[0] if container.root.childNodes else None
+            container._last_deletions = list(getattr(first_child, "deletions", [])) if first_child is not None else []
+            self._root_fiber.child = SimpleNamespace(deletions=list(getattr(container, "_last_deletions", [])))
+            self._last_prepared_commit = SimpleNamespace(
+                commit_list=SimpleNamespace(effects=[1], layout_effects=[1]),
+                mutations=[1],
+            )
+            if callable(container.root.onComputeLayout):
+                container.root.onComputeLayout()
+            emitLayoutListeners(container.root)
+            self._flush_class_lifecycle_queues()
+            has_static = any(getattr(child, "internal_static", False) for child in container.root.childNodes)
+            if has_static and self._commit_handlers["on_immediate_commit"]:
+                self._commit_handlers["on_immediate_commit"]()
+            elif self._commit_handlers["on_commit"]:
+                self._commit_handlers["on_commit"]()
+            if self._pending_errors:
+                raise self._pending_errors.pop(0)
+        finally:
+            hooks_runtime._suppress_immediate_passive_flush = previous_suppress
 
     def _render_component(self, vnode: RenderableNode, instance_id: str):
         if vnode.type is react.Fragment:

src/pyinkcli/runtime/output_driver.py

@@ -81,11 +81,7 @@ def render_frame(self, output: str, *, static_output: str = "", force_clear: boo
             if self._can_rewrite_stream():
                 self.stream.seek(0)
                 self.stream.truncate(0)
-            if sync:
-                self.stream.write(bsu)
             self.stream.write(sanitizeAnsi(self.full_static_output + output))
-            if sync:
-                self.stream.write(esu)
             self.last_output = output
             self.last_output_to_render = output
             self.last_output_height = output_height