react-native-screens 4.11.0-beta.0 → 4.11.0-beta.1

package/android/src/main/java/com/swmansion/rnscreens/stack/views/ScreensCoordinatorLayout.kt

@@ -0,0 +1,99 @@
+package com.swmansion.rnscreens.stack.views
+
+import android.content.Context
+import android.view.WindowInsets
+import android.view.animation.Animation
+import android.view.animation.AnimationSet
+import androidx.coordinatorlayout.widget.CoordinatorLayout
+import com.facebook.react.uimanager.ReactPointerEventsView
+import com.swmansion.rnscreens.PointerEventsBoxNoneImpl
+import com.swmansion.rnscreens.ScreenStackFragment
+import com.swmansion.rnscreens.bottomsheet.usesFormSheetPresentation
+import com.swmansion.rnscreens.stack.anim.ScreensAnimation
+
+internal class ScreensCoordinatorLayout(
+    context: Context,
+    internal val fragment: ScreenStackFragment,
+    private val pointerEventsImpl: ReactPointerEventsView,
+) : CoordinatorLayout(context),
+    ReactPointerEventsView by pointerEventsImpl {
+    constructor(context: Context, fragment: ScreenStackFragment) : this(
+        context,
+        fragment,
+        PointerEventsBoxNoneImpl(),
+    )
+
+    override fun onApplyWindowInsets(insets: WindowInsets?): WindowInsets = super.onApplyWindowInsets(insets)
+
+    private val animationListener: Animation.AnimationListener =
+        object : Animation.AnimationListener {
+            override fun onAnimationStart(animation: Animation) {
+                fragment.onViewAnimationStart()
+            }
+
+            override fun onAnimationEnd(animation: Animation) {
+                fragment.onViewAnimationEnd()
+            }
+
+            override fun onAnimationRepeat(animation: Animation) {}
+        }
+
+    override fun startAnimation(animation: Animation) {
+        // For some reason View##onAnimationEnd doesn't get called for
+        // exit transitions so we explicitly attach animation listener.
+        // We also have some animations that are an AnimationSet, so we don't wrap them
+        // in another set since it causes some visual glitches when going forward.
+        // We also set the listener only when going forward, since when going back,
+        // there is already a listener for dismiss action added, which would be overridden
+        // and also this is not necessary when going back since the lifecycle methods
+        // are correctly dispatched then.
+        // We also add fakeAnimation to the set of animations, which sends the progress of animation
+        val fakeAnimation = ScreensAnimation(fragment).apply { duration = animation.duration }
+
+        if (animation is AnimationSet && !fragment.isRemoving) {
+            animation
+                .apply {
+                    addAnimation(fakeAnimation)
+                    setAnimationListener(animationListener)
+                }.also {
+                    super.startAnimation(it)
+                }
+        } else {
+            AnimationSet(true)
+                .apply {
+                    addAnimation(animation)
+                    addAnimation(fakeAnimation)
+                    setAnimationListener(animationListener)
+                }.also {
+                    super.startAnimation(it)
+                }
+        }
+    }
+
+    /**
+     * This method implements a workaround for RN's autoFocus functionality. Because of the way
+     * autoFocus is implemented it dismisses soft keyboard in fragment transition
+     * due to change of visibility of the view at the start of the transition. Here we override the
+     * call to `clearFocus` when the visibility of view is `INVISIBLE` since `clearFocus` triggers the
+     * hiding of the keyboard in `ReactEditText.java`.
+     */
+    override fun clearFocus() {
+        if (visibility != INVISIBLE) {
+            super.clearFocus()
+        }
+    }
+
+    override fun onLayout(
+        changed: Boolean,
+        l: Int,
+        t: Int,
+        r: Int,
+        b: Int,
+    ) {
+        super.onLayout(changed, l, t, r, b)
+
+        if (fragment.screen.usesFormSheetPresentation()) {
+            fragment.screen.onBottomSheetBehaviorDidLayout(changed)
+        }
+    }
+}

package/lib/commonjs/components/ScreenContentWrapper.windows.js

@@ -0,0 +1,10 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+var _reactNative = require("react-native");
+const ScreenContentWrapper = _reactNative.View;
+var _default = exports.default = ScreenContentWrapper;
+//# sourceMappingURL=ScreenContentWrapper.windows.js.map

package/lib/commonjs/components/ScreenContentWrapper.windows.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["_reactNative","require","ScreenContentWrapper","View","_default","exports","default"],"sourceRoot":"../../../src","sources":["components/ScreenContentWrapper.windows.tsx"],"mappings":";;;;;;AAAA,IAAAA,YAAA,GAAAC,OAAA;AAEA,MAAMC,oBAAoB,GAAGC,iBAAI;AAAC,IAAAC,QAAA,GAAAC,OAAA,CAAAC,OAAA,GAEnBJ,oBAAoB","ignoreList":[]}

package/lib/commonjs/components/ScreenFooter.windows.js

@@ -0,0 +1,11 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = exports.FooterComponent = void 0;
+var _reactNative = require("react-native");
+const ScreenFooter = _reactNative.View;
+const FooterComponent = exports.FooterComponent = _reactNative.View;
+var _default = exports.default = ScreenFooter;
+//# sourceMappingURL=ScreenFooter.windows.js.map

package/lib/commonjs/components/ScreenFooter.windows.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["_reactNative","require","ScreenFooter","View","FooterComponent","exports","_default","default"],"sourceRoot":"../../../src","sources":["components/ScreenFooter.windows.tsx"],"mappings":";;;;;;AAAA,IAAAA,YAAA,GAAAC,OAAA;AAEA,MAAMC,YAAY,GAAGC,iBAAI;AACzB,MAAMC,eAAe,GAAAC,OAAA,CAAAD,eAAA,GAAGD,iBAAI;AAAC,IAAAG,QAAA,GAAAD,OAAA,CAAAE,OAAA,GAEdL,YAAY","ignoreList":[]}

package/lib/module/components/ScreenContentWrapper.windows.js

@@ -0,0 +1,4 @@
+import { View } from 'react-native';
+const ScreenContentWrapper = View;
+export default ScreenContentWrapper;
+//# sourceMappingURL=ScreenContentWrapper.windows.js.map

package/lib/module/components/ScreenContentWrapper.windows.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["View","ScreenContentWrapper"],"sourceRoot":"../../../src","sources":["components/ScreenContentWrapper.windows.tsx"],"mappings":"AAAA,SAASA,IAAI,QAAQ,cAAc;AAEnC,MAAMC,oBAAoB,GAAGD,IAAI;AAEjC,eAAeC,oBAAoB","ignoreList":[]}

package/lib/module/components/ScreenFooter.windows.js

@@ -0,0 +1,6 @@
+import { View } from 'react-native';
+const ScreenFooter = View;
+const FooterComponent = View;
+export default ScreenFooter;
+export { FooterComponent };
+//# sourceMappingURL=ScreenFooter.windows.js.map

package/lib/module/components/ScreenFooter.windows.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["View","ScreenFooter","FooterComponent"],"sourceRoot":"../../../src","sources":["components/ScreenFooter.windows.tsx"],"mappings":"AAAA,SAASA,IAAI,QAAQ,cAAc;AAEnC,MAAMC,YAAY,GAAGD,IAAI;AACzB,MAAME,eAAe,GAAGF,IAAI;AAE5B,eAAeC,YAAY;AAC3B,SAASC,eAAe","ignoreList":[]}

package/lib/typescript/components/ScreenContentWrapper.windows.d.ts

@@ -0,0 +1,4 @@
+import { View } from 'react-native';
+declare const ScreenContentWrapper: typeof View;
+export default ScreenContentWrapper;
+//# sourceMappingURL=ScreenContentWrapper.windows.d.ts.map

package/lib/typescript/components/ScreenContentWrapper.windows.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"ScreenContentWrapper.windows.d.ts","sourceRoot":"","sources":["../../../src/components/ScreenContentWrapper.windows.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,cAAc,CAAC;AAEpC,QAAA,MAAM,oBAAoB,aAAO,CAAC;AAElC,eAAe,oBAAoB,CAAC"}

package/lib/typescript/components/ScreenFooter.windows.d.ts

@@ -0,0 +1,6 @@
+import { View } from 'react-native';
+declare const ScreenFooter: typeof View;
+declare const FooterComponent: typeof View;
+export default ScreenFooter;
+export { FooterComponent };
+//# sourceMappingURL=ScreenFooter.windows.d.ts.map

package/lib/typescript/components/ScreenFooter.windows.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"ScreenFooter.windows.d.ts","sourceRoot":"","sources":["../../../src/components/ScreenFooter.windows.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,cAAc,CAAC;AAEpC,QAAA,MAAM,YAAY,aAAO,CAAC;AAC1B,QAAA,MAAM,eAAe,aAAO,CAAC;AAE7B,eAAe,YAAY,CAAC;AAC5B,OAAO,EAAE,eAAe,EAAE,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-screens",
-  "version": "4.11.0-beta.0",
+  "version": "4.11.0-beta.1",
   "description": "Native navigation primitives for your React Native app.",
   "scripts": {
     "submodules": "git submodule update --init --recursive && (cd react-navigation && yarn && yarn build && cd ../)",

package/src/components/ScreenContentWrapper.windows.tsx

@@ -0,0 +1,5 @@
+import { View } from 'react-native';
+
+const ScreenContentWrapper = View;
+
+export default ScreenContentWrapper;

package/src/components/ScreenFooter.windows.tsx

@@ -0,0 +1,7 @@
+import { View } from 'react-native';
+
+const ScreenFooter = View;
+const FooterComponent = View;
+
+export default ScreenFooter;
+export { FooterComponent };

package/windows/RNScreens/ModalScreenViewManager.cpp

@@ -0,0 +1,22 @@
+#include "pch.h"
+#include "ModalScreenViewManager.h"
+#include "JSValueXaml.h"
+#include "NativeModules.h"
+
+namespace winrt {
+using namespace Microsoft::ReactNative;
+using namespace Windows::Foundation;
+using namespace Windows::Foundation::Collections;
+using namespace Windows::UI;
+using namespace Windows::UI::Xaml;
+using namespace Windows::UI::Xaml::Controls;
+} // namespace winrt
+
+namespace winrt::RNScreens::implementation {
+// IViewManager
+winrt::hstring ModalScreenViewManager::Name() noexcept {
+  return L"RNSModalScreen";
+}
+
+
+} // namespace winrt::RNScreens::implementation

package/windows/RNScreens/ModalScreenViewManager.h

@@ -0,0 +1,13 @@
+#pragma once
+#include "NativeModules.h"
+#include "winrt/Microsoft.ReactNative.h"
+#include "ScreenViewManager.h"
+
+namespace winrt::RNScreens::implementation {
+
+class ModalScreenViewManager : public ScreenViewManager {
+ public:
+  ModalScreenViewManager() = default;
+  winrt::hstring Name() noexcept;
+};
+} // namespace winrt::RNScreens::implementation

package/windows/RNScreens/RNScreens.vcxproj

@@ -20,7 +20,7 @@
   <Import Project="$(ReactNativeWindowsDir)\PropertySheets\External\Microsoft.ReactNative.WindowsSdk.Default.props" Condition="Exists('$(ReactNativeWindowsDir)\PropertySheets\External\Microsoft.ReactNative.WindowsSdk.Default.props')" />
   <PropertyGroup Label="Fallback Windows SDK Versions">
    <WindowsTargetPlatformVersion Condition=" '$(WindowsTargetPlatformVersion)' == '' ">10.0.18362.0</WindowsTargetPlatformVersion>
-   <WindowsTargetPlatformMinVersion Condition=" '$(WindowsTargetPlatformMinVersion)' == '' ">10.0.16299.0</WindowsTargetPlatformMinVersion>
+   <WindowsTargetPlatformMinVersion Condition=" '$(WindowsTargetPlatformMinVersion)' == '' ">10.0.17763.0</WindowsTargetPlatformMinVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <ItemGroup Label="ProjectConfigurations">
@@ -122,6 +122,9 @@
     <ClInclude Include="ScreenContainerViewManager.h" />
     <ClInclude Include="ScreenStack.h" />
     <ClInclude Include="ScreenStackHeaderConfigViewManager.h" />
+    <ClInclude Include="ScreenStackHeaderSubviewViewManager.h" />
+    <ClInclude Include="SearchBarViewManager.h" />
+    <ClInclude Include="ModalScreenViewManager.h" />
     <ClInclude Include="ScreenViewManager.h" />
     <ClInclude Include="RNScreens.h">
       <DependentUpon>RNScreens.idl</DependentUpon>
@@ -133,6 +136,8 @@
       <DependentUpon>RNScreens.idl</DependentUpon>
     </ClCompile>
     <ClInclude Include="ScreenStackHeaderConfig.h" />
+    <ClInclude Include="ScreenStackHeaderSubview.h" />
+    <ClInclude Include="SearchBar.h" />
     <ClInclude Include="ScreenStackViewManager.h" />
   </ItemGroup>
   <ItemGroup>
@@ -144,12 +149,17 @@
     <ClCompile Include="ScreenContainerViewManager.cpp" />
     <ClCompile Include="ScreenStack.cpp" />
     <ClCompile Include="ScreenStackHeaderConfigViewManager.cpp" />
+    <ClCompile Include="ScreenStackHeaderSubviewViewManager.cpp" />
+    <ClCompile Include="SearchBarViewManager.cpp" />
+    <ClCompile Include="ModalScreenViewManager.cpp" />
     <ClCompile Include="ScreenViewManager.cpp" />
     <ClCompile Include="ReactPackageProvider.cpp">
       <DependentUpon>ReactPackageProvider.idl</DependentUpon>
     </ClCompile>
     <ClCompile Include="$(GeneratedFilesDir)module.g.cpp" />
     <ClCompile Include="ScreenStackHeaderConfig.cpp" />
+    <ClCompile Include="ScreenStackHeaderSubview.cpp" />
+    <ClCompile Include="SearchBar.cpp" />
     <ClCompile Include="ScreenStackViewManager.cpp" />
   </ItemGroup>
   <ItemGroup>

package/windows/RNScreens/RNScreens.vcxproj.filters

@@ -17,8 +17,13 @@
     <ClCompile Include="RNScreens.cpp" />
     <ClCompile Include="Screen.cpp" />
     <ClCompile Include="ScreenStackHeaderConfigViewManager.cpp" />
+    <ClCompile Include="ScreenStackHeaderSubviewViewManager.cpp" />
+    <ClCompile Include="SearchBarViewManager.cpp" />
+    <ClCompile Include="ModalScreenViewManager.cpp" />
     <ClCompile Include="ScreenViewManager.cpp" />
     <ClCompile Include="ScreenStackHeaderConfig.cpp" />
+    <ClCompile Include="ScreenStackHeaderSubview.cpp" />
+    <ClCompile Include="SearchBar.cpp" />
     <ClCompile Include="ScreenStackViewManager.cpp" />
     <ClCompile Include="ScreenStack.cpp" />
     <ClCompile Include="ScreenContainerViewManager.cpp" />
@@ -31,8 +36,13 @@
     <ClInclude Include="RNScreens.h" />
     <ClInclude Include="Screen.h" />
     <ClInclude Include="ScreenStackHeaderConfigViewManager.h" />
+    <ClInclude Include="ScreenStackHeaderSubviewViewManager.h" />
+    <ClInclude Include="SearchBarViewManager.h" />
+    <ClInclude Include="ModalScreenViewManager.h" />
     <ClInclude Include="ScreenViewManager.h" />
     <ClInclude Include="ScreenStackHeaderConfig.h" />
+    <ClInclude Include="ScreenStackHeaderSubview.h" />
+    <ClInclude Include="SearchBar.h" />
     <ClInclude Include="ScreenStackViewManager.h" />
     <ClInclude Include="ScreenStack.h" />
     <ClInclude Include="ScreenContainer.h" />

package/windows/RNScreens/ReactPackageProvider.cpp

@@ -8,6 +8,9 @@
 #include "ScreenStackHeaderConfigViewManager.h"
 #include "ScreenStackViewManager.h"
 #include "ScreenViewManager.h"
+#include "ScreenStackHeaderSubviewViewManager.h"
+#include "ModalScreenViewManager.h"
+#include "SearchBarViewManager.h"
 
 using namespace winrt::Microsoft::ReactNative;
 
@@ -17,14 +20,29 @@ void ReactPackageProvider::CreatePackage(
   packageBuilder.AddViewManager(L"RNScreensViewManager", []() {
     return winrt::make<ScreenViewManager>();
   });
+
   packageBuilder.AddViewManager(L"RNScreensStackHeaderConfigViewManager", []() {
     return winrt::make<ScreenStackHeaderConfigViewManager>();
   });
+
   packageBuilder.AddViewManager(L"RNSScreenStackViewManager", []() {
     return winrt::make<ScreenStackViewManager>();
   });
+
   packageBuilder.AddViewManager(L"RNSScreenContainerViewManager", []() {
     return winrt::make<ScreenContainerViewManager>();
   });
+
+  packageBuilder.AddViewManager(L"RNSScreenStackHeaderSubviewViewManager", [] () {
+    return winrt::make<ScreenStackHeaderSubviewViewManager>();
+  });
+
+  packageBuilder.AddViewManager(L"RNSModalScreenViewManager", [] () {
+    return winrt::make<ModalScreenViewManager>();
+  });
+
+  packageBuilder.AddViewManager(L"RNSSearchBar", [] () {
+    return winrt::make<SearchBarViewManager>();
+  });
 }
 } // namespace winrt::RNScreens::implementation

package/windows/RNScreens/Screen.cpp

@@ -1,122 +1,128 @@
-#include "pch.h"
-#include "Screen.h"
-#include "JSValueXaml.h"
-#include "NativeModules.h"
-
-
-namespace winrt {
-using namespace Microsoft::ReactNative;
-using namespace Windows::Foundation;
-using namespace Windows::Foundation::Collections;
-using namespace Windows::UI;
-using namespace Windows::UI::Xaml;
-using namespace Windows::UI::Xaml::Controls;
-} // namespace winrt
-
-namespace winrt::RNScreens::implementation {
-Screen::Screen(winrt::Microsoft::ReactNative::IReactContext reactContext)
-    : m_reactContext(reactContext) {
-  onLoadingRevoker = Loading({this, &Screen::onLoading});
-  onLoadedRevoker = Loaded({this, &Screen::onLoaded});
-  onUnloadedRevoker = Unloaded({this, &Screen::onUnloaded});
-}
-
-Screen::~Screen() {
-  Loading(onLoadingRevoker);
-  Loaded(onLoadedRevoker);
-  Unloaded(onUnloadedRevoker);
-}
-
-void Screen::addView(winrt::Windows::UI::Xaml::UIElement element) {
-  Children().Append(element);
-}
-
-void Screen::removeAllChildren() {
-  Children().Clear();
-}
-
-void Screen::removeChildAt(int64_t index) {
-  Children().RemoveAt(static_cast<uint32_t>(index));
-}
-
-void Screen::replaceChild(
-    winrt::Windows::UI::Xaml::UIElement oldChild,
-    winrt::Windows::UI::Xaml::UIElement newChild) {
-  uint32_t index;
-  if (!Children().IndexOf(oldChild, index))
-    return;
-
-  Children().SetAt(index, newChild);
-}
-
-void Screen::onLoading(
-    winrt::Windows::UI::Xaml::FrameworkElement const &sender,
-    winrt::Windows::Foundation::IInspectable const &) {
-  auto screen = sender.try_as<Screen>();
-  if (!screen)
-    return;
-
-  screen->dispatchOnWillAppear();
-}
-
-void Screen::onLoaded(
-    winrt::Windows::Foundation::IInspectable const &sender,
-    winrt::Windows::UI::Xaml::RoutedEventArgs const &) {
-  auto screen = sender.try_as<Screen>();
-  if (!screen)
-    return;
-
-  screen->dispatchOnAppear();
-}
-
-void Screen::onUnloaded(
-    winrt::Windows::Foundation::IInspectable const &sender,
-    winrt::Windows::UI::Xaml::RoutedEventArgs const &) {
-  auto screen = sender.try_as<Screen>();
-  if (!screen)
-    return;
-
-  screen->dispatchOnWillDisappear();
-  screen->dispatchOnDisappear();
-}
-
-void Screen::dispatchOnWillAppear() {
-  m_reactContext.DispatchEvent(
-      *this,
-      L"topWillAppear",
-      [&](winrt::IJSValueWriter const &eventDataWriter) noexcept {
-        eventDataWriter.WriteObjectBegin();
-        eventDataWriter.WriteObjectEnd();
-      });
-}
-
-void Screen::dispatchOnWillDisappear() {
-  m_reactContext.DispatchEvent(
-      *this,
-      L"topWillDisappear",
-      [&](winrt::IJSValueWriter const &eventDataWriter) noexcept {
-        eventDataWriter.WriteObjectBegin();
-        eventDataWriter.WriteObjectEnd();
-      });
-}
-
-void Screen::dispatchOnAppear() {
-  m_reactContext.DispatchEvent(
-      *this,
-      L"topAppear",
-      [&](winrt::IJSValueWriter const &eventDataWriter) noexcept {
-        eventDataWriter.WriteObjectBegin();
-        eventDataWriter.WriteObjectEnd();
-      });
-}
-
-void Screen::dispatchOnDisappear() {
-  m_reactContext.DispatchEvent(
-      *this,
-      L"topDisappear",
-      [&](winrt::IJSValueWriter const &eventDataWriter) noexcept {
-        eventDataWriter.WriteObjectBegin();
-        eventDataWriter.WriteObjectEnd();
-      });
-}
-} // namespace winrt::RNScreens::implementation
+#include "pch.h"
+#include "Screen.h"
+#include "JSValueXaml.h"
+#include "NativeModules.h"
+
+
+namespace winrt {
+using namespace Microsoft::ReactNative;
+using namespace Windows::Foundation;
+using namespace Windows::Foundation::Collections;
+using namespace Windows::UI;
+using namespace Windows::UI::Xaml;
+using namespace Windows::UI::Xaml::Controls;
+} // namespace winrt
+
+namespace winrt::RNScreens::implementation {
+Screen::Screen(winrt::Microsoft::ReactNative::IReactContext reactContext)
+    : m_reactContext(reactContext) {
+  onLoadingRevoker = Loading({this, &Screen::onLoading});
+  onLoadedRevoker = Loaded({this, &Screen::onLoaded});
+  onUnloadedRevoker = Unloaded({this, &Screen::onUnloaded});
+}
+
+Screen::~Screen() {
+  Loading(onLoadingRevoker);
+  Loaded(onLoadedRevoker);
+  Unloaded(onUnloadedRevoker);
+}
+
+void Screen::addView(winrt::Windows::UI::Xaml::UIElement element) {
+  Children().Append(element);
+}
+
+void Screen::removeAllChildren() {
+  Children().Clear();
+}
+
+void Screen::removeChildAt(int64_t index) {
+  Children().RemoveAt(static_cast<uint32_t>(index));
+}
+
+void Screen::replaceChild(
+    winrt::Windows::UI::Xaml::UIElement oldChild,
+    winrt::Windows::UI::Xaml::UIElement newChild) {
+  uint32_t index;
+  if (!Children().IndexOf(oldChild, index))
+    return;
+
+  Children().SetAt(index, newChild);
+}
+
+void Screen::onLoading(
+    winrt::Windows::UI::Xaml::FrameworkElement const &sender,
+    winrt::Windows::Foundation::IInspectable const &) {
+  auto screen = sender.try_as<Screen>();
+  if (!screen)
+    return;
+
+  screen->dispatchOnWillAppear();
+}
+
+void Screen::onLoaded(
+    winrt::Windows::Foundation::IInspectable const &sender,
+    winrt::Windows::UI::Xaml::RoutedEventArgs const &) {
+  auto screen = sender.try_as<Screen>();
+  if (!screen)
+    return;
+
+  screen->dispatchOnAppear();
+}
+
+void Screen::onUnloaded(
+    winrt::Windows::Foundation::IInspectable const &sender,
+    winrt::Windows::UI::Xaml::RoutedEventArgs const &) {
+  auto screen = sender.try_as<Screen>();
+  if (!screen)
+    return;
+
+  screen->dispatchOnWillDisappear();
+  screen->dispatchOnDisappear();
+}
+
+void Screen::dispatchOnWillAppear() {
+  m_reactContext.DispatchEvent(
+      *this,
+      L"topWillAppear",
+      [&](winrt::IJSValueWriter const &eventDataWriter) noexcept {
+        eventDataWriter.WriteObjectBegin();
+        eventDataWriter.WriteObjectEnd();
+      });
+}
+
+void Screen::dispatchOnWillDisappear() {
+  m_reactContext.DispatchEvent(
+      *this,
+      L"topWillDisappear",
+      [&](winrt::IJSValueWriter const &eventDataWriter) noexcept {
+        eventDataWriter.WriteObjectBegin();
+        eventDataWriter.WriteObjectEnd();
+      });
+}
+
+void Screen::dispatchOnAppear() {
+  m_reactContext.DispatchEvent(
+      *this,
+      L"topAppear",
+      [&](winrt::IJSValueWriter const &eventDataWriter) noexcept {
+        eventDataWriter.WriteObjectBegin();
+        eventDataWriter.WriteObjectEnd();
+      });
+}
+
+void Screen::dispatchOnDisappear() {
+  m_reactContext.DispatchEvent(
+      *this,
+      L"topDisappear",
+      [&](winrt::IJSValueWriter const &eventDataWriter) noexcept {
+        eventDataWriter.WriteObjectBegin();
+        eventDataWriter.WriteObjectEnd();
+      });
+}
+StackAnimation Screen::GetStackAnimation() const {
+  return stackAnimation;
+}
+void Screen::SetStackAnimation(StackAnimation const& animation) {
+  stackAnimation = animation;
+}
+} // namespace winrt::RNScreens::implementation

package/windows/RNScreens/Screen.h

@@ -2,15 +2,16 @@
 
 namespace winrt::RNScreens::implementation {
 
-enum class StackPresentation { PUSH, MODAL, TRANSPARENT_MODAL };
+enum class StackPresentation { PUSH, MODAL, TRANSPARENT_MODAL, FORM_SHEET };
 
 enum class StackAnimation {
   DEFAULT,
   NONE,
   FADE,
-  SIMPLE_FROM_BOTTOM,
+  SLIDE_FROM_BOTTOM,
   SLIDE_FROM_RIGHT,
   SLIDE_FROM_LEFT,
+  FADE_FROM_BOTTOM,
   IOS_FROM_RIGHT,
   IOS_FROM_LEFT
 };
@@ -59,8 +60,11 @@ class Screen : public winrt::Windows::UI::Xaml::Controls::StackPanelT<Screen> {
   void dispatchOnDisappear();
   void dispatchOnWillAppear();
   void dispatchOnWillDisappear();
+  StackAnimation GetStackAnimation() const;
+  void SetStackAnimation(StackAnimation const& animation);
 
  private:
   winrt::Microsoft::ReactNative::IReactContext m_reactContext{nullptr};
+  StackAnimation stackAnimation;
 };
 } // namespace winrt::RNScreens::implementation