titor/drawDB
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #157 from huyjs9/fix/update-title

Browse Source 
Fix update title on first page load
This commit is contained in:
1ilit 2024-07-23 16:47:24 +04:00 committed by GitHub
commit 85504f317c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/components/EditorHeader/ControlPanel.jsx
View File

@ -77,7 +77,6 @@ export default function ControlPanel({
}) { }) {
const [modal, setModal] = useState(MODAL.NONE); const [modal, setModal] = useState(MODAL.NONE);
const [sidesheet, setSidesheet] = useState(SIDESHEET.NONE); const [sidesheet, setSidesheet] = useState(SIDESHEET.NONE);
const [prevTitle, setPrevTitle] = useState(title);
const [showEditName, setShowEditName] = useState(false); const [showEditName, setShowEditName] = useState(false);
const [importDb, setImportDb] = useState(""); const [importDb, setImportDb] = useState("");
const [exportData, setExportData] = useState({ const [exportData, setExportData] = useState({
@ -730,7 +729,6 @@ export default function ControlPanel({
rename: { rename: {
function: () => { function: () => {
setModal(MODAL.RENAME); setModal(MODAL.RENAME);
setPrevTitle(title);
}, },
}, },
delete_diagram: { delete_diagram: {
@ -1316,10 +1314,8 @@ export default function ControlPanel({
setExportData={setExportData} setExportData={setExportData}
title={title} title={title}
setTitle={setTitle} setTitle={setTitle}
setPrevTitle={setPrevTitle}
setDiagramId={setDiagramId} setDiagramId={setDiagramId}
setModal={setModal} setModal={setModal}
prevTitle={prevTitle}
importDb={importDb} importDb={importDb}
/> />
<Sidesheet <Sidesheet

11
src/components/EditorHeader/Modal/Modal.jsx
View File

@ -48,8 +48,6 @@ export default function Modal({
setModal, setModal,
title, title,
setTitle, setTitle,
prevTitle,
setPrevTitle,
setDiagramId, setDiagramId,
exportData, exportData,
setExportData, setExportData,
@ -65,6 +63,7 @@ export default function Modal({
const { setTasks } = useTasks(); const { setTasks } = useTasks();
const { setTransform } = useTransform(); const { setTransform } = useTransform();
const { setUndoStack, setRedoStack } = useUndoRedo(); const { setUndoStack, setRedoStack } = useUndoRedo();
const [uncontrolledTitle, setUncontrolledTitle] = useState(title);
const [importSource, setImportSource] = useState({ const [importSource, setImportSource] = useState({
src: "", src: "",
overwrite: true, overwrite: true,
@ -212,7 +211,7 @@ export default function Modal({
setModal(MODAL.NONE); setModal(MODAL.NONE);
return; return;
case MODAL.RENAME: case MODAL.RENAME:
setPrevTitle(title); setTitle(uncontrolledTitle);
setModal(MODAL.NONE); setModal(MODAL.NONE);
return; return;
case MODAL.SAVEAS: case MODAL.SAVEAS:
@ -256,7 +255,9 @@ export default function Modal({
/> />
); );
case MODAL.RENAME: case MODAL.RENAME:
return <Rename title={title} setTitle={setTitle} />; return (
<Rename key={title} title={title} setTitle={setUncontrolledTitle} />
);
case MODAL.OPEN: case MODAL.OPEN:
return ( return (
<Open <Open
@ -339,7 +340,7 @@ export default function Modal({
}); });
}} }}
onCancel={() => { onCancel={() => {
if (modal === MODAL.RENAME) setTitle(prevTitle); if (modal === MODAL.RENAME) setUncontrolledTitle(title);
setModal(MODAL.NONE); setModal(MODAL.NONE);
}} }}
centered centered

2
src/components/EditorHeader/Modal/Rename.jsx
View File

@ -7,7 +7,7 @@ export default function Rename({ title, setTitle }) {
return ( return (
<Input <Input
placeholder={t("name")} placeholder={t("name")}
value={title} defaultValue={title}
onChange={(v) => setTitle(v)} onChange={(v) => setTitle(v)}
/> />
); );