diff --git a/native/components/color-rows.react.js b/native/components/color-rows.react.js --- a/native/components/color-rows.react.js +++ b/native/components/color-rows.react.js @@ -11,11 +11,10 @@ type Props = { +pendingColor: string, +setPendingColor: SetState, - +outerRingSelectedColor?: string, }; function ColorRows(props: Props): React.Node { - const { pendingColor, setPendingColor, outerRingSelectedColor } = props; + const { pendingColor, setPendingColor } = props; const colorSelectorButtons = React.useMemo( () => @@ -25,10 +24,9 @@ color={color} pendingColor={pendingColor} setPendingColor={setPendingColor} - outerRingSelectedColor={outerRingSelectedColor} /> )), - [outerRingSelectedColor, pendingColor, setPendingColor], + [pendingColor, setPendingColor], ); const firstRow = React.useMemo( diff --git a/native/components/color-selector-button.react.js b/native/components/color-selector-button.react.js --- a/native/components/color-selector-button.react.js +++ b/native/components/color-selector-button.react.js @@ -12,34 +12,22 @@ +color: string, +pendingColor: string, +setPendingColor: SetState, - +outerRingSelectedColor?: string, }; function ColorSelectorButton(props: ColorSelectorButtonProps): React.Node { - const { color, pendingColor, setPendingColor, outerRingSelectedColor } = - props; + const { color, pendingColor, setPendingColor } = props; const styles = useStyles(unboundStyles); const colorSplotchStyle = React.useMemo(() => { return [styles.button, { backgroundColor: `#${color}` }]; }, [color, styles.button]); - const outerRingSelectedStyle = React.useMemo(() => { - const result = [styles.outerRingSelected]; - if (outerRingSelectedColor) { - result.push({ backgroundColor: `#${outerRingSelectedColor}` }); - } - - return result; - }, [outerRingSelectedColor, styles.outerRingSelected]); - const onPendingColorSelected = React.useCallback(() => { setPendingColor(color); }, [setPendingColor, color]); const isSelected = tinycolor.equals(pendingColor, color); - return ( - +