diff --git a/resources/scripts/components/elements/ProgressBar.tsx b/resources/scripts/components/elements/ProgressBar.tsx index e3314f449..0282ee469 100644 --- a/resources/scripts/components/elements/ProgressBar.tsx +++ b/resources/scripts/components/elements/ProgressBar.tsx @@ -12,8 +12,8 @@ const BarFill = styled.div` `; export default () => { - const interval = useRef(null); - const timeout = useRef(null); + const interval = useRef(); + const timeout = useRef(); const [ visible, setVisible ] = useState(false); const progress = useStoreState(state => state.progress.progress); const continuous = useStoreState(state => state.progress.continuous); @@ -30,7 +30,6 @@ export default () => { setVisible((progress || 0) > 0); if (progress === 100) { - // @ts-ignore timeout.current = setTimeout(() => setProgress(undefined), 500); } }, [ progress ]); @@ -49,17 +48,17 @@ export default () => { useEffect(() => { if (continuous) { interval.current && clearInterval(interval.current); - if ((progress || 0) >= 90) { + const p = progress || 0; + if (p >= 90) { setProgress(90); } else { - // @ts-ignore - interval.current = setTimeout(() => setProgress(progress + randomInt(1, 5)), 500); + interval.current = setTimeout(() => setProgress(p + randomInt(1, 5)), 500); } } }, [ progress, continuous ]); return ( -
+
= { + // eslint-disable-next-line @typescript-eslint/no-unused-vars + clearIndicator: (base: CSSObject, props: IndicatorProps): CSSObject => { + return { + ...base, + color: props.isFocused ? theme`colors.neutral.300` : theme`colors.neutral.400`, + + ':hover': { + color: theme`colors.neutral.100`, + }, + }; + }, + // eslint-disable-next-line @typescript-eslint/no-unused-vars container: (base: CSSObject, props: ContainerProps): CSSObject => { return { @@ -30,6 +46,56 @@ export const SelectStyle: StylesConfig = { borderColor: theme`colors.neutral.500`, borderWidth: '2px', color: theme`colors.neutral.200`, + cursor: 'pointer', + // boxShadow: props.isFocused ? '0 0 0 2px #2684ff' : undefined, + + ':hover': { + borderColor: !props.isFocused ? theme`colors.neutral.400` : theme`colors.neutral.500`, + }, + }; + }, + + // eslint-disable-next-line @typescript-eslint/no-unused-vars + dropdownIndicator: (base: CSSObject, props: IndicatorProps): CSSObject => { + return { + ...base, + color: props.isFocused ? theme`colors.neutral.300` : theme`colors.neutral.400`, + // TODO: find better alternative for `isFocused` so this only triggers when the dropdown is visible. + transform: props.isFocused ? 'rotate(180deg)' : undefined, + + ':hover': { + color: theme`colors.neutral.300`, + }, + }; + }, + + // eslint-disable-next-line @typescript-eslint/no-unused-vars + group: (base: CSSObject, props: GroupProps): CSSObject => { + return { + ...base, + }; + }, + + // eslint-disable-next-line @typescript-eslint/no-unused-vars + groupHeading: (base: CSSObject, props: GroupHeadingProps): CSSObject => { + return { + ...base, + }; + }, + + // eslint-disable-next-line @typescript-eslint/no-unused-vars + indicatorsContainer: (base: CSSObject, props: IndicatorContainerProps): CSSObject => { + return { + ...base, + }; + }, + + // eslint-disable-next-line @typescript-eslint/no-unused-vars + indicatorSeparator: (base: CSSObject, props: IndicatorProps): CSSObject => { + return { + ...base, + // width: '0', + backgroundColor: theme`colors.neutral.500`, }; }, @@ -42,6 +108,20 @@ export const SelectStyle: StylesConfig = { }; }, + // eslint-disable-next-line @typescript-eslint/no-unused-vars + loadingIndicator: (base: CSSObject, props: LoadingIndicatorProps): CSSObject => { + return { + ...base, + }; + }, + + // eslint-disable-next-line @typescript-eslint/no-unused-vars + loadingMessage: (base: CSSObject, props: NoticeProps): CSSObject => { + return { + ...base, + }; + }, + // eslint-disable-next-line @typescript-eslint/no-unused-vars menu: (base: CSSObject, props: MenuProps): CSSObject => { return { @@ -51,6 +131,20 @@ export const SelectStyle: StylesConfig = { }; }, + // eslint-disable-next-line @typescript-eslint/no-unused-vars + menuList: (base: CSSObject, props: MenuListComponentProps): CSSObject => { + return { + ...base, + }; + }, + + // eslint-disable-next-line @typescript-eslint/no-unused-vars + menuPortal: (base: CSSObject, props: MenuPortalProps): CSSObject => { + return { + ...base, + }; + }, + // eslint-disable-next-line @typescript-eslint/no-unused-vars multiValue: (base: CSSObject, props: MultiValueProps): CSSObject => { return { @@ -68,11 +162,26 @@ export const SelectStyle: StylesConfig = { }; }, + // eslint-disable-next-line @typescript-eslint/no-unused-vars + multiValueRemove: (base: CSSObject, props: MultiValueRemoveProps): CSSObject => { + return { + ...base, + }; + }, + + // eslint-disable-next-line @typescript-eslint/no-unused-vars + noOptionsMessage: (base: CSSObject, props: NoticeProps): CSSObject => { + return { + ...base, + }; + }, + // eslint-disable-next-line @typescript-eslint/no-unused-vars option: (base: CSSObject, props: OptionProps): CSSObject => { return { ...base, background: theme`colors.neutral.900`, + ':hover': { background: theme`colors.neutral.700`, cursor: 'pointer',