From 3bba225f1a0b919901a941e5a88a466ac9010406 Mon Sep 17 00:00:00 2001
From: Andrew Stein <steinlink@gmail.com>
Date: Fri, 20 Oct 2023 10:05:52 -0400
Subject: [PATCH] v2.6.0

---
 CHANGELOG.md                                  | 19 ++++++++++++++-
 cpp/perspective/package.json                  |  2 +-
 docs/package.json                             | 14 +++++------
 docs/src/components/Demo/layouts.js           |  2 +-
 examples/blocks/package.json                  | 14 +++++------
 examples/esbuild-example/package.json         | 14 +++++------
 examples/esbuild-remote/package.json          | 12 +++++-----
 examples/git-history/package.json             | 10 ++++----
 examples/promo/package.json                   | 14 +++++------
 examples/python-aiohttp/package.json          | 14 +++++------
 examples/python-starlette/package.json        | 14 +++++------
 .../python-tornado-streaming/package.json     | 14 +++++------
 examples/python-tornado/package.json          | 14 +++++------
 examples/react-example/package.json           | 12 +++++-----
 examples/webpack-cross-origin/package.json    | 12 +++++-----
 examples/webpack-example/package.json         | 12 +++++-----
 .../workspace-editing-python/package.json     | 14 +++++------
 examples/workspace/package.json               | 14 +++++------
 package.json                                  |  2 +-
 packages/perspective-cli/package.json         | 14 +++++------
 .../perspective-esbuild-plugin/package.json   |  2 +-
 packages/perspective-jupyterlab/package.json  | 16 ++++++-------
 packages/perspective-viewer-d3fc/package.json | 10 ++++----
 .../perspective-viewer-datagrid/package.json  | 10 ++++----
 .../package.json                              |  8 +++----
 .../perspective-webpack-plugin/package.json   |  6 ++---
 packages/perspective-workspace/package.json   |  8 +++----
 packages/perspective/package.json             |  6 ++---
 python/perspective/package.json               | 12 +++++-----
 .../perspective/perspective/core/_version.py  |  4 ++--
 rust/perspective-viewer/Cargo.lock            |  4 ++--
 rust/perspective-viewer/Cargo.toml            |  2 +-
 rust/perspective-viewer/exprtk.md             | 24 +++++++++++++++++++
 rust/perspective-viewer/package.json          |  8 +++----
 .../tasks/bundle/Cargo.toml                   |  2 +-
 tools/perspective-scripts/package.json        |  2 +-
 tools/perspective-test/package.json           |  4 ++--
 37 files changed, 203 insertions(+), 162 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5fabc32df4..36e777421e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,20 @@
+# [v2.6.0](https://github.com/finos/perspective/releases/tag/v2.6.0)
+
+_20 October 2023_ ([Full changelog](https://github.com/finos/perspective/compare/v2.5.2...v2.6.0))
+
+Features
+
+- X/Y scatter multi-chart [#2395](https://github.com/finos/perspective/pull/2395)
+- Symbols column in `X/Y Scatter` plot [#2394](https://github.com/finos/perspective/pull/2394)
+- New themes `Gruvbox` and `Dracula` + UI performance improvements [#2393](https://github.com/finos/perspective/pull/2393)
+- Add `index()`, `col()`, and `vlookup()` to ExprTk [#2374](https://github.com/finos/perspective/pull/2374)
+- Datagrid rows restyle [#2383](https://github.com/finos/perspective/pull/2383)
+
+Fixes
+
+- Column selector style updates [#2385](https://github.com/finos/perspective/pull/2385)
+- fix gradient values [#2384](https://github.com/finos/perspective/pull/2384)
+
 # [v2.5.2](https://github.com/finos/perspective/releases/tag/v2.5.2)
 
 _8 October 2023_ ([Full changelog](https://github.com/finos/perspective/compare/v2.5.1...v2.5.2))
@@ -12,8 +29,8 @@ Fixes
 
 Misc
 
-- Localize NYPD, Magic and Olympics examples [#2375](https://github.com/finos/perspective/pull/2375)
 - Fix tests [#2380](https://github.com/finos/perspective/pull/2380)
+- Localize NYPD, Magic and Olympics examples [#2375](https://github.com/finos/perspective/pull/2375)
 
 # [v2.5.1](https://github.com/finos/perspective/releases/tag/v2.5.1)
 
diff --git a/cpp/perspective/package.json b/cpp/perspective/package.json
index 5ac0359c4c..f3b24c2e6e 100644
--- a/cpp/perspective/package.json
+++ b/cpp/perspective/package.json
@@ -3,7 +3,7 @@
     "private": true,
     "author": "The Perspective Authors",
     "license": "Apache-2.0",
-    "version": "2.5.2",
+    "version": "2.6.0",
     "main": "./dist/esm/perspective.cpp.js",
     "files": [
         "dist/esm/**/*",
diff --git a/docs/package.json b/docs/package.json
index 1c5fcbd34f..032d6b5875 100644
--- a/docs/package.json
+++ b/docs/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@finos/perspective-docs",
-    "version": "2.5.2",
+    "version": "2.6.0",
     "private": true,
     "scripts": {
         "docusaurus": "docusaurus",
@@ -16,13 +16,13 @@
     "dependencies": {
         "@docusaurus/core": "2.2.0",
         "@docusaurus/preset-classic": "2.2.0",
-        "@finos/perspective": "^2.5.2",
-        "@finos/perspective-viewer": "^2.5.2",
-        "@finos/perspective-viewer-d3fc": "^2.5.2",
-        "@finos/perspective-viewer-datagrid": "^2.5.2",
-        "@finos/perspective-webpack-plugin": "^2.5.2",
+        "@finos/perspective": "^2.6.0",
+        "@finos/perspective-viewer": "^2.6.0",
+        "@finos/perspective-viewer-d3fc": "^2.6.0",
+        "@finos/perspective-viewer-datagrid": "^2.6.0",
+        "@finos/perspective-webpack-plugin": "^2.6.0",
         "@mdx-js/react": "^1.6.22",
-        "blocks": "^2.5.2",
+        "blocks": "^2.6.0",
         "clsx": "^1.1.1",
         "prism-react-renderer": "^1.3.3",
         "react": "^17.0.2",
diff --git a/docs/src/components/Demo/layouts.js b/docs/src/components/Demo/layouts.js
index 85e7d36ea7..81d720f72e 100644
--- a/docs/src/components/Demo/layouts.js
+++ b/docs/src/components/Demo/layouts.js
@@ -71,7 +71,7 @@ export const LAYOUTS = {
         plugin: "X/Y Scatter",
         group_by: ["name"],
         split_by: [],
-        columns: ["bid", "ask", "chg", "vol", "name"],
+        columns: ["bid", "ask", "chg", "vol", null, "name"],
         aggregates: { bid: "avg", ask: "avg", vol: "avg", name: "dominant" },
         sort: [],
     },
diff --git a/examples/blocks/package.json b/examples/blocks/package.json
index 97b78b9758..a41a2b0ec3 100644
--- a/examples/blocks/package.json
+++ b/examples/blocks/package.json
@@ -1,7 +1,7 @@
 {
     "name": "blocks",
     "private": true,
-    "version": "2.5.2",
+    "version": "2.6.0",
     "description": "A collection of simple client-side Perspective examples for `http://bl.ocks.org`.",
     "scripts": {
         "start": "mkdirp dist && node server.mjs"
@@ -10,12 +10,12 @@
     "keywords": [],
     "license": "Apache-2.0",
     "dependencies": {
-        "@finos/perspective": "^2.5.2",
-        "@finos/perspective-viewer": "^2.5.2",
-        "@finos/perspective-viewer-d3fc": "^2.5.2",
-        "@finos/perspective-viewer-datagrid": "^2.5.2",
-        "@finos/perspective-viewer-openlayers": "^2.5.2",
-        "@finos/perspective-workspace": "^2.5.2",
+        "@finos/perspective": "^2.6.0",
+        "@finos/perspective-viewer": "^2.6.0",
+        "@finos/perspective-viewer-d3fc": "^2.6.0",
+        "@finos/perspective-viewer-datagrid": "^2.6.0",
+        "@finos/perspective-viewer-openlayers": "^2.6.0",
+        "@finos/perspective-workspace": "^2.6.0",
         "superstore-arrow": "3.0.0"
     }
 }
diff --git a/examples/esbuild-example/package.json b/examples/esbuild-example/package.json
index 600c644dac..28afa8d9bd 100644
--- a/examples/esbuild-example/package.json
+++ b/examples/esbuild-example/package.json
@@ -1,7 +1,7 @@
 {
     "name": "esbuild-example",
     "private": true,
-    "version": "2.5.2",
+    "version": "2.6.0",
     "description": "An esbuild example app built using `@finos/perspective-viewer`.",
     "scripts": {
         "build": "node build.js",
@@ -10,15 +10,15 @@
     "keywords": [],
     "license": "Apache-2.0",
     "dependencies": {
-        "@finos/perspective": "^2.5.2",
-        "@finos/perspective-viewer": "^2.5.2",
-        "@finos/perspective-viewer-d3fc": "^2.5.2",
-        "@finos/perspective-viewer-datagrid": "^2.5.2",
-        "@finos/perspective-viewer-openlayers": "^2.5.2",
+        "@finos/perspective": "^2.6.0",
+        "@finos/perspective-viewer": "^2.6.0",
+        "@finos/perspective-viewer-d3fc": "^2.6.0",
+        "@finos/perspective-viewer-datagrid": "^2.6.0",
+        "@finos/perspective-viewer-openlayers": "^2.6.0",
         "superstore-arrow": "^3.0.0"
     },
     "devDependencies": {
-        "@finos/perspective-esbuild-plugin": "^2.5.2",
+        "@finos/perspective-esbuild-plugin": "^2.6.0",
         "esbuild": "^0.14.54",
         "http-server": "^0.11.1"
     }
diff --git a/examples/esbuild-remote/package.json b/examples/esbuild-remote/package.json
index a27f14d69c..fb7a197bb7 100644
--- a/examples/esbuild-remote/package.json
+++ b/examples/esbuild-remote/package.json
@@ -1,7 +1,7 @@
 {
     "name": "esbuild-remote",
     "private": true,
-    "version": "2.5.2",
+    "version": "2.6.0",
     "description": "An example of 2 Perspectives, one client and one server, streaming via Apache Arrow.",
     "scripts": {
         "start": "node build.js && node server/index.mjs"
@@ -9,15 +9,15 @@
     "keywords": [],
     "license": "Apache-2.0",
     "dependencies": {
-        "@finos/perspective": "^2.5.2",
-        "@finos/perspective-viewer": "^2.5.2",
-        "@finos/perspective-viewer-d3fc": "^2.5.2",
-        "@finos/perspective-viewer-datagrid": "^2.5.2",
+        "@finos/perspective": "^2.6.0",
+        "@finos/perspective-viewer": "^2.6.0",
+        "@finos/perspective-viewer-d3fc": "^2.6.0",
+        "@finos/perspective-viewer-datagrid": "^2.6.0",
         "express": "^4.17.1",
         "express-ws": "^5.0.2"
     },
     "devDependencies": {
-        "@finos/perspective-esbuild-plugin": "^2.5.2",
+        "@finos/perspective-esbuild-plugin": "^2.6.0",
         "esbuild": "^0.14.54"
     }
 }
diff --git a/examples/git-history/package.json b/examples/git-history/package.json
index 316bf60415..c5e92f2640 100644
--- a/examples/git-history/package.json
+++ b/examples/git-history/package.json
@@ -1,7 +1,7 @@
 {
     "name": "git-history",
     "private": true,
-    "version": "2.5.2",
+    "version": "2.6.0",
     "description": "An example of Perspective's own GIT history rendered in Perspective.",
     "scripts": {
         "start": "node server.js"
@@ -9,9 +9,9 @@
     "keywords": [],
     "license": "Apache-2.0",
     "dependencies": {
-        "@finos/perspective": "^2.5.2",
-        "@finos/perspective-viewer": "^2.5.2",
-        "@finos/perspective-viewer-d3fc": "^2.5.2",
-        "@finos/perspective-viewer-datagrid": "^2.5.2"
+        "@finos/perspective": "^2.6.0",
+        "@finos/perspective-viewer": "^2.6.0",
+        "@finos/perspective-viewer-d3fc": "^2.6.0",
+        "@finos/perspective-viewer-datagrid": "^2.6.0"
     }
 }
diff --git a/examples/promo/package.json b/examples/promo/package.json
index 54371ae92c..5f7973b9c2 100644
--- a/examples/promo/package.json
+++ b/examples/promo/package.json
@@ -1,7 +1,7 @@
 {
     "name": "promo",
     "private": true,
-    "version": "2.5.2",
+    "version": "2.6.0",
     "description": "An puppeteer-guided demo of Perspective's functionality, as seen on Github.",
     "scripts": {
         "dev": "webpack-dev-server --open",
@@ -13,14 +13,14 @@
     "keywords": [],
     "license": "Apache-2.0",
     "dependencies": {
-        "@finos/perspective": "^2.5.2",
-        "@finos/perspective-viewer": "^2.5.2",
-        "@finos/perspective-viewer-d3fc": "^2.5.2",
-        "@finos/perspective-viewer-datagrid": "^2.5.2",
-        "@finos/perspective-workspace": "^2.5.2"
+        "@finos/perspective": "^2.6.0",
+        "@finos/perspective-viewer": "^2.6.0",
+        "@finos/perspective-viewer-d3fc": "^2.6.0",
+        "@finos/perspective-viewer-datagrid": "^2.6.0",
+        "@finos/perspective-workspace": "^2.6.0"
     },
     "devDependencies": {
-        "@finos/perspective-webpack-plugin": "^2.5.2",
+        "@finos/perspective-webpack-plugin": "^2.6.0",
         "http-server": "^0.11.1",
         "npm-run-all": "^4.1.3",
         "rimraf": "^2.5.2"
diff --git a/examples/python-aiohttp/package.json b/examples/python-aiohttp/package.json
index 5aad9c8ee9..e466c647a7 100644
--- a/examples/python-aiohttp/package.json
+++ b/examples/python-aiohttp/package.json
@@ -1,7 +1,7 @@
 {
     "name": "python-aiohttp",
     "private": true,
-    "version": "2.5.2",
+    "version": "2.6.0",
     "description": "An example of editing a `perspective-python` server from the browser.",
     "scripts": {
         "start": "PYTHONPATH=../../python/perspective python3 server.py"
@@ -9,15 +9,15 @@
     "keywords": [],
     "license": "Apache-2.0",
     "dependencies": {
-        "@finos/perspective": "^2.5.2",
-        "@finos/perspective-viewer": "^2.5.2",
-        "@finos/perspective-viewer-d3fc": "^2.5.2",
-        "@finos/perspective-viewer-datagrid": "^2.5.2",
-        "@finos/perspective-workspace": "^2.5.2",
+        "@finos/perspective": "^2.6.0",
+        "@finos/perspective-viewer": "^2.6.0",
+        "@finos/perspective-viewer-d3fc": "^2.6.0",
+        "@finos/perspective-viewer-datagrid": "^2.6.0",
+        "@finos/perspective-workspace": "^2.6.0",
         "superstore-arrow": "^3.0.0"
     },
     "devDependencies": {
-        "@finos/perspective-webpack-plugin": "^2.5.2",
+        "@finos/perspective-webpack-plugin": "^2.6.0",
         "npm-run-all": "^4.1.3",
         "rimraf": "^2.5.2"
     }
diff --git a/examples/python-starlette/package.json b/examples/python-starlette/package.json
index a3ac25bf2c..29343b09f1 100644
--- a/examples/python-starlette/package.json
+++ b/examples/python-starlette/package.json
@@ -1,7 +1,7 @@
 {
     "name": "python-starlette",
     "private": true,
-    "version": "2.5.2",
+    "version": "2.6.0",
     "description": "An example of editing a `perspective-python` server from the browser.",
     "scripts": {
         "start": "PYTHONPATH=../../python/perspective python3 server.py"
@@ -9,15 +9,15 @@
     "keywords": [],
     "license": "Apache-2.0",
     "dependencies": {
-        "@finos/perspective": "^2.5.2",
-        "@finos/perspective-viewer": "^2.5.2",
-        "@finos/perspective-viewer-d3fc": "^2.5.2",
-        "@finos/perspective-viewer-datagrid": "^2.5.2",
-        "@finos/perspective-workspace": "^2.5.2",
+        "@finos/perspective": "^2.6.0",
+        "@finos/perspective-viewer": "^2.6.0",
+        "@finos/perspective-viewer-d3fc": "^2.6.0",
+        "@finos/perspective-viewer-datagrid": "^2.6.0",
+        "@finos/perspective-workspace": "^2.6.0",
         "superstore-arrow": "^3.0.0"
     },
     "devDependencies": {
-        "@finos/perspective-webpack-plugin": "^2.5.2",
+        "@finos/perspective-webpack-plugin": "^2.6.0",
         "npm-run-all": "^4.1.3",
         "rimraf": "^2.5.2"
     }
diff --git a/examples/python-tornado-streaming/package.json b/examples/python-tornado-streaming/package.json
index 0c757a8264..c0fdb58f4f 100644
--- a/examples/python-tornado-streaming/package.json
+++ b/examples/python-tornado-streaming/package.json
@@ -1,7 +1,7 @@
 {
     "name": "python-tornado-streaming",
     "private": true,
-    "version": "2.5.2",
+    "version": "2.6.0",
     "description": "An example of streaming a `perspective-python` server to the browser.",
     "scripts": {
         "start": "PYTHONPATH=../../python/perspective python3 server.py"
@@ -9,15 +9,15 @@
     "keywords": [],
     "license": "Apache-2.0",
     "dependencies": {
-        "@finos/perspective": "^2.5.2",
-        "@finos/perspective-viewer": "^2.5.2",
-        "@finos/perspective-viewer-d3fc": "^2.5.2",
-        "@finos/perspective-viewer-datagrid": "^2.5.2",
-        "@finos/perspective-workspace": "^2.5.2",
+        "@finos/perspective": "^2.6.0",
+        "@finos/perspective-viewer": "^2.6.0",
+        "@finos/perspective-viewer-d3fc": "^2.6.0",
+        "@finos/perspective-viewer-datagrid": "^2.6.0",
+        "@finos/perspective-workspace": "^2.6.0",
         "superstore-arrow": "^3.0.0"
     },
     "devDependencies": {
-        "@finos/perspective-webpack-plugin": "^2.5.2",
+        "@finos/perspective-webpack-plugin": "^2.6.0",
         "npm-run-all": "^4.1.3",
         "rimraf": "^2.5.2"
     }
diff --git a/examples/python-tornado/package.json b/examples/python-tornado/package.json
index 727f5b71fc..5a1211a76a 100644
--- a/examples/python-tornado/package.json
+++ b/examples/python-tornado/package.json
@@ -1,7 +1,7 @@
 {
     "name": "python-tornado",
     "private": true,
-    "version": "2.5.2",
+    "version": "2.6.0",
     "description": "An example of editing a `perspective-python` server from the browser.",
     "scripts": {
         "start": "PYTHONPATH=../../python/perspective python3 server.py"
@@ -9,15 +9,15 @@
     "keywords": [],
     "license": "Apache-2.0",
     "dependencies": {
-        "@finos/perspective": "^2.5.2",
-        "@finos/perspective-viewer": "^2.5.2",
-        "@finos/perspective-viewer-d3fc": "^2.5.2",
-        "@finos/perspective-viewer-datagrid": "^2.5.2",
-        "@finos/perspective-workspace": "^2.5.2",
+        "@finos/perspective": "^2.6.0",
+        "@finos/perspective-viewer": "^2.6.0",
+        "@finos/perspective-viewer-d3fc": "^2.6.0",
+        "@finos/perspective-viewer-datagrid": "^2.6.0",
+        "@finos/perspective-workspace": "^2.6.0",
         "superstore-arrow": "^3.0.0"
     },
     "devDependencies": {
-        "@finos/perspective-webpack-plugin": "^2.5.2",
+        "@finos/perspective-webpack-plugin": "^2.6.0",
         "npm-run-all": "^4.1.3",
         "rimraf": "^2.5.2"
     }
diff --git a/examples/react-example/package.json b/examples/react-example/package.json
index cea4825edd..d5ac27a9cf 100644
--- a/examples/react-example/package.json
+++ b/examples/react-example/package.json
@@ -1,7 +1,7 @@
 {
     "name": "react-example",
     "private": true,
-    "version": "2.5.2",
+    "version": "2.6.0",
     "description": "An example app built using `@finos/perspective-viewer`.",
     "scripts": {
         "start": "webpack serve --open",
@@ -10,15 +10,15 @@
     "keywords": [],
     "license": "Apache-2.0",
     "dependencies": {
-        "@finos/perspective": "^2.5.2",
-        "@finos/perspective-viewer": "^2.5.2",
-        "@finos/perspective-viewer-d3fc": "^2.5.2",
-        "@finos/perspective-viewer-datagrid": "^2.5.2",
+        "@finos/perspective": "^2.6.0",
+        "@finos/perspective-viewer": "^2.6.0",
+        "@finos/perspective-viewer-d3fc": "^2.6.0",
+        "@finos/perspective-viewer-datagrid": "^2.6.0",
         "react": "^16.14.0",
         "react-dom": "^16.9.17"
     },
     "devDependencies": {
-        "@finos/perspective-webpack-plugin": "^2.5.2",
+        "@finos/perspective-webpack-plugin": "^2.6.0",
         "@types/react": "^16.14.0",
         "@types/react-dom": "^16.9.17",
         "source-map-loader": "^0.2.4",
diff --git a/examples/webpack-cross-origin/package.json b/examples/webpack-cross-origin/package.json
index e6407f979b..33c57d90ab 100644
--- a/examples/webpack-cross-origin/package.json
+++ b/examples/webpack-cross-origin/package.json
@@ -1,7 +1,7 @@
 {
     "name": "webpack-cross-origin",
     "private": true,
-    "version": "2.5.2",
+    "version": "2.6.0",
     "description": "An example of using the Perspective Webpack plugin to build a JS file with Webpack.",
     "scripts": {
         "start": "npm-run-all -l -p webpack-watch host:app host:bundles",
@@ -12,13 +12,13 @@
     "keywords": [],
     "license": "Apache-2.0",
     "dependencies": {
-        "@finos/perspective": "^2.5.2",
-        "@finos/perspective-viewer": "^2.5.2",
-        "@finos/perspective-viewer-d3fc": "^2.5.2",
-        "@finos/perspective-viewer-datagrid": "^2.5.2"
+        "@finos/perspective": "^2.6.0",
+        "@finos/perspective-viewer": "^2.6.0",
+        "@finos/perspective-viewer-d3fc": "^2.6.0",
+        "@finos/perspective-viewer-datagrid": "^2.6.0"
     },
     "devDependencies": {
-        "@finos/perspective-webpack-plugin": "^2.5.2",
+        "@finos/perspective-webpack-plugin": "^2.6.0",
         "css-loader": "^0.28.7",
         "html-webpack-plugin": "^5.1.0",
         "http-server": "^0.11.1",
diff --git a/examples/webpack-example/package.json b/examples/webpack-example/package.json
index e050cc44a2..180f7e6459 100644
--- a/examples/webpack-example/package.json
+++ b/examples/webpack-example/package.json
@@ -1,7 +1,7 @@
 {
     "name": "webpack-example",
     "private": true,
-    "version": "2.5.2",
+    "version": "2.6.0",
     "description": "An example app built using `@finos/perspective-viewer`.",
     "scripts": {
         "build": "webpack",
@@ -10,13 +10,13 @@
     "keywords": [],
     "license": "Apache-2.0",
     "dependencies": {
-        "@finos/perspective": "^2.5.2",
-        "@finos/perspective-viewer": "^2.5.2",
-        "@finos/perspective-viewer-d3fc": "^2.5.2",
-        "@finos/perspective-viewer-datagrid": "^2.5.2"
+        "@finos/perspective": "^2.6.0",
+        "@finos/perspective-viewer": "^2.6.0",
+        "@finos/perspective-viewer-d3fc": "^2.6.0",
+        "@finos/perspective-viewer-datagrid": "^2.6.0"
     },
     "devDependencies": {
-        "@finos/perspective-webpack-plugin": "^2.5.2",
+        "@finos/perspective-webpack-plugin": "^2.6.0",
         "css-loader": "^0.28.7",
         "html-webpack-plugin": "^5.1.0",
         "style-loader": "^0.18.2",
diff --git a/examples/workspace-editing-python/package.json b/examples/workspace-editing-python/package.json
index df6def4749..0d0c948657 100644
--- a/examples/workspace-editing-python/package.json
+++ b/examples/workspace-editing-python/package.json
@@ -1,7 +1,7 @@
 {
     "name": "workspace-editing-python",
     "private": true,
-    "version": "2.5.2",
+    "version": "2.6.0",
     "description": "An example app demonstrating client/server editing, built using `@finos/perspective-workspace` and `perspective-python`.",
     "scripts": {
         "start": "yarn webpack && yarn start:server",
@@ -12,14 +12,14 @@
     "keywords": [],
     "license": "Apache-2.0",
     "dependencies": {
-        "@finos/perspective": "^2.5.2",
-        "@finos/perspective-viewer": "^2.5.2",
-        "@finos/perspective-viewer-d3fc": "^2.5.2",
-        "@finos/perspective-viewer-datagrid": "^2.5.2",
-        "@finos/perspective-workspace": "^2.5.2"
+        "@finos/perspective": "^2.6.0",
+        "@finos/perspective-viewer": "^2.6.0",
+        "@finos/perspective-viewer-d3fc": "^2.6.0",
+        "@finos/perspective-viewer-datagrid": "^2.6.0",
+        "@finos/perspective-workspace": "^2.6.0"
     },
     "devDependencies": {
-        "@finos/perspective-webpack-plugin": "^2.5.2",
+        "@finos/perspective-webpack-plugin": "^2.6.0",
         "http-server": "^0.11.1",
         "npm-run-all": "^4.1.3",
         "rimraf": "^2.5.2"
diff --git a/examples/workspace/package.json b/examples/workspace/package.json
index 6d51524377..6b2a4ce57b 100644
--- a/examples/workspace/package.json
+++ b/examples/workspace/package.json
@@ -1,7 +1,7 @@
 {
     "name": "workspace",
     "private": true,
-    "version": "2.5.2",
+    "version": "2.6.0",
     "description": "An example app built using `@finos/perspective-workspace`.",
     "scripts": {
         "start": "webpack serve --open",
@@ -10,14 +10,14 @@
     "keywords": [],
     "license": "Apache-2.0",
     "dependencies": {
-        "@finos/perspective": "^2.5.2",
-        "@finos/perspective-viewer": "^2.5.2",
-        "@finos/perspective-viewer-d3fc": "^2.5.2",
-        "@finos/perspective-viewer-datagrid": "^2.5.2",
-        "@finos/perspective-workspace": "^2.5.2"
+        "@finos/perspective": "^2.6.0",
+        "@finos/perspective-viewer": "^2.6.0",
+        "@finos/perspective-viewer-d3fc": "^2.6.0",
+        "@finos/perspective-viewer-datagrid": "^2.6.0",
+        "@finos/perspective-workspace": "^2.6.0"
     },
     "devDependencies": {
-        "@finos/perspective-webpack-plugin": "^2.5.2",
+        "@finos/perspective-webpack-plugin": "^2.6.0",
         "http-server": "^0.11.1",
         "npm-run-all": "^4.1.3",
         "rimraf": "^2.5.2"
diff --git a/package.json b/package.json
index ebf8636a99..0ddf5d83fd 100644
--- a/package.json
+++ b/package.json
@@ -4,7 +4,7 @@
         "type": "git",
         "url": "https://github.com/finos/perspective"
     },
-    "version": "2.5.2",
+    "version": "2.6.0",
     "changelog": {
         "labels": {
             "enhancement": "Added",
diff --git a/packages/perspective-cli/package.json b/packages/perspective-cli/package.json
index fce47965ed..5a0b52c3e4 100644
--- a/packages/perspective-cli/package.json
+++ b/packages/perspective-cli/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@finos/perspective-cli",
-    "version": "2.5.2",
+    "version": "2.6.0",
     "description": "Perspective.js CLI",
     "main": "src/js/index.js",
     "publishConfig": {
@@ -24,12 +24,12 @@
         "perspective": "perspective"
     },
     "dependencies": {
-        "@finos/perspective": "^2.5.2",
-        "@finos/perspective-viewer": "^2.5.2",
-        "@finos/perspective-viewer-d3fc": "^2.5.2",
-        "@finos/perspective-viewer-datagrid": "^2.5.2",
-        "@finos/perspective-viewer-openlayers": "^2.5.2",
-        "@finos/perspective-workspace": "^2.5.2",
+        "@finos/perspective": "^2.6.0",
+        "@finos/perspective-viewer": "^2.6.0",
+        "@finos/perspective-viewer-d3fc": "^2.6.0",
+        "@finos/perspective-viewer-datagrid": "^2.6.0",
+        "@finos/perspective-viewer-openlayers": "^2.6.0",
+        "@finos/perspective-workspace": "^2.6.0",
         "commander": "^2.19.0",
         "puppeteer": "^13.1.3"
     }
diff --git a/packages/perspective-esbuild-plugin/package.json b/packages/perspective-esbuild-plugin/package.json
index 6f98f5c1db..01aad9f0a5 100644
--- a/packages/perspective-esbuild-plugin/package.json
+++ b/packages/perspective-esbuild-plugin/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@finos/perspective-esbuild-plugin",
-    "version": "2.5.2",
+    "version": "2.6.0",
     "description": "esbuild plugin for Perspective",
     "author": "",
     "license": "Apache-2.0",
diff --git a/packages/perspective-jupyterlab/package.json b/packages/perspective-jupyterlab/package.json
index f7a7475739..3d813b296e 100644
--- a/packages/perspective-jupyterlab/package.json
+++ b/packages/perspective-jupyterlab/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@finos/perspective-jupyterlab",
-    "version": "2.5.2",
+    "version": "2.6.0",
     "description": "A Jupyterlab extension for the Perspective library, designed to be used with perspective-python.",
     "files": [
         "dist/**/*",
@@ -34,19 +34,19 @@
         "version": "yarn build"
     },
     "dependencies": {
-        "@finos/perspective": "^2.5.2",
-        "@finos/perspective-viewer": "^2.5.2",
-        "@finos/perspective-viewer-d3fc": "^2.5.2",
-        "@finos/perspective-viewer-datagrid": "^2.5.2",
-        "@finos/perspective-viewer-openlayers": "^2.5.2",
+        "@finos/perspective": "^2.6.0",
+        "@finos/perspective-viewer": "^2.6.0",
+        "@finos/perspective-viewer-d3fc": "^2.6.0",
+        "@finos/perspective-viewer-datagrid": "^2.6.0",
+        "@finos/perspective-viewer-openlayers": "^2.6.0",
         "@jupyter-widgets/base": "^2 || ^3 || ^4 || ^5 || ^6",
         "@jupyterlab/application": "^3.6.1",
         "@lumino/application": "^1.27.0",
         "@lumino/widgets": "^1.37.0"
     },
     "devDependencies": {
-        "@finos/perspective-esbuild-plugin": "^2.5.2",
-        "@finos/perspective-test": "^2.5.2",
+        "@finos/perspective-esbuild-plugin": "^2.6.0",
+        "@finos/perspective-test": "^2.6.0",
         "@jupyterlab/builder": "^3.4.0",
         "@prospective.co/procss": "^0.1.13",
         "cpy": "^9.0.1"
diff --git a/packages/perspective-viewer-d3fc/package.json b/packages/perspective-viewer-d3fc/package.json
index d913cc7b86..050171f6d8 100644
--- a/packages/perspective-viewer-d3fc/package.json
+++ b/packages/perspective-viewer-d3fc/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@finos/perspective-viewer-d3fc",
-    "version": "2.5.2",
+    "version": "2.6.0",
     "description": "Perspective.js D3FC Plugin",
     "unpkg": "./dist/cdn/perspective-viewer-d3fc.js",
     "jsdelivr": "./dist/cdn/perspective-viewer-d3fc.js",
@@ -43,8 +43,8 @@
     "author": "",
     "license": "Apache-2.0",
     "dependencies": {
-        "@finos/perspective": "^2.5.2",
-        "@finos/perspective-viewer": "^2.5.2",
+        "@finos/perspective": "^2.6.0",
+        "@finos/perspective-viewer": "^2.6.0",
         "chroma-js": "^1.3.4",
         "d3fc": "^15.2.4",
         "d3-selection": "^3.0.0",
@@ -54,8 +54,8 @@
         "gradient-parser": "1.0.2"
     },
     "devDependencies": {
-        "@finos/perspective-esbuild-plugin": "^2.5.2",
-        "@finos/perspective-test": "^2.5.2",
+        "@finos/perspective-esbuild-plugin": "^2.6.0",
+        "@finos/perspective-test": "^2.6.0",
         "@prospective.co/procss": "^0.1.13"
     }
 }
diff --git a/packages/perspective-viewer-datagrid/package.json b/packages/perspective-viewer-datagrid/package.json
index 6f9c5a138a..4d4a75a3db 100644
--- a/packages/perspective-viewer-datagrid/package.json
+++ b/packages/perspective-viewer-datagrid/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@finos/perspective-viewer-datagrid",
-    "version": "2.5.2",
+    "version": "2.6.0",
     "description": "Perspective datagrid plugin based on `regular-table`",
     "unpkg": "dist/cdn/perspective-viewer-datagrid.js",
     "jsdelivr": "dist/cdn/perspective-viewer-datagrid.js",
@@ -29,14 +29,14 @@
     "author": "",
     "license": "Apache-2.0",
     "dependencies": {
-        "@finos/perspective": "^2.5.2",
-        "@finos/perspective-viewer": "^2.5.2",
+        "@finos/perspective": "^2.6.0",
+        "@finos/perspective-viewer": "^2.6.0",
         "chroma-js": "^1.3.4",
         "regular-table": "=0.6.3"
     },
     "devDependencies": {
         "@prospective.co/procss": "^0.1.13",
-        "@finos/perspective-esbuild-plugin": "^2.5.2",
-        "@finos/perspective-test": "^2.5.2"
+        "@finos/perspective-esbuild-plugin": "^2.6.0",
+        "@finos/perspective-test": "^2.6.0"
     }
 }
diff --git a/packages/perspective-viewer-openlayers/package.json b/packages/perspective-viewer-openlayers/package.json
index 87f90cf1a1..5a5d3d730d 100644
--- a/packages/perspective-viewer-openlayers/package.json
+++ b/packages/perspective-viewer-openlayers/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@finos/perspective-viewer-openlayers",
-    "version": "2.5.2",
+    "version": "2.6.0",
     "unpkg": "dist/cdn/perspective-viewer-openlayers.js",
     "jsdelivr": "dist/cdn/perspective-viewer-openlayers.js",
     "exports": {
@@ -24,8 +24,8 @@
         "clean:screenshots": "rimraf \"test/screenshots/**/*.@(failed|diff).png\""
     },
     "dependencies": {
-        "@finos/perspective": "^2.5.2",
-        "@finos/perspective-viewer": "^2.5.2",
+        "@finos/perspective": "^2.6.0",
+        "@finos/perspective-viewer": "^2.6.0",
         "d3": "^7.1.1",
         "d3-color": "^3.0.1",
         "gradient-parser": "1.0.2",
@@ -33,6 +33,6 @@
         "ol": "^5.3.2"
     },
     "devDependencies": {
-        "@finos/perspective-esbuild-plugin": "^2.5.2"
+        "@finos/perspective-esbuild-plugin": "^2.6.0"
     }
 }
diff --git a/packages/perspective-webpack-plugin/package.json b/packages/perspective-webpack-plugin/package.json
index cce2ef1d7b..944c0bdf89 100644
--- a/packages/perspective-webpack-plugin/package.json
+++ b/packages/perspective-webpack-plugin/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@finos/perspective-webpack-plugin",
-    "version": "2.5.2",
+    "version": "2.6.0",
     "description": "Perspective.js Webpack Plugin",
     "main": "index.js",
     "publishConfig": {
@@ -25,8 +25,8 @@
         "worker-loader": "^3.0.7"
     },
     "peerDependencies": {
-        "@finos/perspective": "^2.5.2",
-        "@finos/perspective-viewer": "^2.5.2",
+        "@finos/perspective": "^2.6.0",
+        "@finos/perspective-viewer": "^2.6.0",
         "webpack": "^5.60.0"
     }
 }
diff --git a/packages/perspective-workspace/package.json b/packages/perspective-workspace/package.json
index 2b9b4c884e..51c6fd261a 100644
--- a/packages/perspective-workspace/package.json
+++ b/packages/perspective-workspace/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@finos/perspective-workspace",
-    "version": "2.5.2",
+    "version": "2.6.0",
     "description": "Perspective Workspace",
     "files": [
         "dist/**/*",
@@ -31,7 +31,7 @@
     "author": "",
     "license": "Apache-2.0",
     "dependencies": {
-        "@finos/perspective-viewer": "^2.5.2",
+        "@finos/perspective-viewer": "^2.6.0",
         "@lumino/algorithm": "^1.9.1",
         "@lumino/commands": "^1.20.0",
         "@lumino/domutils": "^1.8.1",
@@ -42,7 +42,7 @@
     },
     "devDependencies": {
         "@prospective.co/procss": "^0.1.13",
-        "@finos/perspective-esbuild-plugin": "^2.5.2",
-        "@finos/perspective-test": "^2.5.2"
+        "@finos/perspective-esbuild-plugin": "^2.6.0",
+        "@finos/perspective-test": "^2.6.0"
     }
 }
diff --git a/packages/perspective/package.json b/packages/perspective/package.json
index 5bdd6ad2de..41195c9175 100644
--- a/packages/perspective/package.json
+++ b/packages/perspective/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@finos/perspective",
-    "version": "2.5.2",
+    "version": "2.6.0",
     "description": "Perspective.js",
     "repository": {
         "type": "git",
@@ -47,8 +47,8 @@
         "ws": "^6.1.2"
     },
     "devDependencies": {
-        "@finos/perspective-cpp": "^2.5.2",
-        "@finos/perspective-esbuild-plugin": "^2.5.2",
+        "@finos/perspective-cpp": "^2.6.0",
+        "@finos/perspective-esbuild-plugin": "^2.6.0",
         "cpy": "^9.0.1",
         "jsverify": "^0.8.4",
         "lodash": "^4.17.4",
diff --git a/python/perspective/package.json b/python/perspective/package.json
index 89d8c4f376..294e685540 100644
--- a/python/perspective/package.json
+++ b/python/perspective/package.json
@@ -1,16 +1,16 @@
 {
     "private": true,
     "name": "perspective-python-internal",
-    "version": "2.5.2",
+    "version": "2.6.0",
     "scripts": {
         "bench": "python3 bench/perspective_benchmark.py",
         "docs": "python3 docs/generate.py"
     },
     "devDependencies": {
-        "@finos/perspective": "^2.5.2",
-        "@finos/perspective-viewer": "^2.5.2",
-        "@finos/perspective-viewer-d3fc": "^2.5.2",
-        "@finos/perspective-viewer-datagrid": "^2.5.2",
-        "@finos/perspective-webpack-plugin": "^2.5.2"
+        "@finos/perspective": "^2.6.0",
+        "@finos/perspective-viewer": "^2.6.0",
+        "@finos/perspective-viewer-d3fc": "^2.6.0",
+        "@finos/perspective-viewer-datagrid": "^2.6.0",
+        "@finos/perspective-webpack-plugin": "^2.6.0"
     }
 }
diff --git a/python/perspective/perspective/core/_version.py b/python/perspective/perspective/core/_version.py
index 3abe7d90b2..776567a9fe 100644
--- a/python/perspective/perspective/core/_version.py
+++ b/python/perspective/perspective/core/_version.py
@@ -1,2 +1,2 @@
-__version__ = "2.5.2"
-major_minor_version = "2.5"
+__version__ = "2.6.0"
+major_minor_version = "2.6"
diff --git a/rust/perspective-viewer/Cargo.lock b/rust/perspective-viewer/Cargo.lock
index 1c745ed4f9..07b121dc1a 100644
--- a/rust/perspective-viewer/Cargo.lock
+++ b/rust/perspective-viewer/Cargo.lock
@@ -1167,7 +1167,7 @@ checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94"
 
 [[package]]
 name = "perspective"
-version = "2.5.2"
+version = "2.6.0"
 dependencies = [
  "anyhow",
  "async-lock",
@@ -1200,7 +1200,7 @@ dependencies = [
 
 [[package]]
 name = "perspective-bundle"
-version = "2.5.2"
+version = "2.6.0"
 dependencies = [
  "flate2",
  "wasm-bindgen-cli-support",
diff --git a/rust/perspective-viewer/Cargo.toml b/rust/perspective-viewer/Cargo.toml
index e315253b0b..6212ceb5b2 100644
--- a/rust/perspective-viewer/Cargo.toml
+++ b/rust/perspective-viewer/Cargo.toml
@@ -12,7 +12,7 @@
 
 [package]
 name = "perspective"
-version = "2.5.2"
+version = "2.6.0"
 authors = ["Andrew Stein <steinlink@gmail.com>"]
 edition = "2021"
 description = "A data visualization and analytics component, especially well-suited for large and/or streaming datasets."
diff --git a/rust/perspective-viewer/exprtk.md b/rust/perspective-viewer/exprtk.md
index 209a47bbb5..1661d847aa 100644
--- a/rust/perspective-viewer/exprtk.md
+++ b/rust/perspective-viewer/exprtk.md
@@ -603,3 +603,27 @@ Replaces all non-overlapping matches of pattern in string with replacer, or retu
 replace(${1:string}, ${2:pattern}, ${3:replacer})
 ```
 
+#### `index`
+
+Looks up the index value of the current row
+
+```
+index()
+```
+
+#### `col`
+
+Looks up a column value by name
+
+```
+col(${1:string})
+```
+
+#### `vlookup`
+
+Looks up a value in another column by index
+
+```
+vlookup(${1:string}, ${2:uint64})
+```
+
diff --git a/rust/perspective-viewer/package.json b/rust/perspective-viewer/package.json
index c4c985de6b..8b37536252 100644
--- a/rust/perspective-viewer/package.json
+++ b/rust/perspective-viewer/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@finos/perspective-viewer",
-    "version": "2.5.2",
+    "version": "2.6.0",
     "description": "The `<perspective-viewer>` Custom Element, frontend for Perspective.js",
     "repository": {
         "type": "git",
@@ -40,13 +40,13 @@
         "access": "public"
     },
     "dependencies": {
-        "@finos/perspective": "^2.5.2",
+        "@finos/perspective": "^2.6.0",
         "fflate": "^0.7.4"
     },
     "devDependencies": {
         "react": "^16.14.0",
-        "@finos/perspective-esbuild-plugin": "^2.5.2",
-        "@finos/perspective-test": "^2.5.2",
+        "@finos/perspective-esbuild-plugin": "^2.6.0",
+        "@finos/perspective-test": "^2.6.0",
         "cpy": "^9.0.1"
     }
 }
diff --git a/rust/perspective-viewer/tasks/bundle/Cargo.toml b/rust/perspective-viewer/tasks/bundle/Cargo.toml
index a1b43b7a9d..f772716d4c 100644
--- a/rust/perspective-viewer/tasks/bundle/Cargo.toml
+++ b/rust/perspective-viewer/tasks/bundle/Cargo.toml
@@ -12,7 +12,7 @@
 
 [package]
 name = "perspective-bundle"
-version = "2.5.2"
+version = "2.6.0"
 edition = "2021"
 
 [[bin]]
diff --git a/tools/perspective-scripts/package.json b/tools/perspective-scripts/package.json
index 6a924af46b..fabab717a9 100644
--- a/tools/perspective-scripts/package.json
+++ b/tools/perspective-scripts/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@finos/perspective-scripts",
-    "version": "2.5.2",
+    "version": "2.6.0",
     "description": "Build scripts based on perspective",
     "private": true,
     "files": [
diff --git a/tools/perspective-test/package.json b/tools/perspective-test/package.json
index 5005948408..89807f6f4e 100644
--- a/tools/perspective-test/package.json
+++ b/tools/perspective-test/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@finos/perspective-test",
-    "version": "2.5.2",
+    "version": "2.6.0",
     "description": "Test utility based on perspective",
     "private": true,
     "main": "src/js/index",
@@ -19,7 +19,7 @@
     "author": "",
     "license": "Apache-2.0",
     "dependencies": {
-        "@finos/perspective": "^2.5.2",
+        "@finos/perspective": "^2.6.0",
         "xml-formatter": "2.4.0"
     }
 }