src/components/floor-plan/modal/outerlinesetting/WallLineSetting.jsx

@@ -10,7 +10,6 @@ import Angle from '@/components/floor-plan/modal/lineTypes/Angle'
 import DoublePitch from '@/components/floor-plan/modal/lineTypes/DoublePitch'
 import Diagonal from '@/components/floor-plan/modal/lineTypes/Diagonal'
 import { usePopup } from '@/hooks/usePopup'
-import { useSwal } from '@/hooks/useSwal'
 import { useState } from 'react'
 import Image from 'next/image'
 import { v4 as uuidv4 } from 'uuid'
@@ -19,7 +18,6 @@ export default function WallLineSetting(props) {
   const { id } = props
   const { addPopup, closePopup } = usePopup()
   const { getMessage } = useMessage()
-  const { swalFire } = useSwal()
   const [propertiesId, setPropertiesId] = useState(uuidv4())
   const [useCalcPad, setUseCalcPad] = useState(false)
   const {
@@ -184,11 +182,10 @@ export default function WallLineSetting(props) {
           <button
             className="btn-frame modal act"
             onClick={() => {
-              swalFire({
+              handleFix()
-                type: 'confirm',
+              // closePopup(id)
-                text: getMessage('modal.cover.outline.fix.confirm'),
+
-                confirmFn: handleFix,
+              // setShowPropertiesSettingModal(true)
-              })
             }}
           >
             {getMessage('modal.cover.outline.fix')}

src/components/floor-plan/modal/placementShape/PlacementShapeDrawing.jsx

@@ -9,13 +9,11 @@ import { OUTER_LINE_TYPE } from '@/store/outerLineAtom'
 import OuterLineWall from '@/components/floor-plan/modal/lineTypes/OuterLineWall'
 import { usePlacementShapeDrawing } from '@/hooks/surface/usePlacementShapeDrawing'
 import { usePopup } from '@/hooks/usePopup'
-import { useSwal } from '@/hooks/useSwal'
 import Image from 'next/image'
 
 export default function PlacementShapeDrawing({ id, pos = { x: 50, y: 230 } }) {
   const { getMessage } = useMessage()
   const { closePopup } = usePopup()
-  const { swalFire } = useSwal()
   const [buttonAct, setButtonAct] = useState(1)
   const [useCalcPad, setUseCalcPad] = useState(false)
   const types = [
@@ -157,16 +155,7 @@ export default function PlacementShapeDrawing({ id, pos = { x: 50, y: 230 } }) {
           <button className="btn-frame modal mr5" onClick={handleRollback}>
             {getMessage('modal.cover.outline.rollback')}
           </button>
-          <button
+          <button className="btn-frame modal act" onClick={handleFix}>
-            className="btn-frame modal act"
-            onClick={() => {
-              swalFire({
-                type: 'confirm',
-                text: getMessage('modal.cover.outline.fix.confirm'),
-                confirmFn: handleFix,
-              })
-            }}
-          >
             {getMessage('modal.placement.surface.drawing.fix')}
           </button>
         </div>

src/hooks/roofcover/useOuterLineWall.js

@@ -30,8 +30,6 @@ import { calculateAngle } from '@/util/qpolygon-utils'
 import { fabric } from 'fabric'
 import { outlineDisplaySelector } from '@/store/settingAtom'
 import { usePopup } from '@/hooks/usePopup'
-import { useSwal } from '@/hooks/useSwal'
-import { useMessage } from '@/hooks/useMessage'
 import Big from 'big.js'
 import RoofShapeSetting from '@/components/floor-plan/modal/roofShape/RoofShapeSetting'
 import { useObject } from '@/hooks/useObject'
@@ -86,8 +84,6 @@ export function useOuterLineWall(id, propertiesId) {
   const arrow1Ref = useRef(arrow1)
   const arrow2Ref = useRef(arrow2)
   const { addPopup, closePopup } = usePopup()
-  const { swalFire } = useSwal()
-  const { getMessage } = useMessage()
 
   const setOuterLineFix = useSetRecoilState(outerLineFixState)
 
@@ -933,11 +929,7 @@ export function useOuterLineWall(id, propertiesId) {
 
   const enterCheck = (e) => {
     if (e.key === 'Enter') {
-      swalFire({
+      handleFix()
-        type: 'confirm',
-        text: getMessage('modal.cover.outline.fix.confirm'),
-        confirmFn: handleFix,
-      })
     }
   }
 

src/hooks/surface/usePlacementShapeDrawing.js

@@ -22,8 +22,6 @@ import {
 import { usePolygon } from '@/hooks/usePolygon'
 import { POLYGON_TYPE } from '@/common/common'
 import { usePopup } from '@/hooks/usePopup'
-import { useSwal } from '@/hooks/useSwal'
-import { useMessage } from '@/hooks/useMessage'
 import { useSurfaceShapeBatch } from './useSurfaceShapeBatch'
 
 import { roofDisplaySelector } from '@/store/settingAtom'
@@ -50,8 +48,6 @@ export function usePlacementShapeDrawing(id) {
   const { setSurfaceShapePattern } = useRoofFn()
   const { changeSurfaceLineType } = useSurfaceShapeBatch({})
   const { handleSelectableObjects } = useObject()
-  const { swalFire } = useSwal()
-  const { getMessage } = useMessage()
 
   const verticalHorizontalMode = useRecoilValue(verticalHorizontalModeState)
   const adsorptionRange = useRecoilValue(adsorptionRangeState)
@@ -1093,11 +1089,7 @@ export function usePlacementShapeDrawing(id) {
 
   const enterCheck = (e) => {
     if (e.key === 'Enter') {
-      swalFire({
+      handleFix()
-        type: 'confirm',
-        text: getMessage('modal.cover.outline.fix.confirm'),
-        confirmFn: handleFix,
-      })
     }
   }
 

src/locales/ja.json

@@ -70,7 +70,6 @@
   "modal.cover.outline.length": "長さ(mm)",
   "modal.cover.outline.arrow": "方向（矢印)",
   "modal.cover.outline.fix": "外壁線確定",
-  "modal.cover.outline.fix.confirm": "本当に確定しますか？確定後は修正できません。",
   "modal.cover.outline.rollback": "前に戻る",
   "modal.cover.outline.finish": "設定完了",
   "common.setting.finish": "設定完了",

src/locales/ko.json

@@ -70,7 +70,6 @@
   "modal.cover.outline.length": "길이(mm)",
   "modal.cover.outline.arrow": "방향(화살표)",
   "modal.cover.outline.fix": "외벽선 확정",
-  "modal.cover.outline.fix.confirm": "정말로 확정하시겠습니까? 확정 후에는 수정할 수 없습니다.",
   "modal.cover.outline.rollback": "일변전으로 돌아가기",
   "modal.cover.outline.finish": "설정완료",
   "common.setting.finish": "설정완료",