Skip to content

Commit b840638

Browse files
committed
fix: 🏷️ update prop types on Spinner suffix component
1 parent 72aaece commit b840638

File tree

3 files changed

+16
-14
lines changed

3 files changed

+16
-14
lines changed

src/components/button/ButtonSpinner.tsx

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@ export const ButtonSpinner: React.FC<ButtonSpinnerProps> = ({
4747
prefix,
4848
suffix,
4949
}) => {
50-
const tailwind = useTheme();
5150
const buttonTheme = useTheme("button");
5251

5352
const spinnerSize = (
@@ -56,6 +55,11 @@ export const ButtonSpinner: React.FC<ButtonSpinnerProps> = ({
5655
: spinnerSizes[size]?.iconOnly
5756
) as SpinnerSizes;
5857

58+
console.log(
59+
buttonTheme.themeColor[themeColor]?.[variant]?.spinner?.disabled,
60+
isValidElement(spinner),
61+
);
62+
5963
return isValidElement(spinner) ? (
6064
React.cloneElement(spinner, {
6165
// @ts-ignore
@@ -64,9 +68,7 @@ export const ButtonSpinner: React.FC<ButtonSpinnerProps> = ({
6468
) : (
6569
<Spinner
6670
size={spinnerSize}
67-
style={tailwind.style(
68-
cx(buttonTheme.themeColor[themeColor]?.[variant]?.spinner?.disabled),
69-
)}
71+
stroke={buttonTheme.themeColor[themeColor]?.[variant]?.spinner?.disabled}
7072
/>
7173
);
7274
};

src/components/input/Input.tsx

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import React, { forwardRef, ReactNode, useMemo, useRef, useState } from "react";
2-
import { Platform, TextInputProps, ViewStyle } from "react-native";
2+
import { Platform, TextInputProps } from "react-native";
33

44
import { Box, BoxProps, RNTextInput, TouchableProps } from "../../primitives";
55
import { useTheme } from "../../theme";
@@ -71,14 +71,14 @@ export interface InputProps extends TextInputProps {
7171
}
7272

7373
interface DefaultInputSpinnerProps extends Pick<InputProps, "size"> {
74-
spinnerStroke: ViewStyle;
74+
spinnerStroke: string;
7575
}
7676

7777
export const DefaultInputSpinner = (
7878
state: DefaultInputSpinnerProps,
7979
): JSX.Element => {
8080
const { size, spinnerStroke } = state;
81-
return <Spinner size={size !== "xl" ? "xs" : "md"} style={spinnerStroke} />;
81+
return <Spinner size={size !== "xl" ? "xs" : "md"} stroke={spinnerStroke} />;
8282
};
8383

8484
const RNInput: React.FC<Partial<InputProps>> = forwardRef<
@@ -212,13 +212,13 @@ const RNInput: React.FC<Partial<InputProps>> = forwardRef<
212212
})
213213
: suffix;
214214

215-
const spinnerStroke = tailwind.style(
215+
const spinnerStroke = tailwind.getColor(
216216
cx(
217217
editable
218218
? inputTheme.variant[variant]?.default?.suffix
219219
: inputTheme.variant[variant]?.disabled?.suffix,
220220
),
221-
);
221+
) as string;
222222
const inputLoading = runIfFn(DefaultInputSpinner, {
223223
size,
224224
spinnerStroke,

src/components/text-area/TextArea.tsx

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import React, { forwardRef, useMemo, useRef, useState } from "react";
2-
import { Platform, TextInputProps, ViewStyle } from "react-native";
2+
import { Platform, TextInputProps } from "react-native";
33

44
import { Box, BoxProps, RNTextInput, TouchableProps } from "../../primitives";
55
import { useTheme } from "../../theme";
@@ -76,14 +76,14 @@ export interface TextAreaProps extends TextInputProps {
7676
}
7777

7878
interface DefaultTextAreaSpinnerProps extends Pick<TextAreaProps, "size"> {
79-
spinnerStroke: ViewStyle;
79+
spinnerStroke: string;
8080
}
8181

8282
export const DefaultTextAreaSpinner = (
8383
state: DefaultTextAreaSpinnerProps,
8484
): JSX.Element => {
8585
const { size, spinnerStroke } = state;
86-
return <Spinner size={size !== "xl" ? "xs" : "md"} style={spinnerStroke} />;
86+
return <Spinner size={size !== "xl" ? "xs" : "md"} stroke={spinnerStroke} />;
8787
};
8888

8989
const RNTextArea: React.FC<Partial<TextAreaProps>> = forwardRef<
@@ -181,13 +181,13 @@ const RNTextArea: React.FC<Partial<TextAreaProps>> = forwardRef<
181181
})
182182
: suffix;
183183

184-
const spinnerStroke = tailwind.style(
184+
const spinnerStroke = tailwind.getColor(
185185
cx(
186186
editable
187187
? textAreaTheme.variant[variant]?.default?.suffix
188188
: textAreaTheme.variant[variant]?.disabled?.suffix,
189189
),
190-
);
190+
) as string;
191191
const inputLoading = runIfFn(DefaultTextAreaSpinner, {
192192
size,
193193
spinnerStroke,

0 commit comments

Comments
 (0)