svelteplot 0.1.3-next.5 → 0.1.3-next.6

package/dist/Mark.svelte

@@ -156,6 +156,7 @@
         }
     });
 
+     
     function isDifferent(array1: ResolvedDataRecord[], array2: ResolvedDataRecord[]) {
         if (array1.length !== array2.length) return true;
         for (let i = 0; i < array1.length; i++) {

package/dist/helpers/resolve.d.ts

@@ -12,6 +12,10 @@ type ChannelOptions = {
 export declare function toChannelOption(name: ScaledChannelName, channel: ChannelAccessor | ChannelAlias): ChannelOptions;
 export declare function resolveChannel(channel: ChannelName, datum: DataRow, channels: Partial<Record<ChannelName, ChannelAccessor | ChannelAlias>>): RawValue;
 export declare function resolveScaledStyleProps(datum: DataRecord, channels: Partial<Record<ScaledChannelName, ChannelAccessor>>, useScale: Record<ScaledChannelName, boolean>, plot: PlotState, defaultColorProp?: 'fill' | 'stroke' | null): any;
-export declare function resolveScaledStyles(datum: DataRecord, channels: Partial<Record<ScaledChannelName, ChannelAccessor>>, useScale: Record<ScaledChannelName, boolean>, plot: PlotState, defaultColorProp?: 'fill' | 'stroke' | null): string;
-export declare function resolveStyles(plot: PlotState, datum: ScaledDataRecord, channels: Partial<Record<ChannelName & MarkStyleProps, ChannelAccessor>>, defaultColorProp: "fill" | "stroke" | null | undefined, useScale: Record<ScaledChannelName, boolean>, recomputeChannels?: boolean): [string | null, string | null];
+export declare function resolveScaledStyles(datum: DataRecord, channels: Partial<Record<ScaledChannelName, ChannelAccessor> & {
+    style: string;
+}>, useScale: Record<ScaledChannelName, boolean>, plot: PlotState, defaultColorProp?: 'fill' | 'stroke' | null): string;
+export declare function resolveStyles(plot: PlotState, datum: ScaledDataRecord, channels: Partial<Record<ChannelName & MarkStyleProps, ChannelAccessor> & {
+    style: string;
+}>, defaultColorProp: "fill" | "stroke" | null | undefined, useScale: Record<ScaledChannelName, boolean>, recomputeChannels?: boolean): [string | null, string | null];
 export {};

package/dist/helpers/resolve.js

@@ -130,7 +130,11 @@ export function resolveStyles(plot, datum, channels, defaultColorProp = null, us
             : {}),
         ...Object.fromEntries(Object.entries(scaledStyleProps)
             .filter(([key]) => channels[key] != null)
-            .map(([key, cssAttr]) => [key, cssAttr, recomputeChannels ? resolveChannel(key, datum.datum, channels) : datum[key]])
+            .map(([key, cssAttr]) => [
+            key,
+            cssAttr,
+            recomputeChannels ? resolveChannel(key, datum.datum, channels) : datum[key]
+        ])
             .filter(([key, , value]) => isValid(value) || key === 'fill' || key === 'stroke')
             .map(([key, cssAttr, value]) => {
             if (useScale[key]) {
@@ -144,9 +148,9 @@ export function resolveStyles(plot, datum, channels, defaultColorProp = null, us
         }))
     };
     if (plot.css) {
-        return [null, plot.css(stylePropsToCSS(styleProps))];
+        return [null, plot.css(`${stylePropsToCSS(styleProps)};${channels.style ?? ''}`)];
     }
     else {
-        return [stylePropsToCSS(styleProps), null];
+        return [`${stylePropsToCSS(styleProps)};${channels.style ?? ''}`, null];
     }
 }

package/dist/marks/Arrow.svelte

@@ -120,7 +120,7 @@
                         class={[className]}
                         use:addEventHandlers={{
                             getPlotState,
-                            options: mark.options,
+                            options: args,
                             datum: d.datum
                         }}>
                         {#if options.onmouseenter || options.onclick}

package/dist/marks/Text.svelte

@@ -131,7 +131,8 @@
                     {@const [style, styleClass] = resolveStyles(
                         plot,
                         { ...d, __tspanIndex: 0 },
-                        { textAnchor: isLeft ? 'start' : isRight ? 'end' : 'middle', ...args },
+                        { fontSize: 12, fontWeight: 500, strokeWidth: 1.6,
+                            textAnchor: isLeft ? 'start' : isRight ? 'end' : 'middle', ...args },
                         'fill',
                         usedScales
                     )}
@@ -140,7 +141,7 @@
                         <!-- multiline text-->
                         {@const fontSize = resolveProp(args.fontSize, d.datum) || 12}
                         <text
-                            class={[textClassName, styleClass]}
+                            class={[textClassName]}
                             dominant-baseline={LINE_ANCHOR[lineAnchor]}
                             transform="translate({[
                                 Math.round(x + dx),
@@ -155,7 +156,7 @@
                                             fontSize
                                 )
                             ]})"
-                            >{#each textLines as line, l}<tspan x="0" dy={l ? fontSize : 0} {style}
+                            >{#each textLines as line, l}<tspan x="0" dy={l ? fontSize : 0} class={styleClass} {style}
                                     >{line}</tspan
                                 >{/each}{#if title}<title>{title}</title>{/if}</text>
                     {:else}
@@ -175,11 +176,6 @@
 
 <style>
     text {
-        fill: none;
-        stroke: none;
-        font-size: 12px;
-        font-weight: 500;
-        stroke-width: 1.6px;
         paint-order: stroke fill;
     }
 </style>

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "svelteplot",
-    "version": "0.1.3-next.5",
+    "version": "0.1.3-next.6",
     "license": "ISC",
     "author": {
         "name": "Gregor Aisch",