diff --git a/.changeset/polite-mails-press.md b/.changeset/polite-mails-press.md new file mode 100644 index 000000000..d0b016c6a --- /dev/null +++ b/.changeset/polite-mails-press.md @@ -0,0 +1,5 @@ +--- +'@sveltejs/vite-plugin-svelte': patch +--- + +svelte-inspector: prevent info-bubble select diff --git a/packages/e2e-tests/inspector-kit/__tests__/inspector.kit.spec.ts b/packages/e2e-tests/inspector-kit/__tests__/inspector.kit.spec.ts index 321ecae74..22e6c8252 100644 --- a/packages/e2e-tests/inspector-kit/__tests__/inspector.kit.spec.ts +++ b/packages/e2e-tests/inspector-kit/__tests__/inspector.kit.spec.ts @@ -6,11 +6,11 @@ describe('inspector-kit', () => { }); if (!isBuild) { it('should show inspector toggle during dev', async () => { - expect(await getEl('.svelte-inspector-toggle')).not.toBe(null); + expect(await getEl('#svelte-inspector-toggle')).not.toBe(null); }); } else { it('should not show inspector toggle during preview', async () => { - expect(await getEl('.svelte-inspector-toggle')).toBe(null); + expect(await getEl('#svelte-inspector-toggle')).toBe(null); }); } }); diff --git a/packages/e2e-tests/inspector-vite/__tests__/inspector.vite.spec.ts b/packages/e2e-tests/inspector-vite/__tests__/inspector.vite.spec.ts index f92a334ec..a9a86f354 100644 --- a/packages/e2e-tests/inspector-vite/__tests__/inspector.vite.spec.ts +++ b/packages/e2e-tests/inspector-vite/__tests__/inspector.vite.spec.ts @@ -6,11 +6,11 @@ describe('inspector-vite', () => { }); if (!isBuild) { it('should show inspector toggle during dev', async () => { - expect(await getEl('.svelte-inspector-toggle')).not.toBe(null); + expect(await getEl('#svelte-inspector-toggle')).not.toBe(null); }); } else { it('should not show inspector toggle during preview', async () => { - expect(await getEl('.svelte-inspector-toggle')).toBe(null); + expect(await getEl('#svelte-inspector-toggle')).toBe(null); }); } }); diff --git a/packages/vite-plugin-svelte/src/ui/inspector/Inspector.svelte b/packages/vite-plugin-svelte/src/ui/inspector/Inspector.svelte index 1a291d3fc..577865143 100644 --- a/packages/vite-plugin-svelte/src/ui/inspector/Inspector.svelte +++ b/packages/vite-plugin-svelte/src/ui/inspector/Inspector.svelte @@ -25,7 +25,6 @@ let x, y, w; let active_el; - let toggle_el; let enabled_ts; @@ -79,14 +78,12 @@ } function is_selectable(el) { - if (el === toggle_el) { - return false; // toggle is our own - } const file = el?.__svelte_meta?.loc?.file; if (!file || file.includes('node_modules/')) { return false; // no file or 3rd party } - if (['svelte-announcer', 'svelte-inspector-announcer'].includes(el.getAttribute('id'))) { + const id = el.getAttribute('id'); + if (id === 'svelte-announcer' || id?.startsWith('svelte-inspector-')) { return false; // ignore some elements by id that would be selectable from keyboard nav otherwise } return true; @@ -286,21 +283,20 @@ {#if show_toggle}