Revert "fix(mobile): keep Android markdown icons aligned with text"

apps/mobile/modules/t3-markdown-text/android/build.gradle

@@ -8,10 +8,6 @@ android {
   namespace 'expo.modules.t3markdowntext'
   compileSdk rootProject.ext.compileSdkVersion
 
-  testOptions {
-    unitTests.includeAndroidResources = true
-  }
-
   defaultConfig {
     minSdkVersion rootProject.ext.minSdkVersion
     targetSdkVersion rootProject.ext.targetSdkVersion
@@ -21,12 +17,4 @@ android {
 dependencies {
   implementation project(':expo-modules-core')
   implementation 'com.facebook.react:react-android'
-  testImplementation 'junit:junit:4.13.2'
-  testImplementation 'org.robolectric:robolectric:4.16.1'
-}
-
-tasks.withType(Test).configureEach {
-  javaLauncher = javaToolchains.launcherFor {
-    languageVersion = JavaLanguageVersion.of(21)
-  }
 }

apps/mobile/modules/t3-markdown-text/android/src/main/java/expo/modules/t3markdowntext/T3MarkdownTextSelectionModule.kt

@@ -18,23 +18,19 @@ import kotlin.math.min
 
 private const val OBJECT_REPLACEMENT_CHARACTER = "\uFFFC"
 
-internal fun copyTextWithoutInlineImages(
+private fun copyTextWithoutInlineImages(
   text: CharSequence,
   start: Int,
   end: Int
 ): String {
   if (text !is Spanned) return text.subSequence(start, end).toString()
 
-  fun isInlineImage(index: Int): Boolean =
-    index >= 0 && text[index].toString() == OBJECT_REPLACEMENT_CHARACTER &&
-      text.getSpans(index, index + 1, ReplacementSpan::class.java).isNotEmpty()
-
   return buildString {
     for (index in start until end) {
-      // The renderer inserts one NBSP after each image to keep its label on the same line.
-      // Inspect the original text even when selection starts after the image.
-      val isIconSpacer = text[index] == '\u00A0' && isInlineImage(index - 1)
-      if (!isInlineImage(index) && !isIconSpacer) append(text[index])
+      val isInlineImage =
+        text[index].toString() == OBJECT_REPLACEMENT_CHARACTER &&
+          text.getSpans(index, index + 1, ReplacementSpan::class.java).isNotEmpty()
+      if (!isInlineImage) append(text[index])
     }
   }
 }

apps/mobile/modules/t3-markdown-text/src/NativeMarkdownBlock.ios.tsx

@@ -4,11 +4,7 @@ import type { MarkdownNode } from "react-native-nitro-markdown/headless";
 
 import { CopyTextButton } from "./CopyTextButton";
 import { MarkdownTextPrimitive } from "./MarkdownTextPrimitive";
-import {
-  nativeMarkdownBlockSpacing,
-  nativeMarkdownDocumentRuns,
-  nativeMarkdownListItemBlocks,
-} from "./nativeMarkdownText";
+import { nativeMarkdownDocumentRuns, nativeMarkdownListItemBlocks } from "./nativeMarkdownText";
 import { NativeMarkdownSelectableText } from "./NativeMarkdownSelectableText.ios";
 import type {
   MarkdownCodeHighlighter,
@@ -599,28 +595,17 @@ export function NativeMarkdownBlock(props: {
   switch (props.node.type) {
     case "document":
       return (
-        <View>
+        <View style={{ gap: 8 }}>
           {(props.node.children ?? []).map((child, index) => (
-            <View
+            <NativeMarkdownBlock
               key={nodeKey(child, index)}
-              style={{
-                paddingTop:
-                  Platform.OS === "android"
-                    ? nativeMarkdownBlockSpacing(props.node.children?.[index - 1], child)
-                    : index > 0
-                      ? 8
-                      : 0,
-              }}
-            >
-              <NativeMarkdownBlock
-                node={child}
-                skills={props.skills}
-                textStyle={props.textStyle}
-                highlightCode={props.highlightCode}
-                onLinkPress={props.onLinkPress}
-                depth={depth}
-              />
-            </View>
+              node={child}
+              skills={props.skills}
+              textStyle={props.textStyle}
+              highlightCode={props.highlightCode}
+              onLinkPress={props.onLinkPress}
+              depth={depth}
+            />
           ))}
         </View>
       );

apps/mobile/modules/t3-markdown-text/src/NativeMarkdownSelectableText.ios.tsx

@@ -222,10 +222,6 @@ export function NativeMarkdownSelectableText(props: {
       }
     }
 
-    if (Platform.OS === "android" && (run.fileIcon || linkIcon)) {
-      text = `\u00A0${text}`;
-    }
-
     return { key: `${signature}:${occurrence}`, run, text, linkIcon };
   });
   // T3MarkdownText only rebuilds its attributed string during native layout. A

apps/mobile/modules/t3-markdown-text/src/SelectableMarkdownText.ios.tsx

@@ -1,5 +1,5 @@
 import { useMemo } from "react";
-import { Platform, View } from "react-native";
+import { View } from "react-native";
 import { parseMarkdownWithOptions } from "react-native-nitro-markdown/headless";
 
 import {
@@ -84,10 +84,8 @@ export function SelectableMarkdownText({
           the resulting single-line width instead of reflowing it. */}
         <View style={{ flexShrink: 1, minWidth: 0, marginTop, marginBottom }}>
           {chunks.map((chunk, index) => {
-            // Android inline images drift when one Text mixes paragraph and list
-            // spacer line heights. Keep those layouts in separate native blocks.
             const content =
-              chunk.kind === "rich" || Platform.OS === "android" ? (
+              chunk.kind === "rich" ? (
                 <NativeMarkdownBlock
                   node={chunk.node}
                   skills={skills}

apps/mobile/modules/t3-markdown-text/src/nativeMarkdownText.ts

@@ -589,14 +589,6 @@ function appendTable(
   return runs;
 }
 
-export function nativeMarkdownBlockSpacing(
-  previous: MarkdownNode | undefined,
-  current: MarkdownNode,
-): number {
-  if (!previous) return 0;
-  return current.type === "heading" ? 20 : previous.type === "heading" ? 10 : 12;
-}
-
 function appendDocumentBlock(
   runs: NativeMarkdownTextRun[],
   node: MarkdownNode,
@@ -607,7 +599,11 @@ function appendDocumentBlock(
       const children = node.children ?? [];
       for (const [index, child] of children.entries()) {
         if (index > 0) {
-          appendSpacer(runs, nativeMarkdownBlockSpacing(children[index - 1], child));
+          const previous = children[index - 1];
+          appendSpacer(
+            runs,
+            child.type === "heading" ? 20 : previous?.type === "heading" ? 10 : 12,
+          );
         }
         appendDocumentBlock(runs, child, depth);
       }

apps/mobile/src/lib/nativeMarkdownText.test.ts

@@ -2,7 +2,6 @@ import { describe, expect, it } from "vite-plus/test";
 import type { MarkdownNode } from "react-native-nitro-markdown/headless";
 
 import {
-  nativeMarkdownBlockSpacing,
   nativeMarkdownChunkSpacing,
   nativeMarkdownDocumentChunks,
   nativeMarkdownDocumentRuns,
@@ -382,11 +381,6 @@ describe("nativeMarkdownDocumentRuns", () => {
         .filter((run) => run.role === "spacer")
         .map((run) => run.spacing),
     ).toEqual([20, 10, 12]);
-    expect(
-      node.children?.map((child, index) =>
-        nativeMarkdownBlockSpacing(node.children?.[index - 1], child),
-      ),
-    ).toEqual([0, 20, 10, 12]);
   });
 
   it("renders tight list items whose inline nodes are direct children", () => {

docs/user/composer.md

@@ -6,9 +6,6 @@ include a skill when the task needs more context.
 Messages can contain up to 120,000 characters. Longer drafts stay in the composer
 so you can shorten them or split them into several messages.
 
-On Android, long-press message text to select within a paragraph or list item.
-Use the message’s copy button to copy the whole message.
-
 ## Attach files
 
 Attach up to eight files per message. Images can be up to 10 MB; other files can