fix: add AutomationProperties names to ScrollViewer controls. (#738)

* feat: disable scroll chaining in popup.

* feat: disable scroll chaining in MenuScrollViewer

README.md

@@ -75,14 +75,12 @@ We offer limited free community support for Semi Avalonia and Ursa. If you have
 
 ## Version compatibility
 
-| Semi Design Version | Avalonia Version |
+| Semi Avalonia Version | Avalonia Version |
-|:--------------------|:-----------------|
+|:----------------------|:-----------------|
-| 11.3.7              | 11.3.7           |
+| 11.3.7                | >=11.3.7         |
-| 11.2.1              | >=11.2.1         |
+| 11.2.1                | >=11.2.1         |
-| 11.2.0              | 11.2.0           |
+| 11.2.0                | End of Life      |
-| 11.1.0              | >=11.1.0         |
+| 11.1.x                | End of Life      |
-| 11.0.7              | >=11.0.7         |
-| 11.0.1              | <=11.0.6         |
 
 ## Credits
 

README_CN.md

@@ -75,14 +75,12 @@ dotnet add package Semi.Avalonia.AvaloniaEdit
 
 ## 版本兼容性
 
-| Semi Design Version | Avalonia Version |
+| Semi Avalonia Version | Avalonia Version |
-|:--------------------|:-----------------|
+|:----------------------|:-----------------|
-| 11.3.7              | 11.3.7           |
+| 11.3.7                | >=11.3.7         |
-| 11.2.1              | >=11.2.1         |
+| 11.2.1                | >=11.2.1         |
-| 11.2.0              | 11.2.0           |
+| 11.2.0                | End of Life      |
-| 11.1.0              | >=11.1.0         |
+| 11.1.x                | End of Life      |
-| 11.0.7              | >=11.0.7         |
-| 11.0.1              | <=11.0.6         |
 
 ## 致谢
 

src/Directory.Packages.props

@@ -8,6 +8,6 @@
         <PackageVersion Include="Avalonia" Version="$(AvaloniaVersion)"/>
         <PackageVersion Include="Avalonia.Controls.ColorPicker" Version="$(AvaloniaVersion)"/>
         <PackageVersion Include="Avalonia.Controls.DataGrid" Version="$(DataGridVersion)"/>
-        <PackageVersion Include="Avalonia.Controls.TreeDataGrid" Version="11.0.10"/>
+        <PackageVersion Include="Avalonia.Controls.TreeDataGrid" Version="11.1.1"/>
     </ItemGroup>
 </Project>

src/Semi.Avalonia.TreeDataGrid/Semi.Avalonia.TreeDataGrid.csproj

@@ -2,8 +2,8 @@
 
     <PropertyGroup>
         <TargetFramework>net6.0</TargetFramework>
-        <Version>11.1.1</Version>
+        <Version>11.1.1.1</Version>
-        <PackageReleaseNotes>Update to Semi.Avalonia.TreeDataGrid 11.1.1</PackageReleaseNotes>
+        <PackageReleaseNotes>Update to Semi.Avalonia.TreeDataGrid 11.1.1.1</PackageReleaseNotes>
         <Title>Semi.Avalonia.TreeDataGrid</Title>
     </PropertyGroup>
 

src/Semi.Avalonia/Controls/AutoCompleteBox.axaml

@@ -85,7 +85,8 @@
                                     Foreground="{TemplateBinding Foreground}"
                                     ItemTemplate="{TemplateBinding ItemTemplate}"
                                     ScrollViewer.HorizontalScrollBarVisibility="Auto"
-                                    ScrollViewer.VerticalScrollBarVisibility="Auto" />
+                                    ScrollViewer.VerticalScrollBarVisibility="Auto" 
+                                    ScrollViewer.IsScrollChainingEnabled="False" />
                             </Border>
                         </Popup>
                     </Panel>

src/Semi.Avalonia/Controls/DatePicker.axaml

@@ -2,9 +2,10 @@
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <Design.PreviewWith>
-        <Border Padding="20">
+        <StackPanel Margin="20">
             <DatePickerPresenter />
-        </Border>
+            <DatePicker Width="500" />
+        </StackPanel>
     </Design.PreviewWith>
     <ControlTheme x:Key="{x:Type DatePickerPresenter}" TargetType="DatePickerPresenter">
         <Setter Property="Width" Value="296" />
@@ -141,6 +142,7 @@
         <Setter Property="HorizontalAlignment" Value="Left" />
         <Setter Property="VerticalAlignment" Value="Center" />
         <Setter Property="MinHeight" Value="{DynamicResource DateTimePickerButtonDefaultHeight}" />
+        <Setter Property="MinWidth" Value="296" />
         <Setter Property="Template">
             <ControlTemplate TargetType="DatePicker">
                 <DataValidationErrors>
@@ -152,8 +154,8 @@
                             Name="PART_FlyoutButton"
                             Grid.Column="0"
                             Grid.ColumnSpan="2"
-                            Width="298"
+                            MinWidth="{TemplateBinding MinWidth}"
-                            MinWidth="298"
+                            MaxWidth="{TemplateBinding MaxWidth}"
                             MinHeight="{TemplateBinding MinHeight}"
                             HorizontalAlignment="Stretch"
                             VerticalAlignment="Stretch"

src/Semi.Avalonia/Controls/Menu.axaml

@@ -7,6 +7,7 @@
 
     <ControlTheme x:Key="MenuScrollViewer" TargetType="ScrollViewer">
         <Setter Property="Background" Value="Transparent" />
+        <Setter Property="ScrollViewer.IsScrollChainingEnabled" Value="False" />
         <Setter Property="Template">
             <ControlTemplate TargetType="ScrollViewer">
                 <DockPanel>
@@ -349,7 +350,7 @@
                                 BorderThickness="{DynamicResource MenuFlyoutBorderThickness}"
                                 BoxShadow="{DynamicResource MenuFlyoutBorderBoxShadow}"
                                 CornerRadius="{DynamicResource MenuFlyoutCornerRadius}">
-                                <ScrollViewer Theme="{StaticResource MenuScrollViewer}" CornerRadius="{DynamicResource MenuFlyoutCornerRadius}">
+                                <ScrollViewer Theme="{StaticResource MenuScrollViewer}" IsScrollChainingEnabled="False" CornerRadius="{DynamicResource MenuFlyoutCornerRadius}">
                                     <ItemsPresenter
                                         Name="PART_ItemsPresenter"
                                         Grid.IsSharedSizeScope="True"

src/Semi.Avalonia/Controls/Popup.axaml

@@ -7,6 +7,7 @@
         <Setter Property="FontSize" Value="{DynamicResource DefaultFontSize}" />
         <Setter Property="FontWeight" Value="{DynamicResource DefaultFontWeight}" />
         <Setter Property="FontFamily" Value="{DynamicResource DefaultFontFamily}" />
+        <Setter Property="Inline.TextDecorations" Value="" />
         <Setter Property="Template">
             <ControlTemplate TargetType="PopupRoot">
                 <LayoutTransformControl LayoutTransform="{TemplateBinding Transform}">
@@ -29,6 +30,10 @@
     </ControlTheme>
 
     <ControlTheme x:Key="{x:Type OverlayPopupHost}" TargetType="OverlayPopupHost">
+        <Setter Property="FontSize" Value="{DynamicResource DefaultFontSize}" />
+        <Setter Property="FontWeight" Value="{DynamicResource DefaultFontWeight}" />
+        <Setter Property="FontFamily" Value="{DynamicResource DefaultFontFamily}" />
+        <Setter Property="Inline.TextDecorations" Value="" />
         <Setter Property="Template">
             <ControlTemplate>
                 <LayoutTransformControl LayoutTransform="{TemplateBinding Transform}">

src/Semi.Avalonia/Controls/ScrollViewer.axaml

@@ -54,6 +54,7 @@
                                 MinWidth="{StaticResource ScrollBarThickness}"
                                 VerticalAlignment="Center"
                                 Focusable="False"
+                                AutomationProperties.Name="Column left"
                                 Theme="{StaticResource ScrollBarRepeatButton}">
                                 <PathIcon
                                     Theme="{StaticResource InnerPathIcon}"
@@ -76,6 +77,7 @@
                                         VerticalAlignment="Stretch"
                                         CornerRadius="0"
                                         Focusable="False"
+                                        AutomationProperties.Name="Page left"
                                         Theme="{StaticResource ScrollBarRepeatButton}" />
                                 </Track.DecreaseButton>
                                 <Track.IncreaseButton>
@@ -86,9 +88,10 @@
                                         VerticalAlignment="Stretch"
                                         CornerRadius="0"
                                         Focusable="False"
+                                        AutomationProperties.Name="Page right"
                                         Theme="{StaticResource ScrollBarRepeatButton}" />
                                 </Track.IncreaseButton>
-                                <Thumb Name="thumb" />
+                                <Thumb Name="thumb" AutomationProperties.Name="Position" />
                             </Track>
                             <RepeatButton
                                 Name="PART_LineDownButton"
@@ -97,6 +100,7 @@
                                 VerticalAlignment="Center"
                                 VerticalContentAlignment="Center"
                                 Focusable="False"
+                                AutomationProperties.Name="Column right"
                                 Theme="{DynamicResource ScrollBarRepeatButton}">
                                 <PathIcon
                                     Theme="{DynamicResource InnerPathIcon}"
@@ -124,6 +128,7 @@
                                 HorizontalContentAlignment="Center"
                                 VerticalContentAlignment="Center"
                                 Focusable="False"
+                                AutomationProperties.Name="Line up"
                                 Theme="{StaticResource ScrollBarRepeatButton}">
                                 <PathIcon
                                     Theme="{StaticResource InnerPathIcon}"
@@ -147,6 +152,7 @@
                                         VerticalAlignment="Stretch"
                                         CornerRadius="0"
                                         Focusable="False"
+                                        AutomationProperties.Name="Page up"
                                         Theme="{StaticResource ScrollBarRepeatButton}" />
                                 </Track.DecreaseButton>
                                 <Track.IncreaseButton>
@@ -157,9 +163,10 @@
                                         VerticalAlignment="Stretch"
                                         CornerRadius="0"
                                         Focusable="False"
+                                        AutomationProperties.Name="Page down"
                                         Theme="{StaticResource ScrollBarRepeatButton}" />
                                 </Track.IncreaseButton>
-                                <Thumb Name="thumb" />
+                                <Thumb Name="thumb" AutomationProperties.Name="Position" />
                             </Track>
                             <RepeatButton
                                 Name="PART_LineDownButton"
@@ -168,6 +175,7 @@
                                 HorizontalContentAlignment="Center"
                                 VerticalContentAlignment="Center"
                                 Focusable="False"
+                                AutomationProperties.Name="Line down"
                                 Theme="{StaticResource ScrollBarRepeatButton}">
                                 <PathIcon
                                     Theme="{StaticResource InnerPathIcon}"

src/Semi.Avalonia/Controls/SelectableTextBlock.axaml

@@ -2,7 +2,10 @@
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
 
-    <MenuFlyout x:Key="SelectableTextBlockContextFlyout" Placement="Bottom">
+    <MenuFlyout
+        x:Key="SelectableTextBlockContextFlyout"
+        ShowMode="{OnFormFactor Desktop=Standard, Mobile=Transient}"
+        Placement="Bottom">
         <MenuItem
             Command="{Binding $parent[SelectableTextBlock].Copy}"
             Header="{DynamicResource STRING_MENU_COPY}"

src/Semi.Avalonia/Controls/TextBox.axaml

@@ -1,7 +1,10 @@
 <ResourceDictionary
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <MenuFlyout x:Key="DefaultTextBoxContextFlyout" Placement="Bottom">
+    <MenuFlyout
+        x:Key="DefaultTextBoxContextFlyout"
+        ShowMode="{OnFormFactor Desktop=Standard, Mobile=Transient}"
+        Placement="Bottom">
         <MenuItem
             Command="{Binding $parent[TextBox].Cut}"
             Header="{DynamicResource STRING_MENU_CUT}"

src/Semi.Avalonia/Controls/TimePicker.axaml

@@ -2,9 +2,10 @@
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <Design.PreviewWith>
-        <Border Padding="20">
+        <StackPanel Margin="20">
             <TimePickerPresenter />
-        </Border>
+            <TimePicker UseSeconds="True" Width="500" />
+        </StackPanel>
     </Design.PreviewWith>
     <ControlTheme x:Key="{x:Type TimePickerPresenter}" TargetType="TimePickerPresenter">
         <Setter Property="Width" Value="242" />
@@ -163,6 +164,7 @@
         <Setter Property="HorizontalAlignment" Value="Left" />
         <Setter Property="VerticalAlignment" Value="Center" />
         <Setter Property="MinHeight" Value="{DynamicResource DateTimePickerButtonDefaultHeight}" />
+        <Setter Property="MinWidth" Value="242" />
         <Setter Property="Template">
             <ControlTemplate>
                 <DataValidationErrors>
@@ -174,8 +176,8 @@
                             Name="PART_FlyoutButton"
                             Grid.Column="0"
                             Grid.ColumnSpan="2"
-                            Width="242"
+                            MinWidth="{TemplateBinding MinWidth}"
-                            MinWidth="242"
+                            MaxWidth="{TemplateBinding MaxWidth}"
                             MinHeight="{TemplateBinding MinHeight}"
                             HorizontalAlignment="Stretch"
                             VerticalAlignment="Stretch"

src/Semi.Avalonia/Tokens/Variables.axaml

@@ -67,7 +67,7 @@
     <FontWeight x:Key="SemiFontWeightRegular">400</FontWeight> <!-- 字重 - 常规 -->
     <FontWeight x:Key="SemiFontWeightBold">600</FontWeight> <!-- 字重 - 粗 -->
     <FontFamily x:Key="SemiFontFamilyRegular">
-        Inter, -apple-system, BlinkMacSystemFont, PingFang SC,
+        fonts:Inter#Inter, Inter, -apple-system, BlinkMacSystemFont, PingFang SC,
         Microsoft YaHei, Segoe UI, Hiragino Sans GB, Helvetica Neue,
         Helvetica, Arial, sans-serif
     </FontFamily>