Skip to content

Commit f18604f

Browse files
author
msftbot[bot]
authored
Various 7.1 Clean-up Fixes (#4251)
## Fixes #4210 and Fixes #4158 Cleans up sample for #4248 (though underlying issue remains to be figured out later). Fixes a sample and cleans-up a few items we missed in our nuget packages. Just need to validate output from CI, but should be fairly straight-forward. ## PR Type What kind of change does this PR introduce? <!-- Please uncomment one or more options below that apply to this PR. --> <!-- - Bugfix --> <!-- - Feature --> <!-- - Code style update (formatting) --> <!-- - Refactoring (no functional changes, no api changes) --> <!-- - Build or CI related changes --> - Documentation content changes - Sample app changes <!-- - Other... Please describe: --> ## What is the current behavior? TTB Sample was binding to the internal collection instead of showing binding to a developer provided collection. Some new features were missing from the NuGet package info. ## What is the new behavior? Fixed! 🎉 ## PR Checklist Please check if your PR fulfills the following requirements: <!-- and remove the ones that are not applicable to the current PR --> - [ ] Tested code with current [supported SDKs](../#supported) - [ ] New component - [ ] Pull Request has been submitted to the documentation repository [instructions](../blob/main/Contributing.md#docs). Link: <!-- docs PR link --> - [ ] Added description of major feature to project description for NuGet package (4000 total character limit, so don't push entire description over that) - [ ] If control, added to Visual Studio Design project - [ ] Sample in sample app has been added / updated (for bug fixes / features) - [ ] Icon has been created (if new sample) following the [Thumbnail Style Guide and templates](https://github.com/CommunityToolkit/WindowsCommunityToolkit-design-assets) - [ ] 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... - [ ] Tests for the changes have been added (for bug fixes / features) (if applicable) - [ ] Header has been added to all new source files (run _build/UpdateHeaders.bat_) - [ ] Contains **NO** breaking changes <!-- If this PR contains a breaking change, please describe the impact and migration path for existing applications below. Please note that breaking changes are likely to be rejected within minor release cycles or held until major versions. --> ## Other information <!-- Please add any other information that might be helpful to reviewers. -->
2 parents 6fd3327 + 2ac2c51 commit f18604f

File tree

11 files changed

+59
-33
lines changed

11 files changed

+59
-33
lines changed

Microsoft.Toolkit.Uwp.SampleApp/SamplePages/TokenizingTextBox/TokenizingTextBoxPage.xaml.cs

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,9 @@ public sealed partial class TokenizingTextBoxPage : Page, IXamlRenderListener
9090
private AdvancedCollectionView _acv;
9191
private AdvancedCollectionView _acvEmail;
9292

93-
private ObservableCollection<SampleEmailDataType> _selectedEmails;
93+
public ObservableCollection<SampleDataType> SelectedTokens { get; set; }
94+
95+
public ObservableCollection<SampleEmailDataType> SelectedEmails { get; set; }
9496

9597
public TokenizingTextBoxPage()
9698
{
@@ -112,7 +114,10 @@ public TokenizingTextBoxPage()
112114

113115
public void OnXamlRendered(FrameworkElement control)
114116
{
115-
_selectedEmails = new ObservableCollection<SampleEmailDataType>();
117+
SelectedTokens = new();
118+
SelectedEmails = new();
119+
120+
control.DataContext = this;
116121

117122
if (_ttb != null)
118123
{
@@ -150,7 +155,6 @@ public void OnXamlRendered(FrameworkElement control)
150155
{
151156
_ttbEmail = ttbEmail;
152157

153-
_ttbEmail.ItemsSource = _selectedEmails;
154158
_ttbEmail.ItemClick += EmailTokenItemClick;
155159
_ttbEmail.TokenItemAdding += EmailTokenItemAdding;
156160
_ttbEmail.TokenItemAdded += EmailTokenItemAdded;

Microsoft.Toolkit.Uwp.SampleApp/SamplePages/TokenizingTextBox/TokenizingTextBoxXaml.bind

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@
3737
</TextBlock>
3838
<controls:TokenizingTextBox
3939
x:Name="TokenBox"
40+
ItemsSource="{Binding SelectedTokens}"
4041
PlaceholderText="Add Actions"
4142
QueryIcon="{ui:SymbolIconSource Symbol=Setting}"
4243
MaxHeight="104"
@@ -65,14 +66,15 @@
6566
<Run>Current Edit: </Run>
6667
<Run Text="{Binding Text, ElementName=TokenBox}"/>
6768
</TextBlock>
68-
<ItemsControl ItemsSource="{Binding ItemsSource, ElementName=TokenBox}"/>
69+
<ItemsControl ItemsSource="{Binding SelectedTokens}"/>
6970
</StackPanel>
7071

7172
<StackPanel Grid.Row="1">
7273
<TextBlock FontSize="32" Text="Select Email Addresses"
7374
Margin="0,0,0,4"/>
7475
<controls:TokenizingTextBox
7576
x:Name="TokenBoxEmail"
77+
ItemsSource="{Binding SelectedEmails}"
7678
PlaceholderText="Select Names"
7779
MaxHeight="104"
7880
HorizontalAlignment="Stretch"

Microsoft.Toolkit.Uwp.UI.Behaviors/Microsoft.Toolkit.Uwp.UI.Behaviors.csproj

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,16 @@
99
<Title>Windows Community Toolkit - UI Behaviors</Title>
1010
<Description>
1111
This library provides UI behaviors built on the XAML behaviors SDK. It is a part of the Windows Community Toolkit.
12-
13-
Behaviors:
14-
- BehaviorBase: Helper for building Behaviors
12+
13+
- Animation: Various helpers for integration with the Toolkit's Animation package.
1514
- AutoFocusBehevior: Sets focus to the associated control.
16-
- FocusBehavior: Sets focus to a specified control.
17-
- ViewportBehavior: Listening for element to enter or exit the ScrollViewer viewport
15+
- AutoSelectBehavior: Selects a TextBox's text automatically.
1816
- FadeHeaderBehavior, QuickReturnHeaderBehavior, StickyHeaderBehavior: Helpers for ListViewBase Header Behavior
17+
- FocusBehavior: Sets focus to a specified control.
18+
- KeyDownTriggerBehavior: Trigger behaviors when a key is pressed.
19+
- ViewportBehavior: Listening for element to enter or exit the ScrollViewer viewport
1920
</Description>
20-
<PackageTags>UI;XAML;Behaviors;Interactivity;Interaction;Focus;Header;Viewport</PackageTags>
21+
<PackageTags>UI;XAML;Behaviors;Interactivity;Interaction;Focus;Header;Viewport;Selection;Focus;KeyDown;Triggers;Viewport</PackageTags>
2122
</PropertyGroup>
2223

2324
<ItemGroup>

Microsoft.Toolkit.Uwp.UI.Controls.Core/Microsoft.Toolkit.Uwp.UI.Controls.Core.csproj

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
- ImageEx: Images are downloaded asynchronously showing a load indicator and can be stored in a local cache.
1717
- InAppNotification: Show local notifications in your application.
1818
- Loading: Helps to show content with animation to the user while the app is doing some calculation.
19+
- MetadataControl: Control for organizing text based categories with a separator, supports commands.
1920
- RadialProgressBar: Displays progress as a circle getting filled.
2021
- RotatorTile: Rotates through a set of items one-by-one like a live-tile.
2122
- TabbedCommandBar: A command bar that organizes features of an application into a series of tabs.
@@ -29,6 +30,7 @@
2930
Image;Ex ;ImageEx ;
3031
In;App;Notification;InAppNotification;InApp ;
3132
Loading ;
33+
Metadata;Tags;
3234
Radial;Progress;Bar;RadialProgressBar;ProgressBar ;
3335
Rotator;Tile ;RotatorTile ;
3436
Tabbed;Command;Bar ;TabbedCommandBar ;CommandBar ;

Microsoft.Toolkit.Uwp.UI.Controls.Input/Microsoft.Toolkit.Uwp.UI.Controls.Input.csproj

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
- RadialGauge: Displays a value within a range, using a needle on a circular face.
1616
- RangeSelector: "Double slider" control for range values.
1717
- RemoteDevicePicker: Remote Device Picker Control for Project Rome.
18+
- RichSuggestBox: RichEditBox which supports at mentioning or tags.
1819
- TokenizingTextBox: An AutoSuggestBox like control which places entered input into easily removed containers for contacts or tags.
1920
</Description>
2021
<PackageTags>
@@ -23,6 +24,7 @@
2324
Radial;Gauge ;RadialGauge ;
2425
Range;Selector ;RangeSelector ;
2526
Remote;Device;Picker;RemoteDevicePicker;DevicePicker;RemoteDevice;
27+
RichEditBox;RichSuggestBox;Suggestions;Mentions;Tags;
2628
Tokenizing;Text;Box ;TokenizingTextBox ;TextBox ;
2729
</PackageTags>
2830
</PropertyGroup>

Microsoft.Toolkit.Uwp.UI.Controls.Primitives/Microsoft.Toolkit.Uwp.UI.Controls.Primitives.csproj

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212

1313
Controls:
1414
- AdaptiveGridView: Presents items in an evenly-spaced set of columns to fill the total available space.
15+
- ConstrainedBox: Constrain child element by aspect ratio, scale, or multiple.
1516
- DockPanel: Define areas where you can arrange child elements either horizontally or vertically, relative to each other.
1617
- StaggeredLayout: Layout of items in a column approach where an item will be added to whichever column has used the least amount of space.
1718
- StaggeredPanel: Layout of items in a column approach where an item will be added to whichever column has used the least amount of space.
@@ -23,6 +24,7 @@
2324
<PackageTags>
2425
Controls;XAML;UI;
2526
Adaptive;Grid;View;AdaptiveGridView;GridView ;AdaptiveGrid ;
27+
Constrained;Box;ConstrainedBox;AspectRatio;Aspect;Scale;Multiple;
2628
Dock;Panel ;DockPanel ;
2729
Staggered;Layout ;StaggeredLayout ;
2830
Staggered;Panel ;StaggeredPanel ;

Microsoft.Toolkit.Uwp.UI.Media/Microsoft.Toolkit.Uwp.UI.Media.csproj

Lines changed: 19 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -7,20 +7,9 @@
77
<PropertyGroup>
88
<Title>Windows Community Toolkit - UI Media</Title>
99
<Description>
10-
This library provides UI brushes. It is a part of the Windows Community Toolkit.
10+
This library provides UI effects which rely on Win2D. It is a part of the Windows Community Toolkit.
1111

12-
Media:
13-
- AcrylicBrush: A custom Brush that that implements an acrylic effect with full control over all parameters.
14-
- BackdropBlurBrush: The BackdropBlurBrush is a Brush that blurs whatever is behind it in the application.
15-
- BackdropGammaTransferBrush: A brush which alters the colors of whatever is behind it in the application by applying a per-channel gamma transfer function.
16-
- BackdropInvertBrush: The BackdropInvertBrush is a Brush which inverts whatever is behind it in the application.
17-
- BackdropSaturationBrush: Brush which applies a SaturationEffect to the Backdrop.
18-
- BackdropSepiaBrush: Brush which applies a SepiaEffect to the Backdrop.
19-
- CanvasBrushBase: Helper Brush class to interop with Win2D Canvas calls.
20-
- ImageBlendBrush: A Brush which blends a BitmapImage to the Backdrop in a given mode.
21-
- PipelineBrush: A Brush that renders a customizable Composition/Win2D effects pipeline
22-
- RadialGradientBrush: This GradientBrush defines its Gradient as an interpolation within an Ellipse.
23-
- TilesBrush: A Brush that displays a tiled image, wrapping at the edges and endlessly repeating.
12+
AttachedCardShadow: Provides an easy-to-use, simple, and performant rounded-rectangle shadow effect.
2413

2514
Effects:
2615
- AcrylicEffect: A custom acrylic effect that can be inserted into a pipeline.
@@ -33,15 +22,28 @@
3322
- TileEffect: An effect that loads an image and replicates it to cover all the available surface area.
3423
- ExposureEffect, GrayscaleEffect, HueRotationEffect and more, mapping to Win2D effects.
3524

25+
Geometry:
26+
- CanvasPathGeometry: A class that parses Win2d Path Mini Language and converts it to CanvasGeometry, CanvasBrush, CanvasStroke, CanvasStrokeStyle or Color.
27+
3628
Helpers:
3729
- SurfaceLoader: A class that can load and draw images and other objects to Win2D surfaces and brushes.
3830

39-
PipelineBuilder: A class that allows to build custom effects pipelines and create CompositionBrush instances from them.
31+
Media:
32+
- AcrylicBrush: A custom Brush that that implements an acrylic effect with full control over all parameters.
33+
- BackdropBlurBrush: The BackdropBlurBrush is a Brush that blurs whatever is behind it in the application.
34+
- BackdropGammaTransferBrush: A brush which alters the colors of whatever is behind it in the application by applying a per-channel gamma transfer function.
35+
- BackdropInvertBrush: The BackdropInvertBrush is a Brush which inverts whatever is behind it in the application.
36+
- BackdropSaturationBrush: Brush which applies a SaturationEffect to the Backdrop.
37+
- BackdropSepiaBrush: Brush which applies a SepiaEffect to the Backdrop.
38+
- CanvasBrushBase: Helper Brush class to interop with Win2D Canvas calls.
39+
- ImageBlendBrush: A Brush which blends a BitmapImage to the Backdrop in a given mode.
40+
- PipelineBrush: A Brush that renders a customizable Composition/Win2D effects pipeline
41+
- RadialGradientBrush: This GradientBrush defines its Gradient as an interpolation within an Ellipse.
42+
- TilesBrush: A Brush that displays a tiled image, wrapping at the edges and endlessly repeating.
4043

41-
Geometry:
42-
- CanvasPathGeometry: A class that parses Win2d Path Mini Language and converts it to CanvasGeometry, CanvasBrush, CanvasStroke, CanvasStrokeStyle or Color.
44+
PipelineBuilder: A class that allows to build custom effects pipelines and create CompositionBrush instances from them.
4345
</Description>
44-
<PackageTags>UI;XAML;Acrylic;Brushes;Blur;Effects;Canvas;Geometry</PackageTags>
46+
<PackageTags>UI;XAML;Acrylic;Brushes;Blur;Effects;Canvas;Geometry;Shadow;Shadows;Animation</PackageTags>
4547
</PropertyGroup>
4648

4749
<ItemGroup>

Microsoft.Toolkit.Uwp.UI/Microsoft.Toolkit.Uwp.UI.csproj

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<PropertyGroup>
1010
<Title>Windows Community Toolkit - UI</Title>
1111
<Description>
12-
This library provides UI components, such as XAML extensions, helpers, converters and more. It is a part of the Windows Community Toolkit.
12+
This library provides various common UI helpers. It is a part of the Windows Community Toolkit.
1313

1414
AdvancedCollectionView: It's a collection view implementation that support filtering, sorting and incremental loading. It's meant to be used in a viewmodel.
1515

@@ -19,6 +19,7 @@
1919

2020
Extensions:
2121
- ApplicationViewExtensions: Provides attached properties for interacting with the ApplicationView on a window (app view).
22+
- AttachedDropShadow: Provides a composition based shadow effect which supports masking.
2223
- FrameworkElementExtensions: Provides attached dependency properties for the FrameworkElement.
2324
- ListViewExtensions: Provides attached dependency properties for the ListViewBase
2425
- LogicalTree: Defines a collection of extensions methods for UI.
@@ -42,8 +43,10 @@
4243
- BindableValueHolder: Holds the value. Can be used to change several objects' properties at a time.
4344
- DependencyPropertyWatcher: Used to Track Changes of a Dependency Property
4445
- ThemeListener: Class which listens for changes to Application Theme or High Contrast Modes and Signals an Event when they occur.
46+
47+
Triggers: Various Visual State Triggers to help trigger VisualStates in a wide variety of scenarios.
4548
</Description>
46-
<PackageTags>UI;XAML;ApplicationView;FrameworkElement;SurfaceDial;Matrix;Mouse;TextBoxMask;TitleBar;VisualTree;Converters;Extensions;Helpers</PackageTags>
49+
<PackageTags>UI;XAML;ApplicationView;FrameworkElement;ListView;SurfaceDial;Matrix;Mouse;TextBoxMask;TitleBar;VisualTree;Converters;Extensions;Helpers</PackageTags>
4750
</PropertyGroup>
4851

4952
<ItemGroup>

Microsoft.Toolkit.Uwp/Microsoft.Toolkit.Uwp.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66

77
<PropertyGroup>
88
<Title>Windows Community Toolkit - Common (UWP)</Title>
9-
<Description>This package includes code only helpers such as Colors conversion tool, Storage file handling, a Stream helper class, etc.</Description>
10-
<PackageTags>Storage;File;Folder;Color;Conversion;Stream;Helpers;Extensions</PackageTags>
9+
<Description>This package includes code only helpers such as Color conversion tool, Storage file handling, a Stream helper class, SystemInformation helpers, etc.</Description>
10+
<PackageTags>Storage;File;Folder;Color;Conversion;Stream;Helpers;Extensions;System;Information</PackageTags>
1111
</PropertyGroup>
1212

1313
<ItemGroup>

Windows Community Toolkit.sln

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Microsoft Visual Studio Solution File, Format Version 12.00
2-
# Visual Studio Version 17
3-
VisualStudioVersion = 17.0.31521.260
2+
# Visual Studio Version 16
3+
VisualStudioVersion = 16.0.31605.320
44
MinimumVisualStudioVersion = 10.0.40219.1
55
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Samples", "Samples", "{9AD30620-667D-433C-9961-8D885EE7B762}"
66
EndProject
@@ -50,6 +50,13 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
5050
Directory.Build.targets = Directory.Build.targets
5151
global.json = global.json
5252
settings.xamlstyler = settings.xamlstyler
53+
build\Windows.Toolkit.Common.props = build\Windows.Toolkit.Common.props
54+
build\Windows.Toolkit.Common.targets = build\Windows.Toolkit.Common.targets
55+
build\Windows.Toolkit.UWP.Build.targets = build\Windows.Toolkit.UWP.Build.targets
56+
build\Windows.Toolkit.UWP.Controls.targets = build\Windows.Toolkit.UWP.Controls.targets
57+
build\Windows.Toolkit.VisualStudio.Design.props = build\Windows.Toolkit.VisualStudio.Design.props
58+
build\Windows.Toolkit.VisualStudio.Design.targets = build\Windows.Toolkit.VisualStudio.Design.targets
59+
build\Windows.Toolkit.Workarounds.Xaml.targets = build\Windows.Toolkit.Workarounds.Xaml.targets
5360
EndProjectSection
5461
EndProject
5562
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Toolkit.Uwp.UI.Controls.Core.DesignTools", "Microsoft.Toolkit.Uwp.UI.Controls.Core.Design\Microsoft.Toolkit.Uwp.UI.Controls.Core.DesignTools.csproj", "{7AEFC959-ED7C-4D96-9E92-72609B40FBE0}"

0 commit comments

Comments
 (0)