@tanstack/table-core 9.0.0-alpha.33 → 9.0.0-alpha.36

package/src/features/column-resizing/columnResizingFeature.utils.ts

@@ -4,6 +4,7 @@ import {
   table_setColumnSizing,
 } from '../column-sizing/columnSizingFeature.utils'
 import { table_getColumn } from '../../core/columns/coreColumnsFeature.utils'
+import { cloneState } from '../../utils'
 import type { CellData, RowData, Updater } from '../../types/type-utils'
 import type { TableFeatures } from '../../types/TableFeatures'
 import type { Table_Internal } from '../../types/Table'
@@ -13,14 +14,14 @@ import type { ColumnSizingState } from '../column-sizing/columnSizingFeature.typ
 import type { columnResizingState } from './columnResizingFeature.types'
 
 export function getDefaultColumnResizingState(): columnResizingState {
-  return structuredClone({
+  return {
     startOffset: null,
     startSize: null,
     deltaOffset: null,
     deltaPercentage: null,
     isResizingColumn: false,
     columnSizingStart: [],
-  })
+  }
 }
 
 export function column_getCanResize<
@@ -39,7 +40,9 @@ export function column_getIsResizing<
   TData extends RowData,
   TValue extends CellData = CellData,
 >(column: Column_Internal<TFeatures, TData, TValue>) {
-  return column.table.store.state.columnResizing?.isResizingColumn === column.id
+  return (
+    column.table.atoms.columnResizing?.get()?.isResizingColumn === column.id
+  )
 }
 
 export function header_getResizeHandler<
@@ -237,7 +240,9 @@ export function table_resetHeaderSizeInfo<
     table,
     defaultState
       ? getDefaultColumnResizingState()
-      : (table.initialState.columnResizing ?? getDefaultColumnResizingState()),
+      : cloneState(
+          table.initialState.columnResizing ?? getDefaultColumnResizingState(),
+        ),
   )
 }
 

package/src/features/column-sizing/columnSizingFeature.ts

@@ -81,7 +81,7 @@ export function constructColumnSizingFeature<
               table_getPinnedVisibleLeafColumns,
               position,
             ),
-            column.table.store.state.columnSizing,
+            column.table.atoms.columnSizing?.get(),
           ],
         },
         column_getAfter: {
@@ -94,7 +94,7 @@ export function constructColumnSizingFeature<
               table_getPinnedVisibleLeafColumns,
               position,
             ),
-            column.table.store.state.columnSizing,
+            column.table.atoms.columnSizing?.get(),
           ],
         },
         column_resetSize: {

package/src/features/column-sizing/columnSizingFeature.utils.ts

@@ -5,7 +5,7 @@ import {
   table_getRightHeaderGroups,
 } from '../column-pinning/columnPinningFeature.utils'
 import { column_getIndex } from '../column-ordering/columnOrderingFeature.utils'
-import { callMemoOrStaticFn } from '../../utils'
+import { callMemoOrStaticFn, cloneState } from '../../utils'
 import type { ColumnPinningPosition } from '../column-pinning/columnPinningFeature.types'
 import type { CellData, RowData, Updater } from '../../types/type-utils'
 import type { TableFeatures } from '../../types/TableFeatures'
@@ -15,15 +15,15 @@ import type { Column_Internal } from '../../types/Column'
 import type { ColumnSizingState } from './columnSizingFeature.types'
 
 export function getDefaultColumnSizingState(): ColumnSizingState {
-  return structuredClone({})
+  return {}
 }
 
 export function getDefaultColumnSizingColumnDef() {
-  return structuredClone({
+  return {
     size: 150,
     minSize: 20,
     maxSize: Number.MAX_SAFE_INTEGER,
-  })
+  }
 }
 
 export function column_getSize<
@@ -32,7 +32,7 @@ export function column_getSize<
   TValue extends CellData = CellData,
 >(column: Column_Internal<TFeatures, TData, TValue>): number {
   const defaultSizes = getDefaultColumnSizingColumnDef()
-  const columnSize = column.table.store.state.columnSizing?.[column.id]
+  const columnSize = column.table.atoms.columnSizing?.get()?.[column.id]
 
   return Math.min(
     Math.max(
@@ -150,7 +150,7 @@ export function table_resetColumnSizing<
 >(table: Table_Internal<TFeatures, TData>, defaultState?: boolean) {
   table_setColumnSizing(
     table,
-    defaultState ? {} : (table.initialState.columnSizing ?? {}),
+    defaultState ? {} : cloneState(table.initialState.columnSizing ?? {}),
   )
 }
 

package/src/features/column-visibility/columnVisibilityFeature.ts

@@ -72,7 +72,7 @@ export function constructColumnVisibilityFeature<
           fn: (column) => column_getIsVisible(column),
           memoDeps: (column) => [
             column.table.options.columns,
-            column.table.store.state.columnVisibility,
+            column.table.atoms.columnVisibility?.get(),
             column.columns,
           ],
         },
@@ -94,7 +94,7 @@ export function constructColumnVisibilityFeature<
           fn: (row) => row_getAllVisibleCells(row),
           memoDeps: (row) => [
             row.getAllCells(),
-            row.table.store.state.columnVisibility,
+            row.table.atoms.columnVisibility?.get(),
           ],
         },
         row_getVisibleCells: {
@@ -114,16 +114,16 @@ export function constructColumnVisibilityFeature<
         table_getVisibleFlatColumns: {
           fn: () => table_getVisibleFlatColumns(table),
           memoDeps: () => [
-            table.store.state.columnVisibility,
-            table.store.state.columnOrder,
+            table.atoms.columnVisibility?.get(),
+            table.atoms.columnOrder?.get(),
             table.options.columns,
           ],
         },
         table_getVisibleLeafColumns: {
           fn: () => table_getVisibleLeafColumns(table),
           memoDeps: () => [
-            table.store.state.columnVisibility,
-            table.store.state.columnOrder,
+            table.atoms.columnVisibility?.get(),
+            table.atoms.columnOrder?.get(),
             table.options.columns,
           ],
         },

package/src/features/column-visibility/columnVisibilityFeature.utils.ts

@@ -1,4 +1,4 @@
-import { callMemoOrStaticFn } from '../../utils'
+import { callMemoOrStaticFn, cloneState } from '../../utils'
 import type { CellData, RowData, Updater } from '../../types/type-utils'
 import type { TableFeatures } from '../../types/TableFeatures'
 import type { Table_Internal } from '../../types/Table'
@@ -8,7 +8,7 @@ import type { ColumnVisibilityState } from './columnVisibilityFeature.types'
 import type { Row } from '../../types/Row'
 
 export function getDefaultColumnVisibilityState(): ColumnVisibilityState {
-  return structuredClone({})
+  return {}
 }
 
 export function column_toggleVisibility<
@@ -37,7 +37,7 @@ export function column_getIsVisible<
       ? childColumns.some((childColumn) =>
           callMemoOrStaticFn(childColumn, 'getIsVisible', column_getIsVisible),
         )
-      : column.table.store.state.columnVisibility?.[column.id]) ?? true
+      : column.table.atoms.columnVisibility?.get()?.[column.id]) ?? true
   )
 }
 
@@ -125,7 +125,7 @@ export function table_resetColumnVisibility<
 >(table: Table_Internal<TFeatures, TData>, defaultState?: boolean) {
   table_setColumnVisibility(
     table,
-    defaultState ? {} : (table.initialState.columnVisibility ?? {}),
+    defaultState ? {} : cloneState(table.initialState.columnVisibility ?? {}),
   )
 }
 

package/src/features/global-filtering/globalFilteringFeature.utils.ts

@@ -1,5 +1,5 @@
 import { filterFn_includesString } from '../../fns/filterFns'
-import { isFunction } from '../../utils'
+import { cloneState, isFunction } from '../../utils'
 import type { Column_Internal } from '../../types/Column'
 import type { FilterFn } from '../column-filtering/columnFilteringFeature.types'
 import type { CellData, RowData } from '../../types/type-utils'
@@ -55,6 +55,6 @@ export function table_resetGlobalFilter<
 >(table: Table_Internal<TFeatures, TData>, defaultState?: boolean) {
   table_setGlobalFilter(
     table,
-    defaultState ? undefined : table.initialState.globalFilter,
+    defaultState ? undefined : cloneState(table.initialState.globalFilter),
   )
 }

package/src/features/row-expanding/createExpandedRowModel.ts

@@ -17,7 +17,7 @@ export function createExpandedRowModel<
       table,
       fnName: 'table.getExpandedRowModel',
       memoDeps: () => [
-        table.store.state.expanded,
+        table.atoms.expanded?.get(),
         table.getPreExpandedRowModel(),
         table.options.paginateExpandedRows,
       ],
@@ -31,7 +31,7 @@ function _createExpandedRowModel<
   TData extends RowData = any,
 >(table: Table_Internal<TFeatures, TData>): RowModel<TFeatures, TData> {
   const rowModel = table.getPreExpandedRowModel()
-  const expanded = table.store.state.expanded
+  const expanded = table.atoms.expanded?.get()
 
   if (
     !rowModel.rows.length ||

package/src/features/row-expanding/rowExpandingFeature.utils.ts

@@ -1,3 +1,4 @@
+import { cloneState } from '../../utils'
 import type { RowData, Updater } from '../../types/type-utils'
 import type { TableFeatures } from '../../types/TableFeatures'
 import type { Table_Internal } from '../../types/Table'
@@ -8,7 +9,7 @@ import type {
 } from './rowExpandingFeature.types'
 
 export function getDefaultExpandedState(): ExpandedState {
-  return structuredClone({})
+  return {}
 }
 
 export function table_autoResetExpanded<
@@ -48,7 +49,7 @@ export function table_resetExpanded<
 >(table: Table_Internal<TFeatures, TData>, defaultState?: boolean) {
   table_setExpanded(
     table,
-    defaultState ? {} : (table.initialState.expanded ?? {}),
+    defaultState ? {} : cloneState(table.initialState.expanded ?? {}),
   )
 }
 
@@ -75,7 +76,7 @@ export function table_getIsSomeRowsExpanded<
   TFeatures extends TableFeatures,
   TData extends RowData,
 >(table: Table_Internal<TFeatures, TData>) {
-  const expanded = table.store.state.expanded ?? {}
+  const expanded = table.atoms.expanded?.get() ?? {}
   return expanded === true || Object.values(expanded).some(Boolean)
 }
 
@@ -83,7 +84,7 @@ export function table_getIsAllRowsExpanded<
   TFeatures extends TableFeatures,
   TData extends RowData,
 >(table: Table_Internal<TFeatures, TData>) {
-  const expanded = table.store.state.expanded ?? {}
+  const expanded = table.atoms.expanded?.get() ?? {}
 
   // If expanded is true, save some cycles and return true
   if (expanded === true) {
@@ -110,9 +111,9 @@ export function table_getExpandedDepth<
   let maxDepth = 0
 
   const rowIds =
-    table.store.state.expanded === true
+    table.atoms.expanded?.get() === true
       ? Object.keys(table.getRowModel().rowsById)
-      : Object.keys(table.store.state.expanded ?? {})
+      : Object.keys(table.atoms.expanded?.get() ?? {})
 
   rowIds.forEach((id) => {
     const splitId = id.split('.')
@@ -161,7 +162,7 @@ export function row_getIsExpanded<
   TFeatures extends TableFeatures,
   TData extends RowData,
 >(row: Row<TFeatures, TData>) {
-  const expanded = row.table.store.state.expanded ?? ({} as ExpandedState)
+  const expanded = row.table.atoms.expanded?.get() ?? ({} as ExpandedState)
 
   return !!(
     row.table.options.getIsRowExpanded?.(row) ??

package/src/features/row-pagination/createPaginatedRowModel.ts

@@ -19,9 +19,9 @@ export function createPaginatedRowModel<
       fnName: 'table.getPaginatedRowModel',
       memoDeps: () => [
         table.getPrePaginatedRowModel(),
-        table.store.state.pagination,
+        table.atoms.pagination?.get(),
         table.options.paginateExpandedRows
-          ? table.store.state.expanded
+          ? table.atoms.expanded?.get()
           : undefined,
       ],
       fn: () => _createPaginatedRowModel(table),
@@ -34,7 +34,7 @@ function _createPaginatedRowModel<
   TData extends RowData = any,
 >(table: Table_Internal<TFeatures, TData>): RowModel<TFeatures, TData> {
   const prePaginatedRowModel = table.getPrePaginatedRowModel()
-  const pagination = table.store.state.pagination
+  const pagination = table.atoms.pagination?.get()
 
   if (!prePaginatedRowModel.rows.length) {
     return prePaginatedRowModel

package/src/features/row-pagination/rowPaginationFeature.utils.ts

@@ -1,4 +1,4 @@
-import { functionalUpdate } from '../../utils'
+import { cloneState, functionalUpdate } from '../../utils'
 import type { RowData, Updater } from '../../types/type-utils'
 import type { TableFeatures } from '../../types/TableFeatures'
 import type { Table_Internal } from '../../types/Table'
@@ -8,10 +8,10 @@ const defaultPageIndex = 0
 const defaultPageSize = 10
 
 export function getDefaultPaginationState(): PaginationState {
-  return structuredClone({
+  return {
     pageIndex: defaultPageIndex,
     pageSize: defaultPageSize,
-  })
+  }
 }
 
 export function table_autoResetPageIndex<
@@ -48,7 +48,9 @@ export function table_resetPagination<
     table,
     defaultState
       ? getDefaultPaginationState()
-      : (table.initialState.pagination ?? getDefaultPaginationState()),
+      : cloneState(
+          table.initialState.pagination ?? getDefaultPaginationState(),
+        ),
   )
 }
 
@@ -78,24 +80,26 @@ export function table_resetPageIndex<
   TFeatures extends TableFeatures,
   TData extends RowData,
 >(table: Table_Internal<TFeatures, TData>, defaultState?: boolean) {
-  table_setPageIndex(
-    table,
-    defaultState
-      ? defaultPageIndex
-      : (table.initialState.pagination?.pageIndex ?? defaultPageIndex),
-  )
+  const currentPageIndex =
+    table.atoms.pagination?.get()?.pageIndex ?? defaultPageIndex
+  const newPageIndex = defaultState
+    ? defaultPageIndex
+    : (table.initialState.pagination?.pageIndex ?? defaultPageIndex)
+  if (newPageIndex === currentPageIndex) return
+  table_setPageIndex(table, newPageIndex)
 }
 
 export function table_resetPageSize<
   TFeatures extends TableFeatures,
   TData extends RowData,
 >(table: Table_Internal<TFeatures, TData>, defaultState?: boolean) {
-  table_setPageSize(
-    table,
-    defaultState
-      ? defaultPageSize
-      : (table.initialState.pagination?.pageSize ?? defaultPageSize),
-  )
+  const currentPageSize =
+    table.atoms.pagination?.get()?.pageSize ?? defaultPageSize
+  const newPageSize = defaultState
+    ? defaultPageSize
+    : (table.initialState.pagination?.pageSize ?? defaultPageSize)
+  if (newPageSize === currentPageSize) return
+  table_setPageSize(table, newPageSize)
 }
 
 export function table_setPageSize<
@@ -131,14 +135,14 @@ export function table_getCanPreviousPage<
   TFeatures extends TableFeatures,
   TData extends RowData,
 >(table: Table_Internal<TFeatures, TData>) {
-  return (table.store.state.pagination?.pageIndex ?? 0) > 0
+  return (table.atoms.pagination?.get()?.pageIndex ?? 0) > 0
 }
 
 export function table_getCanNextPage<
   TFeatures extends TableFeatures,
   TData extends RowData,
 >(table: Table_Internal<TFeatures, TData>) {
-  const pageIndex = table.store.state.pagination?.pageIndex ?? defaultPageIndex
+  const pageIndex = table.atoms.pagination?.get()?.pageIndex ?? defaultPageIndex
 
   const pageCount = table_getPageCount(table)
 
@@ -191,7 +195,7 @@ export function table_getPageCount<
     table.options.pageCount ??
     Math.ceil(
       table_getRowCount(table) /
-        (table.store.state.pagination?.pageSize ?? defaultPageSize),
+        (table.atoms.pagination?.get()?.pageSize ?? defaultPageSize),
     )
   )
 }

package/src/features/row-pinning/rowPinningFeature.ts

@@ -68,7 +68,7 @@ export function constructRowPinningFeature<
           fn: (row) => row_getPinnedIndex(row),
           memoDeps: (row) => [
             row.table.getRowModel().rows,
-            row.table.store.state.rowPinning,
+            row.table.atoms.rowPinning?.get(),
           ],
         },
         row_pin: {
@@ -93,21 +93,21 @@ export function constructRowPinningFeature<
           fn: () => table_getTopRows(table),
           memoDeps: () => [
             table.getRowModel().rows,
-            table.store.state.rowPinning?.top,
+            table.atoms.rowPinning?.get()?.top,
           ],
         },
         table_getBottomRows: {
           fn: () => table_getBottomRows(table),
           memoDeps: () => [
             table.getRowModel().rows,
-            table.store.state.rowPinning?.bottom,
+            table.atoms.rowPinning?.get()?.bottom,
           ],
         },
         table_getCenterRows: {
           fn: () => table_getCenterRows(table),
           memoDeps: () => [
             table.getRowModel().rows,
-            table.store.state.rowPinning,
+            table.atoms.rowPinning?.get(),
           ],
         },
       })

package/src/features/row-pinning/rowPinningFeature.utils.ts

@@ -1,5 +1,5 @@
 import { row_getIsAllParentsExpanded } from '../row-expanding/rowExpandingFeature.utils'
-import { callMemoOrStaticFn } from '../../utils'
+import { callMemoOrStaticFn, cloneState } from '../../utils'
 import type { RowData, Updater } from '../../types/type-utils'
 import type { TableFeatures } from '../../types/TableFeatures'
 import type { Table_Internal } from '../../types/Table'
@@ -12,10 +12,10 @@ import type {
 // State Utils
 
 export function getDefaultRowPinningState(): RowPinningState {
-  return structuredClone({
+  return {
     top: [],
     bottom: [],
-  })
+  }
 }
 
 export function table_setRowPinning<
@@ -36,7 +36,9 @@ export function table_resetRowPinning<
     table,
     defaultState
       ? getDefaultRowPinningState()
-      : (table.initialState.rowPinning ?? getDefaultRowPinningState()),
+      : cloneState(
+          table.initialState.rowPinning ?? getDefaultRowPinningState(),
+        ),
   )
 }
 
@@ -49,7 +51,7 @@ export function table_getIsSomeRowsPinned<
   table: Table_Internal<TFeatures, TData>,
   position?: RowPinningPosition,
 ): boolean {
-  const rowPinning = table.store.state.rowPinning
+  const rowPinning = table.atoms.rowPinning?.get()
 
   if (!position) {
     return Boolean(rowPinning?.top.length || rowPinning?.bottom.length)
@@ -65,7 +67,7 @@ function table_getPinnedRows<
   position: 'top' | 'bottom',
 ): Array<Row<TFeatures, TData>> {
   const visibleRows = table.getRowModel().rows
-  const pinnedRowIds = table.store.state.rowPinning?.[position] ?? []
+  const pinnedRowIds = table.atoms.rowPinning?.get()?.[position] ?? []
 
   const rows =
     (table.options.keepPinnedRows ?? true)
@@ -107,7 +109,7 @@ export function table_getCenterRows<
   TData extends RowData,
 >(table: Table_Internal<TFeatures, TData>): Array<Row<TFeatures, TData>> {
   const { top, bottom } =
-    table.store.state.rowPinning ?? getDefaultRowPinningState()
+    table.atoms.rowPinning?.get() ?? getDefaultRowPinningState()
   const allRows = table.getRowModel().rows
 
   const topAndBottom = new Set([...top, ...bottom])
@@ -132,7 +134,7 @@ export function row_getIsPinned<
   TData extends RowData,
 >(row: Row<TFeatures, TData>): RowPinningPosition {
   const { top, bottom } =
-    row.table.store.state.rowPinning ?? getDefaultRowPinningState()
+    row.table.atoms.rowPinning?.get() ?? getDefaultRowPinningState()
 
   return top.includes(row.id)
     ? 'top'

package/src/features/row-selection/rowSelectionFeature.ts

@@ -117,21 +117,21 @@ export function constructRowSelectionFeature<
         table_getSelectedRowModel: {
           fn: () => table_getSelectedRowModel(table),
           memoDeps: () => [
-            table.store.state.rowSelection,
+            table.atoms.rowSelection?.get(),
             table.getCoreRowModel(),
           ],
         },
         table_getFilteredSelectedRowModel: {
           fn: () => table_getFilteredSelectedRowModel(table),
           memoDeps: () => [
-            table.store.state.rowSelection,
+            table.atoms.rowSelection?.get(),
             table.getFilteredRowModel(),
           ],
         },
         table_getGroupedSelectedRowModel: {
           fn: () => table_getGroupedSelectedRowModel(table),
           memoDeps: () => [
-            table.store.state.rowSelection,
+            table.atoms.rowSelection?.get(),
             table.getSortedRowModel(),
           ],
         },

package/src/features/row-selection/rowSelectionFeature.types.ts

@@ -3,7 +3,7 @@ import type { TableFeatures } from '../../types/TableFeatures'
 import type { RowModel } from '../../core/row-models/coreRowModelsFeature.types'
 import type { Row } from '../../types/Row'
 
-export type RowSelectionState = Record<string, boolean>
+export type RowSelectionState = Record<string, boolean | undefined>
 
 export interface TableState_RowSelection {
   rowSelection: RowSelectionState

package/src/features/row-selection/rowSelectionFeature.utils.ts

@@ -1,3 +1,4 @@
+import { cloneState } from '../../utils'
 import type { RowData, Updater } from '../../types/type-utils'
 import type { TableFeatures } from '../../types/TableFeatures'
 import type { RowModel } from '../../core/row-models/coreRowModelsFeature.types'
@@ -8,7 +9,7 @@ import type { RowSelectionState } from './rowSelectionFeature.types'
 // State APIs
 
 export function getDefaultRowSelectionState(): RowSelectionState {
-  return structuredClone({})
+  return {}
 }
 
 export function table_setRowSelection<
@@ -27,7 +28,7 @@ export function table_resetRowSelection<
 >(table: Table_Internal<TFeatures, TData>, defaultState?: boolean) {
   table_setRowSelection(
     table,
-    defaultState ? {} : (table.initialState.rowSelection ?? {}),
+    defaultState ? {} : cloneState(table.initialState.rowSelection ?? {}),
   )
 }
 
@@ -97,7 +98,7 @@ export function table_getSelectedRowModel<
 >(table: Table_Internal<TFeatures, TData>) {
   const rowModel = table.getCoreRowModel()
 
-  if (!Object.keys(table.store.state.rowSelection ?? {}).length) {
+  if (!Object.keys(table.atoms.rowSelection?.get() ?? {}).length) {
     return {
       rows: [],
       flatRows: [],
@@ -114,7 +115,7 @@ export function table_getFilteredSelectedRowModel<
 >(table: Table_Internal<TFeatures, TData>) {
   const rowModel = table.getCoreRowModel()
 
-  if (!Object.keys(table.store.state.rowSelection ?? {}).length) {
+  if (!Object.keys(table.atoms.rowSelection?.get() ?? {}).length) {
     return {
       rows: [],
       flatRows: [],
@@ -131,7 +132,7 @@ export function table_getGroupedSelectedRowModel<
 >(table: Table_Internal<TFeatures, TData>) {
   const rowModel = table.getCoreRowModel()
 
-  if (!Object.keys(table.store.state.rowSelection ?? {}).length) {
+  if (!Object.keys(table.atoms.rowSelection?.get() ?? {}).length) {
     return {
       rows: [],
       flatRows: [],
@@ -148,7 +149,7 @@ export function table_getIsAllRowsSelected<
 >(table: Table_Internal<TFeatures, TData>) {
   const preGroupedFlatRows = table.getFilteredRowModel().flatRows
   const rowSelection =
-    table.store.state.rowSelection ?? ({} as RowSelectionState)
+    table.atoms.rowSelection?.get() ?? ({} as RowSelectionState)
 
   let isAllRowsSelected = Boolean(
     preGroupedFlatRows.length && Object.keys(rowSelection).length,
@@ -175,7 +176,7 @@ export function table_getIsAllPageRowsSelected<
     .getPaginatedRowModel()
     .flatRows.filter((row) => row_getCanSelect(row))
   const rowSelection =
-    table.store.state.rowSelection ?? ({} as RowSelectionState)
+    table.atoms.rowSelection?.get() ?? ({} as RowSelectionState)
 
   let isAllPageRowsSelected = !!paginationFlatRows.length
 
@@ -193,7 +194,9 @@ export function table_getIsSomeRowsSelected<
   TFeatures extends TableFeatures,
   TData extends RowData,
 >(table: Table_Internal<TFeatures, TData>) {
-  const totalSelected = Object.keys(table.store.state.rowSelection ?? {}).length
+  const totalSelected = Object.keys(
+    table.atoms.rowSelection?.get() ?? {},
+  ).length
   return (
     totalSelected > 0 &&
     totalSelected < table.getFilteredRowModel().flatRows.length
@@ -347,7 +350,7 @@ const mutateRowIsSelected = <
   TFeatures extends TableFeatures,
   TData extends RowData,
 >(
-  selectedRowIds: Record<string, boolean>,
+  selectedRowIds: Record<string, boolean | undefined>,
   rowId: string,
   value: boolean,
   includeChildren: boolean,
@@ -419,7 +422,7 @@ export function isRowSelected<
   TFeatures extends TableFeatures,
   TData extends RowData,
 >(row: Row<TFeatures, TData>): boolean {
-  return (row.table.store.state.rowSelection ?? {})[row.id] ?? false
+  return (row.table.atoms.rowSelection?.get() ?? {})[row.id] ?? false
 }
 
 export function isSubRowSelected<

package/src/features/row-sorting/createSortedRowModel.ts

@@ -22,7 +22,10 @@ export function createSortedRowModel<
       feature: 'rowSortingFeature',
       table,
       fnName: 'table.getSortedRowModel',
-      memoDeps: () => [table.store.state.sorting, table.getPreSortedRowModel()],
+      memoDeps: () => [
+        table.atoms.sorting?.get(),
+        table.getPreSortedRowModel(),
+      ],
       fn: () => _createSortedRowModel(table),
       onAfterUpdate: () => table_autoResetPageIndex(table),
     })
@@ -34,7 +37,7 @@ function _createSortedRowModel<
   TData extends RowData = any,
 >(table: Table_Internal<TFeatures, TData>): RowModel<TFeatures, TData> {
   const preSortedRowModel = table.getPreSortedRowModel()
-  const sorting = table.store.state.sorting
+  const sorting = table.atoms.sorting?.get()
 
   if (!preSortedRowModel.rows.length || !sorting?.length) {
     return preSortedRowModel