fix(bottomsheet): options closeCallback not being called on background dismiss.

feat(bottomsheet): `options.closeCallback` now as a second argument which is the framework instance of the bottomsheet component (can be used to retrieve data)

Author: farfromrefug

src/bottomsheet/bottomsheet-common.ts

@@ -105,14 +105,15 @@ export abstract class ViewWithBottomSheetBase extends View {
             }
             this._raiseClosedBottomSheetEvent();
             this._onDismissBottomSheetCallback = null;
-            this._closeBottomSheetCallback = null;
             this._bottomSheetClosed();
             if (this._bottomSheetContext.closeCallback) {
+                this._bottomSheetContext.closeCallback();
                 // only called if not already called by _closeBottomSheetCallback
-                if (typeof options.closeCallback === 'function') {
-                    options.closeCallback.apply(undefined, originalArgs);
-                }
+                // if (typeof options.closeCallback === 'function') {
+                //     options.closeCallback.apply(undefined, originalArgs);
+                // }
             }
+            this._closeBottomSheetCallback = null;
             this._bottomSheetContext = null;
         };
         this._closeBottomSheetCallback = (...originalArgs) => {
@@ -164,7 +165,7 @@ export abstract class ViewWithBottomSheetBase extends View {
     public closeBottomSheet(...args) {
         const closeCallback = this._closeBottomSheetCallback;
         if (closeCallback) {
-            closeCallback.apply(undefined, arguments);
+            closeCallback.apply(undefined, args);
         } else {
             const parent = this.parent as ViewWithBottomSheetBase;
             if (parent) {

src/bottomsheet/svelte/index.ts

@@ -41,8 +41,11 @@ export function showBottomSheet<T = any, U = any>(modalOptions: SvelteShowBottom
         let resolved = false;
         const closeCallback = (result: T) => {
             if (resolved) return;
-            modalStack.pop();
             resolved = true;
+            if (options.closeCallback) {
+                options.closeCallback(result,componentInstanceInfo.viewInstance);
+            }
+            modalStack.pop();
             resolve(result);
             modalView._tearDownUI();
             componentInstanceInfo.viewInstance.$destroy(); // don't let an exception in destroy kill the promise callback

src/bottomsheet/vue/index.ts

@@ -52,14 +52,16 @@ const BottomSheetPlugin = {
                 this.nativeView.showBottomSheet(
                     Object.assign({}, options, {
                         view: navEntryInstance.nativeView,
-                        closeCallback: (...args) => {
+                        closeCallback: (result) => {
                             if (resolved) {
                                 return;
                             }
                             resolved = true;
+                            if (options.closeCallback) {
+                                options.closeCallback(result, navEntryInstance);
+                            }
+                            resolve(result);
                             if (navEntryInstance && navEntryInstance.nativeView) {
-                                options.closeCallback && options.closeCallback.apply(undefined, args);
-                                resolve(...args);
                                 navEntryInstance.$emit('bottomsheet:close');
                                 navEntryInstance.$destroy();
                                 navEntryInstance = null;

src/bottomsheet/vue3/index.ts

@@ -45,14 +45,15 @@ const showSheet = (component, options: VueBottomSheetOptions) =>
         viewAttached.showBottomSheet(
             Object.assign({}, options, {
                 view: navEntryInstance.nativeView,
-                closeCallback: (...args) => {
+                closeCallback: (result) => {
                     if (resolved) {
                         return;
                     }
-                    resolved = true;
+                    if (options.closeCallback) {
+                        options.closeCallback(result, navEntryInstance);
+                    }
+                    resolve(result);
                     if (navEntryInstance && navEntryInstance) {
-                        options.closeCallback && options.closeCallback.apply(undefined, args);
-                        resolve(...args);
                         navEntryInstance.unmount();
                         modalStack.pop();
                     }