Merge branch 'main' into release

reearth · Sep 18, 2024 · 6df7fc4 · 6df7fc4
2 parents 6d10907 + 08d5d27
commit 6df7fc4
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 10 deletions.
diff --git a/.github/workflows/build_web.yml b/.github/workflows/build_web.yml
@@ -54,7 +54,7 @@ jobs:
         run: yarn build
       - name: Pack
         run: mv dist reearth-web && tar -zcvf reearth-web.tar.gz reearth-web
-      - uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v4
         with:
           name: reearth-web
           path: web/reearth-web.tar.gz
@@ -73,7 +73,7 @@ jobs:
         with:
           app-id: ${{ vars.GH_APP_ID }}
           private-key: ${{ secrets.GH_APP_PRIVATE_KEY }}
-      - uses: actions/download-artifact@v2
+      - uses: actions/download-artifact@v4
         with:
           name: reearth-web
       - name: Rename artifact

diff --git a/web/src/beta/features/Visualizer/Crust/StoryPanel/hooks.ts b/web/src/beta/features/Visualizer/Crust/StoryPanel/hooks.ts
@@ -107,10 +107,9 @@ export default (
       return visualizer?.current?.timeline?.current?.commit({
         cmd: "SET_TIME",
         payload: {
-          start:
-            visualizer?.current?.timeline?.current?.computedTimeline?.start,
+          start: time,
           current: time,
-          stop: visualizer?.current?.timeline?.current?.computedTimeline?.stop
+          stop: time
         },
         committer: { source: "storyPage", id: currentPageId }
       });
@@ -120,11 +119,9 @@ export default (
 
   const handlePageTime = useCallback(
     (page: StoryPage) => {
-      const timePointField = page.property?.timePoint;
-      if (!timePointField?.timePoint?.value) return;
-      return onTimeChange?.(
-        new Date(formatISO8601(timePointField?.timePoint?.value) ?? "")
-      );
+      const time = page.property?.timePoint?.timePoint;
+      if (!time) return;
+      onTimeChange?.(new Date(formatISO8601(time)));
     },
     [onTimeChange]
   );