Skip to content

[19600] fix: Scroll behavior on hover and open, fix partialSelected with groups #19601

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

Open
fkwq34 wants to merge 1 commit into
base: master
Choose a base branch
from
+9 −7
Open

[19600] fix: Scroll behavior on hover and open, fix partialSelected with groups #19601

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
12 changes: 7 additions & 5 deletions packages/primeng/src/multiselect/multiselect.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1916,7 +1916,7 @@ export class MultiSelect extends BaseEditableHolder<MultiSelectPassThrough> {

onOptionMouseEnter(event, index) {
if (this.focusOnHover) {
this.changeFocusedOptionIndex(event, index);
this.focusedOptionIndex.set(index);
}
}

Expand Down Expand Up @@ -2007,7 +2007,7 @@ export class MultiSelect extends BaseEditableHolder<MultiSelectPassThrough> {
}

partialSelected() {
return this.selectedOptions && this.selectedOptions.length > 0 && this.selectedOptions.length < (this.options?.length || 0);
return this.hasSelectedOption() && !this.allSelected();
}

/**
Expand Down Expand Up @@ -2052,12 +2052,14 @@ export class MultiSelect extends BaseEditableHolder<MultiSelectPassThrough> {

if (this.options && this.options.length) {
if (this.virtualScroll) {
const selectedIndex = this.modelValue() ? this.focusedOptionIndex() : -1;
const selectedIndex = this.modelValue() ? this.findSelectedOptionIndex() : -1;
if (selectedIndex !== -1) {
this.scroller?.scrollToIndex(selectedIndex);
setTimeout(() => {
this.scroller?.scrollToIndex(selectedIndex);
}, 20);
}
} else {
let selectedListItem = findSingle(this.itemsWrapper, '[data-pc-section="option"][data-p-selected="true"]');
let selectedListItem = findSingle(this.itemsWrapper, '[data-p-selected="true"]');

if (selectedListItem) {
selectedListItem.scrollIntoView({ block: 'nearest', inline: 'nearest' });
Expand Down
4 changes: 2 additions & 2 deletions packages/primeng/src/select/select.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1241,7 +1241,7 @@ export class Select extends BaseInput<SelectPassThrough> implements AfterViewIni

onOptionMouseEnter(event, index) {
if (this.focusOnHover) {
this.changeFocusedOptionIndex(event, index);
this.focusedOptionIndex.set(index);
}
}

Expand Down Expand Up @@ -1419,7 +1419,7 @@ export class Select extends BaseInput<SelectPassThrough> implements AfterViewIni

if (this.options && this.options.length) {
if (this.virtualScroll) {
const selectedIndex = this.modelValue() ? this.focusedOptionIndex() : -1;
const selectedIndex = this.modelValue() ? this.findSelectedOptionIndex() : -1;
if (selectedIndex !== -1) {
setTimeout(() => {
this.scroller?.scrollToIndex(selectedIndex);
Expand Down