Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Make samples more inline with eachother #8780

Merged
merged 2 commits into from Apr 2, 2021
Merged

Make samples more inline with eachother #8780

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
eceb495
Change tabs from area samples to buttons to switch to be in line with…
LeeLenaleee Apr 2, 2021
f21cf1a
Merge branch 'master' of https://github.com/chartjs/Chart.js
LeeLenaleee Apr 2, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 0 additions & 1 deletion docs/samples/advanced/progress-bar.md
View file
Open in desktop
Expand Up @@ -23,7 +23,6 @@ const actions = [
label: 'Dataset ' + (data.datasets.length + 1),
backgroundColor: Utils.transparentize(dsColor, 0.5),
borderColor: dsColor,
borderWidth: 1,
data: Utils.numbers({count: data.labels.length, min: -100, max: 100}),
};
chart.data.datasets.push(newDataset);
Expand Down
1 change: 0 additions & 1 deletion docs/samples/animations/drop.md
View file
Open in desktop
Expand Up @@ -21,7 +21,6 @@ const actions = [
label: 'Dataset ' + (data.datasets.length + 1),
backgroundColor: Utils.transparentize(dsColor, 0.5),
borderColor: dsColor,
borderWidth: 1,
data: Utils.numbers({count: data.labels.length, min: -100, max: 100}),
};
chart.data.datasets.push(newDataset);
Expand Down
1 change: 0 additions & 1 deletion docs/samples/animations/loop.md
View file
Open in desktop
Expand Up @@ -21,7 +21,6 @@ const actions = [
label: 'Dataset ' + (data.datasets.length + 1),
backgroundColor: Utils.transparentize(dsColor, 0.5),
borderColor: dsColor,
borderWidth: 1,
data: Utils.numbers({count: data.labels.length, min: -100, max: 100}),
};
chart.data.datasets.push(newDataset);
Expand Down
259 changes: 19 additions & 240 deletions docs/samples/area/line-boundaries.md
View file
Open in desktop
@@ -1,9 +1,5 @@
# Line Chart Boundaries

:::: tabs

::: tab "Fill: false"

```js chart-editor
// <block:setup:2>
const inputs = {
Expand Down Expand Up @@ -41,261 +37,44 @@ let smooth = false;

const actions = [
{
name: 'Randomize',
handler(chart) {
// Utils.srand(Utils.rand())
name: 'Fill: false (default)',
handler: (chart) => {
chart.data.datasets.forEach(dataset => {
dataset.data = generateData();
dataset.fill = false;
});
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,
}
},
interaction: {
intersect: false,
}
},
};
// </block:config>

module.exports = {
actions: actions,
config: config,
};
```

:::

::: tab "Fill: origin"

```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});
};

const generateData = () => (Utils.numbers(inputs));
// </block:setup>

// <block:data:0>
const data = {
labels: generateLabels(),
datasets: [
{
label: 'Dataset',
data: generateData(),
borderColor: Utils.CHART_COLORS.red,
backgroundColor: Utils.transparentize(Utils.CHART_COLORS.red),
fill: 'origin'
}
]
};
// </block:data>

// <block:actions:3>
let smooth = false;

const actions = [
{
name: 'Randomize',
handler(chart) {
// Utils.srand(Utils.rand())
name: 'Fill: origin',
handler: (chart) => {
chart.data.datasets.forEach(dataset => {
dataset.data = generateData();
dataset.fill = 'origin';
});
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,
}
},
interaction: {
intersect: false
},
},
};
// </block:config>

module.exports = {
actions: actions,
config: config,
};
```

:::

::: tab "Fill: start"

```js chart-editor
// <block:setup:1>
const inputs = {
min: -100,
max: 100,
count: 8,
decimals: 2,
continuity: 1
};

const generateLabels = () => {
return Utils.months({count: inputs.count});
};

const generateData = () => (Utils.numbers(inputs));
// </block:setup>

// <block:data:0>
const data = {
labels: generateLabels(),
datasets: [
{
label: 'Dataset',
data: generateData(),
borderColor: Utils.CHART_COLORS.red,
backgroundColor: Utils.transparentize(Utils.CHART_COLORS.red),
fill: 'start'
}
]
};
// </block:data>

// <block:actions:2>
let smooth = false;

const actions = [
{
name: 'Randomize',
handler(chart) {
// Utils.srand(Utils.rand())
name: 'Fill: start',
handler: (chart) => {
chart.data.datasets.forEach(dataset => {
dataset.data = generateData();
dataset.fill = 'start';
});
chart.update();
}
},
{
name: 'Smooth',
handler(chart) {
smooth = !smooth;
chart.options.elements.line.tension = smooth ? 0.4 : 0;
name: 'Fill: end',
handler: (chart) => {
chart.data.datasets.forEach(dataset => {
dataset.fill = 'end';
});
chart.update();
}
}
];
// </block:actions>

// <block:config:0>
const config = {
type: 'line',
data: data,
options: {
plugins: {
filler: {
propagate: false,
}
},
interaction: {
intersect: false,
},
},
};
// </block:config>

module.exports = {
actions: actions,
config: config,
};
```

:::

::: tab "Fill: end"

```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});
};

const generateData = () => (Utils.numbers(inputs));
// </block:setup>

// <block:data:0>
const data = {
labels: generateLabels(),
datasets: [
{
label: 'Dataset',
data: generateData(),
borderColor: Utils.CHART_COLORS.red,
backgroundColor: Utils.transparentize(Utils.CHART_COLORS.red),
fill: 'end'
}
]
};
// </block:data>

// <block:actions:3>
let smooth = false;

const actions = [
{
name: 'Randomize',
handler(chart) {
// Utils.srand(Utils.rand())
chart.data.datasets.forEach(dataset => {
dataset.data = generateData();
});
Expand All @@ -321,11 +100,15 @@ const config = {
plugins: {
filler: {
propagate: false,
},
title: {
display: true,
text: (ctx) => 'Fill: ' + ctx.chart.data.datasets[0].fill
}
},
interaction: {
intersect: false,
},
}
},
};
// </block:config>
Expand All @@ -335,7 +118,3 @@ module.exports = {
config: config,
};
```

:::

::::