OpenSource/Sharkey
OpenSource/Sharkey
1
0
Fork 0
mirror of https://activitypub.software/TransFem-org/Sharkey.git synced 2025-01-01 08:26:14 +01:00
Code Issues Projects Releases Packages Wiki Activity

avoid empty blocks when hiding ads

Browse source 
2024.10 or 2024.11 added a `<div>` around `<MkAd>`, but while `MkAd`
checks if ads should be shown, and generates an empty `<div>` if not,
the wrapper `div` was always shown.

This commit takes the same logic from `MkAd` and applies it to the
wrapper as well.

thanks to @puppygirlhornypost for noticing
This commit is contained in:
dakkar 2024-12-18 15:56:46 +00:00
parent 7f19f8c10b
commit e9e2a5dd77
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
packages/frontend/src/components/MkDateSeparatedList.vue
View file

@ -12,6 +12,7 @@ import * as os from '@/os.js';
import { instance } from '@/instance.js'; import { instance } from '@/instance.js';
import { defaultStore } from '@/store.js'; import { defaultStore } from '@/store.js';
import { MisskeyEntity } from '@/types/date-separated-list.js'; import { MisskeyEntity } from '@/types/date-separated-list.js';
import { $i } from '@/account.js';
export default defineComponent({ export default defineComponent({
props: { props: {
@ -55,7 +56,7 @@ export default defineComponent({
if (props.items.length === 0) return; if (props.items.length === 0) return;
const renderChildrenImpl = () => props.items.map((item, i) => { const renderChildrenImpl = (shouldHideAds: boolean) => props.items.map((item, i) => {
if (!slots || !slots.default) return; if (!slots || !slots.default) return;
const el = slots.default({ const el = slots.default({
@ -100,7 +101,7 @@ export default defineComponent({
return [el, separator]; return [el, separator];
} else { } else {
if (props.ad && instance.ads.length > 0 && item._shouldInsertAd_) { if (props.ad && instance.ads.length > 0 && item._shouldInsertAd_ && !shouldHideAds) {
return [h('div', { return [h('div', {
key: item.id + ':ad', key: item.id + ':ad',
class: $style['ad-wrapper'], class: $style['ad-wrapper'],
@ -114,7 +115,9 @@ export default defineComponent({
}); });
const renderChildren = () => { const renderChildren = () => {
const children = renderChildrenImpl(); const shouldHideAds = !defaultStore.state.forceShowAds && $i && $i.policies.canHideAds;
const children = renderChildrenImpl(shouldHideAds);
if (isDebuggerEnabled(6864)) { if (isDebuggerEnabled(6864)) {
const nodes = children.flatMap((node) => node ?? []); const nodes = children.flatMap((node) => node ?? []);
const keys = new Set(nodes.map((node) => node.key)); const keys = new Set(nodes.map((node) => node.key));