From cee5d5bbbf0cb95a641ec8af77200f8aca36f6a8 Mon Sep 17 00:00:00 2001
From: Maks Ridush <max.r@preply.com>
Date: Fri, 23 Dec 2022 16:18:33 +0200
Subject: [PATCH 1/3] initiate slaughter of tree depth

---
 .../src/core/components/Cell/Rows/index.tsx   |  4 +-
 .../core/components/Row/ResizableRowCell.tsx  | 76 +------------------
 .../editor/src/core/components/Row/index.tsx  | 25 +-----
 3 files changed, 6 insertions(+), 99 deletions(-)

diff --git a/packages/editor/src/core/components/Cell/Rows/index.tsx b/packages/editor/src/core/components/Cell/Rows/index.tsx
index c3499f4ff..2f66707ad 100644
--- a/packages/editor/src/core/components/Cell/Rows/index.tsx
+++ b/packages/editor/src/core/components/Cell/Rows/index.tsx
@@ -8,11 +8,11 @@ const Rows: React.FC<{
   const rowIds = useNodeChildrenIds(nodeId);
 
   return (
-    <div className="react-page-cell-rows">
+    <>
       {rowIds.map((id) => (
         <Row nodeId={id} key={id} />
       ))}
-    </div>
+    </>
   );
 };
 
diff --git a/packages/editor/src/core/components/Row/ResizableRowCell.tsx b/packages/editor/src/core/components/Row/ResizableRowCell.tsx
index 352a3ca83..7ae7d92a7 100644
--- a/packages/editor/src/core/components/Row/ResizableRowCell.tsx
+++ b/packages/editor/src/core/components/Row/ResizableRowCell.tsx
@@ -1,90 +1,18 @@
 import React from 'react';
-import Draggable from 'react-draggable';
 import { useMeasure } from 'react-use';
 import Cell from '../Cell';
-import {
-  useIsEditMode,
-  useIsPreviewMode,
-  useIsResizeMode,
-  useResizeCell,
-  useCellSpacing,
-  useOption,
-} from '../hooks';
 
 type Props = {
   nodeId: string;
-  rowWidth: number;
   rowHasInlineChildrenPosition?: string | null;
   isLast: boolean;
-  offset: number;
-  size: number;
-  maxSize: number;
 };
-const ResizableRowCell: React.FC<Props> = ({
-  nodeId,
-  rowWidth,
-  rowHasInlineChildrenPosition,
-  isLast,
-  offset,
-  size,
-  maxSize,
-}) => {
-  const stepWidth = rowWidth / 12; // we're going to keep it a real number to preserve some precision
-  const allowResizeInEditMode = useOption('allowResizeInEditMode');
-  const isResizeMode = useIsResizeMode();
-  const isEditMode = useIsEditMode();
-  const isPreviewMode = useIsPreviewMode();
-  const resize = useResizeCell(nodeId);
-  const [ref, { height: cellHeight }] = useMeasure();
-  const { y: cellSpacingY } = useCellSpacing() ?? { y: 0 };
-
-  const showResizeHandle =
-    !isPreviewMode &&
-    !isLast &&
-    (isResizeMode || (allowResizeInEditMode && isEditMode));
+const ResizableRowCell: React.FC<Props> = ({ nodeId }) => {
+  const [ref] = useMeasure();
 
   return (
     <>
       <Cell nodeId={nodeId} measureRef={ref} />
-
-      {showResizeHandle ? (
-        <Draggable
-          bounds={{
-            top: 0,
-            bottom: 0,
-            left: Math.round(stepWidth),
-            right: Math.round(rowWidth - stepWidth),
-          }}
-          position={{
-            x:
-              rowHasInlineChildrenPosition === 'right'
-                ? Math.round(stepWidth * (12 - offset))
-                : Math.round(stepWidth * offset),
-            y: 0,
-          }}
-          axis="x"
-          onDrag={(e, data) => {
-            const diff = Math.round(data.deltaX / stepWidth);
-            const newSize =
-              rowHasInlineChildrenPosition === 'right'
-                ? size - diff
-                : size + diff;
-            if (newSize > 0 && newSize <= maxSize) resize(newSize);
-          }}
-          grid={[Math.round(stepWidth), 0]}
-        >
-          <div
-            className="resize-handle"
-            style={{
-              // fix floating style
-              height: rowHasInlineChildrenPosition ? cellHeight : 'auto',
-              margin:
-                cellSpacingY !== 0 ? `${cellSpacingY / 2}px 0` : undefined,
-            }}
-            onClick={(e) => e.stopPropagation()}
-          ></div>
-        </Draggable>
-      ) : null}
     </>
   );
 };
diff --git a/packages/editor/src/core/components/Row/index.tsx b/packages/editor/src/core/components/Row/index.tsx
index 471676e4f..bb697444a 100644
--- a/packages/editor/src/core/components/Row/index.tsx
+++ b/packages/editor/src/core/components/Row/index.tsx
@@ -1,36 +1,20 @@
 import classNames from 'classnames';
 import React from 'react';
-import { useMeasure } from 'react-use';
 import type { Node } from '../../types/node';
 import { isRow, Row } from '../../types/node';
 import { useCellSpacing, useNodeHoverPosition, useNodeProps } from '../hooks';
 import Droppable from './Droppable';
 import ResizableRowCell from './ResizableRowCell';
 
-const reduceToIdAndSizeArray = (
-  acc: { offset: number; id: string; size: number; maxSize: number }[],
-  node: Node,
-  index: number,
-  array: Node[]
-) => {
-  const nextNode = array[index + 1];
-
-  const size = isRow(node) ? 12 : node.size ?? 12;
-  const nextSize = !nextNode || isRow(nextNode) ? 0 : nextNode.size ?? 12;
-  const offset = size + (acc[index - 1]?.offset ?? 0);
+const reduceToIdAndSizeArray = (acc: { id: string }[], node: Node) => {
   return [
     ...acc,
     {
       id: node.id,
-      size,
-      maxSize: size + nextSize - 1,
-      offset,
     },
   ];
 };
 const Row: React.FC<{ nodeId: string }> = ({ nodeId }) => {
-  const [ref, { width: rowWidth }] = useMeasure();
-
   const hoverPosition = useNodeHoverPosition(nodeId);
 
   const childrenWithOffsets = useNodeProps(nodeId, (node) =>
@@ -51,7 +35,6 @@ const Row: React.FC<{ nodeId: string }> = ({ nodeId }) => {
     <Droppable nodeId={nodeId}>
       <div
         // eslint-disable-next-line @typescript-eslint/no-explicit-any
-        ref={ref as any}
         className={classNames('react-page-row', {
           'react-page-row-has-floating-children': Boolean(
             rowHasInlineChildrenPosition
@@ -84,16 +67,12 @@ const Row: React.FC<{ nodeId: string }> = ({ nodeId }) => {
               Boolean(hoverPosition),
           })}
         />
-        {childrenWithOffsets.map(({ offset, id, size, maxSize }, index) => (
+        {childrenWithOffsets.map(({ id }, index) => (
           <ResizableRowCell
             key={id}
             isLast={index === childrenWithOffsets.length - 1}
-            rowWidth={rowWidth}
             nodeId={id}
             rowHasInlineChildrenPosition={rowHasInlineChildrenPosition}
-            offset={offset}
-            size={size}
-            maxSize={maxSize}
           />
         ))}
       </div>

From 45528ef64efadc3b089cc47c81304d6bef697b81 Mon Sep 17 00:00:00 2001
From: Maks Ridush <max.r@preply.com>
Date: Fri, 23 Dec 2022 16:54:13 +0200
Subject: [PATCH 2/3] remove cell spacing

---
 .../src/core/components/Cell/Inner/index.tsx  | 30 ++-----------------
 1 file changed, 2 insertions(+), 28 deletions(-)

diff --git a/packages/editor/src/core/components/Cell/Inner/index.tsx b/packages/editor/src/core/components/Cell/Inner/index.tsx
index 29b1348ef..b97962bd7 100644
--- a/packages/editor/src/core/components/Cell/Inner/index.tsx
+++ b/packages/editor/src/core/components/Cell/Inner/index.tsx
@@ -1,13 +1,9 @@
 import React from 'react';
-import {
-  getPluginCellSpacing,
-  normalizeCellSpacing,
-} from '../../../utils/getCellSpacing';
+import { getPluginCellSpacing } from '../../../utils/getCellSpacing';
 import {
   useCellData,
   useCellHasPlugin,
   useCellInnerDivStylingProps,
-  useCellSpacing,
   useCellSpacingProvider,
   useFocusCell,
   useIsEditMode,
@@ -33,20 +29,12 @@ const Inner: React.FC<{ nodeId: string }> = ({ nodeId }) => {
   const focus = useFocusCell(nodeId);
   const focused = useIsFocused(nodeId);
   const childrenIds = useNodeChildrenIds(nodeId);
-  const cellSpacing = useCellSpacing();
   const ref = React.useRef<HTMLDivElement>(null);
 
   const hasChildren = childrenIds.length > 0;
 
   const data = useCellData(nodeId);
   const pluginCellSpacing = getPluginCellSpacing(plugin, data);
-  const [Provider, providerValue] = useCellSpacingProvider(pluginCellSpacing);
-  let cellSpacingY = 0;
-  if (typeof pluginCellSpacing !== 'undefined' && pluginCellSpacing != null) {
-    cellSpacingY = normalizeCellSpacing(pluginCellSpacing)?.y ?? 0;
-  } else {
-    cellSpacingY = cellSpacing?.y ?? 0;
-  }
 
   const onClick = React.useCallback(
     (e: React.MouseEvent<HTMLDivElement>) => {
@@ -96,21 +84,7 @@ const Inner: React.FC<{ nodeId: string }> = ({ nodeId }) => {
           {...innerDivProps}
         >
           <PluginComponent nodeId={nodeId} hasChildren={hasChildren}>
-            {hasChildren ? (
-              <Provider value={providerValue}>
-                <div
-                  style={
-                    cellSpacingY !== 0
-                      ? { margin: `${-cellSpacingY / 2}px 0` }
-                      : undefined
-                  }
-                >
-                  {children}
-                </div>
-              </Provider>
-            ) : (
-              children
-            )}
+            {children}
             {insertAllowed ? (
               <InsertNewWithDefault
                 parentCellId={nodeId}

From 75686f31c8491a7b29256ceb91571c7470d88c5e Mon Sep 17 00:00:00 2001
From: Maks Ridush <max.r@preply.com>
Date: Fri, 23 Dec 2022 16:54:29 +0200
Subject: [PATCH 3/3] rm image placeholder div

---
 .../content/image/src/Renderer/ImageHtmlRenderer.tsx        | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/packages/plugins/content/image/src/Renderer/ImageHtmlRenderer.tsx b/packages/plugins/content/image/src/Renderer/ImageHtmlRenderer.tsx
index 9468ce852..9c775fbd1 100644
--- a/packages/plugins/content/image/src/Renderer/ImageHtmlRenderer.tsx
+++ b/packages/plugins/content/image/src/Renderer/ImageHtmlRenderer.tsx
@@ -35,10 +35,8 @@ const ImageHtmlRenderer: React.FC<CellPluginComponentProps<ImageState>> = (
       )}
     </div>
   ) : (
-    <div>
-      <div className="react-page-plugins-content-image-placeholder">
-        <ImageIcon style={iconStyle} />
-      </div>
+    <div className="react-page-plugins-content-image-placeholder">
+      <ImageIcon style={iconStyle} />
     </div>
   );
 };