Skip to content

fix: Replace old prototype-based "defaultProps" with JS default parameters #296

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 4 commits 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
7 changes: 7 additions & 0 deletions .prettierrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"printWidth": 120,
"trailingComma": "es5",
"tabWidth": 2,
"semi": false,
"singleQuote": true
}
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.

125 changes: 65 additions & 60 deletions src/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,78 +2,83 @@ 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 StoriesContext from './context/Stories'
import { getRenderer } from './util/renderers'
import { renderers as defaultRenderers } from './renderers/index';
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) });
const ReactInstaStories = ({
width = 360,
height = 640,
defaultInterval = 4000,
preloadCount = 1,
...props
}: ReactInstaStoriesProps) => {
const renderers: ReactInstaStoriesProps['renderers'] = props.renderers
? props.renderers.concat(defaultRenderers)
: defaultRenderers

const context: GlobalCtx = {
width: width,
height: 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: 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: preloadCount,
}

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);
}

let renderer = getRenderer(story, renderers);
story.originalContent = story.content;
story.content = renderer;
return story
})
};
if (typeof s === 'string') {
story.url = s
story.type = 'image'
} else if (typeof s === 'object') {
story = Object.assign(story, s)
}

ReactInstaStories.defaultProps = {
width: 360,
height: 640,
defaultInterval: 4000,
preloadCount: 1,
let renderer = getRenderer(story, renderers)
story.originalContent = story.content
story.content = renderer
return story
})
}

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

export default ReactInstaStories