From: Jukka Kurkela <jukka.kurkela@gmail.com>
Date: Sat, 3 Apr 2021 12:13:00 +0000 (+0300)
Subject: Add drawTime option to filler plugin (#8796)
X-Git-Tag: v3.1.0~44
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6df7fae6257cd95fde4457b3e81c8376d0b48b78;p=thirdparty%2FChart.js.git

Add drawTime option to filler plugin (#8796)
---

diff --git a/docs/.vuepress/config.js b/docs/.vuepress/config.js
index a5a4ba771..b23375e1a 100644
--- a/docs/.vuepress/config.js
+++ b/docs/.vuepress/config.js
@@ -133,6 +133,7 @@ module.exports = {
           children: [
             'area/line-boundaries',
             'area/line-datasets',
+            'area/line-drawtime',
             'area/line-stacked',
             'area/radar'
           ]
diff --git a/docs/charts/area.md b/docs/charts/area.md
index 05e16a1e5..f37515e49 100644
--- a/docs/charts/area.md
+++ b/docs/charts/area.md
@@ -64,9 +64,12 @@ new Chart(ctx, {
 
 ## Configuration
 
+Namespace: `options.plugins.filler`
+
 | Option | Type | Default | Description |
 | :--- | :--- | :--- | :--- |
-| [`plugins.filler.propagate`](#propagate) | `boolean` | `true` | Fill propagation when target is hidden.
+| `drawTime` | `string` | `beforeDatasetDraw` | Filler draw time. Supported values: `'beforeDatasetDraw'`, `'beforeDatasetsDraw'`
+| [`propagate`](#propagate) | `boolean` | `true` | Fill propagation when target is hidden.
 
 ### propagate
 
diff --git a/docs/samples/area/line-drawtime.md b/docs/samples/area/line-drawtime.md
new file mode 100644
index 000000000..1c45fcb0c
--- /dev/null
+++ b/docs/samples/area/line-drawtime.md
@@ -0,0 +1,108 @@
+# Line Chart drawTime
+
+```js chart-editor
+// <block:setup:2>
+const inputs = {
+  min: -100,
+  max: 100,
+  count: 8,
+  decimals: 2,
+  continuity: 1
+};
+
+const generateLabels = () => {
+  return Utils.months({count: inputs.count});
+};
+
+Utils.srand(3);
+const generateData = () => (Utils.numbers(inputs));
+// </block:setup>
+
+// <block:data:0>
+const data = {
+  labels: generateLabels(),
+  datasets: [
+    {
+      label: 'Dataset 1',
+      data: generateData(),
+      borderColor: Utils.CHART_COLORS.red,
+      backgroundColor: Utils.transparentize(Utils.CHART_COLORS.red),
+      fill: true
+    },
+    {
+      label: 'Dataset 2',
+      data: generateData(),
+      borderColor: Utils.CHART_COLORS.blue,
+      backgroundColor: Utils.transparentize(Utils.CHART_COLORS.blue),
+      fill: true
+    }
+  ]
+};
+// </block:data>
+
+// <block:actions:3>
+let smooth = false;
+
+const actions = [
+  {
+    name: 'drawTime: beforeDatasetDraw (default)',
+    handler: (chart) => {
+      chart.options.plugins.filler.drawTime = 'beforeDatasetDraw';
+      chart.update();
+    }
+  },
+  {
+    name: 'drawTime: beforeDatasetsDraw',
+    handler: (chart) => {
+      chart.options.plugins.filler.drawTime = 'beforeDatasetsDraw';
+      chart.update();
+    }
+  },
+  {
+    name: 'Randomize',
+    handler(chart) {
+      chart.data.datasets.forEach(dataset => {
+        dataset.data = generateData();
+      });
+      chart.update();
+    }
+  },
+  {
+    name: 'Smooth',
+    handler(chart) {
+      smooth = !smooth;
+      chart.options.elements.line.tension = smooth ? 0.4 : 0;
+      chart.update();
+    }
+  }
+];
+// </block:actions>
+
+// <block:config:1>
+const config = {
+  type: 'line',
+  data: data,
+  options: {
+    plugins: {
+      filler: {
+        propagate: false,
+      },
+      title: {
+        display: true,
+        text: (ctx) => 'drawTime: ' + ctx.chart.options.plugins.filler.drawTime
+      }
+    },
+    pointBackgroundColor: '#fff',
+    radius: 10,
+    interaction: {
+      intersect: false,
+    }
+  },
+};
+// </block:config>
+
+module.exports = {
+  actions: actions,
+  config: config,
+};
+```
diff --git a/src/plugins/plugin.filler.js b/src/plugins/plugin.filler.js
index a7e4dfeac..8ecb7b064 100644
--- a/src/plugins/plugin.filler.js
+++ b/src/plugins/plugin.filler.js
@@ -516,12 +516,25 @@ function doFill(ctx, cfg) {
   ctx.restore();
 }
 
+function drawfill(ctx, source, area) {
+  const target = getTarget(source);
+  const {line, scale} = source;
+  const lineOpts = line.options;
+  const fillOption = lineOpts.fill;
+  const color = lineOpts.backgroundColor;
+  const {above = color, below = color} = fillOption || {};
+  if (target && line.points.length) {
+    clipArea(ctx, area);
+    doFill(ctx, {line, target, above, below, area, scale});
+    unclipArea(ctx);
+  }
+}
+
 export default {
   id: 'filler',
 
   afterDatasetsUpdate(chart, _args, options) {
     const count = (chart.data.datasets || []).length;
-    const propagate = options.propagate;
     const sources = [];
     let meta, i, line, source;
 
@@ -537,7 +550,7 @@ export default {
           fill: decodeFill(line, i, count),
           chart,
           scale: meta.vScale,
-          line
+          line,
         };
       }
 
@@ -551,47 +564,39 @@ export default {
         continue;
       }
 
-      source.fill = resolveTarget(sources, i, propagate);
+      source.fill = resolveTarget(sources, i, options.propagate);
     }
   },
 
-  beforeDatasetsDraw(chart) {
+  beforeDatasetsDraw(chart, _args, options) {
     const metasets = chart.getSortedVisibleDatasetMetas();
     const area = chart.chartArea;
-    let i, meta;
 
-    for (i = metasets.length - 1; i >= 0; --i) {
-      meta = metasets[i].$filler;
+    for (let i = metasets.length - 1; i >= 0; --i) {
+      const source = metasets[i].$filler;
 
-      if (meta) {
-        meta.line.updateControlPoints(area);
+      if (source) {
+        source.line.updateControlPoints(area);
+
+        if (options.drawTime === 'beforeDatasetsDraw') {
+          drawfill(chart.ctx, source, area);
+        }
       }
     }
   },
 
-  beforeDatasetDraw(chart, args) {
-    const area = chart.chartArea;
-    const ctx = chart.ctx;
+  beforeDatasetDraw(chart, args, options) {
     const source = args.meta.$filler;
 
-    if (!source || source.fill === false) {
+    if (!source || source.fill === false || options.drawTime !== 'beforeDatasetDraw') {
       return;
     }
 
-    const target = getTarget(source);
-    const {line, scale} = source;
-    const lineOpts = line.options;
-    const fillOption = lineOpts.fill;
-    const color = lineOpts.backgroundColor;
-    const {above = color, below = color} = fillOption || {};
-    if (target && line.points.length) {
-      clipArea(ctx, area);
-      doFill(ctx, {line, target, above, below, area, scale});
-      unclipArea(ctx);
-    }
+    drawfill(chart.ctx, source, chart.chartArea);
   },
 
   defaults: {
-    propagate: true
+    propagate: true,
+    drawTime: 'beforeDatasetDraw'
   }
 };
diff --git a/test/fixtures/plugin.filler/line/before-dataset-draw.js b/test/fixtures/plugin.filler/line/before-dataset-draw.js
new file mode 100644
index 000000000..3c89a45f6
--- /dev/null
+++ b/test/fixtures/plugin.filler/line/before-dataset-draw.js
@@ -0,0 +1,41 @@
+module.exports = {
+  config: {
+    type: 'line',
+    data: {
+      labels: ['15:00', '16:00', '17:00', '18:00', '19:00', '20:00'],
+      datasets: [
+        {
+          borderColor: '#00ADEE80',
+          backgroundColor: '#00ADEE',
+          data: [0, 1, 1, 2, 2, 0],
+        },
+        {
+          borderColor: '#BD262880',
+          backgroundColor: '#BD2628',
+          data: [0, 2, 2, 1, 1, 1],
+        }
+      ]
+    },
+    options: {
+      borderWidth: 4,
+      fill: true,
+      radius: 20,
+      pointBackgroundColor: '#ffff',
+      cubicInterpolationMode: 'monotone',
+      plugins: {
+        legend: false,
+        filler: {
+          drawTime: 'beforeDatasetDraw'
+        }
+      },
+      scales: {
+        x: {
+          display: false,
+        },
+        y: {
+          display: false
+        }
+      }
+    }
+  }
+};
diff --git a/test/fixtures/plugin.filler/line/before-dataset-draw.png b/test/fixtures/plugin.filler/line/before-dataset-draw.png
new file mode 100644
index 000000000..b69852d2d
Binary files /dev/null and b/test/fixtures/plugin.filler/line/before-dataset-draw.png differ
diff --git a/test/fixtures/plugin.filler/line/before-datasets-draw.js b/test/fixtures/plugin.filler/line/before-datasets-draw.js
new file mode 100644
index 000000000..3b06f3fbd
--- /dev/null
+++ b/test/fixtures/plugin.filler/line/before-datasets-draw.js
@@ -0,0 +1,41 @@
+module.exports = {
+  config: {
+    type: 'line',
+    data: {
+      labels: ['15:00', '16:00', '17:00', '18:00', '19:00', '20:00'],
+      datasets: [
+        {
+          borderColor: '#00ADEE80',
+          backgroundColor: '#00ADEE',
+          data: [0, 1, 1, 2, 2, 0],
+        },
+        {
+          borderColor: '#BD262880',
+          backgroundColor: '#BD2628',
+          data: [0, 2, 2, 1, 1, 1],
+        }
+      ]
+    },
+    options: {
+      borderWidth: 4,
+      fill: true,
+      radius: 20,
+      pointBackgroundColor: '#ffff',
+      cubicInterpolationMode: 'monotone',
+      plugins: {
+        legend: false,
+        filler: {
+          drawTime: 'beforeDatasetsDraw'
+        }
+      },
+      scales: {
+        x: {
+          display: false,
+        },
+        y: {
+          display: false
+        }
+      }
+    }
+  }
+};
diff --git a/test/fixtures/plugin.filler/line/before-datasets-draw.png b/test/fixtures/plugin.filler/line/before-datasets-draw.png
new file mode 100644
index 000000000..9178b8528
Binary files /dev/null and b/test/fixtures/plugin.filler/line/before-datasets-draw.png differ
diff --git a/test/fixtures/plugin.filler/fill-line-boundary-end-span.json b/test/fixtures/plugin.filler/line/boundary/end-span.json
similarity index 100%
rename from test/fixtures/plugin.filler/fill-line-boundary-end-span.json
rename to test/fixtures/plugin.filler/line/boundary/end-span.json
diff --git a/test/fixtures/plugin.filler/fill-line-boundary-end-span.png b/test/fixtures/plugin.filler/line/boundary/end-span.png
similarity index 100%
rename from test/fixtures/plugin.filler/fill-line-boundary-end-span.png
rename to test/fixtures/plugin.filler/line/boundary/end-span.png
diff --git a/test/fixtures/plugin.filler/fill-line-boundary-end.json b/test/fixtures/plugin.filler/line/boundary/end.json
similarity index 100%
rename from test/fixtures/plugin.filler/fill-line-boundary-end.json
rename to test/fixtures/plugin.filler/line/boundary/end.json
diff --git a/test/fixtures/plugin.filler/fill-line-boundary-end.png b/test/fixtures/plugin.filler/line/boundary/end.png
similarity index 100%
rename from test/fixtures/plugin.filler/fill-line-boundary-end.png
rename to test/fixtures/plugin.filler/line/boundary/end.png
diff --git a/test/fixtures/plugin.filler/fill-line-boundary-origin-span-dual.json b/test/fixtures/plugin.filler/line/boundary/origin-span-dual.json
similarity index 100%
rename from test/fixtures/plugin.filler/fill-line-boundary-origin-span-dual.json
rename to test/fixtures/plugin.filler/line/boundary/origin-span-dual.json
diff --git a/test/fixtures/plugin.filler/fill-line-boundary-origin-span-dual.png b/test/fixtures/plugin.filler/line/boundary/origin-span-dual.png
similarity index 100%
rename from test/fixtures/plugin.filler/fill-line-boundary-origin-span-dual.png
rename to test/fixtures/plugin.filler/line/boundary/origin-span-dual.png
diff --git a/test/fixtures/plugin.filler/fill-line-boundary-origin-span.json b/test/fixtures/plugin.filler/line/boundary/origin-span.json
similarity index 100%
rename from test/fixtures/plugin.filler/fill-line-boundary-origin-span.json
rename to test/fixtures/plugin.filler/line/boundary/origin-span.json
diff --git a/test/fixtures/plugin.filler/fill-line-boundary-origin-span.png b/test/fixtures/plugin.filler/line/boundary/origin-span.png
similarity index 100%
rename from test/fixtures/plugin.filler/fill-line-boundary-origin-span.png
rename to test/fixtures/plugin.filler/line/boundary/origin-span.png
diff --git a/test/fixtures/plugin.filler/fill-line-boundary-origin-spline-above.json b/test/fixtures/plugin.filler/line/boundary/origin-spline-above.json
similarity index 100%
rename from test/fixtures/plugin.filler/fill-line-boundary-origin-spline-above.json
rename to test/fixtures/plugin.filler/line/boundary/origin-spline-above.json
diff --git a/test/fixtures/plugin.filler/fill-line-boundary-origin-spline-above.png b/test/fixtures/plugin.filler/line/boundary/origin-spline-above.png
similarity index 100%
rename from test/fixtures/plugin.filler/fill-line-boundary-origin-spline-above.png
rename to test/fixtures/plugin.filler/line/boundary/origin-spline-above.png
diff --git a/test/fixtures/plugin.filler/fill-line-boundary-origin-spline-span.json b/test/fixtures/plugin.filler/line/boundary/origin-spline-span.json
similarity index 100%
rename from test/fixtures/plugin.filler/fill-line-boundary-origin-spline-span.json
rename to test/fixtures/plugin.filler/line/boundary/origin-spline-span.json
diff --git a/test/fixtures/plugin.filler/fill-line-boundary-origin-spline-span.png b/test/fixtures/plugin.filler/line/boundary/origin-spline-span.png
similarity index 100%
rename from test/fixtures/plugin.filler/fill-line-boundary-origin-spline-span.png
rename to test/fixtures/plugin.filler/line/boundary/origin-spline-span.png
diff --git a/test/fixtures/plugin.filler/fill-line-boundary-origin-spline.json b/test/fixtures/plugin.filler/line/boundary/origin-spline.json
similarity index 100%
rename from test/fixtures/plugin.filler/fill-line-boundary-origin-spline.json
rename to test/fixtures/plugin.filler/line/boundary/origin-spline.json
diff --git a/test/fixtures/plugin.filler/fill-line-boundary-origin-spline.png b/test/fixtures/plugin.filler/line/boundary/origin-spline.png
similarity index 100%
rename from test/fixtures/plugin.filler/fill-line-boundary-origin-spline.png
rename to test/fixtures/plugin.filler/line/boundary/origin-spline.png
diff --git a/test/fixtures/plugin.filler/fill-line-boundary-origin-stepped-span.json b/test/fixtures/plugin.filler/line/boundary/origin-stepped-span.json
similarity index 100%
rename from test/fixtures/plugin.filler/fill-line-boundary-origin-stepped-span.json
rename to test/fixtures/plugin.filler/line/boundary/origin-stepped-span.json
diff --git a/test/fixtures/plugin.filler/fill-line-boundary-origin-stepped-span.png b/test/fixtures/plugin.filler/line/boundary/origin-stepped-span.png
similarity index 100%
rename from test/fixtures/plugin.filler/fill-line-boundary-origin-stepped-span.png
rename to test/fixtures/plugin.filler/line/boundary/origin-stepped-span.png
diff --git a/test/fixtures/plugin.filler/fill-line-boundary-origin-stepped.json b/test/fixtures/plugin.filler/line/boundary/origin-stepped.json
similarity index 100%
rename from test/fixtures/plugin.filler/fill-line-boundary-origin-stepped.json
rename to test/fixtures/plugin.filler/line/boundary/origin-stepped.json
diff --git a/test/fixtures/plugin.filler/fill-line-boundary-origin-stepped.png b/test/fixtures/plugin.filler/line/boundary/origin-stepped.png
similarity index 100%
rename from test/fixtures/plugin.filler/fill-line-boundary-origin-stepped.png
rename to test/fixtures/plugin.filler/line/boundary/origin-stepped.png
diff --git a/test/fixtures/plugin.filler/fill-line-boundary-origin.json b/test/fixtures/plugin.filler/line/boundary/origin.json
similarity index 100%
rename from test/fixtures/plugin.filler/fill-line-boundary-origin.json
rename to test/fixtures/plugin.filler/line/boundary/origin.json
diff --git a/test/fixtures/plugin.filler/fill-line-boundary-origin.png b/test/fixtures/plugin.filler/line/boundary/origin.png
similarity index 100%
rename from test/fixtures/plugin.filler/fill-line-boundary-origin.png
rename to test/fixtures/plugin.filler/line/boundary/origin.png
diff --git a/test/fixtures/plugin.filler/fill-line-boundary-start-span.json b/test/fixtures/plugin.filler/line/boundary/start-span.json
similarity index 100%
rename from test/fixtures/plugin.filler/fill-line-boundary-start-span.json
rename to test/fixtures/plugin.filler/line/boundary/start-span.json
diff --git a/test/fixtures/plugin.filler/fill-line-boundary-start-span.png b/test/fixtures/plugin.filler/line/boundary/start-span.png
similarity index 100%
rename from test/fixtures/plugin.filler/fill-line-boundary-start-span.png
rename to test/fixtures/plugin.filler/line/boundary/start-span.png
diff --git a/test/fixtures/plugin.filler/fill-line-boundary-start.json b/test/fixtures/plugin.filler/line/boundary/start.json
similarity index 100%
rename from test/fixtures/plugin.filler/fill-line-boundary-start.json
rename to test/fixtures/plugin.filler/line/boundary/start.json
diff --git a/test/fixtures/plugin.filler/fill-line-boundary-start.png b/test/fixtures/plugin.filler/line/boundary/start.png
similarity index 100%
rename from test/fixtures/plugin.filler/fill-line-boundary-start.png
rename to test/fixtures/plugin.filler/line/boundary/start.png
diff --git a/test/fixtures/plugin.filler/fill-line-dataset-border.json b/test/fixtures/plugin.filler/line/dataset/border.json
similarity index 100%
rename from test/fixtures/plugin.filler/fill-line-dataset-border.json
rename to test/fixtures/plugin.filler/line/dataset/border.json
diff --git a/test/fixtures/plugin.filler/fill-line-dataset-border.png b/test/fixtures/plugin.filler/line/dataset/border.png
similarity index 100%
rename from test/fixtures/plugin.filler/fill-line-dataset-border.png
rename to test/fixtures/plugin.filler/line/dataset/border.png
diff --git a/test/fixtures/plugin.filler/fill-line-dataset-dual.json b/test/fixtures/plugin.filler/line/dataset/dual.json
similarity index 100%
rename from test/fixtures/plugin.filler/fill-line-dataset-dual.json
rename to test/fixtures/plugin.filler/line/dataset/dual.json
diff --git a/test/fixtures/plugin.filler/fill-line-dataset-dual.png b/test/fixtures/plugin.filler/line/dataset/dual.png
similarity index 100%
rename from test/fixtures/plugin.filler/fill-line-dataset-dual.png
rename to test/fixtures/plugin.filler/line/dataset/dual.png
diff --git a/test/fixtures/plugin.filler/fill-line-dataset-interpolated.js b/test/fixtures/plugin.filler/line/dataset/interpolated.js
similarity index 100%
rename from test/fixtures/plugin.filler/fill-line-dataset-interpolated.js
rename to test/fixtures/plugin.filler/line/dataset/interpolated.js
diff --git a/test/fixtures/plugin.filler/fill-line-dataset-interpolated.png b/test/fixtures/plugin.filler/line/dataset/interpolated.png
similarity index 100%
rename from test/fixtures/plugin.filler/fill-line-dataset-interpolated.png
rename to test/fixtures/plugin.filler/line/dataset/interpolated.png
diff --git a/test/fixtures/plugin.filler/fill-line-dataset.json b/test/fixtures/plugin.filler/line/dataset/no-border.json
similarity index 100%
rename from test/fixtures/plugin.filler/fill-line-dataset.json
rename to test/fixtures/plugin.filler/line/dataset/no-border.json
diff --git a/test/fixtures/plugin.filler/fill-line-dataset.png b/test/fixtures/plugin.filler/line/dataset/no-border.png
similarity index 100%
rename from test/fixtures/plugin.filler/fill-line-dataset.png
rename to test/fixtures/plugin.filler/line/dataset/no-border.png
diff --git a/test/fixtures/plugin.filler/fill-line-dataset-span-dual.json b/test/fixtures/plugin.filler/line/dataset/span-dual.json
similarity index 100%
rename from test/fixtures/plugin.filler/fill-line-dataset-span-dual.json
rename to test/fixtures/plugin.filler/line/dataset/span-dual.json
diff --git a/test/fixtures/plugin.filler/fill-line-dataset-span-dual.png b/test/fixtures/plugin.filler/line/dataset/span-dual.png
similarity index 100%
rename from test/fixtures/plugin.filler/fill-line-dataset-span-dual.png
rename to test/fixtures/plugin.filler/line/dataset/span-dual.png
diff --git a/test/fixtures/plugin.filler/fill-line-dataset-span.json b/test/fixtures/plugin.filler/line/dataset/span.json
similarity index 100%
rename from test/fixtures/plugin.filler/fill-line-dataset-span.json
rename to test/fixtures/plugin.filler/line/dataset/span.json
diff --git a/test/fixtures/plugin.filler/fill-line-dataset-span.png b/test/fixtures/plugin.filler/line/dataset/span.png
similarity index 100%
rename from test/fixtures/plugin.filler/fill-line-dataset-span.png
rename to test/fixtures/plugin.filler/line/dataset/span.png
diff --git a/test/fixtures/plugin.filler/fill-line-dataset-spline-span-above.json b/test/fixtures/plugin.filler/line/dataset/spline-span-above.json
similarity index 100%
rename from test/fixtures/plugin.filler/fill-line-dataset-spline-span-above.json
rename to test/fixtures/plugin.filler/line/dataset/spline-span-above.json
diff --git a/test/fixtures/plugin.filler/fill-line-dataset-spline-span-above.png b/test/fixtures/plugin.filler/line/dataset/spline-span-above.png
similarity index 100%
rename from test/fixtures/plugin.filler/fill-line-dataset-spline-span-above.png
rename to test/fixtures/plugin.filler/line/dataset/spline-span-above.png
diff --git a/test/fixtures/plugin.filler/fill-line-dataset-spline-span-below.json b/test/fixtures/plugin.filler/line/dataset/spline-span-below.json
similarity index 100%
rename from test/fixtures/plugin.filler/fill-line-dataset-spline-span-below.json
rename to test/fixtures/plugin.filler/line/dataset/spline-span-below.json
diff --git a/test/fixtures/plugin.filler/fill-line-dataset-spline-span-below.png b/test/fixtures/plugin.filler/line/dataset/spline-span-below.png
similarity index 100%
rename from test/fixtures/plugin.filler/fill-line-dataset-spline-span-below.png
rename to test/fixtures/plugin.filler/line/dataset/spline-span-below.png
diff --git a/test/fixtures/plugin.filler/fill-line-dataset-spline-span.json b/test/fixtures/plugin.filler/line/dataset/spline-span.json
similarity index 100%
rename from test/fixtures/plugin.filler/fill-line-dataset-spline-span.json
rename to test/fixtures/plugin.filler/line/dataset/spline-span.json
diff --git a/test/fixtures/plugin.filler/fill-line-dataset-spline-span.png b/test/fixtures/plugin.filler/line/dataset/spline-span.png
similarity index 100%
rename from test/fixtures/plugin.filler/fill-line-dataset-spline-span.png
rename to test/fixtures/plugin.filler/line/dataset/spline-span.png
diff --git a/test/fixtures/plugin.filler/fill-line-dataset-spline.json b/test/fixtures/plugin.filler/line/dataset/spline.json
similarity index 100%
rename from test/fixtures/plugin.filler/fill-line-dataset-spline.json
rename to test/fixtures/plugin.filler/line/dataset/spline.json
diff --git a/test/fixtures/plugin.filler/fill-line-dataset-spline.png b/test/fixtures/plugin.filler/line/dataset/spline.png
similarity index 100%
rename from test/fixtures/plugin.filler/fill-line-dataset-spline.png
rename to test/fixtures/plugin.filler/line/dataset/spline.png
diff --git a/test/fixtures/plugin.filler/fill-line-dataset-stepped.json b/test/fixtures/plugin.filler/line/dataset/stepped.json
similarity index 100%
rename from test/fixtures/plugin.filler/fill-line-dataset-stepped.json
rename to test/fixtures/plugin.filler/line/dataset/stepped.json
diff --git a/test/fixtures/plugin.filler/fill-line-dataset-stepped.png b/test/fixtures/plugin.filler/line/dataset/stepped.png
similarity index 100%
rename from test/fixtures/plugin.filler/fill-line-dataset-stepped.png
rename to test/fixtures/plugin.filler/line/dataset/stepped.png
diff --git a/test/fixtures/plugin.filler/points-outside-canvas-initial.js b/test/fixtures/plugin.filler/line/points-outside-canvas-initial.js
similarity index 100%
rename from test/fixtures/plugin.filler/points-outside-canvas-initial.js
rename to test/fixtures/plugin.filler/line/points-outside-canvas-initial.js
diff --git a/test/fixtures/plugin.filler/points-outside-canvas-initial.png b/test/fixtures/plugin.filler/line/points-outside-canvas-initial.png
similarity index 100%
rename from test/fixtures/plugin.filler/points-outside-canvas-initial.png
rename to test/fixtures/plugin.filler/line/points-outside-canvas-initial.png
diff --git a/test/fixtures/plugin.filler/points-outside-canvas-update.js b/test/fixtures/plugin.filler/line/points-outside-canvas-update.js
similarity index 100%
rename from test/fixtures/plugin.filler/points-outside-canvas-update.js
rename to test/fixtures/plugin.filler/line/points-outside-canvas-update.js
diff --git a/test/fixtures/plugin.filler/points-outside-canvas-update.png b/test/fixtures/plugin.filler/line/points-outside-canvas-update.png
similarity index 100%
rename from test/fixtures/plugin.filler/points-outside-canvas-update.png
rename to test/fixtures/plugin.filler/line/points-outside-canvas-update.png
diff --git a/test/fixtures/plugin.filler/fill-line-stack.json b/test/fixtures/plugin.filler/line/stack.json
similarity index 100%
rename from test/fixtures/plugin.filler/fill-line-stack.json
rename to test/fixtures/plugin.filler/line/stack.json
diff --git a/test/fixtures/plugin.filler/fill-line-stack.png b/test/fixtures/plugin.filler/line/stack.png
similarity index 100%
rename from test/fixtures/plugin.filler/fill-line-stack.png
rename to test/fixtures/plugin.filler/line/stack.png
diff --git a/test/fixtures/plugin.filler/fill-line-value.json b/test/fixtures/plugin.filler/line/value.json
similarity index 100%
rename from test/fixtures/plugin.filler/fill-line-value.json
rename to test/fixtures/plugin.filler/line/value.json
diff --git a/test/fixtures/plugin.filler/fill-line-value.png b/test/fixtures/plugin.filler/line/value.png
similarity index 100%
rename from test/fixtures/plugin.filler/fill-line-value.png
rename to test/fixtures/plugin.filler/line/value.png
diff --git a/test/fixtures/plugin.filler/fill-radar-boundary-end-circular.json b/test/fixtures/plugin.filler/radar/boundary/end-circular.json
similarity index 100%
rename from test/fixtures/plugin.filler/fill-radar-boundary-end-circular.json
rename to test/fixtures/plugin.filler/radar/boundary/end-circular.json
diff --git a/test/fixtures/plugin.filler/fill-radar-boundary-end-circular.png b/test/fixtures/plugin.filler/radar/boundary/end-circular.png
similarity index 100%
rename from test/fixtures/plugin.filler/fill-radar-boundary-end-circular.png
rename to test/fixtures/plugin.filler/radar/boundary/end-circular.png
diff --git a/test/fixtures/plugin.filler/fill-radar-boundary-end-span.json b/test/fixtures/plugin.filler/radar/boundary/end-span.json
similarity index 100%
rename from test/fixtures/plugin.filler/fill-radar-boundary-end-span.json
rename to test/fixtures/plugin.filler/radar/boundary/end-span.json
diff --git a/test/fixtures/plugin.filler/fill-radar-boundary-end-span.png b/test/fixtures/plugin.filler/radar/boundary/end-span.png
similarity index 100%
rename from test/fixtures/plugin.filler/fill-radar-boundary-end-span.png
rename to test/fixtures/plugin.filler/radar/boundary/end-span.png
diff --git a/test/fixtures/plugin.filler/fill-radar-boundary-end.json b/test/fixtures/plugin.filler/radar/boundary/end.json
similarity index 100%
rename from test/fixtures/plugin.filler/fill-radar-boundary-end.json
rename to test/fixtures/plugin.filler/radar/boundary/end.json
diff --git a/test/fixtures/plugin.filler/fill-radar-boundary-end.png b/test/fixtures/plugin.filler/radar/boundary/end.png
similarity index 100%
rename from test/fixtures/plugin.filler/fill-radar-boundary-end.png
rename to test/fixtures/plugin.filler/radar/boundary/end.png
diff --git a/test/fixtures/plugin.filler/fill-radar-boundary-origin-circular.json b/test/fixtures/plugin.filler/radar/boundary/origin-circular.json
similarity index 100%
rename from test/fixtures/plugin.filler/fill-radar-boundary-origin-circular.json
rename to test/fixtures/plugin.filler/radar/boundary/origin-circular.json
diff --git a/test/fixtures/plugin.filler/fill-radar-boundary-origin-circular.png b/test/fixtures/plugin.filler/radar/boundary/origin-circular.png
similarity index 100%
rename from test/fixtures/plugin.filler/fill-radar-boundary-origin-circular.png
rename to test/fixtures/plugin.filler/radar/boundary/origin-circular.png
diff --git a/test/fixtures/plugin.filler/fill-radar-boundary-origin-span.json b/test/fixtures/plugin.filler/radar/boundary/origin-span.json
similarity index 100%
rename from test/fixtures/plugin.filler/fill-radar-boundary-origin-span.json
rename to test/fixtures/plugin.filler/radar/boundary/origin-span.json
diff --git a/test/fixtures/plugin.filler/fill-radar-boundary-origin-span.png b/test/fixtures/plugin.filler/radar/boundary/origin-span.png
similarity index 100%
rename from test/fixtures/plugin.filler/fill-radar-boundary-origin-span.png
rename to test/fixtures/plugin.filler/radar/boundary/origin-span.png
diff --git a/test/fixtures/plugin.filler/fill-radar-boundary-origin-spline-span.json b/test/fixtures/plugin.filler/radar/boundary/origin-spline-span.json
similarity index 100%
rename from test/fixtures/plugin.filler/fill-radar-boundary-origin-spline-span.json
rename to test/fixtures/plugin.filler/radar/boundary/origin-spline-span.json
diff --git a/test/fixtures/plugin.filler/fill-radar-boundary-origin-spline-span.png b/test/fixtures/plugin.filler/radar/boundary/origin-spline-span.png
similarity index 100%
rename from test/fixtures/plugin.filler/fill-radar-boundary-origin-spline-span.png
rename to test/fixtures/plugin.filler/radar/boundary/origin-spline-span.png
diff --git a/test/fixtures/plugin.filler/fill-radar-boundary-origin-spline.json b/test/fixtures/plugin.filler/radar/boundary/origin-spline.json
similarity index 100%
rename from test/fixtures/plugin.filler/fill-radar-boundary-origin-spline.json
rename to test/fixtures/plugin.filler/radar/boundary/origin-spline.json
diff --git a/test/fixtures/plugin.filler/fill-radar-boundary-origin-spline.png b/test/fixtures/plugin.filler/radar/boundary/origin-spline.png
similarity index 100%
rename from test/fixtures/plugin.filler/fill-radar-boundary-origin-spline.png
rename to test/fixtures/plugin.filler/radar/boundary/origin-spline.png
diff --git a/test/fixtures/plugin.filler/fill-radar-boundary-origin.json b/test/fixtures/plugin.filler/radar/boundary/origin.json
similarity index 100%
rename from test/fixtures/plugin.filler/fill-radar-boundary-origin.json
rename to test/fixtures/plugin.filler/radar/boundary/origin.json
diff --git a/test/fixtures/plugin.filler/fill-radar-boundary-origin.png b/test/fixtures/plugin.filler/radar/boundary/origin.png
similarity index 100%
rename from test/fixtures/plugin.filler/fill-radar-boundary-origin.png
rename to test/fixtures/plugin.filler/radar/boundary/origin.png
diff --git a/test/fixtures/plugin.filler/fill-radar-boundary-start-circular.json b/test/fixtures/plugin.filler/radar/boundary/start-circular.json
similarity index 100%
rename from test/fixtures/plugin.filler/fill-radar-boundary-start-circular.json
rename to test/fixtures/plugin.filler/radar/boundary/start-circular.json
diff --git a/test/fixtures/plugin.filler/fill-radar-boundary-start-circular.png b/test/fixtures/plugin.filler/radar/boundary/start-circular.png
similarity index 100%
rename from test/fixtures/plugin.filler/fill-radar-boundary-start-circular.png
rename to test/fixtures/plugin.filler/radar/boundary/start-circular.png
diff --git a/test/fixtures/plugin.filler/fill-radar-boundary-start-span.json b/test/fixtures/plugin.filler/radar/boundary/start-span.json
similarity index 100%
rename from test/fixtures/plugin.filler/fill-radar-boundary-start-span.json
rename to test/fixtures/plugin.filler/radar/boundary/start-span.json
diff --git a/test/fixtures/plugin.filler/fill-radar-boundary-start-span.png b/test/fixtures/plugin.filler/radar/boundary/start-span.png
similarity index 100%
rename from test/fixtures/plugin.filler/fill-radar-boundary-start-span.png
rename to test/fixtures/plugin.filler/radar/boundary/start-span.png
diff --git a/test/fixtures/plugin.filler/fill-radar-boundary-start.json b/test/fixtures/plugin.filler/radar/boundary/start.json
similarity index 100%
rename from test/fixtures/plugin.filler/fill-radar-boundary-start.json
rename to test/fixtures/plugin.filler/radar/boundary/start.json
diff --git a/test/fixtures/plugin.filler/fill-radar-boundary-start.png b/test/fixtures/plugin.filler/radar/boundary/start.png
similarity index 100%
rename from test/fixtures/plugin.filler/fill-radar-boundary-start.png
rename to test/fixtures/plugin.filler/radar/boundary/start.png
diff --git a/test/fixtures/plugin.filler/fill-radar-dataset-border.json b/test/fixtures/plugin.filler/radar/dataset/border.json
similarity index 100%
rename from test/fixtures/plugin.filler/fill-radar-dataset-border.json
rename to test/fixtures/plugin.filler/radar/dataset/border.json
diff --git a/test/fixtures/plugin.filler/fill-radar-dataset-border.png b/test/fixtures/plugin.filler/radar/dataset/border.png
similarity index 100%
rename from test/fixtures/plugin.filler/fill-radar-dataset-border.png
rename to test/fixtures/plugin.filler/radar/dataset/border.png
diff --git a/test/fixtures/plugin.filler/fill-radar-dataset.json b/test/fixtures/plugin.filler/radar/dataset/default.json
similarity index 100%
rename from test/fixtures/plugin.filler/fill-radar-dataset.json
rename to test/fixtures/plugin.filler/radar/dataset/default.json
diff --git a/test/fixtures/plugin.filler/fill-radar-dataset.png b/test/fixtures/plugin.filler/radar/dataset/default.png
similarity index 100%
rename from test/fixtures/plugin.filler/fill-radar-dataset.png
rename to test/fixtures/plugin.filler/radar/dataset/default.png
diff --git a/test/fixtures/plugin.filler/fill-radar-dataset-order.js b/test/fixtures/plugin.filler/radar/dataset/order.js
similarity index 100%
rename from test/fixtures/plugin.filler/fill-radar-dataset-order.js
rename to test/fixtures/plugin.filler/radar/dataset/order.js
diff --git a/test/fixtures/plugin.filler/fill-radar-dataset-order.png b/test/fixtures/plugin.filler/radar/dataset/order.png
similarity index 100%
rename from test/fixtures/plugin.filler/fill-radar-dataset-order.png
rename to test/fixtures/plugin.filler/radar/dataset/order.png
diff --git a/test/fixtures/plugin.filler/fill-radar-dataset-span.json b/test/fixtures/plugin.filler/radar/dataset/span.json
similarity index 100%
rename from test/fixtures/plugin.filler/fill-radar-dataset-span.json
rename to test/fixtures/plugin.filler/radar/dataset/span.json
diff --git a/test/fixtures/plugin.filler/fill-radar-dataset-span.png b/test/fixtures/plugin.filler/radar/dataset/span.png
similarity index 100%
rename from test/fixtures/plugin.filler/fill-radar-dataset-span.png
rename to test/fixtures/plugin.filler/radar/dataset/span.png
diff --git a/test/fixtures/plugin.filler/fill-radar-dataset-spline.json b/test/fixtures/plugin.filler/radar/dataset/spline.json
similarity index 100%
rename from test/fixtures/plugin.filler/fill-radar-dataset-spline.json
rename to test/fixtures/plugin.filler/radar/dataset/spline.json
diff --git a/test/fixtures/plugin.filler/fill-radar-dataset-spline.png b/test/fixtures/plugin.filler/radar/dataset/spline.png
similarity index 100%
rename from test/fixtures/plugin.filler/fill-radar-dataset-spline.png
rename to test/fixtures/plugin.filler/radar/dataset/spline.png
diff --git a/test/fixtures/plugin.filler/fill-radar-value.json b/test/fixtures/plugin.filler/radar/value.json
similarity index 100%
rename from test/fixtures/plugin.filler/fill-radar-value.json
rename to test/fixtures/plugin.filler/radar/value.json
diff --git a/test/fixtures/plugin.filler/fill-radar-value.png b/test/fixtures/plugin.filler/radar/value.png
similarity index 100%
rename from test/fixtures/plugin.filler/fill-radar-value.png
rename to test/fixtures/plugin.filler/radar/value.png
diff --git a/types/index.esm.d.ts b/types/index.esm.d.ts
index f2a911829..d6f0d3009 100644
--- a/types/index.esm.d.ts
+++ b/types/index.esm.d.ts
@@ -1956,6 +1956,7 @@ export type DecimationOptions = LttbDecimationOptions | MinMaxDecimationOptions;
 
 export const Filler: Plugin;
 export interface FillerOptions {
+  drawTime: 'beforeDatasetDraw' | 'beforeDatasetsDraw';
   propagate: boolean;
 }