buninu-browser 0.3.0 → 0.5.0

package/lib/layout/text-layout.js

@@ -236,9 +236,9 @@ function blockChildren(node, flags) {
       children.push(buildBox(child, inheritedFlags(child, childFlags)));
       for (const open of openInlines) items.push({ kind: "open", node: open, style: open.style ?? null });
     } else if (child.type === "image") {
-      items.push({ kind: "image", node: child });
+      items.push({ kind: "image", node: child, wrap:childFlags.wrap });
     } else if (isAtomic(child)) {
-      items.push({ kind: "atomic", node: child, box: buildBox(child, inheritedFlags(child, childFlags)) });
+      items.push({ kind: "atomic", node: child, wrap:childFlags.wrap, box: buildBox(child, inheritedFlags(child, childFlags)) });
     } else {
       items.push({ kind: "open", node: child, style: child.style ?? null });
       openInlines.push(child);
@@ -2117,11 +2117,13 @@ function buildParagraph(ctx, ifc) {
       let value = String(item.text).replace(/\r\n?/g, "\n");
       if (item.preserve) {
         const pieces = value.split("\n");
+        let sourceStart=0;
         pieces.forEach((piece, index) => {
           if (index > 0) forced.set(text.length, (forced.get(text.length) ?? 0) + 1);
           if (piece) {
-            pushRun({ kind: "text", nodeId: item.node.id, style: item.style, collapsible: false, wrap: item.wrap }, piece);
+            pushRun({ kind: "text", nodeId: item.node.id, style: item.style, collapsible: false, wrap: item.wrap, sourceStart }, piece);
           }
+          sourceStart+=piece.length+1;
         });
         afterSpace = false;
       } else {
@@ -2137,7 +2139,7 @@ function buildParagraph(ctx, ifc) {
       forced.set(text.length, (forced.get(text.length) ?? 0) + 1);
       afterSpace = true;
     } else if (item.kind === "image" || item.kind === "atomic") {
-      pushRun({ kind: item.kind, nodeId: item.node.id, style: item.node.style ?? null, node: item.node, box: item.box, wrap: true }, "");
+      pushRun({ kind: item.kind, nodeId: item.node.id, style: item.node.style ?? null, node: item.node, box: item.box, wrap: item.wrap!==false }, "");
       afterSpace = false;
     }
   }
@@ -2158,7 +2160,7 @@ function buildParagraph(ctx, ifc) {
     const end = index + segment.length;
     if (!run) continue;
     if (run.collapsible && run.wrap && segment === " ") opportunities.add(end);
-    else if (run.kind === "image" || run.kind === "atomic") {
+    else if (run.wrap && (run.kind === "image" || run.kind === "atomic")) {
       opportunities.add(index);
       opportunities.add(end);
     } else if (run.wrap && run.kind === "text" && (Bun.stringWidth(segment) > 1 || (!run.collapsible && segment === " "))) {
@@ -2404,7 +2406,7 @@ function placeLine(ctx, ifc, paragraph, line, x, width, y, atomFor) {
       ascent = Math.max(ascent, atomAscent);
       descent = Math.max(descent, atom.marginTop + atom.height + atom.marginBottom - atomAscent);
     } else {
-      segment.metrics = textMetrics(ctx, run.style);
+      segment.metrics = textMetrics(ctx, run.style, paragraph.text.slice(segment.start,segment.end));
       ascent = Math.max(ascent, segment.metrics.ascent);
       descent = Math.max(descent, segment.metrics.descent);
     }
@@ -2461,6 +2463,7 @@ function placeLine(ctx, ifc, paragraph, line, x, width, y, atomFor) {
     const common = {
       nodeId: run.nodeId,
       text: run.kind === "text" ? paragraph.text.slice(segment.start, segment.end) : "",
+      sourceStart:(run.sourceStart??0)+segment.start-run.start,
       start: segment.start - line.start,
       end: segment.end - line.start,
       style: run.style ?? style,
@@ -2598,8 +2601,8 @@ function measureAtomic(ctx, box, availableWidth) {
   };
 }
 
-function textMetrics(ctx, style) {
-  const font = ctx.metrics(style);
+function textMetrics(ctx, style, text = null) {
+  const font = ctx.metrics(style,text);
   // `line-height: normal` (null) uses the font's own content height.
   const lineHeight = ctx.lineHeight ?? (style ? style.lineHeight ?? font.height : ctx.fallbackLineHeight);
   const halfLeading = (lineHeight - font.height) / 2;
@@ -2668,7 +2671,12 @@ function cachedMetrics(fontMetrics) {
     }
     return metrics;
   };
-  return (style) => {
+  return (style,text=null) => {
+    // Fallback fonts can be taller than the Latin strut. Use the same glyphs
+    // measured for this run rather than assuming every character uses "Hg".
+    if(text && /[^\x00-\x7f]/.test(text) && typeof fontMetrics==='function') {
+      const measured=fontMetrics(style,text);if(measured?.height>0)return measured;
+    }
     if (style === null || typeof style !== "object") return metricsFor(style);
     let metrics = byStyle.get(style);
     if (!metrics) byStyle.set(style, metrics = metricsFor(style));

package/lib/paint/display-list.js

@@ -193,6 +193,9 @@ export function buildDisplayList(layout, tree = null, resources = null, backgrou
         rect: effect.transform ? transformRect(effect.transform, hitRect) : hitRect,
         clipRect: effect.clipRect,
         fixed: effect.fixed,
+        // Preserve text geometry for form-control caret hit testing, including
+        // whitespace runs which intentionally have no painted glyphs.
+        ...(run.type !== 'image'?{textRun:run,transform:effect.transform}:{}),
       });
       reach(effect, hitRect);
       paintRun(fragment, run);
@@ -234,6 +237,8 @@ export function buildDisplayList(layout, tree = null, resources = null, backgrou
         op: "drawText",
         nodeId: run.nodeId,
         text: run.text,
+        textWidth: run.width,
+        sourceStart: run.sourceStart ?? 0,
         x: run.x,
         y,
         font: {
@@ -411,7 +416,7 @@ function paintEffects(layout, tree, scrollOffsetOf = null) {
               radii = insetRadii(radii, style.borderWidths ?? [0, 0, 0, 0]);
             }
             clips.push([node, clip, radii]);
-            if (isScroller(style)) {
+            if (isScroller(style) && boxes.has(node.id)) {
               if (!scrolledBy.size) outOfFlow = positionedOut;
               scrolledBy.add(node);
             }