Skip to content

fix: ref passing to UIResourceRenderer #32

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

Merged
liady merged 1 commit into from
Jul 15, 2025
Merged

fix: ref passing to UIResourceRenderer #32

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
18 changes: 15 additions & 3 deletions packages/client/src/components/UIResourceRenderer.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,10 @@ function getContentType(resource: Partial<Resource>): ResourceContentType | unde
}
}

export const UIResourceRenderer: React.FC<UIResourceRendererProps> = (props) => {
export const UIResourceRenderer = React.forwardRef<
HTMLIFrameElement | null,
UIResourceRendererProps
>((props, ref) => {
const { resource, onUIAction, supportedContentTypes, htmlProps, remoteDomProps } = props;
const contentType = getContentType(resource);

Expand All @@ -40,7 +43,14 @@ export const UIResourceRenderer: React.FC<UIResourceRendererProps> = (props) =>
switch (contentType) {
case 'rawHtml':
case 'externalUrl':
return <HTMLResourceRenderer resource={resource} onUIAction={onUIAction} {...htmlProps} />;
return (
<HTMLResourceRenderer
resource={resource}
onUIAction={onUIAction}
{...htmlProps}
ref={ref}
/>
);
case 'remoteDom':
return (
<RemoteDOMResourceRenderer
Expand All @@ -53,4 +63,6 @@ export const UIResourceRenderer: React.FC<UIResourceRendererProps> = (props) =>
default:
return <p className="text-red-500">Unsupported resource type.</p>;
}
};
});

UIResourceRenderer.displayName = 'UIResourceRenderer';
7 changes: 7 additions & 0 deletions packages/client/src/components/__tests__/HTMLResourceRenderer.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import { HTMLResourceRenderer, HTMLResourceRendererProps } from '../HTMLResource
import { vi } from 'vitest';
import type { Resource } from '@modelcontextprotocol/sdk/types.js';
import { UIActionResult } from '../../types.js';
import React from 'react';

describe('HTMLResource component', () => {
const mockOnUIAction = vi.fn();
Expand Down Expand Up @@ -288,6 +289,12 @@ describe('HTMLResource iframe communication', () => {
});
});

it('should pass ref to iframe', () => {
const ref = React.createRef<HTMLIFrameElement>();
render(<HTMLResourceRenderer resource={mockResourceBaseForUIActionTests} ref={ref} />);
expect(ref.current).toBeInTheDocument();
});

it('should not attempt to call onUIAction if iframeRef.current is null (e.g. resource error)', async () => {
// Render with a resource that will cause an error and prevent iframe rendering
const localMockOnUIAction = vi.fn<[UIActionResult], Promise<unknown>>();
Expand Down
18 changes: 18 additions & 0 deletions packages/client/src/components/__tests__/UIResourceRenderer.unmocked.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
import { render } from '@testing-library/react';
import '@testing-library/jest-dom';
import React from 'react';
import { Resource } from '@modelcontextprotocol/sdk/types.js';
import { UIResourceRenderer } from '../UIResourceRenderer';

describe('UIResourceRenderer', () => {
const testResource: Partial<Resource> = {
mimeType: 'text/html',
text: '<html><body><h1>Test Content</h1><script>console.log("iframe script loaded for onUIAction tests")</script></body></html>',
uri: 'ui://test-resource',
};
it('should pass ref to HTMLResourceRenderer', () => {
const ref = React.createRef<HTMLIFrameElement>();
render(<UIResourceRenderer resource={testResource} ref={ref} />);
expect(ref.current).toBeInTheDocument();
});
});