Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

feat(component): improve pagination #208

Merged
merged 3 commits into from
Feb 25, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
126 changes: 119 additions & 7 deletions apps/website/src/routes/docs/daisy/pagination/index.tsx
Original file line number Diff line number Diff line change
@@ -1,20 +1,132 @@
import { $, component$, useStore } from '@builder.io/qwik';
import { component$, useSignal, useStore } from '@builder.io/qwik';
import { Pagination } from '@qwik-ui/theme-daisy';

export default component$(() => {
const store = useStore({ page: 665 });
const store = useStore({ page: 9 });
const showFirstButton = useSignal(false);
const showLastButton = useSignal(false);
const hideNextButton = useSignal(false);
const hidePrevButton = useSignal(false);
const pages = useSignal(10);
const siblingCount = useSignal(1);
const boundaryCount = useSignal(1);

return (
<div class="flex flex-col mt-4">
<div class="flex flex-col gap-6 mt-4">
<h2>This is the documentation for the Pagination</h2>

<div
class="flex flex-col gap-2 items-stretch"
style={{
width: '250px',
}}
>
<label class="flex items-center justify-between gap-10">
showFirstButton
<input
type="checkbox"
checked={showFirstButton.value}
onChange$={(e) => {
showFirstButton.value = e.target.checked;
}}
/>
</label>

<label class="flex items-center justify-between gap-10">
showLastButton
<input
type="checkbox"
checked={showLastButton.value}
onChange$={(e) => {
showLastButton.value = e.target.checked;
}}
/>
</label>

<label class="flex items-center justify-between gap-10">
hideNextButton
<input
type="checkbox"
checked={hideNextButton.value}
onChange$={(e) => {
hideNextButton.value = e.target.checked;
}}
/>
</label>

<label class="flex items-center justify-between gap-10">
hidePrevButton
<input
type="checkbox"
checked={hidePrevButton.value}
onChange$={(e) => {
hidePrevButton.value = e.target.checked;
}}
/>
</label>

<label class="flex items-center justify-between gap-10">
pages
<input
type="number"
style={{
width: '50px',
background: 'transparent',
textAlign: 'right',
}}
value={pages.value}
onChange$={(e) => {
pages.value = Number(e.target.value);
}}
/>
</label>

<label class="flex items-center justify-between gap-10">
siblingCount
<input
type="number"
style={{
width: '50px',
background: 'transparent',
textAlign: 'right',
}}
value={siblingCount.value}
onChange$={(e) => {
siblingCount.value = Number(e.target.value);
}}
/>
</label>

<label class="flex items-center justify-between gap-10">
boundaryCount
<input
type="number"
style={{
width: '50px',
background: 'transparent',
textAlign: 'right',
}}
value={boundaryCount.value}
onChange$={(e) => {
boundaryCount.value = Number(e.target.value);
}}
/>
</label>
</div>

<div class="flex flex-col gap-8">
<h2>Basic Example:</h2>
<Pagination
pages={1500}
pages={pages.value}
page={store.page}
onPaging$={$((newValue: number) => {
onPaging$={(newValue: number) => {
store.page = newValue;
})}
}}
showFirstButton={showFirstButton.value}
showLastButton={showLastButton.value}
hideNextButton={hideNextButton.value}
hidePrevButton={hidePrevButton.value}
siblingCount={siblingCount.value}
boundaryCount={boundaryCount.value}
/>
</div>
</div>
Expand Down
36 changes: 20 additions & 16 deletions packages/daisy/src/components/pagination/pagination.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,11 @@ import { component$, PropFunction } from '@builder.io/qwik';
import {
IRenderPaginationItemProps,
Pagination as HeadlessPagination,
IPaginationProps,
} from '@qwik-ui/headless';
import { Button } from '../button/button';

export interface PaginationProps {
export interface PaginationProps extends Omit<IPaginationProps, 'RenderItem'> {
pages: number;
page: number;
onPaging$: PropFunction<(index: number) => void>;
Expand Down Expand Up @@ -46,18 +47,21 @@ export const RenderPaginationItem = component$(
}
);

export const Pagination = component$((props: PaginationProps) => {
return (
<div class="flex gap-2 items-center">
<HeadlessPagination
page={props.page}
pages={props.pages}
onPaging$={props.onPaging$}
RenderItem={RenderPaginationItem}
RenderDivider={component$(() => {
return <span class="mb-2">...</span>;
})}
/>
</div>
);
});
export const Pagination = component$(
({ page, pages, onPaging$, ...rest }: PaginationProps) => {
return (
<div class="flex gap-2 items-center">
<HeadlessPagination
{...rest}
page={page}
pages={pages}
onPaging$={onPaging$}
RenderItem={RenderPaginationItem}
RenderDivider={component$(() => {
return <span class="mb-2">...</span>;
})}
/>
</div>
);
}
);
Loading