fixes

akram-r · Dec 19, 2023 · 5c663f0 · 5c663f0
1 parent 246b984
commit 5c663f0
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 5 deletions.
diff --git a/src/App.tsx b/src/App.tsx
@@ -40,7 +40,7 @@ import { SmartObject } from './modules/reflection/helpers';
 import { useModalStyles } from './styles/modal';
 import SectionTitle from './components/SectionTitle';
 import { FABRIC_JSON_ALLOWED_KEYS } from './constants';
-import { createSnappingLines, snapToObject } from './modules/snapping';
+import { createSnappingLines, filterSnappingLines, snapToObject } from './modules/snapping';
 
 store.dispatch(appStart());
 
@@ -147,7 +147,7 @@ function App() {
 			const target = options.target as fabric.Object;
 			snapToObject(
 				target as snappingObjectType,
-				canvasRef.current?.getObjects().filter(x => !x?.data?.isSnappingLine) as snappingObjectType[],
+				filterSnappingLines(canvasRef.current?.getObjects()) as snappingObjectType[],
 				guidesRef,
 				canvasRef,
 				Number(snapDistance),
@@ -279,7 +279,7 @@ function App() {
 				...newArtboard,
 				state: {
 					...json,
-					objects: json?.objects.filter((item: any) => !item?.data?.isSnappingLine),
+					objects: filterSnappingLines(json?.objects),
 				},
 			},
 		];
@@ -482,7 +482,7 @@ function App() {
 					...item,
 					state: {
 						...json,
-						objects: json?.objects.filter((item: any) => !item?.data?.isSnappingLine),
+						objects: filterSnappingLines(json?.objects),
 					},
 				};
 			}

diff --git a/src/modules/layers/List.tsx b/src/modules/layers/List.tsx
@@ -18,6 +18,7 @@ import useTreeOpenHandler from './Folders/useTreeOpenHandler';
 import { convertFabricObjectsToLayers, convertLayersToFabricObjects } from './helpers';
 import { fabric } from 'fabric';
 import SectionTitle from '../../components/SectionTitle';
+import { filterSnappingLines } from '../snapping';
 
 const reorderArray = (array: NodeModel[], sourceIndex: number, targetIndex: number) => {
 	const newArray = [...array];
@@ -113,7 +114,7 @@ export default function LayerList({ canvas }: LayerListProp) {
 
 	useEffect(() => {
 		if (layers.length === 0) return;
-		const newTreeData = convertFabricObjectsToLayers(layers) as NodeModel[];
+		const newTreeData = convertFabricObjectsToLayers(filterSnappingLines(layers)) as NodeModel[];
 		setTreeData(prev => {
 			if (JSON.stringify(prev) === JSON.stringify(newTreeData)) return prev;
 			return newTreeData;

diff --git a/src/modules/snapping/index.tsx b/src/modules/snapping/index.tsx
@@ -199,3 +199,8 @@ export function createSnappingLines(
 	);
 	return guidesRef;
 }
+
+export const filterSnappingLines = (arr: fabric.Object[] | undefined) => {
+	if (!arr) return [];
+	return arr.filter(obj => !obj?.data?.isSnappingLine);
+};