Merge pull request #229 from taichushouwang/fix

Fix Bug
MaaAssistantArknights · Nov 21, 2023 · 570b35f · 570b35f
2 parents b5aa81b + 896bb61
commit 570b35f
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 12 deletions.
diff --git a/src/components/editor/action/EditorActionOperatorDirection.tsx b/src/components/editor/action/EditorActionOperatorDirection.tsx
@@ -7,7 +7,7 @@ import { SetOptional } from 'type-fest'
 import { EditorFieldProps } from 'components/editor/EditorFieldProps'
 import type { CopilotDocV1 } from 'models/copilot.schema'
 
-import { operatorDirections } from '../../../models/operator'
+import { OperatorDirection, operatorDirections } from '../../../models/operator'
 import { FormField2 } from '../../FormField'
 
 interface EditorActionOperatorDirectionProps
@@ -41,8 +41,9 @@ export const EditorActionOperatorDirection = ({
       error={errors[name]}
       description="部署干员的干员朝向"
     >
-      <Select2
+      <Select2<OperatorDirection>
         filterable={false}
+        resetOnSelect={true}
         items={operatorDirections}
         itemRenderer={(action, { handleClick, handleFocus, modifiers }) => (
           <MenuItem

diff --git a/src/components/editor/operator/EditorOperator.tsx b/src/components/editor/operator/EditorOperator.tsx
@@ -69,7 +69,7 @@ export const EditorOperatorName = <T extends FieldValues>({
         query ? fuse.search(query).map((el) => el.item) : items
       }
       fieldState={fieldState}
-      onReset={() => onChange(undefined)}
+      onReset={() => onChange('')}
       itemRenderer={(item, { handleClick, handleFocus, modifiers }) => (
         <MenuItem
           key={item.name}
@@ -88,7 +88,7 @@ export const EditorOperatorName = <T extends FieldValues>({
         />
       )}
       onItemSelect={(item) => onChange(item.name)}
-      selectedItem={createArbitraryOperator(value as string)}
+      selectedItem={createArbitraryOperator((value || '') as string)}
       inputValueRenderer={(item) => item.name}
       createNewItemFromQuery={(query) => createArbitraryOperator(query)}
       createNewItemRenderer={(query, active, handleClick) => (

diff --git a/src/components/editor/operator/EditorOperatorSkill.tsx b/src/components/editor/operator/EditorOperatorSkill.tsx
@@ -12,7 +12,6 @@ interface EditorOperatorSkillChoice {
   title: string
   value: number | null
 }
-const EditorOperatorSkillSelect = Select2.ofType<EditorOperatorSkillChoice>()
 
 interface EditorOperatorSkillProps
   extends EditorFieldProps<CopilotDocV1.Operator, number> {}
@@ -52,8 +51,9 @@ export const EditorOperatorSkill = ({
   const selected = items.find((item) => item.value === (value ?? 1))
 
   return (
-    <EditorOperatorSkillSelect
+    <Select2<EditorOperatorSkillChoice>
       filterable={false}
+      resetOnSelect={true}
       items={items}
       itemRenderer={(action, { handleClick, handleFocus, modifiers }) => (
         <MenuItem
@@ -76,6 +76,6 @@ export const EditorOperatorSkill = ({
         onBlur={onBlur}
         ref={ref}
       />
-    </EditorOperatorSkillSelect>
+    </Select2>
   )
 }
diff --git a/src/components/editor/operator/EditorPerformerAdd.tsx b/src/components/editor/operator/EditorPerformerAdd.tsx
@@ -47,7 +47,7 @@ export const EditorPerformerAdd: FC<EditorPerformerAddProps> = ({
   submitOperator,
   submitGroup,
 }) => {
-  const activeItem =
+  const selectedItem =
     performerSelectItems.find((item) => item.value === mode) ||
     performerSelectItems[0]
 
@@ -59,20 +59,19 @@ export const EditorPerformerAdd: FC<EditorPerformerAddProps> = ({
         items={performerSelectItems}
         className="ml-1"
         onItemSelect={(e) => onModeChange(e.value)}
-        itemRenderer={(action, { handleClick, handleFocus, modifiers }) => (
+        itemRenderer={(action, { handleClick, handleFocus }) => (
           <MenuItem
             key={action.value}
-            selected={modifiers.active}
+            selected={action.value === mode}
             onClick={handleClick}
             onFocus={handleFocus}
             text={action.label}
           />
         )}
-        activeItem={activeItem}
       >
         <Button
           large
-          text={activeItem.label}
+          text={selectedItem.label}
           rightIcon="double-caret-vertical"
         />
       </Select2>