fix(android): result not returned on bottomsheet close

Author: farfromrefug

src/bottomsheet/bottomsheet-common.ts

@@ -87,10 +87,15 @@ export abstract class ViewWithBottomSheetBase extends View {
         };
         this._closeBottomSheetCallback = (...originalArgs) => {
             if (this._closeBottomSheetCallback) {
-                const callback = this._closeBottomSheetCallback;
+                // const callback = this._closeBottomSheetCallback;
                 this._closeBottomSheetCallback = null;
                 this._bottomSheetContext.closeCallback = null;
-                this._hideNativeBottomSheet(parent, callback);
+                const whenClosedCallback = () => {
+                    if (typeof options.closeCallback === "function") {
+                        options.closeCallback.apply(undefined, originalArgs);
+                    }
+                };
+                this._hideNativeBottomSheet(parent, whenClosedCallback);
             }
         };
         this._bottomSheetContext.closeCallback = this._closeBottomSheetCallback;

src/bottomsheet/bottomsheet.android.ts

@@ -199,13 +199,14 @@ function initializeBottomSheetDialogFragment() {
 export class ViewWithBottomSheet extends ViewWithBottomSheetBase {
     _bottomSheetFragment: com.google.android.material.bottomsheet.BottomSheetDialogFragment;
     protected _hideNativeBottomSheet(parent: View, whenClosedCallback: () => void) {
+        // call whenClosedCallback first because dismiss will call another one (without result)
+        whenClosedCallback();
         const manager = this._bottomSheetFragment.getFragmentManager();
         if (manager) {
             this._bottomSheetFragment.dismissAllowingStateLoss();
         }
 
         this._bottomSheetFragment = null;
-        whenClosedCallback();
     }
 
     protected _showNativeBottomSheet(parent: View, options: BottomSheetOptions) {