Skip to content

[C-3519] Fix async absolute lottie imports #6976

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dylanjeffers merged 1 commit into from
Dec 19, 2023
Merged

[C-3519] Fix async absolute lottie imports #6976

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions packages/web/src/components/animated-button/AnimatedIconButton.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,8 +68,8 @@ const AnimatedIconButton = ({
isMatrix={isMatrix}
onClick={onClick || ((e: MouseEvent) => {})}
href={href}
iconLightJSON={() => import(`assets/animations/${light}.json`)}
iconDarkJSON={() => import(`assets/animations/${dark}.json`)}
iconLightJSON={() => import(`../../assets/animations/${light}.json`)}
iconDarkJSON={() => import(`../../assets/animations/${dark}.json`)}
activeClassName={activeClassName}
disabledClassName={disabledClassName}
className={className}
Expand Down
8 changes: 6 additions & 2 deletions packages/web/src/components/bottom-bar/buttons/ExploreButton.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,12 @@ const ExploreButton = ({
isMatrix={isMatrixMode}
onClick={onClick}
href={href}
iconLightJSON={() => import('assets/animations/iconExploreLight.json')}
iconDarkJSON={() => import('assets/animations/iconExploreDark.json')}
iconLightJSON={() =>
import('../../../assets/animations/iconExploreLight.json')
}
iconDarkJSON={() =>
import('../../../assets/animations/iconExploreDark.json')
}
/>
)
}
Expand Down
8 changes: 6 additions & 2 deletions packages/web/src/components/bottom-bar/buttons/FeedButton.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,12 @@ const FeedButton = ({
darkMode={darkMode}
onClick={onClick}
href={href}
iconLightJSON={() => import('assets/animations/iconFeedLight.json')}
iconDarkJSON={() => import('assets/animations/iconFeedDark.json')}
iconLightJSON={() =>
import('../../../assets/animations/iconFeedLight.json')
}
iconDarkJSON={() =>
import('../../../assets/animations/iconFeedDark.json')
}
/>
)
}
Expand Down
8 changes: 6 additions & 2 deletions packages/web/src/components/bottom-bar/buttons/LibraryButton.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,12 @@ const LibraryButton = ({
isMatrix={isMatrixMode}
onClick={onClick}
href={href}
iconLightJSON={() => import('assets/animations/iconFavoriteLight.json')}
iconDarkJSON={() => import('assets/animations/iconFavoriteDark.json')}
iconLightJSON={() =>
import('../../../assets/animations/iconFavoriteLight.json')
}
iconDarkJSON={() =>
import('../../../assets/animations/iconFavoriteDark.json')
}
/>
)
}
Expand Down
8 changes: 6 additions & 2 deletions packages/web/src/components/bottom-bar/buttons/ProfileButton.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,12 @@ const ProfileButton = ({
isMatrix={isMatrixMode}
onClick={onClick}
href={href}
iconLightJSON={() => import('assets/animations/iconProfileLight.json')}
iconDarkJSON={() => import('assets/animations/iconProfileDark.json')}
iconLightJSON={() =>
import('../../../assets/animations/iconProfileLight.json')
}
iconDarkJSON={() =>
import('../../../assets/animations/iconProfileDark.json')
}
/>
)
}
Expand Down
8 changes: 6 additions & 2 deletions packages/web/src/components/bottom-bar/buttons/TrendingButton.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,12 @@ const TrendingButton = ({
isMatrix={isMatrixMode}
onClick={onClick}
href={href}
iconLightJSON={() => import('assets/animations/iconTrendingLight.json')}
iconDarkJSON={() => import('assets/animations/iconTrendingDark.json')}
iconLightJSON={() =>
import('../../../assets/animations/iconTrendingLight.json')
}
iconDarkJSON={() =>
import('../../../assets/animations/iconTrendingDark.json')
}
/>
)
}
Expand Down
6 changes: 3 additions & 3 deletions packages/web/src/components/play-bar/repeat-button/RepeatButtonProvider.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,13 +60,13 @@ const RepeatButtonProvider = ({
} else {
if (!defaultAnimations.current) {
const { default: pbIconRepeatAll } = (await import(
'assets/animations/pbIconRepeatAll.json'
'../../../assets/animations/pbIconRepeatAll.json'
)) as any
const { default: pbIconRepeatSingle } = (await import(
'assets/animations/pbIconRepeatSingle.json'
'../../../assets/animations/pbIconRepeatSingle.json'
)) as any
const { default: pbIconRepeatOff } = (await import(
'assets/animations/pbIconRepeatOff.json'
'../../../assets/animations/pbIconRepeatOff.json'
)) as any
defaultAnimations.current = {
pbIconRepeatAll,
Expand Down
12 changes: 6 additions & 6 deletions packages/web/src/components/play-bar/shuffle-button/ShuffleButtonProvider.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,10 @@ const ShuffleButtonProvider = ({
if (isMatrix) {
if (!matrixAnimations.current) {
const { default: pbIconShuffleOff } = (await import(
'assets/animations/pbIconShuffleOffMatrix.json'
'../../../assets/animations/pbIconShuffleOffMatrix.json'
)) as any
const { default: pbIconShuffleOn } = (await import(
'assets/animations/pbIconShuffleOnMatrix.json'
'../../../assets/animations/pbIconShuffleOnMatrix.json'
)) as any
matrixAnimations.current = {
pbIconShuffleOff,
Expand All @@ -45,8 +45,8 @@ const ShuffleButtonProvider = ({
setAnimations({ ...matrixAnimations.current })
} else if (darkMode) {
if (!darkAnimations.current) {
const pbIconShuffleOff = require('assets/animations/pbIconShuffleOffDark.json')
const pbIconShuffleOn = require('assets/animations/pbIconShuffleOnDark.json')
const pbIconShuffleOff = require('../../../assets/animations/pbIconShuffleOffDark.json')
const pbIconShuffleOn = require('../../../assets/animations/pbIconShuffleOnDark.json')
darkAnimations.current = {
pbIconShuffleOff,
pbIconShuffleOn
Expand All @@ -56,10 +56,10 @@ const ShuffleButtonProvider = ({
} else {
if (!defaultAnimations.current) {
const { default: pbIconShuffleOff } = (await import(
'assets/animations/pbIconShuffleOff.json'
'../../../assets/animations/pbIconShuffleOff.json'
)) as any
const { default: pbIconShuffleOn } = (await import(
'assets/animations/pbIconShuffleOn.json'
'../../../assets/animations/pbIconShuffleOn.json'
)) as any
defaultAnimations.current = {
pbIconShuffleOff,
Expand Down