mirror of
https://github.com/Stremio/stremio-web.git
synced 2026-04-19 01:22:11 +00:00
fix(Addons): parse correct url and search params
This commit is contained in:
parent
0951ef350c
commit
ed65bed7c8
2 changed files with 10 additions and 15 deletions
|
|
@ -1,7 +1,8 @@
|
|||
// Copyright (C) 2017-2023 Smart code 203358507
|
||||
|
||||
const React = require('react');
|
||||
const PropTypes = require('prop-types');
|
||||
const { useParams } = require('react-router');
|
||||
const { useSearchParams } = require('react-router-dom');
|
||||
const classnames = require('classnames');
|
||||
const { useTranslation } = require('react-i18next');
|
||||
const { default: Icon } = require('@stremio/stremio-icons/react');
|
||||
|
|
@ -16,13 +17,15 @@ const useSelectableInputs = require('./useSelectableInputs');
|
|||
const styles = require('./styles');
|
||||
const { AddonPlaceholder } = require('./AddonPlaceholder');
|
||||
|
||||
const Addons = ({ urlParams, queryParams }) => {
|
||||
const Addons = () => {
|
||||
const urlParams = useParams();
|
||||
const [queryParams] = useSearchParams();
|
||||
const { t } = useTranslation();
|
||||
const platform = usePlatform();
|
||||
const { core } = useServices();
|
||||
const installedAddons = useInstalledAddons(urlParams);
|
||||
const remoteAddons = useRemoteAddons(urlParams);
|
||||
const [addonDetailsTransportUrl, setAddonDetailsTransportUrl] = useAddonDetailsTransportUrl(urlParams, queryParams);
|
||||
const [addonDetailsTransportUrl, setAddonDetailsTransportUrl] = useAddonDetailsTransportUrl(urlParams);
|
||||
const selectInputs = useSelectableInputs(installedAddons, remoteAddons);
|
||||
const [filtersModalOpen, openFiltersModal, closeFiltersModal] = useBinaryState(false);
|
||||
const [addAddonModalOpen, openAddAddonModal, closeAddAddonModal] = useBinaryState(false);
|
||||
|
|
@ -292,16 +295,6 @@ const Addons = ({ urlParams, queryParams }) => {
|
|||
);
|
||||
};
|
||||
|
||||
Addons.propTypes = {
|
||||
urlParams: PropTypes.shape({
|
||||
path: PropTypes.string,
|
||||
transportUrl: PropTypes.string,
|
||||
catalogId: PropTypes.string,
|
||||
type: PropTypes.string
|
||||
}),
|
||||
queryParams: PropTypes.instanceOf(URLSearchParams)
|
||||
};
|
||||
|
||||
const AddonsFallback = () => (
|
||||
<MainNavBars className={styles['addons-container']} route={'addons'} />
|
||||
);
|
||||
|
|
|
|||
|
|
@ -1,8 +1,10 @@
|
|||
// Copyright (C) 2017-2023 Smart code 203358507
|
||||
|
||||
const React = require('react');
|
||||
const { useSearchParams } = require('react-router-dom');
|
||||
|
||||
const useAddonDetailsTransportUrl = (urlParams, queryParams) => {
|
||||
const useAddonDetailsTransportUrl = (urlParams) => {
|
||||
const [queryParams, setQueryParams] = useSearchParams();
|
||||
const transportUrl = React.useMemo(() => {
|
||||
return queryParams.get('addon');
|
||||
}, [queryParams]);
|
||||
|
|
@ -14,7 +16,7 @@ const useAddonDetailsTransportUrl = (urlParams, queryParams) => {
|
|||
nextQueryParams.delete('addon');
|
||||
}
|
||||
|
||||
window.location.replace(`#${urlParams.path}?${nextQueryParams}`);
|
||||
setQueryParams(nextQueryParams);
|
||||
}, [urlParams, queryParams]);
|
||||
return [transportUrl, setTransportUrl];
|
||||
};
|
||||
|
|
|
|||
Loading…
Reference in a new issue