Implement more options + Add depth dimension (revert DimensionLayer) (#37)

- Displayed text
- Enable Shortcuts
- Hide text
- Disable Dimension
- Depth dimension

Reviewed-on: https://git.siklos-chaneru.duckdns.org/Siklos/svg-layout-designer-react/pulls/37

src/Components/SVG/Elements/Container.tsx

@@ -2,7 +2,7 @@ import * as React from 'react';
 import { Interweave, Node } from 'interweave';
 import { XPositionReference } from '../../../Enums/XPositionReference';
 import { IContainerModel } from '../../../Interfaces/IContainerModel';
-import { DIMENSION_MARGIN } from '../../../utils/default';
+import { DIMENSION_MARGIN, SHOW_CHILDREN_DIMENSIONS, SHOW_PARENT_DIMENSION, SHOW_TEXT } from '../../../utils/default';
 import { getDepth } from '../../../utils/itertools';
 import { Dimension } from './Dimension';
 import IProperties from '../../../Interfaces/IProperties';
@@ -54,7 +54,7 @@ export const Container: React.FC<IContainerProps> = (props: IContainerProps) =>
   const text = (props.model.properties.width ?? 0).toString();
 
   let dimensionChildren: JSX.Element | null = null;
-  if (props.model.children.length > 1) {
+  if (props.model.children.length > 1 && SHOW_CHILDREN_DIMENSIONS) {
     const {
       childrenId,
       xChildrenStart,
@@ -79,23 +79,28 @@ export const Container: React.FC<IContainerProps> = (props: IContainerProps) =>
       transform={transform}
       key={`container-${props.model.properties.id}`}
     >
-      <Dimension
-        id={id}
-        xStart={xStart}
-        xEnd={xEnd}
-        yStart={y}
-        yEnd={y}
-        strokeWidth={strokeWidth}
-        text={text}
-      />
+      { SHOW_PARENT_DIMENSION
+        ? <Dimension
+          id={id}
+          xStart={xStart}
+          xEnd={xEnd}
+          yStart={y}
+          yEnd={y}
+          strokeWidth={strokeWidth}
+          text={text}
+        />
+        : null
+      }
       { dimensionChildren }
       { svg }
-      <text
-        x={xText}
-        y={yText}
-      >
-        {props.model.properties.id}
-      </text>
+      { SHOW_TEXT
+        ? <text
+          x={xText}
+          y={yText}
+        >
+          {props.model.properties.displayedText}
+        </text>
+        : null }
       { containersElements }
     </g>
   );

src/Components/SVG/Elements/DepthDimensionLayer.tsx

@@ -0,0 +1,90 @@
+import * as React from 'react';
+import { ContainerModel } from '../../../Interfaces/IContainerModel';
+import { DIMENSION_MARGIN } from '../../../utils/default';
+import { getAbsolutePosition, MakeBFSIterator } from '../../../utils/itertools';
+import { transformX } from './Container';
+import { Dimension } from './Dimension';
+
+interface IDimensionLayerProps {
+  roots: ContainerModel | ContainerModel[] | null
+}
+
+const getDimensionsNodes = (root: ContainerModel): React.ReactNode[] => {
+  const it = MakeBFSIterator(root);
+  const dimensions: React.ReactNode[] = [];
+  let currentDepth = 0;
+  let min = Infinity;
+  let max = -Infinity;
+  let lastY = 0;
+  for (const { container, depth } of it) {
+    if (currentDepth !== depth) {
+      AddNewDimension(currentDepth, min, max, lastY, dimensions);
+
+      currentDepth = depth;
+      min = Infinity;
+      max = -Infinity;
+    }
+
+    const absoluteX = getAbsolutePosition(container)[0];
+    const x = transformX(absoluteX, container.properties.width, container.properties.XPositionReference);
+    lastY = container.properties.y + container.properties.height;
+    if (x < min) {
+      min = x;
+    }
+
+    if (x > max) {
+      max = x;
+    }
+  }
+
+  AddNewDimension(currentDepth, min, max, lastY, dimensions);
+
+  return dimensions;
+};
+
+/**
+ * A layer containing all dimension
+ * @param props
+ * @returns
+ */
+export const DepthDimensionLayer: React.FC<IDimensionLayerProps> = (props: IDimensionLayerProps) => {
+  let dimensions: React.ReactNode[] = [];
+  if (Array.isArray(props.roots)) {
+    props.roots.forEach(child => {
+      dimensions.concat(getDimensionsNodes(child));
+    });
+  } else if (props.roots !== null) {
+    dimensions = getDimensionsNodes(props.roots);
+  }
+  return (
+    <g>
+      { dimensions }
+    </g>
+  );
+};
+
+function AddNewDimension(currentDepth: number, min: number, max: number, lastY: number, dimensions: React.ReactNode[]): void {
+  const id = `dim-depth-${currentDepth}`;
+  const xStart = min;
+  const xEnd = max;
+  const y = lastY + (DIMENSION_MARGIN * (currentDepth + 1));
+  const strokeWidth = 1;
+  const width = xEnd - xStart;
+  const text = width.toString();
+
+  if (width === 0) {
+    return;
+  }
+
+  dimensions.push(
+    <Dimension
+      key={id}
+      id={id}
+      xStart={xStart}
+      yStart={y}
+      xEnd={xEnd}
+      yEnd={y}
+      strokeWidth={strokeWidth}
+      text={text} />
+  );
+}

src/Components/SVG/Elements/DimensionLayer.tsx

@@ -0,0 +1,57 @@
+import * as React from 'react';
+import { ContainerModel } from '../../../Interfaces/IContainerModel';
+import { DIMENSION_MARGIN } from '../../../utils/default';
+import { getAbsolutePosition, MakeBFSIterator } from '../../../utils/itertools';
+import { Dimension } from './Dimension';
+
+interface IDimensionLayerProps {
+  roots: ContainerModel | ContainerModel[] | null
+}
+
+const getDimensionsNodes = (root: ContainerModel): React.ReactNode[] => {
+  const it = MakeBFSIterator(root);
+  const dimensions: React.ReactNode[] = [];
+  for (const { container, depth } of it) {
+    const width = container.properties.width;
+    const id = `dim-${container.properties.id}`;
+    const xStart = getAbsolutePosition(container)[0];
+    const xEnd = xStart + width;
+    const y = (container.properties.y + container.properties.height) + (DIMENSION_MARGIN * (depth + 1));
+    const strokeWidth = 1;
+    const text = width.toString();
+    dimensions.push(
+      <Dimension
+        key={id}
+        id={id}
+        xStart={xStart}
+        yStart={y}
+        xEnd={xEnd}
+        yEnd={y}
+        strokeWidth={strokeWidth}
+        text={text}
+      />
+    );
+  }
+  return dimensions;
+};
+
+/**
+ * A layer containing all dimension
+ * @param props
+ * @returns
+ */
+export const DimensionLayer: React.FC<IDimensionLayerProps> = (props: IDimensionLayerProps) => {
+  let dimensions: React.ReactNode[] = [];
+  if (Array.isArray(props.roots)) {
+    props.roots.forEach(child => {
+      dimensions.concat(getDimensionsNodes(child));
+    });
+  } else if (props.roots !== null) {
+    dimensions = getDimensionsNodes(props.roots);
+  }
+  return (
+    <g>
+      { dimensions }
+    </g>
+  );
+};

src/Components/SVG/SVG.tsx

@@ -4,6 +4,9 @@ import { Container } from './Elements/Container';
 import { ContainerModel } from '../../Interfaces/IContainerModel';
 import { Selector } from './Elements/Selector';
 import { BAR_WIDTH } from '../Bar/Bar';
+import { DimensionLayer } from './Elements/DimensionLayer';
+import { DepthDimensionLayer } from './Elements/DepthDimensionLayer';
+import { SHOW_DIMENSIONS_PER_DEPTH } from '../../utils/default';
 
 interface ISVGProps {
   width: number
@@ -74,6 +77,11 @@ export const SVG: React.FC<ISVGProps> = (props: ISVGProps) => {
         <svg {...properties}>
           { children }
           <Selector selected={props.selected} />
+          {
+            SHOW_DIMENSIONS_PER_DEPTH
+              ? <DepthDimensionLayer roots={props.children}/>
+              : null
+          }
         </svg>
       </UncontrolledReactSVGPanZoom>
     </div>