diff --git a/src/components/App.tsx b/src/components/App.tsx index 7022fb6c3..94177e0da 100644 --- a/src/components/App.tsx +++ b/src/components/App.tsx @@ -1361,6 +1361,7 @@ class App extends React.Component { document.querySelector(".excalidraw")!, ).getPropertyValue("--color-selection"); + if(!this.state.shouldCacheIgnoreZoom) console.log(`renderScene`); renderScene( { elements: renderingElements, @@ -1386,23 +1387,19 @@ class App extends React.Component { renderScrollbars: !this.device.isMobile, }, callback: ({ atLeastOneVisibleElement, scrollBars }) => { - if(!this.state.shouldCacheIgnoreZoom) console.log(`callback 1`); if (scrollBars) { currentScrollBars = scrollBars; } - if(!this.state.shouldCacheIgnoreZoom) console.log(`callback 2`); const scrolledOutside = // hide when editing text isTextElement(this.state.editingElement) ? false : !atLeastOneVisibleElement && renderingElements.length > 0; - if(!this.state.shouldCacheIgnoreZoom) console.log(`callback 3`, scrolledOutside, this.state.scrolledOutside); if (this.state.scrolledOutside !== scrolledOutside) { this.setState({ scrolledOutside }); } - if(!this.state.shouldCacheIgnoreZoom) console.log(`callback 4`); - //this.scheduleImageRefresh(); - if(!this.state.shouldCacheIgnoreZoom) console.log(`callback 5`); + this.scheduleImageRefresh(); + if(!this.state.shouldCacheIgnoreZoom) setTimeout(()=>console.log(`after renderScene`)); }, }, THROTTLE_NEXT_RENDER && window.EXCALIDRAW_THROTTLE_RENDER === true, diff --git a/src/renderer/renderScene.ts b/src/renderer/renderScene.ts index 83b9ddb60..c364f701d 100644 --- a/src/renderer/renderScene.ts +++ b/src/renderer/renderScene.ts @@ -427,7 +427,7 @@ export const _renderScene = ({ console.error(error); } }); - if(!appState.shouldCacheIgnoreZoom) console.log(`rendered all elements`); + if (editingLinearElement) { renderLinearPointHandles( context, @@ -475,7 +475,7 @@ export const _renderScene = ({ locallySelectedElements[0] as NonDeleted, ); } - if(!appState.shouldCacheIgnoreZoom) console.log(`checkpoint 1`); + if ( appState.selectedLinearElement && appState.selectedLinearElement.hoverPointIndex >= 0 @@ -637,10 +637,8 @@ export const _renderScene = ({ } context.restore(); } - if(!appState.shouldCacheIgnoreZoom) console.log(`checkpoint 2`); // Reset zoom context.restore(); - if(!appState.shouldCacheIgnoreZoom) console.log(`checkpoint 3`); // Paint remote pointers for (const clientId in renderConfig.remotePointerViewportCoords) { let { x, y } = renderConfig.remotePointerViewportCoords[clientId]; @@ -788,9 +786,7 @@ export const _renderScene = ({ }); context.restore(); } - if(!appState.shouldCacheIgnoreZoom) console.log(`checkpoint 4`); context.restore(); - if(!appState.shouldCacheIgnoreZoom) console.log(`checkpoint 5`); return { atLeastOneVisibleElement: visibleElements.length > 0, scrollBars }; }; @@ -805,7 +801,6 @@ const renderSceneThrottled = throttleRAF( callback?: (data: ReturnType) => void; }) => { const ret = _renderScene(config); - if(!config.appState.shouldCacheIgnoreZoom) console.log(`renderScene 2 throttled`, config.callback) config.callback?.(ret); }, { trailing: true }, @@ -827,12 +822,10 @@ export const renderScene = ( throttle?: T, ): T extends true ? void : ReturnType => { if (throttle) { - if(!config.appState.shouldCacheIgnoreZoom) console.log(`renderScene 1 throttled`, throttle) renderSceneThrottled(config); return undefined as T extends true ? void : ReturnType; } const ret = _renderScene(config); - if(!config.appState.shouldCacheIgnoreZoom) console.log(`renderScene 1 not throttled`, config.callback) config.callback?.(ret); return ret as T extends true ? void : ReturnType; };