Skip to content
Draft
Show file tree
Hide file tree
Changes from all 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
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"comment": "Fix react-native-platform-override version mismatch",
"type": "prerelease",
"packageName": "@office-iss/react-native-win32",
"email": "protikbiswas100@microsoft.com",
"dependentChangeType": "patch"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"comment": "adding reactnativeisland changes",
"type": "prerelease",
"packageName": "@react-native-windows/automation",
"email": "protikbiswas100@microsoft.com",
"dependentChangeType": "patch"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"comment": "Fix C++ formatting",
"type": "prerelease",
"packageName": "@react-native-windows/automation-channel",
"email": "protikbiswas100@microsoft.com",
"dependentChangeType": "patch"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"comment": "Merge branch 'main' into user/protikbiswas100/15353-cleanup",
"type": "prerelease",
"packageName": "@react-native-windows/automation-commands",
"email": "protikbiswas100@microsoft.com",
"dependentChangeType": "patch"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"comment": "applying package updates ***NO_CI***",
"type": "prerelease",
"packageName": "react-native-platform-override",
"email": "protikbiswas100@microsoft.com",
"dependentChangeType": "patch"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"comment": "Revert \"Fix format errors\"",
"type": "prerelease",
"packageName": "react-native-windows",
"email": "protikbiswas100@microsoft.com",
"dependentChangeType": "patch"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"comment": "Merge branch 'main' into user/protikbiswas100/15353-cleanup",
"type": "prerelease",
"packageName": "react-native-windows-init",
"email": "protikbiswas100@microsoft.com",
"dependentChangeType": "patch"
}
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
"fast-glob": "^3.2.11",
"husky": "^4.2.5",
"prettier-plugin-hermes-parser": "0.21.1",
"react-native-platform-override": "0.0.0-canary.1015",
"react-native-platform-override": "0.0.0-canary.1016",
"unbroken": "1.0.27",
"lage": "^2.7.1",
"lodash": "^4.17.15"
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,9 @@
#include <winrt/Microsoft.UI.Windowing.h>
#include <winrt/Microsoft.UI.interop.h>

// Includes from sample-custom-component
#include <winrt/SampleCustomComponent.h>

winrt::Microsoft::UI::Dispatching::DispatcherQueueController g_liftedDispatcherQueueController{nullptr};
winrt::Microsoft::UI::Composition::Compositor g_liftedCompositor{nullptr};

void RegisterCustomComponent(winrt::Microsoft::ReactNative::IReactPackageBuilder const &packageBuilder) noexcept;

/**
* This ImageHandler will accept images with a uri using the ellipse protocol and render an ellipse image
*
Expand Down Expand Up @@ -79,25 +74,6 @@ struct EllipseImageHandler
}
};

struct EllipseReactPackageProvider
: winrt::implements<EllipseReactPackageProvider, winrt::Microsoft::ReactNative::IReactPackageProvider> {
public: // IReactPackageProvider
void CreatePackage(winrt::Microsoft::ReactNative::IReactPackageBuilder const &packageBuilder) noexcept {
// Register ellipse: uri handler for images
packageBuilder.as<winrt::Microsoft::ReactNative::IReactPackageBuilderFabric>().AddUriImageProvider(
winrt::make<EllipseImageHandler>());
}
};

// Have to use TurboModules to override built in modules.. so the standard attributed package provider doesn't work.
struct CompReactPackageProvider
: winrt::implements<CompReactPackageProvider, winrt::Microsoft::ReactNative::IReactPackageProvider> {
public: // IReactPackageProvider
void CreatePackage(winrt::Microsoft::ReactNative::IReactPackageBuilder const &packageBuilder) noexcept {
RegisterCustomComponent(packageBuilder);
}
};

constexpr auto WindowDataProperty = L"WindowData";

int RunPlayground(int showCmd);
Expand Down Expand Up @@ -172,10 +148,6 @@ struct WindowData {
winrt::Microsoft::ReactNative::HttpSettings::SetDefaultUserAgent(
host.InstanceSettings(), L"React Native Windows Playground");

host.PackageProviders().Append(winrt::make<CompReactPackageProvider>());

host.PackageProviders().Append(winrt::SampleCustomComponent::ReactPackageProvider());

winrt::Microsoft::ReactNative::ReactCoreInjection::SetTopLevelWindowId(
host.InstanceSettings().Properties(), reinterpret_cast<uint64_t>(hwnd));

Expand All @@ -189,9 +161,6 @@ struct WindowData {
winrt::Microsoft::ReactNative::Composition::CompositionUIService::SetCompositor(
InstanceSettings(), g_liftedCompositor);

// Register ellipse:// uri hander for images
host.PackageProviders().Append(winrt::make<EllipseReactPackageProvider>());

m_bridge = winrt::Microsoft::UI::Content::DesktopChildSiteBridge::Create(
g_liftedCompositor, winrt::Microsoft::UI::GetWindowIdFromWindow(hwnd));

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,6 @@
<DependentUpon>App.xaml</DependentUpon>
<SubType>Code</SubType>
</ClCompile>
<ClCompile Include="CustomComponent.cpp" />
<ClCompile Include="Playground-Composition.cpp" />
<ClCompile Include="YogaXamlPanel.cpp" />
</ItemGroup>
Expand Down
Loading
Loading