🎥 Make videos programmatically with React
Polish Element install dialog controls
Igor Samokhovets0bcbdc2f91a2
diff --git a/packages/example/e2e/studio-protocol.test.mts b/packages/example/e2e/studio-protocol.test.mtsindex fafd07ad1b..00c1db8d86 100644--- a/packages/example/e2e/studio-protocol.test.mts+++ b/packages/example/e2e/studio-protocol.test.mts@@ -355,13 +355,21 @@ const CloseupPlaceholder = () => {studioProtocolRequests.length = 0;await installInStudio.click();- const dialog = studioPage.getByRole('dialog');- await expect(- dialog.getByText('Install Protocol Element', {exact: true}),- ).toBeVisible();- await expect(- dialog.getByRole('button', {name: 'Current composition'}),- ).toHaveAttribute('aria-pressed', 'true');+ const dialog = studioPage.getByRole('dialog', {+ name: 'Install Protocol Element',+ });+ await expect(dialog).toBeVisible();+ const currentDestination = dialog.getByRole('radio', {+ name: 'Current composition',+ });+ const newDestination = dialog.getByRole('radio', {+ name: 'New composition',+ });+ await expect(currentDestination).toBeChecked();+ await currentDestination.press('ArrowRight');+ await expect(newDestination).toBeChecked();+ await newDestination.press('ArrowLeft');+ await expect(currentDestination).toBeChecked();await expect(dialog.getByText(senderUrl, {exact: true})).toBeVisible();await expect(decoyStudioPage.getByText('Install Protocol Element', {exact: true}),@@ -395,12 +403,12 @@ const CloseupPlaceholder = () => {await senderPage.goto(senderUrl);await senderPage.getByRole('button', {name: 'Install in Studio'}).click();await studioPage.bringToFront();- const newCompositionDialog = studioPage.getByRole('dialog');- await expect(- newCompositionDialog.getByText('Install Protocol Element', {exact: true}),- ).toBeVisible();+ const newCompositionDialog = studioPage.getByRole('dialog', {+ name: 'Install Protocol Element',+ });+ await expect(newCompositionDialog).toBeVisible();await newCompositionDialog- .getByRole('button', {name: 'New composition'})+ .getByRole('radio', {name: 'New composition'}).click();await expect(newCompositionDialog.getByPlaceholder('Composition ID'),diff --git a/packages/studio/src/components/ElementInstallConfirmation.tsx b/packages/studio/src/components/ElementInstallConfirmation.tsxindex 9f140175c2..7f3a6e5b33 100644--- a/packages/studio/src/components/ElementInstallConfirmation.tsx+++ b/packages/studio/src/components/ElementInstallConfirmation.tsx@@ -68,7 +68,7 @@ const container: React.CSSProperties = {const dialogContent: React.CSSProperties = {...container,padding: 16,- width: 'min(600px, calc(100vw - 40px))',+ width: 'min(520px, calc(100vw - 40px))',maxHeight: 'min(720px, calc(100vh - 140px))',overflowY: 'auto',};@@ -130,6 +130,7 @@ const requestSourceStyle: React.CSSProperties = {const requestSourceDescriptionStyle: React.CSSProperties = {...metadataDescriptionStyle,+ color: LIGHT_TEXT,textAlign: 'right',};@@ -253,25 +254,31 @@ const destinationControlStyle: React.CSSProperties = {display: 'flex',alignItems: 'center',justifyContent: 'space-between',- gap: 16,+ columnGap: 16,+ rowGap: 10,+ flexWrap: 'wrap',};const destinationOptionsStyle: React.CSSProperties = {display: 'flex',overflow: 'hidden',+ maxWidth: '100%',+ marginLeft: 'auto',border: `1px solid ${WHITE_ALPHA_12}`,borderRadius: 4,};const destinationOptionStyle: React.CSSProperties = {appearance: 'none',+ minHeight: 26,border: 0,cursor: 'default',fontFamily: 'sans-serif',- fontSize: 11,+ fontSize: 12,fontWeight: 400,- lineHeight: 1.5,- padding: '2px 7px',+ lineHeight: '18px',+ padding: '4px 8px',+ whiteSpace: 'nowrap',};const getDestinationOptionStyle = ({@@ -299,6 +306,8 @@ const cancelStyle: React.CSSProperties = {minWidth: 90,};+const elementInstallTitleId = 'remotion-element-install-title';+const makeSourceControlsVisible = (sourceCode: string) => {return sourceCode.replace(/[\u200b-\u200f\u202a-\u202e\u2066-\u2069\ufeff]/g,@@ -397,6 +406,8 @@ export const ElementInstallConfirmation: React.FC<{);const [submitting, setSubmitting] = useState(false);const inputRef = useRef<HTMLInputElement>(null);+ const currentDestinationRef = useRef<HTMLButtonElement>(null);+ const newDestinationRef = useRef<HTMLButtonElement>(null);const [newCompositionValues, setNewCompositionValues] =useState<NewCompositionFormValues>(() => {const elementComponentName =@@ -549,6 +560,7 @@ export const ElementInstallConfirmation: React.FC<{const folderTargetIsReady =selectedFolderStack === null ||(hasResolvedStack(selectedFolderStack) && folderCompositionFile !== null);+ const title = `Install ${request.element.displayName}${request.element.displayName.endsWith(' Element') ? '' : ' Element'}`;const canSubmit =!submitting &&(mode === 'current-composition'@@ -630,6 +642,35 @@ export const ElementInstallConfirmation: React.FC<{}}, [onClose, submitting]);+ const onDestinationKeyDown = useCallback(+ (event: React.KeyboardEvent<HTMLDivElement>) => {+ if (+ !['ArrowLeft', 'ArrowRight', 'ArrowUp', 'ArrowDown'].includes(event.key)+ ) {+ return;+ }++ event.preventDefault();+ if (currentPlan === null) {+ return;+ }++ const nextMode =+ mode === 'current-composition'+ ? 'new-composition'+ : 'current-composition';+ setMode(nextMode);+ requestAnimationFrame(() => {+ if (nextMode === 'current-composition') {+ currentDestinationRef.current?.focus();+ } else {+ newDestinationRef.current?.focus();+ }+ });+ },+ [currentPlan, mode],+ );+const onSubmit: React.FormEventHandler<HTMLFormElement> = useCallback((event) => {event.preventDefault();@@ -639,11 +680,14 @@ export const ElementInstallConfirmation: React.FC<{);return createPortal(- <ModalContainer onOutsideClick={cancel} onEscape={cancel}>- <ModalHeader- title={`Install ${request.element.displayName}${request.element.displayName.endsWith(' Element') ? '' : ' Element'}`}- onClose={cancel}- />+ <ModalContainer+ ariaLabelledBy={elementInstallTitleId}+ onOutsideClick={cancel}+ onEscape={cancel}+ >+ <div id={elementInstallTitleId}>+ <ModalHeader title={title} onClose={cancel} />+ </div><form onSubmit={onSubmit}><div style={dialogContent}><dl style={requestSourceStyle} aria-label="Request source">@@ -663,29 +707,35 @@ export const ElementInstallConfirmation: React.FC<{<div style={sectionTitleStyle}>Destination</div><divaria-label="Installation destination"- role="group"+ onKeyDown={onDestinationKeyDown}+ role="radiogroup"style={destinationOptionsStyle}><button- aria-pressed={mode === 'current-composition'}+ ref={currentDestinationRef}+ aria-checked={mode === 'current-composition'}className={`${HOVERABLE_CLASS_NAME} ${FOCUS_VISIBLE_ONLY_CLASS_NAME}`}disabled={currentPlan === null}onClick={() => setMode('current-composition')}+ role="radio"style={getDestinationOptionStyle({disabled: currentPlan === null,selected: mode === 'current-composition',})}+ tabIndex={mode === 'current-composition' ? 0 : -1}type="button">Current composition</button><button- aria-pressed={mode === 'new-composition'}+ ref={newDestinationRef}+ aria-checked={mode === 'new-composition'}className={`${HOVERABLE_CLASS_NAME} ${FOCUS_VISIBLE_ONLY_CLASS_NAME}`}onClick={() => {setMode('new-composition');requestAnimationFrame(() => inputRef.current?.select());}}+ role="radio"style={{...getDestinationOptionStyle({disabled: false,@@ -693,6 +743,7 @@ export const ElementInstallConfirmation: React.FC<{}),borderLeft: `1px solid ${WHITE_ALPHA_12}`,}}+ tabIndex={mode === 'new-composition' ? 0 : -1}type="button">New compositiondiff --git a/packages/studio/src/components/ModalContainer.tsx b/packages/studio/src/components/ModalContainer.tsxindex b012e5a91e..0a8a252bc7 100644--- a/packages/studio/src/components/ModalContainer.tsx+++ b/packages/studio/src/components/ModalContainer.tsx@@ -39,12 +39,20 @@ const panel: React.CSSProperties = {};export const ModalContainer: React.FC<{+ readonly ariaLabelledBy?: string;readonly onEscape: () => void;readonly onOutsideClick: () => void;readonly children: React.ReactNode;readonly noZIndex?: boolean;readonly panelStyle?: React.CSSProperties;-}> = ({children, onEscape, onOutsideClick, noZIndex, panelStyle}) => {+}> = ({+ ariaLabelledBy,+ children,+ onEscape,+ onOutsideClick,+ noZIndex,+ panelStyle,+}) => {const onPointerDown = useCallback((e: React.PointerEvent<HTMLDivElement>) => {// Prevent deselection of currently selected itemse.stopPropagation();@@ -52,10 +60,11 @@ export const ModalContainer: React.FC<{return (<div+ aria-labelledby={ariaLabelledBy ?? undefined}+ aria-modal="true"className="css-reset"- style={backgroundOverlay}role="dialog"- aria-modal="true"+ style={backgroundOverlay}onPointerDown={onPointerDown}><HigherZIndex