Skip to content

Remove custom field id generation #12

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
caio-pizzol wants to merge 1 commit into from
Closed

Remove custom field id generation #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 19 additions & 19 deletions src/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,9 @@ const SuperDocTemplateBuilder = forwardRef<
const [templateFields, setTemplateFields] = useState<Types.TemplateField[]>(
fields.initial || [],
);
const [selectedFieldId, setSelectedFieldId] = useState<string | null>(null);
const [selectedFieldId, setSelectedFieldId] = useState<string | number | null>(
null,
);
const [menuVisible, setMenuVisible] = useState(false);
const [menuPosition, setMenuPosition] = useState<DOMRect | undefined>();
const [menuQuery, setMenuQuery] = useState<string>("");
Expand Down Expand Up @@ -202,13 +204,12 @@ const SuperDocTemplateBuilder = forwardRef<
if (!superdocRef.current?.activeEditor) return false;

const editor = superdocRef.current.activeEditor;
const fieldId = `field_${Date.now()}`;
const previousFields = templateFields;

const success =
mode === "inline"
? editor.commands.insertStructuredContentInline?.({
attrs: {
id: fieldId,
alias: field.alias,
tag: field.metadata
? JSON.stringify(field.metadata)
Expand All @@ -218,7 +219,6 @@ const SuperDocTemplateBuilder = forwardRef<
})
: editor.commands.insertStructuredContentBlock?.({
attrs: {
id: fieldId,
alias: field.alias,
tag: field.metadata
? JSON.stringify(field.metadata)
Expand All @@ -228,28 +228,28 @@ const SuperDocTemplateBuilder = forwardRef<
});

if (success) {
const newField: Types.TemplateField = {
id: fieldId,
alias: field.alias,
tag: field.category,
};
const updatedFields = getTemplateFieldsFromEditor(editor);

setTemplateFields((prev) => {
const updated = [...prev, newField];
onFieldsChange?.(updated);
return updated;
});
setTemplateFields(updatedFields);
onFieldsChange?.(updatedFields);

const insertedField = updatedFields.find(
(candidate) =>
!previousFields.some((existing) => existing.id === candidate.id),
);

onFieldInsert?.(newField);
if (insertedField) {
onFieldInsert?.(insertedField);
}
}

return success;
},
[onFieldInsert, onFieldsChange],
[onFieldInsert, onFieldsChange, templateFields],
);

const updateField = useCallback(
(id: string, updates: Partial<Types.TemplateField>): boolean => {
(id: string | number, updates: Partial<Types.TemplateField>): boolean => {
if (!superdocRef.current?.activeEditor) return false;

const editor = superdocRef.current.activeEditor;
Expand All @@ -275,7 +275,7 @@ const SuperDocTemplateBuilder = forwardRef<
);

const deleteField = useCallback(
(id: string): boolean => {
(id: string | number): boolean => {
const editor = superdocRef.current?.activeEditor;

if (!editor) {
Expand Down Expand Up @@ -348,7 +348,7 @@ const SuperDocTemplateBuilder = forwardRef<
);

const selectField = useCallback(
(id: string) => {
(id: string | number) => {
if (!superdocRef.current?.activeEditor) return;

const editor = superdocRef.current.activeEditor;
Expand Down
17 changes: 10 additions & 7 deletions src/types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ export interface FieldDefinition {
}

export interface TemplateField {
id: string;
id: string | number;
alias: string;
tag?: string;
position?: number;
Expand Down Expand Up @@ -38,8 +38,8 @@ export interface FieldMenuProps {
export interface FieldListProps {
fields: TemplateField[];
onSelect: (field: TemplateField) => void;
onDelete: (fieldId: string) => void;
selectedFieldId?: string;
onDelete: (fieldId: string | number) => void;
selectedFieldId?: string | number;
}

export interface DocumentConfig {
Expand Down Expand Up @@ -87,7 +87,7 @@ export interface SuperDocTemplateBuilderProps {
onTrigger?: (event: TriggerEvent) => void;
onFieldInsert?: (field: TemplateField) => void;
onFieldUpdate?: (field: TemplateField) => void;
onFieldDelete?: (fieldId: string) => void;
onFieldDelete?: (fieldId: string | number) => void;
onFieldsChange?: (fields: TemplateField[]) => void;
onFieldSelect?: (field: TemplateField | null) => void;
onFieldCreate?: (
Expand All @@ -105,9 +105,12 @@ export interface SuperDocTemplateBuilderHandle {
insertBlockField: (
field: Partial<FieldDefinition> & { alias: string },
) => boolean;
updateField: (id: string, updates: Partial<TemplateField>) => boolean;
deleteField: (id: string) => boolean;
selectField: (id: string) => void;
updateField: (
id: string | number,
updates: Partial<TemplateField>,
) => boolean;
deleteField: (id: string | number) => boolean;
selectField: (id: string | number) => void;
nextField: () => void;
previousField: () => void;
getFields: () => TemplateField[];
Expand Down
Loading