Fix merge bugs

Author: wenli-cai

workflow-trace-viewer/src/jvmMain/kotlin/com/squareup/workflow1/traceviewer/App.kt

@@ -38,6 +38,7 @@ internal fun App(
   val sandboxState = remember { SandboxState() }
 
   // Default to File mode, and can be toggled to be in Live mode.
+  var active by remember { mutableStateOf(false) }
   var traceMode by remember { mutableStateOf<TraceMode>(TraceMode.File(null)) }
   var selectedTraceFile by remember { mutableStateOf<PlatformFile?>(null) }
 

workflow-trace-viewer/src/jvmMain/kotlin/com/squareup/workflow1/traceviewer/ui/WorkflowTree.kt

@@ -22,7 +22,9 @@ import androidx.compose.ui.input.pointer.isPrimaryPressed
 import androidx.compose.ui.input.pointer.isSecondaryPressed
 import androidx.compose.ui.input.pointer.onPointerEvent
 import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
 import com.squareup.workflow1.traceviewer.model.Node
+import com.squareup.workflow1.traceviewer.model.NodeUpdate
 
 /**
  * Since the workflow nodes present a tree structure, we utilize a recursive function to draw the tree

workflow-trace-viewer/src/jvmMain/kotlin/com/squareup/workflow1/traceviewer/util/TraceParser.kt

@@ -13,6 +13,7 @@ import androidx.compose.ui.Modifier
 import com.squareup.moshi.JsonAdapter
 import com.squareup.workflow1.traceviewer.TraceMode
 import com.squareup.workflow1.traceviewer.model.Node
+import com.squareup.workflow1.traceviewer.model.NodeUpdate
 import com.squareup.workflow1.traceviewer.ui.DrawTree
 
 /**
@@ -25,30 +26,32 @@ import com.squareup.workflow1.traceviewer.ui.DrawTree
 internal fun RenderTrace(
   traceSource: TraceMode,
   frameInd: Int,
-  onFileParse: (List<Node>) -> Unit,
-  onNodeSelect: (Node, Node?) -> Unit,
+  onFileParse: (Int) -> Unit,
+  onNodeSelect: (NodeUpdate) -> Unit,
   onNewFrame: () -> Unit,
+  onNewData: (String) -> Unit,
   modifier: Modifier = Modifier
 ) {
   var isLoading by remember(traceSource) { mutableStateOf(true) }
   var error by remember(traceSource) { mutableStateOf<String?>(null) }
-  val frames = remember { mutableStateListOf<Node>() }
-  val fullTree = remember { mutableStateListOf<Node>() }
-  val affectedNodes = remember { mutableStateListOf<Set<Node>>() }
+  val frames = remember (traceSource){ mutableStateListOf<Node>() }
+  val fullTree = remember (traceSource){ mutableStateListOf<Node>() }
+  val affectedNodes = remember (traceSource){ mutableStateListOf<Set<Node>>() }
 
   // Updates current state with the new data from trace source.
   fun addToStates(frame: List<Node>, tree: List<Node>, affected: List<Set<Node>>) {
     frames.addAll(frame)
     fullTree.addAll(tree)
     affectedNodes.addAll(affected)
     isLoading = false
-    onFileParse(frame)
+    onFileParse(frame.size)
   }
 
   // Handles the result of parsing a trace, either from file or live. Live mode includes callback
   // for when a new frame is received.
   fun handleParseResult(
     parseResult: ParseResult,
+    rawRenderPass: String? = null,
     onNewFrame: (() -> Unit)? = null
   ) {
     when (parseResult) {
@@ -62,7 +65,9 @@ internal fun RenderTrace(
           tree = parseResult.trees,
           affected = parseResult.affectedNodes
         )
+        // Only increment the frame index and add the raw data during Live tracing mode
         onNewFrame?.invoke()
+        rawRenderPass?.let { onNewData(it) }
       }
     }
   }
@@ -82,7 +87,7 @@ internal fun RenderTrace(
         streamRenderPassesFromDevice { renderPass ->
           val currentTree = fullTree.lastOrNull()
           val parseResult = parseLiveTrace(renderPass, adapter, currentTree)
-          handleParseResult(parseResult, onNewFrame)
+          handleParseResult(parseResult, renderPass, onNewFrame)
         }
         error = "Socket has already been closed or is not available."
       }
@@ -98,7 +103,7 @@ internal fun RenderTrace(
     val previousFrame = if (frameInd > 0) fullTree[frameInd - 1] else null
     DrawTree(
       node = fullTree[frameInd],
-      previousNode = previousFrame,
+      previousFrameNode = previousFrame,
       affectedNodes = affectedNodes[frameInd],
       expandedNodes = remember(frameInd) { mutableStateMapOf() },
       onNodeSelect = onNodeSelect,