Skip to content

Commit e8feed4

Browse files
committed
fix: cleanup
1 parent 6fecf60 commit e8feed4

5 files changed

Lines changed: 10 additions & 95 deletions

File tree

‎src/components/form-builder/canvas/sortable-row.tsx‎

Lines changed: 2 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -5,42 +5,18 @@ import { GripVertical } from "lucide-react";
55
import { Button } from "@/components/ui/button";
66
import { cn, generateTWClassesForAllViewports, getGridRows, updateColSpans } from "@/lib/utils";
77
import { RenderEditorComponent } from "../helpers/render-editor-component";
8-
import { DropdownComponents } from "../helpers/dropdown-components";
98
import { useFormBuilderStore } from "@/stores/form-builder-store";
109
import { Over, useDraggable, useDroppable } from "@dnd-kit/core";
1110
import { FormComponentModel } from "@/models/FormComponent";
12-
import { memo, useCallback, useEffect, useMemo, useState } from "react";
11+
import { memo, useCallback, useMemo } from "react";
1312
import * as Icons from "lucide-react";
1413

1514
interface SortableRowProps {
1615
component: FormComponentModel;
1716
index: number;
1817
form: UseFormReturn<any>;
19-
activeIndex: number;
2018
}
2119

22-
// Memoize the row dropzone component
23-
const RowDropzone = memo(
24-
({
25-
newRow,
26-
position,
27-
rowId,
28-
}: {
29-
newRow?: boolean;
30-
position?: "before" | "after";
31-
rowId: number;
32-
}) => (
33-
<div className="flex items-center justify-center absolute mx-8 group-hover/row:opacity-100 opacity-0 border-t border-indigo-200 -bottom-3 -left-2 -right-2">
34-
<DropdownComponents
35-
newRow={newRow}
36-
{...(position === "before" ? { before: rowId } : { after: rowId })}
37-
className="z-10 absolute bg-indigo-200 rounded-full"
38-
/>
39-
</div>
40-
)
41-
);
42-
43-
RowDropzone.displayName = "RowDropzone";
4420

4521
// Memoize the draggable button component
4622
const DraggableButton = memo(({ attributes, listeners }: any) => (
@@ -60,11 +36,7 @@ export const RowColumn = ({
6036
component,
6137
index,
6238
form,
63-
}: {
64-
component: FormComponentModel;
65-
index: number;
66-
form: UseFormReturn<any>;
67-
}) => {
39+
}: SortableRowProps ) => {
6840
const {
6941
attributes: columnAttributes,
7042
listeners: columnListeners,

‎src/components/form-builder/dialogs/open-json-dialog.tsx‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,13 @@ import {
1313
import { Textarea } from "@/components/ui/textarea";
1414
import { useFormBuilderStore } from "@/stores/form-builder-store";
1515
import { useState } from "react";
16-
import { FormRow } from "@/types/form-builder.types";
1716
import { FormComponentModel } from "@/models/FormComponent";
1817

1918
export function OpenJsonDialog() {
2019
const [open, setOpen] = useState(false);
2120
const [jsonInput, setJsonInput] = useState("");
2221
const [error, setError] = useState<string | null>(null);
23-
const updateRows = useFormBuilderStore((state) => state.updateRows);
22+
const updateComponents = useFormBuilderStore((state) => state.updateComponents);
2423

2524
const handleSubmit = () => {
2625
try {
@@ -32,12 +31,9 @@ export function OpenJsonDialog() {
3231
}
3332

3433
// Convert the parsed JSON into FormRow objects
35-
const rows: FormRow[] = parsedJson.map((row, index) => ({
36-
id: index + 1,
37-
components: row.components.map((comp: any) => new FormComponentModel(comp))
38-
}));
34+
const components: FormComponentModel[] = parsedJson.map((comp: any) => new FormComponentModel(comp));
3935

40-
updateRows(rows);
36+
updateComponents(components);
4137
setOpen(false);
4238
setError(null);
4339
} catch (err) {

‎src/components/form-builder/form-components/form-text.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ import { DesignPropertiesViews, FormRow } from "@/types/form-builder.types";
77
import { FormComponentModel } from "@/models/FormComponent";
88
import { HtmlGroup } from "../sidebar/groups/html-group";
99
import { GridGroup } from "../sidebar/groups/grid-group";
10-
export function Text(component: FormComponentModel, row?: FormRow) {
11-
const colSpanClasses = generateTWClassesForAllViewports(component, "colSpan", row);
10+
export function Text(component: FormComponentModel) {
11+
const colSpanClasses = generateTWClassesForAllViewports(component, "colSpan");
1212
const colStartClasses = generateTWClassesForAllViewports(
1313
component,
1414
"colStart"

‎src/components/form-builder/helpers/dropdown-components.tsx‎

Lines changed: 0 additions & 53 deletions
This file was deleted.

‎src/config/available-components.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,7 @@ const formComponents: FormComponentModel[] = [
224224
export const AVAILABLE_COMPONENTS: FormComponentModel[] = [...typographyComponents, ...formComponents];
225225

226226
const typographyViews = {
227-
text: { render: (component: FormComponentModel, row?: FormRow) => Text(component, row), renderDesignProperties: TextDesignProperties, reactCode: getReactCodeText },
227+
text: { render: (component: FormComponentModel) => Text(component), renderDesignProperties: TextDesignProperties, reactCode: getReactCodeText },
228228
};
229229

230230
const formViews = {
@@ -239,7 +239,7 @@ const formViews = {
239239
date: { render: FormDatePicker, renderDesignProperties: DatePickerDesignProperties, reactCode: getReactCodeDatePicker },
240240
};
241241

242-
export function getComponentViews(component: FormComponentModel, row?: FormRow): ComponentViews | undefined {
242+
export function getComponentViews(component: FormComponentModel): ComponentViews | undefined {
243243
const views = {
244244
...typographyViews,
245245
...formViews,
@@ -255,7 +255,7 @@ export function getComponentViews(component: FormComponentModel, row?: FormRow):
255255
if (!componentView) return undefined;
256256

257257
return {
258-
render: componentView.render(component, row),
258+
render: componentView.render(component),
259259
renderDesignProperties: componentView.renderDesignProperties,
260260
reactCode: componentView.reactCode(component),
261261
};

0 commit comments

Comments
 (0)