Merge pull request #21 from Quorafind/dev

Dev
Quorafind · Jan 9, 2022 · ee28cd5 · ee28cd5
2 parents b8a1617 + 450b5c3
commit ee28cd5
Show file tree

Hide file tree

Showing 8 changed files with 68 additions and 22 deletions.
diff --git a/main.js b/main.js
diff --git a/manifest.json b/manifest.json
@@ -2,7 +2,7 @@
   "id": "obsidian-memos",
   "name": "Obsidian Memos",
   "description": "Memos for Obsidian",
-  "version": "1.1.0",
+  "version": "1.1.2",
   "author": "Bonianll",
   "authorUrl": "https://github.com/Quorafind/",
   "isDesktopOnly": false,

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "obsidian-memos",
-  "version": "1.1.0",
+  "version": "1.1.2",
   "description": "A Flomo Like Plugin For Obsidian Daily Notes",
   "author": "boninall",
   "main": "main.js",

diff --git a/src/components/Editor/Editor.tsx b/src/components/Editor/Editor.tsx
@@ -253,12 +253,11 @@ const Editor = forwardRef((props: EditorProps, ref: React.ForwardedRef<EditorRef
           }}
           onInput={handleEditorInput}
           onKeyDown={handleEditorKeyDown}
-          // containerStyle={{
-          //   marginTop: 20,
-          //   width: 400,
-          //   height: 100,
-          //   margin: "20px auto"
-          // }}
+          dropdownStyle={{
+            minWidth: 180,
+            maxHeight: 250,
+            overflowY: "auto",
+          }}
           minChar={0}
           onItemSelected={handleInsertTrigger}
           scrollToItem={true}
@@ -268,7 +267,6 @@ const Editor = forwardRef((props: EditorProps, ref: React.ForwardedRef<EditorRef
               dataProvider: token => {
                 actualToken = token;
                 return usedTags(token)
-                  .slice(0, 10)
                   .map(({ name, char }) => ({ name, char }));
               },
               //eslint-disable-next-line

diff --git a/src/helpers/marked.ts b/src/helpers/marked.ts
@@ -31,7 +31,8 @@ const parseMarkedToHtml = (markedStr: string, memoid?: string): string => {
     .replace(DONE_BLOCK_REG, "<span class='todo-block' data-type='done'>✅</span>")
     .replace(BOLD_TEXT_REG, "<strong>$1</strong>")
     .replace(EM_TEXT_REG, "<em>$1</em>")
-    .replace(/&lt;br&gt;/g, "</p><p>");
+    .replace(/&lt;br&gt;/g, "</p><p>")
+    .replace(/&amp;/g, "&");
 
   let newHtmlText = htmlText;
 

diff --git a/src/less/search-bar.less b/src/less/search-bar.less
@@ -115,8 +115,8 @@ div[data-type="memos_view"] .search-bar-container {
       width: 100%;
       padding: 8px 16px;
       border-radius: 8px;
-      width: 150%;
-      margin-left: -80px;
+      width: 120%;
+      margin-left: -35px;
     }
 
     > .quickly-action-wrapper {

diff --git a/src/less/suggest.less b/src/less/suggest.less
@@ -5,7 +5,33 @@
     font-size: 18px;
     width: 100%;
     height: 100%;
-  }
+
+    > ::-webkit-scrollbar{
+       width:2px;
+       height:16px;
+       background-color:#F5F5F5;
+    }
+
+    > ::-webkit-scrollbar-track
+    {
+    //    -webkit-box-shadow:inset 0 0 6px rgba(0,0,0,0.3);
+    //    border-radius:10px;
+       background-color:#F5F5F5;
+    }
+
+    ::-webkit-scrollbar-thumb
+    {
+    //    border-radius:10px;
+    //    -webkit-box-shadow:inset 0 0 6px rgba(0,0,0,.3);
+       background-color:#555;
+    }
+
+    ::-webkit-scrollbar-track-piece
+    {
+        background-color:rgb(255, 255, 255);
+    }
+}
+
   .rta__loader.rta__loader--empty-suggestion-data {
     display: none;
     border-radius: 3px;
@@ -45,7 +71,7 @@
     padding: 0;
     background: #fff;
     border: 1px solid #dfe2e5;
-    border-radius: 8px;
+    border-radius: 0px;
     box-shadow: 0 0 10px rgba(27, 31, 35, 0.1);
     list-style: none;
   }
@@ -59,6 +85,7 @@
     cursor: pointer;
   }
   .rta__item {
+    text-overflow: "ellipsis";
     line-height: 30px;
   }
   .rta__item:fisrt-child{
@@ -68,7 +95,7 @@
     border-bottom: 1px solid #ecedee;
   }
   .rta__item:last-child{
-    border-radius: 0px 0px 8px 8px;
+    border-radius: 0px 0px 0px 0px;
   }
   .rta__entity > * {
     padding-left: 4px;

diff --git a/styles.css b/styles.css
@@ -228,6 +228,20 @@ div[data-type="memos_view"] .scroll::-webkit-scrollbar {
   width: 100%;
   height: 100%;
 }
+.rta > ::-webkit-scrollbar {
+  width: 2px;
+  height: 16px;
+  background-color: #F5F5F5;
+}
+.rta > ::-webkit-scrollbar-track {
+  background-color: #F5F5F5;
+}
+.rta ::-webkit-scrollbar-thumb {
+  background-color: #555;
+}
+.rta ::-webkit-scrollbar-track-piece {
+  background-color: #ffffff;
+}
 .rta__loader.rta__loader--empty-suggestion-data {
   display: none;
   border-radius: 3px;
@@ -267,7 +281,7 @@ div[data-type="memos_view"] .scroll::-webkit-scrollbar {
   padding: 0;
   background: #fff;
   border: 1px solid #dfe2e5;
-  border-radius: 8px;
+  border-radius: 0px;
   box-shadow: 0 0 10px rgba(27, 31, 35, 0.1);
   list-style: none;
 }
@@ -281,6 +295,7 @@ div[data-type="memos_view"] .scroll::-webkit-scrollbar {
   cursor: pointer;
 }
 .rta__item {
+  text-overflow: "ellipsis";
   line-height: 30px;
 }
 .rta__item:fisrt-child {
@@ -290,7 +305,7 @@ div[data-type="memos_view"] .scroll::-webkit-scrollbar {
   border-bottom: 1px solid #ecedee;
 }
 .rta__item:last-child {
-  border-radius: 0px 0px 8px 8px;
+  border-radius: 0px 0px 0px 0px;
 }
 .rta__entity > * {
   padding-left: 4px;
@@ -496,8 +511,8 @@ div[data-type="memos_view"] .search-bar-container > .quickly-action-wrapper:hove
     width: 100%;
     padding: 8px 16px;
     border-radius: 8px;
-    width: 150%;
-    margin-left: -80px;
+    width: 120%;
+    margin-left: -35px;
   }
   div[data-type="memos_view"] .search-bar-container > .quickly-action-wrapper {
     display: none;