Open-source Grok Bot alternative for named AI teammates. Local-first desktop, web, and mobile clients with per-bot tools, instructions, and memory. Independent fork of T3 Code.
fix(mobile): extend blockquotes across wrapped lines (#6482)
Chris Deemingfd51561b4e2d
diff --git a/apps/mobile/modules/t3-markdown-text/src/NativeMarkdownBlock.ios.tsx b/apps/mobile/modules/t3-markdown-text/src/NativeMarkdownBlock.ios.tsxindex e6a045b3c..5fbe6d4df 100644--- a/apps/mobile/modules/t3-markdown-text/src/NativeMarkdownBlock.ios.tsx+++ b/apps/mobile/modules/t3-markdown-text/src/NativeMarkdownBlock.ios.tsx@@ -4,16 +4,13 @@ import type { MarkdownNode } from "react-native-nitro-markdown/headless";import { CopyTextButton } from "./CopyTextButton";import { MarkdownTextPrimitive } from "./MarkdownTextPrimitive";-import {- nativeMarkdownDocumentRuns,- nativeMarkdownListItemBlocks,- nativeMarkdownTextRuns,-} from "./nativeMarkdownText";+import { nativeMarkdownDocumentRuns, nativeMarkdownListItemBlocks } from "./nativeMarkdownText";import { NativeMarkdownSelectableText } from "./NativeMarkdownSelectableText.ios";import type {MarkdownCodeHighlighter,MarkdownHighlightedToken,NativeMarkdownTextStyle,+ SelectableMarkdownSkill,} from "./SelectableMarkdownText.types";type HighlightedCode = ReadonlyArray<ReadonlyArray<MarkdownHighlightedToken>>;@@ -48,12 +45,13 @@ function documentFor(node: MarkdownNode): MarkdownNode {function SelectableNode(props: {readonly node: MarkdownNode;+ readonly skills: ReadonlyArray<SelectableMarkdownSkill>;readonly textStyle: NativeMarkdownTextStyle;readonly onLinkPress?: (href: string) => void;}) {return (<NativeMarkdownSelectableText- runs={nativeMarkdownDocumentRuns(documentFor(props.node))}+ runs={nativeMarkdownDocumentRuns(documentFor(props.node), props.skills)}textStyle={props.textStyle}onLinkPress={props.onLinkPress}/>@@ -322,6 +320,7 @@ function collectTableRows(node: MarkdownNode): MarkdownNode[] {function NativeTable(props: {readonly node: MarkdownNode;+ readonly skills: ReadonlyArray<SelectableMarkdownSkill>;readonly textStyle: NativeMarkdownTextStyle;readonly onLinkPress?: (href: string) => void;}) {@@ -359,7 +358,7 @@ function NativeTable(props: {}}><NativeMarkdownSelectableText- runs={nativeMarkdownTextRuns(cell).map((run) =>+ runs={nativeMarkdownDocumentRuns(documentFor(cell), props.skills).map((run) =>rowIndex === 0 || cell.isHeader ? { ...run, bold: true } : run,)}textStyle={props.textStyle}@@ -376,6 +375,7 @@ function NativeTable(props: {function NativeMarkdownImage(props: {readonly node: MarkdownNode;+ readonly skills: ReadonlyArray<SelectableMarkdownSkill>;readonly textStyle: NativeMarkdownTextStyle;readonly onLinkPress?: (href: string) => void;}) {@@ -384,6 +384,7 @@ function NativeMarkdownImage(props: {return (<SelectableNodenode={props.node}+ skills={props.skills}textStyle={props.textStyle}onLinkPress={props.onLinkPress}/>@@ -445,6 +446,7 @@ function inlineGroups(nodes: ReadonlyArray<MarkdownNode>): MarkdownNode[] {function NativeMixedParagraph(props: {readonly node: MarkdownNode;+ readonly skills: ReadonlyArray<SelectableMarkdownSkill>;readonly textStyle: NativeMarkdownTextStyle;readonly onLinkPress?: (href: string) => void;}) {@@ -455,6 +457,7 @@ function NativeMixedParagraph(props: {<NativeMarkdownImagekey={nodeKey(child, index)}node={child}+ skills={props.skills}textStyle={props.textStyle}onLinkPress={props.onLinkPress}/>@@ -462,6 +465,7 @@ function NativeMixedParagraph(props: {<SelectableNodekey={nodeKey(child, index)}node={child}+ skills={props.skills}textStyle={props.textStyle}onLinkPress={props.onLinkPress}/>@@ -473,6 +477,7 @@ function NativeMixedParagraph(props: {function NativeList(props: {readonly node: MarkdownNode;+ readonly skills: ReadonlyArray<SelectableMarkdownSkill>;readonly textStyle: NativeMarkdownTextStyle;readonly highlightCode: MarkdownCodeHighlighter;readonly onLinkPress?: (href: string) => void;@@ -534,6 +539,7 @@ function NativeList(props: {<NativeMarkdownBlockkey={nodeKey(child, childIndex)}node={child}+ skills={props.skills}textStyle={props.textStyle}highlightCode={props.highlightCode}onLinkPress={props.onLinkPress}@@ -551,6 +557,7 @@ function NativeList(props: {export function NativeMarkdownBlock(props: {readonly node: MarkdownNode;+ readonly skills: ReadonlyArray<SelectableMarkdownSkill>;readonly textStyle: NativeMarkdownTextStyle;readonly highlightCode: MarkdownCodeHighlighter;readonly onLinkPress?: (href: string) => void;@@ -566,6 +573,7 @@ export function NativeMarkdownBlock(props: {<NativeMarkdownBlockkey={nodeKey(child, index)}node={child}+ skills={props.skills}textStyle={props.textStyle}highlightCode={props.highlightCode}onLinkPress={props.onLinkPress}@@ -587,6 +595,7 @@ export function NativeMarkdownBlock(props: {return (<NativeTablenode={props.node}+ skills={props.skills}textStyle={props.textStyle}onLinkPress={props.onLinkPress}/>@@ -595,6 +604,7 @@ export function NativeMarkdownBlock(props: {return (<NativeMarkdownImagenode={props.node}+ skills={props.skills}textStyle={props.textStyle}onLinkPress={props.onLinkPress}/>@@ -624,6 +634,7 @@ export function NativeMarkdownBlock(props: {<NativeMarkdownBlockkey={nodeKey(child, index)}node={child}+ skills={props.skills}textStyle={props.textStyle}highlightCode={props.highlightCode}onLinkPress={props.onLinkPress}@@ -637,6 +648,7 @@ export function NativeMarkdownBlock(props: {return (<NativeListnode={props.node}+ skills={props.skills}textStyle={props.textStyle}highlightCode={props.highlightCode}onLinkPress={props.onLinkPress}@@ -647,12 +659,14 @@ export function NativeMarkdownBlock(props: {return (props.node.children ?? []).some((child) => child.type === "image") ? (<NativeMixedParagraphnode={props.node}+ skills={props.skills}textStyle={props.textStyle}onLinkPress={props.onLinkPress}/>) : (<SelectableNodenode={props.node}+ skills={props.skills}textStyle={props.textStyle}onLinkPress={props.onLinkPress}/>@@ -673,6 +687,7 @@ export function NativeMarkdownBlock(props: {><SelectableNodenode={props.node}+ skills={props.skills}textStyle={props.textStyle}onLinkPress={props.onLinkPress}/>@@ -690,6 +705,7 @@ export function NativeMarkdownBlock(props: {<NativeMarkdownBlockkey={nodeKey(child, index)}node={child}+ skills={props.skills}textStyle={props.textStyle}highlightCode={props.highlightCode}onLinkPress={props.onLinkPress}@@ -703,6 +719,7 @@ export function NativeMarkdownBlock(props: {return (<SelectableNodenode={props.node}+ skills={props.skills}textStyle={props.textStyle}onLinkPress={props.onLinkPress}/>diff --git a/apps/mobile/modules/t3-markdown-text/src/SelectableMarkdownText.ios.tsx b/apps/mobile/modules/t3-markdown-text/src/SelectableMarkdownText.ios.tsxindex 56321ba01..7860ff592 100644--- a/apps/mobile/modules/t3-markdown-text/src/SelectableMarkdownText.ios.tsx+++ b/apps/mobile/modules/t3-markdown-text/src/SelectableMarkdownText.ios.tsx@@ -69,6 +69,7 @@ export function SelectableMarkdownText({chunk.kind === "rich" ? (<NativeMarkdownBlocknode={chunk.node}+ skills={skills}textStyle={textStyle}highlightCode={highlightCode}onLinkPress={onLinkPress}diff --git a/apps/mobile/modules/t3-markdown-text/src/nativeMarkdownText.ts b/apps/mobile/modules/t3-markdown-text/src/nativeMarkdownText.tsindex dc84755cb..719070f3d 100644--- a/apps/mobile/modules/t3-markdown-text/src/nativeMarkdownText.ts+++ b/apps/mobile/modules/t3-markdown-text/src/nativeMarkdownText.ts@@ -661,6 +661,7 @@ function appendDocumentBlock(function containsRichBlock(node: MarkdownNode): boolean {if (node.type === "code_block" ||+ node.type === "blockquote" ||node.type === "table" ||node.type === "image" ||node.type === "horizontal_rule" ||diff --git a/apps/mobile/src/lib/nativeMarkdownText.test.ts b/apps/mobile/src/lib/nativeMarkdownText.test.tsindex 6e41f2243..5ad2cca26 100644--- a/apps/mobile/src/lib/nativeMarkdownText.test.ts+++ b/apps/mobile/src/lib/nativeMarkdownText.test.ts@@ -173,6 +173,25 @@ describe("nativeMarkdownDocumentRuns", () => {]);});+ it("decorates known skill references inside blockquotes", () => {+ const node: MarkdownNode = {+ type: "blockquote",+ children: [+ {+ type: "paragraph",+ children: [{ type: "text", content: "Use $ui for this." }],+ },+ ],+ };++ expect(nativeMarkdownDocumentRuns(node, [{ name: "ui", displayName: "UI" }])).toContainEqual({+ text: "$ui",+ role: "body",+ skillName: "ui",+ skillLabel: "UI",+ });+ });+it("leaves unknown skill-like text unchanged", () => {const node: MarkdownNode = {type: "document",@@ -328,7 +347,7 @@ describe("nativeMarkdownDocumentRuns", () => {]);});- it("includes quotes and fenced code in the same selectable string", () => {+ it("preserves quotes and fenced code in document runs", () => {const node: MarkdownNode = {type: "document",children: [@@ -414,6 +433,39 @@ describe("nativeMarkdownListItemBlocks", () => {});describe("nativeMarkdownDocumentChunks", () => {+ it("renders plain blockquotes as rich blocks so their marker spans wrapped lines", () => {+ const blockquote: MarkdownNode = {+ type: "blockquote",+ beg: 0,+ end: 120,+ children: [+ {+ type: "paragraph",+ children: [+ {+ type: "text",+ content:+ "Persistent random per-result keys are the strongest design, even when this text wraps.",+ },+ ],+ },+ ],+ };++ expect(+ nativeMarkdownDocumentChunks({+ type: "document",+ children: [blockquote],+ }),+ ).toEqual([+ {+ kind: "rich",+ key: "rich:blockquote:0:120",+ node: blockquote,+ },+ ]);+ });+it("keeps headings and plain lists in one selectable document", () => {const document: MarkdownNode = {type: "document",