Skip to content
Merged
Show file tree
Hide file tree
Changes from 6 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions src/components/ScreenContentWrapper.windows.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
import { View } from 'react-native';

const ScreenContentWrapper = View;

export default ScreenContentWrapper;
7 changes: 7 additions & 0 deletions src/components/ScreenFooter.windows.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
import { View } from 'react-native';

const ScreenFooter = View;
const FooterComponent = View;

export default ScreenFooter;
export { FooterComponent };
1 change: 1 addition & 0 deletions src/utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import { BackHandler, Platform } from 'react-native';
export const isSearchBarAvailableForCurrentPlatform = [
'ios',
'android',
'windows',
].includes(Platform.OS);

export function executeNativeBackPress() {
Expand Down
22 changes: 22 additions & 0 deletions windows/RNScreens/ModalScreenViewManager.cpp
Original file line number Diff line number Diff line change
@@ -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
13 changes: 13 additions & 0 deletions windows/RNScreens/ModalScreenViewManager.h
Original file line number Diff line number Diff line change
@@ -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
12 changes: 11 additions & 1 deletion windows/RNScreens/RNScreens.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand Down Expand Up @@ -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>
Expand All @@ -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>
Expand All @@ -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>
Expand Down
10 changes: 10 additions & 0 deletions windows/RNScreens/RNScreens.vcxproj.filters
Original file line number Diff line number Diff line change
Expand Up @@ -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" />
Expand All @@ -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" />
Expand Down
18 changes: 18 additions & 0 deletions windows/RNScreens/ReactPackageProvider.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand All @@ -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
Loading
Loading