Skip to content

feat: ant-design的issue47812的补充 #58

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

feat: ant-design的issue47812的补充 #58

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
9 changes: 9 additions & 0 deletions docs/examples/basic.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,11 +220,20 @@
}
}

&-buttons {
display: flex;
}

&-prev-btn,&-next-btn,&-finish-btn{
display: inline-block;
margin-left: 8px;
}

&-prompt-btn {
display: inline-block;
min-width: 80px;
}

.ant-btn-primary {
color: #fff;
border: 1px solid #1890ff;
Expand Down
5 changes: 5 additions & 0 deletions src/Tour.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ const Tour: React.FC<TourProps> = props => {
open,
mask = true,
arrow = true,
prompt= false,
rootClassName,
placement,
renderPanel,
Expand Down Expand Up @@ -167,6 +168,10 @@ const Tour: React.FC<TourProps> = props => {
handleClose();
onFinish?.();
}}
onNoPrompt={() => {
handleClose();
onFinish?.();
}}
{...steps[mergedCurrent]}
closable={mergedClosable}
/>
Expand Down
24 changes: 17 additions & 7 deletions src/TourStep/DefaultPanel.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@ export default function DefaultPanel(props: DefaultPanelProps) {
onFinish,
className,
closable,
prompt = true,
onNoPrompt
} = props;
const ariaProps = pickAttrs(closable || {}, true);
const closeIcon = closable?.closeIcon ?? <span className={`${prefixCls}-close-x`}>&times;</span>;
Expand Down Expand Up @@ -47,16 +49,24 @@ export default function DefaultPanel(props: DefaultPanelProps) {
<div className={`${prefixCls}-sliders`}>
{total > 1
? [...Array.from({ length: total }).keys()].map((item, index) => {
return (
<span
key={item}
className={index === current ? 'active' : ''}
/>
);
})
return (
<span
key={item}
className={index === current ? 'active' : ''}
/>
);
})
: null}
</div>
<div className={`${prefixCls}-buttons`}>
{prompt && (
<button
className={`${prefixCls}-prompt-btn`}
onClick={onNoPrompt}
>
No Prompt
</button>
)}
{current !== 0 ? (
<button className={`${prefixCls}-prev-btn`} onClick={onPrev}>
Prev
Expand Down
2 changes: 2 additions & 0 deletions src/interface.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,13 @@ export interface TourStepProps extends TourStepInfo {
prefixCls?: string;
total?: number;
current?: number;
prompt?: boolean;
onClose?: () => void;
onFinish?: () => void;
renderPanel?: (step: TourStepProps, current: number) => ReactNode;
onPrev?: () => void;
onNext?: () => void;
onNoPrompt?: () => void;
}

export interface TourProps extends Pick<TriggerProps, 'onPopupAlign'> {
Expand Down
Loading