Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
35 changes: 0 additions & 35 deletions src/components/EditorCanvas/Table.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -51,41 +51,6 @@ export default function Table(props) {
const { t } = useTranslation();
const { selectedElement, setSelectedElement } = useSelect();

useEffect(() => {
const desiredTableCase = settings.upperCaseFields
? tableData.name.toUpperCase()
: tableData.name.toLowerCase();
const tableNameNeedsUpdate = tableData.name !== desiredTableCase;

const fieldsNeedUpdate = tableData.fields.some((field) => {
const desiredFieldCase = settings.upperCaseFields
? field.name.toUpperCase()
: field.name.toLowerCase();
return field.name !== desiredFieldCase;
});

if (tableNameNeedsUpdate || fieldsNeedUpdate) {
const updatedFields = tableData.fields.map((field) => ({
...field,
name: settings.upperCaseFields
? field.name.toUpperCase()
: field.name.toLowerCase(),
}));

updateTable(tableData.id, {
name: settings.upperCaseFields
? tableData.name.toUpperCase()
: tableData.name.toLowerCase(),
fields: updatedFields,
});
}
}, [
settings.upperCaseFields,
tableData.fields,
tableData.id,
tableData.name,
updateTable,
]);
const calculatedContentWidth = useMemo(() => {
if (!tableData) return settings.tableWidth;

Expand Down
9 changes: 2 additions & 7 deletions src/components/EditorSidePanel/TablesTab/TableField.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -70,9 +70,7 @@ export default function TableField({ data, tid, index }) {
placeholder="Name"
onChange={(value) =>
updateField(tid, index, {
name: settings.upperCaseFields
? value.toUpperCase()
: value.toLowerCase(),
name: value
})
}
onKeyUp={(e) => {
Expand Down Expand Up @@ -105,17 +103,14 @@ export default function TableField({ data, tid, index }) {
onFocus={(e) => setEditField({ name: e.target.value })}
onBlur={(e) => {
if (e.target.value === editField.name) return;
const transformedValue = settings.upperCaseFields
? e.target.value.toUpperCase()
: e.target.value.toLowerCase();
pushUndo({
action: Action.EDIT,
element: ObjectType.TABLE,
component: "field",
tid: tid,
fid: index,
undo: editField,
redo: { name: transformedValue },
redo: { name: e.target.value},
message: t("edit_table", {
tableName: tables[tid].name,
extra: "[field]",
Expand Down
15 changes: 6 additions & 9 deletions src/components/EditorSidePanel/TablesTab/TableInfo.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -43,23 +43,20 @@ export default function TableInfo({ data }) {
placeholder={t("name")}
className="ms-2"
onChange={(value) => updateTable(data.id, {
name: settings.upperCaseFields ? value.toUpperCase() : value.toLowerCase()
name: value
})}
onFocus={(e) => setEditField({ name: e.target.value })}
onBlur={(e) => {
if (e.target.value === editField.name) return;
const transformedValue = settings.upperCaseFields
? e.target.value.toUpperCase()
: e.target.value.toLowerCase();
pushUndo({
action: Action.EDIT,
element: ObjectType.TABLE,
component: "self",
tid: data.id,
undo: editField,
redo: { name: transformedValue },
redo: { name: e.target.value},
message: t("edit_table", {
tableName: transformedValue,
tableName: e.target.value,
extra: "[name]",
}),
});
Expand Down Expand Up @@ -225,7 +222,7 @@ export default function TableInfo({ data }) {
</Collapse>
</Card>
<div className="flex flex-col gap-1">
<div className="flex gap-1 w-full">
<div className="flex gap-1 w-full">
{!(settings.notation === Notation.CROWS_FOOT || settings.notation === Notation.IDEF1X)? (
<Popover
content={
Expand Down Expand Up @@ -275,7 +272,7 @@ export default function TableInfo({ data }) {
/>
</Popover >
):null}

<div className="flex gap-1 flex grow">
<Button
block
Expand Down Expand Up @@ -354,4 +351,4 @@ export default function TableInfo({ data }) {
</div>
</div>
);
}
}