@astryxdesign/core 0.4.6 → 0.4.7-canary.20bae6c

package/dist/Lightbox/Lightbox.js

@@ -12,6 +12,7 @@
  * - /packages/core/src/Lightbox/Lightbox.doc.mjs (props table, features, implementation notes)
  * - /packages/core/src/Lightbox/Lightbox.test.tsx (tests for new/changed behavior)
  * - /packages/core/src/Lightbox/index.ts (exports if types change)
+ * - /packages/core/src/Layer/useLayerDismissal.ts (dismissal stack)
  * - /apps/storybook/stories/Lightbox.stories.tsx (storybook stories)
  * - /packages/cli/assets/templates/blocks/components/Lightbox/ (showcase blocks)
  */
@@ -24,12 +25,14 @@ import { IconButton } from "../IconButton/index.js";
 import { useAnnounce } from "../hooks/useAnnounce.js";
 import { useScrollLock } from "../hooks/useScrollLock.js";
 import { useIsomorphicLayoutEffect } from "../hooks/useIsomorphicLayoutEffect.js";
-import { mergeProps, mergeRefs, rtlStyles } from "../utils/index.js";
+import { mergeProps, rtlStyles } from "../utils/index.js";
 import { themeProps } from "../utils/themeProps.js";
 import { focusOutlineStyles } from "../utils/focusOutline.stylex.js";
 import { overlayPaddingReset } from "../Layout/padding.stylex.js";
+import { LayerDepthProvider } from "../Layer/LayerDepthContext.js";
+import { useLayerDismissal } from "../Layer/useLayerDismissal.js";
 import { useTranslator } from "../i18n/index.js";
-
+import { useMergedRefs } from "../hooks/useMergedRefs.js";
 /**
  * Media type for lightbox items.
  */
@@ -198,6 +201,7 @@ export function Lightbox({
 }) {
   const t = useTranslator();
   const dialogRef = useRef(null);
+  const mergedDialogRef = useMergedRefs(ref, dialogRef);
   const containerRef = useRef(null);
   const imageWrapperRef = useRef(null);
   const triggerElementRef = useRef(null);
@@ -299,12 +303,28 @@ export function Lightbox({
   const handleClose = useCallback(() => {
     onOpenChange(false);
   }, [onOpenChange]);
+  const {
+    shouldDismissOnCloseRequest
+  } = useLayerDismissal({
+    isActive: isOpen,
+    onDismiss: handleClose
+  });
 
-  // Escape key
+  // The native `cancel` event is the browser's own close-watcher firing: an
+  // Android back gesture, or a close request the stack never saw a press for.
+  // Escape presses the stack owns never arrive here — it preventDefault()s
+  // those, which suppresses the close watcher.
+  //
+  // Always preventDefault so the browser cannot close a controlled <dialog>
+  // behind React's back, then answer with the stack's own rules: top-most
+  // only, and never while an IME composition is in progress.
   const handleCancel = useCallback(e => {
     e.preventDefault();
+    if (!shouldDismissOnCloseRequest()) {
+      return;
+    }
     handleClose();
-  }, [handleClose]);
+  }, [handleClose, shouldDismissOnCloseRequest]);
 
   // Backdrop click. The layout container fills the whole transparent dialog,
   // so clicks on the visual backdrop (the dark area around the media) land on
@@ -438,7 +458,7 @@ export function Lightbox({
     return null;
   }
   return /*#__PURE__*/_jsx("dialog", {
-    ref: mergeRefs(ref, dialogRef),
+    ref: mergedDialogRef,
     onCancel: handleCancel,
     onClick: e => {
       handleBackdropClick(e);
@@ -451,88 +471,90 @@ export function Lightbox({
     "aria-label": currentItem.alt || t('@astryx.lightbox.mediaViewer'),
     ...mergeProps(themeProps('lightbox'), stylex.props(styles.dialog, overlayPaddingReset.reset, xstyle), className, style),
     ...props,
-    children: /*#__PURE__*/_jsxs("div", {
-      ref: containerRef,
-      ...{
-        className: "x78zum5 xdt5ytf x6s0dn4 xl56j7k xh8yej3 x5yr21d x1n2onr6"
-      },
-      children: [/*#__PURE__*/_jsx(IconButton, {
-        icon: /*#__PURE__*/_jsx(Icon, {
-          icon: "close",
-          size: "sm",
-          color: "inherit"
-        }),
-        label: t('@astryx.lightbox.close'),
-        variant: "ghost",
-        onClick: handleClose,
-        xstyle: [styles.closeButton, styles.controlButton]
-      }), isGallery && /*#__PURE__*/_jsx(IconButton, {
-        icon: /*#__PURE__*/_jsx(Icon, {
-          icon: "chevronLeft",
-          size: "sm",
-          color: "inherit",
-          xstyle: rtlStyles.mirror
-        }),
-        label: t('@astryx.lightbox.previous'),
-        variant: "ghost",
-        isDisabled: !canPrev,
-        onClick: goToPrev,
-        xstyle: [styles.navButton, styles.navPrev, styles.controlButton]
-      }), /*#__PURE__*/_jsxs("div", {
+    children: /*#__PURE__*/_jsx(LayerDepthProvider, {
+      children: /*#__PURE__*/_jsxs("div", {
+        ref: containerRef,
         ...{
-          className: "x78zum5 xdt5ytf x6s0dn4 x193iq5w xmz0i5r xb3r6kr"
+          className: "x78zum5 xdt5ytf x6s0dn4 xl56j7k xh8yej3 x5yr21d x1n2onr6"
         },
-        children: [/*#__PURE__*/_jsx("div", {
-          ref: imageWrapperRef
-          // The wrapper is a keyboard-operable zoom toggle when zoom is
-          // enabled: Enter/Space toggles, aria-pressed reflects state.
-          ,
-          role: isZoomTarget ? 'button' : undefined,
-          tabIndex: isZoomTarget ? 0 : undefined,
-          "aria-pressed": isZoomTarget ? isZoomed : undefined,
-          "aria-label": isZoomTarget ? t('@astryx.lightbox.zoom') : undefined,
-          ...stylex.props(styles.imageWrapper, isZoomTarget && focusOutlineStyles.focusVisible, !isVideo && hasZoom && !isZoomed && styles.imageWrapperZoomable, !isVideo && isZoomed && styles.imageWrapperZoomed, !isVideo && isDragging && styles.imageWrapperDragging),
-          onDoubleClick: isVideo ? undefined : handleDoubleClick,
-          onKeyDown: isZoomTarget ? handleImageKeyDown : undefined,
-          onPointerDown: isVideo ? undefined : handlePointerDown,
-          children: isVideo ? /*#__PURE__*/_jsx("video", {
-            src: currentItem.src,
-            "aria-label": currentItem.alt,
-            controls: true,
-            autoPlay: hasAutoPlay,
+        children: [/*#__PURE__*/_jsx(IconButton, {
+          icon: /*#__PURE__*/_jsx(Icon, {
+            icon: "close",
+            size: "sm",
+            color: "inherit"
+          }),
+          label: t('@astryx.lightbox.close'),
+          variant: "ghost",
+          onClick: handleClose,
+          xstyle: [styles.closeButton, styles.controlButton]
+        }), isGallery && /*#__PURE__*/_jsx(IconButton, {
+          icon: /*#__PURE__*/_jsx(Icon, {
+            icon: "chevronLeft",
+            size: "sm",
+            color: "inherit",
+            xstyle: rtlStyles.mirror
+          }),
+          label: t('@astryx.lightbox.previous'),
+          variant: "ghost",
+          isDisabled: !canPrev,
+          onClick: goToPrev,
+          xstyle: [styles.navButton, styles.navPrev, styles.controlButton]
+        }), /*#__PURE__*/_jsxs("div", {
+          ...{
+            className: "x78zum5 xdt5ytf x6s0dn4 x193iq5w xmz0i5r xb3r6kr"
+          },
+          children: [/*#__PURE__*/_jsx("div", {
+            ref: imageWrapperRef
+            // The wrapper is a keyboard-operable zoom toggle when zoom is
+            // enabled: Enter/Space toggles, aria-pressed reflects state.
+            ,
+            role: isZoomTarget ? 'button' : undefined,
+            tabIndex: isZoomTarget ? 0 : undefined,
+            "aria-pressed": isZoomTarget ? isZoomed : undefined,
+            "aria-label": isZoomTarget ? t('@astryx.lightbox.zoom') : undefined,
+            ...stylex.props(styles.imageWrapper, isZoomTarget && focusOutlineStyles.focusVisible, !isVideo && hasZoom && !isZoomed && styles.imageWrapperZoomable, !isVideo && isZoomed && styles.imageWrapperZoomed, !isVideo && isDragging && styles.imageWrapperDragging),
+            onDoubleClick: isVideo ? undefined : handleDoubleClick,
+            onKeyDown: isZoomTarget ? handleImageKeyDown : undefined,
+            onPointerDown: isVideo ? undefined : handlePointerDown,
+            children: isVideo ? /*#__PURE__*/_jsx("video", {
+              src: currentItem.src,
+              "aria-label": currentItem.alt,
+              controls: true,
+              autoPlay: hasAutoPlay,
+              ...{
+                className: "x193iq5w xmz0i5r x19kjcj4 x1a2a7pz"
+              }
+            }) : /*#__PURE__*/_jsx("img", {
+              src: currentItem.src,
+              alt: currentItem.alt,
+              draggable: false,
+              ...stylex.props(styles.image, isDragging && styles.imageDragging, imageTransform != null && dynamicStyles.imageTransform(imageTransform))
+            })
+          }), currentItem.caption && /*#__PURE__*/_jsx("div", {
             ...{
-              className: "x193iq5w xmz0i5r x19kjcj4 x1a2a7pz"
-            }
-          }) : /*#__PURE__*/_jsx("img", {
-            src: currentItem.src,
-            alt: currentItem.alt,
-            draggable: false,
-            ...stylex.props(styles.image, isDragging && styles.imageDragging, imageTransform != null && dynamicStyles.imageTransform(imageTransform))
-          })
-        }), currentItem.caption && /*#__PURE__*/_jsx("div", {
+              className: "x9e3rv5 x18juvz8 xf74fhv x2b8uid x1xye8es x18d9i69 xrrkdod xrlsmeg x2lah0s"
+            },
+            children: currentItem.caption
+          })]
+        }), isGallery && /*#__PURE__*/_jsx(IconButton, {
+          icon: /*#__PURE__*/_jsx(Icon, {
+            icon: "chevronRight",
+            size: "sm",
+            color: "inherit",
+            xstyle: rtlStyles.mirror
+          }),
+          label: t('@astryx.lightbox.next'),
+          variant: "ghost",
+          isDisabled: !canNext,
+          onClick: goToNext,
+          xstyle: [styles.navButton, styles.navNext, styles.controlButton]
+        }), isGallery && mediaArray.length > 1 && /*#__PURE__*/_jsxs("div", {
           ...{
-            className: "x9e3rv5 x18juvz8 xf74fhv x2b8uid x1xye8es x18d9i69 xrrkdod xrlsmeg x2lah0s"
+            className: "x10l6tqk xyx6v2t x1ybfrjj x9e3rv5 xjm74w1 xw6l6zx x1vjfegm"
           },
-          children: currentItem.caption
+          children: [index + 1, " / ", mediaArray.length]
         })]
-      }), isGallery && /*#__PURE__*/_jsx(IconButton, {
-        icon: /*#__PURE__*/_jsx(Icon, {
-          icon: "chevronRight",
-          size: "sm",
-          color: "inherit",
-          xstyle: rtlStyles.mirror
-        }),
-        label: t('@astryx.lightbox.next'),
-        variant: "ghost",
-        isDisabled: !canNext,
-        onClick: goToNext,
-        xstyle: [styles.navButton, styles.navNext, styles.controlButton]
-      }), isGallery && mediaArray.length > 1 && /*#__PURE__*/_jsxs("div", {
-        ...{
-          className: "x10l6tqk xyx6v2t x1ybfrjj x9e3rv5 xjm74w1 xw6l6zx x1vjfegm"
-        },
-        children: [index + 1, " / ", mediaArray.length]
-      })]
+      })
     })
   });
 }

package/dist/Markdown/index.d.ts

@@ -6,5 +6,5 @@
 export { Markdown } from './Markdown';
 export type { MarkdownProps, MarkdownSource, MarkdownComponents, MarkdownInlinePlugin, } from './Markdown';
 export { parseMarkdown, parseMarkdownIncremental, createIncrementalState, parseInline, } from './parser';
-export type { BlockNode, InlineNode, ListItemNode, TableCellNode, TableAlignment, IncrementalState as IncrementalParseState, } from './parser';
+export type { BlockNode, InlineNode, SourceRange, ListItemNode, TableCellNode, TableAlignment, IncrementalState as IncrementalParseState, } from './parser';
 //# sourceMappingURL=index.d.ts.map

package/dist/Markdown/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/Markdown/index.ts"],"names":[],"mappings":"AAIA;;;;GAIG;AAEH,OAAO,EAAC,QAAQ,EAAC,MAAM,YAAY,CAAC;AACpC,YAAY,EACV,aAAa,EACb,cAAc,EACd,kBAAkB,EAClB,oBAAoB,GACrB,MAAM,YAAY,CAAC;AAEpB,OAAO,EACL,aAAa,EACb,wBAAwB,EACxB,sBAAsB,EACtB,WAAW,GACZ,MAAM,UAAU,CAAC;AAClB,YAAY,EACV,SAAS,EACT,UAAU,EACV,YAAY,EACZ,aAAa,EACb,cAAc,EACd,gBAAgB,IAAI,qBAAqB,GAC1C,MAAM,UAAU,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/Markdown/index.ts"],"names":[],"mappings":"AAIA;;;;GAIG;AAEH,OAAO,EAAC,QAAQ,EAAC,MAAM,YAAY,CAAC;AACpC,YAAY,EACV,aAAa,EACb,cAAc,EACd,kBAAkB,EAClB,oBAAoB,GACrB,MAAM,YAAY,CAAC;AAEpB,OAAO,EACL,aAAa,EACb,wBAAwB,EACxB,sBAAsB,EACtB,WAAW,GACZ,MAAM,UAAU,CAAC;AAClB,YAAY,EACV,SAAS,EACT,UAAU,EACV,WAAW,EACX,YAAY,EACZ,aAAa,EACb,cAAc,EACd,gBAAgB,IAAI,qBAAqB,GAC1C,MAAM,UAAU,CAAC"}

package/dist/Markdown/parser.d.ts

@@ -35,7 +35,14 @@ export type InlineNode = {
 } | {
     type: 'break';
 };
-export type BlockNode = {
+export type BlockNode = BlockNodeKind & {
+    /**
+     * Where this block came from in the source, when parsed with the
+     * `sourceRanges` option. Top-level blocks only.
+     */
+    range?: SourceRange;
+};
+type BlockNodeKind = {
     type: 'heading';
     level: 1 | 2 | 3 | 4 | 5 | 6;
     children: InlineNode[];
@@ -69,6 +76,19 @@ export type BlockNode = {
     src: string;
     alt: string;
 };
+/**
+ * Where a block sits in the source string handed to `parseMarkdown`:
+ * `source.slice(start, end)` is the block, and `end` excludes the block's
+ * trailing blank lines.
+ *
+ * An object rather than a `[start, end]` tuple so a second way of addressing
+ * the same block — line numbers, once a consumer needs them — can be added as
+ * optional fields without breaking anyone.
+ */
+export type SourceRange = {
+    readonly start: number;
+    readonly end: number;
+};
 export type ListItemNode = {
     checked?: boolean;
     children: BlockNode[];
@@ -100,6 +120,16 @@ export type ParseOptions = {
      * suffix is not rejected (Astryx accepts any plausible TLD shape).
      */
     autolink?: 'gfm';
+    /**
+     * When true, every top-level block carries a `range` — the offsets it
+     * occupies in the string passed in. Lets a consumer that still holds the
+     * source slice the original markdown for a block instead of reconstructing
+     * it from the parsed node (or from the rendered DOM). Off by default: the
+     * field is absent unless asked for, so nothing that compares nodes changes.
+     *
+     * Blocks nested inside a list item or a blockquote do not carry one.
+     */
+    sourceRanges?: boolean;
 };
 export declare function parseInline(text: string, sourceIds?: ReadonlySet<string>): InlineNode[];
 export declare function parseInline(text: string, options: ParseOptions): InlineNode[];
@@ -117,6 +147,12 @@ export interface IncrementalState {
      * with newly-arriving content.
      */
     autolink?: 'gfm';
+    /**
+     * The `sourceRanges` option the cached `settledBlocks` were parsed with.
+     * Flipping it invalidates them the same way `autolink` does: they either
+     * lack the ranges the caller now asks for, or carry ones it did not.
+     */
+    sourceRanges?: boolean;
     /**
      * Signature of the link reference definitions the cached `settledBlocks`
      * were parsed with. Definitions are document-global and typically arrive
@@ -143,4 +179,5 @@ export declare function slugify(value: string): string;
  * document shares a single numbering sequence.
  */
 export declare function uniqueSlug(baseSlug: string, counts: Map<string, number>): string;
+export {};
 //# sourceMappingURL=parser.d.ts.map

package/dist/Markdown/parser.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"parser.d.ts","sourceRoot":"","sources":["../../src/Markdown/parser.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"parser.d.ts","sourceRoot":"","sources":["../../src/Markdown/parser.ts"],"names":[],"mappings":"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"}

package/dist/Markdown/parser.js

@@ -13,6 +13,16 @@
 // Types
 // ---------------------------------------------------------------------------
 
+/**
+ * Where a block sits in the source string handed to `parseMarkdown`:
+ * `source.slice(start, end)` is the block, and `end` excludes the block's
+ * trailing blank lines.
+ *
+ * An object rather than a `[start, end]` tuple so a second way of addressing
+ * the same block — line numbers, once a consumer needs them — can be added as
+ * optional fields without breaking anyone.
+ */
+
 // ---------------------------------------------------------------------------
 // Parse options
 // ---------------------------------------------------------------------------
@@ -47,7 +57,8 @@ function resolveOptions(arg) {
   const opts = arg;
   return {
     sourceIds: opts.sourceIds,
-    autolink: opts.autolink
+    autolink: opts.autolink,
+    sourceRanges: opts.sourceRanges
   };
 }
 
@@ -168,10 +179,17 @@ function extractLinkDefinitions(input) {
       cleaned: input
     };
   }
-  const cleaned = lines.filter((_, index) => keep[index]).join('\n');
+  const lineMap = [];
+  for (let index = 0; index < lines.length; index++) {
+    if (keep[index]) {
+      lineMap.push(index);
+    }
+  }
+  const cleaned = lineMap.map(index => lines[index]).join('\n');
   return {
     defs,
-    cleaned
+    cleaned,
+    lineMap
   };
 }
 
@@ -965,6 +983,19 @@ function isTableSeparator(line) {
   return nonEmpty.length > 0 && nonEmpty.every(cell => /^:?-+:?$/.test(cell));
 }
 
+/**
+ * The same options for content parsed out of an enclosing block. Ranges are a
+ * top-level contract: a list item's or a blockquote's children are parsed from
+ * text the caller reassembled (markers and `>` prefixes stripped), so an
+ * offset into it would not address the document.
+ */
+function nested(opts) {
+  return opts.sourceRanges ? {
+    ...opts,
+    sourceRanges: false
+  } : opts;
+}
+
 /**
  * Returns true when a line could start a new block — used to stop paragraph
  * continuation.  Every regex here uses bounded or single-class quantifiers
@@ -1095,7 +1126,7 @@ function parseList(lines, startIndex, ordered, opts) {
     }
     items.push({
       checked,
-      children: parseMarkdownImpl(itemText, opts)
+      children: parseMarkdownImpl(itemText, nested(opts))
     });
 
     // CommonMark loose list: blank line(s) between items of the same style
@@ -1140,7 +1171,8 @@ function parseMarkdownImpl(input, baseOpts) {
   // parse.
   const {
     defs,
-    cleaned
+    cleaned,
+    lineMap
   } = extractLinkDefinitions(input);
   const inherited = baseOpts.linkDefs;
   let linkDefs;
@@ -1157,8 +1189,22 @@ function parseMarkdownImpl(input, baseOpts) {
   } : baseOpts;
   const lines = cleaned.split('\n');
   const blocks = [];
+  // The line each block started on, parallel to `blocks`. Only collected when
+  // ranges were asked for; a block's end is resolved after the loop, since the
+  // branch that produced it has already moved `index` past whatever it read.
+  const blockStartLines = opts.sourceRanges ? [] : null;
+  // Set only by a block that consumes blank lines as content, where the
+  // positional end derivation would trim them away.
+  const blockEndLines = opts.sourceRanges ? [] : null;
+  let blockStartLine = 0;
+  const pushBlock = (node, endLine) => {
+    blocks.push(node);
+    blockStartLines?.push(blockStartLine);
+    blockEndLines?.push(endLine);
+  };
   let index = 0;
   while (index < lines.length) {
+    blockStartLine = index;
     const line = lines[index];
     if (line.trim() === '') {
       index++;
@@ -1177,18 +1223,21 @@ function parseMarkdownImpl(input, baseOpts) {
         index++;
       }
       index++; // skip closing fence
-      blocks.push({
+      // A fence owns its blank lines, and an unterminated one (mid-stream)
+      // can end on them, so it states its own end rather than letting the
+      // positional derivation trim them off.
+      pushBlock({
         type: 'codeblock',
         language,
         content: codeLines.join('\n')
-      });
+      }, Math.min(index, lines.length) - 1);
       continue;
     }
 
     // --- Heading ---
     const headingMatch = line.match(/^(#{1,6}) +(.*)/);
     if (headingMatch) {
-      blocks.push({
+      pushBlock({
         type: 'heading',
         level: headingMatch[1].length,
         children: parseInlineEntry(headingMatch[2], opts)
@@ -1199,7 +1248,7 @@ function parseMarkdownImpl(input, baseOpts) {
 
     // --- HR (must precede list check to handle `- - -`, `* * *`, `_ _ _`) ---
     if (isHorizontalRule(line)) {
-      blocks.push({
+      pushBlock({
         type: 'hr'
       });
       index++;
@@ -1209,7 +1258,7 @@ function parseMarkdownImpl(input, baseOpts) {
     // --- Standalone image ---
     const imageMatch = line.match(/^!\[([^\]]*)\]\(([^)]+)\)/);
     if (imageMatch && line.trim() === imageMatch[0]) {
-      blocks.push({
+      pushBlock({
         type: 'image',
         alt: imageMatch[1],
         src: imageMatch[2]
@@ -1221,7 +1270,7 @@ function parseMarkdownImpl(input, baseOpts) {
     // --- Table (with or without leading pipe) ---
     if (index + 1 < lines.length && line.includes('|') && isTableSeparator(lines[index + 1])) {
       const tableResult = parseTable(lines, index, opts);
-      blocks.push(tableResult.node);
+      pushBlock(tableResult.node);
       index = tableResult.nextIndex;
       continue;
     }
@@ -1233,9 +1282,9 @@ function parseMarkdownImpl(input, baseOpts) {
         quoteLines.push(lines[index].replace(/^> ?/, ''));
         index++;
       }
-      blocks.push({
+      pushBlock({
         type: 'blockquote',
-        children: parseMarkdownImpl(quoteLines.join('\n'), opts)
+        children: parseMarkdownImpl(quoteLines.join('\n'), nested(opts))
       });
       continue;
     }
@@ -1243,7 +1292,7 @@ function parseMarkdownImpl(input, baseOpts) {
     // --- Unordered list ---
     if (/^ {0,9}[-*+] /.test(line)) {
       const listResult = parseList(lines, index, false, opts);
-      blocks.push(listResult.node);
+      pushBlock(listResult.node);
       index = listResult.nextIndex;
       continue;
     }
@@ -1251,7 +1300,7 @@ function parseMarkdownImpl(input, baseOpts) {
     // --- Ordered list ---
     if (/^ {0,9}\d+[.)] /.test(line)) {
       const listResult = parseList(lines, index, true, opts);
-      blocks.push(listResult.node);
+      pushBlock(listResult.node);
       index = listResult.nextIndex;
       continue;
     }
@@ -1263,14 +1312,63 @@ function parseMarkdownImpl(input, baseOpts) {
       paraLines.push(lines[index]);
       index++;
     }
-    blocks.push({
+    pushBlock({
       type: 'paragraph',
       children: parseInlineEntry(paraLines.join('\n'), opts)
     });
   }
+  if (blockStartLines != null) {
+    stampSourceRanges(blocks, blockStartLines, blockEndLines ?? [], lines, lineMap, input, opts);
+  }
   return blocks;
 }
 
+/**
+ * Give each block the offsets it occupies in the original input.
+ *
+ * Blocks are contiguous and in source order, so a block runs from its own
+ * first line to the line before the next block starts, minus the blank lines
+ * between them. Offsets are computed against the *input*, not the text the
+ * block loop saw: link reference definitions are stripped before parsing, and
+ * `lineMap` says which input line each surviving line came from.
+ */
+function stampSourceRanges(blocks, blockStartLines, blockEndLines, lines, lineMap, input, opts) {
+  const base = opts.baseOffset ?? 0;
+  // Offset of the first character of every line of the input.
+  const inputLineStarts = [0];
+  for (let i = 0; i < input.length; i++) {
+    if (input[i] === '\n') {
+      inputLineStarts.push(i + 1);
+    }
+  }
+  // Stripping removes whole lines and never edits one, so a parsed line's
+  // length is its input line's length.
+  const lineStart = line => base + inputLineStarts[lineMap != null ? lineMap[line] : line];
+  for (let i = 0; i < blocks.length; i++) {
+    const startLine = blockStartLines[i];
+    let endLine = blockEndLines[i];
+    if (endLine == null) {
+      const nextStart = i + 1 < blocks.length ? blockStartLines[i + 1] : lines.length;
+      endLine = nextStart - 1;
+      while (endLine > startLine && lines[endLine].trim() === '') {
+        endLine--;
+      }
+    }
+    // Exactly the block's own lines, verbatim — a CRLF document's trailing
+    // `\r` included, since the parser reads it as part of the line too and a
+    // range that dropped it would slice to something that re-parses
+    // differently.
+    const end = lineStart(endLine) + lines[endLine].length;
+    blocks[i] = {
+      ...blocks[i],
+      range: {
+        start: lineStart(startLine),
+        end
+      }
+    };
+  }
+}
+
 // ---------------------------------------------------------------------------
 // Incremental parsing
 // ---------------------------------------------------------------------------
@@ -1532,6 +1630,18 @@ function trimUnsettledStructural(text) {
   return lines.join('\n');
 }
 
+/**
+ * The same options, for parsing a slice that starts at `offset` of the
+ * document — so the slice's blocks report ranges into the whole document
+ * rather than into the slice.
+ */
+function atOffset(opts, offset) {
+  return opts.sourceRanges ? {
+    ...opts,
+    baseOffset: offset
+  } : opts;
+}
+
 /**
  * Concatenate freshly-parsed delta blocks with previously-settled blocks,
  * merging adjacent same-style lists into a single loose list. The boundary
@@ -1552,7 +1662,15 @@ function mergeSettledBlocks(prev, delta) {
       start: prevLast.start,
       delimiter: prevLast.delimiter,
       loose: true,
-      items: [...prevLast.items, ...deltaFirst.items]
+      items: [...prevLast.items, ...deltaFirst.items],
+      // One list now, so one range: from where the first half started to
+      // where the second half ended.
+      ...(prevLast.range != null && deltaFirst.range != null ? {
+        range: {
+          start: prevLast.range.start,
+          end: deltaFirst.range.end
+        }
+      } : null)
     };
     return [...prev.slice(0, -1), merged, ...delta.slice(1)];
   }
@@ -1560,15 +1678,16 @@ function mergeSettledBlocks(prev, delta) {
 }
 export function parseMarkdownIncremental(input, state, arg) {
   const opts = resolveOptions(arg);
-  // Invalidate cache when the autolink option flips — cached settled blocks
-  // were parsed with the previous setting and would otherwise be reused
-  // unchanged.
-  if (state.autolink !== opts.autolink) {
+  // Invalidate cache when the autolink or sourceRanges option flips — cached
+  // settled blocks were parsed with the previous setting and would otherwise
+  // be reused unchanged.
+  if (state.autolink !== opts.autolink || Boolean(state.sourceRanges) !== Boolean(opts.sourceRanges)) {
     state.prevInput = '';
     state.settledText = '';
     state.settledBlocks = [];
     state.settledUpTo = 0;
     state.autolink = opts.autolink;
+    state.sourceRanges = opts.sourceRanges;
   }
   if (input === '') {
     state.prevInput = '';
@@ -1615,13 +1734,20 @@ export function parseMarkdownIncremental(input, state, arg) {
   } else if (state.settledText.length > 0 && settledText.startsWith(state.settledText)) {
     // Settled portion grew — parse only the new delta
     const delta = settledText.slice(state.settledText.length);
-    const deltaBlocks = parseMarkdownImpl(delta, parseOpts);
+    const deltaBlocks = parseMarkdownImpl(delta, atOffset(parseOpts, state.settledText.length));
     settledBlocks = mergeSettledBlocks(state.settledBlocks, deltaBlocks);
   } else {
     // Content before the boundary changed — full re-parse of settled portion
     settledBlocks = parseMarkdownImpl(settledText, parseOpts);
   }
-  const unsettledBlocks = unsettledText ? parseMarkdownImpl(unsettledText, parseOpts) : [];
+
+  // The unsettled tail is trimmed before parsing, so its offset in the
+  // document is where that trimmed text actually starts — not the boundary,
+  // which is a line index. If it somehow can't be located, parse it without
+  // ranges rather than report wrong ones. Only worth searching for when
+  // ranges were asked for: this runs on every streamed chunk.
+  const unsettledStart = unsettledText && opts.sourceRanges ? input.indexOf(unsettledText, settledText.length) : -1;
+  const unsettledBlocks = unsettledText ? parseMarkdownImpl(unsettledText, unsettledStart >= 0 ? atOffset(parseOpts, unsettledStart) : nested(parseOpts)) : [];
   state.settledText = settledText;
   state.settledBlocks = settledBlocks;
   state.settledUpTo = boundary;