Skip to content

Commit

Permalink
refactor: remove CSSParsing support
Browse files Browse the repository at this point in the history
  • Loading branch information
Aarebecca committed Oct 16, 2024
1 parent 62d7c8a commit ace84b5
Show file tree
Hide file tree
Showing 42 changed files with 255 additions and 829 deletions.
2 changes: 0 additions & 2 deletions __tests__/demos/perf/rect.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
import { Rect, Group, runtime } from '@antv/g';

Check notice

Code scanning / CodeQL

Unused variable, import, function or class Note test

Unused import runtime.
import type { Canvas } from '@antv/g';

runtime.enableCSSParsing = false;

export async function rects(context: { canvas: Canvas }) {
const { canvas } = context;

Expand Down
2 changes: 0 additions & 2 deletions __tests__/demos/plugin/yoga-text.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@ import { runtime, Circle, Group, Rect, Text } from '@antv/g';
import { Plugin as PluginYoga } from '@antv/g-plugin-yoga';

export async function yogaText(context) {
runtime.enableCSSParsing = true;

const { canvas, gui } = context;
await canvas.ready;

Expand Down
30 changes: 22 additions & 8 deletions __tests__/main.ts
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,11 @@ selectChart.style.margin = '1em';
renderOptions();
selectChart.onchange = () => {
const { value } = selectChart;
history.pushState({ value }, '', `?name=${value}&renderer=${selectRenderer.value}`);
history.pushState(
{ value },
'',
`?name=${value}&renderer=${selectRenderer.value}`,
);
plot();
};
document.onkeydown = (event) => {
Expand Down Expand Up @@ -96,7 +100,11 @@ selectRenderer.style.margin = '1em';
selectRenderer.append(...Object.keys(renderers).map(createOption));
selectRenderer.onchange = () => {
const { value } = selectRenderer;
history.pushState({ value }, '', `?name=${selectChart.value}&renderer=${value}`);
history.pushState(
{ value },
'',
`?name=${selectChart.value}&renderer=${value}`,
);
plot();
};

Expand All @@ -123,7 +131,9 @@ addEventListener('popstate', (event) => {
// @ts-ignore
const initialValue = new URL(location).searchParams.get('name') as string;
// @ts-ignore
const initialRenderer = new URL(location).searchParams.get('renderer') as string;
const initialRenderer = new URL(location).searchParams.get(
'renderer',
) as string;
if (tests[initialValue]) selectChart.value = initialValue;
if (renderers[initialRenderer]) selectRenderer.value = initialRenderer;
app.append(selectChart);
Expand Down Expand Up @@ -155,7 +165,9 @@ function createOption(key) {
}

function namespace(object, name) {
return Object.fromEntries(Object.entries(object).map(([key, value]) => [`${name}-${key}`, value]));
return Object.fromEntries(
Object.entries(object).map(([key, value]) => [`${name}-${key}`, value]),
);
}

function createSpecRender(object) {
Expand All @@ -164,8 +176,6 @@ function createSpecRender(object) {
// Select render is necessary for spec tests.
selectRenderer.style.display = 'inline';

runtime.enableCSSParsing = false;

const renderer = new renderers[selectRenderer.value]({
// Used for WebGL renderer
wasmDir: '/',
Expand All @@ -190,7 +200,9 @@ function createSpecRender(object) {
generate.initRenderer(renderer, selectRenderer.value);
}

renderer.registerPlugin(new DragAndDropPlugin({ dragstartDistanceThreshold: 1 }));
renderer.registerPlugin(
new DragAndDropPlugin({ dragstartDistanceThreshold: 1 }),
);

const $div = document.createElement('div');
canvas = new Canvas({
Expand Down Expand Up @@ -237,5 +249,7 @@ function createSpecRender(object) {
container.append($div);
};
};
return Object.fromEntries(Object.entries(object).map(([key, value]) => [key, specRender(value)]));
return Object.fromEntries(
Object.entries(object).map(([key, value]) => [key, specRender(value)]),
);
}
2 changes: 0 additions & 2 deletions demo/2d-shape.html
Original file line number Diff line number Diff line change
Expand Up @@ -66,8 +66,6 @@
const SVGRenderer = window.G.SVG.Renderer;
// const WebGLRenderer = window.G.WebGL.Renderer;

runtime.enableCSSParsing = false;

// create a renderer
const canvasRenderer = new window.G.Canvas2D.Renderer();
canvasRenderer.registerPlugin(new window.G.CSSSelect.Plugin());
Expand Down
3 changes: 0 additions & 3 deletions demo/issue-svg.html
Original file line number Diff line number Diff line change
Expand Up @@ -47,9 +47,6 @@
<script>
const { Line, Group, Canvas, runtime } = window.G;

// disable CSS Parsing
runtime.enableCSSParsing = false;

// create a renderer
const canvasRenderer = new window.G.SVG.Renderer();

Expand Down
3 changes: 0 additions & 3 deletions demo/perf-animation.html
Original file line number Diff line number Diff line change
Expand Up @@ -66,9 +66,6 @@
} = window.G;
const { Arrow } = window.G.Components;

// disable CSS Parsing
runtime.enableCSSParsing = false;

// create a renderer
const canvasRenderer = new window.G.Canvas2D.Renderer();
// const svgRenderer = new window.G.SVG.Renderer();
Expand Down
3 changes: 0 additions & 3 deletions demo/perf-camera.html
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,6 @@
<script>
const { Circle, Canvas, runtime } = window.G;

// disable CSS Parsing
runtime.enableCSSParsing = false;

// create a renderer
const canvasRenderer = new window.G.Canvas2D.Renderer();

Expand Down
2 changes: 0 additions & 2 deletions demo/perf-circles.html
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,6 @@
const { Circle, Canvas, runtime } = window.G;

const timeStart = performance.now();
// disable CSS Parsing
runtime.enableCSSParsing = false;

// create a renderer
const canvasRenderer = new window.G.Canvas2D.Renderer();
Expand Down
3 changes: 0 additions & 3 deletions demo/perf-clippath.html
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,6 @@
<script>
const { Circle, Group, Canvas, runtime } = window.G;

// disable CSS Parsing
runtime.enableCSSParsing = false;

// create a renderer
const canvasRenderer = new window.G.Canvas2D.Renderer();

Expand Down
3 changes: 0 additions & 3 deletions demo/perf-ellipses.html
Original file line number Diff line number Diff line change
Expand Up @@ -47,9 +47,6 @@
<script>
const { Ellipse, Canvas, runtime } = window.G;

// disable CSS Parsing
runtime.enableCSSParsing = false;

// create a renderer
const canvasRenderer = new window.G.Canvas2D.Renderer();

Expand Down
3 changes: 0 additions & 3 deletions demo/perf-groups.html
Original file line number Diff line number Diff line change
Expand Up @@ -51,9 +51,6 @@
<script>
const { Group, Line, Canvas, runtime } = window.G;

// disable CSS Parsing
runtime.enableCSSParsing = false;

// create a renderer
const canvasRenderer = new window.G.Canvas2D.Renderer();
// const svgRenderer = new window.G.SVG.Renderer();
Expand Down
3 changes: 0 additions & 3 deletions demo/perf-html.html
Original file line number Diff line number Diff line change
Expand Up @@ -51,9 +51,6 @@
<script>
const { HTML, Canvas, runtime } = window.G;

// disable CSS Parsing
runtime.enableCSSParsing = false;

// create a renderer
const canvasRenderer = new window.G.Canvas2D.Renderer();
// const svgRenderer = new window.G.SVG.Renderer();
Expand Down
3 changes: 0 additions & 3 deletions demo/perf-lines.html
Original file line number Diff line number Diff line change
Expand Up @@ -47,9 +47,6 @@
<script>
const { Line, Canvas, runtime } = window.G;

// disable CSS Parsing
runtime.enableCSSParsing = false;

// create a renderer
const canvasRenderer = new window.G.Canvas2D.Renderer();

Expand Down
3 changes: 0 additions & 3 deletions demo/perf-nodes-edges.html
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,6 @@
const NODE_NUM = 200000;
const EDGE_NUM = 200000;

// disable CSS Parsing
runtime.enableCSSParsing = false;

// create a renderer
const webglRenderer = new window.G.WebGL.Renderer();
webglRenderer.registerPlugin(
Expand Down
3 changes: 0 additions & 3 deletions demo/perf-paths.html
Original file line number Diff line number Diff line change
Expand Up @@ -47,9 +47,6 @@
<script>
const { Path, Canvas, runtime } = window.G;

// disable CSS Parsing
runtime.enableCSSParsing = false;

// create a renderer
const canvasRenderer = new window.G.Canvas2D.Renderer();

Expand Down
3 changes: 0 additions & 3 deletions demo/perf-polylines.html
Original file line number Diff line number Diff line change
Expand Up @@ -47,9 +47,6 @@
<script>
const { Polyline, Canvas, runtime } = window.G;

// disable CSS Parsing
runtime.enableCSSParsing = false;

// create a renderer
const canvasRenderer = new window.G.Canvas2D.Renderer();

Expand Down
3 changes: 0 additions & 3 deletions demo/perf-rects.html
Original file line number Diff line number Diff line change
Expand Up @@ -47,9 +47,6 @@
<script>
const { Rect, Canvas, runtime } = window.G;

// disable CSS Parsing
runtime.enableCSSParsing = false;

// create a renderer
const canvasRenderer = new window.G.Canvas2D.Renderer();

Expand Down
3 changes: 0 additions & 3 deletions demo/perf-texts.html
Original file line number Diff line number Diff line change
Expand Up @@ -47,9 +47,6 @@
<script>
const { Text, Canvas, runtime } = window.G;

// disable CSS Parsing
runtime.enableCSSParsing = false;

// create a renderer
const canvasRenderer = new window.G.Canvas2D.Renderer();
// const svgRenderer = new window.G.SVG.Renderer();
Expand Down
3 changes: 0 additions & 3 deletions demo/perf-zindex.html
Original file line number Diff line number Diff line change
Expand Up @@ -47,9 +47,6 @@
<script>
const { Circle, Canvas, runtime } = window.G;

// disable CSS Parsing
runtime.enableCSSParsing = false;

// create a renderer
const canvasRenderer = new window.G.Canvas2D.Renderer();

Expand Down
Loading

0 comments on commit ace84b5

Please sign in to comment.