From a0cac795743a585437a6af7f93ec679b20ee9016 Mon Sep 17 00:00:00 2001 From: ysCha Date: Thu, 26 Mar 2026 09:34:08 +0900 Subject: [PATCH] =?UTF-8?q?=E8=A3=9C=E5=8A=A9=E7=B7=9A=E3=81=AE=E4=BD=9C?= =?UTF-8?q?=E6=88=90=20=ED=86=A0=EA=B8=80=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modal/roofShape/RoofShapePassivitySetting.jsx | 12 +++++++++++- .../floor-plan/modal/roofShape/passivity/Eaves.jsx | 4 +++- .../floor-plan/modal/roofShape/passivity/Gable.jsx | 3 ++- .../floor-plan/modal/roofShape/passivity/Shed.jsx | 3 ++- 4 files changed, 18 insertions(+), 4 deletions(-) diff --git a/src/components/floor-plan/modal/roofShape/RoofShapePassivitySetting.jsx b/src/components/floor-plan/modal/roofShape/RoofShapePassivitySetting.jsx index 7530bcdd..c43c16ce 100644 --- a/src/components/floor-plan/modal/roofShape/RoofShapePassivitySetting.jsx +++ b/src/components/floor-plan/modal/roofShape/RoofShapePassivitySetting.jsx @@ -5,27 +5,34 @@ import Shed from '@/components/floor-plan/modal/roofShape/passivity/Shed' import { useMessage } from '@/hooks/useMessage' import { useRoofShapePassivitySetting } from '@/hooks/roofcover/useRoofShapePassivitySetting' import { usePopup } from '@/hooks/usePopup' +import { useState } from 'react' +import Image from 'next/image' export default function RoofShapePassivitySetting({ id, pos = { x: 50, y: 230 } }) { const { handleSave, handleConfirm, handleRollback, buttons, type, setType, TYPES, offsetRef, pitchRef, pitchText } = useRoofShapePassivitySetting(id) const { getMessage } = useMessage() const { closePopup } = usePopup() + const [useCalcPad, setUseCalcPad] = useState(false) + const disableKeypad = !useCalcPad const eavesProps = { offsetRef, pitchRef, pitchText, + disableKeypad, } const gableProps = { offsetRef, pitchRef, pitchText, + disableKeypad, } const shedProps = { offsetRef, + disableKeypad, } return ( @@ -55,7 +62,10 @@ export default function RoofShapePassivitySetting({ id, pos = { x: 50, y: 230 } -
+
+ diff --git a/src/components/floor-plan/modal/roofShape/passivity/Eaves.jsx b/src/components/floor-plan/modal/roofShape/passivity/Eaves.jsx index f3dd4052..3b775440 100644 --- a/src/components/floor-plan/modal/roofShape/passivity/Eaves.jsx +++ b/src/components/floor-plan/modal/roofShape/passivity/Eaves.jsx @@ -5,7 +5,7 @@ import { selectedRoofMaterialSelector } from '@/store/settingAtom' import { useEffect } from 'react' import { CalculatorInput } from '@/components/common/input/CalcInput' -export default function Eaves({ offsetRef, pitchRef, pitchText }) { +export default function Eaves({ offsetRef, pitchRef, pitchText, disableKeypad }) { const { getMessage } = useMessage() const currentAngleType = useRecoilValue(currentAngleTypeSelector) const selectedRoofMaterial = useRecoilValue(selectedRoofMaterialSelector) @@ -30,6 +30,7 @@ export default function Eaves({ offsetRef, pitchRef, pitchText }) { className="input-origin block" ref={pitchRef} value={currentAngleType === ANGLE_TYPE.SLOPE ? selectedRoofMaterial.pitch : selectedRoofMaterial.angle} + disableKeypad={disableKeypad} options={{ allowNegative: false, allowDecimal: true //(index !== 0), @@ -52,6 +53,7 @@ export default function Eaves({ offsetRef, pitchRef, pitchText }) { value={offsetRef.current?.value ?? 500} // Set default value to 500 ref={offsetRef} onChange={() => {}} + disableKeypad={disableKeypad} options={{ allowNegative: false, allowDecimal: false diff --git a/src/components/floor-plan/modal/roofShape/passivity/Gable.jsx b/src/components/floor-plan/modal/roofShape/passivity/Gable.jsx index fe04a65e..a37f7072 100644 --- a/src/components/floor-plan/modal/roofShape/passivity/Gable.jsx +++ b/src/components/floor-plan/modal/roofShape/passivity/Gable.jsx @@ -3,7 +3,7 @@ import { useRecoilValue } from 'recoil' import { currentAngleTypeSelector } from '@/store/canvasAtom' import { CalculatorInput } from '@/components/common/input/CalcInput' -export default function Gable({ offsetRef }) { +export default function Gable({ offsetRef, disableKeypad }) { const { getMessage } = useMessage() const currentAngleType = useRecoilValue(currentAngleTypeSelector) return ( @@ -22,6 +22,7 @@ export default function Gable({ offsetRef }) { value={offsetRef.current?.value ?? 300} // Set default value to 500 ref={offsetRef} onChange={() => {}} + disableKeypad={disableKeypad} options={{ allowNegative: false, allowDecimal: false diff --git a/src/components/floor-plan/modal/roofShape/passivity/Shed.jsx b/src/components/floor-plan/modal/roofShape/passivity/Shed.jsx index 67a47bb0..0f33278f 100644 --- a/src/components/floor-plan/modal/roofShape/passivity/Shed.jsx +++ b/src/components/floor-plan/modal/roofShape/passivity/Shed.jsx @@ -1,7 +1,7 @@ import { useMessage } from '@/hooks/useMessage' import { CalculatorInput } from '@/components/common/input/CalcInput' -export default function Shed({ offsetRef }) { +export default function Shed({ offsetRef, disableKeypad }) { const { getMessage } = useMessage() return ( <> @@ -19,6 +19,7 @@ export default function Shed({ offsetRef }) { value={offsetRef.current?.value ?? 300} // Set default value to 500 ref={offsetRef} onChange={() => {}} + disableKeypad={disableKeypad} options={{ allowNegative: false, allowDecimal: false