microsoft
/
react-native-xaml
зеркало из https://github.com/microsoft/react-native-xaml.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Merge pull request #208 from asklar/menuflyoutsubitem 

Add support for MenuFlyoutSubItem
This commit is contained in:
Alexander Sklar 2022-06-21 11:56:59 -07:00 коммит произвёл GitHub
Родитель 7b61900ddf bf91d14933
Коммит 73cc7be092
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 4AEE18F83AFDEB23
9 изменённых файлов: 180 добавлений и 63 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

92
.clang-format Normal file
Просмотреть файл

@ -0,0 +1,92 @@
---
AccessModifierOffset: -1
AlignAfterOpenBracket: AlwaysBreak
AlignConsecutiveAssignments: false
AlignConsecutiveDeclarations: false
AlignEscapedNewlinesLeft: true
AlignOperands: false
AlignTrailingComments: false
AllowAllParametersOfDeclarationOnNextLine: false
AllowShortBlocksOnASingleLine: false
AllowShortCaseLabelsOnASingleLine: false
AllowShortFunctionsOnASingleLine: Empty
AllowShortIfStatementsOnASingleLine: false
AllowShortLoopsOnASingleLine: false
AlwaysBreakAfterReturnType: None
AlwaysBreakBeforeMultilineStrings: true
AlwaysBreakTemplateDeclarations: true
BinPackArguments: false
BinPackParameters: false
BraceWrapping:
AfterClass: false
AfterControlStatement: false
AfterEnum: false
AfterFunction: false
AfterNamespace: false
AfterObjCDeclaration: false
AfterStruct: false
AfterUnion: false
BeforeCatch: false
BeforeElse: false
IndentBraces: false
BreakBeforeBinaryOperators: None
BreakBeforeBraces: Attach
BreakBeforeTernaryOperators: true
BreakConstructorInitializersBeforeComma: false
BreakAfterJavaFieldAnnotations: false
BreakStringLiterals: false
ColumnLimit: 120
CommentPragmas: '^ IWYU pragma:'
ConstructorInitializerAllOnOneLineOrOnePerLine: true
ConstructorInitializerIndentWidth: 4
ContinuationIndentWidth: 4
Cpp11BracedListStyle: true
DerivePointerAlignment: false
DisableFormat: false
ForEachMacros: [ FOR_EACH_RANGE, FOR_EACH, TEST_CLASS, TEST_CLASS_EX ]
IncludeBlocks: Preserve
IncludeCategories:
- Regex: 'pch.h'
Priority: -1
- Regex: '.*\.g\..*'
Priority: 1
- Regex: '^<.*\.h(pp)?>'
Priority: 2
- Regex: '^<.*'
Priority: 3
- Regex: '.*'
Priority: 4
IndentCaseLabels: true
IndentWidth: 2
IndentWrappedFunctionNames: false
KeepEmptyLinesAtTheStartOfBlocks: false
MacroBlockBegin: ''
MacroBlockEnd: ''
MaxEmptyLinesToKeep: 1
NamespaceIndentation: None
ObjCBlockIndentWidth: 2
ObjCSpaceAfterProperty: true
ObjCSpaceBeforeProtocolList: true
PenaltyBreakBeforeFirstCallParameter: 1
PenaltyBreakComment: 300
PenaltyBreakFirstLessLess: 120
PenaltyBreakString: 1000
PenaltyExcessCharacter: 1000000
PenaltyReturnTypeOnItsOwnLine: 200
PointerAlignment: Right
ReflowComments: true
SortIncludes: true
SpaceAfterCStyleCast: false
SpaceBeforeAssignmentOperators: true
SpaceBeforeParens: ControlStatements
SpaceInEmptyParentheses: false
SpacesBeforeTrailingComments: 1
SpacesInAngles: false
SpacesInContainerLiterals: true
SpacesInCStyleCastParentheses: false
SpacesInParentheses: false
SpacesInSquareBrackets: false
Standard: Cpp11
TabWidth: 8
UseTab: Never
...

4
CONTRIBUTING.md
Просмотреть файл

@ -11,7 +11,9 @@ This project has adopted the [Microsoft Open Source Code of Conduct](https://ope
5. For all other changes: run `yarn build` in src folder so that related files are generated
6. Run from Visual Studio to see output.
7. Once changes are ready, run `yarn change` at the root of the repository to create a patch (it will ask for a description of the change). The version scheme we use is [SemVer](https://semver.org/)
8. Open a pull request and address review feedback.
8. Update the package version by running `yarn bump`
9. Open a pull request and address review feedback.
10. After the PR is merged, manually trigger a publish from GitHub to publish to npm.
## Technical details:
You can find more details to setting up in the [Technical Guide](TechnicalGuide.md).

16
USAGE.md
Просмотреть файл

@ -73,6 +73,22 @@ If you have questions about a scenario you don't see below, please [file an issu
setIsOpen(true); }} />
```
Menus can contain cascading items:
```jsx
<MenuFlyout ...>
<MenuFlyoutSubItem text='subitem 1'>
<MenuFlyoutItem text='item 1'/>
<MenuFlyoutItem text='item 2'/>
<MenuFlyoutItem text='item 3'/>
</MenuFlyoutSubItem>
<MenuFlyoutSubItem text='subitem 2'>
<MenuFlyoutItem text='item 4'/>
<MenuFlyoutItem text='item 5'/>
<MenuFlyoutItem text='item 6'/>
</MenuFlyoutSubItem>
</MenuFlyout>
```
## MenuBar
```jsx
<MenuBar>

2
package.json
Просмотреть файл

@ -5,7 +5,7 @@
"scripts": {
"build": "tsc --project package",
"change": "beachball change",
"bump": "beachball bump && pushd package && yarn codegen && popd"
"bump": "beachball bump && nuget restore example\\windows && pushd package && yarn codegen && popd"
},
"repository": {
"type": "git",

15
package/CHANGELOG.json
Просмотреть файл

@ -1,6 +1,21 @@
{
"name": "react-native-xaml",
"entries": [
{
"date": "Tue, 21 Jun 2022 18:27:36 GMT",
"tag": "react-native-xaml_v0.0.64",
"version": "0.0.64",
"comments": {
"patch": [
{
"author": "asklar@microsoft.com",
"package": "react-native-xaml",
"comment": "Add support for MenuFlyoutSubitem",
"commit": "851778b1147310116a9f803126e5261469bc6857"
}
]
}
},
{
"date": "Wed, 13 Apr 2022 21:16:52 GMT",
"tag": "react-native-xaml_v0.0.63",

10
package/CHANGELOG.md
Просмотреть файл

@ -1,9 +1,17 @@
# Change Log - react-native-xaml
This log was last generated on Wed, 13 Apr 2022 21:16:52 GMT and should not be manually modified.
This log was last generated on Tue, 21 Jun 2022 18:27:36 GMT and should not be manually modified.
<!-- Start content -->
## 0.0.64
Tue, 21 Jun 2022 18:27:36 GMT
### Patches
- Add support for MenuFlyoutSubitem (asklar@microsoft.com)
## 0.0.63
Wed, 13 Apr 2022 21:16:52 GMT

2
package/package.json
Просмотреть файл

@ -1,7 +1,7 @@
{
"name": "react-native-xaml",
"title": "React Native Xaml",
"version": "0.0.63",
"version": "0.0.64",
"description": "Allows using XAML directly, inside of a React Native Windows app",
"main": "lib/index.js",
"typings": "lib/index.d.ts",

2
package/windows/ReactNativeXaml/Codegen/Version.g.h
Просмотреть файл

@ -7,4 +7,4 @@ THIS FILE WAS AUTOMATICALLY GENERATED, DO NOT MODIFY MANUALLY
#define VERSION_MAJOR 0
#define VERSION_MINOR 0
#define VERSION_REVISION 0
#define VERSION_BUILD 63
#define VERSION_BUILD 64

100
package/windows/ReactNativeXaml/XamlViewManager.cpp
Просмотреть файл

@ -58,7 +58,7 @@ namespace winrt::ReactNativeXaml {
const JSValueObject& propertyMap = JSValue::ReadObjectFrom(propertyMapReader);
auto e = view;
auto e = view;
auto cn = get_class_name(e);
if (auto control = e.try_as<DependencyObject>()) {
for (auto const& pair : propertyMap) {
@ -72,12 +72,9 @@ namespace winrt::ReactNativeXaml {
prop->SetValue(realObject, propertyValue, m_reactContext);
handled = true;
continue;
}
else if (auto eventAttacher = m_xamlMetadata->AttachEvent(m_reactContext, propertyName, control, propertyValue.AsBoolean())) {
} else if (auto eventAttacher = m_xamlMetadata->AttachEvent(m_reactContext, propertyName, control, propertyValue.AsBoolean())) {
continue;
}
else if (propertyName == "type") { continue; }
else {
} else if (propertyName == "type") { continue; } else {
//cdebug << "[react-native-xaml] Unhandled call to UpdateProperties " << propertyName << " on view: " << cn << "\n";
//auto className = winrt::get_class_name(e);
//if (IsDebuggerPresent()) {
@ -127,7 +124,7 @@ namespace winrt::ReactNativeXaml {
void XamlViewManager::ReactContext(IReactContext reactContext) noexcept {
m_reactContext = reactContext;
m_xamlMetadata = std::make_shared<XamlMetadata>();
React::ReactContext ctx(reactContext);
auto vm = this->get_strong().as<IViewManager>();
ctx.Properties().Set(XamlViewManagerProperty(), vm);
@ -152,45 +149,38 @@ namespace winrt::ReactNativeXaml {
}
if (auto childFlyout = childContent.try_as<Controls::Primitives::FlyoutBase>()) {
wrapper.DataContext(e);
const auto& childUI = childFE.as<UIElement>();
auto priority = GetPriority<MenuFlyoutPriority>(childUI);
if (priority == MenuFlyoutPriority::Context) {
if (auto button = e.try_as<Button>()) {
return button.Flyout(childFlyout);
}
else {
} else {
if (auto uiParent = e.try_as<UIElement>()) {
return uiParent.ContextFlyout(childFlyout);
}
}
}
else {
} else {
return Primitives::FlyoutBase::SetAttachedFlyout(e, childFlyout);
}
}
else if (auto RTBparent = parent.try_as<RichTextBlock>()) {
} else if (auto RTBparent = parent.try_as<RichTextBlock>()) {
if (auto childBlock = childContent.try_as<Documents::Block>()) {
return RTBparent.Blocks().InsertAt(index, childBlock);
}
}
else if (auto TBparent = parent.try_as<TextBlock>()) {
} else if (auto TBparent = parent.try_as<TextBlock>()) {
if (auto childInline = childContent.try_as<Documents::Inline>()) {
return TBparent.Inlines().InsertAt(index, childInline);
}
}
else if (auto paragraphParent = Unwrap<Documents::Paragraph>(parent)) {
} else if (auto paragraphParent = Unwrap<Documents::Paragraph>(parent)) {
if (auto childInline = childContent.try_as<Documents::Inline>()) {
return paragraphParent.Inlines().InsertAt(index, childInline);
}
}
else if (auto spanParent = Unwrap<Documents::Span>(parent)) {
} else if (auto spanParent = Unwrap<Documents::Span>(parent)) {
if (auto childInline = childContent.try_as<Documents::Inline>()) {
return spanParent.Inlines().InsertAt(index, childInline);
}
}
else if (auto childKeyboardAccelerator = childContent.try_as<xaml::Input::KeyboardAccelerator>()) {
} else if (auto childKeyboardAccelerator = childContent.try_as<xaml::Input::KeyboardAccelerator>()) {
if (auto uiParent = parent.try_as<UIElement>()) {
return uiParent.KeyboardAccelerators().Append(childKeyboardAccelerator);
}
@ -208,14 +198,12 @@ namespace winrt::ReactNativeXaml {
if (priority == NavigationViewPriority::MenuItem) {
return navView.MenuItems().Append(child);
}
}
else if (auto navViewMUX = e.try_as<mux::Controls::NavigationView>()) {
} else if (auto navViewMUX = e.try_as<mux::Controls::NavigationView>()) {
auto childCN = winrt::get_class_name(child);
auto priority = GetPriority<NavigationViewPriority>(child);
if (priority == NavigationViewPriority::MenuItem) {
return navViewMUX.MenuItems().Append(child);
}
else if (priority == NavigationViewPriority::FooterMenuItem) {
} else if (priority == NavigationViewPriority::FooterMenuItem) {
return navViewMUX.FooterMenuItems().Append(child);
}
}
@ -224,8 +212,7 @@ namespace winrt::ReactNativeXaml {
if (auto childIconElement = child.try_as<IconElement>()) {
return navViewItem.Icon(childIconElement);
}
}
else if (auto muxNavViewItem = e.try_as<mux::Controls::NavigationViewItem>()) {
} else if (auto muxNavViewItem = e.try_as<mux::Controls::NavigationViewItem>()) {
if (auto childIconElement = child.try_as<IconElement>()) {
return muxNavViewItem.Icon(childIconElement);
}
@ -235,8 +222,7 @@ namespace winrt::ReactNativeXaml {
const auto priority = GetPriority<SplitViewPriority>(child);
if (priority == SplitViewPriority::Content && splitview.Content() == nullptr) {
return splitview.Content(child);
}
else if (priority == SplitViewPriority::Pane && splitview.Pane() == nullptr) {
} else if (priority == SplitViewPriority::Pane && splitview.Pane() == nullptr) {
return splitview.Pane(child);
}
}
@ -274,8 +260,7 @@ namespace winrt::ReactNativeXaml {
if (auto contentCtrl = e.try_as<ContentControl>()) {
if (index == 0 || contentCtrl.Content() == nullptr) {
return contentCtrl.Content(child);
}
else {
} else {
assert(false && "Parent is a ContentControl, but it already has a child");
}
}
@ -302,30 +287,35 @@ namespace winrt::ReactNativeXaml {
return menuFlyoutItem.Icon(childIcon);
}
}
if (auto menuFlyoutSubItem = e.try_as<MenuFlyoutSubItem>()) {
if (auto childMenuItem = child.try_as<MenuFlyoutItemBase>()) {
return menuFlyoutSubItem.Items().Append(childMenuItem);
}
}
if (auto infoBar = e.try_as<mux::Controls::InfoBar>()) {
if (auto buttonBase = child.try_as<Controls::Primitives::ButtonBase>()) {
return infoBar.ActionButton(buttonBase);
}
}
if (auto menuBar = e.try_as<MenuBar>()) {
if (auto mbi = child.try_as<MenuBarItem>()) {
return menuBar.Items().InsertAt(index, mbi);
}
if (auto mbi = child.try_as<MenuBarItem>()) {
return menuBar.Items().InsertAt(index, mbi);
}
}
if (auto muxMenuBar = e.try_as<mux::Controls::MenuBar>()) {
if (auto mbi = child.try_as<mux::Controls::MenuBarItem>()) {
return muxMenuBar.Items().InsertAt(index, mbi);
}
if (auto mbi = child.try_as<mux::Controls::MenuBarItem>()) {
return muxMenuBar.Items().InsertAt(index, mbi);
}
}
if (auto menuBarItem = e.try_as<MenuBarItem>()) {
if (auto mfi = child.try_as<MenuFlyoutItemBase>()) {
return menuBarItem.Items().InsertAt(index,mfi);
}
if (auto mfi = child.try_as<MenuFlyoutItemBase>()) {
return menuBarItem.Items().InsertAt(index, mfi);
}
}
if (auto muxMenuBarItem = e.try_as<mux::Controls::MenuBarItem>()) {
if (auto mfi = child.try_as<MenuFlyoutItemBase>()) {
return muxMenuBarItem.Items().InsertAt(index, mfi);
}
if (auto mfi = child.try_as<MenuFlyoutItemBase>()) {
return muxMenuBarItem.Items().InsertAt(index, mfi);
}
}
//else
{
@ -338,42 +328,36 @@ namespace winrt::ReactNativeXaml {
auto e = parent;
if (auto panel = e.try_as<Panel>()) {
return panel.Children().Clear();
}
else if (auto contentCtrl = e.try_as<ContentControl>()) {
} else if (auto contentCtrl = e.try_as<ContentControl>()) {
return contentCtrl.Content(nullptr);
}
else if (auto border = e.try_as<Border>()) {
} else if (auto border = e.try_as<Border>()) {
return border.Child(nullptr);
}
else if (auto itemsControl = e.try_as<ItemsControl>()) {
} else if (auto itemsControl = e.try_as<ItemsControl>()) {
return itemsControl.Items().Clear();
}
auto parentType = get_class_name(e);
cdebug << "[react-native-xaml] Unhandled call to RemoveAllChildren with parent: " << parentType
<< "\n";
<< "\n";
}
void XamlViewManager::RemoveChildAt(xaml::FrameworkElement parent, int64_t index) {
auto e = parent;
if (auto panel = e.try_as<Panel>()) {
return panel.Children().RemoveAt(static_cast<uint32_t>(index));
}
else if (auto itemsControl = e.try_as<ItemsControl>()) {
} else if (auto itemsControl = e.try_as<ItemsControl>()) {
return itemsControl.Items().RemoveAt(static_cast<uint32_t>(index));
}
else if (index == 0) {
} else if (index == 0) {
if (auto contentCtrl = e.try_as<ContentControl>()) {
return contentCtrl.Content(nullptr);
}
else if (auto border = e.try_as<Border>()) {
} else if (auto border = e.try_as<Border>()) {
return border.Child(nullptr);
}
}
auto parentType = get_class_name(e);
cdebug << "[react-native-xaml] Unhandled call to RemoveChildAt with parent: " << parentType
<< ", index: " << index << "\n";
<< ", index: " << index << "\n";
}
void XamlViewManager::ReplaceChild(xaml::FrameworkElement parent, xaml::UIElement oldChild, xaml::UIElement newChild) {