From 7237250adcbf4cccb7c5fbdf00739db81a01f69a Mon Sep 17 00:00:00 2001
From: Abhinav Jha <abhinav@appsmith.com>
Date: Sat, 21 Sep 2019 07:22:38 +0530
Subject: [PATCH] WIP: Fix positioning bug

---
 .../src/editorComponents/ButtonComponent.tsx  |  1 -
 .../editorComponents/DragLayerComponent.tsx   | 40 +++++++++++++++++++
 .../editorComponents/DropTargetComponent.tsx  | 19 +++------
 app/client/src/editorComponents/Dropzone.tsx  | 24 ++++++-----
 .../src/pages/Editor/EditorDragLayer.tsx      | 26 ------------
 app/client/src/pages/Editor/index.tsx         |  2 -
 app/client/src/utils/WidgetFactory.tsx        |  3 +-
 app/client/src/utils/WidgetRegistry.tsx       |  2 -
 app/client/src/widgets/BaseWidget.tsx         |  6 +--
 app/client/src/widgets/ContainerWidget.tsx    |  1 -
 10 files changed, 63 insertions(+), 61 deletions(-)
 create mode 100644 app/client/src/editorComponents/DragLayerComponent.tsx
 delete mode 100644 app/client/src/pages/Editor/EditorDragLayer.tsx

diff --git a/app/client/src/editorComponents/ButtonComponent.tsx b/app/client/src/editorComponents/ButtonComponent.tsx
index 2bfab3a0fd..2fb5efa485 100644
--- a/app/client/src/editorComponents/ButtonComponent.tsx
+++ b/app/client/src/editorComponents/ButtonComponent.tsx
@@ -5,7 +5,6 @@ import { Container } from "./ContainerComponent";
 
 class ButtonComponent extends React.Component<ButtonComponentProps> {
   render() {
-    console.log("button props", this.props);
     return (
       <Container {...this.props}>
         <Button icon={this.props.icon} onClick={this.props.onClick}>
diff --git a/app/client/src/editorComponents/DragLayerComponent.tsx b/app/client/src/editorComponents/DragLayerComponent.tsx
new file mode 100644
index 0000000000..c390e5f5a6
--- /dev/null
+++ b/app/client/src/editorComponents/DragLayerComponent.tsx
@@ -0,0 +1,40 @@
+import React from "react";
+import styled from "styled-components";
+import { useDragLayer, XYCoord } from "react-dnd";
+import DropZone from "./Dropzone";
+
+const WrappedDragLayer = styled.div`
+  position: absolute;
+  pointer-events: none;
+  z-index: 100;
+  left: 0;
+  top: 0;
+  width: 100%;
+  height: 100%;
+  cursor: grab;
+`;
+
+type DragLayerProps = {
+  height: number;
+  width: number;
+  parentOffset: XYCoord;
+  cellSize: number;
+  visible: boolean;
+};
+
+const DragLayerComponent = (props: DragLayerProps) => {
+  const { isDragging, currentOffset } = useDragLayer(monitor => ({
+    isDragging: monitor.isDragging(),
+    currentOffset: monitor.getClientOffset(),
+  }));
+
+  if (!isDragging) {
+    return null;
+  }
+  return (
+    <WrappedDragLayer>
+      <DropZone {...props} currentOffset={currentOffset as XYCoord} />
+    </WrappedDragLayer>
+  );
+};
+export default DragLayerComponent;
diff --git a/app/client/src/editorComponents/DropTargetComponent.tsx b/app/client/src/editorComponents/DropTargetComponent.tsx
index b93e5fe2d1..0d3c953d28 100644
--- a/app/client/src/editorComponents/DropTargetComponent.tsx
+++ b/app/client/src/editorComponents/DropTargetComponent.tsx
@@ -1,11 +1,11 @@
 import React, { useState, useLayoutEffect, MutableRefObject } from "react";
 import styled from "styled-components";
 import { WidgetProps, WidgetOperations } from "../widgets/BaseWidget";
-import { useDrop, XYCoord } from "react-dnd";
+import { useDrop } from "react-dnd";
 import { ContainerProps } from "./ContainerComponent";
 import WidgetFactory from "../utils/WidgetFactory";
-import DropZone from "./Dropzone";
 import { snapToGrid } from "../utils/helpers";
+import DragLayerComponent from "./DragLayerComponent";
 
 const DEFAULT_CELL_SIZE = 1;
 const DEFAULT_WIDGET_WIDTH = 200;
@@ -26,7 +26,6 @@ const DropTargetMask = styled.div`
 `;
 
 export const DropTargetComponent = (props: DropTargetComponentProps) => {
-  const [dummyState, setDummyState] = useState({ x: 0, y: 0 });
   const [dropTargetTopLeft, setDropTargetTopLeft] = useState({ x: 0, y: 0 });
   const dropTargetMask: MutableRefObject<HTMLDivElement | null> = React.useRef(
     null,
@@ -42,11 +41,12 @@ export const DropTargetComponent = (props: DropTargetComponentProps) => {
     }
   }, [setDropTargetTopLeft]);
 
-  const [{ isOver, clientOffset }, drop] = useDrop({
+  const [{ isOver }, drop] = useDrop({
     accept: Object.values(WidgetFactory.getWidgetTypes()),
     drop(item: WidgetProps, monitor) {
       if (monitor.isOver({ shallow: true })) {
         const item = monitor.getItem();
+        const clientOffset = monitor.getClientOffset();
         if (clientOffset) {
           const [x, y] = snapToGrid(
             DEFAULT_CELL_SIZE,
@@ -67,21 +67,16 @@ export const DropTargetComponent = (props: DropTargetComponentProps) => {
             });
         }
       }
-
       return undefined;
     },
-    hover: (item, monitor) => {
-      setDummyState(monitor.getDifferenceFromInitialOffset() as XYCoord);
-    },
     collect: monitor => ({
-      hovered: !!monitor.isOver(),
       isOver: !!monitor.isOver({ shallow: true }),
-      clientOffset: monitor.getClientOffset(),
     }),
     canDrop: (item, monitor) => {
       return monitor.isOver({ shallow: true });
     },
   });
+
   return (
     <WrappedDropTarget
       ref={drop}
@@ -95,14 +90,12 @@ export const DropTargetComponent = (props: DropTargetComponentProps) => {
       }}
     >
       <DropTargetMask ref={dropTargetMask} />
-      <DropZone
+      <DragLayerComponent
         parentOffset={dropTargetTopLeft}
         width={DEFAULT_WIDGET_WIDTH}
         height={DEFAULT_WIDGET_HEIGHT}
         cellSize={DEFAULT_CELL_SIZE}
         visible={isOver}
-        currentOffset={clientOffset as XYCoord}
-        dummyState={dummyState}
       />
       {props.children}
     </WrappedDropTarget>
diff --git a/app/client/src/editorComponents/Dropzone.tsx b/app/client/src/editorComponents/Dropzone.tsx
index a655dcd913..b441232eba 100644
--- a/app/client/src/editorComponents/Dropzone.tsx
+++ b/app/client/src/editorComponents/Dropzone.tsx
@@ -9,18 +9,13 @@ type DropZoneWrapperProps = {
   height: number;
   top: number;
 };
-const DropZoneWrapper = styled.div<DropZoneWrapperProps>`
+
+const DropZoneWrapper = styled.div`
   position: absolute;
   z-index: 100;
-  display: ${props => (props.visible ? "block" : "none")};
-  left: ${props => props.left}px;
-  width: ${props => props.width}px;
-  top: ${props => props.top}px;
-  height: ${props => props.height}px;
   background: ${props => props.theme.colors.hover};
   border: 1px dashed ${props => props.theme.colors.textAnchor};
   opacity: 0.7;
-  transition: all 0.2s ease-in-out 0s;
 `;
 
 type DropZoneProps = {
@@ -30,8 +25,8 @@ type DropZoneProps = {
   visible: boolean;
   parentOffset: XYCoord;
   cellSize: number;
-  dummyState: XYCoord;
 };
+
 /* eslint-disable react/display-name */
 export const DropZone = (props: DropZoneProps) => {
   let wrapperProps = {
@@ -59,7 +54,18 @@ export const DropZone = (props: DropZoneProps) => {
     }
   }
 
-  return <DropZoneWrapper {...wrapperProps} />;
+  return (
+    <DropZoneWrapper
+      style={{
+        display: wrapperProps.visible ? "block" : "none",
+        left: wrapperProps.left + "px",
+        width: wrapperProps.width + "px",
+        top: wrapperProps.top + "px",
+        height: wrapperProps.height + "px",
+      }}
+      {...wrapperProps}
+    />
+  );
 };
 
 export default DropZone;
diff --git a/app/client/src/pages/Editor/EditorDragLayer.tsx b/app/client/src/pages/Editor/EditorDragLayer.tsx
deleted file mode 100644
index 71f2506f60..0000000000
--- a/app/client/src/pages/Editor/EditorDragLayer.tsx
+++ /dev/null
@@ -1,26 +0,0 @@
-import React from "react";
-import styled from "styled-components";
-import { useDragLayer } from "react-dnd";
-
-const WrappedDragLayer = styled.div`
-  position: absolute;
-  pointer-events: none;
-  z-index: 100;
-  left: 0;
-  top: 0;
-  width: 100%;
-  height: 100%;
-  cursor: grab;
-`;
-
-const EditorDragLayer = () => {
-  const { isDragging } = useDragLayer(monitor => ({
-    isDragging: monitor.isDragging(),
-  }));
-
-  if (!isDragging) {
-    return null;
-  }
-  return <WrappedDragLayer></WrappedDragLayer>;
-};
-export default EditorDragLayer;
diff --git a/app/client/src/pages/Editor/index.tsx b/app/client/src/pages/Editor/index.tsx
index cbc9ae7de2..0acc5b68ba 100644
--- a/app/client/src/pages/Editor/index.tsx
+++ b/app/client/src/pages/Editor/index.tsx
@@ -15,7 +15,6 @@ import CanvasWidgetsNormalizer from "../../normalizers/CanvasWidgetsNormalizer";
 import { ContainerWidgetProps } from "../../widgets/ContainerWidget";
 import { fetchPage, updateWidget, savePage } from "../../actions/pageActions";
 import { RenderModes } from "../../constants/WidgetConstants";
-import EditorDragLayer from "./EditorDragLayer";
 import { executeAction } from "../../actions/widgetActions";
 import { ActionPayload } from "../../constants/ActionConstants";
 
@@ -72,7 +71,6 @@ class Editor extends Component<EditorProps> {
         <EditorHeader></EditorHeader>
         <EditorWrapper>
           <WidgetCardsPane cards={this.props.cards} />
-          <EditorDragLayer />
           <CanvasContainer>
             <Canvas
               dsl={{
diff --git a/app/client/src/utils/WidgetFactory.tsx b/app/client/src/utils/WidgetFactory.tsx
index 44b90979f0..9ca0c0adcd 100644
--- a/app/client/src/utils/WidgetFactory.tsx
+++ b/app/client/src/utils/WidgetFactory.tsx
@@ -24,10 +24,9 @@ class WidgetFactory {
     const widgetProps: WidgetProps = {
       key: widgetData.widgetId,
       renderMode: renderMode,
-      ...widgetData,
       ...widgetFunctions,
+      ...widgetData,
     };
-    console.log("=====", widgetData);
     const widgetBuilder = this.widgetMap.get(widgetData.type);
     if (widgetBuilder) {
       const widget = widgetBuilder.buildWidget(widgetProps);
diff --git a/app/client/src/utils/WidgetRegistry.tsx b/app/client/src/utils/WidgetRegistry.tsx
index 53e95e6d0b..509270775d 100644
--- a/app/client/src/utils/WidgetRegistry.tsx
+++ b/app/client/src/utils/WidgetRegistry.tsx
@@ -17,7 +17,6 @@ class WidgetBuilderRegistry {
   static registerWidgetBuilders() {
     WidgetFactory.registerWidgetBuilder("CONTAINER_WIDGET", {
       buildWidget(widgetData: ContainerWidgetProps<WidgetProps>): JSX.Element {
-        console.log("Registry container", widgetData);
         return <ContainerWidget {...widgetData} />;
       },
     });
@@ -30,7 +29,6 @@ class WidgetBuilderRegistry {
 
     WidgetFactory.registerWidgetBuilder("BUTTON_WIDGET", {
       buildWidget(widgetData: ButtonWidgetProps): JSX.Element {
-        console.log("Register button", widgetData);
         return <ButtonWidget {...widgetData} />;
       },
     });
diff --git a/app/client/src/widgets/BaseWidget.tsx b/app/client/src/widgets/BaseWidget.tsx
index f67d9c4400..aecb84a091 100644
--- a/app/client/src/widgets/BaseWidget.tsx
+++ b/app/client/src/widgets/BaseWidget.tsx
@@ -29,7 +29,6 @@ abstract class BaseWidget<
     initialState.height = 0;
     initialState.width = 0;
     this.state = initialState as K;
-    console.log(this.props);
   }
 
   componentDidMount(): void {
@@ -116,10 +115,7 @@ abstract class BaseWidget<
 
   getPositionStyle(): BaseStyle {
     return {
-      positionType:
-        this.props.renderMode !== RenderModes.PAGE
-          ? "CONTAINER_DIRECTION"
-          : "ABSOLUTE",
+      positionType: "ABSOLUTE",
       height: this.state.height,
       width: this.state.width,
       yPosition: this.props.topRow * this.props.parentRowSpace,
diff --git a/app/client/src/widgets/ContainerWidget.tsx b/app/client/src/widgets/ContainerWidget.tsx
index fea10b47d6..081ccb90d8 100644
--- a/app/client/src/widgets/ContainerWidget.tsx
+++ b/app/client/src/widgets/ContainerWidget.tsx
@@ -105,7 +105,6 @@ export interface ContainerWidgetProps<T extends WidgetProps>
   snapRows?: number;
   orientation?: ContainerOrientation;
   backgroundColor?: Color;
-  onPropertyChange?: Function;
 }
 
 export default ContainerWidget;