Skip to content

fix: preserve archive filter directory context #2984

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

Closed
RabbiIslamRony wants to merge 1 commit into from
Closed

fix: preserve archive filter directory context #2984

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
2 changes: 1 addition & 1 deletion assets/build/js/public/search-form.js
View file
Open in desktop

Large diffs are not rendered by default.

51 changes: 38 additions & 13 deletions assets/src/js/public/search-form.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -933,28 +933,53 @@ document.addEventListener('DOMContentLoaded', () => {
}, 300);

// Reset search form values
if (this.closest('.directorist-contents-wrap')) {
let searchForm = this.closest(
'.directorist-contents-wrap'
).querySelector('.directorist-search-form');
const resetTargets = new Set();
const searchModal = this.closest('.directorist-search-modal');

if (searchModal) {
resetTargets.add(searchModal);
searchModal
.querySelectorAll("input[type='checkbox'], input[type='radio']")
.forEach((input) => {
input.checked = false;
input
.closest('.directorist-search-field')
?.classList.remove('input-has-value', 'input-is-focused');
});
searchModal.querySelectorAll('select').forEach((select) => {
select.selectedIndex = 0;
select
.closest('.directorist-search-field')
?.classList.remove('input-has-value', 'input-is-focused');
$(select).trigger('change');
});
}

const contentsWrap = this.closest('.directorist-contents-wrap');
if (contentsWrap) {
let searchForm = contentsWrap.querySelector(
'.directorist-search-form'
);
if (searchForm) {
adsFormReset(searchForm);
resetTargets.add(searchForm);
}

let advanceSearchForm = this.closest(
'.directorist-contents-wrap'
).querySelector('.directorist-advanced-filter__form');
let advanceSearchForm = contentsWrap.querySelector(
'.directorist-advanced-filter__form'
);
if (advanceSearchForm) {
adsFormReset(advanceSearchForm);
resetTargets.add(advanceSearchForm);
}

let advanceSearchFilter = this.closest(
'.directorist-contents-wrap'
).querySelector('.directorist-advanced-filter__advanced');
let advanceSearchFilter = contentsWrap.querySelector(
'.directorist-advanced-filter__advanced'
);
if (advanceSearchFilter) {
adsFormReset(advanceSearchFilter);
resetTargets.add(advanceSearchFilter);
}
}

resetTargets.forEach(adsFormReset);
});
}

Expand Down
4 changes: 4 additions & 0 deletions includes/model/Listings.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1499,6 +1499,10 @@ public function get_current_listing_type() {

if ( is_singular( ATBDP_POST_TYPE ) ) {
$directory = get_post_meta( get_the_ID(), '_directory_type', true );
} else if ( 'listing' === $this->type && ! empty( $this->default_directory_type ) ) {
// An archive instance with an explicitly configured default directory
// must not inherit a directory value from another request context.
$directory = $this->default_directory_type;
} else if ( ! empty( $_REQUEST['directory_type'] ) ) {
$directory = sanitize_text_field( wp_unslash( $_REQUEST['directory_type'] ) );
} else if ( ! empty( $this->default_directory_type ) ) {
Expand Down
Loading