Protei/PromucFlow_constructor
2
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

chore: add ctrl y for windows users to redo (#7856)

Browse Source 
* Scaffolding for undo-redo

* undo redo working Poc commit

* memory performance improvements by diffing

* dont run update on undo/redo"

* merging widget postion update and canvas bottom row update into one dsl update.

* fix tabs widget

* Visible updates per undo redo action (#6838)

Co-authored-by: Rahul R <rahulramesha@Rahuls-MacBook-Pro.local>

* resize atomic operation

* fix switch control state issue

* disallow undo/redo for snipping and comment mode

* disallow undo/redo for snipping and comment mode

* fix color picker issue in undo/redo

* add test for replayDSL

* option control fix, adding logs

* minor position change undo redo updates

* add test cases for replayHelpers

* property Upade visual change

* remove unused code

* global hot key jest test for undo redo

* Fixing batch updates on property change..

* add tests for toggle control in property pane

* unwanted utils.

* add tests for text control

* add tests for deletion

* add tests for dropping a new widget

* adding jest test for replayUtils

* add move widget tests

* add tests for color picker control

* add analytics for undo/redo

* add analytics for undo/redo

* tab addition atomic

* cypress tests for propertyPane, toasts and radiowidget optionControl

* replayDSL end of redo stack fix

* property update changes

* menu option control debounce input

* color picker empty undo fix

* fix cypress tests

* widget add/remove atomic

* revert alternative approach to handle atomic operations

* update replayDSL test

* add some comments

* addressing review comments

* flash color for property pane controls

* Fixing adding of tabs widget as well.

* code review comments.

* merging widget postion update and canvas bottom row update into one dsl update.

* fix ordering of tabs property control

* meta property update canvas min height.

* fixing failed specs.

* Fixing entity explorer update on deleting tab from entity explorer.

* address review comments and minor property update changes

* fixing failing tests

* merge conflicts

* changes to cater widget api.

* fix suggested widget table issue

* draggable list for undo redo

* fix widget name focus

* excluding canvas updates.

* fixing codeEditor update on propertySection collapse

* fixed failing test case

* ctrl y to redo for windows users

Co-authored-by: Abhinav Jha <abhinav@appsmith.com>
Co-authored-by: Rahul R <rahulramesha@Rahuls-MacBook-Pro.local>
Co-authored-by: root <root@DESKTOP-9GENCK0.localdomain>
Co-authored-by: Ashok Kumar M <35134347+marks0351@users.noreply.github.com>
Co-authored-by: Pawan Kumar <pawankumar@Pawans-MacBook-Pro.local>
This commit is contained in:
rahulramesha 2021-10-08 12:01:43 +05:30 committed by GitHub
parent ad6c015826
commit 86c931e365
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 38 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
app/client/src/pages/Editor/GlobalHotKeys.test.tsx
View File

@ -575,6 +575,32 @@ describe("Undo/Redo hotkey", () => {
);
});
expect(dispatchSpy).toBeCalledTimes(1);
expect(dispatchSpy).toBeCalledWith(redoAction());
});
it("should dispatch redo Action on ctrl + y", () => {
const dispatchSpy = jest.spyOn(store, "dispatch");
const component = render(
<MockPageDSL>
<GlobalHotKeys>
<MockCanvas />
</GlobalHotKeys>
</MockPageDSL>,
);
dispatchSpy.mockClear();
act(() => {
dispatchTestKeyboardEventWithCode(
component.container,
"keydown",
"Y",
89,
false,
true,
);
});
expect(dispatchSpy).toBeCalledTimes(1);
expect(dispatchSpy).toBeCalledWith(redoAction());
});

8
app/client/src/pages/Editor/GlobalHotKeys.tsx
View File

@ -306,6 +306,14 @@ class GlobalHotKeys extends React.Component<Props> {
preventDefault
stopPropagation
/>
<Hotkey
combo="mod + y"
global
label="Redo change in canvas"
onKeyDown={this.props.redo}
preventDefault
stopPropagation
/>
<Hotkey
combo="mod + g"
global

6
app/client/src/utils/replayHelpers.tsx
View File

@ -2,7 +2,7 @@ import React from "react";
import scrollIntoView from "scroll-into-view-if-needed";
import { modText, flashElementsById } from "./helpers";
import { modText, flashElementsById, isMac } from "./helpers";
import localStorage from "./localStorage";
import { Toaster } from "components/ads/Toast";
import {
@ -24,10 +24,12 @@ export const getReplayToastActionText = (replayType = "undo") => {
case "undo":
return <>UNDO ({modText()}+Z) </>;
case "redo":
return (
return isMac() ? (
<>
REDO ({modText()}+<span>&#8682;</span>+Z){" "}
</>
) : (
<>REDO ({modText()}+Y) </>
);
}
};