Merge pull request 'dev' (#273) from dev into dev-deploy
Reviewed-on: #273
This commit is contained in:
commit
9b0d5697a5
@ -25,6 +25,7 @@ export default function WithDraggable({ isShow, children, pos = { x: 0, y: 0 },
|
||||
position={{ x: position.x, y: position.y }}
|
||||
onDrag={(e, data) => handleOnDrag(e, data)}
|
||||
handle= ''//{handle === '' ? '.modal-handle' : handle} //전체 handle
|
||||
cancel="input, button, select, textarea, [contenteditable]"
|
||||
>
|
||||
<div className={`modal-pop-wrap ${className}`} style={{ visibility: isHidden ? 'hidden' : 'visible' }}>
|
||||
{children}
|
||||
|
||||
@ -846,8 +846,8 @@ export const usePolygon = () => {
|
||||
if (checkLineOverlap(innerLine, polygonLine)) {
|
||||
// innerLine의 type을 polygonLine의 type으로 변경
|
||||
if (polygonLine.attributes?.type && innerLine.attributes) {
|
||||
polygonLine.need = false
|
||||
innerLine.attributes = polygonLine.attributes
|
||||
// polygonLine.need = false
|
||||
innerLine.attributes = { ...polygonLine.attributes }
|
||||
innerLine.direction = polygonLine.direction
|
||||
innerLine.attributes.isStart = true
|
||||
}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user