svelteplot 0.10.3-pr-404.0 → 0.10.3-pr-405.0

package/dist/core/Plot.svelte

@@ -59,6 +59,11 @@
 
     // default settings in the plot and marks can be overwritten by
     // defining the svelteplot/defaults context outside of Plot
+    const asGridDefaults = (opts: PlotDefaults['grid'] | undefined) =>
+        opts === true ? { implicit: true } : opts == null ? {} : opts;
+    const isImplicit = (opts: { implicit?: boolean } | true | undefined) =>
+        opts === true ? true : (opts?.implicit ?? false);
+
     const DEFAULTS: PlotDefaults = {
         height: 350,
         initialWidth: 500,
@@ -93,13 +98,13 @@
         },
         gridX: {
             implicit: false,
-            ...USER_DEFAULTS.grid,
-            ...USER_DEFAULTS.gridX
+            ...asGridDefaults(USER_DEFAULTS.grid),
+            ...asGridDefaults(USER_DEFAULTS.gridX)
         },
         gridY: {
             implicit: false,
-            ...USER_DEFAULTS.grid,
-            ...USER_DEFAULTS.gridY
+            ...asGridDefaults(USER_DEFAULTS.grid),
+            ...asGridDefaults(USER_DEFAULTS.gridY)
         }
     };
 
@@ -444,9 +449,9 @@
             marginTop: maybeMargin(margin, 'top', DEFAULTS.margin, autoMargins),
             marginBottom: maybeMargin(margin, 'bottom', DEFAULTS.margin, autoMargins),
             inset: isOneDimensional ? 10 : DEFAULTS.inset,
-            grid: (DEFAULTS.gridX?.implicit ?? false) && (DEFAULTS.gridY?.implicit ?? false),
+            grid: isImplicit(DEFAULTS.gridX) && isImplicit(DEFAULTS.gridY),
             axes: (DEFAULTS.axisX?.implicit ?? false) && (DEFAULTS.axisY?.implicit ?? false),
-            frame: DEFAULTS.frame?.implicit ?? false,
+            frame: isImplicit(DEFAULTS.frame),
             projection: null,
             aspectRatio: null,
             facet: {},
@@ -464,7 +469,7 @@
                 align: 0.5,
                 tickSpacing: DEFAULTS.axisX.tickSpacing ?? 80,
                 tickFormat: 'auto',
-                grid: DEFAULTS.gridX.implicit ?? false
+                grid: isImplicit(DEFAULTS.gridX)
             },
             y: {
                 type: 'auto',
@@ -479,7 +484,7 @@
                 align: 0.5,
                 tickSpacing: DEFAULTS.axisY.tickSpacing ?? 50,
                 tickFormat: 'auto',
-                grid: DEFAULTS.gridY.implicit ?? false
+                grid: isImplicit(DEFAULTS.gridY)
             },
             opacity: {
                 type: 'linear',

package/dist/hooks/plotDefaults.js

@@ -3,7 +3,8 @@ const PLOT_DEFAULTS_KEY = Symbol('svelteplot/defaults');
 /** sets default options for all Plot components in this component tree, merging with any existing defaults from parent contexts */
 export function setPlotDefaults(plotDefaults) {
     const existingDefaults = getPlotDefaults();
-    const mergedDefaults = { ...existingDefaults, ...plotDefaults };
+    const normalizedDefaults = normalizePlotDefaults(plotDefaults, existingDefaults);
+    const mergedDefaults = { ...existingDefaults, ...normalizedDefaults };
     setContext(PLOT_DEFAULTS_KEY, mergedDefaults);
 }
 /** retrieves the current plot defaults from the Svelte context, or an empty object if none have been set */
@@ -16,3 +17,32 @@ export function getPlotDefaults() {
                     getContext('svelteplot/defaults'))
                 : {};
 }
+function normalizePlotDefaults(plotDefaults, existingDefaults) {
+    const grid = normalizeGridDefaults(plotDefaults.grid, existingDefaults.grid);
+    const gridX = normalizeGridDefaults(plotDefaults.gridX, existingDefaults.gridX);
+    const gridY = normalizeGridDefaults(plotDefaults.gridY, existingDefaults.gridY);
+    const frame = normalizeFrameDefaults(plotDefaults.frame, existingDefaults.frame);
+    return {
+        ...plotDefaults,
+        ...(grid !== undefined ? { grid } : {}),
+        ...(gridX !== undefined ? { gridX } : {}),
+        ...(gridY !== undefined ? { gridY } : {}),
+        ...(frame !== undefined ? { frame } : {})
+    };
+}
+function normalizeGridDefaults(input, existing) {
+    if (input !== true)
+        return input;
+    return {
+        ...(typeof existing === 'object' ? existing : {}),
+        implicit: true
+    };
+}
+function normalizeFrameDefaults(input, existing) {
+    if (input !== true)
+        return input;
+    return {
+        ...(typeof existing === 'object' ? existing : {}),
+        implicit: true
+    };
+}

package/dist/types/plot.d.ts

@@ -210,7 +210,7 @@ export type PlotDefaults = {
      */
     frame: Partial<ComponentProps<typeof Frame> & {
         implicit: boolean;
-    }>;
+    }> | true;
     /**
      * default props for geo marks
      */
@@ -224,19 +224,19 @@ export type PlotDefaults = {
      */
     grid: Partial<Omit<ComponentProps<typeof GridX>, IgnoreDefaults> & {
         implicit: boolean;
-    }>;
+    }> | true;
     /**
      * default props for gridX marks
      */
     gridX: Partial<Omit<ComponentProps<typeof GridX>, IgnoreDefaults> & {
         implicit: boolean;
-    }>;
+    }> | true;
     /**
      * default props for gridY marks
      */
     gridY: Partial<Omit<ComponentProps<typeof GridY>, IgnoreDefaults> & {
         implicit: boolean;
-    }>;
+    }> | true;
     /**
      * default props for image marks
      */

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "svelteplot",
-    "version": "0.10.3-pr-404.0",
+    "version": "0.10.3-pr-405.0",
     "description": "A Svelte-native data visualization framework based on the layered grammar of graphics principles.",
     "keywords": [
         "svelte",