@cel-tui/core 0.2.1 → 0.3.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cel-tui/core",
-  "version": "0.2.1",
+  "version": "0.3.0",
   "description": "Core framework engine for cel-tui — primitives, layout, rendering, input",
   "type": "module",
   "module": "src/index.ts",
@@ -34,7 +34,7 @@
     "layout"
   ],
   "dependencies": {
-    "@cel-tui/types": "0.2.1",
+    "@cel-tui/types": "0.3.0",
     "get-east-asian-width": "^1.5.0"
   },
   "peerDependencies": {

package/src/cel.ts

@@ -8,7 +8,7 @@ import {
   collectKeyPressHandlers,
   collectFocusable,
 } from "./hit-test.js";
-import { parseKey, isEditingKey, normalizeKey } from "./keys.js";
+import { parseKey, isEditingKey } from "./keys.js";
 import { layout, type LayoutNode } from "./layout.js";
 import {
   paint,
@@ -555,11 +555,15 @@ function handleMouseEvent(event: MouseEvent): void {
             if (props.onScroll) {
               // Controlled scroll: notify app.
               // Use batch accumulator if available (multiple events in one chunk),
-              // otherwise read from props.
-              const baseOffset =
+              // otherwise read from props. Clamp to maxOffset first so that
+              // Infinity (sticky-bottom) resolves to a finite value before
+              // applying the delta — otherwise Infinity + (-1) = Infinity
+              // and scrolling up never unsticks.
+              const rawBase =
                 batchScrollOffsets?.get(props) ??
                 (props as any).scrollOffset ??
                 0;
+              const baseOffset = Math.min(rawBase, maxOffset);
               const newOffset = Math.max(
                 0,
                 Math.min(maxOffset, baseOffset + delta),
@@ -685,12 +689,13 @@ function handleKeyEvent(key: string, rawData?: string): void {
     const props = focusedInput.node
       .props as import("@cel-tui/types").TextInputProps;
 
-    // Check submitKey
-    const submitKey = normalizeKey(props.submitKey ?? "enter");
-    if (key === submitKey && props.onSubmit) {
-      props.onSubmit();
-      cel.render();
-      return;
+    // onKeyPress fires before editing — return false prevents the default action
+    if (props.onKeyPress) {
+      const result = props.onKeyPress(key);
+      if (result === false) {
+        cel.render();
+        return;
+      }
     }
 
     // Editing keys are consumed by TextInput
@@ -728,6 +733,7 @@ function handleKeyEvent(key: string, rawData?: string): void {
           }
           break;
         case "enter":
+        case "shift+enter":
           newState = insertChar(editState, "\n");
           break;
         case "tab":
@@ -766,7 +772,16 @@ function handleKeyEvent(key: string, rawData?: string): void {
     for (let i = currentLayouts.length - 1; i >= 0; i--) {
       const path = findPathTo(currentLayouts[i]!, focused);
       if (path) {
-        const handlers = collectKeyPressHandlers(path);
+        let handlers = collectKeyPressHandlers(path);
+        // If a TextInput's onKeyPress was already called in the pre-editing
+        // hook above, exclude it from bubbling to avoid calling it twice.
+        if (
+          focusedInput &&
+          handlers.length > 0 &&
+          handlers[0]!.layoutNode === focusedInput
+        ) {
+          handlers = handlers.slice(1);
+        }
         if (handlers.length > 0) {
           let consumed = false;
           for (const h of handlers) {

package/src/keys.ts

@@ -248,6 +248,7 @@ export function isEditingKey(key: string): boolean {
     "end",
     "space",
     "plus",
+    "shift+enter",
   ]);
 
   return editingKeys.has(key);

package/src/primitives/text-input.ts

@@ -12,9 +12,12 @@ import type { TextInputNode, TextInputProps } from "@cel-tui/types";
  * responds to mouse wheel automatically.
  *
  * TextInput is always focusable. When focused, text-editing keys
- * (printable characters, arrows, backspace, Tab) are consumed.
+ * (printable characters, arrows, backspace, Enter, Tab) are consumed.
  * Modifier combos (e.g., `ctrl+s`) bubble up to ancestor `onKeyPress` handlers.
  *
+ * Use `onKeyPress` to intercept keys before editing. Return `false` to
+ * prevent the default editing action for that key.
+ *
  * @param props - Value, callbacks, sizing, styling, and focus props.
  * @returns A text input node for the UI tree.
  *
@@ -26,14 +29,15 @@ import type { TextInputNode, TextInputProps } from "@cel-tui/types";
  * })
  *
  * @example
- * // Growing input with max height
+ * // Growing input with max height, Enter submits
  * TextInput({
  *   flex: 1,
  *   maxHeight: 10,
  *   value: text,
  *   onChange: handleChange,
- *   onSubmit: handleSend,
- *   submitKey: "ctrl+enter",
+ *   onKeyPress: (key) => {
+ *     if (key === "enter") { handleSend(); return false; }
+ *   },
  *   placeholder: Text("type a message...", { fgColor: "color08" }),
  * })
  */