update: limit wordlist draggable bar

festoney8 · Mar 27, 2024 · 6df9d27 · 6df9d27
1 parent 6e70d53
commit 6df9d27
Show file tree

Hide file tree

Showing 7 changed files with 35 additions and 21 deletions.
diff --git a/src/components/wordlist.ts b/src/components/wordlist.ts
@@ -198,6 +198,20 @@ export class WordList {
                     const diffY = e.clientY - initY
                     wordlist.style.left = `${initLeft + diffX}px`
                     wordlist.style.top = `${initTop + diffY}px`
+                    // 限制bar不超出视口
+                    const rect = bar.getBoundingClientRect()
+                    if (rect.left < 0) {
+                        wordlist.style.left = `${initLeft + diffX - rect.left}px`
+                    }
+                    if (rect.top < 0) {
+                        wordlist.style.top = `${initTop + diffY - rect.top}px`
+                    }
+                    if (rect.right > window.innerWidth) {
+                        wordlist.style.left = `${initLeft + diffX - (rect.right - window.innerWidth)}px`
+                    }
+                    if (rect.bottom > window.innerHeight) {
+                        wordlist.style.top = `${initTop + diffY - (rect.bottom - window.innerHeight)}px`
+                    }
                 }
             })
             document.addEventListener('mouseup', () => {

diff --git a/src/filters/videoFilter/pages/actions/action.ts b/src/filters/videoFilter/pages/actions/action.ts
@@ -262,7 +262,7 @@ export class UploaderKeywordAction implements VideoFilterAction {
         // 初始化黑名单, callback触发edit
         this.blacklist = new WordList(
             this.valueKey,
-            '昵称关键词 黑名单',
+            'UP主昵称关键词 黑名单',
             `每行一个关键词，支持正则(iv)，语法：/abc|\\d+/`,
             (values: string[]) => {
                 this.edit(values)

diff --git a/src/filters/videoFilter/pages/channel.ts b/src/filters/videoFilter/pages/channel.ts
@@ -286,21 +286,21 @@ if (isPageChannel()) {
                 channelUploaderAction.blacklist.show()
             },
         }),
-        // 启用 昵称关键词过滤
+        // 启用 UP主昵称关键词过滤
         new CheckboxItem({
             itemID: channelUploaderKeywordAction.statusKey,
-            description: '启用 昵称关键词过滤',
+            description: '启用 UP主昵称关键词过滤',
             itemFunc: () => {
                 channelUploaderKeywordAction.enable()
             },
             callback: () => {
                 channelUploaderKeywordAction.disable()
             },
         }),
-        // 编辑 昵称关键词黑名单
+        // 编辑 UP主昵称关键词黑名单
         new ButtonItem({
             itemID: 'channel-uploader-keyword-edit-button',
-            description: '编辑 昵称关键词黑名单',
+            description: '编辑 UP主昵称关键词黑名单',
             name: '编辑',
             itemFunc: () => {
                 channelUploaderKeywordAction.blacklist.show()

diff --git a/src/filters/videoFilter/pages/homepage.ts b/src/filters/videoFilter/pages/homepage.ts
@@ -320,21 +320,21 @@ if (isPageHomepage()) {
                 homepageUploaderAction.blacklist.show()
             },
         }),
-        // 启用 昵称关键词过滤
+        // 启用 UP主昵称关键词过滤
         new CheckboxItem({
             itemID: homepageUploaderKeywordAction.statusKey,
-            description: '启用 昵称关键词过滤',
+            description: '启用 UP主昵称关键词过滤',
             itemFunc: () => {
                 homepageUploaderKeywordAction.enable()
             },
             callback: () => {
                 homepageUploaderKeywordAction.disable()
             },
         }),
-        // 编辑 昵称关键词黑名单
+        // 编辑 UP主昵称关键词黑名单
         new ButtonItem({
             itemID: 'homepage-uploader-keyword-edit-button',
-            description: '编辑 昵称关键词黑名单',
+            description: '编辑 UP主昵称关键词黑名单',
             name: '编辑',
             itemFunc: () => {
                 homepageUploaderKeywordAction.blacklist.show()

diff --git a/src/filters/videoFilter/pages/popular.ts b/src/filters/videoFilter/pages/popular.ts
@@ -255,21 +255,21 @@ if (isPagePopular()) {
                 popularUploaderAction.blacklist.show()
             },
         }),
-        // 启用 昵称关键词过滤
+        // 启用 UP主昵称关键词过滤
         new CheckboxItem({
             itemID: popularUploaderKeywordAction.statusKey,
-            description: '启用 昵称关键词过滤',
+            description: '启用 UP主昵称关键词过滤',
             itemFunc: () => {
                 popularUploaderKeywordAction.enable()
             },
             callback: () => {
                 popularUploaderKeywordAction.disable()
             },
         }),
-        // 编辑 昵称关键词黑名单
+        // 编辑 UP主昵称关键词黑名单
         new ButtonItem({
             itemID: 'popular-uploader-keyword-edit-button',
-            description: '编辑 昵称关键词黑名单',
+            description: '编辑 UP主昵称关键词黑名单',
             name: '编辑',
             itemFunc: () => {
                 popularUploaderKeywordAction.blacklist.show()

diff --git a/src/filters/videoFilter/pages/search.ts b/src/filters/videoFilter/pages/search.ts
@@ -275,21 +275,21 @@ if (isPageSearch()) {
                 searchUploaderAction.blacklist.show()
             },
         }),
-        // 启用 昵称关键词过滤
+        // 启用 UP主昵称关键词过滤
         new CheckboxItem({
             itemID: searchUploaderKeywordAction.statusKey,
-            description: '启用 昵称关键词过滤',
+            description: '启用 UP主昵称关键词过滤',
             itemFunc: () => {
                 searchUploaderKeywordAction.enable()
             },
             callback: () => {
                 searchUploaderKeywordAction.disable()
             },
         }),
-        // 编辑 昵称关键词黑名单
+        // 编辑 UP主昵称关键词黑名单
         new ButtonItem({
             itemID: 'search-uploader-keyword-edit-button',
-            description: '编辑 昵称关键词黑名单',
+            description: '编辑 UP主昵称关键词黑名单',
             name: '编辑',
             itemFunc: () => {
                 searchUploaderKeywordAction.blacklist.show()

diff --git a/src/filters/videoFilter/pages/video.ts b/src/filters/videoFilter/pages/video.ts
@@ -273,21 +273,21 @@ if (isPageVideo() || isPagePlaylist()) {
                 videoUploaderAction.blacklist.show()
             },
         }),
-        // 启用 昵称关键词过滤
+        // 启用 UP主昵称关键词过滤
         new CheckboxItem({
             itemID: videoUploaderKeywordAction.statusKey,
-            description: '启用 昵称关键词过滤',
+            description: '启用 UP主昵称关键词过滤',
             itemFunc: () => {
                 videoUploaderKeywordAction.enable()
             },
             callback: () => {
                 videoUploaderKeywordAction.disable()
             },
         }),
-        // 编辑 昵称关键词黑名单
+        // 编辑 UP主昵称关键词黑名单
         new ButtonItem({
             itemID: 'video-uploader-keyword-edit-button',
-            description: '编辑 昵称关键词黑名单',
+            description: '编辑 UP主昵称关键词黑名单',
             name: '编辑',
             itemFunc: () => {
                 videoUploaderKeywordAction.blacklist.show()