Skip to content

Commit 53a5448

Browse files
committed
never apply view-transitions if the background is a user-image
1 parent 869be9f commit 53a5448

File tree

2 files changed

+3
-13
lines changed

2 files changed

+3
-13
lines changed

special-pages/pages/new-tab/app/favorites/components/Favorites.js

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,6 @@ export const FavoritesThemeContext = createContext({
4646
*/
4747
export function Favorites({ gridRef, favorites, expansion, toggle, openContextMenu, openFavorite, add, canAnimateItems }) {
4848
const { t } = useTypedTranslationWith(/** @type {import('../strings.json')} */ ({}));
49-
const platformName = usePlatformName();
50-
5149
// see: https://www.w3.org/WAI/ARIA/apg/patterns/accordion/examples/accordion/
5250
const WIDGET_ID = useId();
5351
const TOGGLE_ID = useId();
@@ -60,12 +58,10 @@ export function Favorites({ gridRef, favorites, expansion, toggle, openContextMe
6058
const kind = useComputed(() => data.value.background.kind);
6159

6260
// A flag to determine if animations are available. This is needed
63-
// because in webkit applying 'view-transition' css properties causes an odd experience
61+
// because 'view-transition' CSS properties causes an odd experience
6462
// with filters.
6563
const animateItems = useComputed(() => {
66-
if (platformName === 'windows' && canAnimateItems) return true;
67-
if (platformName === 'macos' && canAnimateItems && kind.value !== 'userImage') return true;
68-
return false;
64+
return canAnimateItems && kind.value !== 'userImage';
6965
});
7066

7167
return (

special-pages/pages/new-tab/app/favorites/components/FavoritesCustomized.js

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ import { usePlatformName } from '../../settings.provider.js';
1919
export function FavoritesConsumer() {
2020
const { state, toggle, favoritesDidReOrder, openContextMenu, openFavorite, add } = useContext(FavoritesContext);
2121
const telemetry = useTelemetry();
22-
const platformName = usePlatformName();
2322
const { data: backgroundData } = useContext(CustomizerContext);
2423

2524
/**
@@ -29,12 +28,7 @@ export function FavoritesConsumer() {
2928
*/
3029
function didReorder(data) {
3130
const background = backgroundData.value.background;
32-
let supportsViewTransitions = false;
33-
34-
if (state.config?.animation?.kind === 'view-transitions') {
35-
if (platformName === 'windows') supportsViewTransitions = true;
36-
if (platformName === 'macos' && background.kind !== 'userImage') supportsViewTransitions = true;
37-
}
31+
const supportsViewTransitions = state.config?.animation?.kind === 'view-transitions' && background.kind !== 'userImage';
3832

3933
if (supportsViewTransitions) {
4034
viewTransition(() => {

0 commit comments

Comments
 (0)