Skip to content

feat: strict types #36

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

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

feat: strict types #36

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
59 changes: 28 additions & 31 deletions src/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ interface BaseProps
readonly progressProps?: Progress.CirclePropTypes
}

interface NormalProps extends BaseProps, Pick<RenderContentParams, 'thinking'> {
interface NormalProps extends BaseProps, RenderContentParams {
readonly variant: 'normal'
readonly iconPause?: string
readonly iconPlay?: string
Expand Down Expand Up @@ -68,51 +68,47 @@ interface CompactProps extends BaseProps {
type NativeCircularStatusProps = NormalProps | CompactProps

const NativeCircularStatus = ({
// progress,
// iconPause = DEFAULTS.ICON_PAUSE,
// iconPlay,
// iconThinking,
// icon,
// paused,
// renderContent,
variant = 'normal',
animated = true,
strokeRound = true,
colorPrimary = DEFAULTS.COLOR_PRIMARY,
colorSecondary = DEFAULTS.COLOR_SECONDARY,
// onPause,
// onPlay,
// onStatusChanged,
thinking = false,
disabled,
// contentProps = {},
// iconProps = {},
progressProps = {},
...containerProps
}: NativeCircularStatusProps) => {
const [isLocalPaused, setIsLocalPaused] = useState(false)

useEffect(() => {
if (paused !== undefined) {
setIsLocalPaused(paused)
if ('paused' in containerProps) {
if (containerProps.paused !== undefined) {
setIsLocalPaused(containerProps.paused)
}
}
}, [paused])
}, [containerProps])

const handlePress = useCallback(() => {
setIsLocalPaused((prevState) => {
const updatedState = thinking ? prevState : !prevState

if (prevState) {
onPlay?.(thinking)
if ('onPlay' in containerProps) {
containerProps.onPlay?.(thinking)
}
} else {
onPause?.(thinking)
if ('onPause' in containerProps) {
containerProps.onPause?.(thinking)
}
}

onStatusChanged?.({ paused: updatedState, thinking })
if ('onStatusChanged' in containerProps) {
containerProps.onStatusChanged?.({ paused: updatedState, thinking })
}

return updatedState
})
}, [onPause, onPlay, onStatusChanged, thinking])
}, [containerProps, thinking])

const size = useMemo(() => {
switch (variant) {
Expand All @@ -126,12 +122,18 @@ const NativeCircularStatus = ({
}, [variant])

const { style: containerStyle = {}, ...containerRest } = containerProps
const { style: contentStyle = {}, ...contentRest } = contentProps
const { style: iconStyle = {}, ...iconRest } = iconProps
const { style: contentStyle = {}, ...contentRest } =
'contentProps' in containerProps ? containerProps.contentProps || {} : {}
const { style: iconStyle = {}, ...iconRest } =
'iconProps' in containerProps ? containerProps.iconProps || {} : {}

const innerComponent = useMemo(() => {
if (renderContent) {
return renderContent({ progress, paused: isLocalPaused, thinking })
if ('renderContent' in containerProps && containerProps.renderContent) {
return containerProps.renderContent({
progress: containerProps.progress,
paused: isLocalPaused,
thinking,
})
}

if (thinking && !iconThinking && !icon) {
Expand All @@ -157,17 +159,12 @@ const NativeCircularStatus = ({
/>
)
}, [
renderContent,
containerProps,
thinking,
iconThinking,
icon,
isLocalPaused,
iconPlay,
iconPause,
colorPrimary,
iconStyle,
iconRest,
progress,
])

const isNormal = useMemo(() => variant === 'normal', [variant])
Expand Down Expand Up @@ -212,7 +209,7 @@ const NativeCircularStatus = ({
borderColor={colorSecondary}
unfilledColor={isThinkingEnabled ? undefined : colorSecondary}
color={colorPrimary}
progress={progress}
progress={containerProps.progress}
size={size}
thickness={PROGRESS_WIDTH}
fill="#00000000" // TODO remove when https://github.com/oblador/react-native-progress/issues/234 is fixed
Expand Down