@temple-wallet/extension-ads 19.0.0-beta.2 → 19.0.0-beta.4
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/ads-actions/crypto-keywords.json +1 -464
- package/dist/ads-actions/helpers.js +11 -7
- package/dist/ads-actions/helpers.js.map +1 -1
- package/dist/ads-actions/index.js +3 -6
- package/dist/ads-actions/index.js.map +1 -1
- package/dist/ads-actions/process-providers-ads.js.map +1 -1
- package/dist/ads-actions/process-rule.js.map +1 -1
- package/dist/ads-actions/process-youtube-home-ads.js +2 -1
- package/dist/ads-actions/process-youtube-home-ads.js.map +1 -1
- package/dist/ads-actions/process-youtube-search-ads.js +9 -9
- package/dist/ads-actions/process-youtube-search-ads.js.map +1 -1
- package/dist/ads-actions/process-youtube-watch-ads.js +23 -18
- package/dist/ads-actions/process-youtube-watch-ads.js.map +1 -1
- package/dist/ads-configuration.js +2 -2
- package/dist/ads-configuration.js.map +1 -1
- package/dist/ads-flows/youtube-home.js +0 -3
- package/dist/ads-flows/youtube-home.js.map +1 -1
- package/dist/ads-flows/youtube-search.js +0 -3
- package/dist/ads-flows/youtube-search.js.map +1 -1
- package/dist/ads-flows/youtube-watch.js +1 -4
- package/dist/ads-flows/youtube-watch.js.map +1 -1
- package/dist/execute-ads-actions/ads-views/make-ads-tw-view.js +1 -0
- package/dist/execute-ads-actions/ads-views/make-ads-tw-view.js.map +1 -1
- package/dist/execute-ads-actions/children-add-or-remove-changes.d.ts +13 -0
- package/dist/execute-ads-actions/children-add-or-remove-changes.js +34 -0
- package/dist/execute-ads-actions/children-add-or-remove-changes.js.map +1 -0
- package/dist/execute-ads-actions/index.js +22 -18
- package/dist/execute-ads-actions/index.js.map +1 -1
- package/dist/execute-ads-actions/process-insert-ad-action.d.ts +2 -1
- package/dist/execute-ads-actions/process-insert-ad-action.js +34 -9
- package/dist/execute-ads-actions/process-insert-ad-action.js.map +1 -1
- package/dist/execute-ads-actions/theming-params.d.ts +4 -1
- package/dist/execute-ads-actions/theming-params.js +4 -3
- package/dist/execute-ads-actions/theming-params.js.map +1 -1
- package/dist/index.d.ts +0 -1
- package/dist/index.js +26 -26
- package/dist/render-ads-stack.js +4 -2
- package/dist/render-ads-stack.js.map +1 -1
- package/dist/transform-raw-rules.js +4 -1
- package/dist/transform-raw-rules.js.map +1 -1
- package/dist/types/ad-theme-params.d.ts +1 -0
- package/dist/types/ads-actions.d.ts +7 -11
- package/dist/types/ads-actions.js +0 -1
- package/dist/types/ads-actions.js.map +1 -1
- package/dist/types/temple-ads-api.d.ts +0 -1
- package/package.json +1 -1
- package/src/ads-configuration.ts +2 -2
- package/src/execute-ads-actions/children-add-or-remove-changes.ts +43 -0
- package/src/execute-ads-actions/index.ts +8 -3
- package/src/execute-ads-actions/process-insert-ad-action.ts +35 -4
- package/src/transform-raw-rules.ts +6 -1
- package/src/types/ads-actions.ts +2 -2
- package/src/types/temple-ads-api.ts +0 -1
package/dist/render-ads-stack.js
CHANGED
|
@@ -70,7 +70,8 @@ class AdsStack {
|
|
|
70
70
|
});
|
|
71
71
|
}
|
|
72
72
|
if ((_a = this.currentAdMetadata) === null || _a === void 0 ? void 0 : _a.source.native) {
|
|
73
|
-
|
|
73
|
+
const { backgroundColor, themeColor } = this.adThemeParams;
|
|
74
|
+
document.body.style.backgroundColor = (_b = backgroundColor !== null && backgroundColor !== void 0 ? backgroundColor : themeColor) !== null && _b !== void 0 ? _b : 'transparent';
|
|
74
75
|
}
|
|
75
76
|
break;
|
|
76
77
|
}
|
|
@@ -154,8 +155,9 @@ class AdsStack {
|
|
|
154
155
|
}
|
|
155
156
|
placeNewAd(adMetadata) {
|
|
156
157
|
var _a;
|
|
158
|
+
const { backgroundColor, themeColor } = this.adThemeParams;
|
|
157
159
|
document.body.style.backgroundColor = adMetadata.source.native
|
|
158
|
-
? (_a =
|
|
160
|
+
? (_a = backgroundColor !== null && backgroundColor !== void 0 ? backgroundColor : themeColor) !== null && _a !== void 0 ? _a : 'transparent'
|
|
159
161
|
: '#F2F2F2';
|
|
160
162
|
const { source, dimensions } = adMetadata;
|
|
161
163
|
let adView;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"render-ads-stack.js","sourceRoot":"","sources":["../src/render-ads-stack.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"render-ads-stack.js","sourceRoot":"","sources":["../src/render-ads-stack.ts"],"names":[],"mappings":"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"}
|
|
@@ -64,7 +64,10 @@ const buildAdPlacesRules = (hostname, hrefMatchPredicate, adPlacesRulesForAllDom
|
|
|
64
64
|
const ruleToComplementIndex = acc.findIndex((_a) => {
|
|
65
65
|
var { selector: candidateSelector } = _a, candidateRestProps = __rest(_a, ["selector"]);
|
|
66
66
|
const { cssString: _candidateCssString } = candidateSelector, restCandidateSelectorProps = __rest(candidateSelector, ["cssString"]);
|
|
67
|
-
return isEqual(restSelectorProps, restCandidateSelectorProps) &&
|
|
67
|
+
return (isEqual(restSelectorProps, restCandidateSelectorProps) &&
|
|
68
|
+
isEqual(restProps, candidateRestProps) &&
|
|
69
|
+
restSelectorProps.isMultiple &&
|
|
70
|
+
restCandidateSelectorProps.isMultiple);
|
|
68
71
|
});
|
|
69
72
|
if (ruleToComplementIndex === -1) {
|
|
70
73
|
acc.push(Object.assign({ selector }, restProps));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"transform-raw-rules.js","sourceRoot":"","sources":["../src/transform-raw-rules.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"transform-raw-rules.js","sourceRoot":"","sources":["../src/transform-raw-rules.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,8 +7,7 @@ export declare enum AdActionType {
|
|
|
7
7
|
SimpleInsertAd = "simple-insert-ad",
|
|
8
8
|
RemoveElement = "remove-element",
|
|
9
9
|
HideElement = "hide-element",
|
|
10
|
-
MoveElement = "move-element"
|
|
11
|
-
MutateElement = "mutate-element"
|
|
10
|
+
MoveElement = "move-element"
|
|
12
11
|
}
|
|
13
12
|
export declare enum AdType {
|
|
14
13
|
Permanent = "permanent",
|
|
@@ -31,6 +30,7 @@ interface InsertAdActionProps extends Pick<RawPermanentAdPlacesRule, 'wrapperSty
|
|
|
31
30
|
adCategories: string[];
|
|
32
31
|
supportsTheming?: boolean;
|
|
33
32
|
fontSampleSelector?: string;
|
|
33
|
+
backgroundColor?: string;
|
|
34
34
|
showAdBeforeLoaded?: boolean;
|
|
35
35
|
}
|
|
36
36
|
export interface ReplaceAllChildrenWithAdAction extends AdActionBase, InsertAdActionProps {
|
|
@@ -57,7 +57,7 @@ interface SimpleInsertAdActionByPrevSibling extends SimpleInsertAdActionBase {
|
|
|
57
57
|
insertionIndex?: undefined;
|
|
58
58
|
prevSibling: HTMLElement;
|
|
59
59
|
}
|
|
60
|
-
|
|
60
|
+
type SimpleInsertAdAction = SimpleInsertAdActionByIndex | SimpleInsertAdActionByPrevSibling;
|
|
61
61
|
export interface RemoveElementAction extends AdActionBase {
|
|
62
62
|
type: AdActionType.RemoveElement;
|
|
63
63
|
element: HTMLElement;
|
|
@@ -66,21 +66,17 @@ export interface HideElementAction extends AdActionBase {
|
|
|
66
66
|
type: AdActionType.HideElement;
|
|
67
67
|
element: HTMLElement;
|
|
68
68
|
}
|
|
69
|
-
|
|
69
|
+
interface MoveElementAction extends AdActionBase {
|
|
70
70
|
type: AdActionType.MoveElement;
|
|
71
71
|
element: HTMLElement;
|
|
72
72
|
parent: HTMLElement;
|
|
73
73
|
/** Reference node passed to `parent.insertBefore`. `null` or omitted → appends at end. */
|
|
74
74
|
insertBeforeElement?: HTMLElement | null;
|
|
75
75
|
}
|
|
76
|
-
export interface MutateElementAction extends AdActionBase {
|
|
77
|
-
type: AdActionType.MutateElement;
|
|
78
|
-
element: HTMLElement;
|
|
79
|
-
mutate: (element: HTMLElement) => void | Promise<void>;
|
|
80
|
-
}
|
|
81
76
|
export type InsertAdAction = ReplaceAllChildrenWithAdAction | ReplaceElementWithAdAction | SimpleInsertAdAction;
|
|
82
77
|
export type OmitAdInAction<T extends InsertAdActionProps> = Omit<T, 'adsMetadata' | 'originalWidth' | 'originalHeight'>;
|
|
83
|
-
export type
|
|
84
|
-
export type
|
|
78
|
+
export type OmitAdInSimpleInsertAdAction = OmitAdInAction<SimpleInsertAdActionByIndex> | OmitAdInAction<SimpleInsertAdActionByPrevSibling>;
|
|
79
|
+
export type InsertAdActionWithoutMeta = OmitAdInAction<ReplaceAllChildrenWithAdAction> | OmitAdInAction<ReplaceElementWithAdAction> | OmitAdInSimpleInsertAdAction;
|
|
80
|
+
export type AdAction = InsertAdAction | RemoveElementAction | HideElementAction | MoveElementAction;
|
|
85
81
|
export type AddActionsIfAdResolutionAvailable = (elementsToMeasure: Record<'width' | 'height', HTMLElement>, adType: AdType, adIsNative: boolean, expectedCategories: string[], ...actionsBases: (InsertAdActionWithoutMeta | HideElementAction | RemoveElementAction)[]) => boolean;
|
|
86
82
|
export {};
|
|
@@ -6,7 +6,6 @@ export var AdActionType;
|
|
|
6
6
|
AdActionType["RemoveElement"] = "remove-element";
|
|
7
7
|
AdActionType["HideElement"] = "hide-element";
|
|
8
8
|
AdActionType["MoveElement"] = "move-element";
|
|
9
|
-
AdActionType["MutateElement"] = "mutate-element";
|
|
10
9
|
})(AdActionType || (AdActionType = {}));
|
|
11
10
|
export var AdType;
|
|
12
11
|
(function (AdType) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ads-actions.js","sourceRoot":"","sources":["../../src/types/ads-actions.ts"],"names":[],"mappings":"AAKA,MAAM,CAAN,IAAY,
|
|
1
|
+
{"version":3,"file":"ads-actions.js","sourceRoot":"","sources":["../../src/types/ads-actions.ts"],"names":[],"mappings":"AAKA,MAAM,CAAN,IAAY,YAOX;AAPD,WAAY,YAAY;IACtB,2DAA2C,CAAA;IAC3C,kDAAkC,CAAA;IAClC,mDAAmC,CAAA;IACnC,gDAAgC,CAAA;IAChC,4CAA4B,CAAA;IAC5B,4CAA4B,CAAA;AAC9B,CAAC,EAPW,YAAY,KAAZ,YAAY,QAOvB;AAED,MAAM,CAAN,IAAY,MAIX;AAJD,WAAY,MAAM;IAChB,iCAAuB,CAAA;IACvB,8CAAoC,CAAA;IACpC,sDAA4C,CAAA;AAC9C,CAAC,EAJW,MAAM,KAAN,MAAM,QAIjB"}
|
|
@@ -113,7 +113,6 @@ export interface YoutubeVideoPageAnalysisRequest extends YoutubePageAnalysisRequ
|
|
|
113
113
|
}
|
|
114
114
|
export type YoutubePageAnalysisRequest = YoutubeSearchResultsPageAnalysisRequest | YoutubeVideoPageAnalysisRequest;
|
|
115
115
|
export interface YoutubePageAnalysisResponse {
|
|
116
|
-
reasoning: string;
|
|
117
116
|
isCryptoRelated: boolean;
|
|
118
117
|
confidence: number;
|
|
119
118
|
}
|
package/package.json
CHANGED
package/src/ads-configuration.ts
CHANGED
|
@@ -54,9 +54,9 @@ export class AdsConfiguration {
|
|
|
54
54
|
static pickNextAdMetadata: IAdsConfiguration['pickNextAdMetadata'] = () => undefined;
|
|
55
55
|
static makeThemingParamsChangeMessage: IAdsConfiguration['makeThemingParamsChangeMessage'] = () => '';
|
|
56
56
|
static analyzeYoutubeSearchPage: AnalyzeYoutubeSearchPage = () =>
|
|
57
|
-
Promise.resolve({
|
|
57
|
+
Promise.resolve({ confidence: 0, isCryptoRelated: false });
|
|
58
58
|
static analyzeYoutubeVideoPage: AnalyzeYoutubeVideoPage = () =>
|
|
59
|
-
Promise.resolve({
|
|
59
|
+
Promise.resolve({ confidence: 0, isCryptoRelated: false });
|
|
60
60
|
static bannerAdsMeta: AdMetadata[] = [];
|
|
61
61
|
static EXTENSION_VERSION: string | undefined;
|
|
62
62
|
static TEMPLE_PASSPHRASE: string;
|
|
@@ -0,0 +1,43 @@
|
|
|
1
|
+
interface ChildrenAddOrRemoveChange {
|
|
2
|
+
type: 'add' | 'remove';
|
|
3
|
+
index: number;
|
|
4
|
+
}
|
|
5
|
+
|
|
6
|
+
export class ChildrenAddOrRemoveChanges {
|
|
7
|
+
private readonly data: WeakMap<Element, ChildrenAddOrRemoveChange[]>;
|
|
8
|
+
|
|
9
|
+
constructor() {
|
|
10
|
+
this.data = new WeakMap();
|
|
11
|
+
this.get = this.get.bind(this);
|
|
12
|
+
this.onChildAdded = this.onChildAdded.bind(this);
|
|
13
|
+
this.beforeChildRemoved = this.beforeChildRemoved.bind(this);
|
|
14
|
+
}
|
|
15
|
+
|
|
16
|
+
get(parent: Element) {
|
|
17
|
+
return this.data.get(parent) ?? [];
|
|
18
|
+
}
|
|
19
|
+
|
|
20
|
+
onChildAdded(element: Element) {
|
|
21
|
+
const parent = element.parentElement!;
|
|
22
|
+
let changes = this.data.get(parent);
|
|
23
|
+
if (!changes) {
|
|
24
|
+
changes = [];
|
|
25
|
+
this.data.set(parent, changes);
|
|
26
|
+
}
|
|
27
|
+
changes.push({ type: 'add', index: ChildrenAddOrRemoveChanges.getIndex(element) });
|
|
28
|
+
}
|
|
29
|
+
|
|
30
|
+
beforeChildRemoved(element: Element) {
|
|
31
|
+
const parent = element.parentElement!;
|
|
32
|
+
let changes = this.data.get(parent);
|
|
33
|
+
if (!changes) {
|
|
34
|
+
changes = [];
|
|
35
|
+
this.data.set(parent, changes);
|
|
36
|
+
}
|
|
37
|
+
changes.push({ type: 'remove', index: ChildrenAddOrRemoveChanges.getIndex(element) });
|
|
38
|
+
}
|
|
39
|
+
|
|
40
|
+
static getIndex(element: Element) {
|
|
41
|
+
return Array.from(element.parentElement!.children).indexOf(element);
|
|
42
|
+
}
|
|
43
|
+
}
|
|
@@ -1,12 +1,16 @@
|
|
|
1
1
|
import { AdAction, AdActionType } from 'src/types/ads-actions';
|
|
2
2
|
|
|
3
|
+
import { ChildrenAddOrRemoveChanges } from './children-add-or-remove-changes';
|
|
3
4
|
import { processInsertAdAction } from './process-insert-ad-action';
|
|
4
5
|
|
|
5
|
-
export const executeAdsActions = (adsActions: AdAction[], onAdError?: () => void) =>
|
|
6
|
-
|
|
6
|
+
export const executeAdsActions = (adsActions: AdAction[], onAdError?: () => void) => {
|
|
7
|
+
const childrenAddOrRemoveChanges = new ChildrenAddOrRemoveChanges();
|
|
8
|
+
|
|
9
|
+
return Promise.allSettled(
|
|
7
10
|
adsActions.map(async action => {
|
|
8
11
|
switch (action.type) {
|
|
9
12
|
case AdActionType.RemoveElement:
|
|
13
|
+
childrenAddOrRemoveChanges.beforeChildRemoved(action.element);
|
|
10
14
|
action.element.remove();
|
|
11
15
|
break;
|
|
12
16
|
case AdActionType.HideElement:
|
|
@@ -16,8 +20,9 @@ export const executeAdsActions = (adsActions: AdAction[], onAdError?: () => void
|
|
|
16
20
|
action.parent.insertBefore(action.element, action.insertBeforeElement ?? null);
|
|
17
21
|
break;
|
|
18
22
|
default:
|
|
19
|
-
await processInsertAdAction(action, onAdError);
|
|
23
|
+
await processInsertAdAction(action, childrenAddOrRemoveChanges, onAdError);
|
|
20
24
|
break;
|
|
21
25
|
}
|
|
22
26
|
})
|
|
23
27
|
);
|
|
28
|
+
};
|
|
@@ -14,6 +14,7 @@ import { AdActionType, InsertAdAction } from 'src/types/ads-actions';
|
|
|
14
14
|
import { AdDimensions } from 'src/types/ads-meta';
|
|
15
15
|
import { doAfterSuccessfulPing } from 'src/utils';
|
|
16
16
|
|
|
17
|
+
import { ChildrenAddOrRemoveChanges } from './children-add-or-remove-changes';
|
|
17
18
|
import { observeNodeMutations, subscribeToAdsStackIframeLoadIfNecessary, unobserveNodeMutations } from './observing';
|
|
18
19
|
import { overrideElementStyles } from './override-element-styles';
|
|
19
20
|
import { getAdThemingParams } from './theming-params';
|
|
@@ -46,6 +47,7 @@ const getWrapperDimensions = (action: InsertAdAction) => {
|
|
|
46
47
|
|
|
47
48
|
const processInsertAdActionOnce = async (
|
|
48
49
|
action: InsertAdAction,
|
|
50
|
+
childrenAddOrRemoveChanges: ChildrenAddOrRemoveChanges,
|
|
49
51
|
wrapperElement: HTMLDivElement,
|
|
50
52
|
insertionPoint: HTMLDivElement | HTMLTableCellElement,
|
|
51
53
|
onAdsStackLoad: () => void,
|
|
@@ -95,22 +97,43 @@ const processInsertAdActionOnce = async (
|
|
|
95
97
|
switch (action.type) {
|
|
96
98
|
case AdActionType.ReplaceAllChildren:
|
|
97
99
|
stylesOverridesCurrentElement = action.parent;
|
|
100
|
+
for (const child of action.parent.children) {
|
|
101
|
+
childrenAddOrRemoveChanges.beforeChildRemoved(child);
|
|
102
|
+
}
|
|
98
103
|
action.parent.innerHTML = '';
|
|
99
104
|
action.parent.appendChild(wrapperElement);
|
|
105
|
+
childrenAddOrRemoveChanges.onChildAdded(wrapperElement);
|
|
100
106
|
break;
|
|
101
107
|
case AdActionType.ReplaceElement:
|
|
102
108
|
stylesOverridesCurrentElement = action.element.parentElement;
|
|
103
109
|
action.element.replaceWith(wrapperElement);
|
|
104
110
|
break;
|
|
105
|
-
default:
|
|
106
|
-
const nextSibling =
|
|
107
|
-
action.insertionIndex == null ? action.prevSibling?.nextSibling : action.parent.children[action.insertionIndex];
|
|
111
|
+
default: {
|
|
108
112
|
const parent = 'prevSibling' in action && action.prevSibling ? action.prevSibling.parentElement : action.parent;
|
|
109
113
|
|
|
110
114
|
if (!parent) {
|
|
111
115
|
return;
|
|
112
116
|
}
|
|
113
117
|
|
|
118
|
+
let nextSibling: Node | null;
|
|
119
|
+
if (action.insertionIndex == null) {
|
|
120
|
+
nextSibling = action.prevSibling?.nextSibling;
|
|
121
|
+
} else {
|
|
122
|
+
let insertionIndex = action.insertionIndex;
|
|
123
|
+
childrenAddOrRemoveChanges.get(action.parent).forEach(change => {
|
|
124
|
+
if (change.index >= insertionIndex) {
|
|
125
|
+
return;
|
|
126
|
+
}
|
|
127
|
+
|
|
128
|
+
if (change.type === 'remove') {
|
|
129
|
+
insertionIndex--;
|
|
130
|
+
} else {
|
|
131
|
+
insertionIndex++;
|
|
132
|
+
}
|
|
133
|
+
});
|
|
134
|
+
nextSibling = action.parent.children[insertionIndex];
|
|
135
|
+
}
|
|
136
|
+
|
|
114
137
|
if (action.isSiblingReplacement) {
|
|
115
138
|
wrapperElement.setAttribute(SIBLING_REPLACEMENT_ATTRIBUTE_NAME, 'true');
|
|
116
139
|
const observer = new MutationObserver(mutations => {
|
|
@@ -118,6 +141,7 @@ const processInsertAdActionOnce = async (
|
|
|
118
141
|
nextSibling && mutations.some(mutation => Array.from(mutation.removedNodes).includes(nextSibling));
|
|
119
142
|
|
|
120
143
|
if (hasRemoveSiblingMutation) {
|
|
144
|
+
childrenAddOrRemoveChanges.beforeChildRemoved(wrapperElement);
|
|
121
145
|
wrapperElement.remove();
|
|
122
146
|
observer.disconnect();
|
|
123
147
|
}
|
|
@@ -126,7 +150,9 @@ const processInsertAdActionOnce = async (
|
|
|
126
150
|
}
|
|
127
151
|
stylesOverridesCurrentElement = parent;
|
|
128
152
|
parent.insertBefore(wrapperElement, nextSibling);
|
|
153
|
+
childrenAddOrRemoveChanges.onChildAdded(wrapperElement);
|
|
129
154
|
break;
|
|
155
|
+
}
|
|
130
156
|
}
|
|
131
157
|
|
|
132
158
|
if (wrapperType !== 'tbody') {
|
|
@@ -253,7 +279,11 @@ const hidingStylesOverrides = {
|
|
|
253
279
|
'border-bottom-width': '0px'
|
|
254
280
|
};
|
|
255
281
|
|
|
256
|
-
export const processInsertAdAction = async (
|
|
282
|
+
export const processInsertAdAction = async (
|
|
283
|
+
action: InsertAdAction,
|
|
284
|
+
childrenAddOrRemoveChanges: ChildrenAddOrRemoveChanges,
|
|
285
|
+
onError?: () => void
|
|
286
|
+
) => {
|
|
257
287
|
const {
|
|
258
288
|
wrapperStyle = {},
|
|
259
289
|
adsMetadata,
|
|
@@ -305,6 +335,7 @@ export const processInsertAdAction = async (action: InsertAdAction, onError?: ()
|
|
|
305
335
|
|
|
306
336
|
await processInsertAdActionOnce(
|
|
307
337
|
action,
|
|
338
|
+
childrenAddOrRemoveChanges,
|
|
308
339
|
wrapperElement,
|
|
309
340
|
insertionPoint,
|
|
310
341
|
() => {
|
|
@@ -107,7 +107,12 @@ const buildAdPlacesRules = (
|
|
|
107
107
|
const ruleToComplementIndex = acc.findIndex(({ selector: candidateSelector, ...candidateRestProps }) => {
|
|
108
108
|
const { cssString: _candidateCssString, ...restCandidateSelectorProps } = candidateSelector;
|
|
109
109
|
|
|
110
|
-
return
|
|
110
|
+
return (
|
|
111
|
+
isEqual(restSelectorProps, restCandidateSelectorProps) &&
|
|
112
|
+
isEqual(restProps, candidateRestProps) &&
|
|
113
|
+
restSelectorProps.isMultiple &&
|
|
114
|
+
restCandidateSelectorProps.isMultiple
|
|
115
|
+
);
|
|
111
116
|
});
|
|
112
117
|
if (ruleToComplementIndex === -1) {
|
|
113
118
|
acc.push({ selector, ...restProps });
|
package/src/types/ads-actions.ts
CHANGED
|
@@ -69,7 +69,7 @@ interface SimpleInsertAdActionByPrevSibling extends SimpleInsertAdActionBase {
|
|
|
69
69
|
prevSibling: HTMLElement;
|
|
70
70
|
}
|
|
71
71
|
|
|
72
|
-
|
|
72
|
+
type SimpleInsertAdAction = SimpleInsertAdActionByIndex | SimpleInsertAdActionByPrevSibling;
|
|
73
73
|
|
|
74
74
|
export interface RemoveElementAction extends AdActionBase {
|
|
75
75
|
type: AdActionType.RemoveElement;
|
|
@@ -81,7 +81,7 @@ export interface HideElementAction extends AdActionBase {
|
|
|
81
81
|
element: HTMLElement;
|
|
82
82
|
}
|
|
83
83
|
|
|
84
|
-
|
|
84
|
+
interface MoveElementAction extends AdActionBase {
|
|
85
85
|
type: AdActionType.MoveElement;
|
|
86
86
|
element: HTMLElement;
|
|
87
87
|
parent: HTMLElement;
|
|
@@ -120,7 +120,6 @@ export interface YoutubeVideoPageAnalysisRequest extends YoutubePageAnalysisRequ
|
|
|
120
120
|
export type YoutubePageAnalysisRequest = YoutubeSearchResultsPageAnalysisRequest | YoutubeVideoPageAnalysisRequest;
|
|
121
121
|
|
|
122
122
|
export interface YoutubePageAnalysisResponse {
|
|
123
|
-
reasoning: string;
|
|
124
123
|
isCryptoRelated: boolean;
|
|
125
124
|
confidence: number;
|
|
126
125
|
}
|