From 7bf4a0aac1cbf370d682e827628ac72e99fb39d3 Mon Sep 17 00:00:00 2001 From: Arun Kumar Date: Tue, 16 Feb 2021 20:12:34 +0530 Subject: [PATCH] Fix package build --- src/components/App.tsx | 18 ++++++++++-------- src/renderer/renderScene.ts | 3 +-- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/src/components/App.tsx b/src/components/App.tsx index 9a7a15c868..65aeedd035 100644 --- a/src/components/App.tsx +++ b/src/components/App.tsx @@ -283,6 +283,7 @@ class App extends React.Component { unmounted: boolean = false; actionManager: ActionManager; private excalidrawContainerRef = React.createRef(); + _isMobile: boolean; public static defaultProps: Partial = { width: window.innerWidth, @@ -350,6 +351,8 @@ class App extends React.Component { this.actionManager.registerAction(createUndoAction(history)); this.actionManager.registerAction(createRedoAction(history)); + + this._isMobile = isMobile(); } private renderCanvas() { @@ -972,6 +975,7 @@ class App extends React.Component { }, { renderOptimizations: true, + renderScrollbars: !this._isMobile, }, ); if (scrollBars) { @@ -3693,8 +3697,6 @@ class App extends React.Component { const separator = "separator"; - const _isMobile = isMobile(); - const elements = this.scene.getElements(); const element = this.getElementAtPosition(x, y); const options: ContextMenuOption[] = []; @@ -3730,7 +3732,7 @@ class App extends React.Component { ContextMenu.push({ options: [ - _isMobile && + this._isMobile && navigator.clipboard && { name: "paste", perform: (elements, appStates) => { @@ -3741,7 +3743,7 @@ class App extends React.Component { }, contextItemLabel: "labels.paste", }, - _isMobile && navigator.clipboard && separator, + this._isMobile && navigator.clipboard && separator, probablySupportsClipboardBlob && elements.length > 0 && actionCopyAsPng, @@ -3786,9 +3788,9 @@ class App extends React.Component { ContextMenu.push({ options: [ - _isMobile && actionCut, - _isMobile && navigator.clipboard && actionCopy, - _isMobile && + this._isMobile && actionCut, + this._isMobile && navigator.clipboard && actionCopy, + this._isMobile && navigator.clipboard && { name: "paste", perform: (elements, appStates) => { @@ -3799,7 +3801,7 @@ class App extends React.Component { }, contextItemLabel: "labels.paste", }, - _isMobile && separator, + this._isMobile && separator, ...options, separator, actionCopyStyles, diff --git a/src/renderer/renderScene.ts b/src/renderer/renderScene.ts index 82f21d5e75..f6831bb7f3 100644 --- a/src/renderer/renderScene.ts +++ b/src/renderer/renderScene.ts @@ -49,7 +49,6 @@ import { } from "../element/transformHandles"; import { viewportCoordsToSceneCoords, supportsEmoji } from "../utils"; import { UserIdleState } from "../excalidraw-app/collab/types"; -import { isMobile } from "../is-mobile"; const hasEmojiSupport = supportsEmoji(); @@ -187,7 +186,7 @@ export const renderScene = ( sceneState: SceneState, // extra options, currently passed by export helper { - renderScrollbars = !isMobile(), + renderScrollbars = true, renderSelection = true, // Whether to employ render optimizations to improve performance. // Should not be turned on for export operations and similar, because it