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

fix: allow custom props in StoryblokComponent, Story, and ServerComponent types #1296

Merged
merged 1 commit into from
Dec 17, 2024
Merged

fix: allow custom props in StoryblokComponent, Story, and ServerComponent types #1296

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
2 changes: 1 addition & 1 deletion src/__tests__/testing-components/TestUseStoryblok.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ const TestUseStoryblok = ({
return <div>Loading...</div>;
}

return <StoryblokComponent blok={story.content} />;
return <StoryblokComponent blok={story.content} custom="custom" />;
};

export default TestUseStoryblok;
4 changes: 2 additions & 2 deletions src/common/storyblok-component.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@ import {
} from './index';
import type { SbBlokData } from '@/types';

interface StoryblokComponentProps {
interface StoryblokComponentProps extends Omit<Record<string, unknown>, 'blok'> {
blok: SbBlokData;
}

const StoryblokComponent = forwardRef<HTMLElement, StoryblokComponentProps>(
({ blok, ...restProps }, ref) => {
({ blok, ...restProps }: StoryblokComponentProps, ref) => {
if (!blok) {
console.error(
'Please provide a \'blok\' property to the StoryblokComponent',
Expand Down
4 changes: 2 additions & 2 deletions src/rsc/server-component.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@ import {
} from './index';
import type { SbBlokData } from '@/types';

interface SbServerComponentProps {
interface SbServerComponentProps extends Omit<Record<string, unknown>, 'blok'> {
blok: SbBlokData;
}

const StoryblokServerComponent = forwardRef<HTMLElement, SbServerComponentProps>(
({ blok, ...restProps }, ref) => {
({ blok, ...restProps }: SbServerComponentProps, ref) => {
if (!blok) {
console.error(
'Please provide a \'blok\' property to the StoryblokComponent',
Expand Down
4 changes: 2 additions & 2 deletions src/rsc/story.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@ import type { ISbStoryData, StoryblokBridgeConfigV2 } from '@/types';
import { StoryblokServerComponent } from './common';
import StoryblokLiveEditing from './live-editing';

interface StoryblokStoryProps {
interface StoryblokStoryProps extends Omit<Record<string, unknown>, 'story' | 'bridgeOptions'> {
story: ISbStoryData;
bridgeOptions?: StoryblokBridgeConfigV2;
}

const StoryblokStory = forwardRef<HTMLElement, StoryblokStoryProps>(
({ story, bridgeOptions, ...restProps }, ref) => {
({ story, bridgeOptions, ...restProps }: StoryblokStoryProps, ref) => {
if (!story) {
console.error(
'Please provide a \'story\' property to the StoryblokServerComponent',
Expand Down