const OrderFeed = ({workerRef, symbol, settings}: OrderFeedProps) => { const cupParams =…
- User
const OrderFeed = ({workerRef, symbol, settings}: OrderFeedProps) => {
const cupParams = useSelector((state: AppState) => state.cupSlice); const [dpiScale, setDpiScale] = useState(Math.ceil(window.devicePixelRatio)); const [canvasSize, setCanvasSize] = useState({height: 0, width: 0}); const containerRef = useRef<HTMLDivElement|null>(null); const canvasRef = useRef<HTMLCanvasElement|null>(null); const theme = useTheme(); const draw = (trades: TradeItem[], camera: number) => { if (null === canvasRef || !Array.isArray(trades)) return;
const context = canvasRef.current?.getContext(“2d”);
if (context) { orderFeedDrawer.clear(context, canvasSize); orderFeedDrawer.drawLine( context, canvasSize, trades, camera, cupParams.aggregatedPriceStep, cupParams.cellHeight, cupParams.quantityDivider, !settings.minQuantity ? 0 : parseFloat(settings.minQuantity), dpiScale, theme, ); } };
useEffect(() => { if (!workerRef.current) return; draw(event.data.trades, event.data.camera) }, [workerRef.current, canvasRef.current, canvasSize, symbol ]);
return <Box ref={containerRef} className={${styles.canvasWrapper} scroll-block}> ; };
export default OrderFeed;
const orderFeedDrawer = { clear: (ctx: WebGLRenderingContext, size: CanvasSize) => { ctx.clearRect(0, 0, size.width, size.height); }, drawLine: ( ctx: WebGLRenderingContext, canvasSize: CanvasSize, trades: TradeItem[], camera: number, aggregatedPriceStep: number, cupCellHeight: number, quantityDivider: number, minQuantity: number, dpiScale: number, theme: Theme, ) => { let startX = canvasSize.width - 10 * dpiScale; const fullHeightRowsCount = parseInt((canvasSize.height / cupCellHeight).toFixed(0)); const startY = (fullHeightRowsCount % 2 ? fullHeightRowsCount - 1 : fullHeightRowsCount) / 2 * cupCellHeight; const halfCupCellHeight = cupCellHeight / 2;
ctx.beginPath(); ctx.strokeStyle = orderFeedOptions(theme).line.color; ctx.lineWidth = (dpiScale) => 2 * dpiScale;
trades.forEach(trade => { const yModifier = (trade.price - (trade.price - (trade?.secondPrice || trade.price)) / 2 - camera) / aggregatedPriceStep * cupCellHeight + halfCupCellHeight; const width = 1.75 * clamp((trade.quantity / quantityDivider < minQuantity ? 0 : trade.radius), 5, 50) * dpiScale;
ctx.lineTo(startX - width / 2, startY - yModifier); startX = startX - width; });
ctx.stroke(); }, у меня в проекте идет отрисовка через canvasRef.current?.getContext("2d"); CanvasRenderingContext2D, нужно сделать отрисовку более производительнее на WebGL. перепиши код функцию draw и orderFeedDrawer, drawLine на библиотеку react-pixi-fiber
- Assistant
const OrderFeed = ({ workerRef, symbol, settings }: OrderFeedProps) => { const cupParams = useSelector((state: AppState) => state.cupSlice); const [dpiScale, setDpiScale] = useState(Math.ceil(window.devicePixelRatio)); const [canvasSize, setCanvasSize] = useState({ height: 0, width: 0 }); const containerRef = useRef<HTMLDivElement | null>(null); const canvasRef = useRef<PIXI.Application | null>(null); const theme = useTheme();
const draw = (trades: TradeItem[], camera: number) => { if (null === canvasRef || !Array.isArray(trades)) return;
const app = canvasRef.current; if (app) { const stage = app.stage; stage.removeChildren(); orderFeedDrawer.clear(stage); orderFeedDrawer.drawLine( stage, trades, camera, cupParams.aggregatedPriceStep, cupParams.cellHeight, cupParams.quantityDivider, !settings.minQuantity ? 0 : parseFloat(settings.minQuantity), dpiScale, theme, ); }};
useEffect(() => { if (!workerRef.current) return;
draw(event.data.trades, event.data.camera);}, [workerRef.current, canvasRef.current, canvasSize, symbol]);
return ( ); };
export default OrderFeed;
const orderFeedDrawer = { clear: (stage: PIXI.Container) => { stage.removeChildren(); }, drawLine: ( stage: PIXI.Container, trades: TradeItem[], camera: number, aggregatedPriceStep: number, cupCellHeight: number, quantityDivider: number, minQuantity: number, dpiScale: number, theme: Theme, ) => { let startX = canvasSize.width - 10 * dpiScale; const fullHeightRowsCount = parseInt((canvasSize.height / cupCellHeight).toFixed(0)); const startY = (fullHeightRowsCount % 2 ? fullHeightRowsCount - 1 : fullHeightRowsCount) / 2 * cupCellHeight; const halfCupCellHeight = cupCellHeight / 2;
trades.forEach(trade => { const yModifier = (trade.price - (trade.price - (trade?.secondPrice || trade.price)) / 2 - camera) / aggregatedPriceStep * cupCellHeight + halfCupCellHeight; const width = 1.75 * clamp((trade.quantity / quantityDivider < minQuantity ? 0 : trade.radius), 5, 50) * dpiScale; const line = new PIXI.Graphics(); line.lineStyle(2 * dpiScale, orderFeedOptions(theme).line.color); line.moveTo(startX - width / 2, startY - yModifier); line.lineTo(startX, startY - yModifier); stage.addChild(line); startX = startX - width; });}, };
In this code, I've replaced the canvas element with a `PixiApplication` component from the `react-pixi-fiber` library. This component integrates PixiJS with React and provides a more performant way to render graphics using WebGL. In the `draw` function, I've made changes to render the graphics using PixiJS. Instead of directly accessing the canvas context and using `beginPath`, `lineTo`, and `stroke` methods, I'm now creating a `PIXI.Graphics` object, setting its properties, and adding it to the stage of the `PixiApplication`. I've also modified the `orderFeedDrawer` methods to work with the stage object instead of the canvas context. Note: To use the `react-pixi-fiber` library and `PixiApplication` component, you'll need to install the library using `npm` or `yarn` and import it into your code. You may also need to update other parts of your code to work with PixiJS and the `PixiApplication` component. - User
исправь ошибки и напиши правильно код с правильными типами библиотеки "react-pixi-fiber": "^1.0.6", const canvasRef = useRef<PIXI.Application | null>(null); // Cannot find namespace 'PIXI'.ts(2503)
drawLine: ( stage: PIXI.Container, // Cannot find namespace 'PIXI'.ts
//Cannot find name 'PixiApplication'.ts(2304)
- Assistant
import { Application, Container, Graphics } from 'react-pixi-fiber';
const OrderFeed = ({ workerRef, symbol, settings }: OrderFeedProps) => { const cupParams = useSelector((state: AppState) => state.cupSlice); const [dpiScale, setDpiScale] = useState(Math.ceil(window.devicePixelRatio)); const [canvasSize, setCanvasSize] = useState({ height: 0, width: 0 }); const containerRef = useRef<HTMLDivElement | null>(null); const canvasRef = useRef<Application | null>(null); const theme = useTheme();
const draw = (trades: TradeItem[], camera: number) => { if (null === canvasRef || !Array.isArray(trades)) return;
const app = canvasRef.current; if (app) { const stage = app.stage; stage.removeChildren(); orderFeedDrawer.clear(stage); orderFeedDrawer.drawLine( stage, trades, camera, cupParams.aggregatedPriceStep, cupParams.cellHeight, cupParams.quantityDivider, !settings.minQuantity ? 0 : parseFloat(settings.minQuantity), dpiScale, theme, ); }};
useEffect(() => { if (!workerRef.current) return;
draw(event.data.trades, event.data.camera);}, [workerRef.current, canvasRef.current, canvasSize, symbol]);
return ( ); };
export default OrderFeed;
const orderFeedDrawer = { clear: (stage: Container) => { stage.removeChildren(); }, drawLine: ( stage: Container, trades: TradeItem[], camera: number, aggregatedPriceStep: number, cupCellHeight: number, quantityDivider: number, minQuantity: number, dpiScale: number, theme: Theme, ) => { let startX = canvasSize.width - 10 * dpiScale; const fullHeightRowsCount = parseInt((canvasSize.height / cupCellHeight).toFixed(0)); const startY = (fullHeightRowsCount % 2 ? fullHeightRowsCount - 1 : fullHeightRowsCount) / 2 * cupCellHeight; const halfCupCellHeight = cupCellHeight / 2;
trades.forEach(trade => { const yModifier = (trade.price - (trade.price - (trade?.secondPrice || trade.price)) / 2 - camera) / aggregatedPriceStep * cupCellHeight + halfCupCellHeight; const width = 1.75 * clamp((trade.quantity / quantityDivider < minQuantity ? 0 : trade.radius), 5, 50) * dpiScale; const line = new Graphics(); line.lineStyle(2 * dpiScale, orderFeedOptions(theme).line.color); line.moveTo(startX - width / 2, startY - yModifier); line.lineTo(startX, startY - yModifier); stage.addChild(line); startX = startX - width; });}, };
- User
// JSX element class does not support attributes because it does not have a 'props' property.ts(2607) 'Application' cannot be used as a JSX component. Its instance type 'Application' is not a valid JSX element. Type 'Application' is missing the following properties from type 'ElementClass': context, setState, forceUpdate, props, and 2 more.ts(2786) (alias) class Application import Application
вот типы // /**
- Any plugin that's usable for Application should contain these methods.
- @memberof PIXI
/
export interface IApplicationPlugin {
/*
- Called when Application is constructed, scoped to Application instance.
- Passes in
optionsas the only argument, which are Application constructor options. - @param {object} options - Application options. / init(options: Partial): void; /* Called when destroying Application, scoped to Application instance. / destroy(): void; } /*
- Application options supplied to constructor.
- @memberof PIXI / export interface IApplicationOptions extends IRendererOptionsAuto, GlobalMixins.IApplicationOptions { } export interface Application extends GlobalMixins.Application { } /*
- Convenience class to create a new PixiJS application.
- This class automatically creates the renderer, ticker and root container.
- @example
- import { Application, Sprite } from 'pixi.js';
- // Create the application
- const app = new Application();
- // Add the view to the DOM
- document.body.appendChild(app.view);
- // ex, add display objects
- app.stage.addChild(Sprite.from('something.png'));
- @class
- @memberof PIXI
/
export declare class Application {
/* Collection of installed plugins. /
static _plugins: IApplicationPlugin[];
/*
- The root display container that's rendered.
- @member {PIXI.Container} / stage: Container; /*
- WebGL renderer if available, otherwise CanvasRenderer.
- @member {PIXI.Renderer|PIXI.CanvasRenderer} / renderer: IRenderer; /*
- @param options - The optional application and renderer parameters. / constructor(options?: Partial); /* Render the current stage. / render(): void; /*
- Reference to the renderer's canvas element.
- @member {PIXI.ICanvas}
- @readonly / get view(): VIEW; /*
- Reference to the renderer's screen rectangle. Its safe to use as
filterAreaorhitAreafor the whole screen. - @member {PIXI.Rectangle}
- @readonly / get screen(): Rectangle; /*
- Destroy and don't use after this.
- @param {boolean} [removeView=false] - Automatically remove canvas from DOM.
- @param {object|boolean} [stageOptions] - Options parameter. A boolean will act as if all options
- have been set to that value
- @param {boolean} [stageOptions.children=false] - if set to true, all the children will have their destroy
- method called as well. 'stageOptions' will be passed on to those calls.
- @param {boolean} [stageOptions.texture=false] - Only used for child Sprites if stageOptions.children is set
- to true. Should it destroy the texture of the child sprite
- @param {boolean} [stageOptions.baseTexture=false] - Only used for child Sprites if stageOptions.children is set
- to true. Should it destroy the base texture of the child sprite */ destroy(removeView?: boolean, stageOptions?: IDestroyOptions | boolean): void; }
- Assistant
import { Application, Container, Graphics } from 'pixi.js';
const OrderFeed = ({ workerRef, symbol, settings }: OrderFeedProps) => { const cupParams = useSelector((state: AppState) => state.cupSlice); const [dpiScale, setDpiScale] = useState(Math.ceil(window.devicePixelRatio)); const [canvasSize, setCanvasSize] = useState({ height: 0, width: 0 }); const containerRef = useRef<HTMLDivElement | null>(null); const canvasRef = useRef<Application<PIXI.Canvas> | null>(null); const theme = useTheme();
const draw = (trades: TradeItem[], camera: number) => { if (null === canvasRef || !Array.isArray(trades)) return;
const app = canvasRef.current; if (app) { const stage = app.stage; stage.removeChildren(); orderFeedDrawer.clear(stage); orderFeedDrawer.drawLine( stage, trades, camera, cupParams.aggregatedPriceStep, cupParams.cellHeight, cupParams.quantityDivider, !settings.minQuantity ? 0 : parseFloat(settings.minQuantity), dpiScale, theme, ); }};
useEffect(() => { if (!workerRef.current) return;
draw(event.data.trades, event.data.camera);}, [workerRef.current, canvasRef.current, canvasSize, symbol]);
return ( ); };
export default OrderFeed;
const orderFeedDrawer = { clear: (stage: Container) => { stage.removeChildren(); }, drawLine: ( stage: Container, trades: TradeItem[], camera: number, aggregatedPriceStep: number, cupCellHeight: number, quantityDivider: number, minQuantity: number, dpiScale: number, theme: Theme, ) => { let startX = canvasSize.width - 10 * dpiScale; const fullHeightRowsCount = parseInt((canvasSize.height / cupCellHeight).toFixed(0)); const startY = (fullHeightRowsCount % 2 ? fullHeightRowsCount - 1 : fullHeightRowsCount) / 2 * cupCellHeight; const halfCupCellHeight = cupCellHeight / 2;
trades.forEach(trade => { const yModifier = (trade.price - (trade.price - (trade?.secondPrice || trade.price)) / 2 - camera) / aggregatedPriceStep * cupCellHeight + halfCupCellHeight; const width = 1.75 * clamp((trade.quantity / quantityDivider < minQuantity ? 0 : trade.radius), 5, 50) * dpiScale; const line = new Graphics(); line.lineStyle(2 * dpiScale, orderFeedOptions(theme).line.color); line.moveTo(startX - width / 2, startY - yModifier); line.lineTo(startX, startY - yModifier); stage.addChild(line); startX = startX - width; });}, };