diff --git a/.env.development b/.env.development
index 6c0c1eadc..f04f0868c 100644
--- a/.env.development
+++ b/.env.development
@@ -4,9 +4,10 @@ REACT_APP_BACKEND_V2_POST_URL=https://json-dev.excalidraw.com/api/v2/post/
REACT_APP_LIBRARY_URL=https://libraries.excalidraw.com
REACT_APP_LIBRARY_BACKEND=https://us-central1-excalidraw-room-persistence.cloudfunctions.net/libraries
-REACT_APP_PORTAL_URL=http://localhost:3002
-# Fill to set socket server URL used for collaboration.
-# Meant for forks only: excalidraw.com uses custom REACT_APP_PORTAL_URL flow
-REACT_APP_WS_SERVER_URL=
+# collaboration WebSocket server (https://github.com/excalidraw/excalidraw-room)
+REACT_APP_WS_SERVER_URL=http://localhost:3002
+
+# set this only if using the collaboration workflow we use on excalidraw.com
+REACT_APP_PORTAL_URL=
REACT_APP_FIREBASE_CONFIG='{"apiKey":"AIzaSyCMkxA60XIW8KbqMYL7edC4qT5l4qHX2h8","authDomain":"excalidraw-oss-dev.firebaseapp.com","projectId":"excalidraw-oss-dev","storageBucket":"excalidraw-oss-dev.appspot.com","messagingSenderId":"664559512677","appId":"1:664559512677:web:a385181f2928d328a7aa8c"}'
diff --git a/firebase-project/storage.rules b/firebase-project/storage.rules
index 7d1ab153b..dfa1c2133 100644
--- a/firebase-project/storage.rules
+++ b/firebase-project/storage.rules
@@ -1,12 +1,11 @@
rules_version = '2';
service firebase.storage {
match /b/{bucket}/o {
- match /{migrations} {
- match /{scenes}/{scene} {
- allow get, write: if true;
- // redundant, but let's be explicit'
- allow list: if false;
- }
+ match /{files}/rooms/{room}/{file} {
+ allow get, write: if true;
+ }
+ match /{files}/shareLinks/{shareLink}/{file} {
+ allow get, write: if true;
}
}
}
diff --git a/package.json b/package.json
index f837eaa62..9d0d3178e 100644
--- a/package.json
+++ b/package.json
@@ -36,6 +36,7 @@
"i18next-browser-languagedetector": "6.1.2",
"idb-keyval": "6.0.3",
"image-blob-reduce": "3.0.1",
+ "jotai": "1.6.4",
"lodash.throttle": "4.1.1",
"nanoid": "3.1.32",
"open-color": "1.9.1",
diff --git a/public/index.html b/public/index.html
index 0d8ce3b96..d802ee0d6 100644
--- a/public/index.html
+++ b/public/index.html
@@ -124,26 +124,6 @@
user-select: none;
}
- .LoadingMessage {
- position: absolute;
- top: 0;
- right: 0;
- bottom: 0;
- left: 0;
- z-index: 999;
- display: flex;
- align-items: center;
- justify-content: center;
- pointer-events: none;
- }
-
- .LoadingMessage span {
- background-color: var(--button-gray-1);
- border-radius: 5px;
- padding: 0.8em 1.2em;
- color: var(--popup-text-color);
- font-size: 1.3em;
- }
#root {
height: 100%;
-webkit-touch-callout: none;
@@ -152,8 +132,10 @@
-moz-user-select: none;
-ms-user-select: none;
user-select: none;
+ }
- @media screen and (min-width: 1200px) {
+ @media screen and (min-width: 1200px) {
+ #root {
-webkit-touch-callout: default;
-webkit-user-select: auto;
-khtml-user-select: auto;
@@ -170,10 +152,6 @@
Excalidraw