From c6c6968262041d4a6569e313149e120c9ed75b58 Mon Sep 17 00:00:00 2001
From: MinamiFunakoshiTR <minami.funakoshi@thomsonreuters.com>
Date: Thu, 27 Mar 2025 11:47:55 -0700
Subject: [PATCH] basic scroller working

---
 .../Scroller/Scroller.stories.svelte          |  2 +-
 src/components/Scroller/Scroller.svelte       | 19 +++--
 .../Scroller/ScrollerBase/index.svelte        | 69 ++++++++++---------
 ...crollerStash.svelte => ScrollerOld.svelte} |  0
 .../Scroller/ScrollerStashed.svelte           | 30 ++++++++
 5 files changed, 81 insertions(+), 39 deletions(-)
 rename src/components/Scroller/{ScrollerStash.svelte => ScrollerOld.svelte} (100%)
 create mode 100644 src/components/Scroller/ScrollerStashed.svelte

diff --git a/src/components/Scroller/Scroller.stories.svelte b/src/components/Scroller/Scroller.stories.svelte
index 7c992810..ad99d0b3 100644
--- a/src/components/Scroller/Scroller.stories.svelte
+++ b/src/components/Scroller/Scroller.stories.svelte
@@ -1,6 +1,6 @@
 <script module lang="ts">
   import { defineMeta } from '@storybook/addon-svelte-csf';
-  import Scroller from './ScrollerStash.svelte';
+  import Scroller from './Scroller.svelte';
 
   const { Story } = defineMeta({
     title: 'Components/Graphics/Scroller',
diff --git a/src/components/Scroller/Scroller.svelte b/src/components/Scroller/Scroller.svelte
index 4d83e1aa..50c46710 100644
--- a/src/components/Scroller/Scroller.svelte
+++ b/src/components/Scroller/Scroller.svelte
@@ -1,28 +1,33 @@
-<script>
+<!-- @component `Scroller` [Read the docs.](https://reuters-graphics.github.io/graphics-components/?path=/docs/components-graphics-scroller--docs) -->
+<script lang="ts">
+  // @ts-ignore no types
   import ScrollerBase from './ScrollerBase/index.svelte';
 
-  let index, offset, progress;
+  let index = 0;
+  let offset = 0;
+  let progress = 0;
 </script>
 
 <ScrollerBase top={0.2} bottom={0.8} bind:index bind:offset bind:progress>
-  <div slot="background">
+  {#snippet backgroundSnippet()}
     <p>
       This is the background content. It will stay fixed in place while the
       foreground scrolls over the top.
     </p>
 
-    <p>Section {index + 1} is currently active.</p>
-  </div>
+    <p>Index {index} is currently active.</p>
+  {/snippet}
 
-  <div slot="foreground">
+  {#snippet foregroundSnippet()}
     <section>This is the first section.</section>
     <section>This is the second section.</section>
     <section>This is the third section.</section>
-  </div>
+  {/snippet}
 </ScrollerBase>
 
 <style>
   section {
     height: 80vh;
+    outline: 2px solid pink;
   }
 </style>
diff --git a/src/components/Scroller/ScrollerBase/index.svelte b/src/components/Scroller/ScrollerBase/index.svelte
index c81ffc69..15652196 100644
--- a/src/components/Scroller/ScrollerBase/index.svelte
+++ b/src/components/Scroller/ScrollerBase/index.svelte
@@ -1,4 +1,4 @@
-<script context="module">
+<script module lang="ts">
   const handlers = [];
   let manager;
 
@@ -63,49 +63,51 @@
   }
 </script>
 
-<script>
+<script lang="ts">
   import { onMount } from 'svelte';
+  import { type Snippet } from 'svelte';
 
-  // config
-  export let top = 0;
-  export let bottom = 1;
-  export let threshold = 0.5;
-  export let query = 'section';
-  export let parallax = false;
+  let {
+    // bindings
+    index = $bindable(0),
+    count = $bindable(0),
+    offset = $bindable(0),
+    progress = $bindable(0),
+    visible = $bindable(false),
+    // config
+    top = 0,
+    bottom = 1,
+    threshold = 0.5,
+    query = 'section',
+    parallax = false,
+    backgroundSnippet,
+    foregroundSnippet,
+  } = $props();
 
-  // bindings
-  export let index = 0;
-  export let count = 0;
-  export let offset = 0;
-  export let progress = 0;
-  export let visible = false;
-
-  let outer;
-  let foreground;
-  let background;
+  let outer: HTMLElement;
+  let foreground: HTMLElement;
+  let background: HTMLElement;
   let left;
-  let sections;
+  let sections: NodeListOf<HTMLElement>;
   let wh = 0;
-  let fixed;
+  let fixed = $state(false);
   let offset_top = 0;
   let width = 1;
   let height;
   let inverted;
 
-  $: top_px = Math.round(top * wh);
-  $: bottom_px = Math.round(bottom * wh);
-  $: threshold_px = Math.round(threshold * wh);
+  let top_px = Math.round(top * wh);
+  let bottom_px = Math.round(bottom * wh);
+  let threshold_px = Math.round(threshold * wh);
 
-  $: top, bottom, threshold, parallax, update();
-
-  $: style = `
+  let style = $derived(`
 		position: ${fixed ? 'fixed' : 'absolute'};
 		top: 0;
 		transform: translate(0, ${offset_top}px);
 		z-index: ${inverted ? 3 : 1};
-	`;
+	`);
 
-  $: widthStyle = fixed ? `width:${width}px;` : '';
+  let widthStyle = $derived(fixed ? `width:${width}px;` : '');
 
   onMount(() => {
     sections = foreground.querySelectorAll(query);
@@ -119,6 +121,10 @@
     return () => manager.remove(scroller);
   });
 
+  // $effect(() => {
+  //   console.log('index', index);
+  // });
+
   function update() {
     if (!foreground) return;
 
@@ -180,16 +186,16 @@
     style="{style}{widthStyle}"
   >
     <svelte-scroller-background bind:this={background}>
-      <slot name="background"></slot>
+      {@render backgroundSnippet()}
     </svelte-scroller-background>
   </svelte-scroller-background-container>
 
   <svelte-scroller-foreground bind:this={foreground}>
-    <slot name="foreground"></slot>
+    {@render foregroundSnippet()}
   </svelte-scroller-foreground>
 </svelte-scroller-outer>
 
-<style>
+<style lang="scss">
   svelte-scroller-outer {
     display: block;
     position: relative;
@@ -226,5 +232,6 @@
     /* -webkit-transform: translate3d(0, 0, 0);
 		-moz-transform: translate3d(0, 0, 0);
 		transform: translate3d(0, 0, 0); */
+    background-color: yellow;
   }
 </style>
diff --git a/src/components/Scroller/ScrollerStash.svelte b/src/components/Scroller/ScrollerOld.svelte
similarity index 100%
rename from src/components/Scroller/ScrollerStash.svelte
rename to src/components/Scroller/ScrollerOld.svelte
diff --git a/src/components/Scroller/ScrollerStashed.svelte b/src/components/Scroller/ScrollerStashed.svelte
new file mode 100644
index 00000000..13faffd3
--- /dev/null
+++ b/src/components/Scroller/ScrollerStashed.svelte
@@ -0,0 +1,30 @@
+<script>
+  // import ScrollerBase from './ScrollerBase/index.svelte';
+
+  let index, offset, progress;
+</script>
+
+hi!
+
+<!-- <ScrollerBase top={0.2} bottom={0.8} bind:index bind:offset bind:progress>
+  <div slot="background">
+    <p>
+      This is the background content. It will stay fixed in place while the
+      foreground scrolls over the top.
+    </p>
+
+    <p>Section {index + 1} is currently active.</p>
+  </div>
+
+  <div slot="foreground">
+    <section>This is the first section.</section>
+    <section>This is the second section.</section>
+    <section>This is the third section.</section>
+  </div>
+</ScrollerBase> -->
+
+<style>
+  section {
+    height: 80vh;
+  }
+</style>