diff --git a/components/Animations/samples/Animations.md b/components/Animations/samples/Animations.md
index a66f6add..29a653d0 100644
--- a/components/Animations/samples/Animations.md
+++ b/components/Animations/samples/Animations.md
@@ -6,7 +6,7 @@ keywords: Animations, Effects, Layout, Composition, animationset
dev_langs:
- csharp
category: Animations
-subcategory: Layout
+subcategory: Effects
discussion-id: 0
issue-id: 0
icon: Assets/ImplicitAnimations.png
diff --git a/components/Animations/samples/ConnectedAnimations.md b/components/Animations/samples/ConnectedAnimations.md
index 47b015aa..f78b1d7d 100644
--- a/components/Animations/samples/ConnectedAnimations.md
+++ b/components/Animations/samples/ConnectedAnimations.md
@@ -6,7 +6,7 @@ keywords: Animations, Effects, Layout, Composition, animationset, animation, coo
dev_langs:
- csharp
category: Animations
-subcategory: Layout
+subcategory: Effects
discussion-id: 0
issue-id: 0
icon: Assets/ConnectedAnimations.png
diff --git a/components/Behaviors/samples/Assets/AnimationSet.png b/components/Behaviors/samples/Assets/AnimationSet.png
index 4e8f924f..d12f585d 100644
Binary files a/components/Behaviors/samples/Assets/AnimationSet.png and b/components/Behaviors/samples/Assets/AnimationSet.png differ
diff --git a/components/Behaviors/samples/Behaviors.Animations.md b/components/Behaviors/samples/Behaviors.Animations.md
index 67c2d8a1..c7687c67 100644
--- a/components/Behaviors/samples/Behaviors.Animations.md
+++ b/components/Behaviors/samples/Behaviors.Animations.md
@@ -5,8 +5,8 @@ description: A collection of animations that can be grouped together.
keywords: Behaviors, animations, animationset, xaml, visual, composition
dev_langs:
- csharp
-category: Xaml
-subcategory: Behaviors
+category: Animations
+subcategory: Miscellaneous
discussion-id: 0
issue-id: 0
icon: Assets/AnimationSet.png
@@ -125,7 +125,7 @@ Here's an example of how all these various explicit animations can be combined t
## Behaviors
-If you are also referencing the `Microsoft.Toolkit.Uwp.UI.Behaviors` package, it will be possible to also use behaviors and actions to better support the new APIs, such as by automatically triggering an animation when a given event is raised, entirely from XAML. There are four main types being introduced in this package that interoperate with the Animation APIs:
+If you are also referencing the `Behaviors` package, it will be possible to also use behaviors and actions to better support the new APIs, such as by automatically triggering an animation when a given event is raised, entirely from XAML. There are four main types being introduced in this package that interoperate with the Animation APIs:
- [`AnimationStartedTriggerBehavior`](/dotnet/api/microsoft.toolkit.uwp.ui.behaviors.AnimationStartedTriggerBehavior) and [`AnimationCompletedTriggerBehavior`](/dotnet/api/microsoft.toolkit.uwp.ui.behaviors.AnimationCompletedTriggerBehavior): these are custom triggers that can be used to execute `IAction`-s when an `AnimationSet` starts or completes. All the built-in `IAction` objects can be used from the Behaviors package, as well as custom ones as well.
- [`StartAnimationAction`](/dotnet/api/microsoft.toolkit.uwp.ui.behaviors.StartAnimationAction): an `IAction` object that can be used within behaviors to easily start a target animation, either with an attached UI element or with an explicit target to animate.
@@ -164,7 +164,7 @@ This makes it possible to also not having to name the target UI element, to regi
## Effect animations
-Lastly, the `AnimationSet` class can also directly animate Composition/Win2D effects. To gain access to this feature, you will need to also reference the `Microsoft.Toolkit.Uwp.UI.Media`. This package includes some special animation types that can be plugged in into an `AnimationSet` instance and used to animate individual effects within a custom effects graph. This can then be used either from a [PipelineBrush](/dotnet/api/microsoft.toolkit.uwp.ui.media.pipelinebrush) or from an inline graph attached to a UI element through the [`PipelineVisualFactory`](/dotnet/api/microsoft.toolkit.uwp.ui.media.PipelineVisualFactory) type. All these effect animations are powered by the same `AnimationBuilder` type behind the scenes, and can facilitate creating complex animations on specific effects within a graph.
+Lastly, the `AnimationSet` class can also directly animate Composition/Win2D effects. To gain access to this feature, you will need to also reference the `CommunityToolkit.WinUI.Media`. This package includes some special animation types that can be plugged in into an `AnimationSet` instance and used to animate individual effects within a custom effects graph. This can then be used either from a [PipelineBrush](/dotnet/api/microsoft.toolkit.uwp.ui.media.pipelinebrush) or from an inline graph attached to a UI element through the [`PipelineVisualFactory`](/dotnet/api/microsoft.toolkit.uwp.ui.media.PipelineVisualFactory) type. All these effect animations are powered by the same `AnimationBuilder` type behind the scenes, and can facilitate creating complex animations on specific effects within a graph.
Here is an example of how the new `PipelineVisualFactory` type can be combined with these effect animations:
diff --git a/components/CameraPreview/samples/CameraPreview.md b/components/CameraPreview/samples/CameraPreview.md
index 9b863b11..bc047d9e 100644
--- a/components/CameraPreview/samples/CameraPreview.md
+++ b/components/CameraPreview/samples/CameraPreview.md
@@ -6,7 +6,7 @@ keywords: CameraPreview, Control, skommireddi
dev_langs:
- csharp
category: Controls
-subcategory: Layout
+subcategory: Media
discussion-id: 0
issue-id: 0
icon: Assets/CameraPreview.png
diff --git a/components/Collections/samples/AdvancedCollectionView.md b/components/Collections/samples/AdvancedCollectionView.md
index dd83aae1..bace1cc8 100644
--- a/components/Collections/samples/AdvancedCollectionView.md
+++ b/components/Collections/samples/AdvancedCollectionView.md
@@ -27,7 +27,7 @@ In your viewmodel instead of having a public [IEnumerable](/dotnet/core/api/syst
## Example
```csharp
-using Microsoft.Toolkit.Uwp.UI;
+using CommunityToolkit.WinUI;
// Grab a sample type
public class Person
diff --git a/components/Converters/samples/Converters.md b/components/Converters/samples/Converters.md
index 7854e707..90ec6f37 100644
--- a/components/Converters/samples/Converters.md
+++ b/components/Converters/samples/Converters.md
@@ -6,7 +6,7 @@ keywords: Converters, Control, Layout
dev_langs:
- csharp
category: Xaml
-subcategory: None
+subcategory: Miscellaneous
discussion-id: 0
issue-id: 0
icon: Assets/Converters.png
diff --git a/components/Extensions/samples/Assets/ShadowAnimation.png b/components/Extensions/samples/Assets/ShadowAnimation.png
new file mode 100644
index 00000000..7a34b77c
Binary files /dev/null and b/components/Extensions/samples/Assets/ShadowAnimation.png differ
diff --git a/components/Extensions/samples/AttachedCardShadow.md b/components/Extensions/samples/AttachedCardShadow.md
new file mode 100644
index 00000000..8ac08e22
--- /dev/null
+++ b/components/Extensions/samples/AttachedCardShadow.md
@@ -0,0 +1,40 @@
+---
+title: Attached Card Shadow
+author: michael-hawker
+description: Attach performant and easy to use shadows powered by Win2D.
+keywords: shadow, shadows, dropshadow, dropshadowpanel, attachedshadow, attacheddropshadow, attachedcardshadow
+dev_langs:
+ - csharp
+category: Extensions
+subcategory: Shadows
+discussion-id: 0
+issue-id: 0
+icon: Assets/Shadow.png
+---
+
+The `AttachedCardShadow` is the easiest to use and most performant shadow. It is recommended to use it where possible, if taking a Win2D dependency is not a concern. It's only drawbacks are the extra dependency required and that it only supports rectangular and rounded-rectangular geometries (as described in the table above).
+
+The great benefit to the `AttachedCardShadow` is that no extra surface or element is required to add the shadow. This reduces the complexity required in development and allows shadows to easily be added at any point in the development process. It also supports transparent elements, without displaying the shadow behind them!
+
+The example shows how easy it is to not only apply an `AttachedCardShadow` to an element, but use it in a style to apply to multiple elements as well:
+
+```xaml
+ xmlns:ui="using:CommunityToolkit.WinUI"
+ xmlns:media="using:CommunityToolkit.WinUI.Media"/>
+
+
+
+
+
+
+
+
+
+
+
+```
diff --git a/components/Extensions/samples/AttachedDropShadow.md b/components/Extensions/samples/AttachedDropShadow.md
index 5064ea61..412b9ca0 100644
--- a/components/Extensions/samples/AttachedDropShadow.md
+++ b/components/Extensions/samples/AttachedDropShadow.md
@@ -2,11 +2,11 @@
title: Attached Drop Shadow
author: michael-hawker
description: Allows many elements to share a common backdrop for casting shadows.
-keywords: Effects, Control, Layout
+keywords: shadow, shadows, dropshadow, dropshadowpanel, attachedshadow, attacheddropshadow, attachedcardshadow
dev_langs:
- csharp
category: Extensions
-subcategory: Media
+subcategory: Shadows
discussion-id: 0
issue-id: 0
icon: Assets/Shadow.png
diff --git a/components/Extensions/samples/AttachedShadows.md b/components/Extensions/samples/AttachedShadows.md
index 1545dcd1..705fb216 100644
--- a/components/Extensions/samples/AttachedShadows.md
+++ b/components/Extensions/samples/AttachedShadows.md
@@ -1,20 +1,18 @@
---
-title: Attached Shadows
+title: Shadows overview
author: michael-hawker
description: Attached Shadows allow you to easily create shadow effects on elements.
keywords: shadow, shadows, dropshadow, dropshadowpanel, attachedshadow, attacheddropshadow, attachedcardshadow
dev_langs:
- csharp
category: Extensions
-subcategory: Media
+subcategory: Shadows
discussion-id: 0
issue-id: 0
icon: Assets/Shadow.png
---
> **Platform APIs:** [`AttachedCardShadow`](/dotnet/api/microsoft.toolkit.uwp.ui.media.attachedcardshadow), [`AttachedDropShadow`](/dotnet/api/microsoft.toolkit.uwp.ui.attacheddropshadow)
-## Introduction
-
There are two types of attached shadows available today, the `AttachedCardShadow` and the `AttachedDropShadow`. It is recommended to use the `AttachedCardShadow` where possible, if you don't mind the dependency on Win2D. The `AttachedCardShadow` provides an easier to use experience that is more performant and easier to apply across an entire set of elements, assuming those elements are rounded-rectangular in shape. The `AttachedDropShadow` provides masking support and can be leveraged in any UWP app without adding an extra dependency.
### Capability Comparison
@@ -23,7 +21,7 @@ The following table outlines the various capabilities of each shadow type in add
| Capability | AttachedCardShadow | AttachedDropShadow | DropShadowPanel (deprecated) |
|-------------------------------|--------------------------------------------------------------------|-----------------------------------------------------------------|-----------------------------------------------------------------------------------------|
-| Dependency/NuGet Package | 🟡 Win2D via `Microsoft.Toolkit.Uwp.UI.Media` | ✅ Framework Only (Composition Effect) `CommunityToolkit.WinUI.Effects` | ✅ Framework Only (Composition Effect) `Microsoft.Toolkit.Uwp.UI.Controls` (legacy) |
+| Dependency/NuGet Package | 🟡 Win2D via `CommunityToolkit.WinUI.Media` | ✅ Framework Only (Composition Effect) `CommunityToolkit.WinUI.Effects` | ✅ Framework Only (Composition Effect) `Microsoft.Toolkit.Uwp.UI.Controls` (legacy) |
| Layer | Inline Composition + Win2D Clip Geometry | Composition via Target Element Backdrop | Composition via `ContentControl` Container |
| Modify Visual Tree | ✅ No | 🟡 Usually requires single target element, even for multiple shadows | ❌ Individually wrap each element needing shadow |
| Extra Visual Tree Depth | ✅ 0 | 🟡 1 per sibling element to cast one or more shadows to | ❌ _**4** per Shadowed Element_ |
@@ -40,105 +38,12 @@ The `AttachedCardShadow` is the easiest to use and most performant shadow. It is
The great benefit to the `AttachedCardShadow` is that no extra surface or element is required to add the shadow. This reduces the complexity required in development and allows shadows to easily be added at any point in the development process. It also supports transparent elements, without displaying the shadow behind them!
-### Example
-
-The example shows how easy it is to not only apply an `AttachedCardShadow` to an element, but use it in a style to apply to multiple elements as well:
-
-```xaml
- xmlns:ui="using:CommunityToolkit.WinUI"
- xmlns:media="using:CommunityToolkit.WinUI.Media"/>
-
-
-
-
-
-
-
-
-
-
-
-```
-
## AttachedDropShadow (Composition)
The `AttachedDropShadow` provides masking support to a wide variety of elements including transparent images, shapes, and text. Masking to a custom shape that's not rectangular or rounded-rectangular is the main scenario where an `AttachedDropShadow` will be useful. Unlike it's predecessor, the [`DropShadowPanel`](../Controls/DropShadowPanel.md), the `AttachedDropShadow` doesn't need to wrap the element being shadowed; however, it does require another element to cast the shadow on to.
This makes it a bit more complex to use than the `AttachedCardShadow` and the `DropShadowPanel`, but since multiple `AttachedDropShadow` elements can share the same surface, this makes it much more performant than its predecessor.
-> [!SAMPLE AttachedDropShadowBasicSample]
-
### Remarks
While `DropShadowPanel` encapsulated the complexities of adding a shadow, it added a lot of depth and complexity to the visual tree. `AttachedDropShadow` instead requires that you provide the surface where the shadows should be cast, such as a common backdrop element. This means that each shadow can use the same shared surface rather than creating its own backdrop element for each shadow (like `DropShadowPanel` did). This slight trade-off for ease-of-use is a gain in performance. However, it does mean it may not be as flexible for certain use cases with manipulation of an element. In those cases we recommend to try and use `AttachedCardShadow` instead or wrapping an element and its backdrop in a custom control.
-
-### Example
-
-The following example shows how to use an `AttachedDropShadow` as a resource with a `TextBlock` to mask the shadow of some text:
-
-```xaml
-
-
-
-
-
-
-
-
-```
-
-## Animation
-
-Either type of Attached Shadow can be easily animated using the Toolkit's [`AnimationSet`](../animations/AnimationSet.md) api. These provide an easy XAML based way to animate a wide variety of elements, including a variety of shadow properties. They can also be animated with any other composition animation technique in code-behind as well using either the [`AnimationBuilder`](../animations/AnimationBuilder.md) or built-in composition animations.
-
-> **Platform APIs:** [`BlurRadiusDropShadowAnimation`](/dotnet/api/microsoft.toolkit.uwp.ui.animations.blurradiusdropshadowanimation), [`ColorDropShadowAnimation`](/dotnet/api/microsoft.toolkit.uwp.ui.animations.colordropshadowanimation), [`OffsetDropShadowAnimation`](/dotnet/api/microsoft.toolkit.uwp.ui.animations.offsetdropshadowanimation), [`OpacityDropShadowAnimation`](/dotnet/api/microsoft.toolkit.uwp.ui.animations.opacitydropshadowanimation)
-
-> [!NOTE]
-> `AttachedCardShadow` has better support for animations which involve translation of the element along with the shadow. If animating an `AttachedDropShadow` it is best to only animate the shadow itself vs. moving the element it is attached to. This can cause the shadow and element to be desynchronized.
-
-> [!div class="nextstepaction"]
-> [Try it in the sample app](uwpct://animations?sample=shadow%20animations)
-
-### Example
-
-The following example uses a combination of behaviors and animations apis to create an animated shadow effect when hovering over an image with an [`OffsetDropShadowAnimation`](/dotnet/api/microsoft.toolkit.uwp.ui.animations.offsetdropshadowanimation):
-
-```xaml
- xmlns:ui="using:CommunityToolkit.WinUI"
- xmlns:media="using:CommunityToolkit.WinUI.Media"
- xmlns:interactivity="using:Microsoft.Xaml.Interactivity"
- xmlns:interactions="using:Microsoft.Xaml.Interactions.Core"
- xmlns:ani="using:CommunityToolkit.WinUI.Animations"
- xmlns:behaviors="using:CommunityToolkit.WinUI.Behaviors"/>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-```
diff --git a/components/Extensions/samples/DispatcherQueueExtensions.md b/components/Extensions/samples/DispatcherQueueExtensions.md
index 90aa4a83..884a5501 100644
--- a/components/Extensions/samples/DispatcherQueueExtensions.md
+++ b/components/Extensions/samples/DispatcherQueueExtensions.md
@@ -6,7 +6,7 @@ keywords: dispatcher, dispatcherqueue, DispatcherHelper, DispatcherQueueExtensio
dev_langs:
- csharp
category: Extensions
-subcategory: None
+subcategory: Miscellaneous
discussion-id: 0
issue-id: 0
icon: Assets/Extensions.png
diff --git a/components/Extensions/samples/EnumValuesExtension.md b/components/Extensions/samples/EnumValuesExtension.md
index dd9ab4d1..eac81805 100644
--- a/components/Extensions/samples/EnumValuesExtension.md
+++ b/components/Extensions/samples/EnumValuesExtension.md
@@ -36,7 +36,7 @@ Binding to an enum property can be accomplished like so:
```xaml
diff --git a/components/Extensions/samples/Extensions.Samples.csproj b/components/Extensions/samples/Extensions.Samples.csproj
index 33af7944..4b4a26fd 100644
--- a/components/Extensions/samples/Extensions.Samples.csproj
+++ b/components/Extensions/samples/Extensions.Samples.csproj
@@ -9,6 +9,7 @@
+
@@ -20,5 +21,8 @@
PreserveNewest
+
+ PreserveNewest
+
diff --git a/components/Extensions/samples/HyperlinkExtensions.md b/components/Extensions/samples/HyperlinkExtensions.md
index bdecbb3f..6ec1d08b 100644
--- a/components/Extensions/samples/HyperlinkExtensions.md
+++ b/components/Extensions/samples/HyperlinkExtensions.md
@@ -6,7 +6,7 @@ keywords: windows 10, uwp, windows community toolkit, uwp community toolkit, uwp
dev_langs:
- csharp
category: Extensions
-subcategory: Input
+subcategory: Controls
discussion-id: 0
issue-id: 0
icon: Assets/Extensions.png
diff --git a/components/Extensions/samples/IconMarkupExtensions.md b/components/Extensions/samples/IconMarkupExtensions.md
index b211f8ca..cc72eaa6 100644
--- a/components/Extensions/samples/IconMarkupExtensions.md
+++ b/components/Extensions/samples/IconMarkupExtensions.md
@@ -1,5 +1,5 @@
---
-title: Icon markup extensions
+title: Icon extensions
author: sergio0694
description: The FontIcon, FontIconSource and BitmapIcon markup extensions allow developers to easily declare these types of icons directly from XAML in a compact manner.
keywords: markup extension, XAML, markup, fonticon, fonticonsource, bitmapicon
diff --git a/components/Extensions/samples/ListViewExtensions.md b/components/Extensions/samples/ListViewExtensions.md
index 3fdd6c93..5a3b57ab 100644
--- a/components/Extensions/samples/ListViewExtensions.md
+++ b/components/Extensions/samples/ListViewExtensions.md
@@ -6,7 +6,7 @@ keywords: ListViewBase, extensions
dev_langs:
- csharp
category: Extensions
-subcategory: Layout
+subcategory: Controls
discussion-id: 0
issue-id: 0
icon: Assets/Extensions.png
@@ -124,7 +124,7 @@ await MyGridView.SmoothScrollIntoViewWithItemAsync(item: object, itemPlacement:
### Methods
| Methods | Return Type | Description |
-| -- | -- | -- |
+|---------|-------------|-------------|
| SmoothScrollIntoViewWithIndexAsync(int, ScrollItemPlacement, bool, bool, int, int) | Task | Smooth scroll item into view With index number |
| SmoothScrollIntoViewWithItemAsync(object, ScrollItemPlacement, bool, bool, int, int) | Task | Smooth scroll item into view With item object |
diff --git a/components/Extensions/samples/NullableBoolExtension.md b/components/Extensions/samples/NullableBoolExtension.md
index 0ef2e760..77bbd237 100644
--- a/components/Extensions/samples/NullableBoolExtension.md
+++ b/components/Extensions/samples/NullableBoolExtension.md
@@ -6,7 +6,7 @@ keywords: nullable bool, dependency property, markup extension, XAML, markup
dev_langs:
- csharp
category: Extensions
-subcategory: Media
+subcategory: Miscellaneous
discussion-id: 0
issue-id: 0
icon: Assets/Extensions.png
diff --git a/components/Extensions/samples/ScrollViewerExtensions.md b/components/Extensions/samples/ScrollViewerExtensions.md
index f0122f89..cc45f989 100644
--- a/components/Extensions/samples/ScrollViewerExtensions.md
+++ b/components/Extensions/samples/ScrollViewerExtensions.md
@@ -6,7 +6,7 @@ keywords: windows 10, uwp, windows community toolkit, uwp community toolkit, uwp
dev_langs:
- csharp
category: Extensions
-subcategory: Layout
+subcategory: Controls
discussion-id: 0
issue-id: 0
icon: Assets/Extensions.png
@@ -23,7 +23,7 @@ The `ScrollBarMargin` property provides a way to assign a [`Thickness`](/dotnet/
Here is how this property can be used in XAML:
```xaml
-
+
diff --git a/components/Extensions/samples/ShadowAnimations.md b/components/Extensions/samples/ShadowAnimations.md
new file mode 100644
index 00000000..d94c147a
--- /dev/null
+++ b/components/Extensions/samples/ShadowAnimations.md
@@ -0,0 +1,57 @@
+---
+title: Shadow animations
+author: michael-hawker
+description: Animating Attached Shadows
+keywords: shadow, shadows, dropshadow, dropshadowpanel, attachedshadow, attacheddropshadow, attachedcardshadow
+dev_langs:
+ - csharp
+category: Animations
+subcategory: Shadows
+discussion-id: 0
+issue-id: 0
+icon: Assets/ShadowAnimation.png
+---
+
+Either type of Attached Shadow can be easily animated using the Toolkit's [`AnimationSet`](../animations/AnimationSet.md) api. These provide an easy XAML based way to animate a wide variety of elements, including a variety of shadow properties. They can also be animated with any other composition animation technique in code-behind as well using either the [`AnimationBuilder`](../animations/AnimationBuilder.md) or built-in composition animations.
+
+> **Platform APIs:** [`BlurRadiusDropShadowAnimation`](/dotnet/api/microsoft.toolkit.uwp.ui.animations.blurradiusdropshadowanimation), [`ColorDropShadowAnimation`](/dotnet/api/microsoft.toolkit.uwp.ui.animations.colordropshadowanimation), [`OffsetDropShadowAnimation`](/dotnet/api/microsoft.toolkit.uwp.ui.animations.offsetdropshadowanimation), [`OpacityDropShadowAnimation`](/dotnet/api/microsoft.toolkit.uwp.ui.animations.opacitydropshadowanimation)
+
+> [!NOTE]
+> `AttachedCardShadow` has better support for animations which involve translation of the element along with the shadow. If animating an `AttachedDropShadow` it is best to only animate the shadow itself vs. moving the element it is attached to. This can cause the shadow and element to be desynchronized.
+
+### Example
+
+The following example uses a combination of behaviors and animations apis to create an animated shadow effect when hovering over an image with an [`OffsetDropShadowAnimation`](/dotnet/api/microsoft.toolkit.uwp.ui.animations.offsetdropshadowanimation):
+
+```xaml
+ xmlns:ui="using:CommunityToolkit.WinUI"
+ xmlns:media="using:CommunityToolkit.WinUI.Media"
+ xmlns:interactivity="using:Microsoft.Xaml.Interactivity"
+ xmlns:interactions="using:Microsoft.Xaml.Interactions.Core"
+ xmlns:ani="using:CommunityToolkit.WinUI.Animations"
+ xmlns:behaviors="using:CommunityToolkit.WinUI.Behaviors"/>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+```
diff --git a/components/Extensions/samples/StringExtensions.md b/components/Extensions/samples/StringExtensions.md
index 1271caf9..915e7409 100644
--- a/components/Extensions/samples/StringExtensions.md
+++ b/components/Extensions/samples/StringExtensions.md
@@ -6,7 +6,7 @@ keywords: windows 10, uwp, windows community toolkit, uwp community toolkit, uwp
dev_langs:
- csharp
category: Extensions
-subcategory: Input
+subcategory: Miscellaneous
discussion-id: 0
issue-id: 0
icon: Assets/Extensions.png
diff --git a/components/Extensions/samples/TextBoxExtensions.md b/components/Extensions/samples/TextBoxExtensions.md
index 2c5400fc..9ff59623 100644
--- a/components/Extensions/samples/TextBoxExtensions.md
+++ b/components/Extensions/samples/TextBoxExtensions.md
@@ -6,7 +6,7 @@ keywords: TextBoxMask, XAML
dev_langs:
- csharp
category: Extensions
-subcategory: Input
+subcategory: Controls
discussion-id: 0
issue-id: 0
icon: Assets/Extensions.png
@@ -43,7 +43,7 @@ In case you want to add a custom variable character you can use the `CustomMask`
```xaml
+ xmlns:ui="using:CommunityToolkit.WinUI">
@@ -92,21 +92,21 @@ The validation has 3 modes ([`TextBoxExtensions.ValidationMode`](/dotnet/api/mic
```xaml
```
@@ -125,7 +125,7 @@ The `SurfaceDialOptions` property adds features from the Surface Dial control to
```xaml
+ xmlns:ui="using:CommunityToolkit.WinUI">
[!SAMPLE SettingsExpanderItemsSourceSample]
NOTE: Due to [a bug](https://github.com/microsoft/microsoft-ui-xaml/issues/3842) related to the `ItemsRepeater` used in `SettingsExpander`, there might be visual glitches whenever the `SettingsExpander` expands and a `MaxWidth` is set on a parent `StackPanel`. As a workaround, the `StackPanel` (that has the `MaxWidth` set) can be wrapped in a `Grid` to overcome this issue. See the `SettingsPageExample` for snippet.
+
+### Settings page example
+
+The following sample provides a typical design page, following the correct Windows 11 design specifications for things like spacing, section headers and animations.
+
+> [!SAMPLE SettingsPageExample]
diff --git a/components/SettingsControls/samples/SettingsPageExample.md b/components/SettingsControls/samples/SettingsPageExample.md
deleted file mode 100644
index 2855303b..00000000
--- a/components/SettingsControls/samples/SettingsPageExample.md
+++ /dev/null
@@ -1,15 +0,0 @@
----
-title: Settings page (example)
-author: niels9001
-description: A full example of building a Windows 11 style settings experience with SettingsCard and SettingsExpander.
-keywords: SettingsCard, SettingsExpander, Example, Control, Layout, Settings
-dev_langs:
- - csharp
-category: Controls
-subcategory: Layout
-discussion-id: 0
-issue-id: 0
-icon: Assets/SettingsExpander.png
----
-
-> [!SAMPLE SettingsPageExample]
diff --git a/components/Sizers/samples/ContentSizer.md b/components/Sizers/samples/ContentSizer.md
index 7a0e67ac..fcb6aa1a 100644
--- a/components/Sizers/samples/ContentSizer.md
+++ b/components/Sizers/samples/ContentSizer.md
@@ -6,7 +6,7 @@ keywords: ContentSizer, SizerBase, Control, Layout, Expander, Splitter
dev_langs:
- csharp
category: Controls
-subcategory: Layout
+subcategory: Sizers
discussion-id: 96
issue-id: 101
icon: Assets/ContentSizer.png
diff --git a/components/Sizers/samples/GridSplitter.md b/components/Sizers/samples/GridSplitter.md
index cefcb476..02d40a9b 100644
--- a/components/Sizers/samples/GridSplitter.md
+++ b/components/Sizers/samples/GridSplitter.md
@@ -6,7 +6,7 @@ keywords: ContentSizer, SizerBase, Control, Layout, Expander
dev_langs:
- csharp
category: Controls
-subcategory: Layout
+subcategory: Sizers
discussion-id: 96
issue-id: 101
icon: Assets/GridSplitter.png
diff --git a/components/Sizers/samples/PropertySizer.md b/components/Sizers/samples/PropertySizer.md
index 2883a4a6..126d0ab0 100644
--- a/components/Sizers/samples/PropertySizer.md
+++ b/components/Sizers/samples/PropertySizer.md
@@ -6,7 +6,7 @@ keywords: PropertySizer, SizerBase, Control, Layout, NavigationView, Splitter
dev_langs:
- csharp
category: Controls
-subcategory: Layout
+subcategory: Sizers
discussion-id: 96
issue-id: 101
icon: Assets/PropertySizer.png
diff --git a/components/Sizers/samples/SizerControls.md b/components/Sizers/samples/SizerControls.md
index 47d4ce46..6b7d570e 100644
--- a/components/Sizers/samples/SizerControls.md
+++ b/components/Sizers/samples/SizerControls.md
@@ -1,12 +1,12 @@
---
-title: Sizer Controls
+title: Sizer overview
author: mhawker
description: The Sizer controls allow users to resize various parts of your UI easily in a consistent fashion.
keywords: GridSplitter, ContentSizer, PropertySizer, SizerBase, Control, Layout, Expander, Grid, Splitter
dev_langs:
- csharp
category: Controls
-subcategory: Layout
+subcategory: Sizers
discussion-id: 96
issue-id: 101
icon: Assets/Sizers.png
diff --git a/components/TokenizingTextBox/samples/TokenizingTextBox.md b/components/TokenizingTextBox/samples/TokenizingTextBox.md
index 407f7926..074186e8 100644
--- a/components/TokenizingTextBox/samples/TokenizingTextBox.md
+++ b/components/TokenizingTextBox/samples/TokenizingTextBox.md
@@ -6,7 +6,7 @@ keywords: TokenizingTextBox, control, tokens
dev_langs:
- csharp
category: Controls
-subcategory: Input
+subcategory: Text
discussion-id: 0
issue-id: 0
icon: Assets/TokenizingTextBox.png
diff --git a/components/Triggers/samples/Triggers.md b/components/Triggers/samples/Triggers.md
index e67cb361..3ff72aeb 100644
--- a/components/Triggers/samples/Triggers.md
+++ b/components/Triggers/samples/Triggers.md
@@ -6,7 +6,7 @@ keywords: CompareStateTrigger, ControlSizeTrigger, FullScreenModeStateTrigger, I
dev_langs:
- csharp
category: Xaml
-subcategory: None
+subcategory: Miscellaneous
discussion-id: 0
issue-id: 0
icon: Assets/Triggers.png
diff --git a/tooling b/tooling
index 86db77d8..c11f75df 160000
--- a/tooling
+++ b/tooling
@@ -1 +1 @@
-Subproject commit 86db77d8b0736d45e5c5b023745261b7970f475d
+Subproject commit c11f75df72b7d02f15426868422072e141829492