Mirror/SponsorBlock
1
0
Fork 0
mirror of https://github.com/ajayyy/SponsorBlock.git synced 2025-12-20 22:48:36 +03:00
Code Issues Packages Projects Releases Wiki Activity

Handle popup staying open for videoID changes

Browse Source
This commit is contained in:
Ajay
2025-09-09 04:19:00 -04:00
parent 05fa9ff317
commit e1e666049a
1 changed files with 21 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/popup/PopupComponent.tsx
View File

@@ -50,8 +50,9 @@ interface LoadSegmentsProps extends SegmentsLoadedProps {
interface SkipProfileRadioButtonsProps { interface SkipProfileRadioButtonsProps {
selected: SkipProfileAction; selected: SkipProfileAction;
setSelected: (s: SkipProfileAction, updateConfig: boolean) => void; setSelected: (s: SkipProfileAction, updateConfig: boolean) => void;
disabled: boolean; disabled: boolean;
configID: ConfigurationID | null;
videoID: string;
} }
interface SkipOptionActionComponentProps { interface SkipOptionActionComponentProps {
@@ -446,6 +447,10 @@ function SkipProfileButton(props: {videoID: string; setShowForceChannelCheckWarn
const [menuOpen, setMenuOpen] = React.useState(false); const [menuOpen, setMenuOpen] = React.useState(false);
const skipProfileSet = getSkipProfileIDForChannel() !== null; const skipProfileSet = getSkipProfileIDForChannel() !== null;
React.useEffect(() => {
setMenuOpen(false);
}, [props.videoID]);
return ( return (
<> <>
<label id="skipProfileButton" <label id="skipProfileButton"
@@ -476,7 +481,7 @@ function SkipProfileButton(props: {videoID: string; setShowForceChannelCheckWarn
{ {
props.videoID && props.videoID &&
<SkipProfileMenu open={menuOpen} /> <SkipProfileMenu open={menuOpen} videoID={props.videoID} />
} }
</> </>
); );
@@ -496,7 +501,7 @@ const skipProfileOptions: SkipProfileOption[] = [{
active: () => getSkipProfileIDForChannel() !== null active: () => getSkipProfileIDForChannel() !== null
}]; }];
function SkipProfileMenu(props: {open: boolean}): JSX.Element { function SkipProfileMenu(props: {open: boolean; videoID: string}): JSX.Element {
const [configID, setConfigID] = React.useState<ConfigurationID | null>(null); const [configID, setConfigID] = React.useState<ConfigurationID | null>(null);
const [selectedSkipProfileAction, setSelectedSkipProfileAction] = React.useState<SkipProfileAction>(null); const [selectedSkipProfileAction, setSelectedSkipProfileAction] = React.useState<SkipProfileAction>(null);
const [allSkipProfiles, setAllSkipProfiles] = React.useState(Object.entries(Config.local!.skipProfiles)); const [allSkipProfiles, setAllSkipProfiles] = React.useState(Object.entries(Config.local!.skipProfiles));
@@ -511,10 +516,10 @@ function SkipProfileMenu(props: {open: boolean}): JSX.Element {
alert(chrome.i18n.getMessage("channelDataNotFound") + " https://github.com/ajayyy/SponsorBlock/issues/753"); alert(chrome.i18n.getMessage("channelDataNotFound") + " https://github.com/ajayyy/SponsorBlock/issues/753");
} }
} }
setConfigID(getSkipProfileID());
} }
}, [props.open]);
setConfigID(getSkipProfileID());
}, [props.open, props.videoID]);
React.useEffect(() => { React.useEffect(() => {
Config.configLocalListeners.push(() => { Config.configLocalListeners.push(() => {
@@ -582,6 +587,8 @@ function SkipProfileMenu(props: {open: boolean}): JSX.Element {
setSelectedSkipProfileAction(s); setSelectedSkipProfileAction(s);
}} }}
disabled={configID === null} disabled={configID === null}
configID={configID}
videoID={props.videoID}
/> />
</div> </div>
</div> </div>
@@ -592,15 +599,20 @@ function SkipProfileRadioButtons(props: SkipProfileRadioButtonsProps): JSX.Eleme
const result: JSX.Element[] = []; const result: JSX.Element[] = [];
React.useEffect(() => { React.useEffect(() => {
if (props.selected === null) { if (props.configID === null) {
props.setSelected(null, false);
} else {
for (const option of skipProfileOptions) { for (const option of skipProfileOptions) {
if (option.active()) { if (option.active()) {
props.setSelected(option.name, false); if (props.selected !== option.name) {
props.setSelected(option.name, false);
}
return; return;
} }
} }
} }
}, [props.selected]); }, [props.configID, props.videoID]);
let alreadySelected = false; let alreadySelected = false;
for (const option of skipProfileOptions) { for (const option of skipProfileOptions) {