Skip to content

Commit 85504f3

Browse files
authored
Merge pull request #157 from huyjs9/fix/update-title
Fix update title on first page load
2 parents 16b2d30 + 4485bf7 commit 85504f3

File tree

3 files changed

+7
-10
lines changed

3 files changed

+7
-10
lines changed

src/components/EditorHeader/ControlPanel.jsx

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,6 @@ export default function ControlPanel({
7777
}) {
7878
const [modal, setModal] = useState(MODAL.NONE);
7979
const [sidesheet, setSidesheet] = useState(SIDESHEET.NONE);
80-
const [prevTitle, setPrevTitle] = useState(title);
8180
const [showEditName, setShowEditName] = useState(false);
8281
const [importDb, setImportDb] = useState("");
8382
const [exportData, setExportData] = useState({
@@ -730,7 +729,6 @@ export default function ControlPanel({
730729
rename: {
731730
function: () => {
732731
setModal(MODAL.RENAME);
733-
setPrevTitle(title);
734732
},
735733
},
736734
delete_diagram: {
@@ -1316,10 +1314,8 @@ export default function ControlPanel({
13161314
setExportData={setExportData}
13171315
title={title}
13181316
setTitle={setTitle}
1319-
setPrevTitle={setPrevTitle}
13201317
setDiagramId={setDiagramId}
13211318
setModal={setModal}
1322-
prevTitle={prevTitle}
13231319
importDb={importDb}
13241320
/>
13251321
<Sidesheet

src/components/EditorHeader/Modal/Modal.jsx

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,6 @@ export default function Modal({
4848
setModal,
4949
title,
5050
setTitle,
51-
prevTitle,
52-
setPrevTitle,
5351
setDiagramId,
5452
exportData,
5553
setExportData,
@@ -65,6 +63,7 @@ export default function Modal({
6563
const { setTasks } = useTasks();
6664
const { setTransform } = useTransform();
6765
const { setUndoStack, setRedoStack } = useUndoRedo();
66+
const [uncontrolledTitle, setUncontrolledTitle] = useState(title);
6867
const [importSource, setImportSource] = useState({
6968
src: "",
7069
overwrite: true,
@@ -212,7 +211,7 @@ export default function Modal({
212211
setModal(MODAL.NONE);
213212
return;
214213
case MODAL.RENAME:
215-
setPrevTitle(title);
214+
setTitle(uncontrolledTitle);
216215
setModal(MODAL.NONE);
217216
return;
218217
case MODAL.SAVEAS:
@@ -256,7 +255,9 @@ export default function Modal({
256255
/>
257256
);
258257
case MODAL.RENAME:
259-
return <Rename title={title} setTitle={setTitle} />;
258+
return (
259+
<Rename key={title} title={title} setTitle={setUncontrolledTitle} />
260+
);
260261
case MODAL.OPEN:
261262
return (
262263
<Open
@@ -339,7 +340,7 @@ export default function Modal({
339340
});
340341
}}
341342
onCancel={() => {
342-
if (modal === MODAL.RENAME) setTitle(prevTitle);
343+
if (modal === MODAL.RENAME) setUncontrolledTitle(title);
343344
setModal(MODAL.NONE);
344345
}}
345346
centered

src/components/EditorHeader/Modal/Rename.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ export default function Rename({ title, setTitle }) {
77
return (
88
<Input
99
placeholder={t("name")}
10-
value={title}
10+
defaultValue={title}
1111
onChange={(v) => setTitle(v)}
1212
/>
1313
);

0 commit comments

Comments
 (0)