Skip to content
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

fix(): block enterEditing after endCurrentTransform #9513

Merged
merged 4 commits into from
Nov 30, 2023
Merged

fix(): block enterEditing after endCurrentTransform #9513

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
bd45745
fix(): `enterEditing` after `endCurrentTransform`
ShaMan123 Nov 27, 2023
ee44cbb
update CHANGELOG.md
github-actions[bot] Nov 27, 2023
800f6f3
update CHANGELOG.md
github-actions[bot] Nov 27, 2023
ce45d5a
Merge branch 'master' into fix-mouse-up-after-end-transform
asturur Nov 30, 2023
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
4 changes: 4 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@

## [next]

- fix(): block `enterEditing` after `endCurrentTransform` [#9513](https://github.com/fabricjs/fabric.js/pull/9513)
- fix(): transferring object between active selections, expose `FabricObject#parent`, rm `isActiveSelection` [#8951](https://github.com/fabricjs/fabric.js/pull/8951)
**BREAKING beta**:
- rm(): `getParent` => `FabricObject#parent`
- refactor(): Layout Manager [#9152](https://github.com/fabricjs/fabric.js/pull/9152)
- refactor(): transferring object between active selections, expose `FabricObject#parent`, rm `isActiveSelection` [#8951](https://github.com/fabricjs/fabric.js/pull/8951)
- refactor(): **BREAKING beta** `getParent` => `FabricObject#parent` [#8951](https://github.com/fabricjs/fabric.js/pull/8951)
Expand Down
2 changes: 1 addition & 1 deletion src/shapes/IText/ITextClickBehavior.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ export abstract class ITextClickBehavior<
this.__lastLastClickTime = this.__lastClickTime;
this.__lastClickTime = this.__newClickTime;
this.__lastPointer = newPointer;
this.__lastSelected = this.selected;
this.__lastSelected = this.selected && !this.getActiveControl();
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

__lastSelected is at this point a wrong name.
It is used exclusively to stop the mouse up default action and does nothing else, is already private.

I would rename it to `_willEnterEditOnMouseUp' and add a JSDOC block on the top where is declared.

What do you think?

I would discourage anyone to build custom logic on those internals state flip flops

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Doesn't even need to be done now. We can do an extra PR with that.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I agree with the name
Since it is a very crucial part of state there are use cases that you need to block the enter editing somehow.
For the majority of cases this small fix should do

}

isTripleClick(newPointer: XY) {
Expand Down
Loading