From 1ef4c0e3ef04184006da0bba4d50d78fb857a62b Mon Sep 17 00:00:00 2001 From: lby Date: Fri, 7 Jun 2024 18:08:47 +0800 Subject: [PATCH] chore(web): missing prop currentCamera for story built-in blocks (#1011) --- web/src/beta/features/Visualizer/StoryPanel/Page/index.tsx | 6 +++++- .../features/Visualizer/StoryPanel/PanelContent/index.tsx | 5 ++++- web/src/beta/features/Visualizer/StoryPanel/index.tsx | 5 ++++- web/src/beta/features/Visualizer/index.tsx | 1 + 4 files changed, 14 insertions(+), 3 deletions(-) diff --git a/web/src/beta/features/Visualizer/StoryPanel/Page/index.tsx b/web/src/beta/features/Visualizer/StoryPanel/Page/index.tsx index d099a05db6..b8e895390b 100644 --- a/web/src/beta/features/Visualizer/StoryPanel/Page/index.tsx +++ b/web/src/beta/features/Visualizer/StoryPanel/Page/index.tsx @@ -1,7 +1,7 @@ import { Fragment, MutableRefObject, ReactNode, useEffect } from "react"; import DragAndDropList from "@reearth/beta/components/DragAndDropList"; -import type { ValueType, ValueTypes } from "@reearth/beta/utils/value"; +import type { Camera, ValueType, ValueTypes } from "@reearth/beta/utils/value"; import type { InstallableStoryBlock } from "@reearth/services/api/storytellingApi/blocks"; import { useT } from "@reearth/services/i18n"; import { styled } from "@reearth/services/theme"; @@ -29,6 +29,7 @@ type Props = { isEditable?: boolean; isAutoScrolling?: MutableRefObject; scrollTimeoutRef: MutableRefObject; + currentCamera?: Camera; children?: ReactNode; onCurrentPageChange?: (pageId: string, disableScrollIntoView?: boolean) => void; onPageSettingsToggle?: () => void; @@ -73,6 +74,7 @@ const StoryPanel: React.FC = ({ isEditable, scrollTimeoutRef, isAutoScrolling, + currentCamera, children, onCurrentPageChange, onPageSettingsToggle, @@ -175,6 +177,7 @@ const StoryPanel: React.FC = ({ }} isEditable={isEditable} isSelected={selectedStoryBlockId === titleId} + currentCamera={currentCamera} onClick={() => onBlockSelect?.(titleId)} onBlockDoubleClick={() => onBlockDoubleClick?.(titleId)} onClickAway={onBlockSelect} @@ -224,6 +227,7 @@ const StoryPanel: React.FC = ({ pageId={page?.id} isSelected={selectedStoryBlockId === b.id} isEditable={isEditable} + currentCamera={currentCamera} onClick={() => onBlockSelect?.(b.id)} onBlockDoubleClick={() => onBlockDoubleClick?.(b.id)} onClickAway={onBlockSelect} diff --git a/web/src/beta/features/Visualizer/StoryPanel/PanelContent/index.tsx b/web/src/beta/features/Visualizer/StoryPanel/PanelContent/index.tsx index 340e27e8e6..9d8fa18dae 100644 --- a/web/src/beta/features/Visualizer/StoryPanel/PanelContent/index.tsx +++ b/web/src/beta/features/Visualizer/StoryPanel/PanelContent/index.tsx @@ -1,6 +1,6 @@ import { MutableRefObject } from "react"; -import { ValueType, ValueTypes } from "@reearth/beta/utils/value"; +import { Camera, ValueType, ValueTypes } from "@reearth/beta/utils/value"; import type { InstallableStoryBlock } from "@reearth/services/api/storytellingApi/blocks"; import { styled } from "@reearth/services/theme"; @@ -17,6 +17,7 @@ export type Props = { showingIndicator?: boolean; isAutoScrolling?: MutableRefObject; isEditable?: boolean; + currentCamera?: Camera; onPageSettingsToggle?: () => void; onPageSelect?: (pageId?: string | undefined) => void; onCurrentPageChange?: (pageId: string, disableScrollIntoView?: boolean) => void; @@ -61,6 +62,7 @@ const StoryContent: React.FC = ({ showingIndicator, isAutoScrolling, isEditable, + currentCamera, onPageSettingsToggle, onPageSelect, onCurrentPageChange, @@ -94,6 +96,7 @@ const StoryContent: React.FC = ({ selectedStoryBlockId={selectedStoryBlockId} showPageSettings={showPageSettings} isEditable={isEditable} + currentCamera={currentCamera} scrollTimeoutRef={scrollTimeoutRef} isAutoScrolling={isAutoScrolling} onCurrentPageChange={onCurrentPageChange} diff --git a/web/src/beta/features/Visualizer/StoryPanel/index.tsx b/web/src/beta/features/Visualizer/StoryPanel/index.tsx index fe729a8991..8ac4e37d14 100644 --- a/web/src/beta/features/Visualizer/StoryPanel/index.tsx +++ b/web/src/beta/features/Visualizer/StoryPanel/index.tsx @@ -1,7 +1,7 @@ import { forwardRef, memo, Ref, RefObject, useMemo } from "react"; import { createPortal } from "react-dom"; -import { ValueType, ValueTypes } from "@reearth/beta/utils/value"; +import { Camera, ValueType, ValueTypes } from "@reearth/beta/utils/value"; import { styled } from "@reearth/services/theme"; import { BlockProvider } from "../shared/contexts/blockContext"; @@ -25,6 +25,7 @@ export type StoryPanelProps = { selectedStory?: Story; isEditable?: boolean; installableStoryBlocks?: InstallableStoryBlock[]; + currentCamera?: Camera; onStoryPageChange?: (id?: string, disableScrollIntoView?: boolean) => void; onStoryBlockCreate?: ( pageId?: string | undefined, @@ -64,6 +65,7 @@ export const StoryPanel = memo( selectedStory, isEditable, installableStoryBlocks, + currentCamera, onStoryPageChange, onStoryBlockCreate, onStoryBlockMove, @@ -157,6 +159,7 @@ export const StoryPanel = memo( showingIndicator={!!pageInfo} isAutoScrolling={isAutoScrolling} isEditable={isEditable} + currentCamera={currentCamera} onPageSettingsToggle={handlePageSettingsToggle} onPageSelect={handlePageSelect} onCurrentPageChange={handleCurrentPageChange} diff --git a/web/src/beta/features/Visualizer/index.tsx b/web/src/beta/features/Visualizer/index.tsx index 5f78677e58..0f63d4cb64 100644 --- a/web/src/beta/features/Visualizer/index.tsx +++ b/web/src/beta/features/Visualizer/index.tsx @@ -211,6 +211,7 @@ const Visualizer: FC = ({ selectedStory={story} installableStoryBlocks={installableStoryBlocks} isEditable={!!inEditor} + currentCamera={currentCamera} onStoryPageChange={handleStoryPageChange} onStoryBlockCreate={handleStoryBlockCreate} onStoryBlockDelete={handleStoryBlockDelete}