Skip to content

Update: reactive resources in useIndexResourceState #428

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

Merged
merged 3 commits into from
Jan 8, 2025
Merged

Update: reactive resources in useIndexResourceState #428

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4e47494
Update: change type T[] -> Ref(T[]) for reactive resources
haild173094 Jan 7, 2025
2b62ea9
Update: rename variable
haild173094 Jan 7, 2025
42e451e
Update: rename variable
haild173094 Jan 7, 2025
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
24 changes: 14 additions & 10 deletions src/use/useIndexResourceState.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { ref } from 'vue';
import { Ref, computed, ref } from 'vue';
import { SelectionType, type Range } from '@/components/IndexProvider/types';

type ResourceIDResolver<T extends {[key: string]: unknown}> = (
Expand All @@ -16,7 +16,7 @@ function defaultResourceIDResolver(resource: {[key: string]: any}): string {
}

export function useIndexResourceState<T extends {[key: string]: unknown}>(
resources: T[],
resourceValue: Ref<T[]> | T[],
{
selectedResources: initSelectedResources = [],
allResourcesSelected: initAllResourcesSelected = false,
Expand All @@ -37,6 +37,10 @@ export function useIndexResourceState<T extends {[key: string]: unknown}>(
const tmpSelectedResources = ref(initSelectedResources);
const tmpAllResourcesSelected = ref(initAllResourcesSelected);

const resources = computed(() => {
return Array.isArray(resourceValue) ? resourceValue : resourceValue.value;
});

const handleSelectionChange = (
selectionType: SelectionType,
isSelecting: boolean,
Expand All @@ -59,12 +63,12 @@ export function useIndexResourceState<T extends {[key: string]: unknown}>(
case SelectionType.All:
case SelectionType.Page:
if (resourceFilter) {
const filteredResources = resources.filter(resourceFilter);
const filteredResources = resources.value.filter(resourceFilter);
tmpSelectedResources.value = isSelecting && tmpSelectedResources.value.length < filteredResources.length
? filteredResources.map(resourceIDResolver)
: [];
} else {
tmpSelectedResources.value = isSelecting ? resources.map(resourceIDResolver) : [];
tmpSelectedResources.value = isSelecting ? resources.value.map(resourceIDResolver) : [];
}

break;
Expand All @@ -74,15 +78,15 @@ export function useIndexResourceState<T extends {[key: string]: unknown}>(
tmpSelectedResources.value = (() => {
const ids: string[] = [];
const filteredResources = resourceFilter
? resources.filter(resourceFilter)
: resources;
? resources.value.filter(resourceFilter)
: resources.value;
for (
let i = selection[0] as number;
i <= (selection[1] as number);
i++
) {
if (filteredResources.includes(resources[i])) {
const id = resourceIDResolver(resources[i]);
if (filteredResources.includes(resources.value[i])) {
const id = resourceIDResolver(resources.value[i]);

if (
(isSelecting && !tmpSelectedResources.value.includes(id)) ||
Expand All @@ -104,8 +108,8 @@ export function useIndexResourceState<T extends {[key: string]: unknown}>(

tmpSelectedResources.value = (() => {
const filteredResources = resourceFilter
? resources.filter(resourceFilter)
: resources;
? resources.value.filter(resourceFilter)
: resources.value;

const resourceIds = filteredResources.map(resourceIDResolver);

Expand Down