diff --git a/Plugins/BetterSearchPage/BetterSearchPage.plugin.js b/Plugins/BetterSearchPage/BetterSearchPage.plugin.js index c4ad0d29ae..72307f135d 100644 --- a/Plugins/BetterSearchPage/BetterSearchPage.plugin.js +++ b/Plugins/BetterSearchPage/BetterSearchPage.plugin.js @@ -2,8 +2,8 @@ * @name BetterSearchPage * @author DevilBro * @authorId 278543574059057154 - * @version 1.2.2 - * @description Adds some extra Controls to the Search Results Page + * @version 1.2.3 + * @description Makes the Controls in the Search Results Page sticky * @invite Jx3TjNS * @donate https://www.paypal.me/MircoWittrien * @patreon https://www.patreon.com/MircoWittrien @@ -14,7 +14,9 @@ module.exports = (_ => { const changeLog = { - + "improved": { + "New Version": "Instead of copying the controls to the top, the controls are now sticky in the list" + } }; return !window.BDFDB_Global || (!window.BDFDB_Global.loaded && !window.BDFDB_Global.started) ? class { @@ -56,94 +58,65 @@ module.exports = (_ => { return template.content.firstElementChild; } } : (([Plugin, BDFDB]) => { + var stickySearchPagination, SearchResultsPaginationComponent; + const StickySearchPaginationComponent = class StickySearchPagination extends BdApi.React.Component { + componentDidMount() { + stickySearchPagination = this; + } + render() { + console.log(SearchResultsPaginationComponent, this); + if (!SearchResultsPaginationComponent) return null; + return BDFDB.ReactUtils.createElement(SearchResultsPaginationComponent, this.props); + } + }; + return class BetterSearchPage extends Plugin { onLoad () { - this.defaults = { - general: { - addJumpTo: {value: true, description: "Add a Jump to Input Field (press enter to Jump)"}, - cloneToTheTop: {value: true, description: "Clone the controls to the top of the Results Page"} - } - }; - this.modulePatches = { + before: [ + "SearchResultsPagination" + ], after: [ - "SearchResultsInner" + "SearchResults" ] }; + + this.css = ` + ${BDFDB.dotCN.searchresultspagination} { + background-color: var(--background-tertiary); + } + ${BDFDB.dotCNS.searchresultspagination + BDFDB.dotCN.paginationcontainer} { + margin-top: 0; + } + ${BDFDB.dotCN.searchresultswrap} [role="list"] ~ ${BDFDB.dotCN.searchresultspagination} { + display: none !important; + } + `; } onStart () { - this.forceUpdateAll(); } onStop () { - this.forceUpdateAll(); } - getSettingsPanel (collapseStates = {}) { - let settingsPanel, settingsItems = []; - - for (let key in this.defaults.general) settingsItems.push(BDFDB.ReactUtils.createElement(BDFDB.LibraryComponents.SettingsSaveItem, { - type: "Switch", - plugin: this, - keys: ["general", key], - label: this.defaults.general[key].description, - value: this.settings.general[key] - })); - - return settingsPanel = BDFDB.PluginUtils.createSettingsPanel(this, settingsItems); - } - - onSettingsClosed (e) { - if (this.SettingsUpdated) { - delete this.SettingsUpdated; - this.forceUpdateAll(); - } - } - - forceUpdateAll () { - BDFDB.PatchUtils.forceAllUpdates(this); - } - - processSearchResultsInner (e) { + processSearchResults (e) { if (!e.instance.props.search) return; - let [children, index] = BDFDB.ReactUtils.findParent(e.returnvalue, {name: "SearchResultsPagination"}); + let [children, index] = BDFDB.ReactUtils.findParent(e.returnvalue, {name: "SearchResultsHeader"}); if (index == -1) return; - let currentPage = parseInt(Math.floor(e.instance.props.search.offset / BDFDB.DiscordConstants.SEARCH_PAGE_SIZE)) + 1; - let maxPage = e.instance.props.search.totalResults > 5000 ? parseInt(Math.ceil(5000 / BDFDB.DiscordConstants.SEARCH_PAGE_SIZE)) : parseInt(Math.ceil(e.instance.props.search.totalResults / BDFDB.DiscordConstants.SEARCH_PAGE_SIZE)); - - children[index].props.totalResults = children[index].props.totalResults > 5000 ? 5000 : children[index].props.totalResults; - - let pagination = children[index].type(children[index].props); - if (!pagination || maxPage < 2) return; - pagination.props.className = BDFDB.DOMUtils.formatClassName(pagination.props.className, BDFDB.disCN.pagination, BDFDB.disCN._bettersearchpagepagination, this.settings.general.addJumpTo && BDFDB.disCN.paginationmini); - - if (this.settings.general.addJumpTo) { - pagination.props.children = [ - pagination.props.children, - BDFDB.ReactUtils.createElement(BDFDB.LibraryComponents.TextInput, { - type: "number", - size: BDFDB.LibraryComponents.TextInput.Sizes.MINI, - value: currentPage, - min: 1, - max: maxPage, - onKeyDown: (event, instance) => { - if (event.which == 13) { - let page = instance.props.value < 1 ? 1 : (instance.props.value > maxPage ? maxPage : instance.props.value); - if (page < currentPage) BDFDB.LibraryModules.SearchPageUtils.searchPreviousPage(e.instance.props.searchId, (currentPage - page) * BDFDB.DiscordConstants.SEARCH_PAGE_SIZE); - else if (page > currentPage) BDFDB.LibraryModules.SearchPageUtils.searchNextPage(e.instance.props.searchId, (page - currentPage) * BDFDB.DiscordConstants.SEARCH_PAGE_SIZE); - } - } - }) - ].flat(10).filter(n => n); + children.splice(index + 1, 0, BDFDB.ReactUtils.createElement(StickySearchPaginationComponent, { + changePage: newPage => !e.instance.props.search.searching && BDFDB.LibraryModules.SearchPageUtils.changePage(e.instance.props.searchId, newPage - 1), + offset: e.instance.props.search.offset, + totalResults: e.instance.props.search.totalResults, + pageLength: BDFDB.DiscordConstants.SEARCH_PAGE_SIZE + })); + } + + processSearchResultsPagination (e) { + if (!SearchResultsPaginationComponent) { + SearchResultsPaginationComponent = e.component; + BDFDB.ReactUtils.forceUpdate(stickySearchPagination); } - children[index] = pagination; - if (this.settings.general.cloneToTheTop) { - let topPagination = BDFDB.ReactUtils.cloneElement(pagination); - topPagination.props.className = BDFDB.DOMUtils.formatClassName(topPagination.props.className, BDFDB.disCN.paginationtop); - children.unshift(topPagination); - } - pagination.props.className = BDFDB.DOMUtils.formatClassName(pagination.props.className, BDFDB.disCN.paginationbottom); } }; })(window.BDFDB_Global.PluginUtils.buildPlugin(changeLog)); diff --git a/Plugins/BetterSearchPage/README.md b/Plugins/BetterSearchPage/README.md index 7bd99950a4..a3fe34f3ba 100644 --- a/Plugins/BetterSearchPage/README.md +++ b/Plugins/BetterSearchPage/README.md @@ -12,7 +12,7 @@ [patreon-badge]: https://img.shields.io/badge/Patreon-%23F96854.svg?style=flat&logo=data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAAdhwAAHYcBj+XxZQAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAAGBSURBVFiF7Za9ThtBFEbPBUpERWMwCorfJjY4aVLxBFHCKyCl4hWQUqVMBULmbfiRCNACqSJsDsXakjHGO8Y7ovFXrmbmO3NnZ74bqrzUeUR8HPP9mdQ60AZawCZQBwK4BC6ADnAUEZeTFhmnsxLjdfVAfXhl/rB66h/1QyUAalu9TzAe1Z26NROAutvf0VvVU7+/CUD9PKP5MMT2VADqhvqvAvOB7tQ1gIXXznpEP4HlxLEpWgH2AEInX0OLv/cUWKwQAKALbKZU4EsGc4AloJ0C8CmD+UDNFIBGRoBGCkAtI8B66i3IpccUgJuMANcpAKcZAc5SAE4yAnRSAA6BXgbzLnBUChARF8DvDAC/IuIqNYzqFYfRrVqDxDCKiL/AV6o5ikdgJyJuBrsrrcBQJX44W0/QVb+NLpoM0B/f6pdwWt2qL3NlWoD+nFV1X/2fYPxg0cCOfdJL+4ESkBqwDTQpQmuNoi2/onjAOsBxRFxPWmTqClSp9w6jOcAcYA7AE1OMk5ulhBZCAAAAAElFTkSuQmCC [patreon-link]: https://patreon.com/MircoWittrien -Adds some extra Controls to the Search Results Page +Makes the Controls in the Search Results Page sticky ![cover](https://mwittrien.github.io/BetterDiscordAddons/Plugins/BetterSearchPage/_res/cover.png) \ No newline at end of file diff --git a/Plugins/README.md b/Plugins/README.md index d9e67cff69..a93b669d64 100644 --- a/Plugins/README.md +++ b/Plugins/README.md @@ -11,7 +11,7 @@ - [Better Friend List](https://github.com/mwittrien/BetterDiscordAddons/tree/master/Plugins/BetterFriendList) - Adds extra Controls to the Friends Page, for example sort by Name/Status, Search and All/Request/Blocked Amount - [Better NSFW Tag](https://github.com/mwittrien/BetterDiscordAddons/tree/master/Plugins/BetterNsfwTag) - Adds a more noticeable Tag to NSFW Channels - - [Better Search Page](https://github.com/mwittrien/BetterDiscordAddons/tree/master/Plugins/BetterSearchPage) - Adds some extra Controls to the Search Results Page + - [Better Search Page](https://github.com/mwittrien/BetterDiscordAddons/tree/master/Plugins/BetterSearchPage) - Makes the Controls in the Search Results Page sticky - [Char Counter](https://github.com/mwittrien/BetterDiscordAddons/tree/master/Plugins/CharCounter) - Adds a Character Counter to most Inputs - [Chat Aliases](https://github.com/mwittrien/BetterDiscordAddons/tree/master/Plugins/ChatAliases) - Allows you to configure your own Aliases/Commands - [Chat Filter](https://github.com/mwittrien/BetterDiscordAddons/tree/master/Plugins/ChatFilter) - Allows you to censor Words or block complete Messages/Statuses