github.com/excalidraw
1
0
Fork 0
mirror of https://github.com/excalidraw/excalidraw.git synced 2024-11-10 11:35:52 +01:00
Code Releases Wiki Activity

feat: Change title to Excalidraw after a timeout (#2656)

Browse Source 
* feat: Change title to Excalidraw after a timeout

* clear timeout
This commit is contained in:
Lipis 2020-12-22 11:34:06 +02:00 committed by GitHub
parent b0eeb8e6e6
commit 6adb45ef5a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/components/App.tsx
View File

@ -124,6 +124,7 @@ import {
MIME_TYPES, MIME_TYPES,
TAP_TWICE_TIMEOUT, TAP_TWICE_TIMEOUT,
TOUCH_CTX_MENU_TIMEOUT, TOUCH_CTX_MENU_TIMEOUT,
APP_NAME,
} from "../constants"; } from "../constants";
import LayerUI from "./LayerUI"; import LayerUI from "./LayerUI";
@ -502,7 +503,7 @@ class App extends React.Component<ExcalidrawProps, AppState> {
}; };
private importLibraryFromUrl = async (url: string) => { private importLibraryFromUrl = async (url: string) => {
window.history.replaceState({}, "Excalidraw", window.location.origin); window.history.replaceState({}, APP_NAME, window.location.origin);
try { try {
const request = await fetch(url); const request = await fetch(url);
const blob = await request.blob(); const blob = await request.blob();

3
src/constants.ts
View File

@ -1,5 +1,7 @@
import { FontFamily } from "./element/types"; import { FontFamily } from "./element/types";
export const APP_NAME = "Excalidraw";
export const DRAGGING_THRESHOLD = 10; // 10px export const DRAGGING_THRESHOLD = 10; // 10px
export const LINE_CONFIRM_THRESHOLD = 10; // 10px export const LINE_CONFIRM_THRESHOLD = 10; // 10px
export const ELEMENT_SHIFT_TRANSLATE_AMOUNT = 5; export const ELEMENT_SHIFT_TRANSLATE_AMOUNT = 5;
@ -85,3 +87,4 @@ export const STORAGE_KEYS = {
// time in milliseconds // time in milliseconds
export const TAP_TWICE_TIMEOUT = 300; export const TAP_TWICE_TIMEOUT = 300;
export const TOUCH_CTX_MENU_TIMEOUT = 500; export const TOUCH_CTX_MENU_TIMEOUT = 500;
export const TITLE_TIMEOUT = 10000;

10
src/excalidraw-app/collab/CollabWrapper.tsx
View File

@ -1,7 +1,7 @@
import React, { PureComponent } from "react"; import React, { PureComponent } from "react";
import throttle from "lodash.throttle"; import throttle from "lodash.throttle";
import { ENV, EVENT } from "../../constants"; import { APP_NAME, ENV, EVENT } from "../../constants";
import { import {
decryptAESGEM, decryptAESGEM,
@ -157,11 +157,7 @@ class CollabWrapper extends PureComponent<Props, CollabState> {
}; };
openPortal = async () => { openPortal = async () => {
window.history.pushState( window.history.pushState({}, APP_NAME, await generateCollaborationLink());
{},
"Excalidraw",
await generateCollaborationLink(),
);
const elements = this.excalidrawRef.current!.getSceneElements(); const elements = this.excalidrawRef.current!.getSceneElements();
// remove deleted elements from elements array & history to ensure we don't // remove deleted elements from elements array & history to ensure we don't
// expose potentially sensitive user data in case user manually deletes // expose potentially sensitive user data in case user manually deletes
@ -178,7 +174,7 @@ class CollabWrapper extends PureComponent<Props, CollabState> {
closePortal = () => { closePortal = () => {
this.saveCollabRoomToFirebase(); this.saveCollabRoomToFirebase();
window.history.pushState({}, "Excalidraw", window.location.origin); window.history.pushState({}, APP_NAME, window.location.origin);
this.destroySocketClient(); this.destroySocketClient();
trackEvent(EVENT_SHARE, "session end"); trackEvent(EVENT_SHARE, "session end");
}; };

10
src/excalidraw-app/index.tsx
View File

@ -28,6 +28,7 @@ import { SAVE_TO_LOCAL_STORAGE_TIMEOUT } from "./app_constants";
import { EVENT_LOAD, EVENT_SHARE, trackEvent } from "../analytics"; import { EVENT_LOAD, EVENT_SHARE, trackEvent } from "../analytics";
import { ErrorDialog } from "../components/ErrorDialog"; import { ErrorDialog } from "../components/ErrorDialog";
import { getDefaultAppState } from "../appState"; import { getDefaultAppState } from "../appState";
import { APP_NAME, TITLE_TIMEOUT } from "../constants";
const excalidrawRef: React.MutableRefObject< const excalidrawRef: React.MutableRefObject<
MarkRequired<ExcalidrawAPIRefValue, "ready" | "readyPromise"> MarkRequired<ExcalidrawAPIRefValue, "ready" | "readyPromise">
@ -118,7 +119,7 @@ const initializeScene = async (opts: {
scene = await loadScene(jsonMatch[1], jsonMatch[2], initialData); scene = await loadScene(jsonMatch[1], jsonMatch[2], initialData);
} }
if (!isCollabScene) { if (!isCollabScene) {
window.history.replaceState({}, "Excalidraw", window.location.origin); window.history.replaceState({}, APP_NAME, window.location.origin);
} }
} else { } else {
// https://github.com/excalidraw/excalidraw/issues/1919 // https://github.com/excalidraw/excalidraw/issues/1919
@ -137,7 +138,7 @@ const initializeScene = async (opts: {
} }
isCollabScene = false; isCollabScene = false;
window.history.replaceState({}, "Excalidraw", window.location.origin); window.history.replaceState({}, APP_NAME, window.location.origin);
} }
} }
if (isCollabScene) { if (isCollabScene) {
@ -246,6 +247,10 @@ function ExcalidrawWrapper(props: { collab: CollabAPI }) {
} }
}; };
const titleTimeout = setTimeout(
() => (document.title = APP_NAME),
TITLE_TIMEOUT,
);
window.addEventListener(EVENT.HASHCHANGE, onHashChange, false); window.addEventListener(EVENT.HASHCHANGE, onHashChange, false);
window.addEventListener(EVENT.UNLOAD, onBlur, false); window.addEventListener(EVENT.UNLOAD, onBlur, false);
window.addEventListener(EVENT.BLUR, onBlur, false); window.addEventListener(EVENT.BLUR, onBlur, false);
@ -253,6 +258,7 @@ function ExcalidrawWrapper(props: { collab: CollabAPI }) {
window.removeEventListener(EVENT.HASHCHANGE, onHashChange, false); window.removeEventListener(EVENT.HASHCHANGE, onHashChange, false);
window.removeEventListener(EVENT.UNLOAD, onBlur, false); window.removeEventListener(EVENT.UNLOAD, onBlur, false);
window.removeEventListener(EVENT.BLUR, onBlur, false); window.removeEventListener(EVENT.BLUR, onBlur, false);
clearTimeout(titleTimeout);
}; };
}, [collab.initializeSocketClient]); }, [collab.initializeSocketClient]);