@nativescript-community/ui-collectionview 5.2.0 → 5.3.0

package/vue3/component.d.ts

@@ -33,4 +33,4 @@ export declare const CollectionView: import("nativescript-vue").DefineComponent<
 }>>, {
     itemIdGenerator: string;
     alias: string;
-}>;
+}, {}>;

package/vue3/component.js

@@ -1,7 +1,8 @@
 import { CollectionView as NSCollectionView } from '..';
 import { Observable, ObservableArray } from '@nativescript/core';
-import { computed, defineComponent, getCurrentInstance, h, ref, toRaw, warn, watch } from 'nativescript-vue';
+import { ELEMENT_REF, NSVElement, NSVRoot, computed, defineComponent, getCurrentInstance, h, ref, render, toRaw, warn, watch } from 'nativescript-vue';
 const LIST_CELL_ID = Symbol('list_cell_id');
+const LIST_CELL_CONTAINER = Symbol('list_cell_container');
 function getItemCtx(item, index, itemAlias, indexAlias) {
     return {
         [itemAlias]: item,
@@ -51,24 +52,30 @@ export const CollectionView = defineComponent({
             const itemCtx = getItemCtx(event.bindingContext, index, props.alias, props.itemIdGenerator);
             // const itemCtx: ListItem = getItemCtx(props.items instanceof ObservableArray ? props.items.getItem(index) : props.items[index], index, props.alias, props.itemIdGenerator);
             // update the cell data with the current row
+            const slotName = getSlotName(itemCtx, index, event.object.items);
             cells.value[id] = {
                 itemCtx,
-                slotName: getSlotName(itemCtx, index, event.object.items)
+                slotName
             };
             // trigger an update!
-            vm?.update();
+            // vm?.update();
             // find the vnode rendering this cell
-            const vnode = (vm?.subTree.children).find((vnode) => vnode.key === id);
-            const cellEl = toRaw(vnode?.el?.nativeView);
-            cellEl[LIST_CELL_ID] = id;
+            const container = event.view?.[LIST_CELL_CONTAINER] ?? new NSVRoot();
+            const vnode = ctx.slots[slotName]?.(itemCtx)[0];
             if (event.view) {
                 event.view._batchUpdate(() => {
-                    event.view = cellEl;
+                    // todo: handle the case where the slot is not found
+                    render(vnode, container);
                 });
             }
             else {
-                event.view = cellEl;
+                // todo: handle the case where the slot is not found
+                render(vnode, container);
             }
+            const cellEl = toRaw(vnode?.el?.nativeView);
+            cellEl[LIST_CELL_ID] = id;
+            cellEl[LIST_CELL_CONTAINER] = container;
+            event.view = cellEl;
         }
         // render all realized templates as children
         const cellVNODES = () => Object.entries(cells.value).map(([id, entry]) => {
@@ -91,7 +98,7 @@ export const CollectionView = defineComponent({
             items: props.items,
             itemTemplates,
             onItemLoading
-        }, cellVNODES());
+        });
     }
 });
 //# sourceMappingURL=component.js.map

package/vue3/component.js.map

@@ -1 +1 @@
-{"version":3,"file":"component.js","sourceRoot":"../src/","sources":["vue3/component.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"component.js","sourceRoot":"../src/","sources":["vue3/component.ts"],"names":[],"mappings":"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"}

package/angular/collectionview-comp.d.ts

@@ -1,82 +0,0 @@
-import { AfterContentInit, ComponentRef, DoCheck, ElementRef, EmbeddedViewRef, EventEmitter, IterableDiffers, NgZone, OnDestroy, TemplateRef, ViewContainerRef } from '@angular/core';
-import { CollectionViewItemEventData } from '@nativescript-community/ui-collectionview';
-import { DetachedLoader, NativeScriptRendererFactory } from '@nativescript/angular';
-import { View } from '@nativescript/core';
-import * as i0 from "@angular/core";
-export declare class ItemContext {
-    $implicit?: any;
-    item?: any;
-    index?: number;
-    even?: boolean;
-    odd?: boolean;
-    constructor($implicit?: any, item?: any, index?: number, even?: boolean, odd?: boolean);
-}
-export interface SetupItemViewArgs {
-    view: EmbeddedViewRef<any>;
-    data: any;
-    index: number;
-    context: ItemContext;
-}
-export declare class CollectionViewComponent implements DoCheck, OnDestroy, AfterContentInit {
-    private _elementRef;
-    private _iterableDiffers;
-    private _renderer;
-    private _ngZone;
-    get nativeElement(): any;
-    get listView(): any;
-    loader: ViewContainerRef;
-    setupItemView: EventEmitter<SetupItemViewArgs>;
-    itemTemplateQuery: TemplateRef<ItemContext>;
-    autoReuseViews: boolean;
-    detachedLoaderFactory(): ComponentRef<DetachedLoader>;
-    get itemTemplate(): any;
-    set itemTemplate(value: any);
-    get items(): any;
-    set items(value: any);
-    private _collectionView;
-    private _items;
-    private _differ;
-    private _itemTemplate;
-    private _templateMap;
-    private _loaders;
-    constructor(_elementRef: ElementRef, _iterableDiffers: IterableDiffers, _renderer: NativeScriptRendererFactory, _ngZone: NgZone);
-    private itemViewLoader;
-    ngAfterContentInit(): void;
-    ngOnDestroy(): void;
-    ngDoCheck(): void;
-    registerTemplate(key: string, template: TemplateRef<ItemContext>): void;
-    onItemLoading(args: CollectionViewItemEventData): void;
-    onItemRecyclingInternal(args: any): void;
-    onItemDisposingInternal(args: any): void;
-    setupViewRef(view: EmbeddedViewRef<ItemContext>, data: any, index: number): void;
-    protected getItemTemplateViewFactory(template: TemplateRef<ItemContext>): () => View;
-    viewPool: Map<TemplateRef<ItemContext>, {
-        scrapSize: number;
-        scrapHead: Set<EmbeddedViewRef<ItemContext>>;
-    }>;
-    private storeViewRef;
-    viewToTemplate: WeakMap<EmbeddedViewRef<any>, TemplateRef<any>>;
-    viewToLoader: WeakMap<EmbeddedViewRef<any>, ComponentRef<DetachedLoader>>;
-    private getOrCreate;
-    private getView;
-    private getViewPool;
-    private setItemTemplates;
-    private detectChangesOnChild;
-    private refresh;
-    static ɵfac: i0.ɵɵFactoryDeclaration<CollectionViewComponent, never>;
-    static ɵcmp: i0.ɵɵComponentDeclaration<CollectionViewComponent, "CollectionView", never, { "autoReuseViews": "autoReuseViews"; "itemTemplate": "itemTemplate"; "items": "items"; }, { "setupItemView": "setupItemView"; }, ["itemTemplateQuery"], never, false, never>;
-}
-export interface ComponentView {
-    rootNodes: any[];
-    destroy(): void;
-}
-export declare type RootLocator = (nodes: any[], nestLevel: number) => View;
-export declare function getItemViewRoot(viewRef: ComponentView, rootLocator?: RootLocator): View;
-export declare class TemplateKeyDirective {
-    private templateRef;
-    private collectionView;
-    constructor(templateRef: TemplateRef<any>, collectionView: CollectionViewComponent);
-    set cvTemplateKey(value: any);
-    static ɵfac: i0.ɵɵFactoryDeclaration<TemplateKeyDirective, [null, { host: true; }]>;
-    static ɵdir: i0.ɵɵDirectiveDeclaration<TemplateKeyDirective, "[cvTemplateKey]", never, { "cvTemplateKey": "cvTemplateKey"; }, {}, never, never, false, never>;
-}

package/angular/index.d.ts

@@ -1,8 +0,0 @@
-import * as i0 from "@angular/core";
-import * as i1 from "./collectionview-comp";
-export { CollectionViewComponent, TemplateKeyDirective } from './collectionview-comp';
-export declare class CollectionViewModule {
-    static ɵfac: i0.ɵɵFactoryDeclaration<CollectionViewModule, never>;
-    static ɵmod: i0.ɵɵNgModuleDeclaration<CollectionViewModule, [typeof i1.CollectionViewComponent, typeof i1.TemplateKeyDirective], never, [typeof i1.CollectionViewComponent, typeof i1.TemplateKeyDirective]>;
-    static ɵinj: i0.ɵɵInjectorDeclaration<CollectionViewModule>;
-}