Skip to content

fix: resetCanvasState indirectly called in useHistory, resets the isBlock status #1009

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

Merged
rhlin merged 1 commit into from
Jan 9, 2025
Merged

fix: resetCanvasState indirectly called in useHistory, resets the isBlock status #1009

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
1 change: 1 addition & 0 deletions packages/canvas/DesignCanvas/src/api/useCanvas.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -560,6 +560,7 @@ export default function () {
setSaved,
clearCanvas,
getPageSchema,
resetCanvasState,
Comment thread
gene9831 marked this conversation as resolved.
resetPageCanvasState,
resetBlockCanvasState,
clearCurrentState,
Expand Down
3 changes: 2 additions & 1 deletion packages/toolbars/redoundo/src/composable/useHistory.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,8 @@ const push = (schema) => {

const go = (addend, valid) => {
historyState.index = historyState.index + addend
useCanvas().importSchema(string2Schema(list[historyState.index]))
const { pageState, resetCanvasState } = useCanvas()
resetCanvasState({ ...pageState, pageSchema: string2Schema(list[historyState.index]) })

// 不是锁定状态，撤销操作后，传递第二个标识位，将 list 的长度减一，置灰 undoredo 操作按钮
if (typeof valid === 'boolean') {
Expand Down