react-native-windows 0.81.1 → 0.82.0-preview.1

package/Microsoft.ReactNative/Views/ConfigureBundlerDlg.cpp

@@ -1,186 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-#include "pch.h"
-#include "ConfigureBundlerDlg.h"
-#include "DevServerHelper.h"
-#include "IReactDispatcher.h"
-#include "UI.Xaml.Controls.Primitives.h"
-#include "UI.Xaml.Controls.h"
-#include "UI.Xaml.Input.h"
-#include "UI.Xaml.Markup.h"
-#include "Unicode.h"
-#include "Utils/Helpers.h"
-#include "winrt/Windows.UI.Xaml.Interop.h"
-
-namespace Microsoft::ReactNative {
-
-struct ConfigureBundlerDlg : winrt::implements<ConfigureBundlerDlg, winrt::IInspectable> {
-  ConfigureBundlerDlg(Mso::WeakPtr<Mso::React::IReactHost> weakReactHost) : m_weakReactHost(std::move(weakReactHost)) {
-    if (auto reactHost = m_weakReactHost.GetStrongPtr()) {
-      auto uiDispatcher = winrt::Microsoft::ReactNative::implementation::ReactDispatcher::GetUIDispatcher(
-          reactHost->Options().Properties);
-      uiDispatcher.Post([pThis = get_strong()]() { pThis->CreateAndShowUI(); });
-    }
-  }
-
- private:
-  void CreateAndShowUI() noexcept {
-    if (auto reactHost = m_weakReactHost.GetStrongPtr()) {
-      const winrt::hstring xamlString =
-          LR"(
-  <StackPanel
-    xmlns='http://schemas.microsoft.com/winfx/2006/xaml/presentation'
-    xmlns:x='http://schemas.microsoft.com/winfx/2006/xaml'
-    Background='{ThemeResource ContentDialogBackground}'
-    HorizontalAlignment='Center'
-    MinWidth="{ThemeResource ContentDialogMinWidth}"
-    MaxWidth="{ThemeResource ContentDialogMaxWidth}"
-    MinHeight="{ThemeResource ContentDialogMinHeight}"
-    MaxHeight="{ThemeResource ContentDialogMaxHeight}"
-    Margin='-10'
-    Padding="{ThemeResource ContentDialogPadding}"
-  >
-    <StackPanel.Transitions>
-      <TransitionCollection>
-        <EntranceThemeTransition />
-      </TransitionCollection>
-    </StackPanel.Transitions>
-    <TextBlock FontSize="20" Margin="{ThemeResource ContentDialogTitleMargin}">Configure Bundler</TextBlock>
-    <TextBlock Opacity='0.5' TextWrapping="Wrap" Margin="{ThemeResource ContentDialogTitleMargin}">Provide a custom bundler address, port and entrypoint.<LineBreak/>Applying these settings will cause the instance to be reloaded.</TextBlock>
-    <TextBox x:Name="Host" Header="Bundler host:" PlaceholderText="localhost"/>
-    <TextBox x:Name="Port" Header="Bundler port:" PlaceholderText="8081" Margin="0,4,0,0"/>
-    <TextBox x:Name="EntryPoint" Header="Entrypoint:" PlaceholderText="index.windows" Margin="0,4,0,0"/>
-    <StackPanel Orientation="Horizontal" HorizontalAlignment="Right" Margin="{ThemeResource ContentDialogCommandSpaceMargin}">
-      <Button x:Name="Apply" Style="{StaticResource AccentButtonStyle}" Content="Apply Changes" />
-      <Button x:Name="Reset" Content="Reset to Default" Margin="4,0,0,0"/>
-      <Button x:Name="Cancel" Content="Cancel" Margin="4,0,0,0"/>
-    </StackPanel>
-  </StackPanel>)";
-      auto configureUI = winrt::unbox_value<xaml::Controls::StackPanel>(xaml::Markup::XamlReader::Load(xamlString));
-
-      auto options = reactHost->Options();
-
-      auto host = configureUI.FindName(L"Host").as<xaml::Controls::TextBox>();
-
-      host.PlaceholderText(
-          Microsoft::Common::Unicode::Utf8ToUtf16(facebook::react::DevServerHelper::DefaultPackagerHost));
-      host.Text(Microsoft::Common::Unicode::Utf8ToUtf16(options.DeveloperSettings.SourceBundleHost));
-
-      auto port = configureUI.FindName(L"Port").as<xaml::Controls::TextBox>();
-      port.PlaceholderText(std::to_wstring(facebook::react::DevServerHelper::DefaultPackagerPort));
-      if (options.DeveloperSettings.SourceBundlePort)
-        port.Text(std::to_wstring(options.DeveloperSettings.SourceBundlePort));
-
-      auto entry = configureUI.FindName(L"EntryPoint").as<xaml::Controls::TextBox>();
-      entry.PlaceholderText(L"index.windows");
-      entry.Text(Microsoft::Common::Unicode::Utf8ToUtf16(options.DeveloperSettings.SourceBundleName));
-
-      auto applyButton = configureUI.FindName(L"Apply").as<xaml::Controls::Button>();
-      applyButton.Click([this](auto const & /*sender*/, xaml::RoutedEventArgs const & /*args*/) noexcept {
-        if (auto reactHost = m_weakReactHost.GetStrongPtr()) {
-          auto options = reactHost->Options();
-          options.DeveloperSettings.SourceBundleHost =
-              Microsoft::Common::Unicode::Utf16ToUtf8(m_flyout.Content()
-                                                          .as<xaml::FrameworkElement>()
-                                                          .FindName(L"Host")
-                                                          .as<xaml::Controls::TextBox>()
-                                                          .Text()
-                                                          .c_str());
-
-          auto portText =
-              m_flyout.Content().as<xaml::FrameworkElement>().FindName(L"Port").as<xaml::Controls::TextBox>().Text();
-          options.DeveloperSettings.SourceBundlePort = portText.empty()
-              ? facebook::react::DevServerHelper::DefaultPackagerPort
-              : static_cast<uint16_t>(std::stoi(std::wstring(portText)));
-          options.DeveloperSettings.SourceBundleName =
-              Microsoft::Common::Unicode::Utf16ToUtf8(m_flyout.Content()
-                                                          .as<xaml::FrameworkElement>()
-                                                          .FindName(L"EntryPoint")
-                                                          .as<xaml::Controls::TextBox>()
-                                                          .Text()
-                                                          .c_str());
-          Hide();
-          reactHost->ReloadInstanceWithOptions(std::move(options));
-        }
-      });
-
-      auto resetButton = configureUI.FindName(L"Reset").as<xaml::Controls::Button>();
-      resetButton.Click([this](auto const & /*sender*/, xaml::RoutedEventArgs const & /*args*/) noexcept {
-        if (auto reactHost = m_weakReactHost.GetStrongPtr()) {
-          m_flyout.Content().as<xaml::FrameworkElement>().FindName(L"Host").as<xaml::Controls::TextBox>().Text(L"");
-          m_flyout.Content().as<xaml::FrameworkElement>().FindName(L"Port").as<xaml::Controls::TextBox>().Text(L"");
-          m_flyout.Content()
-              .as<xaml::FrameworkElement>()
-              .FindName(L"EntryPoint")
-              .as<xaml::Controls::TextBox>()
-              .Text(L"");
-        }
-      });
-
-      auto cancelButton = configureUI.FindName(L"Cancel").as<xaml::Controls::Button>();
-      cancelButton.Click([this](auto const & /*sender*/, xaml::RoutedEventArgs const & /*args*/) noexcept { Hide(); });
-
-      m_flyout = xaml::Controls::Flyout{};
-      m_flyout.Content(configureUI);
-      if (Is19H1OrHigher()) {
-        // ShouldConstrainToRootBounds added in 19H1
-        m_flyout.ShouldConstrainToRootBounds(false);
-      }
-
-      configureUI.Tag(*this);
-      m_flyout.Closing([](xaml::Controls::Primitives::FlyoutBase const &sender,
-                          xaml::Controls::Primitives::FlyoutBaseClosingEventArgs const & /*args*/) noexcept {
-        // Remove the tag to disconnect the ref cycle
-        sender.as<xaml::Controls::Flyout>().Content().as<xaml::FrameworkElement>().Tag(nullptr);
-      });
-
-      xaml::UIElement root{nullptr};
-      auto xamlRoot = winrt::Microsoft::ReactNative::XamlUIService::GetXamlRoot(reactHost->Options().Properties);
-      if (xamlRoot) {
-        m_flyout.XamlRoot(xamlRoot);
-        root = xamlRoot.Content();
-      } else {
-        auto window = xaml::Window::Current();
-        root = window.Content();
-      }
-
-      m_flyout.LightDismissOverlayMode(xaml::Controls::LightDismissOverlayMode::On);
-      configureUI.XYFocusKeyboardNavigation(xaml::Input::XYFocusKeyboardNavigationMode::Enabled);
-
-      auto style = xaml::Style(winrt::xaml_typename<xaml::Controls::FlyoutPresenter>());
-      style.Setters().Append(xaml::Setter(
-          xaml::Controls::ScrollViewer::HorizontalScrollBarVisibilityProperty(),
-          winrt::box_value(xaml::Controls::ScrollBarVisibility::Disabled)));
-      style.Setters().Append(xaml::Setter(
-          xaml::Controls::ScrollViewer::VerticalScrollBarVisibilityProperty(),
-          winrt::box_value(xaml::Controls::ScrollBarVisibility::Disabled)));
-      style.Setters().Append(xaml::Setter(
-          xaml::Controls::ScrollViewer::HorizontalScrollModeProperty(),
-          winrt::box_value(xaml::Controls::ScrollMode::Disabled)));
-      style.Setters().Append(xaml::Setter(
-          xaml::Controls::ScrollViewer::VerticalScrollModeProperty(),
-          winrt::box_value(xaml::Controls::ScrollMode::Disabled)));
-
-      m_flyout.FlyoutPresenterStyle(style);
-      m_flyout.ShowAt(root.as<xaml::FrameworkElement>());
-    }
-  }
-  void Hide() noexcept {
-    if (!m_flyout)
-      return;
-    auto localFlyout = m_flyout;
-    m_flyout = nullptr;
-    localFlyout.Hide();
-  }
-
-  const Mso::WeakPtr<Mso::React::IReactHost> m_weakReactHost;
-
-  xaml::Controls::Flyout m_flyout{nullptr};
-};
-
-void ShowConfigureBundlerDialog(Mso::WeakPtr<Mso::React::IReactHost> weakReactHost) {
-  winrt::make<ConfigureBundlerDlg>(weakReactHost);
-}
-
-} // namespace Microsoft::ReactNative

package/Microsoft.ReactNative/Views/ConfigureBundlerDlg.h

@@ -1,11 +0,0 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT License.
-#pragma once
-
-#include <ReactHost/React.h>
-
-namespace Microsoft::ReactNative {
-
-void ShowConfigureBundlerDialog(Mso::WeakPtr<Mso::React::IReactHost> weakReactHost);
-
-} // namespace Microsoft::ReactNative

package/Microsoft.ReactNative/Views/ControlViewManager.cpp

@@ -1,143 +0,0 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT License.
-
-#include "pch.h"
-
-#include <UI.Xaml.Controls.h>
-
-#include <Views/ControlViewManager.h>
-#include <Views/FrameworkElementTransferProperties.h>
-#include <Views/ShadowNodeBase.h>
-
-#include <JSValueWriter.h>
-#include <Utils/PropertyUtils.h>
-
-#include <UI.Xaml.Automation.Peers.h>
-
-#ifdef USE_WINUI3
-#define TAB_INDEX_PROPERTY xaml::UIElement::TabIndexProperty
-#define TAB_STOP_PROPERTY xaml::UIElement::IsTabStopProperty
-#else
-#define TAB_INDEX_PROPERTY xaml::Controls::Control::TabIndexProperty
-#define TAB_STOP_PROPERTY xaml::Controls::Control::IsTabStopProperty
-#endif
-
-namespace Microsoft::ReactNative {
-
-ControlViewManager::ControlViewManager(const Mso::React::IReactContext &context) : Super(context) {}
-
-void ControlViewManager::GetNativeProps(const winrt::Microsoft::ReactNative::IJSValueWriter &writer) const {
-  Super::GetNativeProps(writer);
-  winrt::Microsoft::ReactNative::WriteProperty(writer, L"tabIndex", L"number");
-  winrt::Microsoft::ReactNative::WriteProperty(writer, L"focusable", L"boolean");
-  winrt::Microsoft::ReactNative::WriteProperty(writer, L"disabled", L"boolean");
-}
-void ControlViewManager::TransferProperties(const XamlView &oldView, const XamlView &newView) {
-  TransferProperty(oldView, newView, xaml::Controls::Control::FontSizeProperty());
-  TransferProperty(oldView, newView, xaml::Controls::Control::FontFamilyProperty());
-  TransferProperty(oldView, newView, xaml::Controls::Control::FontWeightProperty());
-  TransferProperty(oldView, newView, xaml::Controls::Control::FontStyleProperty());
-  TransferProperty(oldView, newView, xaml::Controls::Control::CharacterSpacingProperty());
-  TransferProperty(oldView, newView, xaml::Controls::Control::IsTextScaleFactorEnabledProperty());
-  TransferProperty(oldView, newView, xaml::Controls::Control::BackgroundProperty());
-  TransferProperty(oldView, newView, xaml::Controls::Control::BorderBrushProperty());
-  TransferProperty(oldView, newView, xaml::Controls::Control::BorderThicknessProperty());
-  TransferProperty(oldView, newView, xaml::Controls::Control::PaddingProperty());
-  TransferProperty(oldView, newView, xaml::Controls::Control::ForegroundProperty());
-  TransferProperty(oldView, newView, TAB_INDEX_PROPERTY());
-  TransferProperty(oldView, newView, TAB_STOP_PROPERTY());
-
-  // Control.CornerRadius is only supported on >= RS5
-  if (oldView.try_as<xaml::Controls::IControl7>() && newView.try_as<xaml::Controls::IControl7>()) {
-    TransferProperty(oldView, newView, xaml::Controls::Control::CornerRadiusProperty());
-  }
-  Super::TransferProperties(oldView, newView);
-}
-
-bool ControlViewManager::UpdateProperty(
-    ShadowNodeBase *nodeToUpdate,
-    const std::string &propertyName,
-    const winrt::Microsoft::ReactNative::JSValue &propertyValue) {
-  auto control(nodeToUpdate->GetView().as<xaml::Controls::Control>());
-
-  bool implementsPadding = nodeToUpdate->ImplementsPadding();
-  bool finalizeBorderRadius{false};
-  bool ret = true;
-
-  if (control != nullptr) {
-    if (TryUpdateBackgroundBrush(control, propertyName, propertyValue)) {
-    } else if (TryUpdateBorderProperties(nodeToUpdate, control, propertyName, propertyValue)) {
-    } else if (TryUpdateForeground(control, propertyName, propertyValue)) {
-    } else if (TryUpdateCornerRadiusOnNode(nodeToUpdate, control, propertyName, propertyValue)) {
-      finalizeBorderRadius = true;
-    } else if (implementsPadding && TryUpdatePadding(nodeToUpdate, control, propertyName, propertyValue)) {
-    } else if (propertyName == "tabIndex") {
-      if (propertyValue.Type() == winrt::Microsoft::ReactNative::JSValueType::Double ||
-          propertyValue.Type() == winrt::Microsoft::ReactNative::JSValueType::Int64) {
-        auto tabIndex = propertyValue.AsDouble();
-        if (tabIndex == static_cast<int32_t>(tabIndex))
-          control.ClearValue(TAB_INDEX_PROPERTY());
-        control.TabIndex(static_cast<int32_t>(tabIndex));
-      } else if (propertyValue.IsNull()) {
-        control.ClearValue(TAB_INDEX_PROPERTY());
-      }
-    } else if (propertyName == "focusable") {
-      if (propertyValue.Type() == winrt::Microsoft::ReactNative::JSValueType::Boolean) {
-        nodeToUpdate->IsFocusable(propertyValue.AsBoolean());
-      } else if (propertyValue.IsNull()) {
-        nodeToUpdate->IsFocusable(false);
-      }
-    } else if (propertyName == "disabled") {
-      if (propertyValue.Type() == winrt::Microsoft::ReactNative::JSValueType::Boolean) {
-        nodeToUpdate->IsDisable(propertyValue.AsBoolean());
-      }
-    } else {
-      if (propertyName == "accessible") {
-        if (propertyValue.Type() == winrt::Microsoft::ReactNative::JSValueType::Boolean) {
-          nodeToUpdate->IsAccessible(propertyValue.AsBoolean());
-        }
-      }
-      ret = Super::UpdateProperty(nodeToUpdate, propertyName, propertyValue);
-    }
-  }
-  if (finalizeBorderRadius && control.try_as<xaml::Controls::IControl7>()) {
-    // Control.CornerRadius is only supported on >= RS5, setting borderRadius on Controls have no effect < RS5
-    UpdateCornerRadiusOnElement(nodeToUpdate, control);
-  }
-  return ret;
-}
-
-void ControlViewManager::SetLayoutProps(
-    ShadowNodeBase &nodeToUpdate,
-    const XamlView &viewToUpdate,
-    float left,
-    float top,
-    float width,
-    float height) {
-  Super::SetLayoutProps(nodeToUpdate, viewToUpdate, left, top, width, height);
-  if (viewToUpdate.try_as<xaml::Controls::IControl7>() &&
-      viewToUpdate.ReadLocalValue(xaml::Controls::Control::CornerRadiusProperty()) !=
-          xaml::DependencyProperty::UnsetValue()) {
-    const auto maxCornerRadius = std::min(width, height) / 2;
-    UpdateCornerRadiusOnElement(&nodeToUpdate, viewToUpdate.as<xaml::Controls::Control>(), maxCornerRadius);
-  }
-}
-
-void ControlViewManager::OnPropertiesUpdated(ShadowNodeBase *node) {
-  auto control(node->GetView().as<xaml::Controls::Control>());
-  const auto isTabStop = !node->IsDisable() && node->IsFocusable();
-  const auto accessibilityView = node->IsAccessible() ? xaml::Automation::Peers::AccessibilityView::Content
-                                                      : xaml::Automation::Peers::AccessibilityView::Raw;
-  control.IsTabStop(isTabStop);
-  xaml::Automation::AutomationProperties::SetAccessibilityView(control, accessibilityView);
-}
-
-void ControlViewManager::OnViewCreated(XamlView view) {
-  // Set the default cornerRadius to 0 for Control: WinUI usually default cornerRadius to 2
-  // Only works on >= RS5 because Control.CornerRadius is only supported >= RS5
-  if (auto control = view.try_as<xaml::Controls::IControl7>()) {
-    control.CornerRadius({0, 0, 0, 0});
-  }
-}
-
-} // namespace Microsoft::ReactNative

package/Microsoft.ReactNative/Views/ControlViewManager.h

@@ -1,38 +0,0 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT License.
-
-#pragma once
-
-#include "FrameworkElementViewManager.h"
-
-namespace Microsoft::ReactNative {
-
-struct ShadowNodeBase;
-
-class REACTWINDOWS_EXPORT ControlViewManager : public FrameworkElementViewManager {
-  using Super = FrameworkElementViewManager;
-
- public:
-  ControlViewManager(const Mso::React::IReactContext &context);
-
-  void GetNativeProps(const winrt::Microsoft::ReactNative::IJSValueWriter &writer) const override;
-  bool UpdateProperty(
-      ShadowNodeBase *nodeToUpdate,
-      const std::string &propertyName,
-      const winrt::Microsoft::ReactNative::JSValue &propertyValue) override;
-  void TransferProperties(const XamlView &oldView, const XamlView &newView) override;
-  void SetLayoutProps(
-      ShadowNodeBase &nodeToUpdate,
-      const XamlView &viewToUpdate,
-      float left,
-      float top,
-      float width,
-      float height) override;
-
- protected:
-  void OnViewCreated(XamlView view) override;
-
-  void OnPropertiesUpdated(ShadowNodeBase *node) override;
-};
-
-} // namespace Microsoft::ReactNative

package/Microsoft.ReactNative/Views/DebuggingOverlayViewManager.cpp

@@ -1,53 +0,0 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT License.
-
-#include "pch.h"
-
-#include <UI.Xaml.Controls.h>
-
-#include <Views/DebuggingOverlayViewManager.h>
-
-#include <JSValueWriter.h>
-
-namespace Microsoft::ReactNative {
-
-namespace DebuggingOverlayCommands {
-constexpr const char *Draw = "draw";
-}; // namespace DebuggingOverlayCommands
-
-DebuggingOverlayViewManager::DebuggingOverlayViewManager(const Mso::React::IReactContext &context) : Super(context) {}
-
-const wchar_t *DebuggingOverlayViewManager::GetName() const {
-  return L"DebuggingOverlay";
-}
-
-void DebuggingOverlayViewManager::GetNativeProps(const winrt::Microsoft::ReactNative::IJSValueWriter &writer) const {
-  Super::GetNativeProps(writer);
-}
-
-void DebuggingOverlayViewManager::GetCommands(const winrt::Microsoft::ReactNative::IJSValueWriter &writer) const {
-  // Upstream JS will dispatch the string directly instead of ever actually calling this, but providing a real
-  // implementation is simple enough in case anything changes.
-  writer.WritePropertyName(winrt::to_hstring(DebuggingOverlayCommands::Draw));
-  writer.WriteString(winrt::to_hstring(DebuggingOverlayCommands::Draw));
-}
-
-XamlView DebuggingOverlayViewManager::CreateViewCore(
-    int64_t /*tag*/,
-    const winrt::Microsoft::ReactNative::JSValueObject &) {
-  return xaml::Controls::Canvas();
-}
-
-void DebuggingOverlayViewManager::DispatchCommand(
-    const XamlView &viewToUpdate,
-    const std::string &commandId,
-    winrt::Microsoft::ReactNative::JSValueArray &&commandArgs) {
-  if (commandId == DebuggingOverlayCommands::Draw) {
-    // The current spec has a Draw command -- but this will be replaced with some different commands in
-    // https://github.com/facebook/react-native/pull/42119
-    // There is little point in attempting to implement these commands until then.
-    return;
-  }
-}
-
-} // namespace Microsoft::ReactNative

package/Microsoft.ReactNative/Views/DebuggingOverlayViewManager.h

@@ -1,30 +0,0 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT License.
-
-#pragma once
-
-#include "FrameworkElementViewManager.h"
-
-namespace Microsoft::ReactNative {
-
-struct ShadowNodeBase;
-
-class REACTWINDOWS_EXPORT DebuggingOverlayViewManager : public FrameworkElementViewManager {
-  using Super = FrameworkElementViewManager;
-
- public:
-  DebuggingOverlayViewManager(const Mso::React::IReactContext &context);
-
-  const wchar_t *GetName() const override;
-  void GetNativeProps(const winrt::Microsoft::ReactNative::IJSValueWriter &writer) const override;
-  void GetCommands(const winrt::Microsoft::ReactNative::IJSValueWriter &writer) const override;
-  XamlView DebuggingOverlayViewManager::CreateViewCore(
-      int64_t /*tag*/,
-      const winrt::Microsoft::ReactNative::JSValueObject &) override;
-  void DispatchCommand(
-      const XamlView &viewToUpdate,
-      const std::string &commandId,
-      winrt::Microsoft::ReactNative::JSValueArray &&commandArgs) override;
-};
-
-} // namespace Microsoft::ReactNative