Skip to content
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

Jump to bottom

feat(radio): radio with tailwind forms #46

Merged
merged 16 commits into from
Feb 1, 2021
Merged

feat(radio): radio with tailwind forms #46

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
6e12cd5
chore(radio): radio with tailwind forms
anuraghazra Jan 21, 2021
ee45d78
chore(radio): added disabled state styles
anuraghazra Jan 22, 2021
f023c43
chore: purge fix
anuraghazra Jan 22, 2021
cf06151
chore: added controllable state
anuraghazra Jan 22, 2021
dd3545b
Merge branch 'tailwind-forms' of https://github.com/timelessco/render…
anuraghazra Jan 22, 2021
ebdc926
chore: addComponent for radio styles
anuraghazra Jan 25, 2021
d7198f1
chore(radio): added RadioLabel
anuraghazra Jan 27, 2021
755b5d9
chore(radio): radio label improvements
anuraghazra Jan 27, 2021
ef37739
chore: remove css file
anuraghazra Jan 27, 2021
ad107d2
chore: changed spinner types to getThemeValue
anuraghazra Jan 27, 2021
90457da
chore: added Box in radio label
anuraghazra Jan 27, 2021
fefa605
feat(radio): added size prop
anuraghazra Jan 27, 2021
af8a92c
fix(radio): fix radio state context
anuraghazra Jan 27, 2021
8986b37
chore: radio types cleanup
anuraghazra Jan 27, 2021
8869b8f
feat(radio): added radio v2 (#49)
anuraghazra Feb 1, 2021
608cccc
chore: refactor & remove old code
anuraghazra Feb 1, 2021
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
Prev Previous commit
Next Next commit
fix(radio): fix radio state context
  • Loading branch information
@anuraghazra
anuraghazra committed Jan 27, 2021
commit af8a92cfa0c61679d64b253835ed4a008236e2f4
30 changes: 19 additions & 11 deletions src/radio/Radio.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,26 @@
import React from "react";
import { cx } from "@renderlesskit/react";
import {
Radio as ReakitRadio,
RadioProps as ReakitRadioProps,
RadioGroup as ReakitRadioGroup,
RadioGroupProps as ReakitRadioGroupProps,
useRadio,
} from "reakit";
import { BoxProps, Box } from "../box";
import { cx } from "@renderlesskit/react";

import { useTheme } from "../theme";
import { BoxProps, Box } from "../box";
import { createContext } from "../utils";
import { forwardRefWithAs } from "../utils/types";
import { useRadioState, RadioInitialState } from "./useRadioState";
import {
useRadioState,
RadioInitialState,
RadioStateReturn,
} from "./useRadioState";

const [RadioProvider, useRadioContext] = createContext({
const [RadioProvider, useRadioContext] = createContext<{
radioState: RadioStateReturn;
radioSize?: RadioLabelProps["size"];
}>({
name: "RadioContext",
strict: true,
errorMessage: "Radio must be used within RadioContextProvider",
Expand All @@ -25,14 +32,15 @@ export interface RadioLabelProps extends BoxProps {
*/
size?: keyof Renderlesskit.GetThemeValue<"radio", "size">;
}

export const RadioLabel = forwardRefWithAs<
RadioLabelProps,
HTMLLabelElement,
"label"
>(({ children, className, size = "sm", ...props }, ref) => {
>(({ children, className, size, ...props }, ref) => {
const theme = useTheme();
const radio = useRadio();
const _size = size || radio?.size || "md";
const { radioSize } = useRadioContext();
const _size = size || radioSize || "sm";

return (
<Box
Expand All @@ -51,13 +59,13 @@ export const Radio = forwardRefWithAs<
HTMLInputElement,
"input"
>(({ children, className, ...props }, ref) => {
const state = useRadioContext();
const { radioState } = useRadioContext();
const theme = useTheme();

return (
<ReakitRadio
className={theme.radio.input}
{...state}
{...radioState}
{...props}
ref={ref}
/>
Expand All @@ -75,7 +83,7 @@ export const RadioGroup = forwardRefWithAs<
const radio = useRadioState(props);

return (
<RadioProvider value={{ state: radio, size }}>
<RadioProvider value={{ radioState: radio, radioSize: size }}>
<ReakitRadioGroup {...radio} ref={ref}>
{children}
</ReakitRadioGroup>
Expand Down
4 changes: 2 additions & 2 deletions src/radio/useRadioState.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ export type RadioActions = CompositeActions & {
/**
* Sets `state`.
*/
setState: React.Dispatch<React.SetStateAction<string | number>>;
setState: React.Dispatch<React.SetStateAction<string | number | undefined>>;
};

export type RadioInitialState = CompositeInitialState &
Expand All @@ -40,7 +40,7 @@ export function useRadioState(
...props
} = initialState;

const [state, setState] = useControllableState({
const [state, setState] = useControllableState<string | number | undefined>({
value: initialValue,
defaultValue: defaultState,
onChange: onStateChange,
Expand Down