memo refactor

TanStack · Oct 17, 2024 · 401d69b · 401d69b
1 parent 9578c73
commit 401d69b
Show file tree

Hide file tree

Showing 13 changed files with 358 additions and 456 deletions.
diff --git a/examples/react/filters-faceted/src/main.tsx b/examples/react/filters-faceted/src/main.tsx
@@ -16,11 +16,9 @@ import {
   flexRender,
   sortingFns,
   tableFeatures,
-  processingFns,
   useTable,
 } from '@tanstack/react-table'
 import { makeData } from './makeData'
-import type { ProcessingFns } from '../../../../packages/table-core/dist/esm/types/ProcessingFns'
 import type {
   CellData,
   Column,
@@ -38,11 +36,6 @@ const _features = tableFeatures({
   RowSorting,
 })
 
-const _processingFns = processingFns(_features, {
-  filterFns,
-  sortingFns,
-})
-
 declare module '@tanstack/react-table' {
   // allows us to define custom properties for our columns
   interface ColumnMeta<
@@ -109,7 +102,10 @@ function App() {
 
   const table = useTable({
     _features,
-    _processingFns,
+    _processingFns: {
+      filterFns,
+      sortingFns,
+    },
     _rowModels: {
       Filtered: createFilteredRowModel(), // client-side filtering
       Paginated: createPaginatedRowModel(),
@@ -174,7 +170,7 @@ function App() {
           {table.getRowModel().rows.map((row) => {
             return (
               <tr key={row.id}>
-                {row.getVisibleCells().map((cell) => {
+                {row.getAllCells().map((cell) => {
                   return (
                     <td key={cell.id}>
                       {flexRender(
@@ -269,7 +265,7 @@ function App() {
   )
 }
 
-function Filter({ column }: { column: Column<any, Person, unknown> }) {
+function Filter({ column }: { column: Column<typeof _features, Person> }) {
   const { filterVariant } = column.columnDef.meta ?? {}
 
   const columnFilterValue = column.getFilterValue()

diff --git a/packages/table-core/src/core/table/Tables.types.ts b/packages/table-core/src/core/table/Tables.types.ts
@@ -118,6 +118,11 @@ export interface Table_CoreProperties<
    * @link [Guide](https://tanstack.com/table/v8/docs/guide/tables)
    */
   _processingFns: ProcessingFns<TFeatures, TData>
+  /**
+   * The row models that are enabled for the table.
+   * @link [API Docs](https://tanstack.com/table/v8/docs/api/core/table#_rowmodels)
+   * @link [Guide](https://tanstack.com/table/v8/docs/guide/tables)
+   */
   _rowModels: CachedRowModels<TFeatures, TData>
   /**
    * This is the resolved initial state of the table.
@@ -137,7 +142,6 @@ export interface Table_Table<
   TFeatures extends TableFeatures,
   TData extends RowData,
 > extends Table_CoreProperties<TFeatures, TData> {
-  _queue: (cb: () => void) => void
   /**
    * Returns the core row model before any processing has been applied.
    * @link [API Docs](https://tanstack.com/table/v8/docs/api/core/table#getcorerowmodel)

diff --git a/packages/table-core/src/core/table/constructTable.ts b/packages/table-core/src/core/table/constructTable.ts
@@ -49,32 +49,6 @@ export function constructTable<
 
   Object.assign(table, coreInstance)
 
-  const queued: Array<() => void> = []
-  let queuedTimeout = false
-
-  table._queue = (cb) => {
-    queued.push(cb)
-
-    if (!queuedTimeout) {
-      queuedTimeout = true
-
-      // Schedule a microtask to run the queued callbacks after
-      // the current call stack (render, etc) has finished.
-      Promise.resolve()
-        .then(() => {
-          while (queued.length) {
-            queued.shift()!()
-          }
-          queuedTimeout = false
-        })
-        .catch((error) =>
-          setTimeout(() => {
-            throw error
-          }),
-        )
-    }
-  }
-
   for (const feature of featuresList) {
     feature.constructTable?.(table)
   }

diff --git a/packages/table-core/src/core/table/createCoreRowModel.ts b/packages/table-core/src/core/table/createCoreRowModel.ts
@@ -15,7 +15,7 @@ export function createCoreRowModel<
   return (table: Table<TFeatures, TData>) =>
     tableMemo({
       debug: isDev && (table.options.debugAll ?? table.options.debugTable),
-      fnName: 'createCoreRowModel',
+      fnName: 'table.createCoreRowModel',
       memoDeps: () => [table.options.data],
       fn: (data) => _createCoreRowModel(table, data),
       onAfterUpdate: () => table_autoResetPageIndex(table),

diff --git a/packages/table-core/src/features/column-faceting/createFacetedMinMaxValues.ts b/packages/table-core/src/features/column-faceting/createFacetedMinMaxValues.ts
@@ -16,7 +16,7 @@ export function createFacetedMinMaxValues<
   return (table, columnId) =>
     tableMemo({
       debug: isDev && (table.options.debugAll ?? table.options.debugTable),
-      fnName: 'createFacetedMinMaxValues',
+      fnName: 'table.createFacetedMinMaxValues',
       memoDeps: () => [
         column_getFacetedRowModel(table.getColumn(columnId), table)(),
       ],

diff --git a/packages/table-core/src/features/column-faceting/createFacetedUniqueValues.ts b/packages/table-core/src/features/column-faceting/createFacetedUniqueValues.ts
@@ -1,4 +1,4 @@
-import { getMemoOptions, memo } from '../../utils'
+import { isDev, tableMemo } from '../../utils'
 import { row_getUniqueValues } from '../../core/rows/Rows.utils'
 import { column_getFacetedRowModel } from './ColumnFaceting.utils'
 import type { RowData } from '../../types/type-utils'
@@ -13,34 +13,43 @@ export function createFacetedUniqueValues<
   columnId: string,
 ) => () => Map<any, number> {
   return (table, columnId) =>
-    memo(
-      () => [column_getFacetedRowModel(table.getColumn(columnId), table)()],
-      (facetedRowModel) => {
-        if (!facetedRowModel) return new Map()
+    tableMemo({
+      debug: isDev && (table.options.debugAll ?? table.options.debugTable),
+      fnName: 'table.createFacetedUniqueValues',
+      memoDeps: () => [
+        column_getFacetedRowModel(table.getColumn(columnId), table)(),
+      ],
+      fn: (facetedRowModel) =>
+        _createFacetedUniqueValues(table, columnId, facetedRowModel),
+    })
+}
+
+function _createFacetedUniqueValues<
+  TFeatures extends TableFeatures,
+  TData extends RowData,
+>(
+  table: Table<TFeatures, TData>,
+  columnId: string,
+  facetedRowModel?: ReturnType<ReturnType<typeof column_getFacetedRowModel>>,
+): Map<any, number> {
+  if (!facetedRowModel) return new Map()
 
-        const facetedUniqueValues = new Map<any, number>()
+  const facetedUniqueValues = new Map<any, number>()
 
-        for (const row of facetedRowModel.flatRows) {
-          const values = row_getUniqueValues(row, table, columnId)
+  for (const row of facetedRowModel.flatRows) {
+    const values = row_getUniqueValues(row, table, columnId)
 
-          for (const value of values) {
-            if (facetedUniqueValues.has(value)) {
-              facetedUniqueValues.set(
-                value,
-                (facetedUniqueValues.get(value) ?? 0) + 1,
-              )
-            } else {
-              facetedUniqueValues.set(value, 1)
-            }
-          }
-        }
+    for (const value of values) {
+      if (facetedUniqueValues.has(value)) {
+        facetedUniqueValues.set(
+          value,
+          (facetedUniqueValues.get(value) ?? 0) + 1,
+        )
+      } else {
+        facetedUniqueValues.set(value, 1)
+      }
+    }
+  }
 
-        return facetedUniqueValues
-      },
-      getMemoOptions(
-        table.options,
-        'debugTable',
-        `getFacetedUniqueValues_${columnId}`,
-      ),
-    )
+  return facetedUniqueValues
 }