helpy4/immich
1
0
Fork 0
mirror of https://github.com/immich-app/immich synced 2026-08-15 13:03:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix(web): recursively unnest class arrays (#29755)

Browse source
This commit is contained in:
Mees Frensel 2026-07-09 12:39:12 +02:00 • committed by GitHub
parent c5222c7579
commit 4fd58885e2
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 9 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
web/src/lib/components/assets/thumbnail/Thumbnail.svelte
View file

@ -247,7 +247,7 @@
>
<ImageThumbnail
class={['absolute group-focus-visible:rounded-lg', { 'rounded-xl': selected }, imageClass]}
brokenAssetClass={['z-1 absolute group-focus-visible:rounded-lg', { 'rounded-xl': selected }, brokenAssetClass]}
brokenAssetClass={['z-1 absolute group-focus-visible:rounded-lg', selected && 'rounded-2xl', brokenAssetClass]}
url={getAssetMediaUrl({ id: asset.id, size: AssetMediaSize.Thumbnail, cacheKey: asset.thumbhash })}
altText={$getAltText(asset)}
widthStyle="{width}px"

4
web/src/lib/index.spec.ts
View file

@ -12,6 +12,10 @@ describe('cleanClass', () => {
it('should unnest arrays', () => {
expect(cleanClass('class1', ['class2', 'class3'])).toBe('class1 class2 class3');
});
it('should unnest doubly nested arrays', () => {
expect(cleanClass('class1', [['class2a', 'class2b'], 'class3'])).toBe('class1 class2a class2b class3');
});
});
describe('isDefined', () => {

6
web/src/lib/index.ts
View file

@ -3,8 +3,7 @@ import { twMerge } from 'tailwind-merge';
export const cleanClass = (...classNames: unknown[]) => {
return twMerge(
classNames
.flatMap((className) => (Array.isArray(className) ? className : [className]))
flattenClass(classNames)
.filter((className) => {
if (!className || typeof className === 'boolean') {
return false;
@ -16,6 +15,9 @@ export const cleanClass = (...classNames: unknown[]) => {
);
};
const flattenClass = (classNames: unknown[]): unknown[] =>
classNames.flatMap((className) => (Array.isArray(className) ? flattenClass(className) : [className]));
export const isDefined = <T>(value: T): value is NonNullable<T> => value !== null && value !== undefined;
export const getHeatmapRange = () => {