Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions .changeset/fix-external-modals-compatibility.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
'@tonconnect/ui': patch
---

fix: improve compatibility with modal from external libraries

5 changes: 4 additions & 1 deletion packages/ui/src/app/components/modal/index.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import cn from 'classnames';
import { Component, createEffect, JSXElement, Show } from 'solid-js';
import { Component, createEffect, JSXElement, onCleanup, Show } from 'solid-js';
import { Transition } from 'solid-transition-group';
import clickOutsideDirective from 'src/app/directives/click-outside';
import keyPressedDirective from 'src/app/directives/key-pressed';
Expand All @@ -17,6 +17,7 @@ import {
} from './style';
import { css, useTheme } from 'solid-styled-components';
import { disableScroll, enableScroll } from 'src/app/utils/web-api';
import { enableModalInteraction } from 'src/app/utils/fix-external-modals';
import { WithDataAttributes } from 'src/app/models/with-data-attributes';
import { useDataAttributes } from 'src/app/hooks/use-data-attributes';
import { TonConnectBrand } from 'src/app/components';
Expand Down Expand Up @@ -45,6 +46,8 @@ export const Modal: Component<ModalProps> = props => {
createEffect(() => {
if (props.opened) {
disableScroll();
const cleanupExternalModals = enableModalInteraction();
onCleanup(cleanupExternalModals);
} else {
enableScroll();
}
Expand Down
33 changes: 33 additions & 0 deletions packages/ui/src/app/utils/fix-external-modals.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
/**
* Fixes compatibility issues with external modal libraries that block pointer events
* on elements outside their content.
*/
export function enableModalInteraction(widgetRootId: string = 'tc-widget-root'): () => void {
const widgetRoot = document.getElementById(widgetRootId);
if (!widgetRoot) {
return () => {};
}

const originalPointerEvents = widgetRoot.style.pointerEvents;
widgetRoot.style.pointerEvents = 'auto';

const preventDismiss = (event: Event): void => {
const target = event.target as Node;
if (widgetRoot.contains(target)) {
event.stopPropagation();
event.stopImmediatePropagation();
}
};

const eventTypes = ['pointerdown', 'mousedown', 'touchstart'];
eventTypes.forEach(eventType => {
document.addEventListener(eventType, preventDismiss, { capture: true });
});

return () => {
widgetRoot.style.pointerEvents = originalPointerEvents;
eventTypes.forEach(eventType => {
document.removeEventListener(eventType, preventDismiss, { capture: true });
});
};
}