Merge pull request #37 from betterRunner/dev

Dev

Author: betterRunner

CHANGELOG.md

@@ -1,3 +1,32 @@
+## [1.3.6](https://github.com/betterRunner/context-note/compare/v1.2.2...v1.3.6) (2021-12-25)
+
+
+### Bug Fixes
+
+*  put the notes with the current location href to the head. ([81360db](https://github.com/betterRunner/context-note/commit/81360db9c0fcf46e5c98dcec9daf89372775b2fe))
+* clear search text when tag-searcher close ([56b0f2b](https://github.com/betterRunner/context-note/commit/56b0f2b2e78984a6691f5c8003b8779cd2b539be))
+* close button ([a2f46fd](https://github.com/betterRunner/context-note/commit/a2f46fd45ab62df661c3ee1335a4855e4e23caed))
+* close icon ([e9803dc](https://github.com/betterRunner/context-note/commit/e9803dcb2ca44f1a4f813695efaea018daebbdec))
+* css on windows ([4e6f22c](https://github.com/betterRunner/context-note/commit/4e6f22ca5cfd43f25500bf63c78d064e3bbe778e))
+* el-overlay z-index ([7e7b62d](https://github.com/betterRunner/context-note/commit/7e7b62df0dec2d7f0e821426252e92e8a419bba1))
+* handleClickOutsideEditor trigger bug ([045c6c8](https://github.com/betterRunner/context-note/commit/045c6c8c8f352928a0156f861560d2acd10f9624))
+* hightlight rects not occupying click event ([f0d4e07](https://github.com/betterRunner/context-note/commit/f0d4e07b3b7af6346cb4c59728b78b757a41a730))
+* more button top ([4032321](https://github.com/betterRunner/context-note/commit/40323213559fca34ea12d4fac55f8fc72f2a8c8c))
+* padding & scrollbar ([ecedbb7](https://github.com/betterRunner/context-note/commit/ecedbb76d29d0b098bf7bd5995e5b3c41ed7621e))
+* popup is hided in small screen ([0950940](https://github.com/betterRunner/context-note/commit/0950940d7d1d668a22d1289989e03c976ff57710))
+* scrollbar of page disappers ([3f5dc31](https://github.com/betterRunner/context-note/commit/3f5dc319dc0149dbf18863ec2d66ca92ad124752))
+* storage write not working ([bf5827b](https://github.com/betterRunner/context-note/commit/bf5827b56b1f5cc02ac53d37554d85b44d9500ed))
+* tag & more css ([b88539f](https://github.com/betterRunner/context-note/commit/b88539fc2a1790ab1c59c3b946a1c8ec0c64b732))
+* wait to run storage oper until prev one finished ([64e3806](https://github.com/betterRunner/context-note/commit/64e38062388e533048507ac34bbeb0ba50e9c5f5))
+
+
+### Features
+
+* copy note to clipboard ([403f7f7](https://github.com/betterRunner/context-note/commit/403f7f7460f1ce9ad086ae9477cc7f2a0acb7007))
+* import notes ([74857b1](https://github.com/betterRunner/context-note/commit/74857b12d45ba41cd0bb1a6db4823134a419f884))
+
+
+
 ## [1.3.5](https://github.com/betterRunner/context-note/compare/v1.3.2...v1.3.5) (2021-11-16)
 
 

package.json

@@ -1,6 +1,6 @@
 {
     "name": "context-note",
-    "version": "1.3.5",
+    "version": "1.3.6",
     "scripts": {
         "dev": "vite build --mode developmemnt",
         "build": "vite build",

src/content-scripts/main.css

@@ -12,13 +12,13 @@ will be invisible, so set left to 0. */
   left: 0 !important;
 }
 
-/* ::-webkit-scrollbar {
+.popup-wrapper::-webkit-scrollbar {
   width: 5px !important;
 }
-::-webkit-scrollbar-track {
-  -webkit-box-shadow: inset006pxrgba(0, 0, 0, 0.3) !important;
+.popup-wrapper::-webkit-scrollbar-track {
+  -webkit-box-shadow: rgba(0, 0, 0, 0.3) !important;
   border-radius: 5px !important;
 }
-::-webkit-scrollbar-thumb:window-inactive {
+.popup-wrapper::-webkit-scrollbar-thumb:window-inactive {
   background: #aaa !important;
-} */
+}

src/content-scripts/renderer/popup/index.vue

@@ -103,6 +103,7 @@ export default defineComponent({
     right: 5px;
     top: 5px;
     cursor: pointer;
+    color: white;
   }
 }
 </style>

src/content-scripts/renderer/popup/note-book/note-list.vue

@@ -42,39 +42,45 @@ export default defineComponent({
     /// search note
     const searchText = ref("");
     const searchedNotes = computed((): TNote[] => {
-      const notes = storage.notes;
+      let notes = storage.notes;
 
-      if (!searchText.value) return notes;
-
-      const plainNotes = notes.map((n) => ({
-        id: n.id,
-        plainText: (n.note as Delta)?.ops
-          ?.map((o: { insert: any }) => o?.insert || "")
-          .join(""),
-      }));
-      const filteredPlainNoteIds = filterArrBySearchText(
-        plainNotes,
-        "plainText",
-        searchText.value
-      ).map((n) => n.id);
-      // fitler by `searchText` in the following order
-      let ids = [
-        // 1. filter by content
-        ...filterArrBySearchText(notes, "content", searchText.value).map((n) => n.id),
-        // 2. filter by plain note
-        ...filteredPlainNoteIds,
-        // 3. filter by tags
-        ...notes
-          .filter((n) => !!filterArrBySearchText(n.tags, "", searchText.value).length)
-          .map((n) => n.id),
-        // 4. filter by link
-        ...notes.filter((n) => n.link.includes(searchText.value)).map((n) => n.id),
+      if (searchText.value) {
+        const plainNotes = notes.map((n) => ({
+          id: n.id,
+          plainText: (n.note as Delta)?.ops
+            ?.map((o: { insert: any }) => o?.insert || "")
+            .join(""),
+        }));
+        const filteredPlainNoteIds = filterArrBySearchText(
+          plainNotes,
+          "plainText",
+          searchText.value
+        ).map((n) => n.id);
+        // fitler by `searchText` in the following order
+        let ids = [
+          // 1. filter by content
+          ...filterArrBySearchText(notes, "content", searchText.value).map((n) => n.id),
+          // 2. filter by plain note
+          ...filteredPlainNoteIds,
+          // 3. filter by tags
+          ...notes
+            .filter((n) => !!filterArrBySearchText(n.tags, "", searchText.value).length)
+            .map((n) => n.id),
+          // 4. filter by link
+          ...notes.filter((n) => n.link.includes(searchText.value)).map((n) => n.id),
+        ];
+        // remove the duplicated ids
+        ids = Array.from(new Set(ids));
+        notes = ids
+          .map((id) => notes.find((n) => n.id === id))
+          .filter((n) => !!n) as TNote[];
+      }
+      // put the ones with the current location href to the head.
+      const href = removeUrlPostfix(window.location.href);
+      return [
+        ...notes.filter(n => n.link === href),
+        ...notes.filter(n => n.link !== href)
       ];
-      // remove the duplicated ids
-      ids = Array.from(new Set(ids));
-      return ids
-        .map((id) => notes.find((n) => n.id === id))
-        .filter((n) => !!n) as TNote[];
     });
 
     /// create note
@@ -273,7 +279,7 @@ export default defineComponent({
 
   .note-list-search {
     margin-bottom: 10px;
-    background: #fff !important;
+    background: unset !important;
     max-width: 500px;
   }
 

src/content-scripts/renderer/popup/note-book/note.vue

@@ -260,7 +260,7 @@ export default {
 
 <style lang="less" scoped>
 .note-wrapper {
-  padding: 16px;
+  padding: 10px 16px;
   background: white;
   box-shadow: 1px 2px 2px 0 rgba(0, 0, 0, 0.1);
   margin-bottom: 20px;
@@ -353,7 +353,7 @@ export default {
 }
 .note-more-opers {
   position: absolute;
-  top: 5px;
+  top: 0px;
   right: 10px;
   cursor: pointer;
   padding: 5px;