mirror of
https://github.com/ajayyy/SponsorBlock.git
synced 2025-12-07 20:17:05 +03:00
Add segment list default tab config
This commit is contained in:
Submodule public/_locales updated: fcee4620b3...cf85b80e76
@@ -329,6 +329,17 @@
|
|||||||
</label>
|
</label>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
<br />
|
||||||
|
|
||||||
|
<div data-type="selector" data-sync="segmentListDefaultTab">
|
||||||
|
<label class="optionLabel" for="segmentListDefaultTab">__MSG_segmentListDefaultTab__:</label>
|
||||||
|
|
||||||
|
<select id="segmentListDefaultTab" class="selector-element optionsSelector">
|
||||||
|
<option value="0">__MSG_SegmentsCap__</option>
|
||||||
|
<option value="1">__MSG_Chapters__</option>
|
||||||
|
</select>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div data-type="toggle" data-sync="darkMode">
|
<div data-type="toggle" data-sync="darkMode">
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
import * as CompileConfig from "../config.json";
|
import * as CompileConfig from "../config.json";
|
||||||
import * as invidiousList from "../ci/invidiouslist.json";
|
import * as invidiousList from "../ci/invidiouslist.json";
|
||||||
import { Category, CategorySelection, CategorySkipOption, NoticeVisibilityMode, PreviewBarOption, SponsorTime, VideoID, SponsorHideType } from "./types";
|
import { Category, CategorySelection, CategorySkipOption, NoticeVisibilityMode, PreviewBarOption, SponsorTime, VideoID, SponsorHideType, SegmentListDefaultTab } from "./types";
|
||||||
import { Keybind, ProtoConfig, keybindEquals } from "../maze-utils/src/config";
|
import { Keybind, ProtoConfig, keybindEquals } from "../maze-utils/src/config";
|
||||||
import { HashedValue } from "../maze-utils/src/hash";
|
import { HashedValue } from "../maze-utils/src/hash";
|
||||||
import { Permission, AdvancedSkipRuleSet } from "./utils/skipRule";
|
import { Permission, AdvancedSkipRuleSet } from "./utils/skipRule";
|
||||||
@@ -10,6 +10,7 @@ interface SBConfig {
|
|||||||
isVip: boolean;
|
isVip: boolean;
|
||||||
permissions: Record<Category, Permission>;
|
permissions: Record<Category, Permission>;
|
||||||
defaultCategory: Category;
|
defaultCategory: Category;
|
||||||
|
segmentListDefaultTab: SegmentListDefaultTab;
|
||||||
renderSegmentsAsChapters: boolean;
|
renderSegmentsAsChapters: boolean;
|
||||||
forceChannelCheck: boolean;
|
forceChannelCheck: boolean;
|
||||||
minutesSaved: number;
|
minutesSaved: number;
|
||||||
@@ -337,6 +338,7 @@ const syncDefaults = {
|
|||||||
isVip: false,
|
isVip: false,
|
||||||
permissions: {},
|
permissions: {},
|
||||||
defaultCategory: "chooseACategory" as Category,
|
defaultCategory: "chooseACategory" as Category,
|
||||||
|
segmentListDefaultTab: SegmentListDefaultTab.Segments,
|
||||||
renderSegmentsAsChapters: false,
|
renderSegmentsAsChapters: false,
|
||||||
forceChannelCheck: false,
|
forceChannelCheck: false,
|
||||||
minutesSaved: 0,
|
minutesSaved: 0,
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
import * as React from "react";
|
import * as React from "react";
|
||||||
import { ActionType, SegmentUUID, SponsorHideType, SponsorTime, VideoID } from "../types";
|
import { ActionType, SegmentListDefaultTab, SegmentUUID, SponsorHideType, SponsorTime, VideoID } from "../types";
|
||||||
import Config from "../config";
|
import Config from "../config";
|
||||||
import { waitFor } from "../../maze-utils/src";
|
import { waitFor } from "../../maze-utils/src";
|
||||||
import { shortCategoryName } from "../utils/categoryUtils";
|
import { shortCategoryName } from "../utils/categoryUtils";
|
||||||
@@ -61,12 +61,21 @@ export const SegmentListComponent = (props: SegmentListComponentProps) => {
|
|||||||
}, [props.segments]);
|
}, [props.segments]);
|
||||||
|
|
||||||
React.useEffect(() => {
|
React.useEffect(() => {
|
||||||
if (hasSegments){
|
const setTabBasedOnConfig = () => {
|
||||||
setTab(SegmentListTab.Segments);
|
const preferChapters = Config.config.segmentListDefaultTab === SegmentListDefaultTab.Chapters;
|
||||||
|
if (preferChapters) {
|
||||||
|
setTab(hasChapters ? SegmentListTab.Chapter : SegmentListTab.Segments);
|
||||||
|
} else {
|
||||||
|
setTab(hasSegments ? SegmentListTab.Segments : SegmentListTab.Chapter);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
if (Config.isReady()) {
|
||||||
|
setTabBasedOnConfig();
|
||||||
} else {
|
} else {
|
||||||
setTab(SegmentListTab.Chapter);
|
waitFor(() => Config.isReady()).then(setTabBasedOnConfig);
|
||||||
}
|
}
|
||||||
}, [props.videoID, hasSegments]);
|
}, [props.videoID, hasSegments, hasChapters]);
|
||||||
|
|
||||||
const segmentsWithNesting = React.useMemo(() => {
|
const segmentsWithNesting = React.useMemo(() => {
|
||||||
const result: SegmentWithNesting[] = [];
|
const result: SegmentWithNesting[] = [];
|
||||||
|
|||||||
@@ -228,3 +228,8 @@ export enum NoticeVisibilityMode {
|
|||||||
FadedForAutoSkip = 3,
|
FadedForAutoSkip = 3,
|
||||||
FadedForAll = 4
|
FadedForAll = 4
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export enum SegmentListDefaultTab {
|
||||||
|
Segments,
|
||||||
|
Chapters,
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user