Open Source Platform for DTC, B2B Commerce, Marketplaces & Omnichannel. REST APIs, TypeScript SDKs, and production-ready Next.js storefront. Self-host it. Own your data. No vendor lock-in. Zero platform fees.
Ruby b2b-commercee-commerceecommerceecommerce-apiecommerce-frameworkecommerce-platformheadlessheadless-commerceheadless-ecommercemarketplacemulti-tenantmulti-vendormulti-vendor-ecommerceopen-sourcespree-commerce
Hoist DndContext above <Table> in ResourceTable
Damian Legawiec07070f694a0c
diff --git a/packages/admin/src/components/spree/resource-table.tsx b/packages/admin/src/components/spree/resource-table.tsxindex 89c07f8934..771bd24afb 100644--- a/packages/admin/src/components/spree/resource-table.tsx+++ b/packages/admin/src/components/spree/resource-table.tsx@@ -339,27 +339,27 @@ export function ResourceTable<T extends Record<string, any>>({hideSort={reorderActive}/><CardContent className="p-0">- <Table>- <TableHeader>- <tr>- {reorderActive && <TableHead className="w-8" />}- {headerColumns.map((col) => (- <TableHead key={col.key} className={col.headerClassName}>- {col.label}- </TableHead>- ))}- </tr>- </TableHeader>- {reorderActive ? (- <DndContext- sensors={sensors}- collisionDetection={closestCenter}- onDragEnd={handleDragEnd}+ {reorderActive ? (+ <DndContext+ sensors={sensors}+ collisionDetection={closestCenter}+ onDragEnd={handleDragEnd}+ >+ <SortableContext+ items={rows.map((r) => (r as any).id)}+ strategy={verticalListSortingStrategy}>- <SortableContext- items={rows.map((r) => (r as any).id)}- strategy={verticalListSortingStrategy}- >+ <Table>+ <TableHeader>+ <tr>+ <TableHead className="w-8" />+ {headerColumns.map((col) => (+ <TableHead key={col.key} className={col.headerClassName}>+ {col.label}+ </TableHead>+ ))}+ </tr>+ </TableHeader><TableBody>{isLoading ? (<TableEmpty colSpan={visibleColumns.length + 1}>Loading...</TableEmpty>@@ -382,9 +382,20 @@ export function ResourceTable<T extends Record<string, any>>({)))}</TableBody>- </SortableContext>- </DndContext>- ) : (+ </Table>+ </SortableContext>+ </DndContext>+ ) : (+ <Table>+ <TableHeader>+ <tr>+ {headerColumns.map((col) => (+ <TableHead key={col.key} className={col.headerClassName}>+ {col.label}+ </TableHead>+ ))}+ </tr>+ </TableHeader><TableBody>{isLoading ? (<TableEmpty colSpan={visibleColumns.length}>Loading...</TableEmpty>@@ -413,8 +424,8 @@ export function ResourceTable<T extends Record<string, any>>({)))}</TableBody>- )}- </Table>+ </Table>+ )}{meta && (<Paginationmeta={meta}