poi-plugin-quest-info-2 0.7.1 → 0.7.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "poi-plugin-quest-info-2",
-  "version": "0.7.1",
+  "version": "0.7.4",
   "private": false,
   "description": "show quest info",
   "homepage": "https://github.com/lawvs/poi-plugin-quest-2/",
@@ -25,13 +25,13 @@
     "downloadKcQuestsData": "ts-node scripts/downloadKcQuestsData.ts",
     "downloadKcanotifyData": "ts-node scripts/downloadKcanotifyGamedata.ts",
     "downloadSprites": "ts-node scripts/downloadSprites.ts",
-    "genQuestCategory": "ts-node scripts/genQuestCategory.ts",
+    "genQuestData": "ts-node scripts/genQuestData.ts",
     "lint": "eslint . --ignore-path .gitignore",
     "lint:fix": "npm run lint -- --fix",
     "storybook": "start-storybook -p 6006",
     "test": "jest",
     "typeCheck": "tsc --noEmit",
-    "update": "npm run downloadKcanotifyData && npm run downloadKcQuestsData && npm run genQuestCategory"
+    "update": "npm run downloadKcanotifyData && npm run downloadKcQuestsData && npm run genQuestData"
   },
   "dependencies": {
     "react-use": "^17.3.1",

package/src/App.tsx

@@ -31,7 +31,7 @@ const Main: React.FC = () => {
   return (
     <>
       <Toolbar></Toolbar>
-      <CountText>{t('TotalQuests', { count: quests.length })}</CountText>
+      <CountText>{t('TotalQuests', { number: quests.length })}</CountText>
       <QuestList quests={quests}></QuestList>
     </>
   )

package/src/Toolbar.tsx

@@ -1,4 +1,4 @@
-import { Button, InputGroup, Intent, Tag, Tooltip } from '@blueprintjs/core'
+import { Button, InputGroup, Intent, Tooltip } from '@blueprintjs/core'
 import { IconNames } from '@blueprintjs/icons'
 import type { ChangeEvent } from 'react'
 import React, { useCallback } from 'react'
@@ -10,12 +10,7 @@ import type { UnionQuest } from './questHelper'
 import { useQuest, useSyncWithGame } from './store'
 import { useFilterTags, useSyncGameTagEffect } from './store/filterTags'
 import { useSearchInput } from './store/search'
-import {
-  ALL_CATEGORY_TAG,
-  ALL_TYPE_TAG,
-  CATEGORY_TAGS,
-  TYPE_TAGS,
-} from './tags'
+import { CategoryTags, CATEGORY_TAGS, TypeTags, TYPE_TAGS } from './tags'
 
 const ToolbarWrapper = styled.div`
   display: flex;
@@ -27,15 +22,6 @@ const ToolbarWrapper = styled.div`
   }
 `
 
-const TagsWrapper = styled.div`
-  margin-left: -4px;
-  margin-right: -4px;
-
-  & > * {
-    margin: 4px;
-  }
-`
-
 const SyncButton = () => {
   const { t } = usePluginTranslation()
   const { searchInput } = useSearchInput()
@@ -91,62 +77,14 @@ export const SearchInput: React.FC = () => {
   )
 }
 
-const Tags = () => {
-  const { t } = usePluginTranslation()
-
+export const Toolbar = () => {
   useSyncGameTagEffect()
 
-  const { typeTags, categoryTags, setCategoryTags, setTypeTags } =
-    useFilterTags()
-
-  return (
-    <>
-      <TagsWrapper>
-        {CATEGORY_TAGS.map(({ name }) => (
-          <Tag
-            onClick={() => setCategoryTags(name)}
-            intent={
-              categoryTags[name]
-                ? name === ALL_CATEGORY_TAG.name
-                  ? 'success'
-                  : 'primary'
-                : 'none'
-            }
-            interactive={true}
-            key={name}
-          >
-            {t(name)}
-          </Tag>
-        ))}
-      </TagsWrapper>
-      <TagsWrapper>
-        {TYPE_TAGS.map((tag) => (
-          <Tag
-            onClick={() => setTypeTags(tag.name)}
-            intent={
-              typeTags[tag.name]
-                ? tag.name === ALL_TYPE_TAG.name
-                  ? 'success'
-                  : 'primary'
-                : 'none'
-            }
-            interactive={true}
-            key={tag.name}
-          >
-            {t(tag.name)}
-            {'suffix' in tag && ' ' + tag.suffix}
-          </Tag>
-        ))}
-      </TagsWrapper>
-    </>
-  )
-}
-
-export const Toolbar = () => {
   return (
     <ToolbarWrapper>
       <SearchInput></SearchInput>
-      <Tags></Tags>
+      <CategoryTags />
+      <TypeTags />
     </ToolbarWrapper>
   )
 }