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.

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

chore: fix delete last page doesn't refresh the right panel #771

Merged
merged 3 commits into from
Oct 30, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
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
33 changes: 18 additions & 15 deletions web/src/beta/features/Editor/Settings/hooks.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { useState, useEffect, useMemo } from "react";
import { useState, useEffect, useMemo, useCallback } from "react";

import { NLSLayer } from "@reearth/services/api/layersApi/utils";
import { Page } from "@reearth/services/api/storytellingApi/utils";
Expand Down Expand Up @@ -30,25 +30,28 @@ export default ({ layers, selectedPage, onPageUpdate }: SettingProps) => {
setAllCheckedLayers(allLayersSelected);
}, [selectedLayerIds, allLayersSelected]);

const handleLayerCheck = (layerId: string) => {
if (!pageId) return;
setCheckedLayer(prev => {
const updatedLayers = prev.includes(layerId)
? prev.filter(id => id !== layerId)
: [...prev, layerId];

onPageUpdate?.(pageId, updatedLayers);
return updatedLayers ? updatedLayers : prev;
});
};

const handleAllLayersCheck = () => {
const handleLayerCheck = useCallback(
(layerId: string) => {
if (!pageId) return;
setCheckedLayer(prev => {
const updatedLayers = prev.includes(layerId)
? prev.filter(id => id !== layerId)
: [...prev, layerId];

onPageUpdate?.(pageId, updatedLayers);
return updatedLayers ? updatedLayers : prev;
});
},
[onPageUpdate, pageId],
);

const handleAllLayersCheck = useCallback(() => {
if (!pageId) return;
const updatedCheckedLayers = allCheckedLayers ? [] : layers?.map(layer => layer.id) || [];
setCheckedLayer(updatedCheckedLayers);
setAllCheckedLayers(!allCheckedLayers);
onPageUpdate?.(pageId, updatedCheckedLayers);
};
}, [allCheckedLayers, layers, onPageUpdate, pageId]);

return {
checkedLayers,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ const StoryRightPanel: React.FC<Props> = ({
onFlyTo,
}) => {
const t = useT();

const propertyItems = useMemo(
() =>
selectedPage?.property.items?.filter(
Expand Down
16 changes: 11 additions & 5 deletions web/src/beta/features/Editor/useStorytelling.ts
Original file line number Diff line number Diff line change
Expand Up @@ -34,23 +34,29 @@ export default function ({ sceneId, onFlyTo }: Props) {
const { installableStoryBlocks } = useInstallableStoryBlocksQuery({ sceneId });
const [currentPage, setCurrentPage] = useState<Page | undefined>(undefined);
const isAutoScrolling = useRef(false);
const [selectedPageId, setSelectedPageId] = useState<string | undefined>(undefined);

const selectedStory = useMemo(() => {
return stories?.length ? stories[0] : undefined;
}, [stories]);

useEffect(() => {
if (!currentPage) {
if (selectedPageId) {
const newPage = getPage(selectedPageId, selectedStory?.pages);
if (newPage) {
setCurrentPage(newPage);
}
} else {
setCurrentPage(selectedStory?.pages?.[0]);
}
}, [currentPage, selectedStory?.pages]);
}, [currentPage, selectedPageId, selectedStory?.pages]);

const handleCurrentPageChange = useCallback(
(pageId: string, disableScrollIntoView?: boolean) => {
const newPage = getPage(pageId, selectedStory?.pages);
if (!newPage) return;

setCurrentPage(newPage);
setSelectedPageId(pageId);

if (!disableScrollIntoView) {
const element = document.getElementById(newPage.id);
Expand Down Expand Up @@ -97,10 +103,10 @@ export default function ({ sceneId, onFlyTo }: Props) {
pageId,
});
if (pageId === currentPage?.id) {
setCurrentPage(pages[deletedPageIndex + 1] ?? pages[deletedPageIndex - 1]);
setSelectedPageId(pages[deletedPageIndex + 1]?.id ?? pages[deletedPageIndex - 1]?.id);
}
},
[sceneId, currentPage?.id, selectedStory, useDeleteStoryPage],
[selectedStory, useDeleteStoryPage, sceneId, currentPage],
);

const handlePageAdd = useCallback(
Expand Down
Loading