Skip to content

Commit a382fa4

Browse files
shakyShanegithub-actions[bot]
shakyShane
authored and
github-actions[bot]
committed
Release build 10.6.0 [ci release]
1 parent 50ec5c3 commit a382fa4

File tree

13 files changed

+144
-100
lines changed

13 files changed

+144
-100
lines changed

‎CHANGELOG.txt

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1 @@
1-
- Use useId() for stable unique ID in omnibar aria-controls (#1791)
2-
- Add enableAi config to control Duck.ai visibility (#1790)
3-
- NTP: Add Omnibar widget UI (#1786)
4-
- Add omnibar page to new tab children list (#1788)
1+
- ntp: support configurable burn animation (#1789)

‎Sources/ContentScopeScripts/dist/pages/new-tab/dist/index.js

Lines changed: 29 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -9079,7 +9079,7 @@
90799079
});
90809080

90819081
// pages/new-tab/app/burning/BurnProvider.js
9082-
function BurnProvider({ children, service }) {
9082+
function BurnProvider({ children, service, showBurnAnimation = true }) {
90839083
const burning = useSignal(
90849084
/** @type {string[]} */
90859085
[]
@@ -9144,21 +9144,18 @@
91449144
cancelled = true;
91459145
};
91469146
});
9147-
y2(() => {
9148-
const handler = (e4) => {
9149-
if (e4.detail.url) {
9147+
const doneBurning = q2(
9148+
(url7) => {
9149+
if (url7) {
91509150
r3(() => {
9151-
burning.value = burning.value.filter((x3) => x3 !== e4.detail.url);
9152-
exiting.value = exiting.value.concat(e4.detail.url);
9151+
burning.value = burning.value.filter((x3) => x3 !== url7);
9152+
exiting.value = exiting.value.concat(url7);
91539153
});
91549154
}
9155-
};
9156-
window.addEventListener("done-burning", handler);
9157-
return () => {
9158-
window.removeEventListener("done-burning", handler);
9159-
};
9160-
}, [burning, exiting]);
9161-
return /* @__PURE__ */ _(ActivityBurningSignalContext.Provider, { value: { burning, exiting, animation } }, /* @__PURE__ */ _(ActivityInteractionsContext.Provider, { value: { didClick } }, children));
9155+
},
9156+
[burning, exiting]
9157+
);
9158+
return /* @__PURE__ */ _(ActivityBurningSignalContext.Provider, { value: { burning, exiting, animation, showBurnAnimation, doneBurning } }, /* @__PURE__ */ _(ActivityInteractionsContext.Provider, { value: { didClick } }, children));
91629159
}
91639160
function toPromise(fn2) {
91649161
return new Promise((resolve) => {
@@ -9279,7 +9276,12 @@
92799276
/** @type {import("@preact/signals").Signal<string[]>} */
92809277
exiting: d3([]),
92819278
/** @type {import("@preact/signals").Signal<{state: 'loading' | 'ready' | 'error', data: null | Record<string, any>}>} */
9282-
animation: d3({ state: "loading", data: null })
9279+
animation: d3({ state: "loading", data: null }),
9280+
/** @type {boolean} */
9281+
showBurnAnimation: true,
9282+
/** @type {(url: string) => void} */
9283+
doneBurning: (_url) => {
9284+
}
92839285
});
92849286
}
92859287
});
@@ -25930,7 +25932,7 @@
2593025932
__export(BurnAnimationLottieWeb_exports, {
2593125933
BurnAnimation: () => BurnAnimation
2593225934
});
25933-
function BurnAnimation({ url: url7 }) {
25935+
function BurnAnimation({ url: url7, doneBurning }) {
2593425936
const ref = A2(
2593525937
/** @type {Lottie} */
2593625938
null
@@ -25940,9 +25942,9 @@
2594025942
if (!ref.current) return;
2594125943
let finished = false;
2594225944
let timer2 = null;
25943-
const publish = (reason) => {
25945+
const publish = (_reason) => {
2594425946
if (finished) return;
25945-
window.dispatchEvent(new CustomEvent("done-burning", { detail: { url: url7, reason } }));
25947+
doneBurning(url7);
2594625948
finished = true;
2594725949
clearTimeout(timer2);
2594825950
};
@@ -25967,7 +25969,7 @@
2596725969
publish("unmount occurred");
2596825970
}
2596925971
};
25970-
}, [url7, json]);
25972+
}, [url7, json, doneBurning]);
2597125973
return /* @__PURE__ */ _("div", { ref, "data-lottie-player": true });
2597225974
}
2597325975
var import_lottie_web;
@@ -25987,7 +25989,7 @@
2598725989
/** @type {HTMLDivElement|null} */
2598825990
null
2598925991
);
25990-
const { exiting, burning } = x2(ActivityBurningSignalContext);
25992+
const { exiting, burning, showBurnAnimation, doneBurning } = x2(ActivityBurningSignalContext);
2599125993
const isBurning = useComputed(() => burning.value.some((x3) => x3 === url7));
2599225994
const isExiting = useComputed(() => exiting.value.some((x3) => x3 === url7));
2599325995
_2(() => {
@@ -26029,7 +26031,11 @@
2602926031
canceled = true;
2603026032
};
2603126033
}, [isBurning.value, isExiting.value, url7]);
26032-
return /* @__PURE__ */ _("div", { class: (0, import_classnames13.default)(Activity_default.anim, isBurning.value && Activity_default.burning), ref }, !isExiting.value && children, !isExiting.value && isBurning.value && /* @__PURE__ */ _(P3, { fallback: null }, /* @__PURE__ */ _(BurnAnimationLazy, { url: url7 })));
26034+
return /* @__PURE__ */ _("div", { class: (0, import_classnames13.default)(Activity_default.anim, isBurning.value && Activity_default.burning), ref }, !isExiting.value && children, !isExiting.value && isBurning.value && showBurnAnimation && /* @__PURE__ */ _(P3, { fallback: null }, /* @__PURE__ */ _(BurnAnimationLazy, { url: url7, doneBurning })), !isExiting.value && isBurning.value && !showBurnAnimation && /* @__PURE__ */ _(NullBurner, { url: url7, doneBurning }));
26035+
}
26036+
function NullBurner({ url: url7, doneBurning }) {
26037+
y2(() => doneBurning(url7), [url7]);
26038+
return null;
2603326039
}
2603426040
var import_classnames13, BurnAnimationLazy;
2603526041
var init_ActivityItemAnimationWrapper = __esm({
@@ -26181,7 +26187,7 @@
2618126187
});
2618226188
return /* @__PURE__ */ _(Activity, { batched, itemCount: itemCount.value }, children);
2618326189
}
26184-
function ActivityConsumer() {
26190+
function ActivityConsumer({ showBurnAnimation }) {
2618526191
const { state } = x2(ActivityContext);
2618626192
const service = x2(ActivityServiceContext);
2618726193
const platformName = usePlatformName();
@@ -26190,7 +26196,7 @@
2619026196
if (platformName === "windows") {
2619126197
return /* @__PURE__ */ _(SignalStateProvider, null, /* @__PURE__ */ _(ActivityConfigured, null, /* @__PURE__ */ _(ActivityBody, { canBurn: false, visibility })));
2619226198
}
26193-
return /* @__PURE__ */ _(SignalStateProvider, null, /* @__PURE__ */ _(BurnProvider, { service }, /* @__PURE__ */ _(ActivityConfigured, null, /* @__PURE__ */ _(ActivityBody, { canBurn: true, visibility }))));
26199+
return /* @__PURE__ */ _(SignalStateProvider, null, /* @__PURE__ */ _(BurnProvider, { service, showBurnAnimation }, /* @__PURE__ */ _(ActivityConfigured, null, /* @__PURE__ */ _(ActivityBody, { canBurn: true, visibility }))));
2619426200
}
2619526201
return null;
2619626202
}
@@ -26610,7 +26616,7 @@
2661026616
feed: config.feed,
2661126617
setFeed
2661226618
},
26613-
config.feed === "activity" && /* @__PURE__ */ _(ActivityProvider, null, /* @__PURE__ */ _(ActivityConsumer, null)),
26619+
config.feed === "activity" && /* @__PURE__ */ _(ActivityProvider, null, /* @__PURE__ */ _(ActivityConsumer, { showBurnAnimation: config.showBurnAnimation ?? true })),
2661426620
config.feed === "privacy-stats" && /* @__PURE__ */ _(PrivacyStatsProvider, null, /* @__PURE__ */ _(BodyExpanderProvider, null, /* @__PURE__ */ _(PrivacyStatsConsumer, null)))
2661526621
);
2661626622
}

‎build/integration/pages/new-tab/dist/index.js

Lines changed: 32 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -9084,7 +9084,7 @@
90849084
});
90859085

90869086
// pages/new-tab/app/burning/BurnProvider.js
9087-
function BurnProvider({ children, service }) {
9087+
function BurnProvider({ children, service, showBurnAnimation = true }) {
90889088
const burning = useSignal(
90899089
/** @type {string[]} */
90909090
[]
@@ -9149,21 +9149,18 @@
91499149
cancelled = true;
91509150
};
91519151
});
9152-
y2(() => {
9153-
const handler = (e4) => {
9154-
if (e4.detail.url) {
9152+
const doneBurning = q2(
9153+
(url7) => {
9154+
if (url7) {
91559155
r3(() => {
9156-
burning.value = burning.value.filter((x3) => x3 !== e4.detail.url);
9157-
exiting.value = exiting.value.concat(e4.detail.url);
9156+
burning.value = burning.value.filter((x3) => x3 !== url7);
9157+
exiting.value = exiting.value.concat(url7);
91589158
});
91599159
}
9160-
};
9161-
window.addEventListener("done-burning", handler);
9162-
return () => {
9163-
window.removeEventListener("done-burning", handler);
9164-
};
9165-
}, [burning, exiting]);
9166-
return /* @__PURE__ */ _(ActivityBurningSignalContext.Provider, { value: { burning, exiting, animation } }, /* @__PURE__ */ _(ActivityInteractionsContext.Provider, { value: { didClick } }, children));
9160+
},
9161+
[burning, exiting]
9162+
);
9163+
return /* @__PURE__ */ _(ActivityBurningSignalContext.Provider, { value: { burning, exiting, animation, showBurnAnimation, doneBurning } }, /* @__PURE__ */ _(ActivityInteractionsContext.Provider, { value: { didClick } }, children));
91679164
}
91689165
function toPromise(fn2) {
91699166
return new Promise((resolve) => {
@@ -9284,7 +9281,12 @@
92849281
/** @type {import("@preact/signals").Signal<string[]>} */
92859282
exiting: d3([]),
92869283
/** @type {import("@preact/signals").Signal<{state: 'loading' | 'ready' | 'error', data: null | Record<string, any>}>} */
9287-
animation: d3({ state: "loading", data: null })
9284+
animation: d3({ state: "loading", data: null }),
9285+
/** @type {boolean} */
9286+
showBurnAnimation: true,
9287+
/** @type {(url: string) => void} */
9288+
doneBurning: (_url) => {
9289+
}
92889290
});
92899291
}
92909292
});
@@ -25940,7 +25942,7 @@
2594025942
__export(BurnAnimationLottieWeb_exports, {
2594125943
BurnAnimation: () => BurnAnimation
2594225944
});
25943-
function BurnAnimation({ url: url7 }) {
25945+
function BurnAnimation({ url: url7, doneBurning }) {
2594425946
const ref = A2(
2594525947
/** @type {Lottie} */
2594625948
null
@@ -25950,9 +25952,9 @@
2595025952
if (!ref.current) return;
2595125953
let finished = false;
2595225954
let timer2 = null;
25953-
const publish = (reason) => {
25955+
const publish = (_reason) => {
2595425956
if (finished) return;
25955-
window.dispatchEvent(new CustomEvent("done-burning", { detail: { url: url7, reason } }));
25957+
doneBurning(url7);
2595625958
finished = true;
2595725959
clearTimeout(timer2);
2595825960
};
@@ -25977,7 +25979,7 @@
2597725979
publish("unmount occurred");
2597825980
}
2597925981
};
25980-
}, [url7, json]);
25982+
}, [url7, json, doneBurning]);
2598125983
return /* @__PURE__ */ _("div", { ref, "data-lottie-player": true });
2598225984
}
2598325985
var import_lottie_web;
@@ -25997,7 +25999,7 @@
2599725999
/** @type {HTMLDivElement|null} */
2599826000
null
2599926001
);
26000-
const { exiting, burning } = x2(ActivityBurningSignalContext);
26002+
const { exiting, burning, showBurnAnimation, doneBurning } = x2(ActivityBurningSignalContext);
2600126003
const isBurning = useComputed(() => burning.value.some((x3) => x3 === url7));
2600226004
const isExiting = useComputed(() => exiting.value.some((x3) => x3 === url7));
2600326005
_2(() => {
@@ -26039,7 +26041,11 @@
2603926041
canceled = true;
2604026042
};
2604126043
}, [isBurning.value, isExiting.value, url7]);
26042-
return /* @__PURE__ */ _("div", { class: (0, import_classnames13.default)(Activity_default.anim, isBurning.value && Activity_default.burning), ref }, !isExiting.value && children, !isExiting.value && isBurning.value && /* @__PURE__ */ _(P3, { fallback: null }, /* @__PURE__ */ _(BurnAnimationLazy, { url: url7 })));
26044+
return /* @__PURE__ */ _("div", { class: (0, import_classnames13.default)(Activity_default.anim, isBurning.value && Activity_default.burning), ref }, !isExiting.value && children, !isExiting.value && isBurning.value && showBurnAnimation && /* @__PURE__ */ _(P3, { fallback: null }, /* @__PURE__ */ _(BurnAnimationLazy, { url: url7, doneBurning })), !isExiting.value && isBurning.value && !showBurnAnimation && /* @__PURE__ */ _(NullBurner, { url: url7, doneBurning }));
26045+
}
26046+
function NullBurner({ url: url7, doneBurning }) {
26047+
y2(() => doneBurning(url7), [url7]);
26048+
return null;
2604326049
}
2604426050
var import_classnames13, BurnAnimationLazy;
2604526051
var init_ActivityItemAnimationWrapper = __esm({
@@ -26191,7 +26197,7 @@
2619126197
});
2619226198
return /* @__PURE__ */ _(Activity, { batched, itemCount: itemCount.value }, children);
2619326199
}
26194-
function ActivityConsumer() {
26200+
function ActivityConsumer({ showBurnAnimation }) {
2619526201
const { state } = x2(ActivityContext);
2619626202
const service = x2(ActivityServiceContext);
2619726203
const platformName = usePlatformName();
@@ -26200,7 +26206,7 @@
2620026206
if (platformName === "windows") {
2620126207
return /* @__PURE__ */ _(SignalStateProvider, null, /* @__PURE__ */ _(ActivityConfigured, null, /* @__PURE__ */ _(ActivityBody, { canBurn: false, visibility })));
2620226208
}
26203-
return /* @__PURE__ */ _(SignalStateProvider, null, /* @__PURE__ */ _(BurnProvider, { service }, /* @__PURE__ */ _(ActivityConfigured, null, /* @__PURE__ */ _(ActivityBody, { canBurn: true, visibility }))));
26209+
return /* @__PURE__ */ _(SignalStateProvider, null, /* @__PURE__ */ _(BurnProvider, { service, showBurnAnimation }, /* @__PURE__ */ _(ActivityConfigured, null, /* @__PURE__ */ _(ActivityBody, { canBurn: true, visibility }))));
2620426210
}
2620526211
return null;
2620626212
}
@@ -26620,7 +26626,7 @@
2662026626
feed: config.feed,
2662126627
setFeed
2662226628
},
26623-
config.feed === "activity" && /* @__PURE__ */ _(ActivityProvider, null, /* @__PURE__ */ _(ActivityConsumer, null)),
26629+
config.feed === "activity" && /* @__PURE__ */ _(ActivityProvider, null, /* @__PURE__ */ _(ActivityConsumer, { showBurnAnimation: config.showBurnAnimation ?? true })),
2662426630
config.feed === "privacy-stats" && /* @__PURE__ */ _(PrivacyStatsProvider, null, /* @__PURE__ */ _(BodyExpanderProvider, null, /* @__PURE__ */ _(PrivacyStatsConsumer, null)))
2662526631
);
2662626632
}
@@ -32421,6 +32427,9 @@
3242132427
if (url4.searchParams.get("protections.feed") === "activity") {
3242232428
config.feed = "activity";
3242332429
}
32430+
if (url4.searchParams.get("protections.burn") === "false") {
32431+
config.showBurnAnimation = false;
32432+
}
3242432433
return Promise.resolve(config);
3242532434
}
3242632435
default: {

0 commit comments

Comments
 (0)