@rozie-ui/data-table-solid 0.3.1 → 0.4.0

package/dist/index.cjs

@@ -44,6 +44,39 @@ const wrapAggregationFn = (fn) => {
 		}
 	};
 };
+const collectNestedDefs = (list, out) => {
+	if (!Array.isArray(list)) return;
+	for (const d of list) {
+		if (!d || d.id == null) continue;
+		const id = String(d.id);
+		if (!(id in out)) out[id] = d;
+		if (Array.isArray(d.columns)) collectNestedDefs(d.columns, out);
+	}
+};
+const indexDefsById = (defs) => {
+	const out = Object.create(null);
+	if (!Array.isArray(defs)) return out;
+	for (const d of defs) {
+		if (!d || d.id == null) continue;
+		out[String(d.id)] = d;
+	}
+	for (const d of defs) if (d && Array.isArray(d.columns)) collectNestedDefs(d.columns, out);
+	return out;
+};
+const collectGroupableLeafDefs = (defs) => {
+	const out = [];
+	if (!Array.isArray(defs)) return out;
+	for (const d of defs) {
+		if (!d) continue;
+		if (Array.isArray(d.columns)) {
+			out.push(...collectGroupableLeafDefs(d.columns));
+			continue;
+		}
+		if (d.groupable === false) continue;
+		out.push(d);
+	}
+	return out;
+};
 //#endregion
 //#region src/helpers/indexMath.ts
 const clamp = (v, lo, hi) => v < lo ? lo : v > hi ? hi : v;
@@ -933,6 +966,7 @@ function DataTable(_props) {
 	let columnDefsCache = null;
 	let columnDefsCacheColumnsRef = void 0;
 	let columnDefsCacheColRegRef = void 0;
+	let columnDefsIndexCache = null;
 	function columnDefs() {
 		const cfg = local.columns || [];
 		const reg = colReg() || {};
@@ -976,8 +1010,13 @@ function DataTable(_props) {
 		columnDefsCache = out;
 		columnDefsCacheColumnsRef = local.columns;
 		columnDefsCacheColRegRef = colReg();
+		columnDefsIndexCache = indexDefsById(out);
 		return out;
 	}
+	function defIndex() {
+		columnDefs();
+		return columnDefsIndexCache || Object.create(null);
+	}
 	const SELECT_COL_ID = "__rdt_select";
 	const EXPANDER_COL_ID = "__rdt_expander";
 	function selectionEnabled() {
@@ -1695,9 +1734,9 @@ function DataTable(_props) {
 		return "";
 	}
 	function defFor(colId) {
-		const defs = columnDefs();
-		for (const d of defs) if (d.id === colId) return d;
-		return null;
+		if (colId == null) return null;
+		const d = defIndex()[String(colId)];
+		return d != null ? d : null;
 	}
 	function visibleCellsFor(row) {
 		return rowModelVer() >= 0 ? row.getVisibleCells() : [];
@@ -1718,12 +1757,6 @@ function DataTable(_props) {
 		const m = editMetaOf(colId);
 		return m && m.editorOptions != null ? m.editorOptions : [];
 	}
-	function hasEditorSlot(colId) {
-		return editorTypeOf(colId) === "custom" && !!(_props.editorSlot ?? _props.slots?.["editor"]);
-	}
-	function hasFilterSlot() {
-		return !!(_props.filterSlot ?? _props.slots?.["filter"]);
-	}
 	function columnIsFilterable(colId) {
 		const d = defFor(colId);
 		return !!(d && d.filterable);
@@ -1732,11 +1765,9 @@ function DataTable(_props) {
 		const d = defFor(colId);
 		return d ? d.header : colId;
 	}
-	function headerWidth(colId) {
-		if (tick() < 0 || !table) return null;
-		const col = table.getColumn(colId);
-		if (!col) return null;
-		const w = col.getSize();
+	function headerWidth(header) {
+		if (tick() < 0 || !header || typeof header.getSize !== "function") return null;
+		const w = header.getSize();
 		return w != null && w > 0 ? w + "px" : null;
 	}
 	function onResizeStart(colId, evt) {
@@ -1800,11 +1831,11 @@ function DataTable(_props) {
 		if (side === "right") return "position:sticky;right:" + (col.getAfter ? col.getAfter("right") : 0) + "px;z-index:" + zIndex + ";";
 		return "";
 	}
-	function thStyle(colId) {
+	function thStyle(header) {
 		let s = "";
-		const w = headerWidth(colId);
+		const w = headerWidth(header);
 		if (w) s += "width:" + w + ";";
-		s += pinStyle(colId, 2);
+		s += pinStyle(header && header.column ? header.column.id : null, 2);
 		return s;
 	}
 	function onGlobalFilterInput(evt) {
@@ -1890,6 +1921,9 @@ function DataTable(_props) {
 	function rowIsGrouped(row) {
 		return !!(tick() >= 0 && row && row.getIsGrouped && row.getIsGrouped());
 	}
+	function rowIndexIsGrouped(rowIndex) {
+		return rowIsGrouped((rows() || [])[rowIndex]);
+	}
 	function groupingActive() {
 		return tick() >= 0 && (currentState().grouping || []).length > 0;
 	}
@@ -1903,21 +1937,54 @@ function DataTable(_props) {
 		return !!(tick() >= 0 && cellCtx && cellCtx.getIsPlaceholder && cellCtx.getIsPlaceholder());
 	}
 	function groupSubRowCount(row) {
-		return row && row.getLeafRows ? row.getLeafRows().length : row && row.subRows ? row.subRows.length : 0;
+		if (row && row.getLeafRows) {
+			const leaves = row.getLeafRows();
+			let n = 0;
+			for (let i = 0; i < leaves.length; i++) {
+				const r = leaves[i];
+				if (!(r && r.getIsGrouped && r.getIsGrouped())) n = n + 1;
+			}
+			return n;
+		}
+		return row && row.subRows ? row.subRows.length : 0;
+	}
+	let groupRowDescriptorCache = null;
+	let groupRowDescriptorCacheVer = void 0;
+	function groupRowDescriptor(row) {
+		const ver = rowModelVer();
+		if (!groupRowDescriptorCache || groupRowDescriptorCacheVer !== ver) {
+			groupRowDescriptorCache = Object.create(null);
+			groupRowDescriptorCacheVer = ver;
+		}
+		const key = String(row.id);
+		let d = groupRowDescriptorCache[key];
+		if (!d) {
+			const groupingColumnId = row.groupingColumnId != null ? row.groupingColumnId : "";
+			const groupingValue = row.getGroupingValue ? row.getGroupingValue(groupingColumnId) : row.groupingValue;
+			d = {
+				isGroupRow: true,
+				groupId: row.id,
+				groupingColumnId,
+				groupingValue,
+				leafCount: groupSubRowCount(row)
+			};
+			groupRowDescriptorCache[key] = d;
+		}
+		return d;
+	}
+	function cellSlotRow(row) {
+		return rowIsGrouped(row) ? groupRowDescriptor(row) : row ? row.original : null;
 	}
 	function groupingKeys() {
 		return currentState().grouping || [];
 	}
 	function groupableColumns() {
 		const out = [];
-		const defs = columnDefs();
-		for (const d of defs) {
-			if (!d || d.groupable === false) continue;
-			out.push({
-				id: d.id,
-				label: d.header != null ? d.header : d.id
-			});
-		}
+		const defs = collectGroupableLeafDefs(columnDefs());
+		for (const d of defs) out.push({
+			id: d.id,
+			label: d.header != null ? d.header : d.id
+		});
 		return out;
 	}
 	function stopEvent(evt) {
@@ -2943,11 +3010,13 @@ function DataTable(_props) {
 		for (let gr = 0; gr < grid.length; gr++) {
 			const r = originRow + gr;
 			if (r > maxRow) break;
+			const rowGrouped = rowIndexIsGrouped(r);
 			const cols = grid[gr] || [];
 			for (let gc = 0; gc < cols.length; gc++) {
 				const c = originCol + gc;
 				if (c > maxCol) break;
 				total = total + 1;
+				if (rowGrouped) continue;
 				const colId = columnIdAt(r, c);
 				if (colId == null || !columnEditable(colId)) continue;
 				const rowObj = rowOriginalAt(r);
@@ -3122,8 +3191,9 @@ function DataTable(_props) {
 			fillEdgeScrollRaf = null;
 		}
 	}
-	function cellIndexFromPoint(clientX, clientY) {
-		if (typeof document === "undefined" || !document.elementFromPoint) return null;
+	const FILL_HITTEST_PROBE_RADIUS_PX = 8;
+	const FILL_HITTEST_PROBE_STEP_PX = 2;
+	function resolveCellAt(clientX, clientY) {
 		let el = document.elementFromPoint(clientX, clientY);
 		while (el && el.shadowRoot && el.shadowRoot.elementFromPoint) {
 			const inner = el.shadowRoot.elementFromPoint(clientX, clientY);
@@ -3144,6 +3214,18 @@ function DataTable(_props) {
 			c
 		};
 	}
+	function cellIndexFromPoint(clientX, clientY) {
+		if (typeof document === "undefined" || !document.elementFromPoint) return null;
+		const direct = resolveCellAt(clientX, clientY);
+		if (direct) return direct;
+		for (let d = FILL_HITTEST_PROBE_STEP_PX; d <= FILL_HITTEST_PROBE_RADIUS_PX; d += FILL_HITTEST_PROBE_STEP_PX) {
+			const right = resolveCellAt(clientX + d, clientY);
+			if (right) return right;
+			const left = resolveCellAt(clientX - d, clientY);
+			if (left) return left;
+		}
+		return null;
+	}
 	function onFillHandlePointerDown(e) {
 		if (!e) return;
 		if (e.preventDefault) e.preventDefault();
@@ -3250,11 +3332,13 @@ function DataTable(_props) {
 		return cell && cell.column ? cell.column.id : null;
 	}
 	function isActiveCellEditable() {
+		if (rowIndexIsGrouped(activeRow())) return false;
 		const colId = activeCellColumnId();
 		return colId != null && columnEditable(colId);
 	}
 	function isEditing(rowIndex, colIndex) {
 		if (editVer() < 0) return false;
+		if (rowIndexIsGrouped(rowIndex)) return false;
 		if (editingRowIndex() != null && editingRowIndex() === rowIndex) {
 			const colId = columnIdAt(rowIndex, colIndex);
 			return colId != null && columnEditable(colId);
@@ -3314,12 +3398,24 @@ function DataTable(_props) {
 		const row = (rows() || [])[editingRow()];
 		return row ? row.id : null;
 	}
-	function focusEditorWhenReady(selectAll = true) {
+	function resolveEditFocusCellEl(rowIndex, colIndex) {
+		if (rowIndex == null || colIndex == null || rowIndex < 0 || colIndex < 0) return null;
+		return resolveCellEl(String(rowIndex), colIndex);
+	}
+	function focusEditorWhenReady(rowIndex, colIndex, selectAll = true) {
 		if (!gridRoot) return;
-		if (editFocusColId() != null && hasEditorSlot(editFocusColId())) return;
 		let attempts = 0;
 		const tryFocus = () => {
-			const el = gridRoot ? gridRoot.querySelector("[data-editing-cell]") : null;
+			const cellEl = resolveEditFocusCellEl(rowIndex, colIndex);
+			const el = cellEl && cellEl.querySelector ? cellEl.querySelector("[data-editing-cell][data-builtin-editor]") : null;
+			if (!el) {
+				if (cellEl && cellEl.querySelector ? cellEl.querySelector("[data-editing-cell]") : null) return;
+				attempts = attempts + 1;
+				if (attempts >= 30) return;
+				if (typeof requestAnimationFrame === "function") requestAnimationFrame(tryFocus);
+				else setTimeout(tryFocus, 16);
+				return;
+			}
 			const ae = gridRoot && gridRoot.getRootNode ? gridRoot.getRootNode().activeElement : null;
 			if (ae && el && ae !== el && ae.closest && gridRoot.contains(ae) && ae.hasAttribute && ae.hasAttribute("data-editing-cell")) {
 				const aeCell = ae.closest("[data-grid-cell]");
@@ -3328,17 +3424,10 @@ function DataTable(_props) {
 				const elCol = elCell ? elCell.getAttribute("data-col-index") : null;
 				if (aeCol != null && aeCol !== elCol) return;
 			}
-			if (el) {
-				el.focus();
-				if (selectAll && el.select) try {
-					el.select();
-				} catch (e) {}
-				return;
-			}
-			attempts = attempts + 1;
-			if (attempts >= 30) return;
-			if (typeof requestAnimationFrame === "function") requestAnimationFrame(tryFocus);
-			else setTimeout(tryFocus, 16);
+			el.focus();
+			if (selectAll && el.select) try {
+				el.select();
+			} catch (e) {}
 		};
 		if (typeof requestAnimationFrame === "function") requestAnimationFrame(tryFocus);
 		else setTimeout(tryFocus, 0);
@@ -3356,6 +3445,7 @@ function DataTable(_props) {
 		return cell ? cell.getValue() : null;
 	}
 	function beginEdit(rowIndex, colIndex, seed) {
+		if (rowIndexIsGrouped(rowIndex)) return;
 		const colId = columnIdAt(rowIndex, colIndex);
 		if (colId == null || !columnEditable(colId)) return;
 		committedThisSession = false;
@@ -3368,7 +3458,7 @@ function DataTable(_props) {
 		setActiveInControl(true);
 		setEditVer(editVer() + 1);
 		setEditFocusColId(colId);
-		focusEditorWhenReady(seed == null);
+		focusEditorWhenReady(rowIndex, colIndex, seed == null);
 	}
 	function focusCellWhenReady(row, col) {
 		if (!gridRoot) return;
@@ -3436,7 +3526,7 @@ function DataTable(_props) {
 		const err = runValidator(colId, newValue, rowOriginal);
 		if (err !== true) {
 			setInvalid(err);
-			focusEditorWhenReady();
+			focusEditorWhenReady(editingRow(), editingCol());
 			return false;
 		}
 		setInvalid("");
@@ -3467,6 +3557,7 @@ function DataTable(_props) {
 		return true;
 	}
 	function toggleActiveBooleanCell() {
+		if (rowIndexIsGrouped(activeRow())) return;
 		const colId = columnIdAt(activeRow(), activeColIndex());
 		if (colId == null || !columnEditable(colId)) return;
 		const row = (rows() || [])[activeRow()];
@@ -3528,12 +3619,10 @@ function DataTable(_props) {
 	}
 	function focusRowEditorAt(rowIndex, colIndex) {
 		if (!gridRoot) return;
-		const colId = columnIdAt(rowIndex, colIndex);
-		if (colId != null && hasEditorSlot(colId)) return;
 		let attempts = 0;
 		const tryFocus = () => {
 			const cellEl = resolveCellEl(String(rowIndex), colIndex);
-			const ed = cellEl && cellEl.querySelector ? cellEl.querySelector("[data-editing-cell]") : null;
+			const ed = cellEl && cellEl.querySelector ? cellEl.querySelector("[data-editing-cell][data-builtin-editor]") : null;
 			if (ed) {
 				ed.focus();
 				if (ed.select) try {
@@ -3541,6 +3630,7 @@ function DataTable(_props) {
 				} catch (e) {}
 				return;
 			}
+			if (cellEl && cellEl.querySelector ? cellEl.querySelector("[data-editing-cell]") : null) return;
 			attempts = attempts + 1;
 			if (attempts >= 30) return;
 			if (typeof requestAnimationFrame === "function") requestAnimationFrame(tryFocus);
@@ -3552,6 +3642,7 @@ function DataTable(_props) {
 	function beginRowEdit(row) {
 		const rowIndex = rowIndexOf(row);
 		if (rowIndex < 0) return;
+		if (rowIndexIsGrouped(rowIndex)) return;
 		const editable = editableColumnsForRow(rowIndex);
 		if (editable.length === 0) return;
 		committedThisSession = false;
@@ -3571,7 +3662,7 @@ function DataTable(_props) {
 		setActiveInControl(true);
 		setEditVer(editVer() + 1);
 		setEditFocusColId(editable[0].colId);
-		focusEditorWhenReady();
+		focusEditorWhenReady(rowIndex, editable[0].colIndex);
 	}
 	function commitRow() {
 		if (editingRowIndex() == null) return false;
@@ -4048,14 +4139,18 @@ function DataTable(_props) {
 		"rdt-expander-th": isExpanderColumn(header().column.id),
 		"rdt-th-resizing": columnIsResizing(header().column.id),
 		"rdt-cell-active": isActiveCell("__header", headerColIndexOf(hg(), header()), hgLevel())
-	})} role="columnheader" data-col={(0, _rozie_runtime_solid.rozieAttr)(header().column.id)} data-grid-cell="" data-row="__header" data-header-level={(0, _rozie_runtime_solid.rozieAttr)(hgLevel())} colSpan={(0, _rozie_runtime_solid.rozieAttr)(header().colSpan > 1 ? header().colSpan : null)} data-col-index={(0, _rozie_runtime_solid.rozieAttr)(headerColIndexOf(hg(), header()))} tabIndex={(0, _rozie_runtime_solid.rozieAttr)(cellTabindex("__header", headerColIndexOf(hg(), header()), hgLevel()))} aria-sort={(0, _rozie_runtime_solid.rozieAttr)(ariaSortFor(header().column.id))} style={(0, _rozie_runtime_solid.parseInlineStyle)(thStyle(header().column.id))} data-rozie-s-d5dcab4c="">
+	})} role="columnheader" data-col={(0, _rozie_runtime_solid.rozieAttr)(header().column.id)} data-grid-cell="" data-row="__header" data-header-level={(0, _rozie_runtime_solid.rozieAttr)(hgLevel())} colSpan={(0, _rozie_runtime_solid.rozieAttr)(header().colSpan > 1 ? header().colSpan : null)} data-col-index={(0, _rozie_runtime_solid.rozieAttr)(headerColIndexOf(hg(), header()))} tabIndex={(0, _rozie_runtime_solid.rozieAttr)(cellTabindex("__header", headerColIndexOf(hg(), header()), hgLevel()))} aria-sort={(0, _rozie_runtime_solid.rozieAttr)(ariaSortFor(header().column.id))} style={(0, _rozie_runtime_solid.parseInlineStyle)(thStyle(header()))} data-rozie-s-d5dcab4c="">
             
             
             {<Solid_js.Show when={isSelectColumn(header().column.id)} fallback={<Solid_js.Show when={isExpanderColumn(header().column.id)} fallback={<span style={{ display: "contents" }} data-rozie-s-d5dcab4c="">
               
               {<Solid_js.Show when={header().column.getCanSort && header().column.getCanSort()} fallback={<span style={{ display: "contents" }} data-rozie-s-d5dcab4c="">
                 <span class={"rdt-header-label"} data-rozie-s-d5dcab4c="">
-                  {(_props.colHeaderSlot ?? _props.slots?.["colHeader"])?.({
+                  {_props.slots?.[`colHeader-${header().column.id}`]?.({
+		columnId: header().column.id,
+		column: header().column,
+		label: headerLabel(header().column.id)
+	}) ?? (_props.colHeaderSlot ?? _props.slots?.["colHeader"])?.({
 		columnId: header().column.id,
 		column: header().column,
 		label: headerLabel(header().column.id)
@@ -4066,7 +4161,11 @@ function DataTable(_props) {
 	}} data-rozie-s-d5dcab4c="">
                 
                 <span class={"rdt-header-label"} data-rozie-s-d5dcab4c="">
-                  {(_props.colHeaderSlot ?? _props.slots?.["colHeader"])?.({
+                  {_props.slots?.[`colHeader-${header().column.id}`]?.({
+		columnId: header().column.id,
+		column: header().column,
+		label: headerLabel(header().column.id)
+	}) ?? (_props.colHeaderSlot ?? _props.slots?.["colHeader"])?.({
 		columnId: header().column.id,
 		column: header().column,
 		label: headerLabel(header().column.id)
@@ -4110,18 +4209,24 @@ function DataTable(_props) {
         {<Solid_js.Show when={hasAnyFilterableColumn()}><tr class={"rdt-filter-row"} data-rozie-s-d5dcab4c="">
           <_solid_primitives_keyed.Key each={headerGroups()[headerGroups().length - 1].headers} by={(header) => header.id}>{(header) => <th class={"rdt-filter-cell"} role="presentation" style={(0, _rozie_runtime_solid.parseInlineStyle)(pinStyle(header().column.id))} data-rozie-s-d5dcab4c="">
             {<Solid_js.Show when={isSelectColumn(header().column.id)} fallback={<Solid_js.Show when={isExpanderColumn(header().column.id)} fallback={<span style={{ display: "contents" }} data-rozie-s-d5dcab4c="">
-              {<Solid_js.Show when={columnIsFilterable(header().column.id) && !hasFilterSlot()}><input type="text" aria-label={(0, _rozie_runtime_solid.rozieAttr)("Filter " + headerLabel(header().column.id))} class={"rdt-col-filter"} value={columnFilterValue(header().column.id)} onInput={($event) => {
-		onColumnFilterInput(header().column.id, $event);
-	}} onClick={($event) => {
-		stopEvent($event);
-	}} data-rozie-s-d5dcab4c="" /></Solid_js.Show>}{<Solid_js.Show when={columnIsFilterable(header().column.id)}><span style={{ display: "contents" }} data-rozie-s-d5dcab4c="">
-                {(_props.filterSlot ?? _props.slots?.["filter"])?.({
+              {<Solid_js.Show when={columnIsFilterable(header().column.id)}><span style={{ display: "contents" }} data-rozie-s-d5dcab4c="">
+                {_props.slots?.[`filter-${header().column.id}`]?.({
 		columnId: header().column.id,
 		value: columnFilterValue(header().column.id),
 		uniqueValues: getFacetedUniqueValues(header().column.id),
 		minMax: getFacetedMinMaxValues(header().column.id),
 		setFilter: setColumnFilter
-	})}
+	}) ?? (_props.filterSlot ?? _props.slots?.["filter"])?.({
+		columnId: header().column.id,
+		value: columnFilterValue(header().column.id),
+		uniqueValues: getFacetedUniqueValues(header().column.id),
+		minMax: getFacetedMinMaxValues(header().column.id),
+		setFilter: setColumnFilter
+	}) ?? <input type="text" aria-label={(0, _rozie_runtime_solid.rozieAttr)("Filter " + headerLabel(header().column.id))} class={"rdt-col-filter"} value={columnFilterValue(header().column.id)} onInput={($event) => {
+		onColumnFilterInput(header().column.id, $event);
+	}} onClick={($event) => {
+		stopEvent($event);
+	}} data-rozie-s-d5dcab4c="" />}
               </span></Solid_js.Show>}</span>}><span style={{ display: "contents" }} data-rozie-s-d5dcab4c="" /></Solid_js.Show>}><span style={{ display: "contents" }} data-rozie-s-d5dcab4c="" /></Solid_js.Show>}</th>}</_solid_primitives_keyed.Key>
         </tr></Solid_js.Show>}</thead>
 
@@ -4137,26 +4242,55 @@ function DataTable(_props) {
 	})} role={(0, _rozie_runtime_solid.rozieAttr)(cellRole())} data-col={(0, _rozie_runtime_solid.rozieAttr)(cell().column.id)} data-grid-cell="" data-row={(0, _rozie_runtime_solid.rozieAttr)(rowIndexOf(row()))} data-col-index={(0, _rozie_runtime_solid.rozieAttr)(colIndexOf(row(), cell()))} tabIndex={(0, _rozie_runtime_solid.rozieAttr)(cellTabindex(String(rowIndexOf(row())), colIndexOf(row(), cell())))} style={(0, _rozie_runtime_solid.parseInlineStyle)(bodyCellStyle(row(), cell().column.id))} aria-invalid={(0, _rozie_runtime_solid.rozieAttr)(cellAriaInvalid(rowIndexOf(row()), colIndexOf(row(), cell())))} data-in-range={(0, _rozie_runtime_solid.rozieAttr)(inRange(rowIndexOf(row()), colIndexOf(row(), cell())) ? "true" : null)} data-agg-cell={(0, _rozie_runtime_solid.rozieAttr)(cellIsAggregated(cell()) ? cell().column.id : null)} data-rozie-s-d5dcab4c="">
             
             {<Solid_js.Show when={isExpanderColumn(cell().column.id)} fallback={<Solid_js.Show when={isSelectColumn(cell().column.id)} fallback={<Solid_js.Show when={cellIsGrouped(cell())} fallback={<Solid_js.Show when={isEditing(rowIndexOf(row()), colIndexOf(row(), cell()))} fallback={<Solid_js.Show when={cellIsPlaceholder(cell())} fallback={<span class={"rdt-cell-value"} data-rozie-s-d5dcab4c="">
-              {(_props.cellSlot ?? _props.slots?.["cell"])?.({
+              {_props.slots?.[`cell-${cell().column.id}`]?.({
 		columnId: cell().column.id,
 		column: cell().column,
-		row: row().original,
+		row: cellSlotRow(row()),
+		value: cell().getValue()
+	}) ?? (_props.cellSlot ?? _props.slots?.["cell"])?.({
+		columnId: cell().column.id,
+		column: cell().column,
+		row: cellSlotRow(row()),
 		value: cell().getValue()
 	}) ?? (0, _rozie_runtime_solid.rozieDisplay)(cell().getValue())}
             </span>}><span style={{ display: "contents" }} data-rozie-s-d5dcab4c="" /></Solid_js.Show>}><span style={{ display: "contents" }} data-rozie-s-d5dcab4c="">
-              {<Solid_js.Show when={hasEditorSlot(cell().column.id)} fallback={<Solid_js.Show when={editorTypeOf(cell().column.id) === "number"} fallback={<Solid_js.Show when={editorTypeOf(cell().column.id) === "select"} fallback={<Solid_js.Show when={editorTypeOf(cell().column.id) === "checkbox"} fallback={<input type="text" data-editing-cell="" class={"rdt-cell-editor"} value={editorValueFor(cell().column.id)} onInput={($event) => {
+              {<Solid_js.Show when={editorTypeOf(cell().column.id) === "number"} fallback={<Solid_js.Show when={editorTypeOf(cell().column.id) === "select"} fallback={<Solid_js.Show when={editorTypeOf(cell().column.id) === "checkbox"} fallback={<Solid_js.Show when={editorTypeOf(cell().column.id) === "custom"} fallback={<input type="text" data-editing-cell="" data-builtin-editor="" class={"rdt-cell-editor"} value={editorValueFor(cell().column.id)} onInput={($event) => {
+		onCellEditorInput(cell().column.id, $event);
+	}} onKeyDown={($event) => {
+		onEditorKeyDown($event);
+	}} onBlur={($event) => {
+		onEditorBlur($event);
+	}} data-rozie-s-d5dcab4c="" />}><span style={{ display: "contents" }} data-rozie-s-d5dcab4c="">
+                {_props.slots?.[`editor-${cell().column.id}`]?.({
+		columnId: cell().column.id,
+		column: cell().column,
+		row: cellSlotRow(row()),
+		value: editorValueFor(cell().column.id),
+		commit: editorCommitFor(cell().column.id),
+		cancel: editorCancelFor(),
+		autofocus: editorAutofocusFor(cell().column.id, rowIndexOf(row()))
+	}) ?? (_props.editorSlot ?? _props.slots?.["editor"])?.({
+		columnId: cell().column.id,
+		column: cell().column,
+		row: cellSlotRow(row()),
+		value: editorValueFor(cell().column.id),
+		commit: editorCommitFor(cell().column.id),
+		cancel: editorCancelFor(),
+		autofocus: editorAutofocusFor(cell().column.id, rowIndexOf(row()))
+	}) ?? <input type="text" data-editing-cell="" data-builtin-editor="" class={"rdt-cell-editor"} value={editorValueFor(cell().column.id)} onInput={($event) => {
 		onCellEditorInput(cell().column.id, $event);
 	}} onKeyDown={($event) => {
 		onEditorKeyDown($event);
 	}} onBlur={($event) => {
 		onEditorBlur($event);
-	}} data-rozie-s-d5dcab4c="" />}><input type="checkbox" data-editing-cell="" class={"rdt-cell-editor"} checked={editorCheckedFor(cell().column.id)} onChange={($event) => {
+	}} data-rozie-s-d5dcab4c="" />}
+              </span></Solid_js.Show>}><input type="checkbox" data-editing-cell="" data-builtin-editor="" class={"rdt-cell-editor"} checked={editorCheckedFor(cell().column.id)} onChange={($event) => {
 		onCellEditorCheckbox(cell().column.id, $event);
 	}} onKeyDown={($event) => {
 		onEditorKeyDown($event);
 	}} onBlur={($event) => {
 		onEditorBlur($event);
-	}} data-rozie-s-d5dcab4c="" /></Solid_js.Show>}><select data-editing-cell="" class={"rdt-cell-editor"} value={editorValueFor(cell().column.id)} onChange={($event) => {
+	}} data-rozie-s-d5dcab4c="" /></Solid_js.Show>}><select data-editing-cell="" data-builtin-editor="" class={"rdt-cell-editor"} value={editorValueFor(cell().column.id)} onChange={($event) => {
 		onCellEditorInput(cell().column.id, $event);
 	}} onKeyDown={($event) => {
 		onEditorKeyDown($event);
@@ -4164,38 +4298,33 @@ function DataTable(_props) {
 		onEditorBlur($event);
 	}} data-rozie-s-d5dcab4c="">
                 <_solid_primitives_keyed.Key each={editorOptionsOf(cell().column.id)} by={(opt) => opt.value}>{(opt) => <option value={(0, _rozie_runtime_solid.rozieAttr)(opt().value)} data-rozie-s-d5dcab4c="">{(0, _rozie_runtime_solid.rozieDisplay)(opt().label)}</option>}</_solid_primitives_keyed.Key>
-              </select></Solid_js.Show>}><input type="number" data-editing-cell="" class={"rdt-cell-editor"} value={editorValueFor(cell().column.id)} onInput={($event) => {
+              </select></Solid_js.Show>}><input type="number" data-editing-cell="" data-builtin-editor="" class={"rdt-cell-editor"} value={editorValueFor(cell().column.id)} onInput={($event) => {
 		onCellEditorInput(cell().column.id, $event);
 	}} onKeyDown={($event) => {
 		onEditorKeyDown($event);
 	}} onBlur={($event) => {
 		onEditorBlur($event);
-	}} data-rozie-s-d5dcab4c="" /></Solid_js.Show>}><span style={{ display: "contents" }} data-rozie-s-d5dcab4c="">
-                {(_props.editorSlot ?? _props.slots?.["editor"])?.({
-		columnId: cell().column.id,
-		column: cell().column,
-		row: row().original,
-		value: editorValueFor(cell().column.id),
-		commit: editorCommitFor(cell().column.id),
-		cancel: editorCancelFor(),
-		autofocus: editorAutofocusFor(cell().column.id, rowIndexOf(row()))
-	})}
-              </span></Solid_js.Show>}</span></Solid_js.Show>}><span style={{ display: "contents" }} data-rozie-s-d5dcab4c="">
+	}} data-rozie-s-d5dcab4c="" /></Solid_js.Show>}</span></Solid_js.Show>}><span style={{ display: "contents" }} data-rozie-s-d5dcab4c="">
               <button type="button" data-expander="" aria-expanded={!!rowIsExpanded(row())} aria-label={(0, _rozie_runtime_solid.rozieAttr)(rowIsExpanded(row()) ? "Collapse group" : "Expand group")} class={"rdt-expander rdt-group-toggle"} onClick={($event) => {
 		onToggleExpand(row(), $event);
 	}} data-rozie-s-d5dcab4c="">{(0, _rozie_runtime_solid.rozieDisplay)(rowIsExpanded(row()) ? "▾" : "▸")}</button>
               <span class={"rdt-group-value"} data-rozie-s-d5dcab4c="">
-                {(_props.cellSlot ?? _props.slots?.["cell"])?.({
+                {_props.slots?.[`cell-${cell().column.id}`]?.({
 		columnId: cell().column.id,
 		column: cell().column,
-		row: row().original,
+		row: cellSlotRow(row()),
+		value: cell().getValue()
+	}) ?? (_props.cellSlot ?? _props.slots?.["cell"])?.({
+		columnId: cell().column.id,
+		column: cell().column,
+		row: cellSlotRow(row()),
 		value: cell().getValue()
 	}) ?? (0, _rozie_runtime_solid.rozieDisplay)(cell().getValue())}
               </span>
               <span class={"rdt-group-count"} data-rozie-s-d5dcab4c="">{(0, _rozie_runtime_solid.rozieDisplay)("(" + groupSubRowCount(row()) + ")")}</span>
             </span></Solid_js.Show>}><span style={{ display: "contents" }} data-rozie-s-d5dcab4c="">
               {(_props.selectCellSlot ?? _props.slots?.["selectCell"])?.({
-		row: row().original,
+		row: cellSlotRow(row()),
 		checked: rowIsSelected(row()),
 		toggle: (e) => onToggleRow(row(), e)
 	}) ?? <input type="checkbox" aria-label="Select row" class={"rdt-select-row"} checked={rowIsSelected(row())} onChange={($event) => {
@@ -4240,11 +4369,15 @@ function DataTable(_props) {
 		"rdt-expander-th": isExpanderColumn(wh().header.column.id),
 		"rdt-th-resizing": columnIsResizing(wh().header.column.id),
 		"rdt-cell-active": isActiveCell("__header", headerColIndexOf(hg(), wh().header), hgLevel())
-	})} role="columnheader" data-col={(0, _rozie_runtime_solid.rozieAttr)(wh().header.column.id)} data-grid-cell="" data-row="__header" data-header-level={(0, _rozie_runtime_solid.rozieAttr)(hgLevel())} colSpan={(0, _rozie_runtime_solid.rozieAttr)(wh().span > 1 ? wh().span : null)} data-col-index={(0, _rozie_runtime_solid.rozieAttr)(headerColIndexOf(hg(), wh().header))} tabIndex={(0, _rozie_runtime_solid.rozieAttr)(cellTabindex("__header", headerColIndexOf(hg(), wh().header), hgLevel()))} aria-sort={(0, _rozie_runtime_solid.rozieAttr)(ariaSortFor(wh().header.column.id))} style={(0, _rozie_runtime_solid.parseInlineStyle)(thStyle(wh().header.column.id))} data-rozie-s-d5dcab4c="">
+	})} role="columnheader" data-col={(0, _rozie_runtime_solid.rozieAttr)(wh().header.column.id)} data-grid-cell="" data-row="__header" data-header-level={(0, _rozie_runtime_solid.rozieAttr)(hgLevel())} colSpan={(0, _rozie_runtime_solid.rozieAttr)(wh().span > 1 ? wh().span : null)} data-col-index={(0, _rozie_runtime_solid.rozieAttr)(headerColIndexOf(hg(), wh().header))} tabIndex={(0, _rozie_runtime_solid.rozieAttr)(cellTabindex("__header", headerColIndexOf(hg(), wh().header), hgLevel()))} aria-sort={(0, _rozie_runtime_solid.rozieAttr)(ariaSortFor(wh().header.column.id))} style={(0, _rozie_runtime_solid.parseInlineStyle)(thStyle(wh().header))} data-rozie-s-d5dcab4c="">
             {<Solid_js.Show when={isSelectColumn(wh().header.column.id)} fallback={<Solid_js.Show when={isExpanderColumn(wh().header.column.id)} fallback={<span style={{ display: "contents" }} data-rozie-s-d5dcab4c="">
               {<Solid_js.Show when={wh().header.column.getCanSort && wh().header.column.getCanSort()} fallback={<span style={{ display: "contents" }} data-rozie-s-d5dcab4c="">
                 <span class={"rdt-header-label"} data-rozie-s-d5dcab4c="">
-                  {(_props.colHeaderSlot ?? _props.slots?.["colHeader"])?.({
+                  {_props.slots?.[`colHeader-${wh().header.column.id}`]?.({
+		columnId: wh().header.column.id,
+		column: wh().header.column,
+		label: headerLabel(wh().header.column.id)
+	}) ?? (_props.colHeaderSlot ?? _props.slots?.["colHeader"])?.({
 		columnId: wh().header.column.id,
 		column: wh().header.column,
 		label: headerLabel(wh().header.column.id)
@@ -4254,7 +4387,11 @@ function DataTable(_props) {
 		onHeaderSort(wh().header.column.id, $event);
 	}} data-rozie-s-d5dcab4c="">
                 <span class={"rdt-header-label"} data-rozie-s-d5dcab4c="">
-                  {(_props.colHeaderSlot ?? _props.slots?.["colHeader"])?.({
+                  {_props.slots?.[`colHeader-${wh().header.column.id}`]?.({
+		columnId: wh().header.column.id,
+		column: wh().header.column,
+		label: headerLabel(wh().header.column.id)
+	}) ?? (_props.colHeaderSlot ?? _props.slots?.["colHeader"])?.({
 		columnId: wh().header.column.id,
 		column: wh().header.column,
 		label: headerLabel(wh().header.column.id)
@@ -4298,18 +4435,24 @@ function DataTable(_props) {
         {<Solid_js.Show when={hasAnyFilterableColumn()}><tr class={"rdt-filter-row"} data-rozie-s-d5dcab4c="">
           {<Solid_js.Show when={colsWindowed()}><th class={"rdt-col-spacer"} aria-hidden="true" style={(0, _rozie_runtime_solid.parseInlineStyle)("width:" + colPadLeft() + "px;padding:0;border:0")} data-rozie-s-d5dcab4c="" /></Solid_js.Show>}<_solid_primitives_keyed.Key each={windowedHeadersFor(headerGroups()[headerGroups().length - 1], headerGroups().length - 1)} by={(wh) => wh.header.id}>{(wh) => <th class={"rdt-filter-cell"} role="presentation" data-col={(0, _rozie_runtime_solid.rozieAttr)(wh().header.column.id)} style={(0, _rozie_runtime_solid.parseInlineStyle)(pinStyle(wh().header.column.id))} data-rozie-s-d5dcab4c="">
             {<Solid_js.Show when={isSelectColumn(wh().header.column.id)} fallback={<Solid_js.Show when={isExpanderColumn(wh().header.column.id)} fallback={<span style={{ display: "contents" }} data-rozie-s-d5dcab4c="">
-              {<Solid_js.Show when={columnIsFilterable(wh().header.column.id) && !hasFilterSlot()}><input type="text" aria-label={(0, _rozie_runtime_solid.rozieAttr)("Filter " + headerLabel(wh().header.column.id))} class={"rdt-col-filter"} value={columnFilterValue(wh().header.column.id)} onInput={($event) => {
-		onColumnFilterInput(wh().header.column.id, $event);
-	}} onClick={($event) => {
-		stopEvent($event);
-	}} data-rozie-s-d5dcab4c="" /></Solid_js.Show>}{<Solid_js.Show when={columnIsFilterable(wh().header.column.id)}><span style={{ display: "contents" }} data-rozie-s-d5dcab4c="">
-                {(_props.filterSlot ?? _props.slots?.["filter"])?.({
+              {<Solid_js.Show when={columnIsFilterable(wh().header.column.id)}><span style={{ display: "contents" }} data-rozie-s-d5dcab4c="">
+                {_props.slots?.[`filter-${wh().header.column.id}`]?.({
+		columnId: wh().header.column.id,
+		value: columnFilterValue(wh().header.column.id),
+		uniqueValues: getFacetedUniqueValues(wh().header.column.id),
+		minMax: getFacetedMinMaxValues(wh().header.column.id),
+		setFilter: setColumnFilter
+	}) ?? (_props.filterSlot ?? _props.slots?.["filter"])?.({
 		columnId: wh().header.column.id,
 		value: columnFilterValue(wh().header.column.id),
 		uniqueValues: getFacetedUniqueValues(wh().header.column.id),
 		minMax: getFacetedMinMaxValues(wh().header.column.id),
 		setFilter: setColumnFilter
-	})}
+	}) ?? <input type="text" aria-label={(0, _rozie_runtime_solid.rozieAttr)("Filter " + headerLabel(wh().header.column.id))} class={"rdt-col-filter"} value={columnFilterValue(wh().header.column.id)} onInput={($event) => {
+		onColumnFilterInput(wh().header.column.id, $event);
+	}} onClick={($event) => {
+		stopEvent($event);
+	}} data-rozie-s-d5dcab4c="" />}
               </span></Solid_js.Show>}</span>}><span style={{ display: "contents" }} data-rozie-s-d5dcab4c="" /></Solid_js.Show>}><span style={{ display: "contents" }} data-rozie-s-d5dcab4c="" /></Solid_js.Show>}</th>}</_solid_primitives_keyed.Key>
           {<Solid_js.Show when={colsWindowed()}><th class={"rdt-col-spacer"} aria-hidden="true" style={(0, _rozie_runtime_solid.parseInlineStyle)("width:" + colPadRight() + "px;padding:0;border:0")} data-rozie-s-d5dcab4c="" /></Solid_js.Show>}</tr></Solid_js.Show>}</thead>
 
@@ -4333,26 +4476,55 @@ function DataTable(_props) {
 	})} role={(0, _rozie_runtime_solid.rozieAttr)(cellRole())} data-col={(0, _rozie_runtime_solid.rozieAttr)(cell().column.id)} data-grid-cell="" data-row={(0, _rozie_runtime_solid.rozieAttr)(wr().vi.index)} data-col-index={(0, _rozie_runtime_solid.rozieAttr)(colIndexOf(wr().row, cell()))} tabIndex={(0, _rozie_runtime_solid.rozieAttr)(cellTabindex(String(wr().vi.index), colIndexOf(wr().row, cell())))} style={(0, _rozie_runtime_solid.parseInlineStyle)(bodyCellStyle(wr().row, cell().column.id))} aria-invalid={(0, _rozie_runtime_solid.rozieAttr)(cellAriaInvalid(wr().vi.index, colIndexOf(wr().row, cell())))} data-in-range={(0, _rozie_runtime_solid.rozieAttr)(inRange(wr().vi.index, colIndexOf(wr().row, cell())) ? "true" : null)} data-agg-cell={(0, _rozie_runtime_solid.rozieAttr)(cellIsAggregated(cell()) ? cell().column.id : null)} data-rozie-s-d5dcab4c="">
             
             {<Solid_js.Show when={isExpanderColumn(cell().column.id)} fallback={<Solid_js.Show when={isSelectColumn(cell().column.id)} fallback={<Solid_js.Show when={cellIsGrouped(cell())} fallback={<Solid_js.Show when={isEditing(wr().vi.index, colIndexOf(wr().row, cell()))} fallback={<Solid_js.Show when={cellIsPlaceholder(cell())} fallback={<span class={"rdt-cell-value"} data-rozie-s-d5dcab4c="">
-              {(_props.cellSlot ?? _props.slots?.["cell"])?.({
+              {_props.slots?.[`cell-${cell().column.id}`]?.({
+		columnId: cell().column.id,
+		column: cell().column,
+		row: cellSlotRow(wr().row),
+		value: cell().getValue()
+	}) ?? (_props.cellSlot ?? _props.slots?.["cell"])?.({
 		columnId: cell().column.id,
 		column: cell().column,
-		row: wr().row.original,
+		row: cellSlotRow(wr().row),
 		value: cell().getValue()
 	}) ?? (0, _rozie_runtime_solid.rozieDisplay)(cell().getValue())}
             </span>}><span style={{ display: "contents" }} data-rozie-s-d5dcab4c="" /></Solid_js.Show>}><span style={{ display: "contents" }} data-rozie-s-d5dcab4c="">
-              {<Solid_js.Show when={hasEditorSlot(cell().column.id)} fallback={<Solid_js.Show when={editorTypeOf(cell().column.id) === "number"} fallback={<Solid_js.Show when={editorTypeOf(cell().column.id) === "select"} fallback={<Solid_js.Show when={editorTypeOf(cell().column.id) === "checkbox"} fallback={<input type="text" data-editing-cell="" class={"rdt-cell-editor"} value={editorValueFor(cell().column.id)} onInput={($event) => {
+              {<Solid_js.Show when={editorTypeOf(cell().column.id) === "number"} fallback={<Solid_js.Show when={editorTypeOf(cell().column.id) === "select"} fallback={<Solid_js.Show when={editorTypeOf(cell().column.id) === "checkbox"} fallback={<Solid_js.Show when={editorTypeOf(cell().column.id) === "custom"} fallback={<input type="text" data-editing-cell="" data-builtin-editor="" class={"rdt-cell-editor"} value={editorValueFor(cell().column.id)} onInput={($event) => {
+		onCellEditorInput(cell().column.id, $event);
+	}} onKeyDown={($event) => {
+		onEditorKeyDown($event);
+	}} onBlur={($event) => {
+		onEditorBlur($event);
+	}} data-rozie-s-d5dcab4c="" />}><span style={{ display: "contents" }} data-rozie-s-d5dcab4c="">
+                {_props.slots?.[`editor-${cell().column.id}`]?.({
+		columnId: cell().column.id,
+		column: cell().column,
+		row: cellSlotRow(wr().row),
+		value: editorValueFor(cell().column.id),
+		commit: editorCommitFor(cell().column.id),
+		cancel: editorCancelFor(),
+		autofocus: editorAutofocusFor(cell().column.id, wr().vi.index)
+	}) ?? (_props.editorSlot ?? _props.slots?.["editor"])?.({
+		columnId: cell().column.id,
+		column: cell().column,
+		row: cellSlotRow(wr().row),
+		value: editorValueFor(cell().column.id),
+		commit: editorCommitFor(cell().column.id),
+		cancel: editorCancelFor(),
+		autofocus: editorAutofocusFor(cell().column.id, wr().vi.index)
+	}) ?? <input type="text" data-editing-cell="" data-builtin-editor="" class={"rdt-cell-editor"} value={editorValueFor(cell().column.id)} onInput={($event) => {
 		onCellEditorInput(cell().column.id, $event);
 	}} onKeyDown={($event) => {
 		onEditorKeyDown($event);
 	}} onBlur={($event) => {
 		onEditorBlur($event);
-	}} data-rozie-s-d5dcab4c="" />}><input type="checkbox" data-editing-cell="" class={"rdt-cell-editor"} checked={editorCheckedFor(cell().column.id)} onChange={($event) => {
+	}} data-rozie-s-d5dcab4c="" />}
+              </span></Solid_js.Show>}><input type="checkbox" data-editing-cell="" data-builtin-editor="" class={"rdt-cell-editor"} checked={editorCheckedFor(cell().column.id)} onChange={($event) => {
 		onCellEditorCheckbox(cell().column.id, $event);
 	}} onKeyDown={($event) => {
 		onEditorKeyDown($event);
 	}} onBlur={($event) => {
 		onEditorBlur($event);
-	}} data-rozie-s-d5dcab4c="" /></Solid_js.Show>}><select data-editing-cell="" class={"rdt-cell-editor"} value={editorValueFor(cell().column.id)} onChange={($event) => {
+	}} data-rozie-s-d5dcab4c="" /></Solid_js.Show>}><select data-editing-cell="" data-builtin-editor="" class={"rdt-cell-editor"} value={editorValueFor(cell().column.id)} onChange={($event) => {
 		onCellEditorInput(cell().column.id, $event);
 	}} onKeyDown={($event) => {
 		onEditorKeyDown($event);
@@ -4360,38 +4532,33 @@ function DataTable(_props) {
 		onEditorBlur($event);
 	}} data-rozie-s-d5dcab4c="">
                 <_solid_primitives_keyed.Key each={editorOptionsOf(cell().column.id)} by={(opt) => opt.value}>{(opt) => <option value={(0, _rozie_runtime_solid.rozieAttr)(opt().value)} data-rozie-s-d5dcab4c="">{(0, _rozie_runtime_solid.rozieDisplay)(opt().label)}</option>}</_solid_primitives_keyed.Key>
-              </select></Solid_js.Show>}><input type="number" data-editing-cell="" class={"rdt-cell-editor"} value={editorValueFor(cell().column.id)} onInput={($event) => {
+              </select></Solid_js.Show>}><input type="number" data-editing-cell="" data-builtin-editor="" class={"rdt-cell-editor"} value={editorValueFor(cell().column.id)} onInput={($event) => {
 		onCellEditorInput(cell().column.id, $event);
 	}} onKeyDown={($event) => {
 		onEditorKeyDown($event);
 	}} onBlur={($event) => {
 		onEditorBlur($event);
-	}} data-rozie-s-d5dcab4c="" /></Solid_js.Show>}><span style={{ display: "contents" }} data-rozie-s-d5dcab4c="">
-                {(_props.editorSlot ?? _props.slots?.["editor"])?.({
-		columnId: cell().column.id,
-		column: cell().column,
-		row: wr().row.original,
-		value: editorValueFor(cell().column.id),
-		commit: editorCommitFor(cell().column.id),
-		cancel: editorCancelFor(),
-		autofocus: editorAutofocusFor(cell().column.id, wr().vi.index)
-	})}
-              </span></Solid_js.Show>}</span></Solid_js.Show>}><span style={{ display: "contents" }} data-rozie-s-d5dcab4c="">
+	}} data-rozie-s-d5dcab4c="" /></Solid_js.Show>}</span></Solid_js.Show>}><span style={{ display: "contents" }} data-rozie-s-d5dcab4c="">
               <button type="button" data-expander="" aria-expanded={!!rowIsExpanded(wr().row)} aria-label={(0, _rozie_runtime_solid.rozieAttr)(rowIsExpanded(wr().row) ? "Collapse group" : "Expand group")} class={"rdt-expander rdt-group-toggle"} onClick={($event) => {
 		onToggleExpand(wr().row, $event);
 	}} data-rozie-s-d5dcab4c="">{(0, _rozie_runtime_solid.rozieDisplay)(rowIsExpanded(wr().row) ? "▾" : "▸")}</button>
               <span class={"rdt-group-value"} data-rozie-s-d5dcab4c="">
-                {(_props.cellSlot ?? _props.slots?.["cell"])?.({
+                {_props.slots?.[`cell-${cell().column.id}`]?.({
+		columnId: cell().column.id,
+		column: cell().column,
+		row: cellSlotRow(wr().row),
+		value: cell().getValue()
+	}) ?? (_props.cellSlot ?? _props.slots?.["cell"])?.({
 		columnId: cell().column.id,
 		column: cell().column,
-		row: wr().row.original,
+		row: cellSlotRow(wr().row),
 		value: cell().getValue()
 	}) ?? (0, _rozie_runtime_solid.rozieDisplay)(cell().getValue())}
               </span>
               <span class={"rdt-group-count"} data-rozie-s-d5dcab4c="">{(0, _rozie_runtime_solid.rozieDisplay)("(" + groupSubRowCount(wr().row) + ")")}</span>
             </span></Solid_js.Show>}><span style={{ display: "contents" }} data-rozie-s-d5dcab4c="">
               {(_props.selectCellSlot ?? _props.slots?.["selectCell"])?.({
-		row: wr().row.original,
+		row: cellSlotRow(wr().row),
 		checked: rowIsSelected(wr().row),
 		toggle: (e) => onToggleRow(wr().row, e)
 	}) ?? <input type="checkbox" aria-label="Select row" class={"rdt-select-row"} checked={rowIsSelected(wr().row)} onChange={($event) => {