Fix vega warnings 2

chartlets.js/src/lib/components/Plot.tsx

@@ -2,32 +2,24 @@ import { VegaLite } from "react-vega";
 
 import { type PlotState } from "@/lib/types/state/component";
 import { type ComponentChangeHandler } from "@/lib/types/state/event";
+import { useSignalListeners } from "@/lib/hooks";
 
 export interface PlotProps extends Omit<PlotState, "type"> {
   onChange: ComponentChangeHandler;
 }
 
 export function Plot({ id, style, chart, onChange }: PlotProps) {
+  const signalListeners = useSignalListeners(chart, id, onChange);
+
   if (!chart) {
     return <div id={id} style={style} />;
   }
-  const { datasets, ...spec } = chart;
-  const handleSignal = (_signalName: string, value: unknown) => {
-    if (id) {
-      return onChange({
-        componentType: "Plot",
-        id: id,
-        property: "points",
-        value: value,
-      });
-    }
-  };
+
   return (
     <VegaLite
-      spec={spec}
-      data={datasets}
+      spec={chart}
       style={style}
-      signalListeners={{ onClick: handleSignal }}
+      signalListeners={signalListeners}
       actions={false}
     />
   );

chartlets.js/src/lib/components/Select.tsx

@@ -8,6 +8,7 @@ import {
   type SelectState,
 } from "@/lib/types/state/component";
 import { type ComponentChangeHandler } from "@/lib/types/state/event";
+import { isString } from "@/lib/utils/isString";
 
 export interface SelectProps extends Omit<SelectState, "type"> {
   onChange: ComponentChangeHandler;
@@ -64,7 +65,7 @@ export function Select({
 function normalizeSelectOption(
   option: SelectOption,
 ): [string | number, string] {
-  if (typeof option === "string") {
+  if (isString(option)) {
     return [option, option];
   } else if (typeof option === "number") {
     return [option, option.toString()];

chartlets.js/src/lib/hooks.ts

@@ -1,12 +1,16 @@
 import type { StoreState } from "@/lib/types/state/store";
 import { store } from "@/lib/store";
-import { useMemo } from "react";
+import { useCallback, useMemo } from "react";
 import type { ContributionState } from "@/lib/types/state/contribution";
+import { type SignalHandler } from "@/lib/types/state/vega";
+import type { TopLevelSpec } from "vega-lite";
 import type {
   ComponentChangeEvent,
   ComponentChangeHandler,
 } from "@/lib/types/state/event";
 import { handleComponentChange } from "@/lib/actions/handleComponentChange";
+import { isString } from "@/lib/utils/isString";
+import { isObject } from "@/lib/utils/isObject";
 
 const selectConfiguration = (state: StoreState) => state.configuration;
 
@@ -38,6 +42,94 @@ export function makeContributionsHook<S extends object = object>(
   };
 }
 
+export function useSignalListeners(
+  chart: TopLevelSpec | null,
+  id: string | undefined,
+  onChange: ComponentChangeHandler,
+): { [key: string]: SignalHandler } {
+  /*
+     Here, we create map of signals which will be then used to create the
+     map of signal-listeners because not all params are event-listeners, and we
+     need to identify them. Later in the code, we then see which handlers do we
+     have so that we can create those listeners with the `name` specified in
+     the event-listener object.
+   */
+  const signals: { [key: string]: string } = useMemo(() => {
+    if (!chart) return {};
+    if (!chart.params) return {};
+    return chart.params
+      .filter(
+        (param): param is { name: string; select: { on: string } } =>
+          isObject(param) &&
+          param !== null &&
+          "name" in param &&
+          "select" in param &&
+          isObject(param.select) &&
+          param.select?.on != null &&
+          isString(param.select.on),
+      )
+      .reduce(
+        (acc, param) => {
+          acc[param.select.on] = param.name;
+          return acc;
+        },
+        {} as { [key: string]: string },
+      );
+  }, [chart]);
+
+  const handleClickSignal = useCallback(
+    (signalName: string, signalValue: unknown) => {
+      if (id) {
+        return onChange({
+          componentType: "Plot",
+          id: id,
+          property: signalName,
+          value: signalValue,
+        });
+      }
+    },
+    [id, onChange],
+  );
+
+  /*
+     Currently, we only have click events support, but if more are required,
+     they can be implemented and added in the map below.
+     */
+  const signalHandlerMap: { [key: string]: SignalHandler } = useMemo(
+    () => ({
+      click: handleClickSignal,
+    }),
+    [handleClickSignal],
+  );
+
+  /*
+     This function creates the map of signal listeners based on the `signals`
+     map computed above.
+     */
+  const createSignalListeners = useCallback(
+    (signals: { [key: string]: string }) => {
+      const signalListeners: { [key: string]: SignalHandler } = {};
+      Object.entries(signals).forEach(([event, signalName]) => {
+        if (signalHandlerMap[event]) {
+          signalListeners[signalName] = signalHandlerMap[event];
+        } else {
+          console.warn(
+            "The signal " + event + " is not yet supported in chartlets.js",
+          );
+        }
+      });
+
+      return signalListeners;
+    },
+    [signalHandlerMap],
+  );
+
+  return useMemo(
+    () => createSignalListeners(signals),
+    [createSignalListeners, signals],
+  );
+}
+
 /**
  * A hook that retrieves the contributions for the given contribution
  * point given by `contribPoint`.

chartlets.js/src/lib/types/state/component.ts

@@ -1,6 +1,7 @@
 import { type CSSProperties } from "react";
-import type { VisualizationSpec } from "react-vega";
 import { isObject } from "@/lib/utils/isObject";
+import type { TopLevelSpec } from "vega-lite";
+import { isString } from "@/lib/utils/isString";
 
 export type ComponentType =
   | "Box"
@@ -62,9 +63,7 @@ export interface CheckboxState extends ComponentState {
 export interface PlotState extends ComponentState {
   type: "Plot";
   chart:
-    | (VisualizationSpec & {
-        datasets?: Record<string, unknown>; // Add the datasets property
-      })
+    | TopLevelSpec // This is the vega-lite specification type
     | null;
 }
 
@@ -77,7 +76,7 @@ export interface TypographyState extends ContainerState {
 }
 
 export function isComponentState(object: unknown): object is ComponentState {
-  return isObject(object) && typeof object.type === "string";
+  return isObject(object) && isString(object.type);
 }
 
 export function isContainerState(object: unknown): object is ContainerState {

chartlets.js/src/lib/types/state/vega.ts

@@ -0,0 +1 @@
+export type SignalHandler = (signalName: string, value: unknown) => void;

chartlets.js/src/lib/utils/isString.ts

@@ -0,0 +1,3 @@
+export function isString(signalName: unknown): signalName is string {
+  return typeof signalName === "string";
+}

chartlets.js/src/lib/utils/objPath.ts

@@ -1,4 +1,5 @@
 import { isObject } from "@/lib/utils/isObject";
+import { isString } from "@/lib/utils/isString";
 
 export type ObjPath = (string | number)[];
 export type ObjPathLike = ObjPath | string | number | undefined | null;
@@ -83,7 +84,7 @@ export function normalizeObjPath(pathLike: ObjPathLike): ObjPath {
 }
 
 export function formatObjPath(objPath: ObjPathLike): string {
-  if (typeof objPath === "string") {
+  if (isString(objPath)) {
     return objPath;
   } else if (Array.isArray(objPath)) {
     return objPath

chartlets.py/my_extension/my_panel_1.py

@@ -1,6 +1,10 @@
+import copy
+from types import NoneType
+
 import altair as alt
+import pandas as pd
 
-from chartlets import Component, Input, Output
+from chartlets import Component, Input, Output, State
 from chartlets.components import Plot, Box, Select
 from chartlets.demo.contribs import Panel
 from chartlets.demo.context import Context
@@ -60,7 +64,7 @@ def make_figure(ctx: Context, selected_dataset: int = 0) -> alt.Chart:
     # Create another parameter to handle the click events and send the data as
     # specified in the fields
     click_param = alt.selection_point(
-        on="click", name="onClick", fields=["x", variable_name]
+        on="click", name="points", fields=["x", variable_name]
     )
     # Create a chart type using mark_* where * could be any kind of chart
     # supported by Vega. We can add properties and parameters as shown below.
@@ -79,5 +83,45 @@ def make_figure(ctx: Context, selected_dataset: int = 0) -> alt.Chart:
         .properties(width=290, height=300, title="Vega charts")
         .add_params(corner_var, click_param)
     )
-
     return chart
+
+
+@panel.callback(
+    Input("plot", property="points"), State("plot", "chart"), Output("plot", "chart")
+)
+def get_click_event_points(ctx: Context, points, plot) -> alt.Chart:
+    """
+    This callback function shows how we can use the event handlers output
+    (property="points") which was defined in the `make_figure` callback
+    function as a `on='click'` handler. Here, we access the variables as
+    defined in the `fields` argument when creating the `click_param` parameter.
+
+    Based on the click event, the user can access the point that was clicked.
+    The function below extracts the points and changes the color of the bar
+    that was clicked.
+
+    """
+    if points:
+        conditions = []
+        for field, values in points.items():
+            if field != "vlPoint":
+                for value in values:
+                    field_type = plot["encoding"].get(field, {}).get("type", "")
+                    if field_type == "nominal":
+                        conditions.append(f"datum.{field} === '{value}'")
+                    else:
+                        conditions.append(f"datum.{field} === {value}")
+                    conditions.append(f"datum.{field} === {repr(value)}")
+
+        condition_expr = " && ".join(conditions)
+
+        plot["encoding"]["color"] = {
+            "condition": {
+                "test": condition_expr,
+                # Highlight color when the condition is true
+                "value": "orange",
+            },
+            "value": "steelblue",  # Default color
+        }
+
+    return alt.Chart.from_dict(plot)

chartlets.py/my_extension/my_panel_2.py

@@ -83,7 +83,13 @@ def make_figure(
         )
         .properties(width=300, height=300, title="Vega charts using Shorthand syntax")
         .add_params(selector)
-        .interactive()
+        # .interactive() # Using interactive mode will lead to warning
+        # `WARN Scale bindings are currently only supported for scales with
+        # unbinned, continuous domains.`
+        # because it expects both x and y to be continuous scales,
+        # but we have x as Nominal which leads to this warning.
+        # This still works where we can only zoom in on the y axis but
+        # with a warning.
     )
     return chart