poi-plugin-quest-info-2 0.8.3 → 0.8.6

package/build/prePostQuest.json

@@ -1375,7 +1375,8 @@
       "Bm4"
     ],
     "post": [
-      "B49"
+      "B49",
+      "B181"
     ]
   },
   "261": {
@@ -1753,7 +1754,7 @@
       "C3",
       "C61",
       "C63",
-      "C54",
+      "C64",
       "C48",
       "F44",
       "F82",
@@ -1773,7 +1774,8 @@
       "C2"
     ],
     "post": [
-      "F46"
+      "F46",
+      "F109"
     ]
   },
   "306": {
@@ -2025,6 +2027,7 @@
     ],
     "post": [
       "C49",
+      "C66",
       "F91"
     ]
   },
@@ -2065,6 +2068,22 @@
     ],
     "post": []
   },
+  "356": {
+    "pre": [
+      "B180"
+    ],
+    "post": [
+      "By12"
+    ]
+  },
+  "357": {
+    "pre": [
+      "C46"
+    ],
+    "post": [
+      "B182"
+    ]
+  },
   "401": {
     "pre": [
       "A5"
@@ -3557,7 +3576,8 @@
       "B78"
     ],
     "post": [
-      "B86"
+      "B86",
+      "B180"
     ]
   },
   "828": {
@@ -3613,7 +3633,9 @@
       "B79",
       "B85"
     ],
-    "post": []
+    "post": [
+      "B179"
+    ]
   },
   "838": {
     "pre": [
@@ -4084,7 +4106,8 @@
       "B140"
     ],
     "post": [
-      "Bq13"
+      "Bq13",
+      "By11"
     ]
   },
   "903": {
@@ -4097,7 +4120,9 @@
     "pre": [
       "B44"
     ],
-    "post": []
+    "post": [
+      "B180"
+    ]
   },
   "905": {
     "pre": [
@@ -4529,6 +4554,82 @@
     ],
     "post": []
   },
+  "970": {
+    "pre": [
+      "B86"
+    ],
+    "post": []
+  },
+  "971": {
+    "pre": [],
+    "post": [
+      "2204B3"
+    ]
+  },
+  "972": {
+    "pre": [
+      "2204B2"
+    ],
+    "post": []
+  },
+  "973": {
+    "pre": [
+      "B141"
+    ],
+    "post": []
+  },
+  "974": {
+    "pre": [
+      "B79",
+      "By1"
+    ],
+    "post": [
+      "C65"
+    ]
+  },
+  "975": {
+    "pre": [
+      "C65"
+    ],
+    "post": []
+  },
+  "976": {
+    "pre": [
+      "B32",
+      "F109"
+    ],
+    "post": [
+      "B182"
+    ]
+  },
+  "977": {
+    "pre": [
+      "C66",
+      "B181"
+    ],
+    "post": [
+      "B183"
+    ]
+  },
+  "978": {
+    "pre": [
+      "B182"
+    ],
+    "post": []
+  },
+  "980": {
+    "pre": [],
+    "post": [
+      "B185"
+    ]
+  },
+  "981": {
+    "pre": [
+      "B184",
+      "F110"
+    ],
+    "post": []
+  },
   "1101": {
     "pre": [],
     "post": [
@@ -4571,12 +4672,43 @@
     "pre": [
       "F51"
     ],
-    "post": []
+    "post": [
+      "F111"
+    ]
   },
   "1108": {
     "pre": [
       "B173"
     ],
     "post": []
+  },
+  "1114": {
+    "pre": [],
+    "post": [
+      "F109"
+    ]
+  },
+  "1115": {
+    "pre": [
+      "C3",
+      "F108"
+    ],
+    "post": [
+      "B181"
+    ]
+  },
+  "1116": {
+    "pre": [],
+    "post": [
+      "B185",
+      "F111"
+    ]
+  },
+  "1117": {
+    "pre": [
+      "F101",
+      "F110"
+    ],
+    "post": []
   }
 }

package/build/questCategory.json

@@ -91,6 +91,7 @@
     353,
     354,
     355,
+    357,
     434,
     436,
     437,
@@ -117,6 +118,8 @@
     946,
     947,
     948,
+    973,
+    975,
     1103,
     1104,
     1105,
@@ -327,6 +330,7 @@
     347,
     351,
     352,
+    356,
     401,
     405,
     406,
@@ -591,6 +595,13 @@
     970,
     971,
     972,
+    974,
+    976,
+    977,
+    978,
+    979,
+    980,
+    981,
     1101,
     1102,
     1106,
@@ -599,6 +610,10 @@
     1110,
     1111,
     1112,
-    1113
+    1113,
+    1114,
+    1115,
+    1116,
+    1117
   ]
 }

package/build/questCodeMap.json

@@ -205,7 +205,7 @@
   "C9": 312,
   "C61": 313,
   "C63": 314,
-  "C54": 315,
+  "C64": 315,
   "C13": 316,
   "C15": 317,
   "C16": 318,
@@ -215,7 +215,7 @@
   "C21": 323,
   "C22": 324,
   "C23": 325,
-  "C59": 326,
+  "C67": 326,
   "C25": 327,
   "C27": 328,
   "2201LC01": 329,
@@ -244,6 +244,8 @@
   "C58": 353,
   "C60": 354,
   "C62": 355,
+  "C65": 356,
+  "C66": 357,
   "D1": 401,
   "D2": 402,
   "D3": 403,
@@ -532,7 +534,7 @@
   "B156": 929,
   "B157": 930,
   "B158": 931,
-  "2103B5": 932,
+  "2204B1": 932,
   "B159": 933,
   "B160": 934,
   "B161": 935,
@@ -570,6 +572,18 @@
   "B176": 967,
   "B177": 968,
   "B178": 969,
+  "B179": 970,
+  "2204B2": 971,
+  "2204B3": 972,
+  "By11": 973,
+  "B180": 974,
+  "By12": 975,
+  "B181": 976,
+  "B182": 977,
+  "B183": 978,
+  "2207B1": 979,
+  "B184": 980,
+  "B185": 981,
   "F96": 1101,
   "F97": 1102,
   "F98": 1103,
@@ -581,5 +595,10 @@
   "F104": 1109,
   "21FaLF01": 1110,
   "F105": 1111,
-  "F106": 1112
+  "F106": 1112,
+  "F107": 1113,
+  "F108": 1114,
+  "F109": 1115,
+  "F110": 1116,
+  "F111": 1117
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "poi-plugin-quest-info-2",
-  "version": "0.8.3",
+  "version": "0.8.6",
   "private": false,
   "description": "show quest info",
   "homepage": "https://github.com/lawvs/poi-plugin-quest-2/",
@@ -36,7 +36,8 @@
   "dependencies": {
     "moize": "^6.1.1",
     "react-use": "^17.3.1",
-    "react-virtualized": "^9.22.3"
+    "react-virtualized-auto-sizer": "^1.0.6",
+    "react-window": "^1.8.7"
   },
   "devDependencies": {
     "@babel/core": "^7.12.10",
@@ -47,7 +48,8 @@
     "@storybook/react": "^6.3.4",
     "@types/jest": "^27.4.1",
     "@types/pangu": "^3.3.0",
-    "@types/react-virtualized": "^9.21.11",
+    "@types/react-virtualized-auto-sizer": "^1.0.1",
+    "@types/react-window": "^1.8.5",
     "@types/sharp": "^0.27.1",
     "@types/styled-components": "^5.1.7",
     "@typescript-eslint/eslint-plugin": "^5.22.0",

package/src/Toolbar.tsx

@@ -11,6 +11,7 @@ import { useQuest, useSyncWithGame } from './store'
 import { useFilterTags, useSyncGameTagEffect } from './store/filterTags'
 import { useSearchInput } from './store/search'
 import { CategoryTags, CATEGORY_TAGS, TypeTags, TYPE_TAGS } from './tags'
+import { And, Or } from './utils'
 
 const ToolbarWrapper = styled.div`
   display: flex;
@@ -115,16 +116,6 @@ const useInputStringFilter = () => {
   return stringFilter
 }
 
-const And =
-  <T extends (...args: any[]) => boolean>(...fnArray: T[]) =>
-  (...args: Parameters<T>) =>
-    fnArray.every((fn) => fn(...args))
-
-const Or =
-  <T extends (...args: any[]) => boolean>(...fnArray: T[]) =>
-  (...args: Parameters<T>) =>
-    fnArray.some((fn) => fn(...args))
-
 const useToolbarFilter = () => {
   const stringFilter = useInputStringFilter()
   const { typeTags, categoryTags } = useFilterTags()

package/src/__tests__/__snapshots__/questCategory.spec.ts.snap

@@ -427,6 +427,11 @@ Object {
       "gameId": 355,
       "name": "精锐「第十五驱逐队」第一小队演习！",
     },
+    Object {
+      "code": "C66",
+      "gameId": 357,
+      "name": "「大和型战舰」第一舰队演习开始！",
+    },
     Object {
       "code": "D32",
       "gameId": 434,
@@ -557,6 +562,16 @@ Object {
       "gameId": 948,
       "name": "机动部队决战",
     },
+    Object {
+      "code": "By11",
+      "gameId": 973,
+      "name": "日英美联合水上舰队，起航！",
+    },
+    Object {
+      "code": "By12",
+      "gameId": 975,
+      "name": "精锐「第十九驱逐队」，全力出击！",
+    },
     Object {
       "code": "F98",
       "gameId": 1103,

package/src/__tests__/__snapshots__/questHelper.spec.ts.snap

@@ -15,6 +15,7 @@ Object {
   "1104": true,
   "1106": true,
   "111": true,
+  "1117": true,
   "112": true,
   "113": true,
   "114": true,
@@ -178,6 +179,7 @@ Object {
   "346": true,
   "347": true,
   "355": true,
+  "356": true,
   "401": true,
   "402": true,
   "403": true,
@@ -371,6 +373,13 @@ Object {
   "967": true,
   "968": true,
   "969": true,
+  "970": true,
+  "973": true,
+  "974": true,
+  "975": true,
+  "976": true,
+  "977": true,
+  "978": true,
 }
 `;
 

package/src/__tests__/kcanotifyData.spec.ts

@@ -1,7 +1,7 @@
 import { version, QuestData } from '../../build/kcanotifyGamedata'
 
 test('should Kcanotify Game data version correct', () => {
-  expect(version).toMatchInlineSnapshot(`"2022042601"`)
+  expect(version).toMatchInlineSnapshot(`"2022071002"`)
 })
 
 test('should Kcanotify Game data keys correct', () => {

package/src/__tests__/kcwikiData.spec.ts

@@ -4,7 +4,7 @@ import newQuestData from '../../build/kcQuestsData/quests-scn-new.json'
 describe('should version correct', () => {
   test('should KcwikiQuestData Game data version correct', () => {
     expect(version).toMatchInlineSnapshot(
-      `"fbee6ceb50a3acc9494978f1bb0adec1aaa5e30d"`
+      `"9e3d68b81583efb366edf0a296854f08e52ef6e8"`
     )
   })
 

package/src/__tests__/questCategory.spec.ts

@@ -8,8 +8,8 @@ describe('should questCategory correct', () => {
     expect(questCategory.weeklyQuest.length).toMatchInlineSnapshot(`17`)
     expect(questCategory.monthlyQuest.length).toMatchInlineSnapshot(`11`)
     expect(questCategory.quarterlyQuest.length).toMatchInlineSnapshot(`25`)
-    expect(questCategory.yearlyQuest.length).toMatchInlineSnapshot(`37`)
-    expect(questCategory.singleQuest.length).toMatchInlineSnapshot(`477`)
+    expect(questCategory.yearlyQuest.length).toMatchInlineSnapshot(`40`)
+    expect(questCategory.singleQuest.length).toMatchInlineSnapshot(`489`)
   })
 
   test('snapshot', () => {

package/src/components/QuestCard/index.tsx

@@ -29,7 +29,6 @@ export type QuestCardProps = {
   tip?: string
   tip2?: string
   status?: QUEST_STATUS
-  preQuest?: string[]
 }
 
 const CardAction = ({ gameId }: { gameId: number }) => {

package/src/components/QuestList.tsx

@@ -1,13 +1,7 @@
 import React, { useCallback, useEffect, useRef } from 'react'
-import type { ListRowProps } from 'react-virtualized'
-// See https://github.com/bvaughn/react-virtualized
-import {
-  AutoSizer,
-  CellMeasurer,
-  CellMeasurerCache,
-  List,
-  ListRowRenderer,
-} from 'react-virtualized'
+import AutoSizer from 'react-virtualized-auto-sizer'
+// https://github.com/bvaughn/react-window
+import { ListChildComponentProps, VariableSizeList as List } from 'react-window'
 import styled from 'styled-components'
 import { useIsQuestPluginTab } from '../poi/hooks'
 import type { UnionQuest } from '../questHelper'
@@ -17,89 +11,77 @@ const QuestListWrapper = styled.div`
   flex: 1;
 `
 
-const MINIMAL_CARD_HEIGHT = 70
-// const LARGE_CARD_HEIGHT = 120
-const cache = new CellMeasurerCache({
-  defaultHeight: MINIMAL_CARD_HEIGHT,
-  fixedWidth: true,
-})
-
-const useQuestsRowRenderer = (quests: UnionQuest[]) => {
-  const rowRenderer = useCallback(
-    ({ key, index, style, parent }: ListRowProps) => {
-      const quest = quests[index]
-      const { gameId } = quest
-      const { code, name, desc, memo, memo2, pre } = quest.docQuest
-
-      return (
-        <CellMeasurer
-          cache={cache}
-          columnIndex={0}
-          key={key}
-          parent={parent}
-          rowIndex={index}
-        >
-          <div style={style}>
-            <QuestCard
-              style={{ margin: '4px' }}
-              gameId={gameId}
-              code={code}
-              name={name}
-              desc={desc}
-              tip={memo}
-              tip2={memo2}
-              preQuest={pre}
-            ></QuestCard>
-          </div>
-        </CellMeasurer>
-      )
-    },
-    [quests]
-  )
-  return rowRenderer
-}
-
 export const QuestList = ({ quests }: { quests: UnionQuest[] }) => {
   const activeTab = useIsQuestPluginTab()
   const listRef = useRef<List>(null)
-  const rowRenderer: ListRowRenderer = useQuestsRowRenderer(quests)
+  const rowHeights = useRef<Record<number, number>>({})
 
   useEffect(() => {
-    cache.clearAll()
-    listRef.current?.recomputeRowHeights()
+    listRef.current?.resetAfterIndex(0)
   }, [quests])
 
   useEffect(() => {
     if (activeTab) {
-      cache.clearAll()
-      listRef.current?.recomputeRowHeights()
+      listRef.current?.resetAfterIndex(0)
     }
   }, [activeTab])
 
-  const onResize = useCallback(() => {
-    cache.clearAll()
-    listRef.current?.recomputeRowHeights()
+  const setRowHeight = useCallback((index, size) => {
+    if (rowHeights.current[index] === size) {
+      return
+    }
+    rowHeights.current = { ...rowHeights.current, [index]: size }
+    listRef.current?.resetAfterIndex(index)
   }, [])
 
-  if (!quests.length) {
-    // Prevent Uncaught Error: Requested index 0 is outside of range 0..0
-    // See https://github.com/bvaughn/react-virtualized/issues/1016
-    return null
+  const getRowHeight = useCallback((index) => {
+    return rowHeights.current[index] + 8 || 200
+  }, [])
+
+  const Row = ({ index, style }: ListChildComponentProps) => {
+    const rowRef = useRef<HTMLDivElement>(null)
+
+    const quest = quests[index]
+    const { gameId } = quest
+    const { code, name, desc, memo, memo2 } = quest.docQuest
+
+    useEffect(() => {
+      if (rowRef.current) {
+        setRowHeight(index, rowRef.current.clientHeight)
+      }
+    }, [index])
+
+    return (
+      <div style={style}>
+        <div ref={rowRef}>
+          <QuestCard
+            style={{ margin: '4px' }}
+            gameId={gameId}
+            code={code}
+            name={name}
+            desc={desc}
+            tip={memo}
+            tip2={memo2}
+          />
+        </div>
+      </div>
+    )
   }
 
   return (
     <QuestListWrapper>
-      <AutoSizer onResize={onResize}>
+      <AutoSizer>
         {({ height, width }) => (
           <List
             ref={listRef}
             height={height}
             width={width}
-            rowCount={quests.length}
-            rowHeight={cache.rowHeight}
-            deferredMeasurementCache={cache}
-            rowRenderer={rowRenderer}
-          ></List>
+            itemCount={quests.length}
+            estimatedItemSize={200}
+            itemSize={getRowHeight}
+          >
+            {Row}
+          </List>
         )}
       </AutoSizer>
     </QuestListWrapper>

package/src/components/QuestTag.tsx

@@ -35,8 +35,16 @@ const QuestTooltip = forwardRef<
         <>
           <div>{`${quest.code} - ${quest.name}`}</div>
           <div>{quest.desc}</div>
-          {quest.memo2 && <b>{quest.memo2}</b>}
-          {quest.memo && <i>{quest.memo}</i>}
+          {quest.memo2 && (
+            <div>
+              <b>{quest.memo2}</b>
+            </div>
+          )}
+          {quest.memo && (
+            <div>
+              <i>{quest.memo}</i>
+            </div>
+          )}
         </>
       }
       placement={'top'}

package/src/poi/hooks.ts

@@ -24,10 +24,12 @@ export const usePluginTranslation = () => {
   return useTranslation(PACKAGE_NAME)
 }
 
+const emptyArray = [] as GameQuest[]
 export const useGameQuest = () => {
   const [quests, setQuests] = useState<GameQuest[]>([])
   useEffect(() => {
-    const listener = (quests: GameQuest[] | null) => setQuests(quests ?? [])
+    const listener = (quests: GameQuest[] | null) =>
+      setQuests(quests ?? emptyArray)
     // See reducer.ts
     return observePluginStore(listener, (i) => i?._?.questList)
   }, [setQuests])

package/src/poi/store.ts

@@ -1,11 +1,9 @@
 import { name as PACKAGE_NAME } from '../../package.json'
 import type { PluginState } from '../reducer'
-import { IN_POI, importFromPoi } from './env'
+import { id, noop } from '../utils'
+import { importFromPoi, IN_POI } from './env'
 import type { PoiState, Store } from './types'
 
-const noop = () => {}
-const id = <T>(x: T) => x
-
 /**
  * See https://redux.js.org/api/store#subscribelistener
  */