Skip to content

Commit 4a9497c

Browse files
committed
[Editor] Fix resize handling
1 parent 26fa394 commit 4a9497c

File tree

2 files changed

+10
-12
lines changed

2 files changed

+10
-12
lines changed

src/editor/render/scaling.ts

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ import {
88
import {
99
canvasPosition,
1010
canvasSize,
11-
isSideBarCollapsed,
1211
originalSize,
1312
zoomFactor
1413
} from '../data';
@@ -80,13 +79,13 @@ export const scaleInverse = ( value: number ) => {
8079
export const useScaler = ( elementToGetParentFrom: Ref<HTMLElement | null>, renderer: Renderer ) => {
8180
const image = renderer.textImage;
8281

83-
const scaler = () => {
84-
const target = elementToGetParentFrom.value!.parentElement!;
82+
let target: HTMLElement | null = null;
8583

84+
const scaler = () => {
8685
if ( image.src !== '' && image.complete )
87-
computeScaleFactor( image.width, target.clientWidth, image.height / image.width );
86+
computeScaleFactor( image.width, target!.clientWidth, image.height / image.width );
8887
else
89-
computeScaleFactor( referenceCanvasSize.width, target.clientWidth, referenceCanvasSize.height / referenceCanvasSize.width );
88+
computeScaleFactor( referenceCanvasSize.width, target!.clientWidth, referenceCanvasSize.height / referenceCanvasSize.width );
9089

9190
renderer.renderAll();
9291
};
@@ -96,14 +95,16 @@ export const useScaler = ( elementToGetParentFrom: Ref<HTMLElement | null>, rend
9695
canvasPosition
9796
], renderer.renderAll );
9897

99-
watch( isSideBarCollapsed, () => {
100-
setTimeout( () => {
101-
scaler();
102-
}, 500 );
98+
const observer = new ResizeObserver( () => {
99+
console.log( 'scaling' );
100+
scaler();
103101
} );
104102

105103
onMounted( () => {
104+
target = elementToGetParentFrom.value!.parentElement!;
105+
106106
window.addEventListener( 'resize', scaler );
107+
observer.observe( target );
107108
image.onload = scaler;
108109

109110
scaler();

src/ts/router/routes.ts

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,6 @@ export const routes = [
4444
'path': '/app',
4545
'name': 'app',
4646
'component': () => import( '@/views/AppMainView.vue' ),
47-
'meta': {
48-
'transition': 'scale'
49-
},
5047
'children': [
5148
{
5249
'path': '',

0 commit comments

Comments
 (0)