Skip to content

🎥 Make videos programmatically with React

Fix nested Explorer action hover states

JonnyBurger472c1328dcd4
diff --git a/packages/browser-studio/e2e/browser-studio.test.ts b/packages/browser-studio/e2e/browser-studio.test.ts
index e078c71735..d825e887c4 100644
--- a/packages/browser-studio/e2e/browser-studio.test.ts
+++ b/packages/browser-studio/e2e/browser-studio.test.ts
@@ -1217,6 +1217,8 @@ test('clears hover backgrounds even if pointer leave events are lost', async ({
locator.evaluate(
(element) => window.getComputedStyle(element).backgroundColor,
);
+ const getColor = (locator: ReturnType<typeof studio.locator>) =>
+ locator.evaluate((element) => window.getComputedStyle(element).color);
await addSolid.hover();
await expect
@@ -1264,6 +1266,11 @@ test('clears hover backgrounds even if pointer leave events are lost', async ({
await expect
.poll(() => getBackgroundColor(assetItem))
.toBe('rgba(255, 255, 255, 0.06)');
+ const assetActions = assetItem.getByRole('button', {name: 'More actions'});
+ await assetActions.hover();
+ await expect.poll(() => getColor(assetActions)).toBe('rgb(255, 255, 255)');
+ await assetItem.hover({position: {x: 10, y: 10}});
+ await expect.poll(() => getColor(assetActions)).toBe('rgb(166, 167, 169)');
await neutralArea.hover();
await expect
.poll(() => getBackgroundColor(assetItem))
@@ -1276,6 +1283,15 @@ test('clears hover backgrounds even if pointer leave events are lost', async ({
await expect
.poll(() => getBackgroundColor(compositionItem))
.toBe('rgba(255, 255, 255, 0.06)');
+ const compositionActions = compositionItem.locator('button').first();
+ await compositionActions.hover();
+ await expect
+ .poll(() => getColor(compositionActions))
+ .toBe('rgb(255, 255, 255)');
+ await compositionItem.hover({position: {x: 10, y: 10}});
+ await expect
+ .poll(() => getColor(compositionActions))
+ .toBe('rgb(166, 167, 169)');
await neutralArea.hover();
await expect
.poll(() => getBackgroundColor(compositionItem))
diff --git a/packages/studio/src/helpers/hoverable.ts b/packages/studio/src/helpers/hoverable.ts
index 9b3f263888..88e11827c4 100644
--- a/packages/studio/src/helpers/hoverable.ts
+++ b/packages/studio/src/helpers/hoverable.ts
@@ -64,18 +64,23 @@ export const makeHoverableCSS = () => `
}
@media (hover: hover) {
- ${hoverable}:hover,
- ${hoverGroup}:hover ${hoverable} {
+ ${hoverable}:hover {
background-color: var(${HOVER_BG_VARIABLE}, var(${BG_VARIABLE}, ${TRANSPARENT}));
}
${hoverable}:hover,
- ${hoverable}:hover *,
- ${hoverGroup}:hover ${hoverable},
- ${hoverGroup}:hover ${hoverable} * {
+ ${hoverable}:hover * {
color: var(${HOVER_COLOR_VARIABLE}, var(${COLOR_VARIABLE}, inherit));
}
+ /* An outer hoverable must not put a nested inline action into its hover
+ state. The nested action should only use its hover color when the
+ pointer is over the action itself. */
+ ${hoverable}:hover ${hoverable}:not(:hover),
+ ${hoverable}:hover ${hoverable}:not(:hover) * {
+ color: var(${COLOR_VARIABLE}, inherit);
+ }
+
${hoverGroup} ${reveal} {
opacity: 0;
}