Skip to content

fix: ReactInstaStories: Support for defaultProps will be removed #293 #307

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.

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
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
4 changes: 2 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

128 changes: 62 additions & 66 deletions src/index.tsx
Original file line number Diff line number Diff line change
@@ -1,79 +1,75 @@
import React, { useEffect, useState } from 'react'
import { ReactInstaStoriesProps, GlobalCtx, Story, Tester, Renderer } from './interfaces'
import Container from './components/Container'
import GlobalContext from './context/Global'
import StoriesContext from './context/Stories';
import { getRenderer } from './util/renderers'
import { renderers as defaultRenderers } from './renderers/index';
import withHeader from './renderers/wrappers/withHeader'
import withSeeMore from './renderers/wrappers/withSeeMore'
import React, { useEffect, useState } from "react";
import { ReactInstaStoriesProps, GlobalCtx, Story, Tester, Renderer } from "./interfaces";
import Container from "./components/Container";
import GlobalContext from "./context/Global";
import StoriesContext from "./context/Stories";
import { getRenderer } from "./util/renderers";
import { renderers as defaultRenderers } from "./renderers/index";
import withHeader from "./renderers/wrappers/withHeader";
import withSeeMore from "./renderers/wrappers/withSeeMore";

const ReactInstaStories = function (props: ReactInstaStoriesProps) {
let renderers = props.renderers ? props.renderers.concat(defaultRenderers) : defaultRenderers;
let context: GlobalCtx = {
width: props.width,
height: props.height,
loader: props.loader,
header: props.header,
storyContainerStyles: props.storyContainerStyles,
storyInnerContainerStyles: props.storyInnerContainerStyles,
storyStyles: props.storyStyles,
progressContainerStyles: props.progressContainerStyles,
progressWrapperStyles: props.progressWrapperStyles,
progressStyles: props.progressStyles,
loop: props.loop,
defaultInterval: props.defaultInterval,
isPaused: props.isPaused,
currentIndex: props.currentIndex,
onStoryStart: props.onStoryStart,
onStoryEnd: props.onStoryEnd,
onAllStoriesEnd: props.onAllStoriesEnd,
onNext: props.onNext,
onPrevious: props.onPrevious,
keyboardNavigation: props.keyboardNavigation,
preventDefault: props.preventDefault,
preloadCount: props.preloadCount,
}
const [stories, setStories] = useState<{ stories: Story[] }>({ stories: generateStories(props.stories, renderers) });

let renderers = props.renderers ? props.renderers.concat(defaultRenderers) : defaultRenderers;
let context: GlobalCtx = {
width: props.width || 360,
height: props.height || 640,
defaultInterval: props.defaultInterval || 4000,
loader: props.loader,
header: props.header,
storyContainerStyles: props.storyContainerStyles,
storyInnerContainerStyles: props.storyInnerContainerStyles,
storyStyles: props.storyStyles,
progressContainerStyles: props.progressContainerStyles,
progressWrapperStyles: props.progressWrapperStyles,
progressStyles: props.progressStyles,
loop: props.loop,
isPaused: props.isPaused,
currentIndex: props.currentIndex,
onStoryStart: props.onStoryStart,
onStoryEnd: props.onStoryEnd,
onAllStoriesEnd: props.onAllStoriesEnd,
onNext: props.onNext,
onPrevious: props.onPrevious,
keyboardNavigation: props.keyboardNavigation,
preventDefault: props.preventDefault,
preloadCount: props.preloadCount || 1
};
const [stories, setStories] = useState<{ stories: Story[] }>({
stories: generateStories(props.stories, renderers)
});

useEffect(() => {
setStories({ stories: generateStories(props.stories, renderers) });
}, [props.stories, props.renderers]);
useEffect(() => {
setStories({ stories: generateStories(props.stories, renderers) });
}, [props.stories, props.renderers]);

return <GlobalContext.Provider value={context}>
<StoriesContext.Provider value={stories}>
<Container />
</StoriesContext.Provider>
return (
<GlobalContext.Provider value={context}>
<StoriesContext.Provider value={stories}>
<Container />
</StoriesContext.Provider>
</GlobalContext.Provider>
}
);
};

const generateStories = (stories: Story[], renderers: { renderer: Renderer, tester: Tester }[]) => {
return stories.map(s => {
let story: Story = {};
const generateStories = (stories: Story[], renderers: { renderer: Renderer; tester: Tester }[]) => {
return stories.map((s) => {
let story: Story = {};

if (typeof s === 'string') {
story.url = s;
story.type = 'image';
} else if (typeof s === 'object') {
story = Object.assign(story, s);
}
if (typeof s === "string") {
story.url = s;
story.type = "image";
} else if (typeof s === "object") {
story = Object.assign(story, s);
}

let renderer = getRenderer(story, renderers);
story.originalContent = story.content;
story.content = renderer;
return story
})
let renderer = getRenderer(story, renderers);
story.originalContent = story.content;
story.content = renderer;
return story;
});
};

ReactInstaStories.defaultProps = {
width: 360,
height: 640,
defaultInterval: 4000,
preloadCount: 1,
}

export const WithHeader = withHeader;
export const WithSeeMore = withSeeMore;

export default ReactInstaStories
export default ReactInstaStories;