diff --git a/src/components/editor/canvas.tsx b/src/components/editor/canvas.tsx index d88bb5c..32ff5b3 100644 --- a/src/components/editor/canvas.tsx +++ b/src/components/editor/canvas.tsx @@ -230,7 +230,7 @@ } } - const selectComopnent = (e: React.MouseEvent, index: number) => { + const selectComponent = (e: React.MouseEvent, index: number) => { e.stopPropagation(); curScreenContext.curScreenActions.selectComponent(index); } @@ -260,7 +260,7 @@
{ selectComopnent(e, index) }} + onClick={(e) => { selectComponent(e, index) }} draggable onDragStart={(e) => { if (curScreenStates.selectingComponentIndex === index) onDragStart(e) }} onDrag={(e) => { if (curScreenStates.selectingComponentIndex === index) draggingComponent(e) }} diff --git a/src/hooks/useDragComponent.ts b/src/hooks/useDragComponent.ts index 3af6f9d..49831ad 100644 --- a/src/hooks/useDragComponent.ts +++ b/src/hooks/useDragComponent.ts @@ -12,10 +12,14 @@ const [componentY, setComponentY] = useState(0); const [componentW, setComponentW] = useState(0); const [componentH, setComponentH] = useState(0); + const [componentV, setComponentV] = useState(true); + const [componentE, setComponentE] = useState(true); const baseX = selectingComponent ? selectingComponent.uiData.posX : 0; const baseY = selectingComponent ? selectingComponent.uiData.posY : 0; const baseW = selectingComponent ? selectingComponent.uiData.width : 0; const baseH = selectingComponent ? selectingComponent.uiData.height : 0; + const baseV = selectingComponent ? selectingComponent.uiData.visible : true; + const baseE = selectingComponent ? selectingComponent.uiData.enable : true; const [prevX, setPrevX] = useState(0); const [prevY, setPrevY] = useState(0); @@ -43,6 +47,16 @@ setComponentH(baseH); }, [baseH]) + useEffect(() => { + // eslint-disable-next-line react-hooks/set-state-in-effect + setComponentV(baseV); + }, [baseV]) + + useEffect(() => { + // eslint-disable-next-line react-hooks/set-state-in-effect + setComponentE(baseE); + }, [baseE]) + const onDragStart = (e: React.DragEvent) => { e.stopPropagation(); setPrevX(e.clientX); @@ -114,7 +128,9 @@ posX: componentX, posY: componentY, width: componentW, - height: componentH + height: componentH, + visible: componentV, + enable: componentE } moveComponent(selectingComponent.screenId, selectingComponent.id, nextUiData); } diff --git a/src/hooks/useProject.ts b/src/hooks/useProject.ts index 6adf91d..82f5568 100644 --- a/src/hooks/useProject.ts +++ b/src/hooks/useProject.ts @@ -102,7 +102,9 @@ posX: 100, posY: 100, width: 75, - height: 25 + height: 25, + visible: true, + enable: true }; const newId = screen.id + "Widget" + nextIndex; let newComponent: Component; @@ -113,6 +115,7 @@ name: newId, type: type, index: nextIndex, + color: `blue`, screenId: screen.id, generalData: getInitialGeneralData(type) as ButtonGeneralData, style: {}, @@ -125,6 +128,7 @@ name: newId, type: type, index: nextIndex, + color: `black`, screenId: screen.id, generalData: getInitialGeneralData(type) as TextGeneralData, style: {}, diff --git a/src/types/component.ts b/src/types/component.ts index 302f404..4bf5b3f 100644 --- a/src/types/component.ts +++ b/src/types/component.ts @@ -13,7 +13,9 @@ posX: number, posY: number, width: number, - height: number + height: number, + visible: boolean, + enable: boolean } export interface TextGeneralData { @@ -45,6 +47,7 @@ type: "button", uiData: UIData, index: number, + color: string, generalData: ButtonGeneralData, style: { [k: string]: string }, action?: ButtonAction @@ -57,6 +60,7 @@ type: "text", uiData: UIData, index: number, + color: string, generalData: TextGeneralData, style: { [k: string]: string }, }