Skip to content

Commit 58af745

Browse files
huynhsontunghuynhsontung
committed
Merge remote-tracking branch 'upstream/main' into rsb-reorganize
2 parents ede46a3 + 81504ce commit 58af745

File tree

4 files changed

+93
-3
lines changed

4 files changed

+93
-3
lines changed

‎.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,10 @@ What kind of change does this PR introduce?
3838
Please check if your PR fulfills the following requirements: <!-- and remove the ones that are not applicable to the current PR -->
3939

4040
- [ ] Tested code with current [supported SDKs](../#supported)
41-
- [ ] Pull Request has been submitted to the documentation repository [instructions](../blob/main/Contributing.md#docs). Link: <!-- docs PR link -->
41+
- [ ] New component
42+
- [ ] Pull Request has been submitted to the documentation repository [instructions](../blob/main/Contributing.md#docs). Link: <!-- docs PR link -->
43+
- [ ] Added description of major feature to project description for NuGet package (4000 total character limit, so don't push entire description over that)
44+
- [ ] If control, added to Visual Studio Design project
4245
- [ ] Sample in sample app has been added / updated (for bug fixes / features)
4346
- [ ] Icon has been created (if new sample) following the [Thumbnail Style Guide and templates](https://github.com/CommunityToolkit/WindowsCommunityToolkit-design-assets)
4447
- [ ] New major technical changes in the toolkit have or will be added to the [Wiki](https://github.com/CommunityToolkit/WindowsCommunityToolkit/wiki) e.g. build changes, source generators, testing infrastructure, sample creation changes, etc...
@@ -51,4 +54,4 @@ Please note that breaking changes are likely to be rejected within minor release
5154

5255
## Other information
5356

54-
<!-- Please add any other information that might be helpful to reviewers. -->
57+
<!-- Please add any other information that might be helpful to reviewers. -->

‎Microsoft.Toolkit.Uwp.UI.Controls.Input.Design/Controls/RichSuggestBox.Metadata.cs

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
// Licensed to the .NET Foundation under one or more agreements.
2+
// The .NET Foundation licenses this file to you under the MIT license.
3+
// See the LICENSE file in the project root for more information.
4+
5+
using System.ComponentModel;
6+
7+
using Microsoft.Toolkit.Uwp.UI.Controls.Design.Properties;
8+
9+
using Microsoft.VisualStudio.DesignTools.Extensibility;
10+
using Microsoft.VisualStudio.DesignTools.Extensibility.Metadata;
11+
12+
namespace Microsoft.Toolkit.Uwp.UI.Controls.Design
13+
{
14+
internal class RichSuggestBoxMetadata : AttributeTableBuilder
15+
{
16+
public RichSuggestBoxMetadata()
17+
: base()
18+
{
19+
AddCallback(ControlTypes.RichSuggestBox,
20+
b =>
21+
{
22+
b.AddCustomAttributes(nameof(RichSuggestBox.ClipboardCopyFormat), new CategoryAttribute(Resources.CategoryCommon));
23+
b.AddCustomAttributes(nameof(RichSuggestBox.ClipboardPasteFormat), new CategoryAttribute(Resources.CategoryCommon));
24+
b.AddCustomAttributes(nameof(RichSuggestBox.Description), new CategoryAttribute(Resources.CategoryCommon));
25+
b.AddCustomAttributes(nameof(RichSuggestBox.DisabledFormattingAccelerators), new CategoryAttribute(Resources.CategoryCommon));
26+
b.AddCustomAttributes(nameof(RichSuggestBox.Header), new CategoryAttribute(Resources.CategoryCommon));
27+
b.AddCustomAttributes(nameof(RichSuggestBox.HeaderTemplate),
28+
new CategoryAttribute(Resources.CategoryAppearance),
29+
new EditorBrowsableAttribute(EditorBrowsableState.Advanced)
30+
);
31+
b.AddCustomAttributes(nameof(RichSuggestBox.PlaceholderText), new CategoryAttribute(Resources.CategoryAppearance));
32+
b.AddCustomAttributes(nameof(RichSuggestBox.PopupCornerRadius), new CategoryAttribute(Resources.CategoryAppearance));
33+
b.AddCustomAttributes(nameof(RichSuggestBox.PopupFooter), new CategoryAttribute(Resources.CategoryCommon));
34+
b.AddCustomAttributes(nameof(RichSuggestBox.PopupFooterTemplate),
35+
new CategoryAttribute(Resources.CategoryAppearance),
36+
new EditorBrowsableAttribute(EditorBrowsableState.Advanced)
37+
);
38+
b.AddCustomAttributes(nameof(RichSuggestBox.PopupHeader), new CategoryAttribute(Resources.CategoryCommon));
39+
b.AddCustomAttributes(nameof(RichSuggestBox.PopupHeaderTemplate),
40+
new CategoryAttribute(Resources.CategoryAppearance),
41+
new EditorBrowsableAttribute(EditorBrowsableState.Advanced)
42+
);
43+
b.AddCustomAttributes(nameof(RichSuggestBox.PopupPlacement), new CategoryAttribute(Resources.CategoryCommon));
44+
b.AddCustomAttributes(nameof(RichSuggestBox.Prefixes), new CategoryAttribute(Resources.CategoryCommon));
45+
b.AddCustomAttributes(nameof(RichSuggestBox.RichEditBoxStyle), new CategoryAttribute(Resources.CategoryAppearance));
46+
b.AddCustomAttributes(nameof(RichSuggestBox.TokenBackground), new CategoryAttribute(Resources.CategoryBrush));
47+
b.AddCustomAttributes(nameof(RichSuggestBox.TokenForeground), new CategoryAttribute(Resources.CategoryBrush));
48+
b.AddCustomAttributes(new ToolboxCategoryAttribute(ToolboxCategoryPaths.Toolkit, false));
49+
}
50+
);
51+
}
52+
}
53+
}

‎Microsoft.Toolkit.Uwp.UI.Controls.Input.Design/Controls/RichSuggestBox.Typedata.cs

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
// Licensed to the .NET Foundation under one or more agreements.
2+
// The .NET Foundation licenses this file to you under the MIT license.
3+
// See the LICENSE file in the project root for more information.
4+
5+
namespace Microsoft.Toolkit.Uwp.UI.Controls.Design
6+
{
7+
internal static partial class ControlTypes
8+
{
9+
internal const string RichSuggestBox = RootNamespace + "." + nameof(RichSuggestBox);
10+
}
11+
12+
internal static class RichSuggestBox
13+
{
14+
internal const string PlaceholderText = nameof(PlaceholderText);
15+
internal const string RichEditBoxStyle = nameof(RichEditBoxStyle);
16+
internal const string Header = nameof(Header);
17+
internal const string HeaderTemplate = nameof(HeaderTemplate);
18+
internal const string Description = nameof(Description);
19+
internal const string PopupPlacement = nameof(PopupPlacement);
20+
internal const string PopupCornerRadius = nameof(PopupCornerRadius);
21+
internal const string PopupHeader = nameof(PopupHeader);
22+
internal const string PopupHeaderTemplate = nameof(PopupHeaderTemplate);
23+
internal const string PopupFooter = nameof(PopupFooter);
24+
internal const string PopupFooterTemplate = nameof(PopupFooterTemplate);
25+
internal const string TokenBackground = nameof(TokenBackground);
26+
internal const string TokenForeground = nameof(TokenForeground);
27+
internal const string Prefixes = nameof(Prefixes);
28+
internal const string ClipboardPasteFormat = nameof(ClipboardPasteFormat);
29+
internal const string ClipboardCopyFormat = nameof(ClipboardCopyFormat);
30+
internal const string DisabledFormattingAccelerators = nameof(DisabledFormattingAccelerators);
31+
}
32+
}

‎Microsoft.Toolkit.Uwp.UI.Controls.Input.Design/Microsoft.Toolkit.Uwp.UI.Controls.Input.DesignTools.csproj

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
1+
<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
22
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
33
<PropertyGroup>
44
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -84,6 +84,8 @@
8484
<Compile Include="Controls\RadialGauge.Typedata.cs" />
8585
<Compile Include="Controls\RangeSelector.Metadata.cs" />
8686
<Compile Include="Controls\RangeSelector.Typedata.cs" />
87+
<Compile Include="Controls\RichSuggestBox.Typedata.cs" />
88+
<Compile Include="Controls\RichSuggestBox.Metadata.cs" />
8789
<Compile Include="Properties\AssemblyInfo.cs">
8890
<SubType>Code</SubType>
8991
</Compile>

0 commit comments

Comments
 (0)