An open-source, self-hostable PaaS alternative to Vercel, Heroku & Netlify that lets you easily deploy static sites, databases, full-stack applications and 360+ one-click services on your own servers.
PHP coolifydatabasesdeploymentdockerdocker-composeinertiajslaravelmariadbmysqlnextjsnodejsphppostgresredisself-hostedself-hostingserverstatic-sitesveltesvelte5
fix(ui): keep helper popups in visual viewport on mobile
Andras Bacsai64d73b6922d2
diff --git a/resources/views/components/helper.blade.php b/resources/views/components/helper.blade.phpindex 15a5055c3d..72ac38d783 100644--- a/resources/views/components/helper.blade.php+++ b/resources/views/components/helper.blade.php@@ -7,6 +7,18 @@open: false,hideTimer: null,style: '',+ visualViewport: null,+ reposition: null,+ init() {+ this.visualViewport = window.visualViewport;+ this.reposition = () => this.open && this.position();+ this.visualViewport?.addEventListener('resize', this.reposition);+ this.visualViewport?.addEventListener('scroll', this.reposition);+ },+ destroy() {+ this.visualViewport?.removeEventListener('resize', this.reposition);+ this.visualViewport?.removeEventListener('scroll', this.reposition);+ },show() {this.cancelHide();this.open = true;@@ -51,26 +63,38 @@return;}+ const padding = 8;+ const viewport = window.visualViewport;+ const viewportLeft = viewport?.offsetLeft ?? 0;+ const viewportTop = viewport?.offsetTop ?? 0;+ const viewportWidth = viewport?.width ?? window.innerWidth;+ const viewportHeight = viewport?.height ?? window.innerHeight;+ const viewportRight = viewportLeft + viewportWidth;+ const viewportBottom = viewportTop + viewportHeight;+ const availableWidth = Math.max(0, viewportWidth - padding * 2);+ const availableHeight = Math.max(0, viewportHeight - padding * 2);++ this.style = `max-width: ${availableWidth}px; max-height: ${availableHeight}px; overflow-y: auto;`;+const triggerRect = trigger.getBoundingClientRect();const popupRect = popup.getBoundingClientRect();- const padding = 8;let top = triggerRect.bottom + padding;let left = triggerRect.right - popupRect.width;- if (top + popupRect.height > window.innerHeight - padding) {+ if (top + popupRect.height > viewportBottom - padding) {top = triggerRect.top - popupRect.height - padding;}- left = Math.min(Math.max(padding, left), window.innerWidth - popupRect.width - padding);- top = Math.max(padding, top);+ left = Math.min(Math.max(viewportLeft + padding, left), viewportRight - popupRect.width - padding);+ top = Math.min(Math.max(viewportTop + padding, top), viewportBottom - popupRect.height - padding);- this.style = `top: ${top}px; left: ${left}px;`;+ this.style += ` top: ${top}px; left: ${left}px;`;}}" @pointerdown.window="closeWhenPointerIsOutside($event)" @keydown.window.escape="close"@resize.window="open && position()" @scroll.window="open && position()"{{ $attributes->merge(['class' => 'relative inline-block align-middle']) }}>{{-- button (not div) so label-for associations do not steal the click on mobile --}}- <button type="button" x-ref="trigger"+ <button type="button" x-ref="trigger" data-icon-tooltip-ignore@class(['info-helper relative inline-flex shrink-0 items-center justify-center border-0 bg-transparent p-0 leading-none','size-3.5' => ! isset($trigger),diff --git a/resources/views/components/icon-tooltip.blade.php b/resources/views/components/icon-tooltip.blade.phpindex 7e3d21f371..f9dea68fbe 100644--- a/resources/views/components/icon-tooltip.blade.php+++ b/resources/views/components/icon-tooltip.blade.php@@ -6,6 +6,7 @@below: false,activeTarget: null,isIconAction(target) {+ if (target.matches('[data-icon-tooltip-ignore]')) return false;return target.matches('[data-tooltip], .icon-button') || target.querySelector('svg');},prepare(root) {diff --git a/tests/Feature/GlobalIconTooltipTest.php b/tests/Feature/GlobalIconTooltipTest.phpindex 7b7c167891..2319e81564 100644--- a/tests/Feature/GlobalIconTooltipTest.php+++ b/tests/Feature/GlobalIconTooltipTest.php@@ -8,6 +8,7 @@ it('uses the custom tooltip for icon actions across layouts', function () {->and($tooltip)->toContain("closest('button, a, [data-tooltip]')")->toContain("target.querySelector('svg')")+ ->toContain("target.matches('[data-icon-tooltip-ignore]')")->toContain("target.removeAttribute('title')")->toContain('role="tooltip"')->toContain('aria-label')diff --git a/tests/Feature/HelperInfoButtonTest.php b/tests/Feature/HelperInfoButtonTest.phpindex 4455c63f17..321e86acda 100644--- a/tests/Feature/HelperInfoButtonTest.php+++ b/tests/Feature/HelperInfoButtonTest.php@@ -10,6 +10,7 @@ test('helper trigger is a button that stops label activation', function () {->toContain('type="button"')->toContain('@click.prevent.stop')->toContain('aria-label="{{ $label }}"')+ ->toContain('data-icon-tooltip-ignore')->toContain('info-helper-popup')->toContain('name="info-circle"')->toContain('class="size-3.5 text-neutral-400')@@ -78,6 +79,18 @@ test('helper popup prefers a position below its trigger and falls back above', f->toContain('top = triggerRect.top - popupRect.height - padding;');});+test('helper popup stays within the visual viewport on mobile', function () {+ $helper = file_get_contents(resource_path('views/components/helper.blade.php'));++ expect($helper)+ ->toContain('window.visualViewport')+ ->toContain('viewport?.offsetLeft')+ ->toContain('viewport?.offsetTop')+ ->toContain('max-width: ${availableWidth}px;')+ ->toContain('max-height: ${availableHeight}px;')+ ->toContain('overflow-y: auto;');+});+test('helper popup supports focus dismissal and tooltip aria relationships', function () {$helper = file_get_contents(resource_path('views/components/helper.blade.php'));