Merge branch 'dev' into main

DeepNotesApp · Jul 26, 2023 · 8839375 · 8839375
2 parents d8ed0a5 + 6216397
commit 8839375
Show file tree

Hide file tree

Showing 28 changed files with 211 additions and 130 deletions.
diff --git a/apps/client/package.json b/apps/client/package.json
@@ -2,7 +2,7 @@
   "name": "@deepnotes/client",
   "description": "DeepNotes",
   "homepage": "https://deepnotes.app",
-  "version": "1.0.4",
+  "version": "1.0.5",
   "author": "Gustavo Toyota <[email protected]>",
   "dependencies": {
     "@_ueberdosis/prosemirror-tables": "1.1.3",
@@ -54,6 +54,7 @@
     "dotenv": "16.0.3",
     "dotenv-expand": "9.0.0",
     "downloadjs": "^1.4.7",
+    "electron-context-menu": "^3.6.1",
     "electron-log": "^4.4.8",
     "electron-updater": "4.3.1",
     "express": "4.18.2",

diff --git a/apps/client/src-capacitor/android/app/version.properties b/apps/client/src-capacitor/android/app/version.properties
@@ -1,2 +1,2 @@
-#Mon Jul 24 09:09:25 AMT 2023
-VERSION_CODE=41
+#Wed Jul 26 15:09:36 AMT 2023
+VERSION_CODE=42
diff --git a/apps/client/src-capacitor/ios/App/App.xcodeproj/project.pbxproj b/apps/client/src-capacitor/ios/App/App.xcodeproj/project.pbxproj
@@ -355,7 +355,7 @@
 				INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.productivity";
 				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				MARKETING_VERSION = 1.0.2;
+				MARKETING_VERSION = 1.0.3;
 				OTHER_SWIFT_FLAGS = "$(inherited) \"-D\" \"COCOAPODS\" \"-DDEBUG\"";
 				PRODUCT_BUNDLE_IDENTIFIER = app.deepnotes;
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -382,7 +382,7 @@
 				INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.productivity";
 				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				MARKETING_VERSION = 1.0.2;
+				MARKETING_VERSION = 1.0.3;
 				PRODUCT_BUNDLE_IDENTIFIER = app.deepnotes;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";

diff --git a/apps/client/src-electron/electron-main.ts b/apps/client/src-electron/electron-main.ts
@@ -1,9 +1,14 @@
-import { app, BrowserWindow, ipcMain, nativeTheme } from 'electron';
+import { app, BrowserWindow, ipcMain, nativeTheme, shell } from 'electron';
 import cookie from 'cookie';
 import path from 'path';
 import os from 'os';
 import log from 'electron-log';
 import { autoUpdater } from 'electron-updater';
+import contextMenu from 'electron-context-menu';
+
+contextMenu({
+  showSaveImageAs: true,
+});
 
 log.transports.file.level = 'info';
 
@@ -83,15 +88,8 @@ function createWindow() {
   }
 
   mainWindow.webContents.setWindowOpenHandler((details) => {
-    return {
-      action: 'allow',
-      overrideBrowserWindowOptions: {
-        autoHideMenuBar: true,
-        webPreferences: {
-          devTools: false,
-        },
-      },
-    };
+    shell.openExternal(details.url);
+    return { action: 'deny' };
   });
 
   mainWindow.on('closed', () => {

diff --git a/apps/client/src/code/pages/composables/use-page-navigation-interception.ts b/apps/client/src/code/pages/composables/use-page-navigation-interception.ts
@@ -60,11 +60,12 @@ export function usePageNavigationInterception() {
       event.preventDefault(); // Prevent default
 
       const matches =
-        href.match(/\/(?:pages|groups)\/([\w-]{21})(?:\?note=([\w-]{21}))?/) ??
-        [];
+        href.match(
+          /\/(?:pages|groups)\/([\w-]{21})(?:\?(?:note|elem)=([\w-]{21}))?/,
+        ) ?? [];
 
       const id = matches[1];
-      const noteId = matches[2];
+      const elemId = matches[2];
 
       if (href.includes('/groups/')) {
         await internals.pages.goToGroup(id, {
@@ -75,7 +76,7 @@ export function usePageNavigationInterception() {
         await internals.pages.goToPage(id, {
           fromParent: true,
           openInNewTab: isCtrlDown(event),
-          noteId,
+          elemId,
         });
       }
     } catch (error) {

diff --git a/apps/client/src/code/pages/page/elems/find-and-replace.ts b/apps/client/src/code/pages/page/elems/find-and-replace.ts
@@ -163,7 +163,7 @@ export class PageFindAndReplace {
     editor.commands.setTextSelection(result);
     editor.commands.focus(undefined, { scrollIntoView: false });
 
-    scrollIntoView(resultElems[this.resultIndex] as HTMLElement, {
+    scrollIntoView(resultElems[this.resultIndex], {
       centerCamera: true,
     });
   }

diff --git a/apps/client/src/code/pages/page/notes/note.ts b/apps/client/src/code/pages/page/notes/note.ts
@@ -109,6 +109,7 @@ export interface INoteReact extends IRegionReact, IElemReact {
   color: ComputedRef<string>;
 
   link: {
+    url: ComputedRef<string>;
     external: ComputedRef<boolean>;
   };
 
@@ -460,7 +461,7 @@ export class PageNote extends PageElem() implements IPageRegion {
           return 'default';
         }
 
-        if (this.react.collab.link) {
+        if (this.react.link.url) {
           return 'pointer';
         }
 
@@ -476,26 +477,24 @@ export class PageNote extends PageElem() implements IPageRegion {
       ),
 
       link: {
-        external: computed(() => {
-          if (this.react.collab.link == null) {
-            return false;
+        url: computed(() => {
+          if (!this.react.collab.link) {
+            return '';
           }
 
-          if (
-            !this.react.collab.link.startsWith('http://') &&
-            !this.react.collab.link.startsWith('https://')
-          ) {
-            return false;
+          if (this.react.collab.link.startsWith('/')) {
+            return `https://deepnotes.app${this.react.collab.link}`;
           }
 
-          if (
-            this.react.collab.link.startsWith('http://deepnotes.app/pages/')
-          ) {
-            return false;
+          if (!this.react.collab.link.includes('://')) {
+            return `https://deepnotes.app/${this.react.collab.link}`;
           }
 
-          return true;
+          return this.react.collab.link;
         }),
+        external: computed(
+          () => !this.react.link.url.startsWith('https://deepnotes.app/pages/'),
+        ),
       },
 
       editors: computed(() => {

diff --git a/apps/client/src/code/pages/page/page.ts b/apps/client/src/code/pages/page/page.ts
@@ -300,18 +300,26 @@ export class Page implements IPageRegion {
 
       mainLogger.sub('page.finishSetup').info('All notes loaded');
 
-      const noteId = (route().value.query.note as string) ?? '';
-
-      if (isNanoID(noteId)) {
-        const note = this.notes.fromId(noteId);
-
-        if (note != null) {
-          this.selection.set(note);
-
-          const noteElem = note.getElem('note-frame');
-
-          if (noteElem != null) {
-            scrollIntoView(noteElem, { animate: false, centerCamera: true });
+      const elemId =
+        ((route().value.query.note ?? route().value.query.elem) as string) ??
+        '';
+
+      if (isNanoID(elemId)) {
+        const elem = this.notes.fromId(elemId) ?? this.arrows.fromId(elemId);
+
+        if (elem != null) {
+          this.selection.set(elem);
+
+          const elemElem =
+            elem.type === 'note'
+              ? elem.getElem('note-frame')
+              : elem.getHitboxElem();
+
+          if (elemElem != null) {
+            scrollIntoView(elemElem, {
+              animate: false,
+              centerCamera: true,
+            });
           }
         }
       }

diff --git a/apps/client/src/code/pages/pages.ts b/apps/client/src/code/pages/pages.ts
@@ -201,14 +201,14 @@ export class Pages {
 
   async goToPage(
     pageId: string,
-    params?: { fromParent?: boolean; openInNewTab?: boolean; noteId?: string },
+    params?: { fromParent?: boolean; openInNewTab?: boolean; elemId?: string },
   ) {
     mainLogger.sub('Pages.goToPage').info('pageId: %s', pageId);
 
     if (params?.openInNewTab) {
       window.open(
         multiModePath(
-          `/pages/${pageId}${params?.noteId ? `?note=${params?.noteId}` : ''}`,
+          `/pages/${pageId}${params?.elemId ? `?elem=${params?.elemId}` : ''}`,
         ),
         '_blank',
       );
@@ -220,7 +220,7 @@ export class Pages {
       await router().push({
         name: 'page',
         params: { pageId },
-        query: { note: params?.noteId },
+        query: { elem: params?.elemId },
       });
 
       const cachedPage = this.pageCache.get(pageId);
@@ -229,17 +229,22 @@ export class Pages {
         cachedPage != null &&
         cachedPage.react.status === 'success' &&
         !cachedPage.react.loading &&
-        isNanoID(params?.noteId ?? '')
+        isNanoID(params?.elemId ?? '')
       ) {
-        const note = cachedPage.notes.fromId(params?.noteId!);
+        const elem =
+          cachedPage.notes.fromId(params?.elemId!) ??
+          cachedPage.arrows.fromId(params?.elemId!);
 
-        if (note != null) {
-          cachedPage.selection.set(note);
+        if (elem != null) {
+          cachedPage.selection.set(elem);
 
-          const noteElem = note.getElem('note-frame');
+          const elemElem =
+            elem.type === 'note'
+              ? elem.getElem('note-frame')
+              : elem.getHitboxElem();
 
-          if (noteElem != null) {
-            scrollIntoView(noteElem, { centerCamera: true });
+          if (elemElem != null) {
+            scrollIntoView(elemElem, { centerCamera: true });
           }
         }
       }

diff --git a/apps/client/src/code/utils/scroll-into-view.ts b/apps/client/src/code/utils/scroll-into-view.ts
@@ -15,17 +15,17 @@ function easeInOutQuint(x: number): number {
 }
 
 export function scrollIntoView(
-  target: HTMLElement,
+  target: Element,
   params?: { animate?: boolean; centerCamera?: boolean },
 ) {
-  let ancestor: HTMLElement | null = target.parentElement;
+  let ancestor: Element | null = target.parentElement;
 
   const targetRect = domRectScreenToWorld(target.getBoundingClientRect());
 
-  const scrollElems: { elem: HTMLElement; from: IVec2; to: IVec2 }[] = [];
+  const scrollElems: { elem: Element; from: IVec2; to: IVec2 }[] = [];
 
   while (ancestor != null) {
-    if (hasScrollbar(ancestor)) {
+    if (hasScrollbar(ancestor as HTMLElement)) {
       const ancestorRect = domRectScreenToWorld(
         ancestor.getBoundingClientRect(),
       );

diff --git a/apps/client/src/components/PageItem.vue b/apps/client/src/components/PageItem.vue
@@ -1,6 +1,6 @@
 <template>
   <a
-    :href="`/pages/${pageId}`"
+    :href="`https://deepnotes.app/pages/${pageId}`"
     @click.prevent.stop
   >
     <q-item

diff --git a/...ent/DisplayPage/DisplayScreens/DisplayWorld/DisplayNote/ArrowLinkZones/ArrowLinkZones.vue b/...ent/DisplayPage/DisplayScreens/DisplayWorld/DisplayNote/ArrowLinkZones/ArrowLinkZones.vue
@@ -56,5 +56,7 @@ const page = inject<Page>('page')!;
   left: 0;
 
   overflow: visible;
+
+  z-index: 2147483646;
 }
 </style>
diff --git a/...gesLayout/MainContent/DisplayPage/DisplayScreens/DisplayWorld/DisplayNote/DisplayNote.vue b/...gesLayout/MainContent/DisplayPage/DisplayScreens/DisplayWorld/DisplayNote/DisplayNote.vue
@@ -19,6 +19,8 @@
 
         <NoteLinkIcon />
 
+        <ArrowLinkZones />
+
         <NoteContent>
           <NoteTextSection section="head" />
 
@@ -32,8 +34,6 @@
         </NoteContent>
 
         <NoteResizeHandles />
-
-        <ArrowLinkZones />
       </NoteFrame>
     </NoteAnchor>
   </Teleport>

diff --git a/...agesLayout/MainContent/DisplayPage/DisplayScreens/DisplayWorld/DisplayNote/NoteAnchor.vue b/...agesLayout/MainContent/DisplayPage/DisplayScreens/DisplayWorld/DisplayNote/NoteAnchor.vue
@@ -9,7 +9,7 @@
       position:
         note.react.floating || note.react.resizing?.active
           ? 'absolute'
-          : 'relative',
+          : 'relative', // relative is needed for the drop zones
 
       left: note.react.resizing?.active
         ? `${note.react.resizing.newWorldRect.topLeft.x}px`

diff --git a/...gesLayout/MainContent/DisplayPage/DisplayScreens/DisplayWorld/DisplayNote/NoteContent.vue b/...gesLayout/MainContent/DisplayPage/DisplayScreens/DisplayWorld/DisplayNote/NoteContent.vue
@@ -1,8 +1,6 @@
 <template>
   <a
-    :href="
-      note.react.selected ? undefined : note.react.collab.link || undefined
-    "
+    :href="note.react.selected ? undefined : note.react.link.url || undefined"
     :style="{ cursor: note.react.cursor }"
     tabindex="-1"
     target="_blank"
@@ -55,7 +53,7 @@ function onLeftPointerDown(event: PointerEvent) {
 
   if (
     ((event.target instanceof HTMLElement && event.target.nodeName === 'A') ||
-      note.react.collab.link) &&
+      note.react.link.url) &&
     !event.altKey &&
     !event.shiftKey &&
     !internals.mobileAltKey &&

diff --git a/...ontent/DisplayPage/DisplayScreens/DisplayWorld/DisplayNote/NoteDropZones/NoteDropZone.vue b/...ontent/DisplayPage/DisplayScreens/DisplayWorld/DisplayNote/NoteDropZones/NoteDropZone.vue
@@ -72,7 +72,7 @@ async function onLeftPointerUp() {
   background-color: #42a5f5;
   opacity: 0;
 
-  z-index: 2147483645;
+  z-index: 2147483640;
 }
 .note-drop-zone.active {
   opacity: 0.25;

diff --git a/...PagesLayout/MainContent/DisplayPage/DisplayScreens/DisplayWorld/DisplayNote/NoteFrame.vue b/...PagesLayout/MainContent/DisplayPage/DisplayScreens/DisplayWorld/DisplayNote/NoteFrame.vue
@@ -2,7 +2,6 @@
   <div
     class="note-frame"
     ref="frameElem"
-    style="position: relative"
     :style="{
       'min-width': note.react.width.minCSS,
       width: note.react.width.finalCSS,
@@ -65,3 +64,9 @@ useResizeObserver(
   },
 );
 </script>
+
+<style scoped lang="scss">
+.note-frame {
+  position: relative; /* relative is needed for the zones and handles */
+}
+</style>
diff --git a/...esLayout/MainContent/DisplayPage/DisplayScreens/DisplayWorld/DisplayNote/NoteLinkIcon.vue b/...esLayout/MainContent/DisplayPage/DisplayScreens/DisplayWorld/DisplayNote/NoteLinkIcon.vue
@@ -1,7 +1,7 @@
 <template>
   <q-icon
     class="note-link-icon"
-    v-if="note.react.collab.link"
+    v-if="note.react.link.url"
     :name="note.react.link.external ? 'mdi-launch' : 'mdi-link-variant'"
     :size="note.react.link.external ? '15px' : '16px'"
   />

diff --git a/...creens/DisplayWorld/DisplayNote/NoteSection/NoteContainerSection/NoteContainerSection.vue b/...creens/DisplayWorld/DisplayNote/NoteSection/NoteContainerSection/NoteContainerSection.vue
@@ -1,8 +1,5 @@
 <template>
-  <NoteSection
-    section="container"
-    style="position: relative"
-  >
+  <NoteSection section="container">
     <NoteSpatialContainer v-if="note.react.collab.container.spatial" />
     <NoteListContainer v-else />
   </NoteSection>

diff --git a/...ayScreens/DisplayWorld/DisplayNote/NoteSection/NoteContainerSection/NoteListContainer.vue b/...ayScreens/DisplayWorld/DisplayNote/NoteSection/NoteContainerSection/NoteListContainer.vue
@@ -54,7 +54,6 @@
         v-for="(childNote, index) in note.react.notes"
         :key="childNote?.id ?? index"
         class="note-container-child"
-        style="z-index: 2147483646"
         :style="{
           'flex-direction': note.react.collab.container.horizontal
             ? 'row'