Skip to content

The first one is not selected by default in controlled mode #176

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

The first one is not selected by default in controlled mode #176

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
15 changes: 13 additions & 2 deletions docs/demo/controlled.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,11 @@ import type { SegmentedValue } from 'rc-segmented';

export default class Demo extends React.Component<
unknown,
{ value: SegmentedValue }
{ value: SegmentedValue; value2?: SegmentedValue }
> {
state = {
value: 'Web3',
value2: undefined,
};

render() {
Expand All @@ -23,7 +24,7 @@ export default class Demo extends React.Component<
})
}
/>
&nbsp;&nbsp;
&nbsp;
<Segmented
options={['iOS', 'Android', 'Web3']}
value={this.state.value}
Expand All @@ -33,6 +34,16 @@ export default class Demo extends React.Component<
})
}
/>
&nbsp;
<Segmented
options={['iOS', 'Android', 'Web3']}
value={this.state.value2}
onChange={(value2) =>
this.setState({
value2,
})
}
/>
</React.StrictMode>
);
}
Expand Down
21 changes: 13 additions & 8 deletions src/MotionThumb.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ type ThumbReact = {

export interface MotionThumbInterface {
containerRef: React.RefObject<HTMLDivElement>;
value: SegmentedValue;
value?: SegmentedValue;
getValueIndex: (value: SegmentedValue) => number;
prefixCls: string;
motionName: string;
Expand Down Expand Up @@ -55,7 +55,8 @@ export default function MotionThumb(props: MotionThumbInterface) {
const [prevValue, setPrevValue] = React.useState(value);

// =========================== Effect ===========================
const findValueElement = (val: SegmentedValue) => {
const findValueElement = (val?: SegmentedValue) => {
if (!val) return null;
const index = getValueIndex(val);

const ele = containerRef.current?.querySelectorAll<HTMLDivElement>(
Expand Down Expand Up @@ -90,16 +91,20 @@ export default function MotionThumb(props: MotionThumbInterface) {

const thumbStart = React.useMemo(
() =>
direction === 'rtl'
? toPX(-(prevStyle?.right as number))
: toPX(prevStyle?.left as number),
prevStyle
? direction === 'rtl'
? toPX(-(prevStyle?.right as number))
: toPX(prevStyle?.left as number)
: 'auto',
[direction, prevStyle],
);
const thumbActive = React.useMemo(
() =>
direction === 'rtl'
? toPX(-(nextStyle?.right as number))
: toPX(nextStyle?.left as number),
nextStyle
? direction === 'rtl'
? toPX(-(nextStyle?.right as number))
: toPX(nextStyle?.left as number)
: 'auto',
[direction, nextStyle],
);

Expand Down
11 changes: 7 additions & 4 deletions src/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,10 +142,13 @@ const Segmented = React.forwardRef<HTMLDivElement, SegmentedProps>(

// Note: We should not auto switch value when value not exist in options
// which may break single source of truth.
const [rawValue, setRawValue] = useMergedState(segmentedOptions[0]?.value, {
value,
defaultValue,
});
const [rawValue, setRawValue] = useMergedState(
props.hasOwnProperty('value') ? value : segmentedOptions[0]?.value,
{
value,
defaultValue,
},
);

// ======================= Change ========================
const [thumbShow, setThumbShow] = React.useState(false);
Expand Down