ISSUE-020 - Transitions in place and working.

Also fixed an issue with eslinter that was reporting some incorrect unused var warnings. Removed some ignore rules with it being fixed.
This commit is contained in:
Kyle Geib committed 2022-01-17 13:26:38 -05:00
1 parent 9b3ae2dae2
commit 3fce5d05b9
4 files changed
+29 -19

No files matched your search

+2 -1
View File
@@ -50,7 +50,8 @@
"error", "error",
"always-multiline" "always-multiline"
], ],
"no-unused-vars": [ "no-unused-vars": "off",
"@typescript-eslint/no-unused-vars": [
"warn", "warn",
{ {
"varsIgnorePattern": "^_", "varsIgnorePattern": "^_",
@@ -1,14 +1,16 @@
import { useMemo, useState } from "react"; import { useEffect, useMemo, useState } from "react";
import { animated, useSpringRef, useTransition } from "@react-spring/web";
import { findPrefixCount } from "../../../../utils/strings"; import { findPrefixCount } from "../../../../utils/strings";
import { SlotText, SlotWindow } from "./styles"; import { SlotText, SlotWindow } from "./styles";
type SlotSelectorProps = { type SlotSelectorProps = {
items: Array<string>, items: Array<string>,
onChange: (value: string) => void, // eslint-disable-line no-unused-vars onChange: (value: string) => void,
removePrefix?: boolean, removePrefix?: boolean,
formatter?: (value: string) => string, // eslint-disable-line no-unused-vars formatter?: (value: string) => string,
initialIndex?: number, initialIndex?: number,
} };
export function SlotSelector({ export function SlotSelector({
items, items,
onChange, onChange,
@@ -20,17 +22,15 @@ export function SlotSelector({
const [prefixMask, setPrefixMask] = useState(0); const [prefixMask, setPrefixMask] = useState(0);
const [formattedItems, setFormattedItems] = useState<Array<string>>([]); const [formattedItems, setFormattedItems] = useState<Array<string>>([]);
// useMemo makes these functions only run once when mounting. Not ever re-render.
useMemo(() => { useMemo(() => {
const tempFormattedItems = items.map(item => formatter(item)); const tempFormattedItems = items.map(item => formatter(item));
setFormattedItems(tempFormattedItems); setFormattedItems(tempFormattedItems);
setPrefixMask(findPrefixCount(tempFormattedItems)); setPrefixMask(findPrefixCount(tempFormattedItems));
}, [items]); }, [items]);
const getNextIndex = (i: number) => (i + 1) % items.length;
const getPreviousIndex = (i: number) => i - 1 >= 0 ? i - 1 : items.length - 1;
const onClick = () => { const onClick = () => {
const nextIndex = getNextIndex(index); const nextIndex = (index + 1) % items.length;
setIndex(nextIndex); setIndex(nextIndex);
onChange(items[nextIndex]); onChange(items[nextIndex]);
}; };
@@ -42,15 +42,24 @@ export function SlotSelector({
formattedItems[i].slice(prefixMask) : formattedItems[i].slice(prefixMask) :
formattedItems[i]; formattedItems[i];
const currentItem = getItem(index); const transRef = useSpringRef();
const nextItem = getItem(getNextIndex(index)); const transitions = useTransition(index, {
ref: transRef,
keys: null,
from: { opacity: 0, transform: "translate3d(0, 100%, 0" },
enter: { opacity: 1, transform: "translate3d(0, 0%, 0" },
leave: { opacity: 0, transform: "translate3d(0, -100%, 0" },
});
useEffect(() => {
transRef.start();
}, [index]);
return ( return (
<SlotWindow <SlotWindow onClick={onClick}>
onClick={onClick} {transitions((style, i) => (
> <SlotText as={animated.span} style={style}>{getItem(i)}</SlotText>
<SlotText>{currentItem}</SlotText> ))}
<SlotText>{nextItem}</SlotText>
</SlotWindow> </SlotWindow>
); );
} }
@@ -3,7 +3,7 @@ import styled from "styled-components";
export const SlotWindow = styled.div` export const SlotWindow = styled.div`
position: relative; position: relative;
height: 1.7em; height: 1.7em;
width: 200px; width: auto;
border-radius: 0.6em; border-radius: 0.6em;
background-color: white; background-color: white;
@@ -18,9 +18,9 @@ export const SlotWindow = styled.div`
`; `;
export const SlotText = styled.span` export const SlotText = styled.span`
position: absolute;
display: block; display: block;
margin-left: .4em; margin-left: .4em;
position: relative;
font-family: ${p => p.theme.fonts.f1Regular}; font-family: ${p => p.theme.fonts.f1Regular};
color: ${p => p.theme.colors.darkGrey}; color: ${p => p.theme.colors.darkGrey};
user-select: none; user-select: none;
@@ -12,7 +12,7 @@ import {
export type ToggleProps = { export type ToggleProps = {
label: string, label: string,
toggled: boolean, toggled: boolean,
onToggle: (value: boolean) => void, // eslint-disable-line no-unused-vars onToggle: (value: boolean) => void,
showIndicators?: boolean, showIndicators?: boolean,
}; };
/** /**