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.

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(cdk/drag-drop): account for enterPredicate when setting receiving class #21346

Merged

Conversation

crisbeto
Copy link
Member

Currently we set a class when a container is able to receive the dragged item, however we add this class to all connected containers without accounting for other things that could prevent the item from entering, like enterPredicate.

These changes add some logic to account for the predicate when setting the class.

Fixes #21171.

… class

Currently we set a class when a container is able to receive the dragged item,
however we add this class to all connected containers without accounting
for other things that could prevent the item from entering, like `enterPredicate`.

These changes add some logic to account for the predicate when setting the class.

Fixes angular#21171.
@crisbeto crisbeto added P3 An issue that is relevant to core functions, but does not impede progress. Important, but not urgent target: patch This PR is targeted for the next patch release labels Dec 14, 2020
@google-cla google-cla bot added the cla: yes PR author has agreed to Google's Contributor License Agreement label Dec 14, 2020
@@ -4483,33 +4483,6 @@ describe('CdkDrag', () => {
expect(spy).toHaveBeenCalledWith(dragItem, dropInstances[1]);
}));

it('should not call the `enterPredicate` if the pointer is not over the container',
Copy link
Member Author

Choose a reason for hiding this comment

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

This test was removed, because it's conflicting with what we want to do.

Copy link
Member

@jelbourn jelbourn left a comment

Choose a reason for hiding this comment

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

LGTM

@jelbourn jelbourn added the action: merge The PR is ready for merge by the caretaker label Dec 14, 2020
@mmalerba mmalerba merged commit 411b174 into angular:master Dec 17, 2020
mmalerba pushed a commit that referenced this pull request Dec 17, 2020
… class (#21346)

Currently we set a class when a container is able to receive the dragged item,
however we add this class to all connected containers without accounting
for other things that could prevent the item from entering, like `enterPredicate`.

These changes add some logic to account for the predicate when setting the class.

Fixes #21171.

(cherry picked from commit 411b174)
wagnermaciel pushed a commit to wagnermaciel/components that referenced this pull request Jan 14, 2021
… class (angular#21346)

Currently we set a class when a container is able to receive the dragged item,
however we add this class to all connected containers without accounting
for other things that could prevent the item from entering, like `enterPredicate`.

These changes add some logic to account for the predicate when setting the class.

Fixes angular#21171.
@angular-automatic-lock-bot
Copy link

This issue has been automatically locked due to inactivity.
Please file a new issue if you are encountering a similar or related problem.

Read more about our automatic conversation locking policy.

This action has been performed automatically by a bot.

@angular-automatic-lock-bot angular-automatic-lock-bot bot locked and limited conversation to collaborators Jan 17, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
action: merge The PR is ready for merge by the caretaker cla: yes PR author has agreed to Google's Contributor License Agreement P3 An issue that is relevant to core functions, but does not impede progress. Important, but not urgent target: patch This PR is targeted for the next patch release
Projects
None yet
Development

Successfully merging this pull request may close these issues.

feat(cdk-drag-drop): Give a visual clue to which droplist can receive a specific dragged item.
3 participants