Skip to content

Visualize Your Ideas With Code

feat(ui): presentation interface (#487)

Jacob1899f020fb1c
diff --git a/packages/ui/src/Editor.tsx b/packages/ui/src/Editor.tsx
index 9e00d9b3..470e6fb6 100644
--- a/packages/ui/src/Editor.tsx
+++ b/packages/ui/src/Editor.tsx
@@ -3,11 +3,15 @@ import {Timeline} from './components/timeline';
import {Viewport} from './components/viewport';
import {ResizeableLayout} from './components/layout';
import {useState} from 'preact/hooks';
+import {usePresenterState} from './hooks';
+import {PresenterState} from '@motion-canvas/core';
+import {PresentationMode} from './components/presentation';
export function Editor() {
+ const state = usePresenterState();
const [sidebarOpen, setSidebarOpen] = useState(false);
- return (
+ return state === PresenterState.Initial ? (
<ResizeableLayout
id={'main-timeline'}
size={0.7}
@@ -22,5 +26,7 @@ export function Editor() {
}
end={<Timeline />}
/>
+ ) : (
+ <PresentationMode />
);
}
diff --git a/packages/ui/src/components/controls/Button.tsx b/packages/ui/src/components/controls/Button.tsx
index cc9827e7..8ab3720d 100644
--- a/packages/ui/src/components/controls/Button.tsx
+++ b/packages/ui/src/components/controls/Button.tsx
@@ -2,7 +2,7 @@ import styles from './Controls.module.scss';
import type {JSX} from 'preact';
import clsx from 'clsx';
-interface ButtonProps extends JSX.HTMLAttributes<HTMLButtonElement> {
+export interface ButtonProps extends JSX.HTMLAttributes<HTMLButtonElement> {
main?: boolean;
}
diff --git a/packages/ui/src/components/controls/ButtonSelect.tsx b/packages/ui/src/components/controls/ButtonSelect.tsx
new file mode 100644
index 00000000..34b0bf01
--- /dev/null
+++ b/packages/ui/src/components/controls/ButtonSelect.tsx
@@ -0,0 +1,23 @@
+import styles from './Controls.module.scss';
+import {Select, SelectProps} from './Select';
+import {Button, ButtonProps} from './Button';
+
+export type ButtonSelectProps<T> = Omit<ButtonProps, 'value' | 'onChange'> &
+ SelectProps<T>;
+
+export function ButtonSelect<T extends string | number>({
+ options,
+ value,
+ onChange,
+ main,
+ ...props
+}: ButtonSelectProps<T>) {
+ return (
+ <div className={styles.inputSelect}>
+ <Button main={main} {...props}>
+ {options.find(option => option.value === value)?.text}
+ </Button>
+ <Select value={value} main={main} options={options} onChange={onChange} />
+ </div>
+ );
+}
diff --git a/packages/ui/src/components/controls/Controls.module.scss b/packages/ui/src/components/controls/Controls.module.scss
index 0a77c33d..41bfc95a 100644
--- a/packages/ui/src/components/controls/Controls.module.scss
+++ b/packages/ui/src/components/controls/Controls.module.scss
@@ -29,6 +29,12 @@
&:hover {
color: #fff;
}
+
+ &.disabled {
+ cursor: default;
+ pointer-events: none;
+ color: rgba(255, 255, 255, 0.16);
+ }
}
.group {
@@ -84,6 +90,10 @@
flex-grow: 1;
flex-shrink: 1;
+ .button {
+ border-radius: 4px 0 0 4px;
+ }
+
.input {
width: 0;
border-radius: 4px 0 0 4px;
@@ -127,6 +137,12 @@
}
}
+.select.main {
+ background: var(--theme)
+ url("data:image/svg+xml;charset=UTF-8,%3csvg width='24' height='24' viewBox='0 0 24 24' fill='none' xmlns='http://www.w3.org/2000/svg'%3e%3cpath d='M16.71 10.71L15.29 9.28998L12 12.59L8.71001 9.28998L7.29001 10.71L12 15.41L16.71 10.71Z' fill='black'/%3e%3c/svg%3e")
+ no-repeat 100% 50%;
+}
+
.colorPreview {
width: 16px;
height: 16px;
diff --git a/packages/ui/src/components/controls/IconButton.tsx b/packages/ui/src/components/controls/IconButton.tsx
index ea8896be..3e409fe0 100644
--- a/packages/ui/src/components/controls/IconButton.tsx
+++ b/packages/ui/src/components/controls/IconButton.tsx
@@ -7,6 +7,7 @@ interface IconButtonProps {
title?: string;
onClick?: () => void;
children: ComponentChildren;
+ disabled?: boolean;
className?: string;
}
@@ -15,13 +16,18 @@ export function IconButton({
onClick,
title,
className,
+ disabled,
}: IconButtonProps) {
return (
<button
title={title}
- className={clsx(styles.iconButton, className)}
+ className={clsx(
+ styles.iconButton,
+ className,
+ disabled && styles.disabled,
+ )}
type="button"
- onClick={onClick}
+ onClick={disabled ? null : onClick}
>
{children}
</button>
diff --git a/packages/ui/src/components/controls/InputSelect.tsx b/packages/ui/src/components/controls/InputSelect.tsx
index 5d6e06ff..c382d2b0 100644
--- a/packages/ui/src/components/controls/InputSelect.tsx
+++ b/packages/ui/src/components/controls/InputSelect.tsx
@@ -3,7 +3,7 @@ import type {JSX} from 'preact';
import {Input} from './Input';
import {Select, SelectProps} from './Select';
-export type InputSelect<T> = Omit<
+export type InputSelectProps<T> = Omit<
JSX.HTMLAttributes<HTMLInputElement>,
'value' | 'onChange'
> &
@@ -14,7 +14,7 @@ export function InputSelect<T extends string | number>({
value,
onChange,
...props
-}: InputSelect<T>) {
+}: InputSelectProps<T>) {
return (
<div className={styles.inputSelect}>
<Input
diff --git a/packages/ui/src/components/controls/Select.tsx b/packages/ui/src/components/controls/Select.tsx
index bd0ce9b0..7b64105c 100644
--- a/packages/ui/src/components/controls/Select.tsx
+++ b/packages/ui/src/components/controls/Select.tsx
@@ -5,6 +5,7 @@ export interface SelectProps<T> {
title?: string;
options: {value: T; text: string}[];
className?: string;
+ main?: boolean;
value: T;
onChange: (value: T) => void;
}
@@ -14,12 +15,13 @@ export function Select<T>({
value,
onChange,
title,
+ main,
className,
}: SelectProps<T>) {
return (
<select
title={title}
- className={clsx(styles.select, className)}
+ className={clsx(styles.select, className, main && styles.main)}
value={options.findIndex(option => option.value === value)}
onChange={event =>
onChange(
diff --git a/packages/ui/src/components/controls/index.ts b/packages/ui/src/components/controls/index.ts
index 32c7f10b..fe2f0989 100644
--- a/packages/ui/src/components/controls/index.ts
+++ b/packages/ui/src/components/controls/index.ts
@@ -1,4 +1,5 @@
export * from './Button';
+export * from './ButtonSelect';
export * from './ColorInput';
export * from './InputSelect';
export * from './Group';
diff --git a/packages/ui/src/components/fields/Expandable.module.scss b/packages/ui/src/components/fields/Expandable.module.scss
index b7879201..a9b941d8 100644
--- a/packages/ui/src/components/fields/Expandable.module.scss
+++ b/packages/ui/src/components/fields/Expandable.module.scss
@@ -15,3 +15,7 @@
.content {
padding-bottom: 16px;
}
+
+.root:last-child .content {
+ padding-bottom: 0;
+}
diff --git a/packages/ui/src/components/fields/Expandable.tsx b/packages/ui/src/components/fields/Expandable.tsx
index facb8df6..ce178070 100644
--- a/packages/ui/src/components/fields/Expandable.tsx
+++ b/packages/ui/src/components/fields/Expandable.tsx
@@ -14,13 +14,33 @@ export interface ExpandableProps {
export function Expandable({title, children, open}: ExpandableProps) {
const [isOpen, setOpen] = useStorage(`expandable-${title}`, open);
+ return (
+ <ControlledExpandable title={title} open={isOpen} setOpen={setOpen}>
+ {children}
+ </ControlledExpandable>
+ );
+}
+
+export interface ControlledExpandableProps {
+ title: string;
+ children: ComponentChildren;
+ open: boolean;
+ setOpen: (value: boolean) => void;
+}
+
+export function ControlledExpandable({
+ title,
+ children,
+ open,
+ setOpen,
+}: ControlledExpandableProps) {
return (
<div className={styles.root}>
- <div className={styles.title} onClick={() => setOpen(!isOpen)}>
- <Toggle open={isOpen} />
+ <div className={styles.title} onClick={() => setOpen(!open)}>
+ <Toggle open={open} />
{title}
</div>
- {isOpen && <div className={styles.content}>{children}</div>}
+ {open && <div className={styles.content}>{children}</div>}
</div>
);
}
diff --git a/packages/ui/src/components/icons/Close.tsx b/packages/ui/src/components/icons/Close.tsx
new file mode 100644
index 00000000..9c674c83
--- /dev/null
+++ b/packages/ui/src/components/icons/Close.tsx
@@ -0,0 +1,7 @@
+export function Close() {
+ return (
+ <svg viewBox="0 0 24 24" fill="currentColor">
+ <path d="M19 6.41L17.59 5 12 10.59 6.41 5 5 6.41 10.59 12 5 17.59 6.41 19 12 13.41 17.59 19 19 17.59 13.41 12 19 6.41z" />
+ </svg>
+ );
+}
diff --git a/packages/ui/src/components/icons/Fullscreen.tsx b/packages/ui/src/components/icons/Fullscreen.tsx
new file mode 100644
index 00000000..41499c36
--- /dev/null
+++ b/packages/ui/src/components/icons/Fullscreen.tsx
@@ -0,0 +1,7 @@
+export function Fullscreen() {
+ return (
+ <svg viewBox="0 0 24 24" fill="currentColor">
+ <path d="M7 14H5v5h5v-2H7v-3zm-2-4h2V7h3V5H5v5zm12 7h-3v2h5v-5h-2v3zM14 5v2h3v3h2V5h-5z" />
+ </svg>
+ );
+}
diff --git a/packages/ui/src/components/icons/index.ts b/packages/ui/src/components/icons/index.ts
index 07c824f2..fb2ac215 100644
--- a/packages/ui/src/components/icons/index.ts
+++ b/packages/ui/src/components/icons/index.ts
@@ -2,7 +2,9 @@ export * from './AccountTree';
export * from './Add';
export * from './Bug';
export * from './Clear';
+export * from './Close';
export * from './DragIndicator';
+export * from './Fullscreen';
export * from './Locate';
export * from './MotionCanvas';
export * from './OpenInNew';
diff --git a/packages/ui/src/components/layout/Header.module.scss b/packages/ui/src/components/layout/Header.module.scss
new file mode 100644
index 00000000..8dd37df8
--- /dev/null
+++ b/packages/ui/src/components/layout/Header.module.scss
@@ -0,0 +1,7 @@
+.header {
+ font-size: 16px;
+ line-height: 24px;
+ text-transform: uppercase;
+ font-weight: bold;
+ margin-bottom: 16px;
+}
diff --git a/packages/ui/src/components/layout/Header.tsx b/packages/ui/src/components/layout/Header.tsx
new file mode 100644
index 00000000..c119f3c2
--- /dev/null
+++ b/packages/ui/src/components/layout/Header.tsx
@@ -0,0 +1,11 @@
+import {ComponentChildren} from 'preact';
+
+import styles from './Header.module.scss';
+
+export interface HeaderProps {
+ children: ComponentChildren;
+}
+
+export function Header({children}: HeaderProps) {
+ return <div className={styles.header}>{children}</div>;
+}
diff --git a/packages/ui/src/components/layout/index.ts b/packages/ui/src/components/layout/index.ts
index 9922b5cc..a4eff26f 100644
--- a/packages/ui/src/components/layout/index.ts
+++ b/packages/ui/src/components/layout/index.ts
@@ -1 +1,2 @@
+export * from './Header';
export * from './ResizeableLayout';
diff --git a/packages/ui/src/components/presentation/PresentationControls.module.scss b/packages/ui/src/components/presentation/PresentationControls.module.scss
new file mode 100644
index 00000000..90c679bd
--- /dev/null
+++ b/packages/ui/src/components/presentation/PresentationControls.module.scss
@@ -0,0 +1,18 @@
+.controls {
+ position: absolute;
+ bottom: 16px;
+
+ display: flex;
+ gap: 16px;
+ padding: 16px;
+ background-color: var(--surface-color);
+ border-radius: 4px;
+}
+
+.count {
+ color: rgba(255, 255, 255, 0.32);
+ font-size: 14px;
+ line-height: 24px;
+ text-align: right;
+ user-select: none;
+}
diff --git a/packages/ui/src/components/presentation/PresentationControls.tsx b/packages/ui/src/components/presentation/PresentationControls.tsx
new file mode 100644
index 00000000..16139a57
--- /dev/null
+++ b/packages/ui/src/components/presentation/PresentationControls.tsx
@@ -0,0 +1,103 @@
+import styles from './PresentationControls.module.scss';
+
+import {IconButton} from '../controls';
+import {useDocumentEvent, useSubscribableValue} from '../../hooks';
+import {useCallback} from 'preact/hooks';
+import {useApplication} from '../../contexts';
+import {
+ Close,
+ Fullscreen,
+ Pause,
+ PlayArrow,
+ SkipNext,
+ SkipPrevious,
+} from '../icons';
+
+export function PresentationControls() {
+ const {presenter} = useApplication();
+ const status = useSubscribableValue(presenter.onInfoChanged);
+ const toggleFullscreen = () => {
+ if (document.fullscreenElement) {
+ document.exitFullscreen();
+ } else {
+ presenter.stage.finalBuffer.requestFullscreen();
+ }
+ };
+
+ useDocumentEvent(
+ 'keydown',
+ useCallback(
+ event => {
+ if (document.activeElement.tagName === 'INPUT') {
+ return;
+ }
+ switch (event.key) {
+ case ' ':
+ event.preventDefault();
+ presenter.resume();
+ break;
+ case 'ArrowLeft':
+ event.preventDefault();
+ if (event.shiftKey) {
+ presenter.requestFirstSlide();
+ return;
+ }
+ presenter.requestPreviousSlide();
+ break;
+ case 'ArrowRight':
+ event.preventDefault();
+ if (event.shiftKey) {
+ presenter.requestLastSlide();
+ return;
+ }
+ presenter.requestNextSlide();
+ break;
+ case 'f':
+ event.preventDefault();
+ toggleFullscreen();
+ break;
+ }
+ },
+ [presenter],
+ ),
+ );
+
+ return (
+ <div className={styles.controls}>
+ <div className={styles.count}>
+ [
+ {((status.index ?? 0) + 1)
+ .toString()
+ .padStart(status.count.toString().length, '0')}
+ /{status.count}]
+ </div>
+ <IconButton title="Go back to editing" onClick={() => presenter.abort()}>
+ <Close />
+ </IconButton>
+ <IconButton
+ title="Previous slide [Left arrow]"
+ onClick={() => presenter.requestPreviousSlide()}
+ disabled={!status.hasPrevious}
+ >
+ <SkipPrevious />
+ </IconButton>
+ <IconButton
+ title="Resume [Space]"
+ onClick={() => presenter.resume()}
+ disabled={!status.isWaiting}
+ >
+ {status.isWaiting ? <PlayArrow /> : <Pause />}
+ </IconButton>
+ <IconButton
+ title="Next slide [Right arrow]"
+ onClick={() => presenter.requestNextSlide()}
+ disabled={!status.hasNext}
+ >
+ <SkipNext />
+ </IconButton>
+ <IconButton title="Enter fullscreen [F]" onClick={toggleFullscreen}>
+ <Fullscreen />
+ </IconButton>
+ </div>
+ );
+}
diff --git a/packages/ui/src/components/presentation/PresentationMode.tsx b/packages/ui/src/components/presentation/PresentationMode.tsx
new file mode 100644
index 00000000..bbe8820f
--- /dev/null
+++ b/packages/ui/src/components/presentation/PresentationMode.tsx
@@ -0,0 +1,15 @@
+import {useApplication} from '../../contexts';
+import {CustomStage} from '../viewport';
+import {PresentationControls} from './PresentationControls';
+import {SlideGraph} from './SlideGraph';
+
+export function PresentationMode() {
+ const {presenter} = useApplication();
+ return (
+ <>
+ <CustomStage stage={presenter.stage} />
+ <SlideGraph />
+ <PresentationControls />
+ </>
+ );
+}
diff --git a/packages/ui/src/components/presentation/SceneGroup.tsx b/packages/ui/src/components/presentation/SceneGroup.tsx
new file mode 100644
index 00000000..2ccb613b
--- /dev/null
+++ b/packages/ui/src/components/presentation/SceneGroup.tsx
@@ -0,0 +1,46 @@
+import type {Scene} from '@motion-canvas/core/lib/scenes';
+import {useApplication} from '../../contexts';
+import {useSubscribableValue} from '../../hooks';
+import {useEffect, useState} from 'preact/hooks';
+import {ControlledExpandable} from '../fields';
+import {SlideElement} from './SlideElement';
+
+interface SceneGroupProps {
+ scene: Scene;
+}
+
+export function SceneGroup({scene}: SceneGroupProps) {
+ const {presenter} = useApplication();
+ const {currentSlideId, nextSlideId, isWaiting} = useSubscribableValue(
+ presenter.onInfoChanged,
+ );
+ const slides = useSubscribableValue(scene.slides.onChanged);
+ const [open, setOpen] = useState(
+ !!slides.find(({id}) => id === currentSlideId),
+ );
+
+ useEffect(() => {
+ if (
+ slides.find(
+ ({id}) => id === currentSlideId || (!isWaiting && id === nextSlideId),
+ )
+ ) {
+ setOpen(true);
+ }
+ }, [currentSlideId, nextSlideId, isWaiting]);
+
+ return slides.length > 0 ? (
+ <ControlledExpandable open={open} setOpen={setOpen} title={scene.name}>
+ {slides.map(slide => (
+ <SlideElement
+ key={slide.id}
+ slide={slide}
+ active={currentSlideId === slide.id}
+ inProgress={!isWaiting && nextSlideId === slide.id}
+ />
+ ))}
+ </ControlledExpandable>
+ ) : (
+ <></>
+ );
+}
diff --git a/packages/ui/src/components/presentation/SlideElement.tsx b/packages/ui/src/components/presentation/SlideElement.tsx
new file mode 100644
index 00000000..be162537
--- /dev/null
+++ b/packages/ui/src/components/presentation/SlideElement.tsx
@@ -0,0 +1,26 @@
+import type {Slide} from '@motion-canvas/core/lib/scenes';
+import {useApplication} from '../../contexts';
+import clsx from 'clsx';
+import styles from './SlideGraph.module.scss';
+
+interface SlideElementProps {
+ slide: Slide;
+ active: boolean;
+ inProgress: boolean;
+}
+
+export function SlideElement({slide, active, inProgress}: SlideElementProps) {
+ const {presenter} = useApplication();
+ return (
+ <button
+ className={clsx(
+ styles.slide,
+ active && styles.active,
+ inProgress && styles.inProgress,
+ )}
+ onClick={() => presenter.requestSlide(slide.id)}
+ >
+ {slide.name}
+ </button>
+ );
+}
diff --git a/packages/ui/src/components/presentation/SlideGraph.module.scss b/packages/ui/src/components/presentation/SlideGraph.module.scss
new file mode 100644
index 00000000..0bb2cef4
--- /dev/null
+++ b/packages/ui/src/components/presentation/SlideGraph.module.scss
@@ -0,0 +1,36 @@
+.root {
+ position: fixed;
+ left: 16px;
+ top: 16px;
+ max-height: calc(100vh - 32px);
+ width: min(360px, 30vw);
+ background-color: var(--surface-color);
+ border-radius: 4px;
+ padding: 16px;
+ overflow-y: scroll;
+}
+
+.slide {
+ display: block;
+ color: inherit;
+ line-height: 24px;
+ text-align: start;
+ padding: 4px 8px 4px 36px;
+ width: 100%;
+ user-select: none;
+ border-radius: 4px;
+ cursor: pointer;
+
+ &:hover {
+ background-color: var(--surface-color-hover);
+ }
+
+ &.active {
+ color: var(--theme);
+ background-color: var(--theme-overlay);
+ }
+
+ &.inProgress {
+ color: var(--theme);
+ }
+}
diff --git a/packages/ui/src/components/presentation/SlideGraph.tsx b/packages/ui/src/components/presentation/SlideGraph.tsx
new file mode 100644
index 00000000..34cccc54
--- /dev/null
+++ b/packages/ui/src/components/presentation/SlideGraph.tsx
@@ -0,0 +1,19 @@
+import {useApplication} from '../../contexts';
+import {useSubscribableValue} from '../../hooks';
+import {Header} from '../layout';
+import {SceneGroup} from './SceneGroup';
+import styles from './SlideGraph.module.scss';
+
+export function SlideGraph() {
+ const {presenter} = useApplication();
+ const scenes = useSubscribableValue(presenter.playback.onScenesRecalculated);
+
+ return (
+ <div className={styles.root}>
+ <Header>SLIDES</Header>
+ {scenes.map(scene => (
+ <SceneGroup key={scene.name} scene={scene} />
+ ))}
+ </div>
+ );
+}
diff --git a/packages/ui/src/components/presentation/index.ts b/packages/ui/src/components/presentation/index.ts
new file mode 100644
index 00000000..f846b266
--- /dev/null
+++ b/packages/ui/src/components/presentation/index.ts
@@ -0,0 +1 @@
+export * from './PresentationMode';
diff --git a/packages/ui/src/components/sidebar/VideoSettings.tsx b/packages/ui/src/components/sidebar/VideoSettings.tsx
index eb64902c..98a90d58 100644
--- a/packages/ui/src/components/sidebar/VideoSettings.tsx
+++ b/packages/ui/src/components/sidebar/VideoSettings.tsx
@@ -1,15 +1,12 @@
-import {useRendererState} from '../../hooks';
-import {Button, Group, Label} from '../controls';
+import {usePresenterState, useRendererState, useStorage} from '../../hooks';
+import {ButtonSelect, Group, Label} from '../controls';
import {Pane} from '../tabs';
import {useApplication} from '../../contexts';
import {PreviewSettings, RenderingSettings, SharedSettings} from '../settings';
import {Expandable} from '../fields';
-import {RendererState} from '@motion-canvas/core';
+import {PresenterState, RendererState} from '@motion-canvas/core';
export function VideoSettings() {
- const {renderer, project, meta} = useApplication();
- const state = useRendererState();
-
return (
<Pane title="Video Settings" id="settings-pane">
<Expandable title="General" open>
@@ -23,28 +20,47 @@ export function VideoSettings() {
</Expandable>
<Group>
<Label />
- <Button
- main
- id="render"
- data-rendering={state !== RendererState.Initial}
- onClick={() => {
- if (state === RendererState.Initial) {
- renderer.render({
- ...meta.getFullRenderingSettings(),
- name: project.name,
- });
- } else {
- renderer.abort();
- }
- }}
- >
- {state === RendererState.Initial
- ? 'RENDER'
- : state === RendererState.Working
- ? 'STOP RENDERING'
- : 'ABORTING...'}
- </Button>
+ <ProcessButton />
</Group>
</Pane>
);
}
+
+function ProcessButton() {
+ const [processId, setProcess] = useStorage('main-action', 0);
+ const {renderer, presenter, meta, project} = useApplication();
+ const rendererState = useRendererState();
+ const presenterState = usePresenterState();
+
+ return (
+ <ButtonSelect
+ main
+ id="render"
+ data-rendering={rendererState !== RendererState.Initial}
+ value={processId}
+ onChange={setProcess}
+ onClick={() => {
+ if (processId === 0) {
+ if (rendererState === RendererState.Initial) {
+ renderer.render({
+ ...meta.getFullRenderingSettings(),
+ name: project.name,
+ });
+ } else {
+ renderer.abort();
+ }
+ } else if (presenterState === PresenterState.Initial) {
+ presenter.present({
+ ...meta.getFullRenderingSettings(),
+ name: project.name,
+ slide: null,
+ });
+ }
+ }}
+ options={[
+ {value: 0, text: 'RENDER'},
+ {value: 1, text: 'PRESENT'},
+ ]}
+ />
+ );
+}
diff --git a/packages/ui/src/components/tabs/Pane.tsx b/packages/ui/src/components/tabs/Pane.tsx
index 3f4d8f17..fde8d9c3 100644
--- a/packages/ui/src/components/tabs/Pane.tsx
+++ b/packages/ui/src/components/tabs/Pane.tsx
@@ -1,5 +1,6 @@
import styles from './Tabs.module.scss';
+import {Header} from '../layout';
import {ComponentChildren} from 'preact';
export interface PaneProps {
@@ -11,7 +12,7 @@ export interface PaneProps {
export function Pane({title, id, children}: PaneProps) {
return (
<div className={styles.pane} id={id}>
- <div className={styles.header}>{title}</div>
+ <Header>{title}</Header>
{children}
</div>
);
diff --git a/packages/ui/src/components/tabs/Tabs.module.scss b/packages/ui/src/components/tabs/Tabs.module.scss
index d64fd1ca..88dfa7c3 100644
--- a/packages/ui/src/components/tabs/Tabs.module.scss
+++ b/packages/ui/src/components/tabs/Tabs.module.scss
@@ -72,11 +72,3 @@
padding: 16px;
overflow-y: scroll;
}
-
-.header {
- font-size: 16px;
- line-height: 24px;
- text-transform: uppercase;
- font-weight: bold;
- margin-bottom: 16px;
-}
diff --git a/packages/ui/src/components/timeline/SceneTrack.tsx b/packages/ui/src/components/timeline/SceneTrack.tsx
index 80ba1e25..b4ec54cd 100644
--- a/packages/ui/src/components/timeline/SceneTrack.tsx
+++ b/packages/ui/src/components/timeline/SceneTrack.tsx
@@ -5,6 +5,7 @@ import {useScenes, useSubscribableValue} from '../../hooks';
import {useApplication, useTimelineContext} from '../../contexts';
import {useMemo} from 'preact/hooks';
import {findAndOpenFirstUserFile} from '../../utils';
+import {SlideTrack} from './SlideTrack';
export function SceneTrack() {
const scenes = useScenes();
@@ -36,8 +37,7 @@ function SceneClip({scene}: SceneClipProps) {
return (
<div
- className={styles.sceneClip}
- data-name={scene.name}
+ className={styles.clip}
style={{
width: `${framesToPercents(cachedData.duration)}%`,
}}
@@ -56,19 +56,19 @@ function SceneClip({scene}: SceneClipProps) {
}
}}
>
- <div className={styles.scene}>
- {cachedData.transitionDuration > 0 && (
- <div
- style={{
- width: `${
- (cachedData.transitionDuration / cachedData.duration) * 100
- }%`,
- }}
- className={styles.transition}
- />
- )}
- <button
- className={styles.sceneName}
+ {cachedData.transitionDuration > 0 && (
+ <div
+ style={{
+ width: `${
+ (cachedData.transitionDuration / cachedData.duration) * 100
+ }%`,
+ }}
+ className={styles.transition}
+ />
+ )}
+ <div className={styles.container}>
+ <div
+ className={styles.name}
style={nameStyle}
title="Go to source"
onMouseUp={async event => {
@@ -79,8 +79,12 @@ function SceneClip({scene}: SceneClipProps) {
}}
>
{scene.name}
- </button>
+ </div>
</div>
+ <SlideTrack
+ scene={scene}
+ duration={scene.playback.framesToSeconds(cachedData.duration)}
+ />
</div>
);
}
diff --git a/packages/ui/src/components/timeline/SlideTrack.tsx b/packages/ui/src/components/timeline/SlideTrack.tsx
new file mode 100644
index 00000000..1b1ae876
--- /dev/null
+++ b/packages/ui/src/components/timeline/SlideTrack.tsx
@@ -0,0 +1,42 @@
+import {Scene} from '@motion-canvas/core/lib/scenes';
+import {useSubscribableValue} from '../../hooks';
+import styles from './Timeline.module.scss';
+import clsx from 'clsx';
+
+export interface SlideTrackProps {
+ scene: Scene;
+ duration: number;
+}
+
+export function SlideTrack({scene, duration}: SlideTrackProps) {
+ const slides = useSubscribableValue(scene.slides.onChanged);
+
+ return slides.length > 0 ? (
+ <div className={styles.slideTrack}>
+ {slides[0].time > 0 && (
+ <div
+ className={clsx(styles.clip, styles.continuation)}
+ style={{left: 0, width: `${(slides[0].time / duration) * 100}%`}}
+ />
+ )}
+ {slides.map((slide, index) => (
+ <div
+ className={styles.clip}
+ style={{
+ width: `${
+ (((slides[index + 1]?.time ?? duration) - slide.time) /
+ duration) *
+ 100
+ }%`,
+ }}
+ >
+ <div className={styles.container}>
+ <div className={styles.name}>{slide.name}</div>
+ </div>
+ </div>
+ ))}
+ </div>
+ ) : (
+ <></>
+ );
+}
diff --git a/packages/ui/src/components/timeline/Timeline.module.scss b/packages/ui/src/components/timeline/Timeline.module.scss
index 488b5c08..c71dd768 100644
--- a/packages/ui/src/components/timeline/Timeline.module.scss
+++ b/packages/ui/src/components/timeline/Timeline.module.scss
@@ -87,46 +87,89 @@
}
.sceneTrack {
- height: 48px;
- padding: 4px 0;
+ padding: 8px 0;
display: flex;
+ align-items: stretch;
+ --clip-color: var(--surface-color-light);
+ --clip-gap: 4px;
}
-.sceneClip {
- height: 48px;
- padding: 4px;
+.clip {
+ position: relative;
- .scene {
- position: relative;
+ &::before {
+ position: absolute;
+ top: 0;
+ left: var(--clip-gap);
+ right: var(--clip-gap);
+ bottom: 0;
+ display: block;
+ content: '';
border-radius: 4px;
- background-color: var(--surface-color-light);
+ background-color: var(--clip-color);
+ }
+
+ .container {
+ width: 100%;
+ padding: 8px 16px;
+ }
+
+ .name {
+ color: inherit;
+ cursor: pointer;
+ position: relative;
+ line-height: 24px;
+ white-space: nowrap;
overflow: hidden;
+ text-overflow: ellipsis;
- .transition {
- position: absolute;
- pointer-events: none;
- top: 0;
- bottom: 0;
- left: -4px;
- background: linear-gradient(
- 90deg,
- rgba(36, 36, 36, 1) 0%,
- rgba(36, 36, 36, 0) 100%
- );
+ &:hover {
+ text-decoration: underline;
}
+ }
+}
- .sceneName {
- color: inherit;
- cursor: pointer;
- position: relative;
- line-height: 24px;
- overflow: hidden;
- text-overflow: ellipsis;
- margin: 8px 12px;
-
- &:hover {
- text-decoration: underline;
- }
+.transition {
+ position: absolute;
+ pointer-events: none;
+ top: 0;
+ bottom: 0;
+ left: -4px;
+ background: linear-gradient(
+ 90deg,
+ rgba(36, 36, 36, 1) 0%,
+ rgba(36, 36, 36, 0) 100%
+ );
+}
+
+.slideTrack {
+ display: flex;
+ padding: 4px 0;
+ width: 100%;
+ --clip-color: var(--surface-color-hover);
+ --clip-gap: 2px;
+
+ .container {
+ padding: 4px 16px;
+ }
+
+ .clip {
+ &:first-child::before {
+ left: 8px;
+ }
+
+ &:last-child::before {
+ right: 8px;
+ }
+
+ &.continuation::before {
+ background: repeating-linear-gradient(
+ 45deg,
+ transparent,
+ transparent 8px,
+ var(--surface-color-hover) 8px,
+ var(--surface-color-hover) 16px
+ );
}
}
}
diff --git a/packages/ui/src/components/timeline/Timeline.tsx b/packages/ui/src/components/timeline/Timeline.tsx
index a5c398d3..57eaa0fd 100644
--- a/packages/ui/src/components/timeline/Timeline.tsx
+++ b/packages/ui/src/components/timeline/Timeline.tsx
@@ -1,12 +1,6 @@
import styles from './Timeline.module.scss';
-import {
- useCallback,
- useEffect,
- useLayoutEffect,
- useMemo,
- useRef,
-} from 'preact/hooks';
+import {useCallback, useLayoutEffect, useMemo, useRef} from 'preact/hooks';
import {
useDocumentEvent,
useDuration,
@@ -45,7 +39,7 @@ export function Timeline() {
const [scale, setScale] = useStorage('timeline-scale', 1);
const isReady = duration > 0;
- useEffect(() => {
+ useLayoutEffect(() => {
containerRef.current.scrollLeft = offset;
}, [rect.width > 0 && isReady]);
diff --git a/packages/ui/src/components/viewport/RenderingPreview.tsx b/packages/ui/src/components/viewport/CustomStage.tsx
similarity index 65%
rename from packages/ui/src/components/viewport/RenderingPreview.tsx
rename to packages/ui/src/components/viewport/CustomStage.tsx
index 7e2f6fa6..79bd265f 100644
--- a/packages/ui/src/components/viewport/RenderingPreview.tsx
+++ b/packages/ui/src/components/viewport/CustomStage.tsx
@@ -1,19 +1,22 @@
-import {useApplication} from '../../contexts';
+import type {Stage} from '@motion-canvas/core';
import {useLayoutEffect, useRef} from 'preact/hooks';
import {useSharedSettings} from '../../hooks';
import styles from './Viewport.module.scss';
import clsx from 'clsx';
-export function RenderingPreview() {
- const {renderer} = useApplication();
+export interface CustomStageProps {
+ stage: Stage;
+}
+
+export function CustomStage({stage}: CustomStageProps) {
const ref = useRef<HTMLDivElement>();
const settings = useSharedSettings();
useLayoutEffect(() => {
- ref.current.append(renderer.stage.finalBuffer);
- return () => renderer.stage.finalBuffer.remove();
- }, []);
+ ref.current.append(stage.finalBuffer);
+ return () => stage.finalBuffer.remove();
+ }, [stage]);
return (
<div
diff --git a/packages/ui/src/components/viewport/Viewport.tsx b/packages/ui/src/components/viewport/Viewport.tsx
index 1abc489e..73a59c00 100644
--- a/packages/ui/src/components/viewport/Viewport.tsx
+++ b/packages/ui/src/components/viewport/Viewport.tsx
@@ -4,11 +4,11 @@ import {CurrentTime} from '../playback/CurrentTime';
import {EditorPreview} from './EditorPreview';
import styles from './Viewport.module.scss';
import {useApplication} from '../../contexts';
-import {RenderingPreview} from './RenderingPreview';
+import {CustomStage} from './CustomStage';
import {RendererState} from '@motion-canvas/core';
export function Viewport() {
- const {player} = useApplication();
+ const {player, renderer} = useApplication();
const duration = useDuration();
const {speed} = usePlayerState();
const state = useRendererState();
@@ -16,7 +16,7 @@ export function Viewport() {
return (
<div className={styles.root}>
{state === RendererState.Working ? (
- <RenderingPreview />
+ <CustomStage stage={renderer.stage} />
) : (
<EditorPreview />
)}
diff --git a/packages/ui/src/components/viewport/index.ts b/packages/ui/src/components/viewport/index.ts
index f3e6b530..d396d7f3 100644
--- a/packages/ui/src/components/viewport/index.ts
+++ b/packages/ui/src/components/viewport/index.ts
@@ -1 +1,2 @@
+export * from './CustomStage';
export * from './Viewport';
diff --git a/packages/ui/src/contexts/application.tsx b/packages/ui/src/contexts/application.tsx
index cbfe5e5a..9927b6c7 100644
--- a/packages/ui/src/contexts/application.tsx
+++ b/packages/ui/src/contexts/application.tsx
@@ -1,11 +1,18 @@
import {ComponentChildren, createContext} from 'preact';
import {useContext} from 'preact/hooks';
-import {Player, Renderer, Project, ProjectMetadata} from '@motion-canvas/core';
+import type {
+ Player,
+ Renderer,
+ Project,
+ Presenter,
+ ProjectMetadata,
+} from '@motion-canvas/core';
interface Application {
project: Project;
player: Player;
renderer: Renderer;
+ presenter: Presenter;
meta: ProjectMetadata;
}
diff --git a/packages/ui/src/hooks/index.ts b/packages/ui/src/hooks/index.ts
index b3a91d19..92e2a6bc 100644
--- a/packages/ui/src/hooks/index.ts
+++ b/packages/ui/src/hooks/index.ts
@@ -6,6 +6,7 @@ export * from './useFormattedNumber';
export * from './useKeyHold';
export * from './usePlayerState';
export * from './usePlayerTime';
+export * from './usePresenterState';
export * from './useRendererState';
export * from './useScenes';
export * from './useSettings';
diff --git a/packages/ui/src/hooks/usePresenterState.ts b/packages/ui/src/hooks/usePresenterState.ts
new file mode 100644
index 00000000..823fdc97
--- /dev/null
+++ b/packages/ui/src/hooks/usePresenterState.ts
@@ -0,0 +1,7 @@
+import {useSubscribableValue} from './useSubscribable';
+import {useApplication} from '../contexts';
+
+export function usePresenterState() {
+ const {presenter} = useApplication();
+ return useSubscribableValue(presenter.onStateChanged);
+}
diff --git a/packages/ui/src/main.tsx b/packages/ui/src/main.tsx
index ed15f990..49c5405d 100644
--- a/packages/ui/src/main.tsx
+++ b/packages/ui/src/main.tsx
@@ -1,7 +1,7 @@
import './index.scss';
import type {Project} from '@motion-canvas/core';
-import {Player, Renderer} from '@motion-canvas/core';
+import {Player, Presenter, Renderer} from '@motion-canvas/core';
import {ComponentChild, render} from 'preact';
import {Editor} from './Editor';
import {Index, ProjectData} from './Index';
@@ -31,6 +31,7 @@ export function editor(project: Project) {
});
const renderer = new Renderer(project);
+ const presenter = new Presenter(project);
const meta = project.meta;
const playerKey = `${project.name}/player`;
@@ -61,6 +62,7 @@ export function editor(project: Project) {
application={{
player,
renderer,
+ presenter,
project,
meta,
}}