Merge branch 'main' into alpha

Author: lachlancollins

docs/api/core/table.md

@@ -89,7 +89,7 @@ declare module '@tanstack/table-core' {
 }
 ```
 
-> 🧠 Think of this option as an arbitrary "context" for your table. This is a great way to pass arbitrary data or functions to your table without having to pass it to every thing the table touches. A good example is passing a locale object to your table to use for formatting dates, numbers, etc or even a function that can be used to update editable data like in the [editable-data example](../../framework/react/examples/editable-data).
+> 🧠 Think of this option as an arbitrary "context" for your table. This is a great way to pass arbitrary data or functions to your table without having to pass it to every thing the table touches. A good example is passing a locale object to your table to use for formatting dates, numbers, etc or even a function that can be used to update editable data like in the [editable-data example](../../../framework/react/examples/editable-data).
 
 ### `state`
 

docs/config.json

@@ -617,6 +617,10 @@
             {
               "to": "framework/react/examples/custom-features",
               "label": "Custom Features"
+            },
+            {
+              "to": "framework/react/examples/query-router-search-params",
+              "label": "Query Router Search Params"
             }
           ]
         },

docs/framework/react/guide/table-state.md

@@ -131,7 +131,7 @@ table.setOptions(prev => ({
 
 ### On State Change Callbacks
 
-So far, we have seen the `on[State]Change` and `onStateChange` table options work to "hoist" the table state changes into our own state management. However, there are a few things about these using these options that you should be aware of.
+So far, we have seen the `on[State]Change` and `onStateChange` table options work to "hoist" the table state changes into our own state management. However, there are a few things about using these options that you should be aware of.
 
 #### 1. **State Change Callbacks MUST have their corresponding state value in the `state` option**.
 
@@ -201,4 +201,4 @@ const [sorting, setSorting] = React.useState<SortingState[]>([
     desc: true,
   }
 ])
-```
+```

docs/guide/column-filtering.md

@@ -25,7 +25,7 @@ Filtering comes in 2 flavors: Column Filtering and Global Filtering.
 
 This guide will focus on column filtering, which is a filter that is applied to a single column's accessor value.
 
-TanStack table supports both both client-side and manual server-side filtering. This guide will go over how to implement and customize both, and help you decide which one is best for your use-case.
+TanStack table supports both client-side and manual server-side filtering. This guide will go over how to implement and customize both, and help you decide which one is best for your use-case.
 
 ### Client-Side vs Server-Side Filtering
 

examples/angular/filters/src/app/app.component.html

@@ -10,7 +10,7 @@
               @if (!header.isPlaceholder) {
                 <div
                   [ngClass]="{
-                    'cursor-pointer select-none': header.column.getCanSort()
+                    'cursor-pointer select-none': header.column.getCanSort(),
                   }"
                 >
                   <ng-container

examples/qwik/basic/package.json

@@ -5,11 +5,11 @@
   "type": "module",
   "scripts": {
     "dev": "vite",
-    "build": "tsc && vite build",
+    "build": "vite build",
     "preview": "serve dist"
   },
   "devDependencies": {
-    "@builder.io/qwik": "^1.5.2",
+    "@builder.io/qwik": "^1.6.0",
     "serve": "^14.2.3",
     "typescript": "5.4.5",
     "vite": "^5.3.1"

examples/qwik/filters/package.json

@@ -5,11 +5,11 @@
   "type": "module",
   "scripts": {
     "dev": "vite",
-    "build": "tsc && vite build",
+    "build": "vite build",
     "preview": "serve dist"
   },
   "devDependencies": {
-    "@builder.io/qwik": "^1.5.2",
+    "@builder.io/qwik": "^1.6.0",
     "@faker-js/faker": "^8.4.1",
     "serve": "^14.2.3",
     "typescript": "5.4.5",

examples/qwik/row-selection/package.json

@@ -5,11 +5,11 @@
   "type": "module",
   "scripts": {
     "dev": "vite",
-    "build": "tsc && vite build",
+    "build": "vite build",
     "preview": "serve dist"
   },
   "devDependencies": {
-    "@builder.io/qwik": "^1.5.2",
+    "@builder.io/qwik": "^1.6.0",
     "@faker-js/faker": "^8.4.1",
     "serve": "^14.2.3",
     "typescript": "5.4.5",

examples/qwik/sorting/package.json

@@ -5,11 +5,11 @@
   "type": "module",
   "scripts": {
     "dev": "vite",
-    "build": "tsc && vite build",
+    "build": "vite build",
     "preview": "serve dist"
   },
   "devDependencies": {
-    "@builder.io/qwik": "^1.5.2",
+    "@builder.io/qwik": "^1.6.0",
     "@faker-js/faker": "^8.4.1",
     "serve": "^14.2.3",
     "typescript": "5.4.5",

examples/react/query-router-search-params/.gitignore

@@ -0,0 +1,5 @@
+node_modules
+.DS_Store
+dist
+dist-ssr
+*.local