@inshapardaz/likhari-react 0.1.18-dev.130 → 0.1.18-dev.134

package/dist/blocks/poetryActions.d.ts

@@ -16,4 +16,14 @@ export declare function $setPoetryLayout(node: PoetryBlockNode, layout: PoetryLa
 /** Inserts a new two-misra couplet after the selection's top-level block,
  * in `layout`/`align`, and focuses its first misra. */
 export declare function $insertPoetryCouplet(layout: PoetryLayout, align: PoetryAlign): boolean;
+/**
+ * Enter at the end of a couplet's last misra would otherwise land inside
+ * ParagraphNode's own insertNewAfter — which inserts the new paragraph as a
+ * sibling of the misra, i.e. still inside the couplet (or, for two-column,
+ * inside its LayoutItemNode) — trapping the caret with no way to add a line
+ * after the block. Handled here instead: a plain paragraph after the whole
+ * couplet, focused. Returns false (let normal Enter handling proceed) for
+ * every other caret position, including earlier in the couplet.
+ */
+export declare function $exitPoetryOnEnter(): boolean;
 //# sourceMappingURL=poetryActions.d.ts.map

package/dist/blocks/poetryActions.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"poetryActions.d.ts","sourceRoot":"","sources":["../../src/blocks/poetryActions.ts"],"names":[],"mappings":"AACA,OAAO,EAA4E,KAAK,aAAa,EAAE,MAAM,SAAS,CAAC;AAEvH,OAAO,EAA8C,KAAK,WAAW,EAAE,KAAK,YAAY,EAAE,KAAK,eAAe,EAAE,MAAM,cAAc,CAAC;AAErI;wCACwC;AACxC,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,eAAe,GAAG,aAAa,EAAE,CAW1E;AAED,oEAAoE;AACpE,wBAAgB,4BAA4B,IAAI,eAAe,GAAG,IAAI,CAKrE;AAED;;;;;;GAMG;AACH,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,eAAe,EAAE,MAAM,EAAE,YAAY,GAAG,IAAI,CAclF;AAED;uDACuD;AACvD,wBAAgB,oBAAoB,CAAC,MAAM,EAAE,YAAY,EAAE,KAAK,EAAE,WAAW,GAAG,OAAO,CAmBtF"}
+{"version":3,"file":"poetryActions.d.ts","sourceRoot":"","sources":["../../src/blocks/poetryActions.ts"],"names":[],"mappings":"AACA,OAAO,EAA4E,KAAK,aAAa,EAAE,MAAM,SAAS,CAAC;AAEvH,OAAO,EAA8C,KAAK,WAAW,EAAE,KAAK,YAAY,EAAE,KAAK,eAAe,EAAE,MAAM,cAAc,CAAC;AAErI;wCACwC;AACxC,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,eAAe,GAAG,aAAa,EAAE,CAW1E;AAED,oEAAoE;AACpE,wBAAgB,4BAA4B,IAAI,eAAe,GAAG,IAAI,CAKrE;AAED;;;;;;GAMG;AACH,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,eAAe,EAAE,MAAM,EAAE,YAAY,GAAG,IAAI,CAclF;AAED;uDACuD;AACvD,wBAAgB,oBAAoB,CAAC,MAAM,EAAE,YAAY,EAAE,KAAK,EAAE,WAAW,GAAG,OAAO,CAwBtF;AAED;;;;;;;;GAQG;AACH,wBAAgB,kBAAkB,IAAI,OAAO,CAoB5C"}

package/dist/blocks/poetryActions.js

@@ -58,7 +58,12 @@ export function $insertPoetryCouplet(layout, align) {
     const selection = $getSelection();
     if (!$isRangeSelection(selection))
         return false;
-    const anchorTopLevel = selection.anchor.getNode().getTopLevelElementOrThrow();
+    // getTopLevelElement() stops at the nearest shadow root, and a
+    // PoetryBlockNode is one — so from inside an existing couplet it resolves
+    // to the misra paragraph itself, not the couplet. Without this check, a
+    // second insert lands as a sibling of that misra (nested inside the first
+    // couplet) instead of after the couplet as a whole.
+    const anchorTopLevel = $getPoetryBlockFromSelection() ?? selection.anchor.getNode().getTopLevelElementOrThrow();
     const node = $createPoetryBlockNode(layout, align);
     const misraA = $createParagraphNode();
     const misraB = $createParagraphNode();
@@ -74,3 +79,33 @@ export function $insertPoetryCouplet(layout, align) {
     misraA.selectStart();
     return true;
 }
+/**
+ * Enter at the end of a couplet's last misra would otherwise land inside
+ * ParagraphNode's own insertNewAfter — which inserts the new paragraph as a
+ * sibling of the misra, i.e. still inside the couplet (or, for two-column,
+ * inside its LayoutItemNode) — trapping the caret with no way to add a line
+ * after the block. Handled here instead: a plain paragraph after the whole
+ * couplet, focused. Returns false (let normal Enter handling proceed) for
+ * every other caret position, including earlier in the couplet.
+ */
+export function $exitPoetryOnEnter() {
+    const selection = $getSelection();
+    if (!$isRangeSelection(selection) || !selection.isCollapsed())
+        return false;
+    const couplet = $getPoetryBlockFromSelection();
+    if (!couplet)
+        return false;
+    const misras = $getMisraParagraphs(couplet);
+    const lastMisra = misras[misras.length - 1];
+    if (!lastMisra)
+        return false;
+    const anchor = selection.anchor;
+    const lastDesc = lastMisra.getLastDescendant();
+    const isAtEnd = lastDesc ? anchor.key === lastDesc.getKey() && anchor.offset === lastDesc.getTextContentSize() : anchor.key === lastMisra.getKey();
+    if (!isAtEnd)
+        return false;
+    const paragraph = $createParagraphNode();
+    couplet.insertAfter(paragraph);
+    paragraph.select();
+    return true;
+}

package/dist/plugins/PoetryPlugin.d.ts

@@ -6,9 +6,12 @@ export declare const INSERT_POETRY_COUPLET_COMMAND: LexicalCommand<{
 }>;
 /**
  * Registers INSERT_POETRY_COUPLET_COMMAND (mirrors LayoutPlugin/FootnotePlugin's
- * shape) and a node transform that removes a couplet left with no misra
+ * shape), a node transform that removes a couplet left with no misra
  * content — e.g. after undo/paste leaves it structurally empty — rather
- * than letting an unselectable husk linger in the document.
+ * than letting an unselectable husk linger in the document, and a
+ * KEY_ENTER_COMMAND handler (above RichTextPlugin's own, which would
+ * otherwise trap Enter inside the couplet — see poetryActions.ts) that lets
+ * Enter at the end of the last misra add a paragraph after the block.
  */
 export declare function PoetryPlugin(): null;
 //# sourceMappingURL=PoetryPlugin.d.ts.map

package/dist/plugins/PoetryPlugin.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"PoetryPlugin.d.ts","sourceRoot":"","sources":["../../src/plugins/PoetryPlugin.tsx"],"names":[],"mappings":"AAEA,OAAO,EAA0C,KAAK,cAAc,EAAE,MAAM,SAAS,CAAC;AAGtF,OAAO,EAAmB,KAAK,WAAW,EAAE,KAAK,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAG5F,eAAO,MAAM,6BAA6B,EAAE,cAAc,CAAC;IAAE,MAAM,EAAE,YAAY,CAAC;IAAC,KAAK,EAAE,WAAW,CAAA;CAAE,CAEtG,CAAC;AAEF;;;;;GAKG;AACH,wBAAgB,YAAY,SAqB3B"}
+{"version":3,"file":"PoetryPlugin.d.ts","sourceRoot":"","sources":["../../src/plugins/PoetryPlugin.tsx"],"names":[],"mappings":"AAEA,OAAO,EAAoF,KAAK,cAAc,EAAE,MAAM,SAAS,CAAC;AAGhI,OAAO,EAAmB,KAAK,WAAW,EAAE,KAAK,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAG5F,eAAO,MAAM,6BAA6B,EAAE,cAAc,CAAC;IAAE,MAAM,EAAE,YAAY,CAAC;IAAC,KAAK,EAAE,WAAW,CAAA;CAAE,CAEtG,CAAC;AAEF;;;;;;;;GAQG;AACH,wBAAgB,YAAY,SA+B3B"}

package/dist/plugins/PoetryPlugin.js

@@ -1,16 +1,19 @@
 import { useEffect } from 'react';
 import { useLexicalComposerContext } from '@lexical/react/LexicalComposerContext';
-import { COMMAND_PRIORITY_EDITOR, createCommand } from 'lexical';
+import { COMMAND_PRIORITY_EDITOR, COMMAND_PRIORITY_HIGH, KEY_ENTER_COMMAND, createCommand } from 'lexical';
 import { mergeRegister } from '@lexical/utils';
 import { LayoutContainerNode, LayoutItemNode } from '../blocks/LayoutNode.js';
 import { PoetryBlockNode } from '../blocks/PoetryNode.js';
-import { $insertPoetryCouplet } from '../blocks/poetryActions.js';
+import { $exitPoetryOnEnter, $insertPoetryCouplet } from '../blocks/poetryActions.js';
 export const INSERT_POETRY_COUPLET_COMMAND = createCommand('INSERT_POETRY_COUPLET_COMMAND');
 /**
  * Registers INSERT_POETRY_COUPLET_COMMAND (mirrors LayoutPlugin/FootnotePlugin's
- * shape) and a node transform that removes a couplet left with no misra
+ * shape), a node transform that removes a couplet left with no misra
  * content — e.g. after undo/paste leaves it structurally empty — rather
- * than letting an unselectable husk linger in the document.
+ * than letting an unselectable husk linger in the document, and a
+ * KEY_ENTER_COMMAND handler (above RichTextPlugin's own, which would
+ * otherwise trap Enter inside the couplet — see poetryActions.ts) that lets
+ * Enter at the end of the last misra add a paragraph after the block.
  */
 export function PoetryPlugin() {
     const [editor] = useLexicalComposerContext();
@@ -21,7 +24,14 @@ export function PoetryPlugin() {
         return mergeRegister(editor.registerCommand(INSERT_POETRY_COUPLET_COMMAND, ({ layout, align }) => $insertPoetryCouplet(layout, align), COMMAND_PRIORITY_EDITOR), editor.registerNodeTransform(PoetryBlockNode, (node) => {
             if (node.getChildrenSize() === 0)
                 node.remove();
-        }));
+        }), editor.registerCommand(KEY_ENTER_COMMAND, (event) => {
+            if (event?.shiftKey)
+                return false; // Shift+Enter stays a plain line break
+            const handled = $exitPoetryOnEnter();
+            if (handled)
+                event?.preventDefault();
+            return handled;
+        }, COMMAND_PRIORITY_HIGH));
     }, [editor]);
     return null;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@inshapardaz/likhari-react",
-  "version": "0.1.18-dev.130",
+  "version": "0.1.18-dev.134",
   "description": "React implementation of the Likhari editor, built on @lexical/react.",
   "license": "MIT",
   "repository": {