mirror of
https://github.com/ajayyy/SponsorBlock.git
synced 2025-12-12 14:37:23 +03:00
Make category tooltip work on mobile and make it clear after voting
This commit is contained in:
@@ -13,6 +13,7 @@ import { getErrorMessage } from "../maze-utils/formating";
|
|||||||
export interface CategoryPillProps {
|
export interface CategoryPillProps {
|
||||||
vote: (type: number, UUID: SegmentUUID, category?: Category) => Promise<VoteResponse>;
|
vote: (type: number, UUID: SegmentUUID, category?: Category) => Promise<VoteResponse>;
|
||||||
showTextByDefault: boolean;
|
showTextByDefault: boolean;
|
||||||
|
showTooltipOnClick: boolean;
|
||||||
}
|
}
|
||||||
|
|
||||||
export interface CategoryPillState {
|
export interface CategoryPillState {
|
||||||
@@ -49,6 +50,7 @@ class CategoryPillComponent extends React.Component<CategoryPillProps, CategoryP
|
|||||||
onClick={(e) => this.toggleOpen(e)}
|
onClick={(e) => this.toggleOpen(e)}
|
||||||
onMouseEnter={() => this.openTooltip()}
|
onMouseEnter={() => this.openTooltip()}
|
||||||
onMouseLeave={() => this.closeTooltip()}>
|
onMouseLeave={() => this.closeTooltip()}>
|
||||||
|
|
||||||
<span className="sponsorBlockCategoryPillTitleSection">
|
<span className="sponsorBlockCategoryPillTitleSection">
|
||||||
<img className="sponsorSkipLogo sponsorSkipObject"
|
<img className="sponsorSkipLogo sponsorSkipObject"
|
||||||
src={chrome.extension.getURL("icons/IconSponsorBlocker256px.png")}>
|
src={chrome.extension.getURL("icons/IconSponsorBlocker256px.png")}>
|
||||||
@@ -86,7 +88,10 @@ class CategoryPillComponent extends React.Component<CategoryPillProps, CategoryP
|
|||||||
{/* Close Button */}
|
{/* Close Button */}
|
||||||
<img src={chrome.extension.getURL("icons/close.png")}
|
<img src={chrome.extension.getURL("icons/close.png")}
|
||||||
className="categoryPillClose"
|
className="categoryPillClose"
|
||||||
onClick={() => this.setState({ show: false })}>
|
onClick={() => {
|
||||||
|
this.setState({ show: false });
|
||||||
|
this.closeTooltip();
|
||||||
|
}}>
|
||||||
</img>
|
</img>
|
||||||
</span>
|
</span>
|
||||||
);
|
);
|
||||||
@@ -96,6 +101,14 @@ class CategoryPillComponent extends React.Component<CategoryPillProps, CategoryP
|
|||||||
event.stopPropagation();
|
event.stopPropagation();
|
||||||
|
|
||||||
if (this.state.show) {
|
if (this.state.show) {
|
||||||
|
if (this.props.showTooltipOnClick) {
|
||||||
|
if (this.state.open) {
|
||||||
|
this.closeTooltip();
|
||||||
|
} else {
|
||||||
|
this.openTooltip();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
this.setState({ open: !this.state.open });
|
this.setState({ open: !this.state.open });
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -113,6 +126,8 @@ class CategoryPillComponent extends React.Component<CategoryPillProps, CategoryP
|
|||||||
open: false,
|
open: false,
|
||||||
show: type === 1
|
show: type === 1
|
||||||
});
|
});
|
||||||
|
|
||||||
|
this.closeTooltip();
|
||||||
} else if (response.statusCode !== 403) {
|
} else if (response.statusCode !== 403) {
|
||||||
alert(getErrorMessage(response.statusCode, response.responseText));
|
alert(getErrorMessage(response.statusCode, response.responseText));
|
||||||
}
|
}
|
||||||
@@ -132,7 +147,11 @@ class CategoryPillComponent extends React.Component<CategoryPillProps, CategoryP
|
|||||||
}
|
}
|
||||||
|
|
||||||
private openTooltip(): void {
|
private openTooltip(): void {
|
||||||
const tooltipMount = document.querySelector("#above-the-fold") as HTMLElement;
|
if (this.tooltip) {
|
||||||
|
this.tooltip.close();
|
||||||
|
}
|
||||||
|
|
||||||
|
const tooltipMount = document.querySelector("#above-the-fold, ytm-slim-owner-renderer") as HTMLElement;
|
||||||
if (tooltipMount) {
|
if (tooltipMount) {
|
||||||
this.tooltip = new Tooltip({
|
this.tooltip = new Tooltip({
|
||||||
text: this.getTitleText(),
|
text: this.getTitleText(),
|
||||||
@@ -148,7 +167,7 @@ class CategoryPillComponent extends React.Component<CategoryPillProps, CategoryP
|
|||||||
}
|
}
|
||||||
|
|
||||||
private closeTooltip(): void {
|
private closeTooltip(): void {
|
||||||
this.tooltip?.close();
|
this.tooltip?.close?.();
|
||||||
this.tooltip = null;
|
this.tooltip = null;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -47,7 +47,11 @@ export class CategoryPill {
|
|||||||
|
|
||||||
this.root = createRoot(this.container);
|
this.root = createRoot(this.container);
|
||||||
this.ref = React.createRef();
|
this.ref = React.createRef();
|
||||||
this.root.render(<CategoryPillComponent ref={this.ref} vote={this.vote} showTextByDefault={!this.onMobileYouTube} />);
|
this.root.render(<CategoryPillComponent
|
||||||
|
ref={this.ref}
|
||||||
|
vote={this.vote}
|
||||||
|
showTextByDefault={!this.onMobileYouTube}
|
||||||
|
showTooltipOnClick={this.onMobileYouTube} />);
|
||||||
|
|
||||||
if (this.onMobileYouTube) {
|
if (this.onMobileYouTube) {
|
||||||
if (this.mutationObserver) {
|
if (this.mutationObserver) {
|
||||||
|
|||||||
Reference in New Issue
Block a user