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.

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

Pass index to slot of Vue Virtualizer #499

Closed
wants to merge 1 commit into from
Closed
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
13 changes: 5 additions & 8 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -202,23 +202,20 @@ export default async () => {
import { VList } from "virtua/vue";

const sizes = [20, 40, 180, 77];
const data = Array.from({ length: 1000 }).map((_, i) => ({
id: i,
size: sizes[i % 4] + "px",
}));
const data = Array.from({ length: 1000 }).map((_, i) => sizes[i % 4]!);
</script>

<template>
<VList :data="data" :style="{ height: '800px' }" #default="item">
<VList :data="data" :style="{ height: '800px' }" #default="item, index">
<div
:key="item.id"
:key="index"
:style="{
height: item.size,
height: item + 'px',
background: 'white',
borderBottom: 'solid 1px #ccc',
}"
>
{{ item.id }}
{{ index }}
</div>
</VList>
</template>
Expand Down
3 changes: 2 additions & 1 deletion src/vue/VList.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import {
ComponentOptionsWithObjectProps,
ComponentObjectPropsOptions,
ref,
VNode,
} from "vue";
import { Virtualizer, VirtualizerHandle } from "./Virtualizer";

Expand Down Expand Up @@ -140,5 +141,5 @@ export const VList = /*#__PURE__*/ defineComponent({
string,
{},
string,
SlotsType<{ default: any }>
SlotsType<{ default: (...args: [any, number]) => VNode[] }>
>);
4 changes: 2 additions & 2 deletions src/vue/Virtualizer.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -246,7 +246,7 @@
i <= j;
i++
) {
const e = slots.default(props.data![i]!)[0]! as VNode;
const e = slots.default(props.data![i]!, i)[0]!;

Check failure on line 249 in src/vue/Virtualizer.tsx

View workflow job for this annotation

GitHub Actions / check

vue/VList.ssr.spec.ts > SSR > should render items with renderToString and vertical

TypeError: _push is not a function ❯ eval ../node_modules/@vue/server-renderer/dist/server-renderer.cjs.js:591:35 ❯ Proxy.renderFnWithContext ../node_modules/@vue/runtime-core/dist/runtime-core.cjs.js:698:13 ❯ Proxy.<anonymous> vue/Virtualizer.tsx:249:25 ❯ renderComponentRoot ../node_modules/@vue/runtime-core/dist/runtime-core.cjs.js:6246:16 ❯ renderComponentSubTree ../node_modules/@vue/server-renderer/dist/server-renderer.cjs.js:715:28 ❯ renderComponentVNode ../node_modules/@vue/server-renderer/dist/server-renderer.cjs.js:642:12 ❯ renderVNode ../node_modules/@vue/server-renderer/dist/server-renderer.cjs.js:758:14 ❯ renderVNodeChildren ../node_modules/@vue/server-renderer/dist/server-renderer.cjs.js:774:5 ❯ renderElementVNode ../node_modules/@vue/server-renderer/dist/server-renderer.cjs.js:821:9 ❯ renderVNode ../node_modules/@vue/server-renderer/dist/server-renderer.cjs.js:756:9

Check failure on line 249 in src/vue/Virtualizer.tsx

View workflow job for this annotation

GitHub Actions / check

vue/VList.ssr.spec.ts > SSR > should render items with renderToString and horizontal

TypeError: _push is not a function ❯ eval ../node_modules/@vue/server-renderer/dist/server-renderer.cjs.js:591:35 ❯ Proxy.renderFnWithContext ../node_modules/@vue/runtime-core/dist/runtime-core.cjs.js:698:13 ❯ Proxy.<anonymous> vue/Virtualizer.tsx:249:25 ❯ renderComponentRoot ../node_modules/@vue/runtime-core/dist/runtime-core.cjs.js:6246:16 ❯ renderComponentSubTree ../node_modules/@vue/server-renderer/dist/server-renderer.cjs.js:715:28 ❯ renderComponentVNode ../node_modules/@vue/server-renderer/dist/server-renderer.cjs.js:642:12 ❯ renderVNode ../node_modules/@vue/server-renderer/dist/server-renderer.cjs.js:758:14 ❯ renderVNodeChildren ../node_modules/@vue/server-renderer/dist/server-renderer.cjs.js:774:5 ❯ renderElementVNode ../node_modules/@vue/server-renderer/dist/server-renderer.cjs.js:821:9 ❯ renderVNode ../node_modules/@vue/server-renderer/dist/server-renderer.cjs.js:756:9
items.push(
<ListItem
key={getKey(e, i)}
Expand Down Expand Up @@ -316,5 +316,5 @@
string,
{},
string,
SlotsType<{ default: any }>
SlotsType<{ default: (...args: [any, number]) => VNode[] }>
>);
6 changes: 3 additions & 3 deletions src/vue/WindowVirtualizer.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ export const WindowVirtualizer = /*#__PURE__*/ defineComponent({

return () => {
rerender.value;

const Element = props.as;
const ItemElement = props.item;
const count = props.data.length;
Expand All @@ -154,7 +154,7 @@ export const WindowVirtualizer = /*#__PURE__*/ defineComponent({
i <= j;
i++
) {
const e = slots.default(props.data![i]!)[0]! as VNode;
const e = slots.default(props.data![i]!, i)[0]!;
items.push(
<ListItem
key={getKey(e, i)}
Expand Down Expand Up @@ -218,5 +218,5 @@ export const WindowVirtualizer = /*#__PURE__*/ defineComponent({
string,
{},
string,
SlotsType<{ default: any }>
SlotsType<{ default: (...args: [any, number]) => VNode[] }>
>);
11 changes: 4 additions & 7 deletions stories/vue/Default.vue
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,13 @@
import { VList } from '../../src/vue'

const sizes = [20, 40, 180, 77];
const createItem = (i: number) => ({ index: i, size: sizes[i % 4] + 'px' })

const data = Array.from({ length: 1000 }).map((_, i) => createItem(i));

const data = Array.from({ length: 1000 }).map((_, i) => sizes[i % 4]!);
</script>

<template>
<VList :data="data" :style="{ height: '100vh' }" #default="item">
<div :key="item.index" :style="{ height: item.size, background: 'white', borderBottom: 'solid 1px #ccc' }">
{{ item.index }}
<VList :data="data" :style="{ height: '100vh' }" #default="item, index">
<div :key="index" :style="{ height: item + 'px', background: 'white', borderBottom: 'solid 1px #ccc' }">
{{ index }}
</div>
</VList>
</template>
Expand Down
Loading