Merge branch 'dev' of ssh://git.jetbrains.space/nalpari/q-cast-iii/qcast-front into dev

src/components/management/StuffDetail.jsx

@@ -2,7 +2,6 @@
 
 import { useState, useEffect, useRef, useContext } from 'react'
 import { useRouter, useSearchParams } from 'next/navigation'
-import { Button } from '@nextui-org/react'
 import Select from 'react-select'
 import { useAxios } from '@/hooks/useAxios'
 import { globalLocaleStore } from '@/store/localeAtom'
@@ -2311,7 +2310,12 @@ export default function StuffDetail() {
                             </div>
                             {managementState?.tempFlg === '1' ? (
                               <>
-                                <button className="btn-origin grey" onPress={onSearchDesignRequestPopOpen} style={{ display: showButton }}>
+                                <button
+                                  type="button"
+                                  className="btn-origin grey"
+                                  onClick={onSearchDesignRequestPopOpen}
+                                  style={{ display: showButton }}
+                                >
                                   {getMessage('stuff.planReqPopup.title')}
                                 </button>
                               </>

src/hooks/module/useTrestle.js

@@ -1665,13 +1665,13 @@ export const useTrestle = () => {
       canvas.add(bracket)
       canvas.renderAll()
       if (direction === 'south') {
-        startPointY -= height
+        startPointY -= height - moduleIntvlVer / 10
       } else if (direction === 'north') {
-        startPointY += height
+        startPointY += height + moduleIntvlVer / 10
       } else if (direction === 'east') {
-        startPointX -= width
+        startPointX -= width - moduleIntvlHor / 10
       } else if (direction === 'west') {
-        startPointX += width
+        startPointX += width + moduleIntvlHor / 10
       }
     }
   }

src/hooks/useCanvas.js

@@ -3,8 +3,8 @@ import { fabric } from 'fabric'
 
 import { actionHandler, anchorWrapper, polygonPositionHandler } from '@/util/canvas-util'
 
-import { useRecoilState, useRecoilValue } from 'recoil'
-import { canvasSizeState, canvasState, fontSizeState } from '@/store/canvasAtom'
+import { useRecoilState, useRecoilValue, useResetRecoilState, useSetRecoilState } from 'recoil'
+import { canvasSizeState, canvasState, canvasZoomState, fontSizeState } from '@/store/canvasAtom'
 import { QLine } from '@/components/fabric/QLine'
 import { QPolygon } from '@/components/fabric/QPolygon'
 import { defineQLine } from '@/util/qline-utils'
@@ -27,6 +27,7 @@ export function useCanvas(id) {
   const { setCanvasForEvent, attachDefaultEventOnCanvas } = useCanvasEvent()
   const isImageDisplay = useRecoilValue(imageDisplaySelector)
   const {} = useFont()
+  const resetCanvasZoom = useResetRecoilState(canvasZoomState)
 
   /**
    * 처음 셋팅
@@ -43,7 +44,7 @@ export function useCanvas(id) {
     setCanvas(c)
     setCanvasForEvent(c)
     attachDefaultEventOnCanvas()
-
+    resetCanvasZoom()
     return () => {
       // c.dispose()
       c.clear()