From f0b97f1d3389165767e095878d814d3e0ac18ece Mon Sep 17 00:00:00 2001
From: Siddharth Movaliya <siddraj1992@gmail.com>
Date: Thu, 5 Oct 2023 16:37:42 +0530
Subject: [PATCH 1/4] fix: #11213, #11215

---
 .../components/data-table/DataTableToolbar.tsx   |  4 ++--
 packages/ui/components/data-table/index.tsx      | 16 ++--------------
 packages/ui/components/table/TableNew.tsx        |  8 ++++++--
 3 files changed, 10 insertions(+), 18 deletions(-)

diff --git a/packages/ui/components/data-table/DataTableToolbar.tsx b/packages/ui/components/data-table/DataTableToolbar.tsx
index 9e8250b3bada05..be6426c322aa0c 100644
--- a/packages/ui/components/data-table/DataTableToolbar.tsx
+++ b/packages/ui/components/data-table/DataTableToolbar.tsx
@@ -36,10 +36,10 @@ export function DataTableToolbar<TData>({
   const isFiltered = table.getState().columnFilters.length > 0;
 
   return (
-    <div className="flex items-center justify-end space-x-2">
+    <div className="bg-darkgray-50 sticky top-[3rem] z-10 flex items-center justify-end space-x-2 py-4 md:top-0">
       {searchKey && (
         <Input
-          className="max-w-64 mb-0 mr-auto"
+          className="max-w-64 mb-0 mr-auto rounded-md"
           placeholder="Search"
           value={(table.getColumn(searchKey)?.getFilterValue() as string) ?? ""}
           onChange={(event) => table.getColumn(searchKey)?.setFilterValue(event.target.value)}
diff --git a/packages/ui/components/data-table/index.tsx b/packages/ui/components/data-table/index.tsx
index 3cf83a79062fe4..5a41ebcf4e7b8e 100644
--- a/packages/ui/components/data-table/index.tsx
+++ b/packages/ui/components/data-table/index.tsx
@@ -102,21 +102,9 @@ export function DataTable<TData, TValue>({
         searchKey={searchKey}
         tableCTA={tableCTA}
       />
-      <div
-        className="border-subtle rounded-md border"
-        ref={tableContainerRef}
-        onScroll={onScroll}
-        style={{
-          height: "calc(100vh - 30vh)",
-          overflow: "auto",
-        }}>
+      <div className="border-subtle border" ref={tableContainerRef} onScroll={onScroll}>
         <Table>
-          <TableHeader
-            style={{
-              position: "sticky",
-              top: 0,
-              zIndex: 1,
-            }}>
+          <TableHeader>
             {table.getHeaderGroups().map((headerGroup) => (
               <TableRow key={headerGroup.id}>
                 {headerGroup.headers.map((header) => {
diff --git a/packages/ui/components/table/TableNew.tsx b/packages/ui/components/table/TableNew.tsx
index 0825ff375b5f26..146e2297d51e93 100644
--- a/packages/ui/components/table/TableNew.tsx
+++ b/packages/ui/components/table/TableNew.tsx
@@ -4,7 +4,7 @@ import { classNames } from "@calcom/lib";
 
 const Table = React.forwardRef<HTMLTableElement, React.HTMLAttributes<HTMLTableElement>>(
   ({ className, ...props }, ref) => (
-    <div className="w-full overflow-auto">
+    <div className="w-full overflow-auto md:overflow-visible">
       <table ref={ref} className={classNames("w-full caption-bottom text-sm", className)} {...props} />
     </div>
   )
@@ -13,7 +13,11 @@ Table.displayName = "Table";
 
 const TableHeader = React.forwardRef<HTMLTableSectionElement, React.HTMLAttributes<HTMLTableSectionElement>>(
   ({ className, ...props }, ref) => (
-    <thead ref={ref} className={classNames("[&_tr]:bg-subtle [&_tr]:border-b", className)} {...props} />
+    <thead
+      ref={ref}
+      className={classNames("[&_tr]:bg-subtle md:sticky md:top-[4.25rem] md:z-10 [&_tr]:border-b", className)}
+      {...props}
+    />
   )
 );
 TableHeader.displayName = "TableHeader";

From afa5e5a9a6db17e87c14899fc848a905bda4b5a4 Mon Sep 17 00:00:00 2001
From: Sean Brydon <sean@cal.com>
Date: Thu, 5 Oct 2023 14:59:05 +0100
Subject: [PATCH 2/4] Use default colour

---
 packages/ui/components/data-table/DataTableToolbar.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/ui/components/data-table/DataTableToolbar.tsx b/packages/ui/components/data-table/DataTableToolbar.tsx
index be6426c322aa0c..df3370bed83e5f 100644
--- a/packages/ui/components/data-table/DataTableToolbar.tsx
+++ b/packages/ui/components/data-table/DataTableToolbar.tsx
@@ -36,7 +36,7 @@ export function DataTableToolbar<TData>({
   const isFiltered = table.getState().columnFilters.length > 0;
 
   return (
-    <div className="bg-darkgray-50 sticky top-[3rem] z-10 flex items-center justify-end space-x-2 py-4 md:top-0">
+    <div className="bg-default sticky top-[3rem] z-10 flex items-center justify-end space-x-2 py-4 md:top-0">
       {searchKey && (
         <Input
           className="max-w-64 mb-0 mr-auto rounded-md"

From 42c5bdef08923b655269fc96f7472f07e2469544 Mon Sep 17 00:00:00 2001
From: Roland Weisleder <rweisleder@users.noreply.github.com>
Date: Mon, 1 Jul 2024 15:24:06 +0200
Subject: [PATCH 3/4] Fix typo in german translation

---
 apps/web/public/static/locales/de/common.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/web/public/static/locales/de/common.json b/apps/web/public/static/locales/de/common.json
index 14324480925511..80cbc7ca61ff62 100644
--- a/apps/web/public/static/locales/de/common.json
+++ b/apps/web/public/static/locales/de/common.json
@@ -812,7 +812,7 @@
   "add_new_event_type": "Neuen Termintyp hinzufügen",
   "new_event_type_to_book_description": "Erstellen Sie einen neuen Termintyp, mit dem Personen Zeiten buchen können.",
   "length": "Länge",
-  "minimum_booking_notice": "Mindesvorlaufzeit für eine Buchung",
+  "minimum_booking_notice": "Mindestvorlaufzeit für eine Buchung",
   "offset_toggle": "Versetzte Startzeiten",
   "offset_toggle_description": "Versetzt die den Buchern angezeigten Zeitfenster um eine bestimmte Anzahl von Minuten",
   "offset_start": "Versetzt um",

From dde4100ecde67356f4008b4e55f5b7396daab44c Mon Sep 17 00:00:00 2001
From: unknown <adhabal2002@gmail.com>
Date: Tue, 2 Jul 2024 05:52:26 +0530
Subject: [PATCH 4/4] fix_the_conflict

---
 packages/ui/components/data-table/DataTableToolbar.tsx | 2 +-
 packages/ui/components/data-table/index.tsx            | 2 +-
 packages/ui/components/table/TableNew.tsx              | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/ui/components/data-table/DataTableToolbar.tsx b/packages/ui/components/data-table/DataTableToolbar.tsx
index 43aff54ab28cce..ab0803619af942 100644
--- a/packages/ui/components/data-table/DataTableToolbar.tsx
+++ b/packages/ui/components/data-table/DataTableToolbar.tsx
@@ -96,4 +96,4 @@ export function DataTableToolbar<TData>({
       {tableCTA ? tableCTA : null}
     </div>
   );
-}
\ No newline at end of file
+}
diff --git a/packages/ui/components/data-table/index.tsx b/packages/ui/components/data-table/index.tsx
index 291f50ca728f41..16c6fc191bbcb3 100644
--- a/packages/ui/components/data-table/index.tsx
+++ b/packages/ui/components/data-table/index.tsx
@@ -181,4 +181,4 @@ export function DataTable<TData, TValue>({
       />
     </div>
   );
-}
\ No newline at end of file
+}
diff --git a/packages/ui/components/table/TableNew.tsx b/packages/ui/components/table/TableNew.tsx
index 91a8084af54f59..d04e2ecf0a5c0d 100644
--- a/packages/ui/components/table/TableNew.tsx
+++ b/packages/ui/components/table/TableNew.tsx
@@ -86,4 +86,4 @@ const TableCaption = React.forwardRef<HTMLTableCaptionElement, React.HTMLAttribu
 );
 TableCaption.displayName = "TableCaption";
 
-export { Table, TableHeader, TableBody, TableFooter, TableHead, TableRow, TableCell, TableCaption };
\ No newline at end of file
+export { Table, TableHeader, TableBody, TableFooter, TableHead, TableRow, TableCell, TableCaption };