Merge branch 'dev' into feature/fix-input-stepper-align-right-number

Author: brauliodiez

src/common/components/mock-components/front-basic-shapes/index.ts

@@ -10,3 +10,4 @@ export * from './large-arrow-shape';
 export * from './image-shape';
 export * from './modal-cover-shape';
 export * from './cilinder-basic-shape';
+export * from './mouse-cursor/mouse-cursor-basic-shape';

src/common/components/mock-components/front-basic-shapes/mouse-cursor/icon-shape.business.ts

@@ -0,0 +1,18 @@
+import { IconSize } from '@/core/model';
+
+export const returnIconSize = (iconSize: IconSize): number[] => {
+  switch (iconSize) {
+    case 'XS':
+      return [25, 25];
+    case 'S':
+      return [50, 50];
+    case 'M':
+      return [100, 100];
+    case 'L':
+      return [125, 125];
+    case 'XL':
+      return [150, 150];
+    default:
+      return [50, 50];
+  }
+};

src/common/components/mock-components/front-basic-shapes/mouse-cursor/index.ts

@@ -0,0 +1 @@
+export * from './mouse-cursor-basic-shape';

src/common/components/mock-components/front-basic-shapes/mouse-cursor/mouse-cursor-basic-shape.tsx

@@ -0,0 +1,78 @@
+import { ShapeSizeRestrictions, ShapeType, BASE_ICONS_URL } from '@/core/model';
+import { forwardRef, useEffect, useState } from 'react';
+import { ShapeProps } from '../../shape.model';
+import { loadSvgWithFill } from '@/common/utils/svg.utils';
+import { Group, Image } from 'react-konva';
+import { fitSizeToShapeSizeRestrictions } from '@/common/utils/shapes/shape-restrictions';
+import { returnIconSize } from './icon-shape.business';
+import { useGroupShapeProps } from '../../mock-components.utils';
+import { useShapeProps } from '../../../shapes/use-shape-props.hook';
+import { BASIC_SHAPE } from '../../front-components/shape.const';
+
+const MouseCursorSizeRestrictions: ShapeSizeRestrictions = {
+  minWidth: 25,
+  minHeight: 25,
+  maxWidth: -1,
+  maxHeight: -1,
+  defaultWidth: 150,
+  defaultHeight: 150,
+};
+
+export const getMouseCursorShapeSizeRestrictions = (): ShapeSizeRestrictions =>
+  MouseCursorSizeRestrictions;
+
+const shapeType: ShapeType = 'mouseCursor';
+
+export const MouseCursorShape = forwardRef<any, ShapeProps>((props, ref) => {
+  const {
+    x,
+    y,
+    width,
+    height,
+    id,
+    onSelected,
+    text,
+    iconSize,
+    otherProps,
+    ...shapeProps
+  } = props;
+
+  const [iconWidth, iconHeight] = returnIconSize(iconSize);
+  const restrictedSize = fitSizeToShapeSizeRestrictions(
+    MouseCursorSizeRestrictions,
+    iconWidth,
+    iconHeight
+  );
+
+  const { width: restrictedWidth, height: restrictedHeight } = restrictedSize;
+  const { stroke } = useShapeProps(otherProps, BASIC_SHAPE);
+  const commonGroupProps = useGroupShapeProps(
+    props,
+    restrictedSize,
+    shapeType,
+    ref
+  );
+
+  const [image, setImage] = useState<HTMLImageElement | null>(null);
+  //const imgRef = useRef(null);
+  const fileName = 'cursor.svg';
+  useEffect(() => {
+    loadSvgWithFill(`${BASE_ICONS_URL}${fileName}`, `${stroke}`).then(img => {
+      setImage(img);
+    });
+  }, [stroke]);
+  return (
+    <Group {...commonGroupProps} {...shapeProps}>
+      {image && (
+        <Image
+          image={image}
+          x={0}
+          y={0}
+          width={restrictedWidth}
+          height={restrictedHeight}
+          //ref={imageRef}
+        />
+      )}
+    </Group>
+  );
+});

src/core/model/index.ts

@@ -87,7 +87,8 @@ export type ShapeType =
   | 'textScribbled'
   | 'paragraphScribbled'
   | 'fabButton'
-  | 'fileTree';
+  | 'fileTree'
+  | 'mouseCursor';
 
 export const ShapeDisplayName: Record<ShapeType, string> = {
   multiple: 'multiple',
@@ -164,6 +165,7 @@ export const ShapeDisplayName: Record<ShapeType, string> = {
   paragraphScribbled: 'Paragraph Scribbled',
   fabButton: 'Fab Button',
   fileTree: 'File Tree',
+  mouseCursor: 'Mouse Cursor',
 };
 
 export type EditType = 'input' | 'textarea' | 'imageupload';

src/pods/canvas/model/shape-other-props.utils.ts

@@ -266,6 +266,11 @@ export const generateDefaultOtherProps = (
         iconSize: 'M',
         stroke: BASIC_SHAPE.DEFAULT_STROKE_COLOR,
       };
+    case 'mouseCursor':
+      return {
+        stroke: BASIC_SHAPE.DEFAULT_STROKE_COLOR,
+        iconSize: 'M',
+      };
     case 'image':
       return {
         imageSrc: '',

src/pods/canvas/model/shape-size.mapper.ts

@@ -42,6 +42,7 @@ import {
   getStarShapeSizeRestrictions,
   getModalCoverShapeSizeRestrictions,
   getCilinderShapeSizeRestrictions,
+  getMouseCursorShapeSizeRestrictions,
   // other imports
 } from '@/common/components/mock-components/front-basic-shapes';
 import {
@@ -177,6 +178,7 @@ const shapeSizeMap: Record<ShapeType, () => ShapeSizeRestrictions> = {
   fabButton: getFabButtonShapeSizeRestrictions,
   fileTree: getFileTreeShapeSizeRestrictions,
   paragraphScribbled: getParagraphScribbledShapeRestrictions,
+  mouseCursor: getMouseCursorShapeSizeRestrictions,
 };
 
 export default shapeSizeMap;

src/pods/canvas/model/transformer.model.ts

@@ -87,6 +87,7 @@ export const generateTypeOfTransformer = (shapeType: ShapeType): string[] => {
         'bottom-center',
       ];
     case 'icon':
+    case 'mouseCursor':
     case 'multiple':
       return [];
     case 'image':

src/pods/canvas/shape-renderer/index.tsx

@@ -65,6 +65,7 @@ import {
   renderLargeArrowShape,
   renderCilinder,
   renderImage,
+  renderMouseCursor,
 } from './simple-basic-shapes';
 import {
   renderHeading1,
@@ -238,6 +239,8 @@ export const renderShapeComponent = (
       return renderTextScribbled(shape, shapeRenderedProps);
     case 'paragraphScribbled':
       return renderParagraphScribbled(shape, shapeRenderedProps);
+    case 'mouseCursor':
+      return renderMouseCursor(shape, shapeRenderedProps);
     default:
       return renderNotFound(shape, shapeRenderedProps);
   }

src/pods/canvas/shape-renderer/simple-basic-shapes/index.ts

@@ -10,3 +10,4 @@ export * from './large-arrow.renderer';
 export * from './modal-cover.rerender';
 export * from './cilinder.renderer';
 export * from './image.renderer';
+export * from './mouse-cursor.renderer';