@milaboratories/miplots4 1.0.178 → 1.1.0

package/dist/scatterplot/utils/createLegendInfo.js

@@ -21,28 +21,33 @@ function t(t, n, r) {
 function n(e) {
 	return typeof e == "object" && "type" in e && e.type === "grouping";
 }
-function r(e, r, i) {
-	return r.reduce((r, a) => {
-		let o = a.columnName, s = o.nullValueLabel ?? "NA", c = a.order, l = (t) => o.valueLabels ? e.getColumnValueCategory(o.valueLabels, t) : void 0, u = /* @__PURE__ */ new Set(), d = {};
+function r(e, r, i, a) {
+	return r.reduce((r, o) => {
+		let s = o.columnName, c = s.nullValueLabel ?? "NA", l = o.order, u = (t) => s.valueLabels ? e.getColumnValueCategory(s.valueLabels, t) : void 0, d = /* @__PURE__ */ new Set(), f = {};
 		i.forEach((e) => {
 			e.aes && Object.entries(e.aes).forEach(([e, t]) => {
-				n(t) && t.value === o.value && (u.add(e), d[e] = t.palette);
+				n(t) && t.value === s.value && (d.add(e), f[e] = t.palette);
 			});
 		});
-		let f = {}, p = [];
-		if (u.has("dotFill") || u.has("dotShape") || u.has("lineColor")) {
-			let t = e.getColumnCategories(o.value, !1);
+		for (let e of a?.curves ?? []) {
+			n(e.lineColor) && e.lineColor.value === s.value && (d.add("lineColor"), e.lineColor.palette && (f.lineColor = e.lineColor.palette));
+			let t = e.trend?.color;
+			t && n(t) && t.value === s.value && (d.add("lineColor"), t.palette && (f.lineColor = t.palette));
+		}
+		let p = {}, m = [];
+		if (d.has("dotFill") || d.has("dotShape") || d.has("lineColor")) {
+			let t = e.getColumnCategories(s.value, !1);
 			if (t.length < 100) {
-				f = t.reduce((t, n) => (t[n] = l(e.getColumnCategoryRowIndex(o.value, n)) ?? n, t[n] === "null" && (t[n] = s), t), f);
-				let n = t.reduce((e, t) => (e[t] = c?.indexOf(t) ?? -1, e), {});
-				p = t.sort((e, t) => n[e] === n[t] ? f[e]?.localeCompare(f[t] ?? "", "en", { numeric: !0 }) ?? 0 : n[e] - n[t]);
-			} else p = t;
+				p = t.reduce((t, n) => (t[n] = u(e.getColumnCategoryRowIndex(s.value, n)) ?? n, t[n] === "null" && (t[n] = c), t), p);
+				let n = t.reduce((e, t) => (e[t] = l?.indexOf(t) ?? -1, e), {});
+				m = t.sort((e, t) => n[e] === n[t] ? p[e]?.localeCompare(p[t] ?? "", "en", { numeric: !0 }) ?? 0 : n[e] - n[t]);
+			} else m = t;
 		}
-		return r[o.value] = {
-			values: p,
-			usedAes: [...u],
-			aesMap: t(o, d, a.inheritedAes),
-			labels: f
+		return r[s.value] = {
+			values: m,
+			usedAes: [...d],
+			aesMap: t(s, f, o.inheritedAes),
+			labels: p
 		}, r;
 	}, {});
 }

package/dist/scatterplot/utils/createLegendInfo.js.map

@@ -1 +1 @@
-{"version":3,"file":"createLegendInfo.js","names":[],"sources":["../../../src/scatterplot/utils/createLegendInfo.ts"],"sourcesContent":["import { MAX_SHOWN_UNIQUE_VALUES_IN_LABELS } from '../../constants';\nimport type { DataFrame } from '../../DataFrame';\nimport type {AesRecord} from '../../types';\nimport type {\n    AesItem,\n    Category,\n    ColumnName,\n    ContinuousAesFromColumn,\n    InheritAesScatterplot,\n    ScatterplotLayer,\n    ScatterplotLegendInfo\n} from '../../types';\nimport type { ScatterplotSettingsImpl } from '../ScatterplotSettingsImpl';\n\nconst categoryIndexer = (() => {\n    const map = new Map<string, Map<Category, number>>();\n    const clear = () => map.clear();\n    const getIndex = (columnName: ColumnName, category: Category): number => {\n        let categoryMap = map.get(columnName.value);\n        if (categoryMap === undefined) {\n            categoryMap = new Map();\n            map.set(columnName.value, categoryMap);\n        }\n        let index = categoryMap.get(category);\n        if (index === undefined) {\n            index = categoryMap.size;\n            categoryMap.set(category, index);\n        }\n        return index;\n    };\n\n    return {\n        clear,\n        getIndex,\n    };\n})();\n\nexport function addPalettesToAesMapping(\n    columnName: ColumnName,\n    usedAesFromPalettes: Partial<Record<keyof AesItem, string[]>>,\n    inheritedAes?: AesRecord\n) {\n    categoryIndexer.clear();\n    const hasInheritedAes = inheritedAes && Object.keys(inheritedAes).length > 0;\n    const dotFill = usedAesFromPalettes['dotFill'];\n    const hasDotFill = dotFill && dotFill.length > 0;\n    const lineColor = usedAesFromPalettes['lineColor'];\n    const hasLineColor = lineColor && lineColor.length > 0;\n    const getAesField = (category: Category, field: keyof AesItem) => {\n        const inheritedResult = hasInheritedAes ? inheritedAes[category]?.[field] : undefined;\n        // Use inherited when defined; otherwise generate from palette so overflow categories get a color\n        if (field === 'dotFill' && hasDotFill) {\n            return inheritedResult ?? dotFill[categoryIndexer.getIndex(columnName, category) % dotFill.length];\n        }\n        if (field === 'lineColor' && hasLineColor) {\n            return inheritedResult ?? lineColor[categoryIndexer.getIndex(columnName, category) % lineColor.length];\n        }\n        return inheritedResult;\n    };\n\n    return getAesField;\n}\n\nfunction isInheritMapping<T extends (string | number)>(value:T | InheritAesScatterplot | ContinuousAesFromColumn<T>):value is InheritAesScatterplot {\n    return typeof value === 'object' && 'type' in value && value.type === 'grouping';\n}\nexport function createLegendInfo(\n    data: DataFrame,\n    grouping: ScatterplotSettingsImpl['grouping'],\n    layers: ScatterplotLayer[],\n): ScatterplotLegendInfo {\n    return grouping.reduce((res: ScatterplotLegendInfo, groupingElement) => {\n        // TODO: remove String conversion\n        const column = groupingElement.columnName;\n        const nullValueLabel = column.nullValueLabel ?? 'NA';\n        const order = groupingElement.order;\n        const getValueLabel = (index: number) => {\n            return column.valueLabels\n            ? data.getColumnValueCategory(column.valueLabels, index)\n            : undefined;\n        };\n\n        const usedAes = new Set<keyof AesItem>();\n        const usedAesFromPalettes:Partial<Record<keyof AesItem, string[]>> = {}; // if there is palette in mapping then\n        layers.forEach(layer => {\n            if (!layer.aes)  return;\n            \n            Object.entries(layer.aes).forEach(([key, value]) => {\n                if (!(isInheritMapping(value) && value.value === column.value)) return;\n                \n                usedAes.add(key as keyof AesItem);\n                usedAesFromPalettes[key as keyof AesItem] = value.palette;\n            });\n        });\n        let labels: Record<Category, string> = {};\n        let values: Category[] = [];\n        if (usedAes.has('dotFill') || usedAes.has('dotShape') || usedAes.has('lineColor')) {\n            const categories = data.getColumnCategories(column.value, false);\n            if (categories.length < MAX_SHOWN_UNIQUE_VALUES_IN_LABELS) {\n                labels = categories.reduce((res, category) => {\n                    const index = data.getColumnCategoryRowIndex(column.value, category);\n                    res[category] = getValueLabel(index) ?? category;\n                    if (res[category] === 'null') {\n                        res[category] = nullValueLabel;\n                    }\n                    return res;\n                }, labels);\n                const sortWeights = categories.reduce((res, v) => {\n                    res[v] = order?.indexOf(v) ?? -1;\n                    return res;\n                }, {} as Record<string, number>);\n                values = categories.sort((a, b) => {\n                    if (sortWeights[a] !== sortWeights[b]) {\n                        return sortWeights[a] - sortWeights[b];\n                    }\n                    return labels[a]?.localeCompare(labels[b] ?? '', 'en', {numeric: true}) ?? 0;\n                });\n            } else {\n                values = categories;\n            }\n        }\n        res[column.value] = {\n            values,\n            usedAes: [...usedAes],\n            aesMap: addPalettesToAesMapping(column, usedAesFromPalettes, groupingElement.inheritedAes),\n            labels,\n        };\n        return res;\n    }, {});\n}"],"mappings":"AAcA,IAAM,WAAyB;CAC3B,IAAM,oBAAM,IAAI,KAAoC;AAgBpD,QAAO;EACH,aAhBgB,EAAI,OAAO;EAiB3B,WAhBc,GAAwB,MAA+B;GACrE,IAAI,IAAc,EAAI,IAAI,EAAW,MAAM;AAC3C,GAAI,MAAgB,KAAA,MAChB,oBAAc,IAAI,KAAK,EACvB,EAAI,IAAI,EAAW,OAAO,EAAY;GAE1C,IAAI,IAAQ,EAAY,IAAI,EAAS;AAKrC,UAJI,MAAU,KAAA,MACV,IAAQ,EAAY,MACpB,EAAY,IAAI,GAAU,EAAM,GAE7B;;EAMV;IACD;AAEJ,SAAgB,EACZ,GACA,GACA,GACF;AACE,GAAgB,OAAO;CACvB,IAAM,IAAkB,KAAgB,OAAO,KAAK,EAAa,CAAC,SAAS,GACrE,IAAU,EAAoB,SAC9B,IAAa,KAAW,EAAQ,SAAS,GACzC,IAAY,EAAoB,WAChC,IAAe,KAAa,EAAU,SAAS;AAarD,SAZqB,GAAoB,MAAyB;EAC9D,IAAM,IAAkB,IAAkB,EAAa,KAAY,KAAS,KAAA;AAQ5E,SANI,MAAU,aAAa,IAChB,KAAmB,EAAQ,EAAgB,SAAS,GAAY,EAAS,GAAG,EAAQ,UAE3F,MAAU,eAAe,IAClB,KAAmB,EAAU,EAAgB,SAAS,GAAY,EAAS,GAAG,EAAU,UAE5F;;;AAMf,SAAS,EAA8C,GAA6F;AAChJ,QAAO,OAAO,KAAU,YAAY,UAAU,KAAS,EAAM,SAAS;;AAE1E,SAAgB,EACZ,GACA,GACA,GACqB;AACrB,QAAO,EAAS,QAAQ,GAA4B,MAAoB;EAEpE,IAAM,IAAS,EAAgB,YACzB,IAAiB,EAAO,kBAAkB,MAC1C,IAAQ,EAAgB,OACxB,KAAiB,MACZ,EAAO,cACZ,EAAK,uBAAuB,EAAO,aAAa,EAAM,GACtD,KAAA,GAGA,oBAAU,IAAI,KAAoB,EAClC,IAA+D,EAAE;AACvE,IAAO,SAAQ,MAAS;AACf,KAAM,OAEX,OAAO,QAAQ,EAAM,IAAI,CAAC,SAAS,CAAC,GAAK,OAAW;AAC1C,MAAiB,EAAM,IAAI,EAAM,UAAU,EAAO,UAExD,EAAQ,IAAI,EAAqB,EACjC,EAAoB,KAAwB,EAAM;KACpD;IACJ;EACF,IAAI,IAAmC,EAAE,EACrC,IAAqB,EAAE;AAC3B,MAAI,EAAQ,IAAI,UAAU,IAAI,EAAQ,IAAI,WAAW,IAAI,EAAQ,IAAI,YAAY,EAAE;GAC/E,IAAM,IAAa,EAAK,oBAAoB,EAAO,OAAO,GAAM;AAChE,OAAI,EAAW,SAAA,KAA4C;AACvD,QAAS,EAAW,QAAQ,GAAK,OAE7B,EAAI,KAAY,EADF,EAAK,0BAA0B,EAAO,OAAO,EAAS,CAChC,IAAI,GACpC,EAAI,OAAc,WAClB,EAAI,KAAY,IAEb,IACR,EAAO;IACV,IAAM,IAAc,EAAW,QAAQ,GAAK,OACxC,EAAI,KAAK,GAAO,QAAQ,EAAE,IAAI,IACvB,IACR,EAAE,CAA2B;AAChC,QAAS,EAAW,MAAM,GAAG,MACrB,EAAY,OAAO,EAAY,KAG5B,EAAO,IAAI,cAAc,EAAO,MAAM,IAAI,MAAM,EAAC,SAAS,IAAK,CAAC,IAAI,IAFhE,EAAY,KAAK,EAAY,GAG1C;SAEF,KAAS;;AASjB,SANA,EAAI,EAAO,SAAS;GAChB;GACA,SAAS,CAAC,GAAG,EAAQ;GACrB,QAAQ,EAAwB,GAAQ,GAAqB,EAAgB,aAAa;GAC1F;GACH,EACM;IACR,EAAE,CAAC"}
+{"version":3,"file":"createLegendInfo.js","names":[],"sources":["../../../src/scatterplot/utils/createLegendInfo.ts"],"sourcesContent":["import { MAX_SHOWN_UNIQUE_VALUES_IN_LABELS } from '../../constants';\nimport type { DataFrame } from '../../DataFrame';\nimport type {AesRecord} from '../../types';\nimport type {\n    AesItem,\n    Category,\n    ColumnName,\n    ContinuousAesFromColumn,\n    InheritAesScatterplot,\n    ScatterplotLayer,\n    ScatterplotLegendInfo\n} from '../../types';\nimport type { ScatterplotSettingsImpl } from '../ScatterplotSettingsImpl';\n\nconst categoryIndexer = (() => {\n    const map = new Map<string, Map<Category, number>>();\n    const clear = () => map.clear();\n    const getIndex = (columnName: ColumnName, category: Category): number => {\n        let categoryMap = map.get(columnName.value);\n        if (categoryMap === undefined) {\n            categoryMap = new Map();\n            map.set(columnName.value, categoryMap);\n        }\n        let index = categoryMap.get(category);\n        if (index === undefined) {\n            index = categoryMap.size;\n            categoryMap.set(category, index);\n        }\n        return index;\n    };\n\n    return {\n        clear,\n        getIndex,\n    };\n})();\n\nexport function addPalettesToAesMapping(\n    columnName: ColumnName,\n    usedAesFromPalettes: Partial<Record<keyof AesItem, string[]>>,\n    inheritedAes?: AesRecord\n) {\n    categoryIndexer.clear();\n    const hasInheritedAes = inheritedAes && Object.keys(inheritedAes).length > 0;\n    const dotFill = usedAesFromPalettes['dotFill'];\n    const hasDotFill = dotFill && dotFill.length > 0;\n    const lineColor = usedAesFromPalettes['lineColor'];\n    const hasLineColor = lineColor && lineColor.length > 0;\n    const getAesField = (category: Category, field: keyof AesItem) => {\n        const inheritedResult = hasInheritedAes ? inheritedAes[category]?.[field] : undefined;\n        // Use inherited when defined; otherwise generate from palette so overflow categories get a color\n        if (field === 'dotFill' && hasDotFill) {\n            return inheritedResult ?? dotFill[categoryIndexer.getIndex(columnName, category) % dotFill.length];\n        }\n        if (field === 'lineColor' && hasLineColor) {\n            return inheritedResult ?? lineColor[categoryIndexer.getIndex(columnName, category) % lineColor.length];\n        }\n        return inheritedResult;\n    };\n\n    return getAesField;\n}\n\nfunction isInheritMapping<T extends (string | number)>(value:T | InheritAesScatterplot | ContinuousAesFromColumn<T>):value is InheritAesScatterplot {\n    return typeof value === 'object' && 'type' in value && value.type === 'grouping';\n}\n// Structural minimum needed from `additionalCurves` for legend-info collection. Scatterplot and UMAP\n// each have their own full AdditionalCurves type (scatterplot has a per-entry `trend` sub-object, UMAP\n// doesn't), but this function only reads `lineColor` + optional `trend.color`, so a narrow shape lets\n// both call sites share this helper without fighting the type system.\ntype LegendAdditionalCurves = {\n    curves: ReadonlyArray<{\n        lineColor: string | InheritAesScatterplot | ContinuousAesFromColumn<string>;\n        trend?: { color?: string | InheritAesScatterplot | ContinuousAesFromColumn<string> };\n    }>;\n};\n\nexport function createLegendInfo(\n    data: DataFrame,\n    grouping: ScatterplotSettingsImpl['grouping'],\n    layers: ScatterplotLayer[],\n    additionalCurves?: LegendAdditionalCurves | null,\n): ScatterplotLegendInfo {\n    return grouping.reduce((res: ScatterplotLegendInfo, groupingElement) => {\n        // TODO: remove String conversion\n        const column = groupingElement.columnName;\n        const nullValueLabel = column.nullValueLabel ?? 'NA';\n        const order = groupingElement.order;\n        const getValueLabel = (index: number) => {\n            return column.valueLabels\n            ? data.getColumnValueCategory(column.valueLabels, index)\n            : undefined;\n        };\n\n        const usedAes = new Set<keyof AesItem>();\n        const usedAesFromPalettes:Partial<Record<keyof AesItem, string[]>> = {}; // if there is palette in mapping then\n        layers.forEach(layer => {\n            if (!layer.aes)  return;\n\n            Object.entries(layer.aes).forEach(([key, value]) => {\n                if (!(isInheritMapping(value) && value.value === column.value)) return;\n\n                usedAes.add(key as keyof AesItem);\n                usedAesFromPalettes[key as keyof AesItem] = value.palette;\n            });\n        });\n        // Additional-curve entries contribute `lineColor` (and trend.color) to this grouping's aesMap\n        // whenever their color is grouping-inherited against this column. Without this, the renderer's\n        // per-group resolution falls back to DEFAULT_COMMON_AES since the column has no registered\n        // lineColor palette.\n        for (const entry of additionalCurves?.curves ?? []) {\n            if (isInheritMapping(entry.lineColor) && entry.lineColor.value === column.value) {\n                usedAes.add('lineColor');\n                if (entry.lineColor.palette) {\n                    usedAesFromPalettes['lineColor'] = entry.lineColor.palette;\n                }\n            }\n            const trendColor = entry.trend?.color;\n            if (trendColor && isInheritMapping(trendColor) && trendColor.value === column.value) {\n                usedAes.add('lineColor');\n                if (trendColor.palette) {\n                    usedAesFromPalettes['lineColor'] = trendColor.palette;\n                }\n            }\n        }\n        let labels: Record<Category, string> = {};\n        let values: Category[] = [];\n        if (usedAes.has('dotFill') || usedAes.has('dotShape') || usedAes.has('lineColor')) {\n            const categories = data.getColumnCategories(column.value, false);\n            if (categories.length < MAX_SHOWN_UNIQUE_VALUES_IN_LABELS) {\n                labels = categories.reduce((res, category) => {\n                    const index = data.getColumnCategoryRowIndex(column.value, category);\n                    res[category] = getValueLabel(index) ?? category;\n                    if (res[category] === 'null') {\n                        res[category] = nullValueLabel;\n                    }\n                    return res;\n                }, labels);\n                const sortWeights = categories.reduce((res, v) => {\n                    res[v] = order?.indexOf(v) ?? -1;\n                    return res;\n                }, {} as Record<string, number>);\n                values = categories.sort((a, b) => {\n                    if (sortWeights[a] !== sortWeights[b]) {\n                        return sortWeights[a] - sortWeights[b];\n                    }\n                    return labels[a]?.localeCompare(labels[b] ?? '', 'en', {numeric: true}) ?? 0;\n                });\n            } else {\n                values = categories;\n            }\n        }\n        res[column.value] = {\n            values,\n            usedAes: [...usedAes],\n            aesMap: addPalettesToAesMapping(column, usedAesFromPalettes, groupingElement.inheritedAes),\n            labels,\n        };\n        return res;\n    }, {});\n}"],"mappings":"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"}

package/dist/scatterplot-umap/ChartRenderer.d.ts

@@ -7,7 +7,7 @@ import { Label } from '../scatterplot/utils/getVisibleLabels';
 import { ColumnName, ScatterplotEventHandlers } from '../types';
 import { ScatterplotUmapLegendInfo } from '../types/scatterplot-umap';
 import { ScatterplotUmapLayer, ScatterplotUmapSettingsImpl } from './SettingsImpl';
-import { AesGetters, CaptionsSizes, ChartScales, ChartSizes, Dot, DotsExtents, LassoControlsState, Margins, Polygon, SVGLayerProps } from './types';
+import { AdditionalCurveRenderData, AesGetters, CaptionsSizes, ChartScales, ChartSizes, Dot, DotsExtents, LassoControlsState, Margins, Polygon, SVGLayerProps } from './types';
 import { default as KDBush } from 'kdbush';
 import { DataFrame } from '../DataFrame';
 declare class ChartRenderer {
@@ -52,16 +52,16 @@ declare class ChartRenderer {
     updateCaptionsSize(): void;
     createMainTitle(title: ScatterplotUmapSettingsImpl['chartSettings']['title']): void;
     updateMargins(xAxis: ScatterplotUmapSettingsImpl['chartSettings']['xAxis'], yAxis: ScatterplotUmapSettingsImpl['chartSettings']['yAxis']): void;
-    updateLegendSize(legend: ScatterplotUmapSettingsImpl['chartSettings']['legend'], legendLabels: ScatterplotUmapLegendInfo, grouping: ColumnName[], layers: ScatterplotUmapLayer[]): void;
-    initSettings(dots: Dot[], chartSettings: ScatterplotUmapSettingsImpl['chartSettings'], dotExtents: DotsExtents, legendInfo: ScatterplotUmapLegendInfo, layers: ScatterplotUmapSettingsImpl['layers'], grouping: ColumnName[], onZoomChange: (v: boolean) => void): void;
+    updateLegendSize(legend: ScatterplotUmapSettingsImpl['chartSettings']['legend'], legendLabels: ScatterplotUmapLegendInfo, grouping: ColumnName[], layers: ScatterplotUmapLayer[], additionalCurves: ScatterplotUmapSettingsImpl['additionalCurves'], yColumn: ColumnName): void;
+    initSettings(dots: Dot[], chartSettings: ScatterplotUmapSettingsImpl['chartSettings'], dotExtents: DotsExtents, legendInfo: ScatterplotUmapLegendInfo, layers: ScatterplotUmapSettingsImpl['layers'], grouping: ColumnName[], onZoomChange: (v: boolean) => void, additionalCurves: ScatterplotUmapSettingsImpl['additionalCurves'], yColumn: ColumnName): void;
     resetZoom(xAxis: ScatterplotUmapSettingsImpl['chartSettings']['xAxis'], yAxis: ScatterplotUmapSettingsImpl['chartSettings']['yAxis'], dotsExtents?: DotsExtents): void;
-    updateAes(legendInfo: ScatterplotUmapLegendInfo, layers: ScatterplotUmapSettingsImpl['layers']): void;
-    updatePointSize(legendInfo: ScatterplotUmapLegendInfo, layers: ScatterplotUmapSettingsImpl['layers']): void;
+    updateAes(legendInfo: ScatterplotUmapLegendInfo, layers: ScatterplotUmapSettingsImpl['layers'], additionalCurves: ScatterplotUmapSettingsImpl['additionalCurves']): void;
+    updatePointSize(legendInfo: ScatterplotUmapLegendInfo, layers: ScatterplotUmapSettingsImpl['layers'], additionalCurves: ScatterplotUmapSettingsImpl['additionalCurves']): void;
     updateByLasso(): void;
     createQuadtree(dots: Dot[]): KDBush;
     getClosestDot(_x: number, _y: number): Dot | null;
     updateDots(dots: Dot[]): void;
-    render(dataFrame: DataFrame, settingsId: string, chartSettings: ScatterplotUmapSettingsImpl['chartSettings'], keyColumn: ColumnName | null, dots: Dot[], dotExtents: DotsExtents, dotsByGrouping: Record<string, Dot[]>, layers: ScatterplotUmapSettingsImpl['layers'], legendInfo: ScatterplotUmapLegendInfo, grouping: ColumnName[], onPolygonUpdateOutside: ScatterplotEventHandlers['onPolygonUpdate'], onTooltipHintSwitch: (v: boolean) => void, onLassoControlsStateUpdate: (v: LassoControlsState) => void, onZoomChange: (v: boolean) => void): void;
+    render(dataFrame: DataFrame, settingsId: string, chartSettings: ScatterplotUmapSettingsImpl['chartSettings'], keyColumn: ColumnName | null, dots: Dot[], dotExtents: DotsExtents, dotsByGrouping: Record<string, Dot[]>, layers: ScatterplotUmapSettingsImpl['layers'], legendInfo: ScatterplotUmapLegendInfo, grouping: ColumnName[], onPolygonUpdateOutside: ScatterplotEventHandlers['onPolygonUpdate'], onTooltipHintSwitch: (v: boolean) => void, onLassoControlsStateUpdate: (v: LassoControlsState) => void, onZoomChange: (v: boolean) => void, additionalCurves: AdditionalCurveRenderData[] | undefined, additionalCurvesSettings: ScatterplotUmapSettingsImpl["additionalCurves"] | undefined, yColumn: ColumnName): void;
     renderWebglLayer(): void;
     onPolygonUpdate: (p: Polygon[]) => void;
     renderSvgLayer(): void;

package/dist/scatterplot-umap/ChartRenderer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ChartRenderer.d.ts","sourceRoot":"","sources":["../../src/scatterplot-umap/ChartRenderer.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"ChartRenderer.d.ts","sourceRoot":"","sources":["../../src/scatterplot-umap/ChartRenderer.tsx"],"names":[],"mappings":"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"}

package/dist/scatterplot-umap/ChartRenderer.js

@@ -35,12 +35,13 @@ function R(e) {
 function z(e, t, n) {
 	return n.length === 0 ? !0 : n.some((n) => n.closed && n.points.length > 2 && I(n.points, [e, t]));
 }
-function B(e, t, r) {
-	let i = r.find((e) => e.type === "dots"), a = r.find((e) => e.type === "curve");
+function B(e, t, r, i) {
+	let a = r.find((e) => e.type === "dots"), o = r.find((e) => e.type === "curve");
 	return {
-		dotFill: m(e, t, i?.aes.dotFill ?? n.color, "dotFill"),
-		dotSize: m(e, t, i?.aes.dotSize ?? n.size, "dotSize"),
-		lineType: m(e, t, a?.aes.lineShape ?? "solid", "lineShape")
+		dotFill: m(e, t, a?.aes.dotFill ?? n.color, "dotFill"),
+		dotSize: m(e, t, a?.aes.dotSize ?? n.size, "dotSize"),
+		lineType: m(e, t, o?.aes.lineShape ?? "solid", "lineShape"),
+		additionalCurveLineColor: (i?.curves ?? []).map((n) => m(e, t, n.lineColor, "lineColor"))
 	};
 }
 var V = class {
@@ -53,7 +54,8 @@ var V = class {
 	aesGetters = {
 		dotSize: () => 2,
 		dotFill: () => t,
-		lineType: () => "solid"
+		lineType: () => "solid",
+		additionalCurveLineColor: []
 	};
 	tools = null;
 	margins = {
@@ -150,7 +152,7 @@ var V = class {
 			right: this.legend.width + 24
 		}, this.chartSizes.totalWidth = this.margins.left + this.chartSizes.chartWidth + this.margins.right, this.chartSizes.totalHeight = this.margins.top + Math.max(this.chartSizes.chartHeight, this.legend.height) + this.margins.bottom, O(this.canvasNode).style("width", this.chartSizes.chartWidth + "px").style("height", this.chartSizes.chartHeight + "px").style("top", this.margins.top + "px").style("left", this.margins.left + "px");
 	}
-	updateLegendSize(e, t, a, s) {
+	updateLegendSize(e, a, s, c, u, d) {
 		if (!e.show) {
 			this.legend = {
 				width: 0,
@@ -159,50 +161,88 @@ var V = class {
 			};
 			return;
 		}
-		let c = [], u = {
+		let p = [], m = {
 			width: 0,
 			height: 0,
 			left: 0,
 			top: 0
-		}, d = Math.min(Math.max(this.chartSizes.chartHeight, 250), 400), p = Math.max(this.chartSizes.chartHeight, d);
-		if (a.forEach((e) => {
-			let r = t[e.value];
-			if (r.usedAes.length === 0 || !r.aesMap) return;
-			if (r.values.length > 100) {
-				console.warn(`Too many values for discrete legend (${r.values.length})`);
+		}, h = Math.min(Math.max(this.chartSizes.chartHeight, 250), 400), g = Math.max(this.chartSizes.chartHeight, h);
+		if (s.forEach((e) => {
+			let t = a[e.value];
+			if (t.usedAes.length === 0 || !t.aesMap) return;
+			if (t.values.length > 100) {
+				console.warn(`Too many values for discrete legend (${t.values.length})`);
 				return;
 			}
-			let i = {};
-			r.values.forEach((e) => {
-				i[e] || (i[e] = { ...n }), r.usedAes.forEach((t) => {
-					t === "dotFill" && (i[e].color = r.aesMap(e, t) ?? "#110529"), t === "dotSize" && (i[e].size = Number(r.aesMap(e, t) ?? 3));
+			let r = {};
+			t.values.forEach((e) => {
+				r[e] || (r[e] = { ...n }), t.usedAes.forEach((n) => {
+					n === "dotFill" && (r[e].color = t.aesMap(e, n) ?? "#110529"), n === "dotSize" && (r[e].size = Number(t.aesMap(e, n) ?? 3));
 				});
 			});
-			let a = e.label ?? e.value, o = S().domain(r.values).range(r.values.map((e) => i[e]));
-			c.push({
-				...u,
+			let i = e.label ?? e.value, o = S().domain(t.values).range(t.values.map((e) => r[e]));
+			p.push({
+				...m,
 				id: e.value,
 				type: "dots",
-				title: a,
+				title: i,
 				scale: o,
-				values: r.values,
-				labels: r.labels
+				values: t.values,
+				labels: t.labels
 			});
-		}), s.forEach((e) => {
+		}), c.forEach((e) => {
 			if (e.type === "dots" && r(e.aes.dotFill)) {
-				let { domain: t, range: n, columnName: r, type: a = "linear" } = e.aes.dotFill, o = r.label ?? r.value, s = f(n, t, "linear"), l = (a === "log" ? C() : b()).domain(t).range([d, 0]), p = i(l, t);
-				c.push({
-					...u,
+				let { domain: t, range: n, columnName: r, type: a = "linear" } = e.aes.dotFill, o = r.label ?? r.value, s = f(n, t, "linear"), c = (a === "log" ? C() : b()).domain(t).range([h, 0]), l = i(c, t);
+				p.push({
+					...m,
 					id: "dotFill",
 					type: "continuous",
 					title: o,
 					scale: s,
-					tickPositionScale: l,
-					values: p
+					tickPositionScale: c,
+					values: l
 				});
 			}
-			e.type === "dots" && r(e.aes.dotSize) && c.push(o(e.aes.dotSize));
-		}), !c.length) {
+			e.type === "dots" && r(e.aes.dotSize) && p.push(o(e.aes.dotSize));
+		}), u && u.curves.length > 0) {
+			let e = t, n = [], r = {}, i = {}, a = c.find((e) => e.type === "curve");
+			if (a) {
+				let t = d.label ?? d.value, o = typeof a.aes.lineColor == "string" ? a.aes.lineColor : e;
+				n.push(t), r[t] = t, i[t] = {
+					lineShape: a.aes.lineShape,
+					lineColor: o
+				};
+			}
+			for (let t of u.curves) {
+				let a = t.label, o = 1;
+				for (; n.includes(a);) a = `${t.label} (${++o})`;
+				let s = typeof t.lineColor == "string" ? t.lineColor : e;
+				n.push(a), r[a] = a, i[a] = {
+					lineShape: t.lineShape,
+					lineColor: s
+				};
+			}
+			if (n.length > 0) {
+				let e = S().domain(n).range(n.map((e) => i[e])).unknown({});
+				p.push({
+					...m,
+					id: "additionalCurves",
+					type: "discreteMulti",
+					title: "Curves",
+					scale: e,
+					values: n,
+					labels: r,
+					usedAes: {
+						lineShape: !0,
+						lineColor: !0,
+						dotFill: !1,
+						dotShape: !1,
+						fillColor: !1
+					}
+				});
+			}
+		}
+		if (!p.length) {
 			this.legend = {
 				width: 0,
 				height: 0,
@@ -210,27 +250,27 @@ var V = class {
 			};
 			return;
 		}
-		let m = l(c, p, d);
+		let _ = l(p, g, h);
 		this.legend = {
-			width: m.reduce((e, t) => Math.max(e, t.left + t.width), 0) + 24,
-			height: p,
-			items: m
+			width: _.reduce((e, t) => Math.max(e, t.left + t.width), 0) + 24,
+			height: g,
+			items: _
 		};
 	}
-	initSettings(e, t, n, r, i, a, o) {
-		let { xAxis: s, yAxis: c, size: l, title: u, legend: d } = t;
-		this.updateChartSizes(l), this.updateViewport(s, c, n), this.updateCaptionsSize(), this.updateLegendSize(d, r, a, i), this.createMainTitle(u), this.updateMargins(s, c), this.aesGetters = B(this.dataFrame, r, i);
-		let f = P().data(e).value((e) => {
+	initSettings(e, t, n, r, i, a, o, s, c) {
+		let { xAxis: l, yAxis: u, size: d, title: f, legend: p } = t;
+		this.updateChartSizes(d), this.updateViewport(l, u, n), this.updateCaptionsSize(), this.updateLegendSize(p, r, a, i, s, c), this.createMainTitle(f), this.updateMargins(l, u), this.aesGetters = B(this.dataFrame, r, i, s);
+		let m = P().data(e).value((e) => {
 			let t = y(this.aesGetters.dotFill(e.idx));
 			return t[3] = !e.dimmed && z(e.x, e.y, this.polygons) ? 1 : .4, v(t, t);
-		}), p = N().equals((e, t) => e === t).size((e) => R(this.aesGetters.dotSize(e.idx))).crossValue((e) => e.x).mainValue((e) => e.y).decorate((e) => f(e)), m = k().scaleExtent([.1, 1e3]).filter((e) => e.type === "wheel" || e.metaKey || e.ctrlKey).on("start", () => {
+		}), h = N().equals((e, t) => e === t).size((e) => R(this.aesGetters.dotSize(e.idx))).crossValue((e) => e.x).mainValue((e) => e.y).decorate((e) => m(e)), g = k().scaleExtent([.1, 1e3]).filter((e) => e.type === "wheel" || e.metaKey || e.ctrlKey).on("start", () => {
 			this.selectedDot = null;
 		}).on("zoom", (e) => {
 			let t = e.transform, n = t.rescaleX(this.scales.xOriginal), r = t.rescaleY(this.scales.yOriginal);
 			this.scales.x.domain(n.domain()), this.scales.y.domain(r.domain()), this.zoomTransform = t, this.zoomStateKey = `${t.x}_${t.y}_${t.k}`, this.updateLabelsPosition(this.visibleLabels), this.renderSvgLayer(), this.renderWebglLayer();
 		}).on("end", () => {
 			this.visibleLabels = this.computeLabels(this.allDots), this.renderSvgLayer(), o(!0);
-		}), h = F().on("point", ([e]) => {
+		}), _ = F().on("point", ([e]) => {
 			let t;
 			e && (t = this.getClosestDot(e.x, e.y));
 			let n = this.selectedDot && !t || !this.selectedDot && t || this.selectedDot?.idx !== t?.idx;
@@ -240,26 +280,26 @@ var V = class {
 			webglChart: D({
 				xScale: this.scales.x,
 				yScale: this.scales.y
-			}).xAxisHeight(() => "0").yAxisWidth(() => "0").svgPlotArea(j()).webglPlotArea(M().series([p]).mapping((e) => e)).decorate((e) => {
+			}).xAxisHeight(() => "0").yAxisWidth(() => "0").svgPlotArea(j()).webglPlotArea(M().series([h]).mapping((e) => e)).decorate((e) => {
 				let t = e.enter();
-				t && !this.svgLayerElement && (t.style("grid-template-columns", "0 auto 1fr auto 0"), t.style("grid-template-rows", "0 auto 1fr auto 0"), this.svgLayerElement = t.select(".svg-plot-area.plot-area svg").node()), t.select(".svg-plot-area.plot-area").attr("class", "svg-plot-area plot-area miplots-scatterplot-plot-area").call(m).call(h);
+				t && !this.svgLayerElement && (t.style("grid-template-columns", "0 auto 1fr auto 0"), t.style("grid-template-rows", "0 auto 1fr auto 0"), this.svgLayerElement = t.select(".svg-plot-area.plot-area svg").node()), t.select(".svg-plot-area.plot-area").attr("class", "svg-plot-area plot-area miplots-scatterplot-plot-area").call(g).call(_);
 			}),
-			zoom: m,
-			fillColor: f,
-			pointSeries: p
+			zoom: g,
+			fillColor: m,
+			pointSeries: h
 		}, O(this.canvasNode).datum(e).style("position", "absolute").style("width", this.chartSizes.chartWidth + "px").style("height", this.chartSizes.chartHeight + "px").style("top", this.margins.top + "px").style("left", this.margins.left + "px"), this.onPolygonUpdate(this.polygons);
 	}
 	resetZoom(e, t, n) {
 		!this.tools?.zoom || !n || (this.updateViewport(e, t, n), O(".miplots-scatterplot-plot-area").call(this.tools.zoom.transform, A));
 	}
-	updateAes(e, t) {
-		this.tools !== null && (this.aesGetters = B(this.dataFrame, e, t), this.tools.fillColor.value((e) => {
+	updateAes(e, t, n) {
+		this.tools !== null && (this.aesGetters = B(this.dataFrame, e, t, n), this.tools.fillColor.value((e) => {
 			let t = y((this.aesGetters.dotFill ?? _)(e.idx));
 			return t[3] = !e.dimmed && z(e.x, e.y, this.polygons) ? 1 : .4, v(t, t);
 		}));
 	}
-	updatePointSize(e, t) {
-		this.tools !== null && (this.updateAes(e, t), O(this.canvasNode).datum([...this.allDots]), this.tools.pointSeries.size((e) => R(this.aesGetters.dotSize(e.idx))));
+	updatePointSize(e, t, n) {
+		this.tools !== null && (this.updateAes(e, t, n), O(this.canvasNode).datum([...this.allDots]), this.tools.pointSeries.size((e) => R(this.aesGetters.dotSize(e.idx))));
 	}
 	updateByLasso() {
 		this.tools !== null && (this.tools?.fillColor.value((e) => {
@@ -287,20 +327,21 @@ var V = class {
 	updateDots(e) {
 		this.tools !== null && (O(this.canvasNode).datum(e), this.tools.fillColor.data(e), this.tools.qt = this.createQuadtree(e), this.allDots = e);
 	}
-	render(e, t, n, r, i, a, o, s, c, l, u, d, f, p) {
+	render(e, t, n, r, i, a, o, s, c, l, u, d, f, p, m = [], h = null, g) {
 		this.dataFrame = e;
-		let m = n.size.width !== this.chartSizes.chartWidth || n.size.height !== this.chartSizes.chartHeight;
-		if (this.tools === null) this.initSettings(i, n, a, c, s, l, p);
+		let _ = n.size.width !== this.chartSizes.chartWidth || n.size.height !== this.chartSizes.chartHeight;
+		if (this.tools === null) this.initSettings(i, n, a, c, s, l, p, h, g);
 		else {
 			let { title: e, legend: t, size: r } = n;
-			this.updateChartSizes(r), this.updateLegendSize(t, c, l, s), this.createMainTitle(e), this.updateMargins(n.xAxis, n.yAxis), this.updateAes(c, s);
+			this.updateChartSizes(r), this.updateLegendSize(t, c, l, s, h, g), this.createMainTitle(e), this.updateMargins(n.xAxis, n.yAxis), this.updateAes(c, s, h);
 		}
-		this.onPolygonUpdateOutside = u, this.onTooltipHintSwitch = d, this.onLassoControlsStateUpdate = f, this.allDots === i ? m && (this.visibleLabels = this.computeLabels(i)) : (this.updateDots(i), this.visibleLabels = this.computeLabels(i), this.onPolygonUpdate(this.polygons)), this.notCalculatedProps = {
+		this.onPolygonUpdateOutside = u, this.onTooltipHintSwitch = d, this.onLassoControlsStateUpdate = f, this.allDots === i ? _ && (this.visibleLabels = this.computeLabels(i)) : (this.updateDots(i), this.visibleLabels = this.computeLabels(i), this.onPolygonUpdate(this.polygons)), this.notCalculatedProps = {
 			settingsId: t,
 			chartSettings: n,
 			keyColumn: r,
 			dotsByGrouping: o,
-			layers: s
+			layers: s,
+			additionalCurves: m
 		}, this.renderWebglLayer(), this.renderSvgLayer();
 	}
 	renderWebglLayer() {
@@ -318,6 +359,7 @@ var V = class {
 			keyColumn: this.notCalculatedProps.keyColumn,
 			dotsByGrouping: this.notCalculatedProps.dotsByGrouping,
 			layers: this.notCalculatedProps.layers,
+			additionalCurves: this.notCalculatedProps.additionalCurves ?? [],
 			chartSizes: this.chartSizes,
 			scales: this.scales,
 			margins: this.margins,