@nativescript-community/ui-material-bottomsheet 7.1.4 → 7.2.1

package/bottomsheet-common.d.ts

@@ -1,4 +1,4 @@
-import { EventData, View, ViewBase } from '@nativescript/core';
+import { EventData, View } from '@nativescript/core';
 export interface ShownBottomSheetData extends EventData {
     /**
      * The context (optional, may be undefined) passed to the view when shown modally.
@@ -17,12 +17,12 @@ export declare enum StateBottomSheet {
     EXPANDED = 1,
     DRAGGING = 2
 }
-export declare type onChangeStateBottomSheet = (stateBottomSheet: StateBottomSheet, slideOffset?: number) => void;
+export type onChangeStateBottomSheet = (stateBottomSheet: StateBottomSheet, slideOffset?: number) => void;
 export declare const shownInBottomSheetEvent = "shownInBottomSheet";
 export declare const showingInBottomSheetEvent = "showingInBottomSheet";
 export declare const closedSheetEvent = "closedBottomSheet";
 export interface BottomSheetOptions {
-    view: string | ViewBase;
+    view: string | View;
     context?: any;
     animated?: boolean;
     dismissOnBackgroundTap?: boolean;
@@ -54,5 +54,5 @@ export declare abstract class ViewWithBottomSheetBase extends View {
     protected _raiseShowingBottomSheetEvent(): void;
     _raiseClosedBottomSheetEvent(): void;
     closeBottomSheet(...args: any[]): void;
-    showBottomSheet(options: BottomSheetOptions): ViewBase;
+    showBottomSheet(options: BottomSheetOptions): View;
 }

package/bottomsheet.ios.js

@@ -15,7 +15,7 @@ var MDCBottomSheetControllerDelegateImpl = /** @class */ (function (_super) {
     };
     MDCBottomSheetControllerDelegateImpl.prototype.bottomSheetControllerDidChangeYOffsetYOffset = function (controller, yOffset) {
         var owner = this._owner.get();
-        if (owner && owner._onChangeStateBottomSheetCallback) {
+        if (owner === null || owner === void 0 ? void 0 : owner._onChangeStateBottomSheetCallback) {
             var presentationController = controller.presentationController;
             var heightScreen = Screen.mainScreen.heightDIPs;
             var heightCollapsedSheet = presentationController.preferredSheetHeight || controller.preferredContentSize.height;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@nativescript-community/ui-material-bottomsheet",
-    "version": "7.1.4",
+    "version": "7.2.1",
     "description": "Material Design Bottom Sheets slide up from the bottom of the screen to reveal more content. Bottom sheets integrate with the app to display supporting content or present deep-linked content from other apps.",
     "main": "./bottomsheet",
     "sideEffects": false,
@@ -46,7 +46,7 @@
     },
     "readmeFilename": "README.md",
     "dependencies": {
-        "@nativescript-community/ui-material-core": "^7.1.4"
+        "@nativescript-community/ui-material-core": "^7.2.1"
     },
-    "gitHead": "8052d595674b39c5d2369b44c29823ad09eb8a83"
+    "gitHead": "75b7a4ee372bce6dacaa260d05a106179dfa2713"
 }

package/svelte/index.d.ts

@@ -1,19 +1,24 @@
-/// <reference types="svelte-native" />
 import { BottomSheetOptions } from '../bottomsheet';
 import { View } from '@nativescript/core';
 import { NativeViewElementNode } from 'svelte-native/dom';
 import { PageSpec } from 'svelte-native/dom/navigation';
-export interface ShowBottomSheetOptions extends Omit<BottomSheetOptions, 'view'> {
-    view: PageSpec;
-    parent: NativeViewElementNode<View> | View;
-    props?: any;
+declare module '@nativescript/core/ui/core/view' {
+    interface View {
+        closeBottomSheet(...args: any): void;
+        showBottomSheet(options: BottomSheetOptions): View;
+    }
+}
+export interface SvelteShowBottomSheetOptions<U> extends Omit<BottomSheetOptions, 'view'> {
+    view: PageSpec<U>;
+    parent?: NativeViewElementNode<View> | View;
+    props?: U;
 }
 interface ComponentInstanceInfo {
     element: NativeViewElementNode<View>;
     viewInstance: SvelteComponent;
 }
-export declare function resolveComponentElement(viewSpec: PageSpec, props?: any): ComponentInstanceInfo;
-export declare function showBottomSheet<T>(modalOptions: ShowBottomSheetOptions): Promise<T>;
+export declare function resolveComponentElement<T>(viewSpec: typeof SvelteComponent<T>, props?: any): ComponentInstanceInfo;
+export declare function showBottomSheet<T, U = any>(modalOptions: SvelteShowBottomSheetOptions<U>): Promise<T>;
 export declare function closeBottomSheet(result?: any): void;
 export declare function isBottomSheetOpened(): boolean;
 export {};

package/svelte/index.js

@@ -1,8 +1,8 @@
-import { Frame, View, ViewBase } from '@nativescript/core';
+import { Frame, View } from '@nativescript/core';
 import { NativeViewElementNode, createElement } from 'svelte-native/dom';
 const modalStack = [];
 export function resolveComponentElement(viewSpec, props) {
-    const dummy = createElement('fragment');
+    const dummy = createElement('fragment', window.document);
     const viewInstance = new viewSpec({ target: dummy, props });
     const element = dummy.firstElement();
     return { element, viewInstance };
@@ -12,18 +12,16 @@ export function showBottomSheet(modalOptions) {
     // Get this before any potential new frames are created by component below
     const modalLauncher = (parent && (parent instanceof View ? parent : parent.nativeView)) || Frame.topmost().currentPage;
     const componentInstanceInfo = resolveComponentElement(view, props);
-    const modalView = componentInstanceInfo.element.nativeView;
+    let modalView = componentInstanceInfo.element.nativeView;
     return new Promise(async (resolve, reject) => {
         let resolved = false;
         const closeCallback = (result) => {
             if (resolved)
                 return;
-            const index = modalStack.indexOf(componentInstanceInfo);
-            if (index !== -1) {
-                modalStack.splice(index, 1);
-            }
+            modalStack.pop();
             resolved = true;
             resolve(result);
+            modalView._tearDownUI();
             componentInstanceInfo.viewInstance.$destroy(); // don't let an exception in destroy kill the promise callback
         };
         try {

package/svelte/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"../src/","sources":["svelte/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAC3D,OAAO,EAAE,qBAAqB,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAazE,MAAM,UAAU,GAA4B,EAAE,CAAC;AAE/C,MAAM,UAAU,uBAAuB,CAAC,QAAkB,EAAE,KAAW;IACnE,MAAM,KAAK,GAAG,aAAa,CAAC,UAAU,CAAC,CAAC;IACxC,MAAM,YAAY,GAAG,IAAI,QAAQ,CAAC,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC,CAAC;IAC5D,MAAM,OAAO,GAAG,KAAK,CAAC,YAAY,EAAiC,CAAC;IACpE,OAAO,EAAE,OAAO,EAAE,YAAY,EAAE,CAAC;AACrC,CAAC;AAED,MAAM,UAAU,eAAe,CAAI,YAAoC;IACnE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,GAAG,EAAE,EAAE,GAAG,OAAO,EAAE,GAAG,YAAY,CAAC;IAC9D,0EAA0E;IAC1E,MAAM,aAAa,GAAG,CAAC,MAAM,IAAI,CAAC,MAAM,YAAY,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,IAAI,KAAK,CAAC,OAAO,EAAE,CAAC,WAAW,CAAC;IAEvH,MAAM,qBAAqB,GAAG,uBAAuB,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;IACnE,MAAM,SAAS,GAAa,qBAAqB,CAAC,OAAO,CAAC,UAAU,CAAC;IAErE,OAAO,IAAI,OAAO,CAAC,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE;QACzC,IAAI,QAAQ,GAAG,KAAK,CAAC;QACrB,MAAM,aAAa,GAAG,CAAC,MAAS,EAAE,EAAE;YAChC,IAAI,QAAQ;gBAAE,OAAO;YACrB,MAAM,KAAK,GAAG,UAAU,CAAC,OAAO,CAAC,qBAAqB,CAAC,CAAC;YACxD,IAAI,KAAK,KAAK,CAAC,CAAC,EAAE;gBACd,UAAU,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;aAC/B;YACD,QAAQ,GAAG,IAAI,CAAC;YAChB,OAAO,CAAC,MAAM,CAAC,CAAC;YAChB,qBAAqB,CAAC,YAAY,CAAC,QAAQ,EAAE,CAAC,CAAC,8DAA8D;QACjH,CAAC,CAAC;QACF,IAAI;YACA,aAAa,CAAC,eAAe,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE,GAAG,OAAO,EAAE,OAAO,EAAE,EAAE,EAAE,aAAa,EAAE,CAAC,CAAC;YAC3F,UAAU,CAAC,IAAI,CAAC,qBAAqB,CAAC,CAAC;SAC1C;QAAC,OAAO,GAAG,EAAE;YACV,MAAM,CAAC,GAAG,CAAC,CAAC;SACf;IACL,CAAC,CAAC,CAAC;AACP,CAAC;AAED,MAAM,UAAU,gBAAgB,CAAC,MAAY;IACzC,MAAM,qBAAqB,GAAG,UAAU,CAAC,UAAU,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;IAChE,IAAI,qBAAqB,EAAE;QACtB,qBAAqB,CAAC,OAAO,CAAC,UAAkB,CAAC,gBAAgB,CAAC,MAAM,CAAC,CAAC;KAC9E;AACL,CAAC;AACD,MAAM,UAAU,mBAAmB;IAC/B,OAAO,UAAU,CAAC,MAAM,GAAG,CAAC,CAAC;AACjC,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"../src/","sources":["svelte/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,oBAAoB,CAAC;AACjD,OAAO,EAAE,qBAAqB,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAoBzE,MAAM,UAAU,GAA4B,EAAE,CAAC;AAE/C,MAAM,UAAU,uBAAuB,CAAI,QAAmC,EAAE,KAAW;IACvF,MAAM,KAAK,GAAG,aAAa,CAAC,UAAU,EAAE,MAAM,CAAC,QAAe,CAAC,CAAC;IAChE,MAAM,YAAY,GAAG,IAAI,QAAQ,CAAC,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC,CAAC;IAC5D,MAAM,OAAO,GAAG,KAAK,CAAC,YAAY,EAAiC,CAAC;IACpE,OAAO,EAAE,OAAO,EAAE,YAAY,EAAE,CAAC;AACrC,CAAC;AAED,MAAM,UAAU,eAAe,CAAa,YAA6C;IACrF,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,GAAG,EAAE,EAAE,GAAG,OAAO,EAAE,GAAG,YAAY,CAAC;IAC9D,0EAA0E;IAC1E,MAAM,aAAa,GAAS,CAAC,MAAM,IAAI,CAAC,MAAM,YAAY,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,IAAI,KAAK,CAAC,OAAO,EAAE,CAAC,WAAW,CAAC;IAE7H,MAAM,qBAAqB,GAAG,uBAAuB,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;IACnE,IAAI,SAAS,GAAS,qBAAqB,CAAC,OAAO,CAAC,UAAU,CAAC;IAE/D,OAAO,IAAI,OAAO,CAAC,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE;QACzC,IAAI,QAAQ,GAAG,KAAK,CAAC;QACrB,MAAM,aAAa,GAAG,CAAC,MAAS,EAAE,EAAE;YAChC,IAAI,QAAQ;gBAAE,OAAO;YACrB,UAAU,CAAC,GAAG,EAAE,CAAC;YACjB,QAAQ,GAAG,IAAI,CAAC;YAChB,OAAO,CAAC,MAAM,CAAC,CAAC;YAChB,SAAS,CAAC,WAAW,EAAE,CAAC;YACxB,qBAAqB,CAAC,YAAY,CAAC,QAAQ,EAAE,CAAC,CAAC,8DAA8D;QACjH,CAAC,CAAC;QACF,IAAI;YACA,aAAa,CAAC,eAAe,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE,GAAG,OAAO,EAAE,OAAO,EAAE,EAAE,EAAE,aAAa,EAAE,CAAC,CAAC;YAC3F,UAAU,CAAC,IAAI,CAAC,qBAAqB,CAAC,CAAC;SAC1C;QAAC,OAAO,GAAG,EAAE;YACV,MAAM,CAAC,GAAG,CAAC,CAAC;SACf;IACL,CAAC,CAAC,CAAC;AACP,CAAC;AAED,MAAM,UAAU,gBAAgB,CAAC,MAAY;IACzC,MAAM,qBAAqB,GAAG,UAAU,CAAC,UAAU,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;IAChE,IAAI,qBAAqB,EAAE;QACtB,qBAAqB,CAAC,OAAO,CAAC,UAAkB,CAAC,gBAAgB,CAAC,MAAM,CAAC,CAAC;KAC9E;AACL,CAAC;AACD,MAAM,UAAU,mBAAmB;IAC/B,OAAO,UAAU,CAAC,MAAM,GAAG,CAAC,CAAC;AACjC,CAAC"}

package/vue3/index.d.ts

@@ -1,4 +1,4 @@
-import { ViewBase } from '@nativescript/core';
+import { View } from '@nativescript/core';
 import { BottomSheetOptions } from '../bottomsheet';
 declare module '@vue/runtime-core' {
     interface ComponentCustomProperties {
@@ -14,7 +14,7 @@ declare const BottomSheetPlugin: {
     install(app: any): void;
 };
 interface VueBottomSheetOptions extends Partial<BottomSheetOptions> {
-    view?: string | ViewBase;
+    view?: string | View;
     props?: any;
     on?: Record<string, (...args: any[]) => any>;
 }

package/angular/bottomsheet.module.d.ts

@@ -1,10 +0,0 @@
-import { ModuleWithProviders } from '@angular/core';
-import * as i0 from "@angular/core";
-export declare class NativeScriptMaterialBottomSheetModule {
-    private static initialized;
-    static forRoot(): ModuleWithProviders<NativeScriptMaterialBottomSheetModule>;
-    constructor();
-    static ɵfac: i0.ɵɵFactoryDeclaration<NativeScriptMaterialBottomSheetModule, never>;
-    static ɵmod: i0.ɵɵNgModuleDeclaration<NativeScriptMaterialBottomSheetModule, never, never, never>;
-    static ɵinj: i0.ɵɵInjectorDeclaration<NativeScriptMaterialBottomSheetModule>;
-}

package/angular/bottomsheet.service.d.ts

@@ -1,28 +0,0 @@
-import { Type, ViewContainerRef } from '@angular/core';
-import type { BottomSheetOptions as MaterialBottomSheetOptions } from '@nativescript-community/ui-material-bottomsheet';
-import { Observable } from 'rxjs';
-import * as i0 from "@angular/core";
-export declare type BaseShowBottomSheetOptions = Omit<MaterialBottomSheetOptions, 'closeCallback' | 'view'>;
-export interface BottomSheetOptions extends BaseShowBottomSheetOptions {
-    viewContainerRef?: ViewContainerRef;
-}
-export declare class BottomSheetParams {
-    readonly context: any;
-    readonly closeCallback: (...args: any[]) => void;
-    constructor(context: any, closeCallback: (...args: any[]) => void);
-}
-export declare class BottomSheetService {
-    show<TResult = any>(type: Type<any>, options: BottomSheetOptions): Observable<TResult>;
-    showWithCloseCallback<TResult = any>(type: Type<any>, options: BottomSheetOptions): {
-        observable: Observable<TResult>;
-        closeCallback: () => void;
-    };
-    private getParentView;
-    private getFactoryResolver;
-    private createChildInjector;
-    private getBottomSheetParams;
-    private createDetachedLoader;
-    private loadComponent;
-    static ɵfac: i0.ɵɵFactoryDeclaration<BottomSheetService, never>;
-    static ɵprov: i0.ɵɵInjectableDeclaration<BottomSheetService>;
-}

package/angular/index.d.ts

@@ -1,2 +0,0 @@
-export * from './bottomsheet.module';
-export * from './bottomsheet.service';