Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

bug: disable iframes within shadowdom during dnd #791

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

bug: disable iframes within shadowdom during dnd #791

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
32 changes: 27 additions & 5 deletions packages/dockview-core/src/dom.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,8 +112,11 @@ export function isAncestor(
return false;
}

export function getElementsByTagName(tag: string): HTMLElement[] {
return Array.prototype.slice.call(document.getElementsByTagName(tag), 0);
export function getElementsByTagName(
tag: string,
document: ParentNode
): HTMLElement[] {
return Array.prototype.slice.call(document.querySelectorAll(tag), 0);
}

export interface IFocusTracker extends IDisposable {
Expand Down Expand Up @@ -288,10 +291,29 @@ export function addTestId(element: HTMLElement, id: string): void {
element.setAttribute('data-testid', id);
}

export function disableIframePointEvents() {
export function disableIframePointEvents(rootNode: ParentNode = document) {
const includeShadowDom = true;

const shadowRoots = [];

if (includeShadowDom) {
const items = rootNode.querySelectorAll('*');

for (let i = 0; i < items.length; i++) {
const item = items[i];
if (item.shadowRoot) {
shadowRoots.push(item.shadowRoot);
}
}
}

const iframes: HTMLElement[] = [
...getElementsByTagName('iframe'),
...getElementsByTagName('webview'),
...getElementsByTagName('iframe', rootNode),
...getElementsByTagName('webview', rootNode),
...shadowRoots.flatMap((root) => [
...getElementsByTagName('iframe', root),
...getElementsByTagName('webview', root),
]),
];

const original = new WeakMap<HTMLElement, string>(); // don't hold onto HTMLElement references longer than required
Expand Down
45 changes: 44 additions & 1 deletion packages/docs/sandboxes/react/dockview/demo-dockview/src/app.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import {
DockviewApi,
} from 'dockview';
import * as React from 'react';
import * as ReactDOM from 'react-dom/client';
import './app.scss';
import { defaultConfig } from './defaultLayout';
import { GridActions } from './gridActions';
Expand All @@ -30,6 +31,20 @@ const Option = (props: {
);
};

const ShadowIframe = (props: IDockviewPanelProps) => {
return (
<iframe
onMouseDown={() => {
if (!props.api.isActive) {
props.api.setActive();
}
}}
style={{ border: 'none', width: '100%', height: '100%' }}
src="https://dockview.dev"
/>
);
};

const components = {
default: (props: IDockviewPanelProps) => {
const isDebug = React.useContext(DebugContext);
Expand Down Expand Up @@ -105,13 +120,41 @@ const components = {
}
}}
style={{
border: 'none',
width: '100%',
height: '100%',
}}
src="https://dockview.dev"
/>
);
},
shadowDom: (props: IDockviewPanelProps) => {
const ref = React.useRef<HTMLDivElement>(null);

React.useEffect(() => {
if (!ref.current) {
return;
}

const shadow = ref.current.attachShadow({
mode: 'open',
});

const shadowRoot = document.createElement('div');
shadowRoot.style.height = '100%';
shadow.appendChild(shadowRoot);

const root = ReactDOM.createRoot(shadowRoot);

root.render(<ShadowIframe {...props} />);

return () => {
root.unmount();
};
}, []);

return <div style={{ height: '100%' }} ref={ref}></div>;
},
};

const headerComponents = {
Expand Down Expand Up @@ -208,7 +251,7 @@ const DockviewDemo = (props: { theme?: string }) => {

event.api.onDidMaximizedGroupChange((event) => {
addLogLine(
`Group Maximized Changed ${event.view.id} [${event.isMaximized}]`
`Group Maximized Changed ${event.group.id} [${event.isMaximized}]`
);
});

Expand Down
23 changes: 21 additions & 2 deletions packages/docs/sandboxes/react/dockview/demo-dockview/src/gridActions.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,15 +132,18 @@ export const GridActions = (props: {

const popover = usePopover();

const onAddPanel = (options?: { advanced: boolean }) => {
const onAddPanel = (options?: {
advanced: boolean;
component?: string;
}) => {
if (options?.advanced) {
popover.open(({ close }) => {
return <PanelBuilder api={props.api!} done={close} />;
});
} else {
props.api?.addPanel({
id: `id_${Date.now().toString()}`,
component: 'default',
component: options?.component ?? 'default',
title: `Tab ${nextId()}`,
renderer: 'always',
});
Expand Down Expand Up @@ -170,6 +173,22 @@ export const GridActions = (props: {
<span className="material-symbols-outlined">tune</span>
</button>
</div>
<div className="button-group">
<button
className="text-button"
onClick={() =>
onAddPanel({ component: 'shadowDom', advanced: false })
}
>
Add Panel 2
</button>
<button
className="demo-icon-button"
onClick={() => onAddPanel({ advanced: true })}
>
<span className="material-symbols-outlined">tune</span>
</button>
</div>
<button className="text-button" onClick={onAddGroup}>
Add Group
</button>
Expand Down
4 changes: 2 additions & 2 deletions packages/docs/sandboxes/react/dockview/demo-dockview/src/panelActions.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,9 +75,9 @@ const PanelAction = (props: {
const panel = props.api.getPanel(props.panelId);
if (panel) {
props.api.addFloatingGroup(panel, {
width: 400,
height: 300,
position: {
width: 400,
height: 300,
bottom: 50,
right: 50,
},
Expand Down
Loading