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.

Sign up for GitHub

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

Jump to bottom

chore(web): Fix story block creation and preview #837

Merged
merged 11 commits into from
Nov 28, 2023
Merged

chore(web): Fix story block creation and preview #837

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
2ea6c2f
change input orders
mkumbobeaty Nov 20, 2023
ae6447a
chore(web): fix WAS gap
KaWaite Nov 20, 2023
5ef59b4
chore(web): fix camera behavior in interaction mode (#824)
keiya01 Nov 20, 2023
0271762
chore(server): modify zoom level in manifest (#807)
nina992 Nov 21, 2023
af67c1d
Revert "chore(web): fix camera behavior in interaction mode (#824)"
mkumbobeaty Nov 22, 2023
c58f7db
Merge branch 'main' of github.com:reearth/reearth
mkumbobeaty Nov 22, 2023
14ab2e5
revert unsposed changes
mkumbobeaty Nov 22, 2023
3cd43c3
Merge branch 'main' of github.com:reearth/reearth
mkumbobeaty Nov 27, 2023
1e6e4de
fix editmode in publishing
mkumbobeaty Nov 27, 2023
e62ffa7
fix adding block bug
mkumbobeaty Nov 27, 2023
c39a8a1
Merge branch 'main' of github.com:reearth/reearth into chore/bug-fix
mkumbobeaty Nov 28, 2023
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
8 changes: 4 additions & 4 deletions web/src/beta/lib/core/StoryPanel/Block/builtin/Timeline/hook.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -241,7 +241,6 @@ export default ({
if (target) {
target.style.pointerEvents = "initial";
setTarget(null);
setIsPause(false);
}
}, [target]);

Expand Down Expand Up @@ -272,6 +271,7 @@ export default ({
},
[inEditor, range, committer?.id, handleOnDrag],
);

const handleTimelineCommitterChange = useCallback(
(committer: TimelineCommitter) => {
if (
Expand All @@ -281,14 +281,14 @@ export default ({
) {
setActiveBlock(" ");
setIsActive(false);
setIsPause(false);
setIsPlaying(false);
setIsPlayingReversed(false);
const currentTimeValue = timelineValues?.currentTime ?? "";
timelineValues
? setCurrentTime?.(getNewDate(new Date(currentTimeValue.substring(0, 19))).getTime())
: setCurrentTime?.(range?.start);
}
setIsPause(false);
},
[activeBlock, isActive, range, setCurrentTime, timelineValues],
);
Expand Down Expand Up @@ -318,7 +318,8 @@ export default ({
]);

useEffect(() => {
if (isActive) onTick?.(handleTick), onCommit?.(handleTimelineCommitterChange);
if (isActive) onTick?.(handleTick);
onCommit?.(handleTimelineCommitterChange);
return () => {
removeTickEventListener?.(handleTick);
removeOnCommitEventListener?.(handleTimelineCommitterChange);
Expand All @@ -345,7 +346,6 @@ export default ({
positionPercentage = Math.round(positionPercentage);
positionPercentage = Math.max(positionPercentage, 16);
positionPercentage = Math.min(positionPercentage, 372);

return positionPercentage;
}
}
Expand Down
4 changes: 2 additions & 2 deletions web/src/beta/lib/core/StoryPanel/Block/builtin/common/hooks.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ export default ({
const title = useMemo(() => name ?? property?.title, [name, property?.title]);

const handleBlockDoubleClick = useCallback(() => {
onBlockDoubleClick?.(), setEditMode(true);
}, [onBlockDoubleClick]);
if (isEditable) onBlockDoubleClick?.(), setEditMode(true);
}, [isEditable, onBlockDoubleClick]);

const [handleSingleClick, handleDoubleClick] = useDoubleClick(
() => onClick?.(),
Expand Down
2 changes: 1 addition & 1 deletion web/src/beta/lib/core/StoryPanel/Page/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,7 @@ const StoryPanel: React.FC<Props> = ({
openBlocks={openBlocksIndex === -1}
installableStoryBlocks={installableStoryBlocks}
onBlockOpen={() => handleBlockOpen(-1)}
onBlockAdd={() => handleBlockCreate(0)}
onBlockAdd={handleBlockCreate(0)}
/>
)}
</PageTitleWrapper>
Expand Down
Loading