From ca1fdf48088003536ac991d27565471161a18d1a Mon Sep 17 00:00:00 2001
From: Frankreed <baoanhtdn@gmail.com>
Date: Mon, 24 Jun 2024 15:07:10 -0700
Subject: [PATCH 1/2] improved Saved highlight text box behavior for smaller
 spaces and settings bar

---
 apps/unclutter/source/overlay/index.css               |  2 +-
 .../source/sidebar/components/AnnotationDraft.tsx     | 11 ++++++-----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/apps/unclutter/source/overlay/index.css b/apps/unclutter/source/overlay/index.css
index aeed319bf..74dd0eec5 100644
--- a/apps/unclutter/source/overlay/index.css
+++ b/apps/unclutter/source/overlay/index.css
@@ -279,7 +279,7 @@
     }
     #lindy-annotations-bar {
         left: calc(var(--lindy-pagewidth) + 10px + 5px) !important;
-        width: calc(100vw - (var(--lindy-pagewidth) + 10px + 5px) - 15px) !important;
+        width: calc(100vw - (var(--lindy-pagewidth) + 10px + 5px) - 46px) !important;
     }
     .lindy-page-settings-pageadjacent {
         left: calc(var(--lindy-pagewidth) + 10px + 0px) !important;
diff --git a/apps/unclutter/source/sidebar/components/AnnotationDraft.tsx b/apps/unclutter/source/sidebar/components/AnnotationDraft.tsx
index da6fc4e2f..d4f774a59 100644
--- a/apps/unclutter/source/sidebar/components/AnnotationDraft.tsx
+++ b/apps/unclutter/source/sidebar/components/AnnotationDraft.tsx
@@ -75,7 +75,7 @@ export default function AnnotationDraft({
     return (
         <div
             className={clsx(
-                `annotation annotation-draft relative rounded-l-sm rounded-r-md p-2 px-3 text-sm shadow`,
+                `annotation annotation-draft relative rounded-l-sm rounded-r-md p-2 px-3 text-sm shadow flex flex-wrap`,
                 annotation.focused && "focused",
                 className
             )}
@@ -84,11 +84,12 @@ export default function AnnotationDraft({
                 // @ts-ignore
                 "--dark-border-color": colorDark || color,
                 maxHeight: heightLimitPx,
+                minWidth: 110,
             }}
             // ref={ref}
         >
             <TextareaAutosize
-                className="w-full select-none resize-none overflow-hidden bg-transparent align-top outline-none placeholder:select-none placeholder:text-stone-400 dark:placeholder:text-stone-600"
+                className="select-none resize-none overflow-hidden bg-transparent align-top outline-none placeholder:select-none placeholder:text-stone-400 dark:placeholder:text-stone-600 grow"
                 placeholder={
                     userInfo?.aiEnabled
                         ? annotation.tags.map((t) => `#${t}`).join(" ")
@@ -116,9 +117,9 @@ export default function AnnotationDraft({
             {isFetching ? (
                 <div className="loader absolute right-3 top-[9px] h-4 w-4" />
             ) : (
-                <div className="animate-fadein absolute top-[1px] right-1 flex gap-0 text-stone-400 dark:text-stone-600">
+                <div className="animate-fadein flex gap-4 text-stone-400 dark:text-stone-600">
                     <svg
-                        className="annotation-button h-8 cursor-pointer p-2"
+                        className="annotation-button h-4 cursor-pointer"
                         viewBox="0 0 512 512"
                         onMouseDown={(e) => e.preventDefault()}
                         onClick={() => copyTextToClipboard(`"${annotation.quote_text}"`)}
@@ -129,7 +130,7 @@ export default function AnnotationDraft({
                         />
                     </svg>
                     <svg
-                        className="annotation-button h-8 cursor-pointer p-2"
+                        className="annotation-button h-4 cursor-pointer"
                         viewBox="0 0 448 512"
                         onMouseDown={(e) => e.preventDefault()}
                         onClick={() => deleteAnnotation(userInfo, annotation)}

From 5c2207d239a7fb532ff03df1c96042f391d9c8bc Mon Sep 17 00:00:00 2001
From: Frankreed <baoanhtdn@gmail.com>
Date: Mon, 24 Jun 2024 16:06:27 -0700
Subject: [PATCH 2/2] disables highlight mode by default, and handled the case
 where the left sidebar is visible

---
 apps/unclutter/source/common/featureFlags.ts                    | 2 +-
 apps/unclutter/source/overlay/index.css                         | 2 +-
 .../source/overlay/ui/Controls/PrivateNotesControl.svelte       | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/apps/unclutter/source/common/featureFlags.ts b/apps/unclutter/source/common/featureFlags.ts
index 55e8ceab4..d6ce123da 100644
--- a/apps/unclutter/source/common/featureFlags.ts
+++ b/apps/unclutter/source/common/featureFlags.ts
@@ -56,7 +56,7 @@ export const defaultFeatureFlags = {
     [isDevelopmentFeatureFlag]: false,
     [enableSocialCountsFeatureFlag]: true,
 
-    [enableAnnotationsFeatureFlag]: true,
+    [enableAnnotationsFeatureFlag]: false,
     [enableSocialCommentsFeatureFlag]: true,
 
     [submittedFeedbackFlag]: false,
diff --git a/apps/unclutter/source/overlay/index.css b/apps/unclutter/source/overlay/index.css
index 74dd0eec5..176d835af 100644
--- a/apps/unclutter/source/overlay/index.css
+++ b/apps/unclutter/source/overlay/index.css
@@ -186,7 +186,7 @@
     position: absolute !important;
     top: 8px !important;
     left: calc((100vw - var(--lindy-pagewidth)) / 2 + var(--lindy-pagewidth) - 4px) !important;
-    width: calc((100vw - var(--lindy-pagewidth)) / 2 - 8px - 4px) !important;
+    width: calc((100vw - var(--lindy-pagewidth)) / 2 - 8px - 34px) !important;
     height: calc(100% - 8px) !important;
     user-select: none !important;
     contain: strict !important;
diff --git a/apps/unclutter/source/overlay/ui/Controls/PrivateNotesControl.svelte b/apps/unclutter/source/overlay/ui/Controls/PrivateNotesControl.svelte
index 3f8f68cb0..14a785563 100644
--- a/apps/unclutter/source/overlay/ui/Controls/PrivateNotesControl.svelte
+++ b/apps/unclutter/source/overlay/ui/Controls/PrivateNotesControl.svelte
@@ -14,7 +14,7 @@
     export let smartHighlightsProxy: SmartHighlightsProxy;
     export let overlayModifier: OverlayManager;
 
-    let privateNotesEnabled: boolean = true;
+    let privateNotesEnabled: boolean = false;
     getFeatureFlag(enableAnnotationsFeatureFlag).then((defaultEnabled) => {
         privateNotesEnabled = defaultEnabled;
     });