Resolve merge conflicts with openapi-diff base branch

Co-authored-by: ulrikandersen <11440456+ulrikandersen@users.noreply.github.com>

Author: Copilot

src/common/ui/HighlightText.tsx

@@ -1,5 +1,5 @@
 "use client"
-import React from "react"
+
 import { SxProps, Typography, TypographyVariant } from "@mui/material"
 import styled from "@emotion/styled"
 

src/common/ui/SpacedList.tsx

@@ -1,32 +1,28 @@
 import React from "react"
 import { List, Box, SxProps } from "@mui/material"
 
-const SpacedList = ({
-  itemSpacing,
-  sx,
-  children
-}: {
+interface SpacedListProps {
   itemSpacing: number
   sx?: SxProps
   children?: React.ReactNode
-}) => {
+}
+
+const SpacedList = ({ itemSpacing, sx, children }: SpacedListProps) => {
+  const childrenArray = React.Children.toArray(children)
+  const lastIndex = childrenArray.length - 1
+
   return (
-    <List disablePadding sx={{ ...sx }}>
-      {React.Children.map(children, (child, idx) => {
-        const baseKey = (child as React.ReactElement)?.key ?? "idx";
-        const key = `${String(baseKey)}-${idx}`;
-        return (
-          <Box
-            key={key}
-            sx={{
-              marginBottom:
-                idx < React.Children.count(children) - 1 ? itemSpacing : 0,
-            }}
-          >
-            {child}
-          </Box>
-        );
-      })}
+    <List disablePadding sx={sx}>
+      {childrenArray.map((child, idx) => (
+        <Box
+          key={idx}
+          sx={{
+            marginBottom: idx < lastIndex ? itemSpacing : 0
+          }}
+        >
+          {child}
+        </Box>
+      ))}
     </List>
   )
 }

src/features/diff/data/IOasDiffCalculator.ts

@@ -1,4 +1,4 @@
-import { DiffChange } from "../domain/DiffChange";
+import { DiffChange } from "../domain/DiffChange"
 
 export interface DiffResult {
     from: string
@@ -14,5 +14,5 @@ export interface IOasDiffCalculator {
         path: string,
         baseRefOid: string,
         toRef: string
-    ): Promise<DiffResult>;
+    ): Promise<DiffResult>
 }

src/features/diff/domain/DiffChange.ts

@@ -1,4 +1,4 @@
-import { z } from "zod";
+import { z } from "zod"
 
 export const DiffChangeSchema = z.object({
   id: z.string(),
@@ -9,6 +9,6 @@ export const DiffChangeSchema = z.object({
   path: z.string().optional(),
   source: z.string().optional(),
   section: z.string().optional(),
-});
+})
 
-export type DiffChange = z.infer<typeof DiffChangeSchema>;
+export type DiffChange = z.infer<typeof DiffChangeSchema>