🎥 Make videos programmatically with React
`@remotion/studio`: Remove preselection from dropdowns without checkmarks
Jonny Burgerf0e6c233d8fb
diff --git a/packages/studio/src/components/NewComposition/ComboBox.tsx b/packages/studio/src/components/NewComposition/ComboBox.tsxindex 6c0b5a5bf8..4ab754cdca 100644--- a/packages/studio/src/components/NewComposition/ComboBox.tsx+++ b/packages/studio/src/components/NewComposition/ComboBox.tsx@@ -12,6 +12,7 @@ import {import {useMobileLayout} from '../../helpers/mobile-layout';import {noop} from '../../helpers/noop';import {CaretDown} from '../../icons/caret';+import {Checkmark} from '../../icons/Checkmark';import {HigherZIndex, useZIndex} from '../../state/z-index';import {COMPACT_CONTROL_ROW_HEIGHT, Spacing} from '../layout';import {MENU_INITIATOR_CLASSNAME, isMenuItem} from '../Menu/is-menu-item';@@ -343,9 +344,13 @@ export const Combobox: React.FC<{values={values}onHide={onHide}leaveLeftSpace- preselectIndex={values.findIndex(- (v) => selected && v.id === selected.id,- )}+ preselectIndex={+ selected &&+ React.isValidElement(selected.leftItem) &&+ selected.leftItem.type === Checkmark+ ? values.findIndex((v) => v.id === selected.id)+ : false+ }topItemCanBeUnselected={false}fixedHeight={derivedMaxHeight}/>diff --git a/packages/studio/src/components/SegmentedButton.tsx b/packages/studio/src/components/SegmentedButton.tsxindex e7b34a2381..9556b92a51 100644--- a/packages/studio/src/components/SegmentedButton.tsx+++ b/packages/studio/src/components/SegmentedButton.tsx@@ -14,6 +14,7 @@ import {} from '../helpers/hoverable';import {useMobileLayout} from '../helpers/mobile-layout';import {noop} from '../helpers/noop';+import {Checkmark} from '../icons/Checkmark';import {HigherZIndex, useZIndex} from '../state/z-index';import {ActionTooltip} from './ActionTooltip';import {MENU_INITIATOR_CLASSNAME} from './Menu/is-menu-item';@@ -383,13 +384,13 @@ const SegmentedButtonMenu: React.FC<{onHide={onHide}onNextMenu={noop}onPreviousMenu={noop}- preselectIndex={- segment.selectedId === null- ? false- : segment.values.findIndex(- (value) => value.id === segment.selectedId,- )- }+ preselectIndex={segment.values.findIndex(+ (value) =>+ value.type === 'item' &&+ value.id === segment.selectedId &&+ React.isValidElement(value.leftItem) &&+ value.leftItem.type === Checkmark,+ )}topItemCanBeUnselected={false}values={segment.values}/>