fix: fixed tsc errors

Author: farfromrefug

src/bottomsheet/bottomsheet-common.ts

@@ -28,7 +28,7 @@ export const showingInBottomSheetEvent = 'showingInBottomSheet';
 export const closedSheetEvent = 'closedBottomSheet';
 
 export interface BottomSheetOptions {
-    view: string | ViewBase; // View instance to be shown in bottom sheet. Or the name of the module to load starting from the application root.
+    view: string | View; // View instance to be shown in bottom sheet. Or the name of the module to load starting from the application root.
     context?: any; // Any context you want to pass to the view shown in bottom sheet. This same context will be available in the arguments of the shownInBottomSheet event handler.
     animated?: boolean; // An optional parameter specifying whether to show the sheet view with animation.
     dismissOnBackgroundTap?: boolean; // An optional parameter specifying whether to dismiss the sheet when clicking on background.
@@ -173,7 +173,7 @@ export abstract class ViewWithBottomSheetBase extends View {
         }
     }
 
-    public showBottomSheet(options: BottomSheetOptions): ViewBase {
+    public showBottomSheet(options: BottomSheetOptions): View {
         if (arguments.length === 0) {
             throw new Error('showModal without parameters is deprecated. Please call showModal on a view instance instead.');
         } else {

src/bottomsheet/bottomsheet.ios.ts

@@ -24,7 +24,7 @@ class MDCBottomSheetControllerDelegateImpl extends NSObject {
     }
     bottomSheetControllerDidChangeYOffsetYOffset(controller: MDCBottomSheetController, yOffset: number) {
         const owner = this._owner.get();
-        if (owner && owner._onChangeStateBottomSheetCallback) {
+        if (owner?._onChangeStateBottomSheetCallback) {
             const presentationController = controller.presentationController as MDCBottomSheetPresentationController;
             const heightScreen = Screen.mainScreen.heightDIPs;
             const heightCollapsedSheet = presentationController.preferredSheetHeight || controller.preferredContentSize.height;

src/bottomsheet/svelte/index.ts

@@ -1,12 +1,19 @@
 import { BottomSheetOptions } from '../bottomsheet';
-import { Frame, View, ViewBase } from '@nativescript/core';
+import { Frame, View } from '@nativescript/core';
 import { NativeViewElementNode, createElement } 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>;
@@ -15,31 +22,29 @@ interface ComponentInstanceInfo {
 
 const modalStack: ComponentInstanceInfo[] = [];
 
-export function resolveComponentElement(viewSpec: PageSpec, props?: any): ComponentInstanceInfo {
-    const dummy = createElement('fragment');
+export function resolveComponentElement<T>(viewSpec: typeof SvelteComponent<T>, props?: any): ComponentInstanceInfo {
+    const dummy = createElement('fragment', window.document as any);
     const viewInstance = new viewSpec({ target: dummy, props });
     const element = dummy.firstElement() as NativeViewElementNode<View>;
     return { element, viewInstance };
 }
 
-export function showBottomSheet<T>(modalOptions: ShowBottomSheetOptions): Promise<T> {
+export function showBottomSheet<T, U = any>(modalOptions: SvelteShowBottomSheetOptions<U>): Promise<T> {
     const { view, parent, props = {}, ...options } = 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 modalLauncher: View = (parent && (parent instanceof View ? parent : parent.nativeView)) || Frame.topmost().currentPage;
 
     const componentInstanceInfo = resolveComponentElement(view, props);
-    const modalView: ViewBase = componentInstanceInfo.element.nativeView;
+    let modalView: View = componentInstanceInfo.element.nativeView;
 
     return new Promise(async (resolve, reject) => {
         let resolved = false;
         const closeCallback = (result: T) => {
             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 {

src/bottomsheet/vue3/index.ts

@@ -84,7 +84,7 @@ const createNativeView = (component: any, props?: any): App => createApp(compone
 
 
 interface VueBottomSheetOptions extends Partial<BottomSheetOptions> {
-    view?: string | ViewBase;
+    view?: string | View;
     props?: any;
     on?: Record<string, (...args: any[]) => any>;
 }