Visualize Your Ideas With Code
feat(ui): improve rendering button (#662)
Jacob2b4ae70ea0b0
diff --git a/packages/ui/index.html b/packages/ui/index.htmlindex 1606ecd1..daa0d960 100644--- a/packages/ui/index.html+++ b/packages/ui/index.html@@ -15,10 +15,14 @@<script type="module">import {index} from '/src/main.tsx';index([- {name: 'project.html', url: './src/project.ts'},- {name: 'exampleA', url: './src/exampleA.ts'},- {name: 'exampleB', url: './src/exampleB.ts'},- {name: 'exampleC', url: './src/exampleC.ts'},+ {+ name: 'project.html',+ fileName: 'project.html',+ url: './src/project.ts',+ },+ {name: 'exampleA', fileName: 'exampleA', url: './src/exampleA.ts'},+ {name: 'exampleB', fileName: 'exampleB', url: './src/exampleB.ts'},+ {name: 'exampleC', fileName: 'exampleC', url: './src/exampleC.ts'},]);</script></body>diff --git a/packages/ui/src/components/controls/ButtonSelect.tsx b/packages/ui/src/components/controls/ButtonSelect.tsxindex 34b0bf01..758950f2 100644--- a/packages/ui/src/components/controls/ButtonSelect.tsx+++ b/packages/ui/src/components/controls/ButtonSelect.tsx@@ -10,14 +10,21 @@ export function ButtonSelect<T extends string | number>({value,onChange,main,+ disabled,...props}: ButtonSelectProps<T>) {return (<div className={styles.inputSelect}>- <Button main={main} {...props}>+ <Button main={main} {...props} disabled={disabled}>{options.find(option => option.value === value)?.text}</Button>- <Select value={value} main={main} options={options} onChange={onChange} />+ <Select+ value={value}+ main={main}+ options={options}+ onChange={onChange}+ disabled={disabled}+ /></div>);}diff --git a/packages/ui/src/components/controls/Controls.module.scss b/packages/ui/src/components/controls/Controls.module.scssindex 8c092c03..1b0fa87c 100644--- a/packages/ui/src/components/controls/Controls.module.scss+++ b/packages/ui/src/components/controls/Controls.module.scss@@ -92,6 +92,11 @@box-shadow: 0 0 0 2px white inset;}}++ &:disabled {+ pointer-events: none;+ opacity: 0.54;+ }}.inputSelect {diff --git a/packages/ui/src/components/controls/Select.tsx b/packages/ui/src/components/controls/Select.tsxindex bcb7356f..04162f7a 100644--- a/packages/ui/src/components/controls/Select.tsx+++ b/packages/ui/src/components/controls/Select.tsx@@ -6,6 +6,7 @@ export interface SelectProps<T> {options: {value: T; text: string}[];className?: string;main?: boolean;+ disabled?: boolean;value: T;onChange: (value: T) => void;}@@ -16,11 +17,13 @@ export function Select<T>({onChange,title,main,+ disabled,className,}: SelectProps<T>) {return (<selecttitle={title}+ disabled={disabled}className={clsx(styles.select, className, main && styles.main)}value={options.findIndex(option => option.value === value)}onChange={event => {diff --git a/packages/ui/src/components/sidebar/VideoSettings.tsx b/packages/ui/src/components/sidebar/VideoSettings.tsxindex 462776b6..e8efa187 100644--- a/packages/ui/src/components/sidebar/VideoSettings.tsx+++ b/packages/ui/src/components/sidebar/VideoSettings.tsx@@ -1,9 +1,9 @@-import {usePresenterState, useRendererState, useStorage} from '../../hooks';-import {ButtonSelect, Group, Label} from '../controls';+import {useRendererState, useStorage} from '../../hooks';+import {Button, ButtonSelect, Group, Label} from '../controls';import {Pane} from '../tabs';import {useApplication} from '../../contexts';import {Expandable} from '../fields';-import {PresenterState, RendererState} from '@motion-canvas/core';+import {RendererState} from '@motion-canvas/core';import {MetaFieldView} from '../meta';export function VideoSettings() {@@ -32,26 +32,20 @@ function ProcessButton() {const [processId, setProcess] = useStorage('main-action', 0);const {renderer, presenter, meta, project} = useApplication();const rendererState = useRendererState();- const presenterState = usePresenterState();- return (+ return rendererState === RendererState.Initial ? (<ButtonSelectmainid="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) {+ renderer.render({+ ...meta.getFullRenderingSettings(),+ name: project.name,+ });+ } else {presenter.present({...meta.getFullRenderingSettings(),name: project.name,@@ -60,9 +54,24 @@ function ProcessButton() {}}}options={[- {value: 0, text: 'RENDER'},+ {+ value: 0,+ text: 'RENDER',+ },{value: 1, text: 'PRESENT'},]}/>+ ) : (+ <Button+ main+ id="render"+ data-rendering={true}+ disabled={rendererState === RendererState.Aborting}+ onClick={() => {+ renderer.abort();+ }}+ >+ {rendererState === RendererState.Working ? 'ABORT' : 'ABORTING'}+ </Button>);}