Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
18 changes: 16 additions & 2 deletions src/components/Lottie/Lottie.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
isReverseMode,
createRenderConfig,
isNullish,
isContainerWidth,
} from './ts/utils';
import { Tween } from 'svelte/motion';

Expand Down Expand Up @@ -49,7 +50,8 @@
layout = { fit: 'contain', align: [0.5, 0.5] },
animationId = '',
lottiePlayer = $bindable(undefined),
height = '100lvh',
width = 'fluid',
height = 'auto',
showDebugInfo = false,
lottieState = createLottieState(),
progress = $bindable(0),
Expand Down Expand Up @@ -396,7 +398,12 @@
});
</script>

<div class="lottie-block">
<div
class="lottie-block"
style="max-width: {isContainerWidth(width) ?
`var(--${width}-column-width)`
: width};"
>
{#if showDebugInfo && lottiePlayer}
<Debug componentState={lottieState} />
{/if}
Expand All @@ -420,11 +427,18 @@
:global(.lottie-block) {
position: relative;
height: 100%;
width: 100%;
margin: 0 auto;
// to remove
border: 2px solid green;

.lottie-container {
width: 100%;
height: 100%;
// to remove
border: 2px solid red;
}

canvas {
width: 100%;
height: 100%;
Expand Down
13 changes: 13 additions & 0 deletions src/components/Lottie/demo/withScrollerBase.svelte
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<script lang="ts">
import BodyText from '../../BodyText/BodyText.svelte';
import ScrollerBase from '../../ScrollerBase/ScrollerBase.svelte';
import Lottie from '../Lottie.svelte';
import LottieSample from '../lottie/themesLottie.zip?url';
Expand All @@ -11,8 +12,14 @@
let top = $state(0);
let threshold = $state(0.5);
let bottom = $state(1);

const dummyText = `Greetings, earthling. This placeholder text is running in debug mode. All bugs have been upgraded to features, and all features downgraded to TODOs. If you find yourself reading this, you are now the sysadmin of your own destiny.

Remember the network is down because someone tripped over the Ethernet cable. Keep calm and RTFM before summoning the wizard. In case of panic, type 'kill -9' and hope for the best. End of line. Insert witty comment here.`;
</script>

<BodyText text={dummyText} />

<ScrollerBase
{top}
{threshold}
Expand All @@ -35,15 +42,21 @@
{/snippet}
</ScrollerBase>

<BodyText text={dummyText} />

<style lang="scss">
@use '../../../scss/mixins' as mixins;

.step-foreground-container {
height: 100lvh;
width: 50%;
margin: 0 auto;
display: flex;
align-items: center;
justify-content: center;

h3 {
width: 100%;
background-color: antiquewhite;
text-align: center;
}
Expand Down
2 changes: 2 additions & 0 deletions src/components/Lottie/ts/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import {
type DotLottie as DotLottieType,
} from '@lottiefiles/dotlottie-web';
import { type LottieState } from './lottieState.svelte';
import type { ContainerWidth } from '../../@types/global';

type DotlottieProps = {
autoplay?: Config['autoplay'];
Expand Down Expand Up @@ -33,6 +34,7 @@ export type Props = DotlottieProps & {
// Additional properties can be added here if needed
lottiePlayer?: DotLottieType | undefined;
showDebugInfo?: boolean;
width?: string | ContainerWidth;
height?: string;
lottieState?: LottieState;
progress?: number;
Expand Down
16 changes: 16 additions & 0 deletions src/components/Lottie/ts/utils.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import type { DotLottie } from '@lottiefiles/dotlottie-web';
import type { LottieState } from './lottieState.svelte';
import type { ContainerWidth } from '$lib/components/@types/global';

function constrain(n: number, low: number, high: number) {
return Math.max(Math.min(n, high), low);
Expand Down Expand Up @@ -109,3 +110,18 @@ export function createRenderConfig() {
export function isNullish(value: unknown): boolean {
return value === null || value === undefined || value === '';
}

/**
* Checks if a value is of type ContainerWidth
*/
export function isContainerWidth(string: any): string is ContainerWidth {
return (
string === 'narrower' ||
string === 'narrow' ||
string === 'normal' ||
string === 'wide' ||
string === 'wider' ||
string === 'widest' ||
string === 'fluid'
);
}