@perspective-dev/workspace 4.1.1 → 4.3.0

package/dist/esm/workspace/workspace.d.ts

@@ -83,7 +83,7 @@ export declare class PerspectiveWorkspace extends SplitPanel {
     _maximize(widget: PerspectiveViewerWidget): void;
     _unmaximize(): void;
     toggleSingleDocument(widget: PerspectiveViewerWidget): void;
-    _filterViewer(viewer: HTMLPerspectiveViewerElement, filters: [string, string, string][], candidates: Set<string>): Promise<void>;
+    _filterViewer(viewer: HTMLPerspectiveViewerElement, removeFilters: psp.Filter[], insertFilters: psp.Filter[], candidates: Set<string>): Promise<void>;
     onPerspectiveSelect(event: CustomEvent): Promise<void>;
     makeMaster(widget: PerspectiveViewerWidget): Promise<void>;
     makeDetail(widget: PerspectiveViewerWidget): void;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@perspective-dev/workspace",
-  "version": "4.1.1",
+  "version": "4.3.0",
   "description": "Perspective Workspace",
   "files": [
     "dist/**/*",
@@ -41,10 +41,11 @@
   },
   "devDependencies": {
     "@perspective-dev/viewer": "",
-    "@prospective.co/procss": "0.1.17",
+    "@prospective.co/procss": "0.1.18",
     "@perspective-dev/esbuild-plugin": "",
     "@perspective-dev/test": "",
     "@types/lodash": "^4.17.20",
+    "@types/react": ">17 <20",
     "typescript": ">=5 <6",
     "zx": ">=8 <9"
   },

package/src/ts/extensions.ts

@@ -10,7 +10,8 @@
 // ┃ of the [Apache License 2.0](https://www.apache.org/licenses/LICENSE-2.0). ┃
 // ┗━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┛
 
-import { HTMLPerspectiveWorkspaceElement } from "./perspective-workspace";
+import type { HTMLPerspectiveWorkspaceElement } from "./perspective-workspace";
+import type * as React from "react";
 
 type ReactPerspectiveWorkspaceAttributes<T> = React.HTMLAttributes<T>;
 
@@ -21,6 +22,8 @@ type JsxPerspectiveWorkspaceElement = {
     HTMLPerspectiveWorkspaceElement
 >;
 
+// React <19
+
 declare global {
     namespace JSX {
         interface IntrinsicElements {
@@ -29,6 +32,34 @@ declare global {
     }
 }
 
+// React >=19
+
+// @ts-ignore
+declare module "react/jsx-runtime" {
+    namespace JSX {
+        interface IntrinsicElements {
+            "perspective-workspace": JsxPerspectiveWorkspaceElement;
+        }
+    }
+}
+
+// @ts-ignore
+declare module "react/jsx-dev-runtime" {
+    namespace JSX {
+        interface IntrinsicElements {
+            "perspective-workspace": JsxPerspectiveWorkspaceElement;
+        }
+    }
+}
+
+declare module "react" {
+    namespace JSX {
+        interface IntrinsicElements {
+            "perspective-workspace": JsxPerspectiveWorkspaceElement;
+        }
+    }
+}
+
 // Custom Elements extensions
 
 declare global {

package/src/ts/workspace/workspace.ts

@@ -683,20 +683,23 @@ export class PerspectiveWorkspace extends SplitPanel {
 
     async _filterViewer(
         viewer: HTMLPerspectiveViewerElement,
-        filters: [string, string, string][],
+        removeFilters: psp.Filter[],
+        insertFilters: psp.Filter[],
         candidates: Set<string>,
     ) {
         const config = await viewer.save();
         const table = await viewer.getTable();
         const availableColumns = Object.keys(await table.schema());
         const currentFilters = config.filter || [];
-        const columnAvailable = (filter: [string, string, any]) =>
+        const columnAvailable = (filter: psp.Filter) =>
             filter[0] && availableColumns.includes(filter[0]);
 
-        const validFilters = filters.filter(columnAvailable);
+        const clearColumns = new Set<string>(removeFilters.map((f) => f[0]));
+        const validFilters = insertFilters.filter(columnAvailable);
         validFilters.push(
             ...currentFilters.filter(
-                (x: [string, ..._: string[]]) => !candidates.has(x[0]),
+                (x: [string, ..._: string[]]) =>
+                    !candidates.has(x[0]) && !clearColumns.has(x[0]),
             ),
         );
 
@@ -712,14 +715,21 @@ export class PerspectiveWorkspace extends SplitPanel {
         const candidates = new Set([
             ...(config["group_by"] || []),
             ...(config["split_by"] || []),
-            ...(config.filter || []).map((x: [string, string, any]) => x[0]),
+            ...(config.filter || []).map((x: psp.Filter) => x[0]),
         ]);
 
-        const filters = [...event.detail.config.filter];
+        const removeFilters = (
+            (event.detail.removeConfigs ?? []) as psp.ViewConfigUpdate[]
+        ).flatMap((x) => x.filter ?? []);
+        const insertFilters = (
+            (event.detail.insertConfigs ?? []) as psp.ViewConfigUpdate[]
+        ).flatMap((x) => x.filter ?? []);
+
         toArray(this.dockpanel.widgets()).forEach((widget) => {
             this._filterViewer(
                 (widget as PerspectiveViewerWidget).viewer,
-                filters,
+                removeFilters,
+                insertFilters,
                 candidates,
             );
         });