Skip to content

Commit 42783ec

Browse files
texodustexodus
authored
Merge pull request #3166 from perspective-dev/perspective-charts
Rename `@perspective-dev/viewer-charts`, add missing chart types
2 parents 9d8766e + 8200c03 commit 42783ec

342 files changed

Lines changed: 15405 additions & 18965 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/build.yaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ jobs:
152152
- name: WebAssembly Build
153153
run: pnpm run build --ci
154154
env:
155-
PACKAGE: "server,client,viewer,viewer-datagrid,viewer-d3fc,viewer-openlayers,workspace,react"
155+
PACKAGE: "server,client,viewer,viewer-datagrid,viewer-charts,viewer-openlayers,workspace,react"
156156
# PSP_USE_CCACHE: 1
157157

158158
- uses: actions/upload-artifact@v4
@@ -164,7 +164,7 @@ jobs:
164164
rust/perspective-server/dist
165165
rust/perspective-viewer/dist
166166
rust/perspective-viewer/src
167-
packages/viewer-d3fc/dist
167+
packages/viewer-charts/dist
168168
packages/viewer-datagrid/dist
169169
packages/viewer-openlayers/dist
170170
packages/workspace/dist
@@ -648,7 +648,7 @@ jobs:
648648
- name: Run Tests
649649
run: pnpm run test
650650
env:
651-
PACKAGE: "server,client,viewer,viewer-datagrid,viewer-d3fc,viewer-openlayers,workspace,react"
651+
PACKAGE: "server,client,viewer,viewer-datagrid,viewer-charts,viewer-openlayers,workspace,react"
652652
# PSP_USE_CCACHE: 1
653653

654654
# ,--,--' . .-,--. . .
@@ -1012,7 +1012,7 @@ jobs:
10121012
working-directory: ./packages/viewer-datagrid
10131013

10141014
- run: pnpm pack --pack-destination=../..
1015-
working-directory: ./packages/viewer-d3fc
1015+
working-directory: ./packages/viewer-charts
10161016

10171017
- run: pnpm pack --pack-destination=../..
10181018
working-directory: ./packages/viewer-openlayers

‎docs/md/how_to/javascript/importing.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ imported from a `<script type="module">`:
148148
<script type="module">
149149
import "https://cdn.jsdelivr.net/npm/@perspective-dev/viewer/dist/cdn/perspective-viewer.js";
150150
import "https://cdn.jsdelivr.net/npm/@perspective-dev/viewer-datagrid/dist/cdn/perspective-viewer-datagrid.js";
151-
import "https://cdn.jsdelivr.net/npm/@perspective-dev/viewer-d3fc/dist/cdn/perspective-viewer-d3fc.js";
151+
import "https://cdn.jsdelivr.net/npm/@perspective-dev/viewer-charts/dist/cdn/perspective-viewer-charts.js";
152152
import perspective from "https://cdn.jsdelivr.net/npm/@perspective-dev/client/dist/cdn/perspective.js";
153153
154154
// .. Do stuff here ..

‎docs/md/how_to/javascript/installation.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ and must be imported individually.
2020
- `@perspective-dev/viewer-datagrid`
2121
A custom high-performance data-grid component based on HTML `<table>`.
2222

23-
- `@perspective-dev/viewer-d3fc`
23+
- `@perspective-dev/viewer-charts`
2424
A `<perspective-viewer>` plugin for the [d3fc](https://d3fc.io) charting
2525
library.
2626

@@ -44,7 +44,7 @@ installed separately. All Plugins are optional - but a `<perspective-viewer>`
4444
without Plugins would be rather boring!
4545

4646
```bash
47-
$ npm add @perspective-dev/viewer-d3fc @perspective-dev/viewer-datagrid @perspective-dev/viewer-openlayers
47+
$ npm add @perspective-dev/viewer-charts @perspective-dev/viewer-datagrid @perspective-dev/viewer-openlayers
4848
```
4949

5050
## Node.js

‎docs/md/how_to/javascript/plugin_settings.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ static variants if you know the element name (you can e.g. look this up in your
2525
browser's DOM inspector):
2626

2727
```javascript
28-
const plugin = customElements.get("perspective-viewer-d3fc-treemap");
28+
const plugin = customElements.get("perspective-viewer-charts-treemap");
2929
plugin.max_cells = 1_000_000;
3030
plugin.max_columns = 1000;
3131
```

‎docs/md/perspective.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
import "https://cdn.jsdelivr.net/npm/@perspective-dev/viewer/dist/cdn/perspective-viewer.js";
1414
import "https://cdn.jsdelivr.net/npm/@perspective-dev/viewer-datagrid/dist/cdn/perspective-viewer-datagrid.js";
15-
import "https://cdn.jsdelivr.net/npm/@perspective-dev/viewer-d3fc/dist/cdn/perspective-viewer-d3fc.js";
15+
import "https://cdn.jsdelivr.net/npm/@perspective-dev/viewer-charts/dist/cdn/perspective-viewer-charts.js";
1616
import perspective from "https://cdn.jsdelivr.net/npm/@perspective-dev/client/dist/cdn/perspective.js";
1717

1818
const WASM_URL =

‎docs/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"mdbook": "docker compose run --rm mdbook build"
1212
},
1313
"dependencies": {
14-
"@perspective-dev/viewer-d3fc": "workspace:",
14+
"@perspective-dev/viewer-charts": "workspace:",
1515
"@perspective-dev/viewer-datagrid": "workspace:",
1616
"@perspective-dev/viewer": "workspace:",
1717
"@perspective-dev/client": "workspace:",

‎docs/src/components/demo.ts‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ export async function initDemo(container: HTMLElement) {
6161
import("../data/worker.js"),
6262
import("@perspective-dev/viewer"),
6363
import("@perspective-dev/viewer-datagrid"),
64-
import("@perspective-dev/viewer-d3fc"),
64+
import("@perspective-dev/viewer-charts"),
6565
]);
6666

6767
const wrapper = document.createElement("div");
@@ -105,14 +105,15 @@ export async function initDemo(container: HTMLElement) {
105105
const slider = document.createElement("input");
106106
slider.type = "range";
107107
slider.className = "demo__freq-slider";
108-
slider.setAttribute("aria-label", "Demo update rate in messages per second");
108+
slider.setAttribute(
109+
"aria-label",
110+
"Demo update rate in messages per second",
111+
);
109112
slider.value = String(Math.round((FREQ - 190) * (5 / -9)));
110113
slider.addEventListener("input", () => {
111114
FREQ = (-9 / 5) * Number(slider.value) + 190;
112115
freqLabel.textContent =
113-
FREQ >= 189
114-
? "paused"
115-
: `${((1000 / FREQ) * 10).toFixed(0)} msg/s`;
116+
FREQ >= 189 ? "paused" : `${((1000 / FREQ) * 10).toFixed(0)} msg/s`;
116117
});
117118
timeControls.appendChild(slider);
118119

‎docs/template.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<script type="module">
2424
import "/node_modules/@perspective-dev/viewer/dist/cdn/perspective-viewer.js";
2525
import "/node_modules/@perspective-dev/viewer-datagrid/dist/cdn/perspective-viewer-datagrid.js";
26-
import "/node_modules/@perspective-dev/viewer-d3fc/dist/cdn/perspective-viewer-d3fc.js";
26+
import "/node_modules/@perspective-dev/viewer-charts/dist/cdn/perspective-viewer-charts.js";
2727
import perspective from "/node_modules/@perspective-dev/client/dist/cdn/perspective.js";
2828
const WORKER = await perspective.worker();
2929

‎docs/test/js/examples.spec.mts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ test.describe("Examples", () => {
7373
const plugin = new_config.plugin
7474
.replace(/[-\/\s]/gi, "")
7575
.toLowerCase();
76-
selector = `perspective-viewer-d3fc-${plugin}`;
76+
selector = `perspective-viewer-charts-${plugin}`;
7777
}
7878

7979
await compareSVGContentsToSnapshot(page, selector, [
@@ -95,7 +95,7 @@ test("test svgs", async ({ page }) => {
9595
const viewer = new PageView(page);
9696
await viewer.restore({ plugin: "X/Y Scatter" });
9797
const contents = await getSvgContentString(
98-
"perspective-viewer-d3fc-xyscatter",
98+
"perspective-viewer-charts-xyscatter",
9999
)(page);
100100
console.log(contents);
101101
});

‎examples/blocks/index.mjs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ const replacements = {
2727
"@perspective-dev/client/dist/cdn/perspective.js": `@perspective-dev/client@${version}/dist/cdn/perspective.js`,
2828
"@perspective-dev/viewer/dist/cdn/perspective-viewer.js": `@perspective-dev/viewer@${version}/dist/cdn/perspective-viewer.js`,
2929
"@perspective-dev/viewer-datagrid/dist/cdn/perspective-viewer-datagrid.js": `@perspective-dev/viewer-datagrid@${version}/dist/cdn/perspective-viewer-datagrid.js`,
30-
"@perspective-dev/viewer-d3fc/dist/cdn/perspective-viewer-d3fc.js": `@perspective-dev/viewer-d3fc@${version}/dist/cdn/perspective-viewer-d3fc.js`,
30+
"@perspective-dev/viewer-charts/dist/cdn/perspective-viewer-charts.js": `@perspective-dev/viewer-charts@${version}/dist/cdn/perspective-viewer-charts.js`,
3131
"@perspective-dev/workspace/dist/cdn/perspective-workspace.js": `@perspective-dev/workspace@${version}/dist/cdn/perspective-workspace.js`,
3232
"@perspective-dev/server/dist/cdn/perspective.cpp.wasm": `@perspective-dev/client@${version}/dist/cdn/perspective.cpp.wasm`,
3333
"@perspective-dev/viewer/dist/cdn/perspective.rx.wasm": `@perspective-dev/viewer@${version}/dist/cdn/perspective.rx.wasm`,

0 commit comments

Comments
 (0)