Skip to content
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

fix(web): textarea autogrow height #13983

Merged
merged 2 commits into from
Nov 14, 2024
Merged

fix(web): textarea autogrow height #13983

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
eee1640
fix(web): remove album assetGridWidth & globalWidth
duckimann Nov 7, 2024
95930e2
merge main
alextran1502 Nov 14, 2024
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
9 changes: 2 additions & 7 deletions web/src/routes/(user)/albums/[albumId=id]/[[photos=photos]]/[[assetId=id]]/+page.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,8 +104,6 @@
let isShowActivity = $state(false);
let isLiked: ActivityResponseDto | null = $state(null);
let reactions: ActivityResponseDto[] = $state([]);
let globalWidth: number = $state(0);
let assetGridWidth: number = $derived(isShowActivity ? globalWidth - (globalWidth < 768 ? 360 : 460) : globalWidth);
let albumOrder: AssetOrder | undefined = $state(data.album.order);

const assetInteractionStore = createAssetInteractionStore();
Expand Down Expand Up @@ -430,7 +428,7 @@
});
</script>

<div class="flex overflow-hidden" bind:clientWidth={globalWidth}>
<div class="flex overflow-hidden">
<div class="relative w-full shrink">
{#if $isMultiSelectState}
<AssetSelectControlBar assets={$selectedAssets} clearSelect={() => assetInteractionStore.clearMultiselect()}>
Expand Down Expand Up @@ -568,10 +566,7 @@
{/if}
{/if}

<main
class="relative h-screen overflow-hidden bg-immich-bg px-6 pt-[var(--navbar-height)] dark:bg-immich-dark-bg"
style={`width:${assetGridWidth}px`}
>
<main class="relative h-screen overflow-hidden bg-immich-bg px-6 pt-[var(--navbar-height)] dark:bg-immich-dark-bg">
<!-- Use key because AssetGrid can't deal with changing stores -->
{#key albumKey}
{#if viewMode === AlbumPageViewMode.SELECT_ASSETS}
Expand Down
Loading