Skip to content

🎥 Make videos programmatically with React

`@remotion/studio`: Separate composition annotation targets from sidebar selectors

Jonny Burger44c18d1ba5be
diff --git a/packages/studio/src/components/CanvasTabs.tsx b/packages/studio/src/components/CanvasTabs.tsx
index ee35ea91b3..c8d499fcf1 100644
--- a/packages/studio/src/components/CanvasTabs.tsx
+++ b/packages/studio/src/components/CanvasTabs.tsx
@@ -428,7 +428,7 @@ const CanvasTab: React.FC<{
triggerStyle={tooltipTriggerStyle}
>
<span
- data-compname={
+ data-annotation-composition-id={
tab.type === 'composition' ? tab.compositionId : undefined
}
style={{...labelStyle, color: selected ? WHITE : LIGHT_TEXT}}
diff --git a/packages/studio/src/components/CompositionSelectorItem.tsx b/packages/studio/src/components/CompositionSelectorItem.tsx
index 32154ff5cd..9f62d7d8a5 100644
--- a/packages/studio/src/components/CompositionSelectorItem.tsx
+++ b/packages/studio/src/components/CompositionSelectorItem.tsx
@@ -855,6 +855,7 @@ export const CompositionSelectorItem: React.FC<{
aria-label={item.composition.id}
className={`__remotion-composition __remotion-composition-selector-item ${HOVERABLE_CLASS_NAME} ${HOVER_GROUP_CLASS_NAME}`}
data-compname={item.composition.id}
+ data-annotation-composition-id={item.composition.id}
>
<CompositionOrStillIcon
composition={item.composition}
diff --git a/packages/studio/src/components/InspectorPanel/ConnectedCompositionsSection.tsx b/packages/studio/src/components/InspectorPanel/ConnectedCompositionsSection.tsx
index 41ea214084..f2f2a2e86c 100644
--- a/packages/studio/src/components/InspectorPanel/ConnectedCompositionsSection.tsx
+++ b/packages/studio/src/components/InspectorPanel/ConnectedCompositionsSection.tsx
@@ -110,7 +110,9 @@ const ConnectedCompositionRow: React.FC<{
/>
)}
>
- <span data-compname={composition.id}>{composition.id}</span>
+ <span data-annotation-composition-id={composition.id}>
+ {composition.id}
+ </span>
</InspectorQuickAction>
</ContextMenu>
);
diff --git a/packages/studio/src/components/QuickSwitcher/QuickSwitcherResult.tsx b/packages/studio/src/components/QuickSwitcher/QuickSwitcherResult.tsx
index d389a3ddba..f4731b2ea4 100644
--- a/packages/studio/src/components/QuickSwitcher/QuickSwitcherResult.tsx
+++ b/packages/studio/src/components/QuickSwitcher/QuickSwitcherResult.tsx
@@ -229,7 +229,7 @@ export const QuickSwitcherResult: React.FC<{
<div
key={result.id}
ref={ref}
- data-compname={composition?.id}
+ data-annotation-composition-id={composition?.id}
style={style}
onClick={onSelected ?? undefined}
>
diff --git a/packages/studio/src/components/composition-menu-items.ts b/packages/studio/src/components/composition-menu-items.ts
index 18951bd458..e707926801 100644
--- a/packages/studio/src/components/composition-menu-items.ts
+++ b/packages/studio/src/components/composition-menu-items.ts
@@ -439,11 +439,14 @@ export const getCompositionMenuItems = ({
id: 'annotate-composition',
getTarget: () =>
getVisibleAnnotationTarget(
- Array.from(document.querySelectorAll('[data-compname]'))
+ Array.from(
+ document.querySelectorAll('[data-annotation-composition-id]'),
+ )
.reverse()
.filter(
(element) =>
- element.getAttribute('data-compname') === composition.id,
+ element.getAttribute('data-annotation-composition-id') ===
+ composition.id,
),
),
initialComment: null,