Commit a991bbd

Browse files
cursoragentcursoragent
committed
Fix 6 Android/iOS mobile bugs: associated domains, scroll, diff indices, content reset, file nav, comment height
- Restore associatedDomains (applinks/webcredentials) for iOS builds after relyingParty was removed from variant config - Fix Android composer scroll by overriding scrollTo in SelectionAwareEditText to actually prevent scrolling when scrollEnabled=false - Map visible-range indices back to original row indices so JS highlighting targets correct lines when files are collapsed on Android - Bump rowsDecodeGeneration and clear rows in setContentResetKey to prevent stale in-flight decodes from repopulating after content reset - Emit null fileId in onVisibleFileChange when scrolled to top on Android, matching iOS behavior for ReviewFileNavigator - Use collapsed-aware row height (44dp) for collapsed comments in Android DiffCanvasView, matching iOS behavior
1 parent 276b453 commit a991bbd

3 files changed

Lines changed: 41 additions & 4 deletions

File tree

‎apps/mobile/app.config.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,7 @@ const config: ExpoConfig = {
107107
icon: variant.iosIcon,
108108
supportsTablet: true,
109109
bundleIdentifier: iosBundleIdentifier,
110+
associatedDomains: ["applinks:clerk.t3.codes","webcredentials:clerk.t3.codes"],
110111
infoPlist: {
111112
NSAppTransportSecurity: {
112113
NSAllowsArbitraryLoads: true,

‎apps/mobile/modules/t3-composer-editor/android/src/main/java/expo/modules/t3composereditor/T3ComposerEditorView.kt‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -197,6 +197,7 @@ class T3ComposerEditorView(context: Context, appContext: AppContext) : ExpoView(
197197

198198
funsetScrollEnabled(scrollEnabled:Boolean) {
199199
editor.isVerticalScrollBarEnabled = scrollEnabled
200+
editor.scrollEnabled = scrollEnabled
200201
}
201202

202203
funsetAutoFocus(autoFocus:Boolean) {
@@ -424,6 +425,11 @@ private fun parseTokens(value: String): List<ComposerToken> = try {
424425
privateclassSelectionAwareEditText(context:Context) : EditText(context) {
425426
var selectionListener: ((Int, Int) ->Unit)?=null
426427
var pasteImagesListener: ((List<String>) ->Unit)?=null
428+
var scrollEnabled =true
429+
430+
overridefunscrollTo(x:Int, y:Int) {
431+
if (scrollEnabled) super.scrollTo(x, y)
432+
}
427433

428434
overridefunonSelectionChanged(selStart:Int, selEnd:Int) {
429435
super.onSelectionChanged(selStart, selEnd)

‎apps/mobile/modules/t3-review-diff/android/src/main/java/expo/modules/t3reviewdiff/T3ReviewDiffView.kt‎

Lines changed: 34 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ class T3ReviewDiffView(context: Context, appContext: AppContext) : ExpoView(cont
3232
privateval onToggleComment by EventDispatcher()
3333
privatevar rows:List<DiffRow> = emptyList()
3434
privatevar visibleRows:List<DiffRow> = emptyList()
35+
privatevar visibleToOriginalIndex:IntArray= intArrayOf()
3536
privatevar collapsedFileIds:Set<String> = emptySet()
3637
privatevar viewedFileIds:Set<String> = emptySet()
3738
privatevar selectedRowIds:Set<String> = emptySet()
@@ -56,11 +57,13 @@ class T3ReviewDiffView(context: Context, appContext: AppContext) : ExpoView(cont
5657
init {
5758
canvasView.onRowTap = { row, gesture -> handleRowTap(row, gesture) }
5859
canvasView.onVisibleRowsChanged = { first, last ->
60+
val originalFirst =if (first in visibleToOriginalIndex.indices) visibleToOriginalIndex[first] else first
61+
val originalLast =if (last in visibleToOriginalIndex.indices) visibleToOriginalIndex[last] else last
5962
onDebug(
6063
mapOf(
6164
"message" to "visible-range",
62-
"firstRowIndex" to first,
63-
"lastRowIndex" to last,
65+
"firstRowIndex" to originalFirst,
66+
"lastRowIndex" to originalLast,
6467
),
6568
)
6669
emitVisibleFile(first)
@@ -81,7 +84,12 @@ class T3ReviewDiffView(context: Context, appContext: AppContext) : ExpoView(cont
8184
funsetContentResetKey(value:String) {
8285
if (contentResetKey == value) return
8386
contentResetKey = value
87+
rowsDecodeGeneration +=1
8488
tokensDecodeGeneration +=1
89+
rows = emptyList()
90+
visibleRows = emptyList()
91+
visibleToOriginalIndex = intArrayOf()
92+
canvasView.rows = emptyList()
8593
canvasView.tokensByRowId = emptyMap()
8694
lastVisibleFileId =null
8795
pendingInitialScroll =true
@@ -314,21 +322,27 @@ class T3ReviewDiffView(context: Context, appContext: AppContext) : ExpoView(cont
314322

315323
privatefunrebuildVisibleRows() {
316324
val filtered =ArrayList<DiffRow>(rows.size)
325+
val indexMapping =ArrayList<Int>(rows.size)
317326
var currentFileCollapsed =false
318-
rows.forEach { row ->
327+
rows.forEachIndexed { originalIndex, row ->
319328
if (row.kind =="file") {
320329
currentFileCollapsed = collapsedFileIds.contains(row.resolvedFileId)
321330
filtered.add(row)
331+
indexMapping.add(originalIndex)
322332
} elseif (!currentFileCollapsed) {
323333
if (row.kind !="comment"||!collapsedCommentIds.contains(row.id)) {
324334
filtered.add(row)
335+
indexMapping.add(originalIndex)
325336
} else {
326337
filtered.add(row.copy(commentText ="Comment collapsed"))
338+
indexMapping.add(originalIndex)
327339
}
328340
}
329341
}
330342
visibleRows = filtered
343+
visibleToOriginalIndex = indexMapping.toIntArray()
331344
canvasView.rows = filtered
345+
canvasView.collapsedCommentIds = collapsedCommentIds
332346
canvasView.viewedFileIds = viewedFileIds
333347
canvasView.selectedRowIds = selectedRowIds
334348
applyPendingInitialScroll()
@@ -360,6 +374,13 @@ class T3ReviewDiffView(context: Context, appContext: AppContext) : ExpoView(cont
360374

361375
privatefunemitVisibleFile(firstVisibleIndex:Int) {
362376
if (visibleRows.isEmpty()) return
377+
if (canvasView.verticalOffset() <=0) {
378+
if (lastVisibleFileId !=null) {
379+
lastVisibleFileId =null
380+
onVisibleFileChange(mapOf("fileId" to null))
381+
}
382+
return
383+
}
363384
val start = firstVisibleIndex.coerceIn(0, visibleRows.lastIndex)
364385
val fileId = (start downTo 0)
365386
.asSequence()
@@ -590,6 +611,11 @@ private class DiffCanvasView(context: Context) : View(context) {
590611
field = value
591612
invalidate()
592613
}
614+
var collapsedCommentIds:Set<String> = emptySet()
615+
set(value) {
616+
field = value
617+
rebuildOffsets()
618+
}
593619
var theme:DiffTheme=DiffTheme.fallback("light")
594620
set(value) {
595621
field = value
@@ -691,7 +717,11 @@ private class DiffCanvasView(context: Context) : View(context) {
691717

692718
privatefunrowHeight(row:DiffRow): Int=when (row.kind) {
693719
"file"-> style.fileHeaderHeightPx.toInt()
694-
"comment"-> max((style.rowHeightPx *3.2f).toInt(), (56* density).toInt())
720+
"comment"->if (collapsedCommentIds.contains(row.id)) {
721+
(44* density).toInt()
722+
} else {
723+
max((style.rowHeightPx *3.2f).toInt(), (56* density).toInt())
724+
}
695725
else-> style.rowHeightPx.toInt()
696726
}.coerceAtLeast(1)
697727

0 commit comments

Comments
 (0)
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
Commit a991bbd
Browse files
cursoragentcursoragent
committed
Fix 6 Android/iOS mobile bugs: associated domains, scroll, diff indices, content reset, file nav, comment height
- Restore associatedDomains (applinks/webcredentials) for iOS builds after
relyingParty was removed from variant config
- Fix Android composer scroll by overriding scrollTo in SelectionAwareEditText
to actually prevent scrolling when scrollEnabled=false
- Map visible-range indices back to original row indices so JS highlighting
targets correct lines when files are collapsed on Android
- Bump rowsDecodeGeneration and clear rows in setContentResetKey to prevent
stale in-flight decodes from repopulating after content reset
- Emit null fileId in onVisibleFileChange when scrolled to top on Android,
matching iOS behavior for ReviewFileNavigator
- Use collapsed-aware row height (44dp) for collapsed comments in Android
DiffCanvasView, matching iOS behavior
1 parent 276b453 commit a991bbd
3 files changed
Lines changed: 41 additions & 4 deletions
File tree
‎apps/mobile/app.config.ts‎
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,7 @@ const config: ExpoConfig = {
107107
icon: variant.iosIcon,
108108
supportsTablet: true,
109109
bundleIdentifier: iosBundleIdentifier,
110+
associatedDomains: ["applinks:clerk.t3.codes","webcredentials:clerk.t3.codes"],
110111
infoPlist: {
111112
NSAppTransportSecurity: {
112113
NSAllowsArbitraryLoads: true,
‎apps/mobile/modules/t3-composer-editor/android/src/main/java/expo/modules/t3composereditor/T3ComposerEditorView.kt‎
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -197,6 +197,7 @@ class T3ComposerEditorView(context: Context, appContext: AppContext) : ExpoView(
197197

198198
funsetScrollEnabled(scrollEnabled:Boolean) {
199199
 editor.isVerticalScrollBarEnabled = scrollEnabled
200+
 editor.scrollEnabled = scrollEnabled
200201
 }
201202

202203
funsetAutoFocus(autoFocus:Boolean) {
@@ -424,6 +425,11 @@ private fun parseTokens(value: String): List<ComposerToken> = try {
424425
privateclassSelectionAwareEditText(context:Context) : EditText(context) {
425426
var selectionListener: ((Int, Int) ->Unit)?=null
426427
var pasteImagesListener: ((List<String>) ->Unit)?=null
428+
var scrollEnabled =true
429+
430+
overridefunscrollTo(x:Int, y:Int) {
431+
if (scrollEnabled) super.scrollTo(x, y)
432+
 }
427433

428434
overridefunonSelectionChanged(selStart:Int, selEnd:Int) {
429435
super.onSelectionChanged(selStart, selEnd)
‎apps/mobile/modules/t3-review-diff/android/src/main/java/expo/modules/t3reviewdiff/T3ReviewDiffView.kt‎
Lines changed: 34 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ class T3ReviewDiffView(context: Context, appContext: AppContext) : ExpoView(cont
3232
privateval onToggleComment by EventDispatcher()
3333
privatevar rows:List<DiffRow> = emptyList()
3434
privatevar visibleRows:List<DiffRow> = emptyList()
35+
privatevar visibleToOriginalIndex:IntArray= intArrayOf()
3536
privatevar collapsedFileIds:Set<String> = emptySet()
3637
privatevar viewedFileIds:Set<String> = emptySet()
3738
privatevar selectedRowIds:Set<String> = emptySet()
@@ -56,11 +57,13 @@ class T3ReviewDiffView(context: Context, appContext: AppContext) : ExpoView(cont
5657
init {
5758
 canvasView.onRowTap = { row, gesture -> handleRowTap(row, gesture) }
5859
 canvasView.onVisibleRowsChanged = { first, last ->
60+
val originalFirst =if (first in visibleToOriginalIndex.indices) visibleToOriginalIndex[first] else first
61+
val originalLast =if (last in visibleToOriginalIndex.indices) visibleToOriginalIndex[last] else last
5962
 onDebug(
6063
mapOf(
6164
"message" to "visible-range",
62-
"firstRowIndex" to first,
63-
"lastRowIndex" to last,
65+
"firstRowIndex" to originalFirst,
66+
"lastRowIndex" to originalLast,
6467
 ),
6568
 )
6669
 emitVisibleFile(first)
@@ -81,7 +84,12 @@ class T3ReviewDiffView(context: Context, appContext: AppContext) : ExpoView(cont
8184
funsetContentResetKey(value:String) {
8285
if (contentResetKey == value) return
8386
 contentResetKey = value
87+
 rowsDecodeGeneration +=1
8488
 tokensDecodeGeneration +=1
89+
 rows = emptyList()
90+
 visibleRows = emptyList()
91+
 visibleToOriginalIndex = intArrayOf()
92+
 canvasView.rows = emptyList()
8593
 canvasView.tokensByRowId = emptyMap()
8694
 lastVisibleFileId =null
8795
 pendingInitialScroll =true
@@ -314,21 +322,27 @@ class T3ReviewDiffView(context: Context, appContext: AppContext) : ExpoView(cont
314322

315323
privatefunrebuildVisibleRows() {
316324
val filtered =ArrayList<DiffRow>(rows.size)
325+
val indexMapping =ArrayList<Int>(rows.size)
317326
var currentFileCollapsed =false
318-
 rows.forEach { row ->
327+
 rows.forEachIndexed { originalIndex, row ->
319328
if (row.kind =="file") {
320329
 currentFileCollapsed = collapsedFileIds.contains(row.resolvedFileId)
321330
 filtered.add(row)
331+
 indexMapping.add(originalIndex)
322332
 } elseif (!currentFileCollapsed) {
323333
if (row.kind !="comment"||!collapsedCommentIds.contains(row.id)) {
324334
 filtered.add(row)
335+
 indexMapping.add(originalIndex)
325336
 } else {
326337
 filtered.add(row.copy(commentText ="Comment collapsed"))
338+
 indexMapping.add(originalIndex)
327339
 }
328340
 }
329341
 }
330342
 visibleRows = filtered
343+
 visibleToOriginalIndex = indexMapping.toIntArray()
331344
 canvasView.rows = filtered
345+
 canvasView.collapsedCommentIds = collapsedCommentIds
332346
 canvasView.viewedFileIds = viewedFileIds
333347
 canvasView.selectedRowIds = selectedRowIds
334348
 applyPendingInitialScroll()
@@ -360,6 +374,13 @@ class T3ReviewDiffView(context: Context, appContext: AppContext) : ExpoView(cont
360374

361375
privatefunemitVisibleFile(firstVisibleIndex:Int) {
362376
if (visibleRows.isEmpty()) return
377+
if (canvasView.verticalOffset() <=0) {
378+
if (lastVisibleFileId !=null) {
379+
 lastVisibleFileId =null
380+
 onVisibleFileChange(mapOf("fileId" to null))
381+
 }
382+
return
383+
 }
363384
val start = firstVisibleIndex.coerceIn(0, visibleRows.lastIndex)
364385
val fileId = (start downTo 0)
365386
 .asSequence()
@@ -590,6 +611,11 @@ private class DiffCanvasView(context: Context) : View(context) {
590611
 field = value
591612
 invalidate()
592613
 }
614+
var collapsedCommentIds:Set<String> = emptySet()
615+
 set(value) {
616+
 field = value
617+
 rebuildOffsets()
618+
 }
593619
var theme:DiffTheme=DiffTheme.fallback("light")
594620
 set(value) {
595621
 field = value
@@ -691,7 +717,11 @@ private class DiffCanvasView(context: Context) : View(context) {
691717

692718
privatefunrowHeight(row:DiffRow): Int=when (row.kind) {
693719
"file"-> style.fileHeaderHeightPx.toInt()
694-
"comment"-> max((style.rowHeightPx *3.2f).toInt(), (56* density).toInt())
720+
"comment"->if (collapsedCommentIds.contains(row.id)) {
721+
 (44* density).toInt()
722+
 } else {
723+
 max((style.rowHeightPx *3.2f).toInt(), (56* density).toInt())
724+
 }
695725
else-> style.rowHeightPx.toInt()
696726
 }.coerceAtLeast(1)
697727

0 commit comments
Comments
 (0)

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Commit a991bbd
Browse files
cursoragentcursoragent
committed
Fix 6 Android/iOS mobile bugs: associated domains, scroll, diff indices, content reset, file nav, comment height
- Restore associatedDomains (applinks/webcredentials) for iOS builds after
relyingParty was removed from variant config
- Fix Android composer scroll by overriding scrollTo in SelectionAwareEditText
to actually prevent scrolling when scrollEnabled=false
- Map visible-range indices back to original row indices so JS highlighting
targets correct lines when files are collapsed on Android
- Bump rowsDecodeGeneration and clear rows in setContentResetKey to prevent
stale in-flight decodes from repopulating after content reset
- Emit null fileId in onVisibleFileChange when scrolled to top on Android,
matching iOS behavior for ReviewFileNavigator
- Use collapsed-aware row height (44dp) for collapsed comments in Android
DiffCanvasView, matching iOS behavior
1 parent 276b453 commit a991bbd
3 files changed
Lines changed: 41 additions & 4 deletions
File tree
‎apps/mobile/app.config.ts‎
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,7 @@ const config: ExpoConfig = {
107107
icon: variant.iosIcon,
108108
supportsTablet: true,
109109
bundleIdentifier: iosBundleIdentifier,
110+
associatedDomains: ["applinks:clerk.t3.codes","webcredentials:clerk.t3.codes"],
110111
infoPlist: {
111112
NSAppTransportSecurity: {
112113
NSAllowsArbitraryLoads: true,
‎apps/mobile/modules/t3-composer-editor/android/src/main/java/expo/modules/t3composereditor/T3ComposerEditorView.kt‎
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -197,6 +197,7 @@ class T3ComposerEditorView(context: Context, appContext: AppContext) : ExpoView(
197197

198198
funsetScrollEnabled(scrollEnabled:Boolean) {
199199
 editor.isVerticalScrollBarEnabled = scrollEnabled
200+
 editor.scrollEnabled = scrollEnabled
200201
 }
201202

202203
funsetAutoFocus(autoFocus:Boolean) {
@@ -424,6 +425,11 @@ private fun parseTokens(value: String): List<ComposerToken> = try {
424425
privateclassSelectionAwareEditText(context:Context) : EditText(context) {
425426
var selectionListener: ((Int, Int) ->Unit)?=null
426427
var pasteImagesListener: ((List<String>) ->Unit)?=null
428+
var scrollEnabled =true
429+
430+
overridefunscrollTo(x:Int, y:Int) {
431+
if (scrollEnabled) super.scrollTo(x, y)
432+
 }
427433

428434
overridefunonSelectionChanged(selStart:Int, selEnd:Int) {
429435
super.onSelectionChanged(selStart, selEnd)
‎apps/mobile/modules/t3-review-diff/android/src/main/java/expo/modules/t3reviewdiff/T3ReviewDiffView.kt‎
Lines changed: 34 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ class T3ReviewDiffView(context: Context, appContext: AppContext) : ExpoView(cont
3232
privateval onToggleComment by EventDispatcher()
3333
privatevar rows:List<DiffRow> = emptyList()
3434
privatevar visibleRows:List<DiffRow> = emptyList()
35+
privatevar visibleToOriginalIndex:IntArray= intArrayOf()
3536
privatevar collapsedFileIds:Set<String> = emptySet()
3637
privatevar viewedFileIds:Set<String> = emptySet()
3738
privatevar selectedRowIds:Set<String> = emptySet()
@@ -56,11 +57,13 @@ class T3ReviewDiffView(context: Context, appContext: AppContext) : ExpoView(cont
5657
init {
5758
 canvasView.onRowTap = { row, gesture -> handleRowTap(row, gesture) }
5859
 canvasView.onVisibleRowsChanged = { first, last ->
60+
val originalFirst =if (first in visibleToOriginalIndex.indices) visibleToOriginalIndex[first] else first
61+
val originalLast =if (last in visibleToOriginalIndex.indices) visibleToOriginalIndex[last] else last
5962
 onDebug(
6063
mapOf(
6164
"message" to "visible-range",
62-
"firstRowIndex" to first,
63-
"lastRowIndex" to last,
65+
"firstRowIndex" to originalFirst,
66+
"lastRowIndex" to originalLast,
6467
 ),
6568
 )
6669
 emitVisibleFile(first)
@@ -81,7 +84,12 @@ class T3ReviewDiffView(context: Context, appContext: AppContext) : ExpoView(cont
8184
funsetContentResetKey(value:String) {
8285
if (contentResetKey == value) return
8386
 contentResetKey = value
87+
 rowsDecodeGeneration +=1
8488
 tokensDecodeGeneration +=1
89+
 rows = emptyList()
90+
 visibleRows = emptyList()
91+
 visibleToOriginalIndex = intArrayOf()
92+
 canvasView.rows = emptyList()
8593
 canvasView.tokensByRowId = emptyMap()
8694
 lastVisibleFileId =null
8795
 pendingInitialScroll =true
@@ -314,21 +322,27 @@ class T3ReviewDiffView(context: Context, appContext: AppContext) : ExpoView(cont
314322

315323
privatefunrebuildVisibleRows() {
316324
val filtered =ArrayList<DiffRow>(rows.size)
325+
val indexMapping =ArrayList<Int>(rows.size)
317326
var currentFileCollapsed =false
318-
 rows.forEach { row ->
327+
 rows.forEachIndexed { originalIndex, row ->
319328
if (row.kind =="file") {
320329
 currentFileCollapsed = collapsedFileIds.contains(row.resolvedFileId)
321330
 filtered.add(row)
331+
 indexMapping.add(originalIndex)
322332
 } elseif (!currentFileCollapsed) {
323333
if (row.kind !="comment"||!collapsedCommentIds.contains(row.id)) {
324334
 filtered.add(row)
335+
 indexMapping.add(originalIndex)
325336
 } else {
326337
 filtered.add(row.copy(commentText ="Comment collapsed"))
338+
 indexMapping.add(originalIndex)
327339
 }
328340
 }
329341
 }
330342
 visibleRows = filtered
343+
 visibleToOriginalIndex = indexMapping.toIntArray()
331344
 canvasView.rows = filtered
345+
 canvasView.collapsedCommentIds = collapsedCommentIds
332346
 canvasView.viewedFileIds = viewedFileIds
333347
 canvasView.selectedRowIds = selectedRowIds
334348
 applyPendingInitialScroll()
@@ -360,6 +374,13 @@ class T3ReviewDiffView(context: Context, appContext: AppContext) : ExpoView(cont
360374

361375
privatefunemitVisibleFile(firstVisibleIndex:Int) {
362376
if (visibleRows.isEmpty()) return
377+
if (canvasView.verticalOffset() <=0) {
378+
if (lastVisibleFileId !=null) {
379+
 lastVisibleFileId =null
380+
 onVisibleFileChange(mapOf("fileId" to null))
381+
 }
382+
return
383+
 }
363384
val start = firstVisibleIndex.coerceIn(0, visibleRows.lastIndex)
364385
val fileId = (start downTo 0)
365386
 .asSequence()
@@ -590,6 +611,11 @@ private class DiffCanvasView(context: Context) : View(context) {
590611
 field = value
591612
 invalidate()
592613
 }
614+
var collapsedCommentIds:Set<String> = emptySet()
615+
 set(value) {
616+
 field = value
617+
 rebuildOffsets()
618+
 }
593619
var theme:DiffTheme=DiffTheme.fallback("light")
594620
 set(value) {
595621
 field = value
@@ -691,7 +717,11 @@ private class DiffCanvasView(context: Context) : View(context) {
691717

692718
privatefunrowHeight(row:DiffRow): Int=when (row.kind) {
693719
"file"-> style.fileHeaderHeightPx.toInt()
694-
"comment"-> max((style.rowHeightPx *3.2f).toInt(), (56* density).toInt())
720+
"comment"->if (collapsedCommentIds.contains(row.id)) {
721+
 (44* density).toInt()
722+
 } else {
723+
 max((style.rowHeightPx *3.2f).toInt(), (56* density).toInt())
724+
 }
695725
else-> style.rowHeightPx.toInt()
696726
 }.coerceAtLeast(1)
697727

0 commit comments
Comments
 (0)

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Commit a991bbd
Browse files
cursoragentcursoragent
committed
Fix 6 Android/iOS mobile bugs: associated domains, scroll, diff indices, content reset, file nav, comment height
- Restore associatedDomains (applinks/webcredentials) for iOS builds after
relyingParty was removed from variant config
- Fix Android composer scroll by overriding scrollTo in SelectionAwareEditText
to actually prevent scrolling when scrollEnabled=false
- Map visible-range indices back to original row indices so JS highlighting
targets correct lines when files are collapsed on Android
- Bump rowsDecodeGeneration and clear rows in setContentResetKey to prevent
stale in-flight decodes from repopulating after content reset
- Emit null fileId in onVisibleFileChange when scrolled to top on Android,
matching iOS behavior for ReviewFileNavigator
- Use collapsed-aware row height (44dp) for collapsed comments in Android
DiffCanvasView, matching iOS behavior
1 parent 276b453 commit a991bbd
3 files changed
Lines changed: 41 additions & 4 deletions
File tree
‎apps/mobile/app.config.ts‎
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,7 @@ const config: ExpoConfig = {
107107
icon: variant.iosIcon,
108108
supportsTablet: true,
109109
bundleIdentifier: iosBundleIdentifier,
110+
associatedDomains: ["applinks:clerk.t3.codes","webcredentials:clerk.t3.codes"],
110111
infoPlist: {
111112
NSAppTransportSecurity: {
112113
NSAllowsArbitraryLoads: true,
‎apps/mobile/modules/t3-composer-editor/android/src/main/java/expo/modules/t3composereditor/T3ComposerEditorView.kt‎
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -197,6 +197,7 @@ class T3ComposerEditorView(context: Context, appContext: AppContext) : ExpoView(
197197

198198
funsetScrollEnabled(scrollEnabled:Boolean) {
199199
 editor.isVerticalScrollBarEnabled = scrollEnabled
200+
 editor.scrollEnabled = scrollEnabled
200201
 }
201202

202203
funsetAutoFocus(autoFocus:Boolean) {
@@ -424,6 +425,11 @@ private fun parseTokens(value: String): List<ComposerToken> = try {
424425
privateclassSelectionAwareEditText(context:Context) : EditText(context) {
425426
var selectionListener: ((Int, Int) ->Unit)?=null
426427
var pasteImagesListener: ((List<String>) ->Unit)?=null
428+
var scrollEnabled =true
429+
430+
overridefunscrollTo(x:Int, y:Int) {
431+
if (scrollEnabled) super.scrollTo(x, y)
432+
 }
427433

428434
overridefunonSelectionChanged(selStart:Int, selEnd:Int) {
429435
super.onSelectionChanged(selStart, selEnd)
‎apps/mobile/modules/t3-review-diff/android/src/main/java/expo/modules/t3reviewdiff/T3ReviewDiffView.kt‎
Lines changed: 34 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ class T3ReviewDiffView(context: Context, appContext: AppContext) : ExpoView(cont
3232
privateval onToggleComment by EventDispatcher()
3333
privatevar rows:List<DiffRow> = emptyList()
3434
privatevar visibleRows:List<DiffRow> = emptyList()
35+
privatevar visibleToOriginalIndex:IntArray= intArrayOf()
3536
privatevar collapsedFileIds:Set<String> = emptySet()
3637
privatevar viewedFileIds:Set<String> = emptySet()
3738
privatevar selectedRowIds:Set<String> = emptySet()
@@ -56,11 +57,13 @@ class T3ReviewDiffView(context: Context, appContext: AppContext) : ExpoView(cont
5657
init {
5758
 canvasView.onRowTap = { row, gesture -> handleRowTap(row, gesture) }
5859
 canvasView.onVisibleRowsChanged = { first, last ->
60+
val originalFirst =if (first in visibleToOriginalIndex.indices) visibleToOriginalIndex[first] else first
61+
val originalLast =if (last in visibleToOriginalIndex.indices) visibleToOriginalIndex[last] else last
5962
 onDebug(
6063
mapOf(
6164
"message" to "visible-range",
62-
"firstRowIndex" to first,
63-
"lastRowIndex" to last,
65+
"firstRowIndex" to originalFirst,
66+
"lastRowIndex" to originalLast,
6467
 ),
6568
 )
6669
 emitVisibleFile(first)
@@ -81,7 +84,12 @@ class T3ReviewDiffView(context: Context, appContext: AppContext) : ExpoView(cont
8184
funsetContentResetKey(value:String) {
8285
if (contentResetKey == value) return
8386
 contentResetKey = value
87+
 rowsDecodeGeneration +=1
8488
 tokensDecodeGeneration +=1
89+
 rows = emptyList()
90+
 visibleRows = emptyList()
91+
 visibleToOriginalIndex = intArrayOf()
92+
 canvasView.rows = emptyList()
8593
 canvasView.tokensByRowId = emptyMap()
8694
 lastVisibleFileId =null
8795
 pendingInitialScroll =true
@@ -314,21 +322,27 @@ class T3ReviewDiffView(context: Context, appContext: AppContext) : ExpoView(cont
314322

315323
privatefunrebuildVisibleRows() {
316324
val filtered =ArrayList<DiffRow>(rows.size)
325+
val indexMapping =ArrayList<Int>(rows.size)
317326
var currentFileCollapsed =false
318-
 rows.forEach { row ->
327+
 rows.forEachIndexed { originalIndex, row ->
319328
if (row.kind =="file") {
320329
 currentFileCollapsed = collapsedFileIds.contains(row.resolvedFileId)
321330
 filtered.add(row)
331+
 indexMapping.add(originalIndex)
322332
 } elseif (!currentFileCollapsed) {
323333
if (row.kind !="comment"||!collapsedCommentIds.contains(row.id)) {
324334
 filtered.add(row)
335+
 indexMapping.add(originalIndex)
325336
 } else {
326337
 filtered.add(row.copy(commentText ="Comment collapsed"))
338+
 indexMapping.add(originalIndex)
327339
 }
328340
 }
329341
 }
330342
 visibleRows = filtered
343+
 visibleToOriginalIndex = indexMapping.toIntArray()
331344
 canvasView.rows = filtered
345+
 canvasView.collapsedCommentIds = collapsedCommentIds
332346
 canvasView.viewedFileIds = viewedFileIds
333347
 canvasView.selectedRowIds = selectedRowIds
334348
 applyPendingInitialScroll()
@@ -360,6 +374,13 @@ class T3ReviewDiffView(context: Context, appContext: AppContext) : ExpoView(cont
360374

361375
privatefunemitVisibleFile(firstVisibleIndex:Int) {
362376
if (visibleRows.isEmpty()) return
377+
if (canvasView.verticalOffset() <=0) {
378+
if (lastVisibleFileId !=null) {
379+
 lastVisibleFileId =null
380+
 onVisibleFileChange(mapOf("fileId" to null))
381+
 }
382+
return
383+
 }
363384
val start = firstVisibleIndex.coerceIn(0, visibleRows.lastIndex)
364385
val fileId = (start downTo 0)
365386
 .asSequence()
@@ -590,6 +611,11 @@ private class DiffCanvasView(context: Context) : View(context) {
590611
 field = value
591612
 invalidate()
592613
 }
614+
var collapsedCommentIds:Set<String> = emptySet()
615+
 set(value) {
616+
 field = value
617+
 rebuildOffsets()
618+
 }
593619
var theme:DiffTheme=DiffTheme.fallback("light")
594620
 set(value) {
595621
 field = value
@@ -691,7 +717,11 @@ private class DiffCanvasView(context: Context) : View(context) {
691717

692718
privatefunrowHeight(row:DiffRow): Int=when (row.kind) {
693719
"file"-> style.fileHeaderHeightPx.toInt()
694-
"comment"-> max((style.rowHeightPx *3.2f).toInt(), (56* density).toInt())
720+
"comment"->if (collapsedCommentIds.contains(row.id)) {
721+
 (44* density).toInt()
722+
 } else {
723+
 max((style.rowHeightPx *3.2f).toInt(), (56* density).toInt())
724+
 }
695725
else-> style.rowHeightPx.toInt()
696726
 }.coerceAtLeast(1)
697727

0 commit comments
Comments
 (0)

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
Commit a991bbd
Browse files
cursoragentcursoragent
committed
Fix 6 Android/iOS mobile bugs: associated domains, scroll, diff indices, content reset, file nav, comment height
- Restore associatedDomains (applinks/webcredentials) for iOS builds after
relyingParty was removed from variant config
- Fix Android composer scroll by overriding scrollTo in SelectionAwareEditText
to actually prevent scrolling when scrollEnabled=false
- Map visible-range indices back to original row indices so JS highlighting
targets correct lines when files are collapsed on Android
- Bump rowsDecodeGeneration and clear rows in setContentResetKey to prevent
stale in-flight decodes from repopulating after content reset
- Emit null fileId in onVisibleFileChange when scrolled to top on Android,
matching iOS behavior for ReviewFileNavigator
- Use collapsed-aware row height (44dp) for collapsed comments in Android
DiffCanvasView, matching iOS behavior
1 parent 276b453 commit a991bbd
3 files changed
Lines changed: 41 additions & 4 deletions
File tree
‎apps/mobile/app.config.ts‎
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,7 @@ const config: ExpoConfig = {
107107
icon: variant.iosIcon,
108108
supportsTablet: true,
109109
bundleIdentifier: iosBundleIdentifier,
110+
associatedDomains: ["applinks:clerk.t3.codes","webcredentials:clerk.t3.codes"],
110111
infoPlist: {
111112
NSAppTransportSecurity: {
112113
NSAllowsArbitraryLoads: true,
‎apps/mobile/modules/t3-composer-editor/android/src/main/java/expo/modules/t3composereditor/T3ComposerEditorView.kt‎
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -197,6 +197,7 @@ class T3ComposerEditorView(context: Context, appContext: AppContext) : ExpoView(
197197

198198
funsetScrollEnabled(scrollEnabled:Boolean) {
199199
 editor.isVerticalScrollBarEnabled = scrollEnabled
200+
 editor.scrollEnabled = scrollEnabled
200201
 }
201202

202203
funsetAutoFocus(autoFocus:Boolean) {
@@ -424,6 +425,11 @@ private fun parseTokens(value: String): List<ComposerToken> = try {
424425
privateclassSelectionAwareEditText(context:Context) : EditText(context) {
425426
var selectionListener: ((Int, Int) ->Unit)?=null
426427
var pasteImagesListener: ((List<String>) ->Unit)?=null
428+
var scrollEnabled =true
429+
430+
overridefunscrollTo(x:Int, y:Int) {
431+
if (scrollEnabled) super.scrollTo(x, y)
432+
 }
427433

428434
overridefunonSelectionChanged(selStart:Int, selEnd:Int) {
429435
super.onSelectionChanged(selStart, selEnd)
‎apps/mobile/modules/t3-review-diff/android/src/main/java/expo/modules/t3reviewdiff/T3ReviewDiffView.kt‎
Lines changed: 34 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ class T3ReviewDiffView(context: Context, appContext: AppContext) : ExpoView(cont
3232
privateval onToggleComment by EventDispatcher()
3333
privatevar rows:List<DiffRow> = emptyList()
3434
privatevar visibleRows:List<DiffRow> = emptyList()
35+
privatevar visibleToOriginalIndex:IntArray= intArrayOf()
3536
privatevar collapsedFileIds:Set<String> = emptySet()
3637
privatevar viewedFileIds:Set<String> = emptySet()
3738
privatevar selectedRowIds:Set<String> = emptySet()
@@ -56,11 +57,13 @@ class T3ReviewDiffView(context: Context, appContext: AppContext) : ExpoView(cont
5657
init {
5758
 canvasView.onRowTap = { row, gesture -> handleRowTap(row, gesture) }
5859
 canvasView.onVisibleRowsChanged = { first, last ->
60+
val originalFirst =if (first in visibleToOriginalIndex.indices) visibleToOriginalIndex[first] else first
61+
val originalLast =if (last in visibleToOriginalIndex.indices) visibleToOriginalIndex[last] else last
5962
 onDebug(
6063
mapOf(
6164
"message" to "visible-range",
62-
"firstRowIndex" to first,
63-
"lastRowIndex" to last,
65+
"firstRowIndex" to originalFirst,
66+
"lastRowIndex" to originalLast,
6467
 ),
6568
 )
6669
 emitVisibleFile(first)
@@ -81,7 +84,12 @@ class T3ReviewDiffView(context: Context, appContext: AppContext) : ExpoView(cont
8184
funsetContentResetKey(value:String) {
8285
if (contentResetKey == value) return
8386
 contentResetKey = value
87+
 rowsDecodeGeneration +=1
8488
 tokensDecodeGeneration +=1
89+
 rows = emptyList()
90+
 visibleRows = emptyList()
91+
 visibleToOriginalIndex = intArrayOf()
92+
 canvasView.rows = emptyList()
8593
 canvasView.tokensByRowId = emptyMap()
8694
 lastVisibleFileId =null
8795
 pendingInitialScroll =true
@@ -314,21 +322,27 @@ class T3ReviewDiffView(context: Context, appContext: AppContext) : ExpoView(cont
314322

315323
privatefunrebuildVisibleRows() {
316324
val filtered =ArrayList<DiffRow>(rows.size)
325+
val indexMapping =ArrayList<Int>(rows.size)
317326
var currentFileCollapsed =false
318-
 rows.forEach { row ->
327+
 rows.forEachIndexed { originalIndex, row ->
319328
if (row.kind =="file") {
320329
 currentFileCollapsed = collapsedFileIds.contains(row.resolvedFileId)
321330
 filtered.add(row)
331+
 indexMapping.add(originalIndex)
322332
 } elseif (!currentFileCollapsed) {
323333
if (row.kind !="comment"||!collapsedCommentIds.contains(row.id)) {
324334
 filtered.add(row)
335+
 indexMapping.add(originalIndex)
325336
 } else {
326337
 filtered.add(row.copy(commentText ="Comment collapsed"))
338+
 indexMapping.add(originalIndex)
327339
 }
328340
 }
329341
 }
330342
 visibleRows = filtered
343+
 visibleToOriginalIndex = indexMapping.toIntArray()
331344
 canvasView.rows = filtered
345+
 canvasView.collapsedCommentIds = collapsedCommentIds
332346
 canvasView.viewedFileIds = viewedFileIds
333347
 canvasView.selectedRowIds = selectedRowIds
334348
 applyPendingInitialScroll()
@@ -360,6 +374,13 @@ class T3ReviewDiffView(context: Context, appContext: AppContext) : ExpoView(cont
360374

361375
privatefunemitVisibleFile(firstVisibleIndex:Int) {
362376
if (visibleRows.isEmpty()) return
377+
if (canvasView.verticalOffset() <=0) {
378+
if (lastVisibleFileId !=null) {
379+
 lastVisibleFileId =null
380+
 onVisibleFileChange(mapOf("fileId" to null))
381+
 }
382+
return
383+
 }
363384
val start = firstVisibleIndex.coerceIn(0, visibleRows.lastIndex)
364385
val fileId = (start downTo 0)
365386
 .asSequence()
@@ -590,6 +611,11 @@ private class DiffCanvasView(context: Context) : View(context) {
590611
 field = value
591612
 invalidate()
592613
 }
614+
var collapsedCommentIds:Set<String> = emptySet()
615+
 set(value) {
616+
 field = value
617+
 rebuildOffsets()
618+
 }
593619
var theme:DiffTheme=DiffTheme.fallback("light")
594620
 set(value) {
595621
 field = value
@@ -691,7 +717,11 @@ private class DiffCanvasView(context: Context) : View(context) {
691717

692718
privatefunrowHeight(row:DiffRow): Int=when (row.kind) {
693719
"file"-> style.fileHeaderHeightPx.toInt()
694-
"comment"-> max((style.rowHeightPx *3.2f).toInt(), (56* density).toInt())
720+
"comment"->if (collapsedCommentIds.contains(row.id)) {
721+
 (44* density).toInt()
722+
 } else {
723+
 max((style.rowHeightPx *3.2f).toInt(), (56* density).toInt())
724+
 }
695725
else-> style.rowHeightPx.toInt()
696726
 }.coerceAtLeast(1)
697727

0 commit comments
Comments
 (0)

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Commit a991bbd
Browse files
cursoragentcursoragent
committed
Fix 6 Android/iOS mobile bugs: associated domains, scroll, diff indices, content reset, file nav, comment height
- Restore associatedDomains (applinks/webcredentials) for iOS builds after
relyingParty was removed from variant config
- Fix Android composer scroll by overriding scrollTo in SelectionAwareEditText
to actually prevent scrolling when scrollEnabled=false
- Map visible-range indices back to original row indices so JS highlighting
targets correct lines when files are collapsed on Android
- Bump rowsDecodeGeneration and clear rows in setContentResetKey to prevent
stale in-flight decodes from repopulating after content reset
- Emit null fileId in onVisibleFileChange when scrolled to top on Android,
matching iOS behavior for ReviewFileNavigator
- Use collapsed-aware row height (44dp) for collapsed comments in Android
DiffCanvasView, matching iOS behavior
1 parent 276b453 commit a991bbd
3 files changed
Lines changed: 41 additions & 4 deletions
File tree
‎apps/mobile/app.config.ts‎
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,7 @@ const config: ExpoConfig = {
107107
icon: variant.iosIcon,
108108
supportsTablet: true,
109109
bundleIdentifier: iosBundleIdentifier,
110+
associatedDomains: ["applinks:clerk.t3.codes","webcredentials:clerk.t3.codes"],
110111
infoPlist: {
111112
NSAppTransportSecurity: {
112113
NSAllowsArbitraryLoads: true,
‎apps/mobile/modules/t3-composer-editor/android/src/main/java/expo/modules/t3composereditor/T3ComposerEditorView.kt‎
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -197,6 +197,7 @@ class T3ComposerEditorView(context: Context, appContext: AppContext) : ExpoView(
197197

198198
funsetScrollEnabled(scrollEnabled:Boolean) {
199199
 editor.isVerticalScrollBarEnabled = scrollEnabled
200+
 editor.scrollEnabled = scrollEnabled
200201
 }
201202

202203
funsetAutoFocus(autoFocus:Boolean) {
@@ -424,6 +425,11 @@ private fun parseTokens(value: String): List<ComposerToken> = try {
424425
privateclassSelectionAwareEditText(context:Context) : EditText(context) {
425426
var selectionListener: ((Int, Int) ->Unit)?=null
426427
var pasteImagesListener: ((List<String>) ->Unit)?=null
428+
var scrollEnabled =true
429+
430+
overridefunscrollTo(x:Int, y:Int) {
431+
if (scrollEnabled) super.scrollTo(x, y)
432+
 }
427433

428434
overridefunonSelectionChanged(selStart:Int, selEnd:Int) {
429435
super.onSelectionChanged(selStart, selEnd)
‎apps/mobile/modules/t3-review-diff/android/src/main/java/expo/modules/t3reviewdiff/T3ReviewDiffView.kt‎
Lines changed: 34 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ class T3ReviewDiffView(context: Context, appContext: AppContext) : ExpoView(cont
3232
privateval onToggleComment by EventDispatcher()
3333
privatevar rows:List<DiffRow> = emptyList()
3434
privatevar visibleRows:List<DiffRow> = emptyList()
35+
privatevar visibleToOriginalIndex:IntArray= intArrayOf()
3536
privatevar collapsedFileIds:Set<String> = emptySet()
3637
privatevar viewedFileIds:Set<String> = emptySet()
3738
privatevar selectedRowIds:Set<String> = emptySet()
@@ -56,11 +57,13 @@ class T3ReviewDiffView(context: Context, appContext: AppContext) : ExpoView(cont
5657
init {
5758
 canvasView.onRowTap = { row, gesture -> handleRowTap(row, gesture) }
5859
 canvasView.onVisibleRowsChanged = { first, last ->
60+
val originalFirst =if (first in visibleToOriginalIndex.indices) visibleToOriginalIndex[first] else first
61+
val originalLast =if (last in visibleToOriginalIndex.indices) visibleToOriginalIndex[last] else last
5962
 onDebug(
6063
mapOf(
6164
"message" to "visible-range",
62-
"firstRowIndex" to first,
63-
"lastRowIndex" to last,
65+
"firstRowIndex" to originalFirst,
66+
"lastRowIndex" to originalLast,
6467
 ),
6568
 )
6669
 emitVisibleFile(first)
@@ -81,7 +84,12 @@ class T3ReviewDiffView(context: Context, appContext: AppContext) : ExpoView(cont
8184
funsetContentResetKey(value:String) {
8285
if (contentResetKey == value) return
8386
 contentResetKey = value
87+
 rowsDecodeGeneration +=1
8488
 tokensDecodeGeneration +=1
89+
 rows = emptyList()
90+
 visibleRows = emptyList()
91+
 visibleToOriginalIndex = intArrayOf()
92+
 canvasView.rows = emptyList()
8593
 canvasView.tokensByRowId = emptyMap()
8694
 lastVisibleFileId =null
8795
 pendingInitialScroll =true
@@ -314,21 +322,27 @@ class T3ReviewDiffView(context: Context, appContext: AppContext) : ExpoView(cont
314322

315323
privatefunrebuildVisibleRows() {
316324
val filtered =ArrayList<DiffRow>(rows.size)
325+
val indexMapping =ArrayList<Int>(rows.size)
317326
var currentFileCollapsed =false
318-
 rows.forEach { row ->
327+
 rows.forEachIndexed { originalIndex, row ->
319328
if (row.kind =="file") {
320329
 currentFileCollapsed = collapsedFileIds.contains(row.resolvedFileId)
321330
 filtered.add(row)
331+
 indexMapping.add(originalIndex)
322332
 } elseif (!currentFileCollapsed) {
323333
if (row.kind !="comment"||!collapsedCommentIds.contains(row.id)) {
324334
 filtered.add(row)
335+
 indexMapping.add(originalIndex)
325336
 } else {
326337
 filtered.add(row.copy(commentText ="Comment collapsed"))
338+
 indexMapping.add(originalIndex)
327339
 }
328340
 }
329341
 }
330342
 visibleRows = filtered
343+
 visibleToOriginalIndex = indexMapping.toIntArray()
331344
 canvasView.rows = filtered
345+
 canvasView.collapsedCommentIds = collapsedCommentIds
332346
 canvasView.viewedFileIds = viewedFileIds
333347
 canvasView.selectedRowIds = selectedRowIds
334348
 applyPendingInitialScroll()
@@ -360,6 +374,13 @@ class T3ReviewDiffView(context: Context, appContext: AppContext) : ExpoView(cont
360374

361375
privatefunemitVisibleFile(firstVisibleIndex:Int) {
362376
if (visibleRows.isEmpty()) return
377+
if (canvasView.verticalOffset() <=0) {
378+
if (lastVisibleFileId !=null) {
379+
 lastVisibleFileId =null
380+
 onVisibleFileChange(mapOf("fileId" to null))
381+
 }
382+
return
383+
 }
363384
val start = firstVisibleIndex.coerceIn(0, visibleRows.lastIndex)
364385
val fileId = (start downTo 0)
365386
 .asSequence()
@@ -590,6 +611,11 @@ private class DiffCanvasView(context: Context) : View(context) {
590611
 field = value
591612
 invalidate()
592613
 }
614+
var collapsedCommentIds:Set<String> = emptySet()
615+
 set(value) {
616+
 field = value
617+
 rebuildOffsets()
618+
 }
593619
var theme:DiffTheme=DiffTheme.fallback("light")
594620
 set(value) {
595621
 field = value
@@ -691,7 +717,11 @@ private class DiffCanvasView(context: Context) : View(context) {
691717

692718
privatefunrowHeight(row:DiffRow): Int=when (row.kind) {
693719
"file"-> style.fileHeaderHeightPx.toInt()
694-
"comment"-> max((style.rowHeightPx *3.2f).toInt(), (56* density).toInt())
720+
"comment"->if (collapsedCommentIds.contains(row.id)) {
721+
 (44* density).toInt()
722+
 } else {
723+
 max((style.rowHeightPx *3.2f).toInt(), (56* density).toInt())
724+
 }
695725
else-> style.rowHeightPx.toInt()
696726
 }.coerceAtLeast(1)
697727

0 commit comments
Comments
 (0)

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Commit a991bbd
Browse files
cursoragentcursoragent
committed
Fix 6 Android/iOS mobile bugs: associated domains, scroll, diff indices, content reset, file nav, comment height
- Restore associatedDomains (applinks/webcredentials) for iOS builds after
relyingParty was removed from variant config
- Fix Android composer scroll by overriding scrollTo in SelectionAwareEditText
to actually prevent scrolling when scrollEnabled=false
- Map visible-range indices back to original row indices so JS highlighting
targets correct lines when files are collapsed on Android
- Bump rowsDecodeGeneration and clear rows in setContentResetKey to prevent
stale in-flight decodes from repopulating after content reset
- Emit null fileId in onVisibleFileChange when scrolled to top on Android,
matching iOS behavior for ReviewFileNavigator
- Use collapsed-aware row height (44dp) for collapsed comments in Android
DiffCanvasView, matching iOS behavior
1 parent 276b453 commit a991bbd
3 files changed
Lines changed: 41 additions & 4 deletions
File tree
‎apps/mobile/app.config.ts‎
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,7 @@ const config: ExpoConfig = {
107107
icon: variant.iosIcon,
108108
supportsTablet: true,
109109
bundleIdentifier: iosBundleIdentifier,
110+
associatedDomains: ["applinks:clerk.t3.codes","webcredentials:clerk.t3.codes"],
110111
infoPlist: {
111112
NSAppTransportSecurity: {
112113
NSAllowsArbitraryLoads: true,
‎apps/mobile/modules/t3-composer-editor/android/src/main/java/expo/modules/t3composereditor/T3ComposerEditorView.kt‎
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -197,6 +197,7 @@ class T3ComposerEditorView(context: Context, appContext: AppContext) : ExpoView(
197197

198198
funsetScrollEnabled(scrollEnabled:Boolean) {
199199
 editor.isVerticalScrollBarEnabled = scrollEnabled
200+
 editor.scrollEnabled = scrollEnabled
200201
 }
201202

202203
funsetAutoFocus(autoFocus:Boolean) {
@@ -424,6 +425,11 @@ private fun parseTokens(value: String): List<ComposerToken> = try {
424425
privateclassSelectionAwareEditText(context:Context) : EditText(context) {
425426
var selectionListener: ((Int, Int) ->Unit)?=null
426427
var pasteImagesListener: ((List<String>) ->Unit)?=null
428+
var scrollEnabled =true
429+
430+
overridefunscrollTo(x:Int, y:Int) {
431+
if (scrollEnabled) super.scrollTo(x, y)
432+
 }
427433

428434
overridefunonSelectionChanged(selStart:Int, selEnd:Int) {
429435
super.onSelectionChanged(selStart, selEnd)
‎apps/mobile/modules/t3-review-diff/android/src/main/java/expo/modules/t3reviewdiff/T3ReviewDiffView.kt‎
Lines changed: 34 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ class T3ReviewDiffView(context: Context, appContext: AppContext) : ExpoView(cont
3232
privateval onToggleComment by EventDispatcher()
3333
privatevar rows:List<DiffRow> = emptyList()
3434
privatevar visibleRows:List<DiffRow> = emptyList()
35+
privatevar visibleToOriginalIndex:IntArray= intArrayOf()
3536
privatevar collapsedFileIds:Set<String> = emptySet()
3637
privatevar viewedFileIds:Set<String> = emptySet()
3738
privatevar selectedRowIds:Set<String> = emptySet()
@@ -56,11 +57,13 @@ class T3ReviewDiffView(context: Context, appContext: AppContext) : ExpoView(cont
5657
init {
5758
 canvasView.onRowTap = { row, gesture -> handleRowTap(row, gesture) }
5859
 canvasView.onVisibleRowsChanged = { first, last ->
60+
val originalFirst =if (first in visibleToOriginalIndex.indices) visibleToOriginalIndex[first] else first
61+
val originalLast =if (last in visibleToOriginalIndex.indices) visibleToOriginalIndex[last] else last
5962
 onDebug(
6063
mapOf(
6164
"message" to "visible-range",
62-
"firstRowIndex" to first,
63-
"lastRowIndex" to last,
65+
"firstRowIndex" to originalFirst,
66+
"lastRowIndex" to originalLast,
6467
 ),
6568
 )
6669
 emitVisibleFile(first)
@@ -81,7 +84,12 @@ class T3ReviewDiffView(context: Context, appContext: AppContext) : ExpoView(cont
8184
funsetContentResetKey(value:String) {
8285
if (contentResetKey == value) return
8386
 contentResetKey = value
87+
 rowsDecodeGeneration +=1
8488
 tokensDecodeGeneration +=1
89+
 rows = emptyList()
90+
 visibleRows = emptyList()
91+
 visibleToOriginalIndex = intArrayOf()
92+
 canvasView.rows = emptyList()
8593
 canvasView.tokensByRowId = emptyMap()
8694
 lastVisibleFileId =null
8795
 pendingInitialScroll =true
@@ -314,21 +322,27 @@ class T3ReviewDiffView(context: Context, appContext: AppContext) : ExpoView(cont
314322

315323
privatefunrebuildVisibleRows() {
316324
val filtered =ArrayList<DiffRow>(rows.size)
325+
val indexMapping =ArrayList<Int>(rows.size)
317326
var currentFileCollapsed =false
318-
 rows.forEach { row ->
327+
 rows.forEachIndexed { originalIndex, row ->
319328
if (row.kind =="file") {
320329
 currentFileCollapsed = collapsedFileIds.contains(row.resolvedFileId)
321330
 filtered.add(row)
331+
 indexMapping.add(originalIndex)
322332
 } elseif (!currentFileCollapsed) {
323333
if (row.kind !="comment"||!collapsedCommentIds.contains(row.id)) {
324334
 filtered.add(row)
335+
 indexMapping.add(originalIndex)
325336
 } else {
326337
 filtered.add(row.copy(commentText ="Comment collapsed"))
338+
 indexMapping.add(originalIndex)
327339
 }
328340
 }
329341
 }
330342
 visibleRows = filtered
343+
 visibleToOriginalIndex = indexMapping.toIntArray()
331344
 canvasView.rows = filtered
345+
 canvasView.collapsedCommentIds = collapsedCommentIds
332346
 canvasView.viewedFileIds = viewedFileIds
333347
 canvasView.selectedRowIds = selectedRowIds
334348
 applyPendingInitialScroll()
@@ -360,6 +374,13 @@ class T3ReviewDiffView(context: Context, appContext: AppContext) : ExpoView(cont
360374

361375
privatefunemitVisibleFile(firstVisibleIndex:Int) {
362376
if (visibleRows.isEmpty()) return
377+
if (canvasView.verticalOffset() <=0) {
378+
if (lastVisibleFileId !=null) {
379+
 lastVisibleFileId =null
380+
 onVisibleFileChange(mapOf("fileId" to null))
381+
 }
382+
return
383+
 }
363384
val start = firstVisibleIndex.coerceIn(0, visibleRows.lastIndex)
364385
val fileId = (start downTo 0)
365386
 .asSequence()
@@ -590,6 +611,11 @@ private class DiffCanvasView(context: Context) : View(context) {
590611
 field = value
591612
 invalidate()
592613
 }
614+
var collapsedCommentIds:Set<String> = emptySet()
615+
 set(value) {
616+
 field = value
617+
 rebuildOffsets()
618+
 }
593619
var theme:DiffTheme=DiffTheme.fallback("light")
594620
 set(value) {
595621
 field = value
@@ -691,7 +717,11 @@ private class DiffCanvasView(context: Context) : View(context) {
691717

692718
privatefunrowHeight(row:DiffRow): Int=when (row.kind) {
693719
"file"-> style.fileHeaderHeightPx.toInt()
694-
"comment"-> max((style.rowHeightPx *3.2f).toInt(), (56* density).toInt())
720+
"comment"->if (collapsedCommentIds.contains(row.id)) {
721+
 (44* density).toInt()
722+
 } else {
723+
 max((style.rowHeightPx *3.2f).toInt(), (56* density).toInt())
724+
 }
695725
else-> style.rowHeightPx.toInt()
696726
 }.coerceAtLeast(1)
697727

0 commit comments
Comments
 (0)

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
Commit a991bbd
Browse files
cursoragentcursoragent
committed
Fix 6 Android/iOS mobile bugs: associated domains, scroll, diff indices, content reset, file nav, comment height
- Restore associatedDomains (applinks/webcredentials) for iOS builds after
relyingParty was removed from variant config
- Fix Android composer scroll by overriding scrollTo in SelectionAwareEditText
to actually prevent scrolling when scrollEnabled=false
- Map visible-range indices back to original row indices so JS highlighting
targets correct lines when files are collapsed on Android
- Bump rowsDecodeGeneration and clear rows in setContentResetKey to prevent
stale in-flight decodes from repopulating after content reset
- Emit null fileId in onVisibleFileChange when scrolled to top on Android,
matching iOS behavior for ReviewFileNavigator
- Use collapsed-aware row height (44dp) for collapsed comments in Android
DiffCanvasView, matching iOS behavior
1 parent 276b453 commit a991bbd
3 files changed
Lines changed: 41 additions & 4 deletions
File tree
‎apps/mobile/app.config.ts‎
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,7 @@ const config: ExpoConfig = {
107107
icon: variant.iosIcon,
108108
supportsTablet: true,
109109
bundleIdentifier: iosBundleIdentifier,
110+
associatedDomains: ["applinks:clerk.t3.codes","webcredentials:clerk.t3.codes"],
110111
infoPlist: {
111112
NSAppTransportSecurity: {
112113
NSAllowsArbitraryLoads: true,
‎apps/mobile/modules/t3-composer-editor/android/src/main/java/expo/modules/t3composereditor/T3ComposerEditorView.kt‎
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -197,6 +197,7 @@ class T3ComposerEditorView(context: Context, appContext: AppContext) : ExpoView(
197197

198198
funsetScrollEnabled(scrollEnabled:Boolean) {
199199
 editor.isVerticalScrollBarEnabled = scrollEnabled
200+
 editor.scrollEnabled = scrollEnabled
200201
 }
201202

202203
funsetAutoFocus(autoFocus:Boolean) {
@@ -424,6 +425,11 @@ private fun parseTokens(value: String): List<ComposerToken> = try {
424425
privateclassSelectionAwareEditText(context:Context) : EditText(context) {
425426
var selectionListener: ((Int, Int) ->Unit)?=null
426427
var pasteImagesListener: ((List<String>) ->Unit)?=null
428+
var scrollEnabled =true
429+
430+
overridefunscrollTo(x:Int, y:Int) {
431+
if (scrollEnabled) super.scrollTo(x, y)
432+
 }
427433

428434
overridefunonSelectionChanged(selStart:Int, selEnd:Int) {
429435
super.onSelectionChanged(selStart, selEnd)
‎apps/mobile/modules/t3-review-diff/android/src/main/java/expo/modules/t3reviewdiff/T3ReviewDiffView.kt‎
Lines changed: 34 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ class T3ReviewDiffView(context: Context, appContext: AppContext) : ExpoView(cont
3232
privateval onToggleComment by EventDispatcher()
3333
privatevar rows:List<DiffRow> = emptyList()
3434
privatevar visibleRows:List<DiffRow> = emptyList()
35+
privatevar visibleToOriginalIndex:IntArray= intArrayOf()
3536
privatevar collapsedFileIds:Set<String> = emptySet()
3637
privatevar viewedFileIds:Set<String> = emptySet()
3738
privatevar selectedRowIds:Set<String> = emptySet()
@@ -56,11 +57,13 @@ class T3ReviewDiffView(context: Context, appContext: AppContext) : ExpoView(cont
5657
init {
5758
 canvasView.onRowTap = { row, gesture -> handleRowTap(row, gesture) }
5859
 canvasView.onVisibleRowsChanged = { first, last ->
60+
val originalFirst =if (first in visibleToOriginalIndex.indices) visibleToOriginalIndex[first] else first
61+
val originalLast =if (last in visibleToOriginalIndex.indices) visibleToOriginalIndex[last] else last
5962
 onDebug(
6063
mapOf(
6164
"message" to "visible-range",
62-
"firstRowIndex" to first,
63-
"lastRowIndex" to last,
65+
"firstRowIndex" to originalFirst,
66+
"lastRowIndex" to originalLast,
6467
 ),
6568
 )
6669
 emitVisibleFile(first)
@@ -81,7 +84,12 @@ class T3ReviewDiffView(context: Context, appContext: AppContext) : ExpoView(cont
8184
funsetContentResetKey(value:String) {
8285
if (contentResetKey == value) return
8386
 contentResetKey = value
87+
 rowsDecodeGeneration +=1
8488
 tokensDecodeGeneration +=1
89+
 rows = emptyList()
90+
 visibleRows = emptyList()
91+
 visibleToOriginalIndex = intArrayOf()
92+
 canvasView.rows = emptyList()
8593
 canvasView.tokensByRowId = emptyMap()
8694
 lastVisibleFileId =null
8795
 pendingInitialScroll =true
@@ -314,21 +322,27 @@ class T3ReviewDiffView(context: Context, appContext: AppContext) : ExpoView(cont
314322

315323
privatefunrebuildVisibleRows() {
316324
val filtered =ArrayList<DiffRow>(rows.size)
325+
val indexMapping =ArrayList<Int>(rows.size)
317326
var currentFileCollapsed =false
318-
 rows.forEach { row ->
327+
 rows.forEachIndexed { originalIndex, row ->
319328
if (row.kind =="file") {
320329
 currentFileCollapsed = collapsedFileIds.contains(row.resolvedFileId)
321330
 filtered.add(row)
331+
 indexMapping.add(originalIndex)
322332
 } elseif (!currentFileCollapsed) {
323333
if (row.kind !="comment"||!collapsedCommentIds.contains(row.id)) {
324334
 filtered.add(row)
335+
 indexMapping.add(originalIndex)
325336
 } else {
326337
 filtered.add(row.copy(commentText ="Comment collapsed"))
338+
 indexMapping.add(originalIndex)
327339
 }
328340
 }
329341
 }
330342
 visibleRows = filtered
343+
 visibleToOriginalIndex = indexMapping.toIntArray()
331344
 canvasView.rows = filtered
345+
 canvasView.collapsedCommentIds = collapsedCommentIds
332346
 canvasView.viewedFileIds = viewedFileIds
333347
 canvasView.selectedRowIds = selectedRowIds
334348
 applyPendingInitialScroll()
@@ -360,6 +374,13 @@ class T3ReviewDiffView(context: Context, appContext: AppContext) : ExpoView(cont
360374

361375
privatefunemitVisibleFile(firstVisibleIndex:Int) {
362376
if (visibleRows.isEmpty()) return
377+
if (canvasView.verticalOffset() <=0) {
378+
if (lastVisibleFileId !=null) {
379+
 lastVisibleFileId =null
380+
 onVisibleFileChange(mapOf("fileId" to null))
381+
 }
382+
return
383+
 }
363384
val start = firstVisibleIndex.coerceIn(0, visibleRows.lastIndex)
364385
val fileId = (start downTo 0)
365386
 .asSequence()
@@ -590,6 +611,11 @@ private class DiffCanvasView(context: Context) : View(context) {
590611
 field = value
591612
 invalidate()
592613
 }
614+
var collapsedCommentIds:Set<String> = emptySet()
615+
 set(value) {
616+
 field = value
617+
 rebuildOffsets()
618+
 }
593619
var theme:DiffTheme=DiffTheme.fallback("light")
594620
 set(value) {
595621
 field = value
@@ -691,7 +717,11 @@ private class DiffCanvasView(context: Context) : View(context) {
691717

692718
privatefunrowHeight(row:DiffRow): Int=when (row.kind) {
693719
"file"-> style.fileHeaderHeightPx.toInt()
694-
"comment"-> max((style.rowHeightPx *3.2f).toInt(), (56* density).toInt())
720+
"comment"->if (collapsedCommentIds.contains(row.id)) {
721+
 (44* density).toInt()
722+
 } else {
723+
 max((style.rowHeightPx *3.2f).toInt(), (56* density).toInt())
724+
 }
695725
else-> style.rowHeightPx.toInt()
696726
 }.coerceAtLeast(1)
697727

0 commit comments
Comments
 (0)