poi-plugin-quest-info-2 0.9.15 → 0.10.1

package/build/questCodeMap.json

@@ -1,9 +1,4 @@
 {
-  "23070701": 992,
-  "23070702": 994,
-  "23070703": 993,
-  "23070704": 1131,
-  "23070705": 368,
   "A1": 101,
   "A2": 102,
   "A3": 103,
@@ -197,71 +192,72 @@
   "B124": 298,
   "B125": 299,
   "C1": 301,
-  "C4": 302,
-  "C2": 303,
-  "C3": 304,
+  "Cw1": 302,
+  "Cd1": 303,
+  "Cd2": 304,
   "WC01": 306,
   "C5": 307,
   "C6": 308,
   "C7": 309,
-  "C8": 311,
+  "Cm1": 311,
   "C9": 312,
-  "C69": 313,
+  "Cs1": 313,
   "C71": 314,
-  "C64": 315,
+  "Cs3": 315,
   "C13": 316,
   "C15": 317,
-  "C16": 318,
+  "Cm2": 318,
   "C17": 319,
   "C18": 320,
   "C20": 322,
   "C21": 323,
   "C22": 324,
   "C23": 325,
-  "": 326,
+  "Cs5": 326,
   "C25": 327,
   "C27": 328,
-  "C29": 330,
+  "Cq1": 330,
   "C31": 331,
   "C32": 332,
   "C33": 333,
   "C34": 334,
   "C35": 335,
   "C37": 336,
-  "C38": 337,
+  "Cq2": 337,
   "C39": 338,
-  "C42": 339,
-  "C44": 342,
+  "Cq3": 339,
+  "Cq4": 342,
   "C46": 343,
   "C48": 344,
-  "C49": 345,
-  "C50": 346,
+  "Cy1": 345,
+  "Cy2": 346,
   "C51": 347,
-  "C53": 348,
-  "C55": 350,
+  "Cy3": 348,
+  "Cy4": 350,
   "C56": 351,
   "C57": 352,
-  "C58": 353,
-  "C60": 354,
-  "C62": 355,
-  "C65": 356,
-  "C66": 357,
+  "Cy5": 353,
+  "Cy6": 354,
+  "Cy7": 355,
+  "Cy8": 356,
+  "Cy9": 357,
   "C68": 358,
   "C70": 360,
-  "C72": 362,
+  "Cy10": 362,
   "C73": 364,
   "C75": 365,
   "C76": 366,
+  "Cy11": 368,
   "D1": 401,
-  "D2": 402,
-  "D3": 403,
-  "D4": 404,
+  "Dd1": 402,
+  "Dd2": 403,
+  "Dw1": 404,
   "D5": 405,
   "D6": 406,
   "D7": 408,
   "D8": 409,
-  "D9": 410,
-  "D11": 411,
+  "Dw2": 410,
+  "Dw3": 411,
   "D10": 412,
   "D12": 413,
   "D13": 414,
@@ -273,60 +269,60 @@
   "D19": 420,
   "D20": 422,
   "D21": 423,
-  "D22": 424,
+  "Dm1": 424,
   "D23": 425,
-  "D24": 426,
+  "Dq1": 426,
   "D25": 427,
-  "D26": 428,
+  "Dq2": 428,
   "D27": 429,
   "D28": 430,
   "D29": 431,
   "D30": 432,
   "D31": 433,
-  "D32": 434,
-  "D33": 436,
-  "D34": 437,
-  "D35": 438,
-  "D36": 439,
-  "D37": 440,
-  "D38": 442,
+  "Dy1": 434,
+  "Dy2": 436,
+  "Dy3": 437,
+  "Dy4": 438,
+  "Dy5": 439,
+  "Dy6": 440,
+  "Dy7": 442,
   "D39": 443,
-  "D40": 444,
+  "Dy8": 444,
   "D41": 445,
   "D42": 446,
   "D43": 447,
   "E1": 501,
   "E2": 502,
-  "E3": 503,
-  "E4": 504,
+  "Ed1": 503,
+  "Ed2": 504,
   "F1": 601,
   "F2": 602,
   "F3": 603,
   "F4": 604,
-  "F5": 605,
-  "F6": 606,
-  "F7": 607,
-  "F8": 608,
-  "F9": 609,
+  "Fd1": 605,
+  "Fd2": 606,
+  "Fd3": 607,
+  "Fd4": 608,
+  "Fd5": 609,
   "F10": 610,
   "WF01": 611,
   "F11": 612,
-  "F12": 613,
+  "Fw1": 613,
   "F13": 614,
   "F14": 615,
   "F15": 616,
   "F16": 617,
   "F17": 618,
-  "F18": 619,
+  "Fd6": 619,
   "F88": 620,
   "F89": 621,
   "F20": 622,
   "F19": 623,
   "F21": 624,
   "F23": 625,
-  "F22": 626,
+  "Fm1": 626,
   "F24": 627,
-  "F25": 628,
+  "Fm2": 628,
   "F26": 629,
   "F28": 630,
   "F27": 631,
@@ -335,14 +331,14 @@
   "F31": 634,
   "F32": 635,
   "F33": 636,
-  "F35": 637,
-  "F34": 638,
+  "Fq1": 637,
+  "Fw2": 638,
   "F36": 639,
   "F37": 641,
   "F38": 642,
-  "F39": 643,
+  "Fq2": 643,
   "F40": 644,
-  "F41": 645,
+  "Fm3": 645,
   "F42": 646,
   "F43": 647,
   "F44": 648,
@@ -350,17 +346,17 @@
   "F46": 650,
   "F47": 651,
   "F48": 652,
-  "F90": 653,
-  "F93": 654,
-  "F94": 655,
+  "Fq9": 653,
+  "Fy2": 654,
+  "Fy3": 655,
   "F49": 656,
-  "F92": 657,
+  "Fy1": 657,
   "F50": 658,
   "F51": 659,
   "F52": 660,
   "F53": 661,
   "F54": 662,
-  "F55": 663,
+  "Fq3": 663,
   "F56": 664,
   "F57": 665,
   "F58": 666,
@@ -370,22 +366,22 @@
   "F63": 670,
   "F62": 671,
   "F64": 672,
-  "F65": 673,
-  "F66": 674,
-  "F67": 675,
-  "F68": 676,
-  "F69": 677,
-  "F70": 678,
+  "Fd7": 673,
+  "Fd8": 674,
+  "Fq4": 675,
+  "Fw3": 676,
+  "Fw4": 677,
+  "Fq5": 678,
   "F71": 679,
-  "F72": 680,
-  "F95": 681,
+  "Fq6": 680,
+  "Fy4": 681,
   "F73": 682,
   "F74": 683,
   "F75": 684,
   "F76": 685,
-  "F77": 686,
+  "Fq7": 686,
   "F78": 687,
-  "F79": 688,
+  "Fq8": 688,
   "F80": 689,
   "F81": 690,
   "F82": 691,
@@ -396,14 +392,14 @@
   "F87": 696,
   "F91": 698,
   "G1": 701,
-  "G2": 702,
-  "G3": 703,
+  "Gd1": 702,
+  "Gw1": 703,
   "G4": 704,
   "G5": 705,
-  "G6": 714,
-  "G7": 715,
-  "G8": 716,
-  "G9": 717,
+  "Gy1": 714,
+  "Gy2": 715,
+  "Gy3": 716,
+  "Gy4": 717,
   "G10": 718,
   "G11": 719,
   "B58": 805,
@@ -551,17 +547,20 @@
   "B186": 982,
   "B187": 983,
   "B188": 989,
+  "2307B1": 992,
+  "B193": 993,
+  "2307B2": 994,
   "B189": 995,
   "B190": 996,
   "B191": 997,
   "B192": 998,
   "F96": 1101,
   "F97": 1102,
-  "F98": 1103,
-  "F99": 1104,
-  "F100": 1105,
+  "Fy5": 1103,
+  "Fy6": 1104,
+  "Fy7": 1105,
   "F101": 1106,
-  "F102": 1107,
+  "Fy8": 1107,
   "F103": 1108,
   "F104": 1109,
   "F105": 1111,
@@ -572,10 +571,11 @@
   "F110": 1116,
   "F111": 1117,
   "F112": 1118,
-  "F113": 1120,
-  "F114": 1123,
+  "Fy9": 1120,
+  "Fy10": 1123,
   "F115": 1127,
   "F116": 1128,
   "F117": 1129,
-  "F118": 1130
+  "F118": 1130,
+  "F119": 1131
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "poi-plugin-quest-info-2",
-  "version": "0.9.15",
+  "version": "0.10.1",
   "private": false,
   "description": "show quest info",
   "homepage": "https://github.com/lawvs/poi-plugin-quest-2/",
@@ -18,6 +18,7 @@
   },
   "main": "src/index.ts",
   "scripts": {
+    "dev": "npm run storybook",
     "build": "npm run convertAssets && npm run update",
     "build-storybook": "build-storybook",
     "clean": "rm -rf build",
@@ -37,6 +38,7 @@
   },
   "dependencies": {
     "moize": "^6.1.1",
+    "react-highlight-words": "^0.20.0",
     "react-use": "^17.3.1",
     "react-virtualized-auto-sizer": "^1.0.6",
     "react-window": "^1.8.7"
@@ -51,6 +53,7 @@
     "@storybook/react": "^6.3.4",
     "@types/jest": "^27.4.1",
     "@types/pangu": "^3.3.0",
+    "@types/react-highlight-words": "^0.16.4",
     "@types/react-virtualized-auto-sizer": "^1.0.1",
     "@types/react-window": "^1.8.5",
     "@types/sharp": "^0.27.1",

package/src/Toolbar.tsx

@@ -2,7 +2,6 @@ import { Button, InputGroup } from '@blueprintjs/core'
 import { IconNames } from '@blueprintjs/icons'
 import type { ChangeEvent } from 'react'
 import React, { useCallback } from 'react'
-import { useThrottle } from 'react-use'
 import styled from 'styled-components'
 import { usePluginTranslation } from './poi/hooks'
 import { QUEST_STATUS, UnionQuest } from './questHelper'
@@ -13,8 +12,8 @@ import {
   useSyncGameTagEffect,
 } from './store/filterTags'
 import { useGlobalQuestStatusQuery } from './store/gameQuest'
-import { useSearchInput } from './store/search'
-import { CategoryTags, CATEGORY_TAGS, TypeTags, TYPE_TAGS } from './tags'
+import { useSearchInput, useStableSearchWords } from './store/search'
+import { CATEGORY_TAGS, CategoryTags, TYPE_TAGS, TypeTags } from './tags'
 import { And, Or } from './utils'
 
 const ToolbarWrapper = styled.div`
@@ -71,14 +70,7 @@ export const Toolbar = () => {
 }
 
 const useInputStringFilter = () => {
-  const { searchInput } = useSearchInput()
-  const throttledSearchInput = useThrottle(searchInput)
-  const searchKeywords = throttledSearchInput
-    .split(' ')
-    // Remove empty string
-    .filter((i) => !!i)
-    .map((i) => i.toUpperCase())
-
+  const searchKeywords = useStableSearchWords()
   const stringFilter = useCallback(
     (quest: UnionQuest) => {
       if (!searchKeywords || !searchKeywords.length) {
@@ -86,7 +78,7 @@ const useInputStringFilter = () => {
       }
       const text = `${quest.docQuest.code} ${quest.docQuest.name} ${
         quest.docQuest.desc
-      } ${quest.docQuest.memo ?? ''} ${quest.docQuest.memo2 ?? ''}`
+      } ${quest.docQuest.rewards ?? ''} ${quest.docQuest.memo2 ?? ''}`
       return searchKeywords.some((keyword) =>
         text.toUpperCase().includes(keyword)
       )