svelteplot 0.5.1-pr-245.0 → 0.5.1-pr-246.0

package/dist/core/Plot.svelte

@@ -65,7 +65,7 @@
         margin: 'auto',
         colorScheme: 'turbo',
         unknown: '#cccccc99',
-        sortOrdinalDomains: true,
+
         categoricalColorScheme: 'observable10',
         pointScaleHeight: 18,
         bandScaleHeight: 30,
@@ -365,12 +365,7 @@
         initialOpts: Partial<PlotOptions>,
         opts: PlotOptionsParameters
     ): PlotOptions {
-        return mergeDeep<PlotOptions>(
-            {},
-            { sortOrdinalDomains: DEFAULTS.sortOrdinalDomains },
-            smartDefaultPlotOptions(opts),
-            initialOpts
-        );
+        return mergeDeep<PlotOptions>({}, smartDefaultPlotOptions(opts), initialOpts);
     }
 
     function maybeMargin(

package/dist/helpers/autoScales.js

@@ -79,7 +79,16 @@ export function autoScale({ name, type, domain, scaleOptions, plotOptions, plotW
         ...(type === 'band' || type === 'point'
             ? {
                 align: scaleOptions.align,
-                padding: maybeNumber(coalesce(scaleOptions.padding, plotOptions.padding, 0.15))
+                ...(type === 'point'
+                    ? {
+                        // point scales don't have paddingInner/Outer, only padding
+                        padding: maybeNumber(coalesce(scaleOptions.padding, plotOptions.padding, 0.15))
+                    }
+                    : {
+                        //   padding: maybeNumber(coalesce(scaleOptions.padding, plotOptions.padding, 0.15)),
+                        paddingInner: maybeNumber(coalesce(scaleOptions.paddingInner, scaleOptions.padding, plotOptions.padding, 0.15)),
+                        paddingOuter: maybeNumber(coalesce(scaleOptions.paddingOuter, scaleOptions.padding, plotOptions.padding, 0.15))
+                    })
             }
             : {})
     };

package/dist/helpers/scales.d.ts

@@ -40,4 +40,3 @@ export declare function looksLikeANumber(input: string | number): boolean;
 export declare function projectXY(scales: PlotScales, x: RawValue, y: RawValue, useXScale?: boolean, useYScale?: boolean): [number, number];
 export declare function projectX(channel: 'x' | 'x1' | 'x2', scales: PlotScales, value: RawValue): number;
 export declare function projectY(channel: 'y' | 'y1' | 'y2', scales: PlotScales, value: RawValue): number;
-export declare function isOrdinalScale(scaleType: ScaleType): scaleType is "point" | "ordinal" | "band" | "categorical" | "threshold";

package/dist/helpers/scales.js

@@ -48,7 +48,7 @@ export function createScale(name, scaleOptions, marks, plotOptions, plotWidth, p
     let manualActiveMarks = 0;
     const propNames = new Set();
     const uniqueScaleProps = new Set();
-    let sortOrdinalDomain = plotOptions.sortOrdinalDomains ?? true;
+    let sortOrdinalDomain = true;
     for (const mark of marks) {
         // we only sort the scale domain alphabetically, if none of the
         // marks that map to it are using the `sort` transform. Note that
@@ -152,7 +152,11 @@ export function createScale(name, scaleOptions, marks, plotOptions, plotWidth, p
         throw new Error(`Invalid scale type ${type} for scale
             ${name}. Valid types are ${[...VALID_SCALE_TYPES[name]].join(', ')}`);
     }
-    const isOrdinal = isOrdinalScale(type);
+    const isOrdinal = type === 'band' ||
+        type === 'point' ||
+        type === 'ordinal' ||
+        type === 'categorical' ||
+        type === 'threshold';
     if (isOrdinal && sortOrdinalDomain) {
         valueArr.sort(ascending);
     }
@@ -347,10 +351,3 @@ export function projectY(channel, scales, value) {
                 ? scales.y.fn.bandwidth()
                 : 0));
 }
-export function isOrdinalScale(scaleType) {
-    return (scaleType === 'band' ||
-        scaleType === 'point' ||
-        scaleType === 'ordinal' ||
-        scaleType === 'categorical' ||
-        scaleType === 'threshold');
-}

package/dist/marks/BarX.svelte

@@ -59,7 +59,7 @@
         stackX(
             intervalX(
                 // by default, sort by y channel (the ordinal labels)
-                sort(recordizeX({ data, ...options })),
+                sort(recordizeX({ data, sort: { channel: 'y' }, ...options })),
                 { plot }
             ),
             stack

package/dist/marks/BarY.svelte

@@ -59,7 +59,7 @@
         stackY(
             intervalY(
                 // by default, sort by x channel (the ordinal labels)
-                sort(recordizeY({ data, ...options })),
+                sort(recordizeY({ data, sort: { channel: 'x' }, ...options })),
                 { plot }
             ),
             stack

package/dist/marks/Dot.svelte

@@ -32,7 +32,6 @@
     import { addEventHandlers } from './helpers/events.js';
     import Anchor from './helpers/Anchor.svelte';
     import { getPlotDefaults } from '../hooks/plotDefaults.js';
-    import { isOrdinalScale } from '../helpers/scales.js';
 
     const DEFAULTS = {
         ...getPlotDefaults().dot
@@ -61,11 +60,7 @@
             recordizeXY({
                 data,
                 // sort by descending radius by default
-                ...(options.r &&
-                !isOrdinalScale(plot.scales.x.type) &&
-                !isOrdinalScale(plot.scales.y.type)
-                    ? { sort: { channel: '-r' } }
-                    : {}),
+                ...(options.r ? { sort: { channel: '-r' } } : {}),
                 ...options,
                 ...(options.fill === true ? { fill: 'currentColor' } : {})
             })

package/dist/types/plot.d.ts

@@ -112,10 +112,6 @@ export type PlotDefaults = {
      * default dot radius for line markers, used in dot, circle, and circle-stroke markers
      */
     markerDotRadius: number;
-    /**
-     * if set to true, ordinal domains will be sorted alphabetically
-     */
-    sortOrdinalDomains: boolean;
     /**
      * default props for area marks, applied to area, areaX, and areaY marks
      */
@@ -471,9 +467,5 @@ export type PlotOptions = {
      * pass a @emotion/css function to style plot using dynamic classes
      */
     css: (d: string) => string | undefined;
-    /**
-     * if set to true, ordinal domains will be sorted alphabetically
-     */
-    sortOrdinalDomains: boolean;
 };
 export {};

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "svelteplot",
-    "version": "0.5.1-pr-245.0",
+    "version": "0.5.1-pr-246.0",
     "license": "ISC",
     "author": {
         "name": "Gregor Aisch",