Skip to content

[fix]タブ推移問題の修正 #1986

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
riririn180904 wants to merge 2 commits into
base: gm3/develop
Choose a base branch
from
Open

[fix]タブ推移問題の修正 #1986

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a76b20c
[fix]フォーム初期値の生成をuseMemoに切り出し
riririn180904 Dec 15, 2025
c0ffe1f
[fix]フォーム表示を条件描画から変更
riririn180904 Dec 15, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions user/src/components/Applications/Power/components/PowerFormView.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ export const PowerFormView: FC<PowerFormViewProps> = ({
/>

{/* 申請する場合のフォーム */}
{showForm && (
<div style={{ display: showForm ? 'block' : 'none' }}>
<form onSubmit={handleSubmit(onSubmit)}>
<div className="flex w-full flex-col gap-10">
{fields.map((field, index) => (
Expand Down Expand Up @@ -74,7 +74,7 @@ export const PowerFormView: FC<PowerFormViewProps> = ({
</div>
</div>
</form>
)}
</div>
</div>
);
};
11 changes: 9 additions & 2 deletions user/src/components/Applications/Power/hooks/usePowerApplication.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { useEffect, useState } from 'react';
import { useEffect, useMemo, useState } from 'react';
import { useGetPowerOrders, useMutatePowerOrders } from '@/api/powerApi';
import {
ORDER_TYPES,
Expand Down Expand Up @@ -58,7 +58,14 @@ export const usePowerApplication = (groupId: number) => {
const { submitPowerOrders, deletePowerOrder } = useMutatePowerOrders();

// フォーム管理
const powerForm = usePowerForm(hasExisting ? { devices } : undefined);
const initialDefaultValues = useMemo(() => {
if (!hasExisting) return undefined;

return {
devices: devices.map((d) => ({ ...d })),
};
}, [hasExisting, devices]);
const powerForm = usePowerForm(initialDefaultValues);
const { formMethods } = powerForm;

// 状態更新のヘルパー関数
Expand Down