massively improve UX of clicking around annotations on a page

- insta close the annotation editor and open for the next note
WorldBrain · Jul 26, 2024 · f7bbfe8 · f7bbfe8
1 parent f3ed1f8
commit f7bbfe8
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 3 deletions.
diff --git a/external/@worldbrain/memex-common b/external/@worldbrain/memex-common
diff --git a/src/content-scripts/content_script/global.ts b/src/content-scripts/content_script/global.ts
@@ -1456,6 +1456,7 @@ export async function main(
             getState: tooltipUtils.getTooltipState,
             setState: tooltipUtils.setTooltipState,
         },
+        shouldInitTooltip: areHighlightsEnabled,
     })
 
     // 9. Check for page activity status

diff --git a/src/in-page-ui/tooltip/content_script/components/index.tsx b/src/in-page-ui/tooltip/content_script/components/index.tsx
@@ -374,12 +374,23 @@ class TooltipRoot extends React.Component<TooltipRootProps, TooltipRootState> {
     saveAnnotation = async (
         commentState: string,
         color?: HighlightColor['id'],
+        unifiedId?: string,
+        dontUpdateState?: boolean,
     ) => {
-        const currentAnnotation = this.state.currentAnnotation
+        let currentAnnotation = undefined
+        let comment = commentState
+
+        if (unifiedId) {
+            currentAnnotation = this.props.annotationsCache.annotations.byId[
+                unifiedId
+            ]
+        } else {
+            currentAnnotation = this.state.currentAnnotation
+        }
+
         const existingHighlight = this.props.annotationsCache.annotations.byId[
             currentAnnotation.unifiedId
         ]
-        const comment = commentState
 
         this.props.annotationsCache.updateAnnotation(
             {
@@ -413,6 +424,10 @@ class TooltipRoot extends React.Component<TooltipRootProps, TooltipRootState> {
         } catch (err) {
             console.log(err)
         }
+
+        if (dontUpdateState) {
+            return
+        }
         this.setState({
             currentAnnotation: {
                 ...currentAnnotation,