fix: fix the draft release version tag.

chore: bump to 12.0.0-rc1.
Pr3/carousel page (#772 )
2026-04-23 09:56:35 +08:00 · 2026-03-21 18:18:49 +08:00 · 2026-03-21 18:08:48 +08:00 · 2026-03-21 17:58:35 +08:00 · 2026-03-21 17:57:56 +08:00 · 2026-03-20 15:47:53 +08:00
162 changed files with 3147 additions and 1496 deletions
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -2,7 +2,7 @@ name: Deploy to GitHub Pages

 env:
  PROJECT_PATH: demo/Semi.Avalonia.Demo.Web/Semi.Avalonia.Demo.Web.csproj
-  OUTPUT_PATH: demo/Semi.Avalonia.Demo.Web/bin/Release/net9.0-browser/publish/wwwroot
+  OUTPUT_PATH: demo/Semi.Avalonia.Demo.Web/bin/Release/net10.0-browser/publish/wwwroot
 on:
  workflow_dispatch:

@@ -11,14 +11,13 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: Checkout
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6

      - name: Setup dotnet
        uses: actions/setup-dotnet@v5
        with:
          dotnet-version: |
-            8.0.x
-            9.0.x
+            10.0.x

      - name: Install wasm-tools
        run: dotnet workload install wasm-tools
@@ -33,7 +32,7 @@ jobs:
        run: touch $OUTPUT_PATH/.nojekyll

      - name: Commit wwwroot to GitHub Pages
-        uses: JamesIves/github-pages-deploy-action@v4.5.0
+        uses: JamesIves/github-pages-deploy-action@v4
        with:
          github_token: ${{ secrets.GITHUB_TOKEN }}
          branch: gh-pages
--- a/.github/workflows/pack-nightly.yml
+++ b/.github/workflows/pack-nightly.yml
@@ -31,7 +31,7 @@ jobs:

    steps:
      - name: Checkout
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6

      - name: Get Version
        run: |
@@ -62,7 +62,7 @@ jobs:
        run: dotnet nuget push "nugets/*.nupkg" --api-key ${{ secrets.IRIHI_NUGET_API_KEY }} --source irihi.tech --skip-duplicate

      - name: Upload a Build Artifact
-        uses: actions/upload-artifact@v4.6.2
+        uses: actions/upload-artifact@v7
        with:
          name: nugets
          path: nugets
--- a/.github/workflows/pack.yml
+++ b/.github/workflows/pack.yml
@@ -47,7 +47,7 @@ jobs:

    steps:
      - name: Checkout
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6

      - name: Pack Semi.Avalonia
        if: ${{ inputs.Semi_Avalonia }}
@@ -70,7 +70,7 @@ jobs:
        run: dotnet nuget push "nugets/*.nupkg" --api-key ${{ secrets.NUGET_ORG_API_KEY }} --source https://api.nuget.org/v3/index.json --skip-duplicate

      - name: Upload a Build Artifact
-        uses: actions/upload-artifact@v4.6.2
+        uses: actions/upload-artifact@v7
        with:
          name: nugets
          path: nugets
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -75,11 +75,11 @@ jobs:
    runs-on: windows-latest
    steps:
      - name: Checkout
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
      - name: Publish win-x64
        run: dotnet publish demo/Semi.Avalonia.Demo.Desktop -r win-x64 -c Release -o publish --sc /p:PublishSingleFile=true /p:IncludeNativeLibrariesForSelfExtract=true
      - name: Upload a Build Artifact
-        uses: actions/upload-artifact@v4.6.2
+        uses: actions/upload-artifact@v7
        with:
          name: Semi.Avalonia.Demo.Desktop.win-x64
          path: |
@@ -91,13 +91,13 @@ jobs:
    runs-on: windows-latest
    steps:
      - name: Checkout
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
      - name: Enable Native AOT in .csproj
        run: sed -i 's#<!--<PublishAot>true</PublishAot>-->#<PublishAot>true</PublishAot>#' demo/Semi.Avalonia.Demo.Desktop/Semi.Avalonia.Demo.Desktop.csproj
      - name: Publish win-x64 AOT
        run: dotnet publish demo/Semi.Avalonia.Demo.Desktop -r win-x64 -c Release -o publish
      - name: Upload a Build Artifact
-        uses: actions/upload-artifact@v4.6.2
+        uses: actions/upload-artifact@v7
        with:
          name: Semi.Avalonia.Demo.Desktop.win-x64.NativeAOT
          path: |
@@ -109,11 +109,11 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: Checkout
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
      - name: Publish linux-x64
        run: dotnet publish demo/Semi.Avalonia.Demo.Desktop -r linux-x64 -c Release -o publish --sc /p:PublishSingleFile=true /p:IncludeNativeLibrariesForSelfExtract=true
      - name: Upload a Build Artifact
-        uses: actions/upload-artifact@v4.6.2
+        uses: actions/upload-artifact@v7
        with:
          name: Semi.Avalonia.Demo.Desktop.linux-x64
          path: |
@@ -125,13 +125,13 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: Checkout
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
      - name: Enable Native AOT in .csproj
        run: sed -i 's#<!--<PublishAot>true</PublishAot>-->#<PublishAot>true</PublishAot>#' demo/Semi.Avalonia.Demo.Desktop/Semi.Avalonia.Demo.Desktop.csproj
      - name: Publish linux-x64 AOT
        run: dotnet publish demo/Semi.Avalonia.Demo.Desktop -r linux-x64 -c Release -o publish
      - name: Upload a Build Artifact
-        uses: actions/upload-artifact@v4.6.2
+        uses: actions/upload-artifact@v7
        with:
          name: Semi.Avalonia.Demo.Desktop.linux-x64.NativeAOT
          path: |
@@ -143,11 +143,11 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: Checkout
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
      - name: Publish linux-x64 DRM
        run: dotnet publish demo/Semi.Avalonia.Demo.Drm -r linux-x64 -c Release -o publish --sc /p:PublishSingleFile=true /p:IncludeNativeLibrariesForSelfExtract=true
      - name: Upload a Build Artifact
-        uses: actions/upload-artifact@v4.6.2
+        uses: actions/upload-artifact@v7
        with:
          name: Semi.Avalonia.Demo.Drm.linux-x64
          path: |
@@ -159,13 +159,13 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: Checkout
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
      - name: Enable Native AOT in .csproj
        run: sed -i 's#<!--<PublishAot>true</PublishAot>-->#<PublishAot>true</PublishAot>#' demo/Semi.Avalonia.Demo.Drm/Semi.Avalonia.Demo.Drm.csproj
      - name: Publish linux-x64 AOT
        run: dotnet publish demo/Semi.Avalonia.Demo.Drm -r linux-x64 -c Release -o publish
      - name: Upload a Build Artifact
-        uses: actions/upload-artifact@v4.6.2
+        uses: actions/upload-artifact@v7
        with:
          name: Semi.Avalonia.Demo.Drm.linux-x64.NativeAOT
          path: |
@@ -177,11 +177,11 @@ jobs:
    runs-on: macos-latest
    steps:
      - name: Checkout
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
      - name: Publish osx-arm64
        run: dotnet publish demo/Semi.Avalonia.Demo.Desktop -r osx-arm64 -c Release -o publish --sc /p:PublishSingleFile=true /p:IncludeNativeLibrariesForSelfExtract=true
      - name: Upload a Build Artifact
-        uses: actions/upload-artifact@v4.6.2
+        uses: actions/upload-artifact@v7
        with:
          name: Semi.Avalonia.Demo.Desktop.osx-arm64
          path: |
@@ -193,13 +193,13 @@ jobs:
    runs-on: macos-latest
    steps:
      - name: Checkout
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
      - name: Enable Native AOT in .csproj
        run: sed -i '' 's#<!--<PublishAot>true</PublishAot>-->#<PublishAot>true</PublishAot>#' demo/Semi.Avalonia.Demo.Desktop/Semi.Avalonia.Demo.Desktop.csproj
      - name: Publish osx-arm64 AOT
        run: dotnet publish demo/Semi.Avalonia.Demo.Desktop -r osx-arm64 -c Release -o publish
      - name: Upload a Build Artifact
-        uses: actions/upload-artifact@v4.6.2
+        uses: actions/upload-artifact@v7
        with:
          name: Semi.Avalonia.Demo.Desktop.osx-arm64.NativeAOT
          path: |
@@ -211,15 +211,15 @@ jobs:
    runs-on: windows-latest
    steps:
      - name: Checkout
-        uses: actions/checkout@v5
-      - name: CD Android
-        run: cd demo/Semi.Avalonia.Demo.Android
+        uses: actions/checkout@v6
+      - name: Install Android workload
+        run: dotnet workload install android
      - name: Restore Dependencies
-        run: dotnet restore
+        run: dotnet restore demo/Semi.Avalonia.Demo.Android
      - name: Publish Android
-        run: dotnet publish demo/Semi.Avalonia.Demo.Android -c Release -f net9.0-android --no-restore -o publish /p:RuntimeIdentifier=android-arm64
+        run: dotnet publish demo/Semi.Avalonia.Demo.Android -c Release -f net10.0-android --no-restore -o publish /p:RuntimeIdentifier=android-arm64
      - name: Upload a Build Artifact
-        uses: actions/upload-artifact@v4.6.2
+        uses: actions/upload-artifact@v7
        with:
          name: android-arm64
          path: publish/*Signed.apk
--- a/.github/workflows/release-tag.yml
+++ b/.github/workflows/release-tag.yml
@@ -41,7 +41,7 @@ jobs:
    needs: [ nuget,publish ]
    runs-on: ubuntu-latest
    steps:
-      - uses: actions/download-artifact@v4.3.0
+      - uses: actions/download-artifact@v8

      - name: Display structure of downloaded files
        run: ls -R
@@ -62,7 +62,7 @@ jobs:
        run: ls -R

      - name: Release
-        uses: softprops/action-gh-release@v2.3.2
+        uses: softprops/action-gh-release@v2
        if: startsWith(github.ref, 'refs/tags/') || github.event_name == 'workflow_dispatch'
        with:
          generate_release_notes: true
--- a/Nuget.Config
+++ b/Nuget.Config
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+    <packageSources>
+        <add key="avalonia-nightly" value="https://nuget-feed-nightly.avaloniaui.net/v3/index.json" />
+    </packageSources>
+</configuration>
--- a/README.md
+++ b/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 |
-|:--------------------|:-----------------|
-| 11.3.7              | 11.3.7           |
-| 11.2.1              | >=11.2.1         |
-| 11.2.0              | 11.2.0           |
-| 11.1.0              | >=11.1.0         |
-| 11.0.7              | >=11.0.7         |
-| 11.0.1              | <=11.0.6         |
+| Semi Avalonia Version | Avalonia Version |
+|:----------------------|:-----------------|
+| 11.3.7                | >=11.3.7         |
+| 11.2.1                | >=11.2.1         |
+| 11.2.0                | End of Life      |
+| 11.1.x                | End of Life      |

 ## Credits

--- a/README_CN.md
+++ b/README_CN.md
@@ -75,14 +75,12 @@ dotnet add package Semi.Avalonia.AvaloniaEdit

 ## 版本兼容性

-| Semi Design Version | Avalonia Version |
-|:--------------------|:-----------------|
-| 11.3.7              | 11.3.7           |
-| 11.2.1              | >=11.2.1         |
-| 11.2.0              | 11.2.0           |
-| 11.1.0              | >=11.1.0         |
-| 11.0.7              | >=11.0.7         |
-| 11.0.1              | <=11.0.6         |
+| Semi Avalonia Version | Avalonia Version |
+|:----------------------|:-----------------|
+| 11.3.7                | >=11.3.7         |
+| 11.2.1                | >=11.2.1         |
+| 11.2.0                | End of Life      |
+| 11.1.x                | End of Life      |

 ## 致谢

--- a/Semi.Avalonia.sln
+++ b/Semi.Avalonia.sln
@@ -1,99 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 17
-VisualStudioVersion = 17.3.32929.385
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Semi.Avalonia", "src\Semi.Avalonia\Semi.Avalonia.csproj", "{90D0B063-BC64-40AB-A56C-AC11909CF410}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Files", "Solution Files", "{B1E6A7D4-0AFB-4D32-9969-5FBDAC0CFF3E}"
-	ProjectSection(SolutionItems) = preProject
-		demo\Directory.Build.props = demo\Directory.Build.props
-		demo\global.json = demo\global.json
-		src\Package.props = src\Package.props
-	EndProjectSection
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "GitHub Action", "GitHub Action", "{318534A1-1CC3-40FB-B4AE-736F94465232}"
-	ProjectSection(SolutionItems) = preProject
-		.github\workflows\deploy.yml = .github\workflows\deploy.yml
-		.github\workflows\pack.yml = .github\workflows\pack.yml
-		.github\workflows\pack-nightly.yml = .github\workflows\pack-nightly.yml
-		.github\workflows\publish.yml = .github\workflows\publish.yml
-		.github\workflows\release-tag.yml = .github\workflows\release-tag.yml
-	EndProjectSection
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Demo", "Demo", "{43091528-9509-43CB-A003-9C5C11E96DD6}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Semi.Avalonia.Demo.Desktop", "demo\Semi.Avalonia.Demo.Desktop\Semi.Avalonia.Demo.Desktop.csproj", "{2ADCA724-2B6D-46EC-87F7-604D7918B89A}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Semi.Avalonia.Demo.Web", "demo\Semi.Avalonia.Demo.Web\Semi.Avalonia.Demo.Web.csproj", "{69A2C77D-6DB7-4AE4-B179-D1F5CF5E2DF0}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Semi.Avalonia.Demo", "demo\Semi.Avalonia.Demo\Semi.Avalonia.Demo.csproj", "{D789AEDB-EBDF-4450-8E8E-B4A03FB257B0}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Semi.Avalonia.DataGrid", "src\Semi.Avalonia.DataGrid\Semi.Avalonia.DataGrid.csproj", "{8A90C292-8761-4F70-8E1F-EFC097FEADB3}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Semi.Avalonia.ColorPicker", "src\Semi.Avalonia.ColorPicker\Semi.Avalonia.ColorPicker.csproj", "{0B64C2F2-FDCD-48E4-AB9D-7CCC63B006CA}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Semi.Avalonia.Demo.Android", "demo\Semi.Avalonia.Demo.Android\Semi.Avalonia.Demo.Android.csproj", "{0C81FC1C-5D2D-478A-9876-923A0C85EC2F}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Semi.Avalonia.Demo.Drm", "demo\Semi.Avalonia.Demo.Drm\Semi.Avalonia.Demo.Drm.csproj", "{86D93406-412A-4429-93B2-92AAD0407784}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Semi.Avalonia.TreeDataGrid", "src\Semi.Avalonia.TreeDataGrid\Semi.Avalonia.TreeDataGrid.csproj", "{398D2998-0835-41F5-99A3-608CAB8051E2}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Release|Any CPU = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{90D0B063-BC64-40AB-A56C-AC11909CF410}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{90D0B063-BC64-40AB-A56C-AC11909CF410}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{90D0B063-BC64-40AB-A56C-AC11909CF410}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{90D0B063-BC64-40AB-A56C-AC11909CF410}.Release|Any CPU.Build.0 = Release|Any CPU
-		{2ADCA724-2B6D-46EC-87F7-604D7918B89A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{2ADCA724-2B6D-46EC-87F7-604D7918B89A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2ADCA724-2B6D-46EC-87F7-604D7918B89A}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{2ADCA724-2B6D-46EC-87F7-604D7918B89A}.Release|Any CPU.Build.0 = Release|Any CPU
-		{69A2C77D-6DB7-4AE4-B179-D1F5CF5E2DF0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{69A2C77D-6DB7-4AE4-B179-D1F5CF5E2DF0}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{69A2C77D-6DB7-4AE4-B179-D1F5CF5E2DF0}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{69A2C77D-6DB7-4AE4-B179-D1F5CF5E2DF0}.Release|Any CPU.Build.0 = Release|Any CPU
-		{D789AEDB-EBDF-4450-8E8E-B4A03FB257B0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D789AEDB-EBDF-4450-8E8E-B4A03FB257B0}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D789AEDB-EBDF-4450-8E8E-B4A03FB257B0}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{D789AEDB-EBDF-4450-8E8E-B4A03FB257B0}.Release|Any CPU.Build.0 = Release|Any CPU
-		{8A90C292-8761-4F70-8E1F-EFC097FEADB3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{8A90C292-8761-4F70-8E1F-EFC097FEADB3}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8A90C292-8761-4F70-8E1F-EFC097FEADB3}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{8A90C292-8761-4F70-8E1F-EFC097FEADB3}.Release|Any CPU.Build.0 = Release|Any CPU
-		{0B64C2F2-FDCD-48E4-AB9D-7CCC63B006CA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{0B64C2F2-FDCD-48E4-AB9D-7CCC63B006CA}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{0B64C2F2-FDCD-48E4-AB9D-7CCC63B006CA}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{0B64C2F2-FDCD-48E4-AB9D-7CCC63B006CA}.Release|Any CPU.Build.0 = Release|Any CPU
-		{0C81FC1C-5D2D-478A-9876-923A0C85EC2F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{0C81FC1C-5D2D-478A-9876-923A0C85EC2F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{0C81FC1C-5D2D-478A-9876-923A0C85EC2F}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
-		{0C81FC1C-5D2D-478A-9876-923A0C85EC2F}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{0C81FC1C-5D2D-478A-9876-923A0C85EC2F}.Release|Any CPU.Build.0 = Release|Any CPU
-		{86D93406-412A-4429-93B2-92AAD0407784}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{86D93406-412A-4429-93B2-92AAD0407784}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{86D93406-412A-4429-93B2-92AAD0407784}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{86D93406-412A-4429-93B2-92AAD0407784}.Release|Any CPU.Build.0 = Release|Any CPU
-		{398D2998-0835-41F5-99A3-608CAB8051E2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{398D2998-0835-41F5-99A3-608CAB8051E2}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{398D2998-0835-41F5-99A3-608CAB8051E2}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{398D2998-0835-41F5-99A3-608CAB8051E2}.Release|Any CPU.Build.0 = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{2ADCA724-2B6D-46EC-87F7-604D7918B89A} = {43091528-9509-43CB-A003-9C5C11E96DD6}
-		{69A2C77D-6DB7-4AE4-B179-D1F5CF5E2DF0} = {43091528-9509-43CB-A003-9C5C11E96DD6}
-		{D789AEDB-EBDF-4450-8E8E-B4A03FB257B0} = {43091528-9509-43CB-A003-9C5C11E96DD6}
-		{0C81FC1C-5D2D-478A-9876-923A0C85EC2F} = {43091528-9509-43CB-A003-9C5C11E96DD6}
-		{86D93406-412A-4429-93B2-92AAD0407784} = {43091528-9509-43CB-A003-9C5C11E96DD6}
-	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {7CA41ED3-2CED-40CC-AA21-28C3B42B1E86}
-	EndGlobalSection
-EndGlobal
--- a/Semi.Avalonia.slnx
+++ b/Semi.Avalonia.slnx
@@ -0,0 +1,28 @@
+<Solution>
+    <Folder Name="/Demo/">
+        <Project Path="demo/Semi.Avalonia.Demo.Android/Semi.Avalonia.Demo.Android.csproj"/>
+        <Project Path="demo/Semi.Avalonia.Demo.Desktop/Semi.Avalonia.Demo.Desktop.csproj"/>
+        <Project Path="demo/Semi.Avalonia.Demo.Drm/Semi.Avalonia.Demo.Drm.csproj"/>
+        <Project Path="demo/Semi.Avalonia.Demo.Web/Semi.Avalonia.Demo.Web.csproj"/>
+        <Project Path="demo/Semi.Avalonia.Demo/Semi.Avalonia.Demo.csproj"/>
+    </Folder>
+    <Folder Name="/GitHub Action/">
+        <File Path=".github/workflows/deploy.yml"/>
+        <File Path=".github/workflows/pack-nightly.yml"/>
+        <File Path=".github/workflows/pack.yml"/>
+        <File Path=".github/workflows/publish.yml"/>
+        <File Path=".github/workflows/release-tag.yml"/>
+    </Folder>
+    <Folder Name="/Solution Items/Demo/">
+        <File Path="demo/Directory.Packages.props"/>
+        <File Path="demo/global.json"/>
+    </Folder>
+    <Folder Name="/Solution Items/Package/">
+        <File Path="src/Directory.Packages.props"/>
+        <File Path="src/Directory.Build.props"/>
+    </Folder>
+    <Project Path="src/Semi.Avalonia.ColorPicker/Semi.Avalonia.ColorPicker.csproj"/>
+    <Project Path="src/Semi.Avalonia.DataGrid/Semi.Avalonia.DataGrid.csproj"/>
+    <Project Path="src/Semi.Avalonia.TreeDataGrid/Semi.Avalonia.TreeDataGrid.csproj"/>
+    <Project Path="src/Semi.Avalonia/Semi.Avalonia.csproj"/>
+</Solution>
--- a/demo/Directory.Build.props
+++ b/demo/Directory.Build.props
@@ -1,7 +0,0 @@
-<Project>
-    <PropertyGroup>
-        <AvaloniaVersion>11.3.7</AvaloniaVersion>
-        <DataGridVersion>11.3.7</DataGridVersion>
-        <CommunityToolkitVersion>8.4.0</CommunityToolkitVersion>
-    </PropertyGroup>
-</Project>
--- a/demo/Directory.Packages.props
+++ b/demo/Directory.Packages.props
@@ -0,0 +1,26 @@
+<Project>
+    <PropertyGroup>
+        <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
+        <AvaloniaVersion>12.0.0-rc1</AvaloniaVersion>
+        <DataGridVersion>12.0.0-rc1</DataGridVersion>
+        <SkiaSharpVersion>3.119.1</SkiaSharpVersion>
+    </PropertyGroup>
+    <ItemGroup>
+        <PackageVersion Include="Avalonia" Version="$(AvaloniaVersion)"/>
+        <PackageVersion Include="Avalonia.Desktop" Version="$(AvaloniaVersion)" />
+        <PackageVersion Include="Avalonia.LinuxFramebuffer" Version="$(AvaloniaVersion)"/>
+        <PackageVersion Include="Avalonia.iOS" Version="$(AvaloniaVersion)" />
+        <PackageVersion Include="Avalonia.Browser" Version="$(AvaloniaVersion)" />
+        <PackageVersion Include="Avalonia.Android" Version="$(AvaloniaVersion)" />
+        <PackageVersion Include="Avalonia.Controls.ColorPicker" Version="$(AvaloniaVersion)"/>
+        <PackageVersion Include="Avalonia.Controls.DataGrid" Version="$(DataGridVersion)"/>
+        <PackageVersion Include="AvaloniaUI.DiagnosticsSupport" Version="2.2.0-beta3"/>
+
+        <PackageVersion Include="SkiaSharp" Version="$(SkiaSharpVersion)"/>
+        <PackageVersion Include="SkiaSharp.NativeAssets.WebAssembly" Version="$(SkiaSharpVersion)"/>
+
+        <PackageVersion Include="Xamarin.AndroidX.Core.SplashScreen" Version="1.2.0"/>
+
+        <PackageVersion Include="CommunityToolkit.Mvvm" Version="8.4.0"/>
+    </ItemGroup>
+</Project>
--- a/demo/Semi.Avalonia.Demo.Android/Application.cs
+++ b/demo/Semi.Avalonia.Demo.Android/Application.cs
@@ -0,0 +1,20 @@
+using Android.App;
+using Android.Runtime;
+using Avalonia;
+using Avalonia.Android;
+
+namespace Semi.Avalonia.Demo.Android;
+
+[Application]
+public class Application : AvaloniaAndroidApplication<App>
+{
+    protected Application(nint javaReference, JniHandleOwnership transfer) : base(javaReference, transfer)
+    {
+    }
+
+    protected override AppBuilder CustomizeAppBuilder(AppBuilder builder)
+    {
+        return base.CustomizeAppBuilder(builder)
+            .WithSourceHanSansCNFont();
+    }
+}
--- a/demo/Semi.Avalonia.Demo.Android/MainActivity.cs
+++ b/demo/Semi.Avalonia.Demo.Android/MainActivity.cs
@@ -1,6 +1,5 @@
 using Android.App;
 using Android.Content.PM;
-using Avalonia;
 using Avalonia.Android;

 namespace Semi.Avalonia.Demo.Android;
@@ -12,11 +11,4 @@ namespace Semi.Avalonia.Demo.Android;
    MainLauncher = true,
    LaunchMode = LaunchMode.SingleTop,
    ConfigurationChanges = ConfigChanges.Orientation | ConfigChanges.ScreenSize | ConfigChanges.UiMode)]
-public class MainActivity : AvaloniaMainActivity<App>
-{
-    protected override AppBuilder CustomizeAppBuilder(AppBuilder builder)
-    {
-        return base.CustomizeAppBuilder(builder)
-            .WithSourceHanSansCNFont();
-    }
-}
+public class MainActivity : AvaloniaMainActivity;
--- a/demo/Semi.Avalonia.Demo.Android/Semi.Avalonia.Demo.Android.csproj
+++ b/demo/Semi.Avalonia.Demo.Android/Semi.Avalonia.Demo.Android.csproj
@@ -1,8 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
    <PropertyGroup>
        <OutputType>Exe</OutputType>
-        <TargetFramework>net9.0-android</TargetFramework>
-        <SupportedOSPlatformVersion>21</SupportedOSPlatformVersion>
+        <TargetFramework>net10.0-android</TargetFramework>
+        <SupportedOSPlatformVersion>23</SupportedOSPlatformVersion>
        <Nullable>enable</Nullable>
        <ApplicationId>com.irihitech.Semi.Avalonia</ApplicationId>
        <ApplicationVersion>1</ApplicationVersion>
@@ -13,14 +13,20 @@
        <RootNamespace>Semi.Avalonia.Demo.Android</RootNamespace>
    </PropertyGroup>

+    <!-- Use CoreCLR on Android -->
+    <PropertyGroup Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'android'">
+        <UseMonoRuntime>false</UseMonoRuntime>
+        <PublishReadyToRun>true</PublishReadyToRun>
+    </PropertyGroup>
+
    <ItemGroup>
        <AndroidResource Include="Icon.png" Link="Resources\drawable\Icon.png"/>
        <AvaloniaResource Include="..\Fonts\*" Link="Assets\Fonts\%(Filename)%(Extension)" />
    </ItemGroup>

    <ItemGroup>
-        <PackageReference Include="Avalonia.Android" Version="$(AvaloniaVersion)"/>
-        <PackageReference Include="Xamarin.AndroidX.Core.SplashScreen" Version="1.0.1.1"/>
+        <PackageReference Include="Avalonia.Android"/>
+        <PackageReference Include="Xamarin.AndroidX.Core.SplashScreen"/>
    </ItemGroup>

    <ItemGroup>
--- a/demo/Semi.Avalonia.Demo.Desktop/Semi.Avalonia.Demo.Desktop.csproj
+++ b/demo/Semi.Avalonia.Demo.Desktop/Semi.Avalonia.Demo.Desktop.csproj
@@ -23,7 +23,7 @@
    </ItemGroup>

    <ItemGroup>
-        <PackageReference Include="Avalonia.Desktop" Version="$(AvaloniaVersion)"/>
+        <PackageReference Include="Avalonia.Desktop"/>
    </ItemGroup>

    <ItemGroup>
--- a/demo/Semi.Avalonia.Demo.Drm/Semi.Avalonia.Demo.Drm.csproj
+++ b/demo/Semi.Avalonia.Demo.Drm/Semi.Avalonia.Demo.Drm.csproj
@@ -23,8 +23,8 @@
    </ItemGroup>

    <ItemGroup>
-        <PackageReference Include="Avalonia.Desktop" Version="$(AvaloniaVersion)"/>
-        <PackageReference Include="Avalonia.LinuxFramebuffer" Version="$(AvaloniaVersion)"/>
+        <PackageReference Include="Avalonia.Desktop"/>
+        <PackageReference Include="Avalonia.LinuxFramebuffer"/>
    </ItemGroup>

    <ItemGroup>
--- a/demo/Semi.Avalonia.Demo.Web/Semi.Avalonia.Demo.Web.csproj
+++ b/demo/Semi.Avalonia.Demo.Web/Semi.Avalonia.Demo.Web.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk.WebAssembly">
    <PropertyGroup>
-        <TargetFramework>net9.0-browser</TargetFramework>
+        <TargetFramework>net10.0-browser</TargetFramework>
        <OutputType>Exe</OutputType>
        <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
        <Nullable>enable</Nullable>
@@ -11,7 +11,9 @@
    </ItemGroup>

    <ItemGroup>
-        <PackageReference Include="Avalonia.Browser" Version="$(AvaloniaVersion)"/>
+        <PackageReference Include="Avalonia.Browser"/>
+        <PackageReference Include="SkiaSharp"/>
+        <PackageReference Include="SkiaSharp.NativeAssets.WebAssembly"/>
    </ItemGroup>

    <ItemGroup>
--- a/demo/Semi.Avalonia.Demo/App.axaml
+++ b/demo/Semi.Avalonia.Demo/App.axaml
@@ -11,7 +11,7 @@
        <semi:SemiPopupAnimations />
        <semi:ColorPickerSemiTheme />
        <semi:DataGridSemiTheme />
-        <semi:TreeDataGridSemiTheme />
+        <!-- <semi:TreeDataGridSemiTheme /> -->
    </Application.Styles>
    <Application.Resources>
        <ResourceDictionary>
--- a/demo/Semi.Avalonia.Demo/App.axaml.cs
+++ b/demo/Semi.Avalonia.Demo/App.axaml.cs
@@ -12,6 +12,9 @@ public partial class App : Application
    public override void Initialize()
    {
        AvaloniaXamlLoader.Load(this);
+#if DEBUG
+        this.AttachDeveloperTools();
+#endif
        this.DataContext = new ApplicationViewModel();
    }

@@ -22,7 +25,7 @@ public partial class App : Application
            case IClassicDesktopStyleApplicationLifetime desktop:
                // Line below is needed to remove Avalonia data validation.
                // Without this line you will get duplicate validations from both Avalonia and CT
-                BindingPlugins.DataValidators.RemoveAt(0);
+                // BindingPlugins.DataValidators.RemoveAt(0);
                desktop.MainWindow = new MainWindow();
                break;
            case ISingleViewApplicationLifetime singleView:
--- a/demo/Semi.Avalonia.Demo/Controls/ColorDetailControl.cs
+++ b/demo/Semi.Avalonia.Demo/Controls/ColorDetailControl.cs
@@ -3,6 +3,7 @@ using System.Threading.Tasks;
 using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Controls.Primitives;
+using Avalonia.Input.Platform;
 using Avalonia.Media;
 using Semi.Avalonia.Demo.Converters;

--- a/demo/Semi.Avalonia.Demo/Pages/AutoCompleteBoxDemo.axaml
+++ b/demo/Semi.Avalonia.Demo/Pages/AutoCompleteBoxDemo.axaml
@@ -28,7 +28,7 @@
        </StackPanel.Styles>

        <AutoCompleteBox
-            Watermark="Please select a State"
+            PlaceholderText="Please select a State"
            ValueMemberBinding="{Binding Name,DataType=vm:StateData}" />
        <AutoCompleteBox
            Classes="Large"
@@ -41,7 +41,7 @@
            ValueMemberBinding="{Binding Name,DataType=vm:StateData}" />
        <AutoCompleteBox
            IsEnabled="False"
-            Watermark="Disabled"
+            PlaceholderText="Disabled"
            ValueMemberBinding="{Binding Name,DataType=vm:StateData}" />
        <AutoCompleteBox
            InnerLeftContent="https://"
@@ -52,16 +52,16 @@
            <AutoCompleteBox
                Width="100"
                Classes="Large"
-                Watermark="Large"
+                PlaceholderText="Large"
                ValueMemberBinding="{Binding Name,DataType=vm:StateData}" />
            <AutoCompleteBox
                Width="100"
-                Watermark="Default"
+                PlaceholderText="Default"
                ValueMemberBinding="{Binding Name,DataType=vm:StateData}" />
            <AutoCompleteBox
                Width="100"
                Classes="Small"
-                Watermark="Small"
+                PlaceholderText="Small"
                ValueMemberBinding="{Binding Name,DataType=vm:StateData}" />
        </StackPanel>

@@ -69,12 +69,12 @@
            <AutoCompleteBox
                Width="100"
                IsEnabled="False"
-                Watermark="Disabled"
+                PlaceholderText="Disabled"
                ValueMemberBinding="{Binding Name,DataType=vm:StateData}" />
            <AutoCompleteBox
                Width="100"
                Classes="Bordered"
-                Watermark="Bordered"
+                PlaceholderText="Bordered"
                ValueMemberBinding="{Binding Name,DataType=vm:StateData}" />
            <AutoCompleteBox
                Width="100"
--- a/demo/Semi.Avalonia.Demo/Pages/CalendarDatePickerDemo.axaml
+++ b/demo/Semi.Avalonia.Demo/Pages/CalendarDatePickerDemo.axaml
@@ -33,6 +33,6 @@
            Margin="0,0,0,8"
            CustomDateFormatString="ddd, MMM d"
            SelectedDateFormat="Custom" />
-        <CalendarDatePicker Margin="0,0,0,8" Watermark="Watermark" />
+        <CalendarDatePicker Margin="0,0,0,8" PlaceholderText="Placeholder" />
    </StackPanel>
 </UserControl>
--- a/demo/Semi.Avalonia.Demo/Pages/CarouselPageDemo.axaml
+++ b/demo/Semi.Avalonia.Demo/Pages/CarouselPageDemo.axaml
@@ -0,0 +1,69 @@
+<UserControl xmlns="https://github.com/avaloniaui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             x:Class="Semi.Avalonia.Demo.Pages.CarouselPageDemo">
+    <DockPanel>
+        <ScrollViewer DockPanel.Dock="Right" Width="220">
+            <StackPanel Margin="12" Spacing="8">
+                <TextBlock Text="Configuration" FontWeight="SemiBold" FontSize="16"
+                           Foreground="{DynamicResource SystemControlHighlightAccentBrush}" />
+
+                <TextBlock Text="Navigation" FontWeight="SemiBold" FontSize="13" />
+                <StackPanel Spacing="6">
+                    <Button Content="Previous" Click="OnPrevious" HorizontalAlignment="Stretch" />
+                    <Button Content="Next" Click="OnNext" HorizontalAlignment="Stretch" />
+                </StackPanel>
+
+                <Separator />
+
+                <TextBlock Text="Status" FontWeight="SemiBold" FontSize="13" />
+                <TextBlock Name="StatusText" Text="Page 1 of 3" Opacity="0.7" TextWrapping="Wrap" />
+            </StackPanel>
+        </ScrollViewer>
+
+        <Border DockPanel.Dock="Right" Width="1"
+                Background="{DynamicResource SystemControlForegroundBaseMediumLowBrush}" />
+
+        <Border Margin="12"
+                BorderBrush="{DynamicResource SystemControlForegroundBaseMediumLowBrush}"
+                BorderThickness="1" CornerRadius="6" ClipToBounds="True">
+            <Panel>
+                <CarouselPage Name="DemoCarousel"
+                              SelectionChanged="OnSelectionChanged">
+                    <ContentPage Header="Welcome">
+                        <StackPanel Margin="24" Spacing="12"
+                                    HorizontalAlignment="Center" VerticalAlignment="Center">
+                            <TextBlock Text="Welcome" FontSize="28" FontWeight="Bold"
+                                       HorizontalAlignment="Center" />
+                            <TextBlock Text="Swipe left or use the buttons to navigate."
+                                       TextWrapping="Wrap" Opacity="0.7" TextAlignment="Center" MaxWidth="280" />
+                        </StackPanel>
+                    </ContentPage>
+                    <ContentPage Header="Explore">
+                        <StackPanel Margin="24" Spacing="12"
+                                    HorizontalAlignment="Center" VerticalAlignment="Center">
+                            <TextBlock Text="Explore" FontSize="28" FontWeight="Bold"
+                                       HorizontalAlignment="Center" />
+                            <TextBlock Text="CarouselPage supports scroll-based and transition-based navigation modes."
+                                       TextWrapping="Wrap" Opacity="0.7" TextAlignment="Center" MaxWidth="280" />
+                        </StackPanel>
+                    </ContentPage>
+                    <ContentPage Header="Get Started">
+                        <StackPanel Margin="24" Spacing="12"
+                                    HorizontalAlignment="Center" VerticalAlignment="Center">
+                            <TextBlock Text="Get Started" FontSize="28" FontWeight="Bold"
+                                       HorizontalAlignment="Center" />
+                            <TextBlock Text="Use SelectedIndex to jump to any page, or assign a PageTransition for animated switching."
+                                       TextWrapping="Wrap" Opacity="0.7" TextAlignment="Center" MaxWidth="280" />
+                        </StackPanel>
+                    </ContentPage>
+                </CarouselPage>
+                <PipsPager HorizontalAlignment="Center"
+                           VerticalAlignment="Bottom" Margin="0,0,0,20"
+                           NumberOfPages="3"
+                           SelectedPageIndex="{Binding #DemoCarousel.SelectedIndex}" />
+            </Panel>
+        </Border>
+
+
+    </DockPanel>
+</UserControl>
--- a/demo/Semi.Avalonia.Demo/Pages/CarouselPageDemo.axaml.cs
+++ b/demo/Semi.Avalonia.Demo/Pages/CarouselPageDemo.axaml.cs
@@ -0,0 +1,34 @@
+using System.Collections;
+using Avalonia.Controls;
+using Avalonia.Interactivity;
+
+namespace Semi.Avalonia.Demo.Pages;
+
+public partial class CarouselPageDemo : UserControl
+{
+    public CarouselPageDemo()
+    {
+        InitializeComponent();
+    }
+
+    private void OnPrevious(object? sender, RoutedEventArgs e)
+    {
+        if (DemoCarousel.SelectedIndex > 0)
+            DemoCarousel.SelectedIndex--;
+    }
+
+    private void OnNext(object? sender, RoutedEventArgs e)
+    {
+        var pageCount = (DemoCarousel.Pages as IList)?.Count ?? 0;
+        if (DemoCarousel.SelectedIndex < pageCount - 1)
+            DemoCarousel.SelectedIndex++;
+    }
+
+    private void OnSelectionChanged(object? sender, PageSelectionChangedEventArgs e)
+    {
+        if (StatusText == null)
+            return;
+        var pageCount = (DemoCarousel.Pages as IList)?.Count ?? 0;
+        StatusText.Text = $"Page {DemoCarousel.SelectedIndex + 1} of {pageCount}";
+    }
+}
--- a/demo/Semi.Avalonia.Demo/Pages/CommandBarDemo.axaml
+++ b/demo/Semi.Avalonia.Demo/Pages/CommandBarDemo.axaml
@@ -0,0 +1,94 @@
+<UserControl
+    x:Class="Semi.Avalonia.Demo.Pages.CommandBarDemo"
+    xmlns="https://github.com/avaloniaui"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:collections="clr-namespace:Avalonia.Collections;assembly=Avalonia.Base"
+    d:DesignHeight="600"
+    d:DesignWidth="800"
+    mc:Ignorable="d">
+    <UserControl.Resources>
+        <collections:AvaloniaList x:TypeArguments="CommandBarDefaultLabelPosition" x:Key="LabelPositionList">
+            <CommandBarDefaultLabelPosition>Bottom</CommandBarDefaultLabelPosition>
+            <CommandBarDefaultLabelPosition>Collapsed</CommandBarDefaultLabelPosition>
+            <CommandBarDefaultLabelPosition>Right</CommandBarDefaultLabelPosition>
+        </collections:AvaloniaList>
+        <collections:AvaloniaList x:TypeArguments="CommandBarOverflowButtonVisibility" x:Key="VisibilityList">
+            <CommandBarOverflowButtonVisibility>Auto</CommandBarOverflowButtonVisibility>
+            <CommandBarOverflowButtonVisibility>Collapsed</CommandBarOverflowButtonVisibility>
+            <CommandBarOverflowButtonVisibility>Visible</CommandBarOverflowButtonVisibility>
+        </collections:AvaloniaList>
+    </UserControl.Resources>
+    <ScrollViewer>
+        <StackPanel Spacing="16">
+            <GroupBox>
+                <GroupBox.Header>
+                    <Grid ColumnDefinitions="Auto,*" RowDefinitions="Auto,Auto,Auto,Auto,Auto,Auto">
+
+                        <TextBlock Grid.Row="0" Grid.Column="0" Text="DefaultLabelPosition" VerticalAlignment="Center" />
+                        <ComboBox Grid.Row="0" Grid.Column="1"
+                                  Name="lc"
+                                  ItemsSource="{DynamicResource LabelPositionList}"
+                                  SelectedValue="{x:Static CommandBarDefaultLabelPosition.Bottom}" />
+
+                        <TextBlock Grid.Row="1" Grid.Column="0" Text="OverflowButtonVisibility" VerticalAlignment="Center" />
+                        <ComboBox Grid.Row="1" Grid.Column="1"
+                                  Name="btvb"
+                                  ItemsSource="{DynamicResource VisibilityList}"
+                                  SelectedValue="{x:Static CommandBarOverflowButtonVisibility.Auto}" />
+
+                        <TextBlock Grid.Row="2" Grid.Column="0" Text="IsDynamicOverflowEnabled" VerticalAlignment="Center" />
+                        <ToggleSwitch Grid.Row="2" Grid.Column="1" Name="idfe" IsChecked="True" />
+
+                        <TextBlock Grid.Row="3" Grid.Column="0" Text="IsOpen" VerticalAlignment="Center" />
+                        <ToggleSwitch Grid.Row="3" Grid.Column="1" Name="isop" />
+
+                        <TextBlock Grid.Row="4" Grid.Column="0" Text="IsSticky" VerticalAlignment="Center" />
+                        <ToggleSwitch Grid.Row="4" Grid.Column="1" Name="isst" />
+
+                        <TextBlock Grid.Row="5" Grid.Column="0" Text="Width" VerticalAlignment="Center" />
+                        <Slider Grid.Row="5" Grid.Column="1" Name="ws" HorizontalAlignment="Left" Width="500" Minimum="0" Maximum="1000" Value="200" />
+                    </Grid>
+                </GroupBox.Header>
+                <CommandBar
+                    DefaultLabelPosition="{Binding #lc.SelectedValue}"
+                    OverflowButtonVisibility="{Binding #btvb.SelectedValue}"
+                    IsDynamicOverflowEnabled="{Binding #idfe.IsChecked}"
+                    IsOpen="{Binding #isop.IsChecked}"
+                    IsSticky="{Binding #isst.IsChecked}"
+                    Width="{Binding #ws.Value}">
+                    <AppBarButton Label="New" Icon="{DynamicResource SemiIconPlus}" />
+                    <AppBarButton Label="Save" Icon="{DynamicResource SemiIconSave}" />
+                    <AppBarSeparator />
+                    <AppBarToggleButton Label="Bold" Icon="{DynamicResource SemiIconBold}" />
+                    <AppBarToggleButton Label="Italic" Icon="{DynamicResource SemiIconItalic}" />
+                    <AppBarToggleButton IsChecked="True" IsEnabled="False" Label="Underline" Icon="{DynamicResource SemiIconUnderline}" />
+                    <AppBarSeparator />
+                    <AppBarButton Label="Share" Icon="{DynamicResource SemiIconShare}" />
+                    <AppBarButton Label="Export" Icon="{DynamicResource SemiIconExport}" />
+                    <AppBarButton Label="Print" Icon="{DynamicResource SemiIconPrint}" />
+                    <AppBarSeparator />
+                    <AppBarButton Label="Delete" Icon="{DynamicResource SemiIconDelete}" />
+                </CommandBar>
+            </GroupBox>
+
+            <!--  With secondary commands (overflow)  -->
+            <GroupBox>
+                <GroupBox.Header>
+                    <TextBlock Text="CommandBar — With Secondary Commands (overflow)" />
+                </GroupBox.Header>
+                <CommandBar>
+                    <AppBarButton Label="New" Icon="{DynamicResource SemiIconPlus}" />
+                    <AppBarButton Label="Save" Icon="{DynamicResource SemiIconSave}" />
+                    <AppBarButton Label="Share" Icon="{DynamicResource SemiIconShare}" />
+                    <CommandBar.SecondaryCommands>
+                        <AppBarButton Label="Export" Icon="{DynamicResource SemiIconExport}" />
+                        <AppBarButton Label="Delete" Icon="{DynamicResource SemiIconDelete}" />
+                    </CommandBar.SecondaryCommands>
+                </CommandBar>
+            </GroupBox>
+
+        </StackPanel>
+    </ScrollViewer>
+</UserControl>
--- a/demo/Semi.Avalonia.Demo/Pages/CommandBarDemo.axaml.cs
+++ b/demo/Semi.Avalonia.Demo/Pages/CommandBarDemo.axaml.cs
@@ -0,0 +1,11 @@
+using Avalonia.Controls;
+
+namespace Semi.Avalonia.Demo.Pages;
+
+public partial class CommandBarDemo : UserControl
+{
+    public CommandBarDemo()
+    {
+        InitializeComponent();
+    }
+}
--- a/demo/Semi.Avalonia.Demo/Pages/ContentPageDemo.axaml
+++ b/demo/Semi.Avalonia.Demo/Pages/ContentPageDemo.axaml
@@ -0,0 +1,54 @@
+<UserControl
+    x:Class="Semi.Avalonia.Demo.Pages.ContentPageDemo"
+    xmlns="https://github.com/avaloniaui"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    d:DesignHeight="600"
+    d:DesignWidth="800"
+    mc:Ignorable="d">
+    <DockPanel>
+        <ScrollViewer DockPanel.Dock="Right" Width="260">
+            <StackPanel Margin="12" Spacing="8">
+                <TextBlock Text="Configuration" FontWeight="SemiBold" FontSize="16"
+                           Foreground="{DynamicResource SemiColorText0}" />
+                <TextBlock Text="ContentPage is the fundamental page type. It hosts a single piece of content and integrates with NavigationPage, TabbedPage, and CarouselPage. The Header property sets the navigation bar title."
+                           FontSize="12" Opacity="0.7" TextWrapping="Wrap" />
+
+                <Separator />
+
+                <TextBlock Text="Navigation" FontWeight="SemiBold" />
+                <Button Content="Push Page" HorizontalAlignment="Stretch" Click="OnPush" />
+                <Button Content="Pop Page" HorizontalAlignment="Stretch" Click="OnPop" />
+                <Button Content="Pop to Root" HorizontalAlignment="Stretch" Click="OnPopToRoot" />
+
+                <Separator />
+
+                <TextBlock Text="Key Properties" FontWeight="SemiBold" />
+                <TextBlock Text="• Header: nav bar title (string or Control)" FontSize="12" Opacity="0.8" TextWrapping="Wrap" />
+                <TextBlock Text="• Content: any Avalonia control" FontSize="12" Opacity="0.8" TextWrapping="Wrap" />
+                <TextBlock Text="• Background: page background brush" FontSize="12" Opacity="0.8" TextWrapping="Wrap" />
+                <TextBlock Text="• HorizontalContentAlignment" FontSize="12" Opacity="0.8" />
+                <TextBlock Text="• VerticalContentAlignment" FontSize="12" Opacity="0.8" />
+                <TextBlock Text="• AutomaticallyApplySafeAreaPadding" FontSize="12" Opacity="0.8" />
+
+                <Separator />
+
+                <TextBlock Name="StatusText"
+                           Text="Depth: 1 | Current: Root Page"
+                           FontSize="11"
+                           Opacity="0.7" />
+            </StackPanel>
+        </ScrollViewer>
+
+        <Border DockPanel.Dock="Right" Width="1" Background="{DynamicResource SemiColorBackground0}" />
+
+        <Border Margin="12"
+                BorderBrush="{DynamicResource SemiColorBorder}"
+                BorderThickness="1"
+                CornerRadius="6"
+                ClipToBounds="True">
+            <NavigationPage Name="DemoNav" />
+        </Border>
+    </DockPanel>
+</UserControl>
--- a/demo/Semi.Avalonia.Demo/Pages/ContentPageDemo.axaml.cs
+++ b/demo/Semi.Avalonia.Demo/Pages/ContentPageDemo.axaml.cs
@@ -0,0 +1,93 @@
+using Avalonia.Controls;
+using Avalonia.Interactivity;
+using Avalonia.Media;
+using Avalonia.Layout;
+
+namespace Semi.Avalonia.Demo.Pages;
+
+public partial class ContentPageDemo : UserControl
+{
+    private static readonly Color[] PageColors =
+    [
+        Color.FromRgb(0xE3, 0xF2, 0xFD), // blue
+        Color.FromRgb(0xF3, 0xE5, 0xF5), // purple
+        Color.FromRgb(0xE8, 0xF5, 0xE9), // green
+        Color.FromRgb(0xFF, 0xF8, 0xE1), // amber
+        Color.FromRgb(0xFB, 0xE9, 0xE7), // deep orange
+    ];
+
+    private int _pageCount;
+
+    public ContentPageDemo()
+    {
+        InitializeComponent();
+        Loaded += OnLoaded;
+    }
+
+    private async void OnLoaded(object? sender, RoutedEventArgs e)
+    {
+        await DemoNav.PushAsync(MakePage("Root Page", "ContentPage inside a NavigationPage.\nUse the options to navigate."));
+        UpdateStatus();
+    }
+
+    private async void OnPush(object? sender, RoutedEventArgs e)
+    {
+        _pageCount++;
+        await DemoNav.PushAsync(MakePage($"Page {_pageCount}", $"ContentPage #{_pageCount}.\nNavigate back using the back button."));
+        UpdateStatus();
+    }
+
+    private async void OnPop(object? sender, RoutedEventArgs e)
+    {
+        await DemoNav.PopAsync();
+        UpdateStatus();
+    }
+
+    private async void OnPopToRoot(object? sender, RoutedEventArgs e)
+    {
+        await DemoNav.PopToRootAsync();
+        _pageCount = 0;
+        UpdateStatus();
+    }
+
+    private void UpdateStatus()
+    {
+        StatusText.Text = $"Depth: {DemoNav.StackDepth} | Current: {DemoNav.CurrentPage?.Header}";
+    }
+
+    private ContentPage MakePage(string header, string body) =>
+        new ContentPage
+        {
+            Header = header,
+            Background = new SolidColorBrush(PageColors[_pageCount % PageColors.Length]),
+            Content = new StackPanel
+            {
+                HorizontalAlignment = HorizontalAlignment.Center,
+                VerticalAlignment = VerticalAlignment.Center,
+                Spacing = 10,
+                Children =
+                {
+                    new TextBlock
+                    {
+                        Text = header,
+                        FontSize = 20,
+                        FontWeight = FontWeight.SemiBold,
+                        HorizontalAlignment = HorizontalAlignment.Center,
+                        Foreground = Brushes.Black,
+                    },
+                    new TextBlock
+                    {
+                        Text = body,
+                        FontSize = 13,
+                        Opacity = 0.7,
+                        TextWrapping = TextWrapping.Wrap,
+                        TextAlignment = TextAlignment.Center,
+                        MaxWidth = 260,
+                        Foreground = Brushes.Black,
+                    }
+                }
+            },
+            HorizontalContentAlignment = HorizontalAlignment.Stretch,
+            VerticalContentAlignment = VerticalAlignment.Stretch
+        };
+}
--- a/demo/Semi.Avalonia.Demo/Pages/DataGridDemo.axaml.cs
+++ b/demo/Semi.Avalonia.Demo/Pages/DataGridDemo.axaml.cs
@@ -1,4 +1,6 @@
+using Avalonia;
 using Avalonia.Controls;
+using Avalonia.Markup.Xaml;
 using Semi.Avalonia.Demo.ViewModels;

 namespace Semi.Avalonia.Demo.Pages;
--- a/demo/Semi.Avalonia.Demo/Pages/DrawerPageDemo.axaml
+++ b/demo/Semi.Avalonia.Demo/Pages/DrawerPageDemo.axaml
@@ -0,0 +1,72 @@
+<UserControl
+    x:Class="Semi.Avalonia.Demo.Pages.DrawerPageDemo"
+    xmlns="https://github.com/avaloniaui"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    d:DesignHeight="700"
+    d:DesignWidth="800"
+    mc:Ignorable="d">
+    <DockPanel>
+        <ScrollViewer DockPanel.Dock="Right" Width="260">
+            <StackPanel Margin="12" Spacing="8">
+                <TextBlock Text="Configuration" FontWeight="SemiBold" FontSize="16"
+                           Foreground="{DynamicResource SemiColorText0}" />
+
+                <Button Content="Toggle Drawer"
+                        HorizontalAlignment="Stretch"
+                        Click="OnToggleDrawer" />
+
+                <Separator />
+
+                <CheckBox Name="GestureCheck"
+                          Content="Gesture Enabled"
+                          IsChecked="True"
+                          IsCheckedChanged="OnGestureChanged" />
+
+                <Separator />
+
+                <TextBlock Text="Status" FontWeight="SemiBold" FontSize="14" />
+                <TextBlock Name="StatusText"
+                           Text="Drawer: Closed"
+                           Opacity="0.7"
+                           TextWrapping="Wrap" />
+            </StackPanel>
+        </ScrollViewer>
+
+        <Border DockPanel.Dock="Right" Width="1" Background="{DynamicResource SemiColorBackground0}" />
+
+        <Border Margin="12"
+                BorderBrush="{DynamicResource SemiColorBorder}"
+                BorderThickness="1"
+                CornerRadius="6"
+                ClipToBounds="True">
+            <DrawerPage Name="DemoDrawer"
+                        Header="First Look"
+                        DrawerLength="250">
+                <DrawerPage.DrawerHeader>
+                    <Border Padding="16" Background="{DynamicResource SemiColorPrimary}">
+                        <TextBlock Text="Menu" FontSize="18" FontWeight="SemiBold" Foreground="{DynamicResource SemiColorText0}" />
+                    </Border>
+                </DrawerPage.DrawerHeader>
+                <DrawerPage.Drawer>
+                    <ListBox Name="DrawerMenu" SelectionChanged="OnMenuSelectionChanged">
+                        <ListBoxItem Content="Home" />
+                        <ListBoxItem Content="Settings" />
+                        <ListBoxItem Content="Profile" />
+                        <ListBoxItem Content="About" />
+                    </ListBox>
+                </DrawerPage.Drawer>
+                <DrawerPage.Content>
+                    <ContentPage Header="Home">
+                        <StackPanel HorizontalAlignment="Center" VerticalAlignment="Center" Spacing="8">
+                            <TextBlock Text="Home Page" FontSize="20" FontWeight="SemiBold" HorizontalAlignment="Center" />
+                            <TextBlock Text="Swipe from the left edge or use the hamburger button to open the drawer."
+                                       FontSize="13" Opacity="0.7" TextWrapping="Wrap" TextAlignment="Center" MaxWidth="300" />
+                        </StackPanel>
+                    </ContentPage>
+                </DrawerPage.Content>
+            </DrawerPage>
+        </Border>
+    </DockPanel>
+</UserControl>
--- a/demo/Semi.Avalonia.Demo/Pages/DrawerPageDemo.axaml.cs
+++ b/demo/Semi.Avalonia.Demo/Pages/DrawerPageDemo.axaml.cs
@@ -0,0 +1,68 @@
+using System;
+using Avalonia.Controls;
+using Avalonia.Interactivity;
+using Avalonia.Layout;
+using Avalonia.Media;
+
+namespace Semi.Avalonia.Demo.Pages;
+
+public partial class DrawerPageDemo : UserControl
+{
+    public DrawerPageDemo()
+    {
+        InitializeComponent();
+    }
+
+    protected override void OnLoaded(RoutedEventArgs e)
+    {
+        base.OnLoaded(e);
+        DemoDrawer.Opened += OnDrawerStatusChanged;
+        DemoDrawer.Closed += OnDrawerStatusChanged;
+    }
+
+    protected override void OnUnloaded(RoutedEventArgs e)
+    {
+        base.OnUnloaded(e);
+        DemoDrawer.Opened -= OnDrawerStatusChanged;
+        DemoDrawer.Closed -= OnDrawerStatusChanged;
+    }
+
+    private void OnDrawerStatusChanged(object? sender, EventArgs e) => UpdateStatus();
+
+    private void OnToggleDrawer(object? sender, RoutedEventArgs e)
+    {
+        DemoDrawer.IsOpen = !DemoDrawer.IsOpen;
+    }
+
+    private void OnGestureChanged(object? sender, RoutedEventArgs e)
+    {
+        DemoDrawer.IsGestureEnabled = GestureCheck.IsChecked == true;
+    }
+
+    private void OnMenuSelectionChanged(object? sender, SelectionChangedEventArgs e)
+    {
+        if (DrawerMenu.SelectedItem is ListBoxItem item)
+        {
+            DemoDrawer.Content = new ContentPage
+            {
+                Header = item.Content?.ToString(),
+                Content = new TextBlock
+                {
+                    Text = $"{item.Content} page content",
+                    FontSize = 16,
+                    HorizontalAlignment = HorizontalAlignment.Center,
+                    VerticalAlignment = VerticalAlignment.Center,
+                    Foreground = Brushes.Black,
+                },
+                HorizontalContentAlignment = HorizontalAlignment.Stretch,
+                VerticalContentAlignment = VerticalAlignment.Stretch
+            };
+            DemoDrawer.IsOpen = false;
+        }
+    }
+
+    private void UpdateStatus()
+    {
+        StatusText.Text = $"Drawer: {(DemoDrawer.IsOpen ? "Open" : "Closed")}";
+    }
+}
--- a/demo/Semi.Avalonia.Demo/Pages/HeaderedContentControlDemo.axaml
+++ b/demo/Semi.Avalonia.Demo/Pages/HeaderedContentControlDemo.axaml
@@ -36,10 +36,20 @@
                        <HyperlinkButton HorizontalAlignment="Right" Content="更多" />
                    </Panel>
                </HeaderedContentControl.Header>
-                <HeaderedContentControl.Content>
-                    <SelectableTextBlock Text="Semi Design 是由互娱社区前端团队与 UED 团队共同设计开发并维护的设计系统。设计系统包含设计语言以及一整套可复用的前端组件，帮助设计师与开发者更容易地打造高质量的、用户体验一致的、符合设计规范的 Web 应用。" />
-                </HeaderedContentControl.Content>
+                <SelectableTextBlock Text="Semi Design 是由互娱社区前端团队与 UED 团队共同设计开发并维护的设计系统。设计系统包含设计语言以及一整套可复用的前端组件，帮助设计师与开发者更容易地打造高质量的、用户体验一致的、符合设计规范的 Web 应用。" />
            </HeaderedContentControl>
+            <TextBlock>Real GroupBox</TextBlock>
+            <GroupBox
+                HorizontalAlignment="Left"
+                MaxWidth="360">
+                <HeaderedContentControl.Header>
+                    <Panel>
+                        <SelectableTextBlock Text="Semi Design" />
+                        <HyperlinkButton HorizontalAlignment="Right" Content="更多" />
+                    </Panel>
+                </HeaderedContentControl.Header>
+                <SelectableTextBlock Text="Semi Design 是由互娱社区前端团队与 UED 团队共同设计开发并维护的设计系统。设计系统包含设计语言以及一整套可复用的前端组件，帮助设计师与开发者更容易地打造高质量的、用户体验一致的、符合设计规范的 Web 应用。" />
+            </GroupBox>
        </StackPanel>
    </ScrollViewer>
 </UserControl>
--- a/demo/Semi.Avalonia.Demo/Pages/HighContrastDemo.axaml
+++ b/demo/Semi.Avalonia.Demo/Pages/HighContrastDemo.axaml
@@ -1,4 +1,4 @@
-<UserControl xmlns="https://github.com/avaloniaui"
+<UserControl xmlns="https://github.com/avaloniaui"
             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
--- a/demo/Semi.Avalonia.Demo/Pages/HighContrastDemo.axaml.cs
+++ b/demo/Semi.Avalonia.Demo/Pages/HighContrastDemo.axaml.cs
@@ -1,5 +1,6 @@
-using System.Threading.Tasks;
+using System.Threading.Tasks;
 using Avalonia.Controls;
+using Avalonia.Input.Platform;
 using Semi.Avalonia.Demo.ViewModels;

 namespace Semi.Avalonia.Demo.Pages;
--- a/demo/Semi.Avalonia.Demo/Pages/IconDemo.axaml
+++ b/demo/Semi.Avalonia.Demo/Pages/IconDemo.axaml
@@ -16,7 +16,7 @@
            Margin="8"
            Classes="ClearButton"
            Text="{Binding SearchText}"
-            Watermark="Input Icon Name" />
+            PlaceholderText="Input Icon Name" />

        <TabControl
            Grid.Row="1"
--- a/demo/Semi.Avalonia.Demo/Pages/NavigationDemoHelper.cs
+++ b/demo/Semi.Avalonia.Demo/Pages/NavigationDemoHelper.cs
@@ -0,0 +1,66 @@
+using Avalonia.Controls;
+using Avalonia.Layout;
+using Avalonia.Media;
+
+namespace Semi.Avalonia.Demo.Pages;
+
+/// <summary>
+/// Shared helpers for ControlCatalog demo pages.
+/// </summary>
+internal static class NavigationDemoHelper
+{
+    /// <summary>
+    /// Pastel background brushes cycled by page index.
+    /// </summary>
+    internal static readonly IBrush[] PageBrushes =
+    [
+        new SolidColorBrush(Color.Parse("#BBDEFB")),
+        new SolidColorBrush(Color.Parse("#C8E6C9")),
+        new SolidColorBrush(Color.Parse("#FFE0B2")),
+        new SolidColorBrush(Color.Parse("#E1BEE7")),
+        new SolidColorBrush(Color.Parse("#FFCDD2")),
+        new SolidColorBrush(Color.Parse("#B2EBF2"))
+    ];
+
+    internal static IBrush GetPageBrush(int index) =>
+        PageBrushes[(index % PageBrushes.Length + PageBrushes.Length) % PageBrushes.Length];
+
+    /// <summary>
+    /// Creates a simple demo ContentPage with a centered title and subtitle.
+    /// </summary>
+    internal static ContentPage MakePage(string header, string body, int colorIndex) =>
+        new()
+        {
+            Header = header,
+            Background = GetPageBrush(colorIndex),
+            Content = new StackPanel
+            {
+                HorizontalAlignment = HorizontalAlignment.Center,
+                VerticalAlignment = VerticalAlignment.Center,
+                Spacing = 8,
+                Children =
+                {
+                    new TextBlock
+                    {
+                        Text = header,
+                        FontSize = 20,
+                        FontWeight = FontWeight.SemiBold,
+                        HorizontalAlignment = HorizontalAlignment.Center,
+                        Foreground = Brushes.Black,
+                    },
+                    new TextBlock
+                    {
+                        Text = body,
+                        FontSize = 13,
+                        Opacity = 0.7,
+                        TextWrapping = TextWrapping.Wrap,
+                        TextAlignment = TextAlignment.Center,
+                        MaxWidth = 260,
+                        Foreground = Brushes.Black,
+                    }
+                }
+            },
+            HorizontalContentAlignment = HorizontalAlignment.Stretch,
+            VerticalContentAlignment = VerticalAlignment.Stretch
+        };
+}
--- a/demo/Semi.Avalonia.Demo/Pages/NavigationPageDemo.axaml
+++ b/demo/Semi.Avalonia.Demo/Pages/NavigationPageDemo.axaml
@@ -0,0 +1,65 @@
+<UserControl
+    x:Class="Semi.Avalonia.Demo.Pages.NavigationPageDemo"
+    xmlns="https://github.com/avaloniaui"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    d:DesignHeight="700"
+    d:DesignWidth="800"
+    mc:Ignorable="d">
+    <ScrollViewer>
+        <DockPanel>
+            <ScrollViewer DockPanel.Dock="Right" Width="260">
+                <StackPanel Margin="12" Spacing="8">
+                    <TextBlock Text="Configuration" FontWeight="SemiBold" FontSize="16" />
+                    <TextBlock Text="Navigation" FontWeight="SemiBold" FontSize="13" />
+
+                    <Button Content="Push Page"
+                            HorizontalAlignment="Stretch"
+                            Click="OnPush" />
+                    <Button Content="Pop"
+                            HorizontalAlignment="Stretch"
+                            Click="OnPop" />
+                    <Button Content="Pop to Root"
+                            HorizontalAlignment="Stretch"
+                            Click="OnPopToRoot" />
+
+                    <Separator />
+
+                    <TextBlock Text="Options" FontWeight="SemiBold" FontSize="14" />
+
+                    <CheckBox Name="HasNavBarCheck"
+                              Content="Has Navigation Bar"
+                              IsChecked="True"
+                              IsCheckedChanged="OnHasNavBarChanged" />
+                    <CheckBox Name="HasBackButtonCheck"
+                              Content="Has Back Button"
+                              IsChecked="True" 
+                              IsCheckedChanged="OnHasBackButonChanged" />
+
+                    <Separator />
+
+                    <TextBlock Text="Status" FontWeight="SemiBold" FontSize="14" />
+                    <TextBlock Name="StatusText"
+                               Text="Depth: 1"
+                               Opacity="0.7"
+                               TextWrapping="Wrap" />
+                    <TextBlock Name="HeaderText"
+                               Text="Current: Home"
+                               Opacity="0.7"
+                               TextWrapping="Wrap" />
+                </StackPanel>
+            </ScrollViewer>
+
+            <Border DockPanel.Dock="Right" Width="1" Background="{DynamicResource SemiColorBackground0}" />
+
+            <Border Margin="12"
+                    BorderBrush="{DynamicResource SemiColorBorder}"
+                    BorderThickness="1"
+                    CornerRadius="6"
+                    ClipToBounds="True">
+                <NavigationPage Name="DemoNav" />
+            </Border>
+        </DockPanel>
+    </ScrollViewer>
+</UserControl>
--- a/demo/Semi.Avalonia.Demo/Pages/NavigationPageDemo.axaml.cs
+++ b/demo/Semi.Avalonia.Demo/Pages/NavigationPageDemo.axaml.cs
@@ -0,0 +1,66 @@
+using Avalonia.Controls;
+using Avalonia.Interactivity;
+
+namespace Semi.Avalonia.Demo.Pages;
+
+public partial class NavigationPageDemo : UserControl
+{
+    private int _pageCount;
+
+    public NavigationPageDemo()
+    {
+        InitializeComponent();
+        Loaded += OnLoaded;
+    }
+
+    private async void OnLoaded(object? sender, RoutedEventArgs e)
+    {
+        await DemoNav.PushAsync(NavigationDemoHelper.MakePage("Home", "Welcome!\nUse the buttons to push and pop pages.", 0), null);
+        UpdateStatus();
+    }
+
+    private async void OnPush(object? sender, RoutedEventArgs e)
+    {
+        _pageCount++;
+        var page = NavigationDemoHelper.MakePage($"Page {_pageCount}", $"This is page {_pageCount}.", _pageCount);
+        NavigationPage.SetHasNavigationBar(page, HasNavBarCheck.IsChecked == true);
+        NavigationPage.SetHasBackButton(page, HasBackButtonCheck.IsChecked == true);
+        await DemoNav.PushAsync(page);
+        UpdateStatus();
+    }
+
+    private async void OnPop(object? sender, RoutedEventArgs e)
+    {
+        await DemoNav.PopAsync();
+        UpdateStatus();
+    }
+
+    private async void OnPopToRoot(object? sender, RoutedEventArgs e)
+    {
+        await DemoNav.PopToRootAsync();
+        _pageCount = 0;
+        UpdateStatus();
+    }
+
+    private void OnHasNavBarChanged(object? sender, RoutedEventArgs e)
+    {
+        if (DemoNav == null)
+            return;
+        if (DemoNav.CurrentPage != null)
+            NavigationPage.SetHasNavigationBar(DemoNav.CurrentPage, HasNavBarCheck.IsChecked == true);
+    }
+
+    private void OnHasBackButonChanged(object? sender, RoutedEventArgs e)
+    {
+        if (DemoNav == null)
+            return;
+        if (DemoNav.CurrentPage != null)
+            NavigationPage.SetHasBackButton(DemoNav.CurrentPage, HasBackButtonCheck.IsChecked == true);
+    }
+
+    private void UpdateStatus()
+    {
+        StatusText.Text = $"Depth: {DemoNav.StackDepth}";
+        HeaderText.Text = $"Current: {DemoNav.CurrentPage?.Header ?? "(none)"}";
+    }
+}
--- a/demo/Semi.Avalonia.Demo/Pages/NumericUpDownDemo.axaml
+++ b/demo/Semi.Avalonia.Demo/Pages/NumericUpDownDemo.axaml
@@ -28,15 +28,15 @@
            <NumericUpDown
                Width="100"
                Classes="Large"
-                Watermark="Large"
+                PlaceholderText="Large"
                ButtonSpinnerLocation="Left" />
            <NumericUpDown
                Width="100"
-                Watermark="Default"
+                PlaceholderText="Default"
                ShowButtonSpinner="False" />
            <NumericUpDown
                Width="100"
-                Watermark="Small"
+                PlaceholderText="Small"
                Classes="Small" />
        </StackPanel>

--- a/demo/Semi.Avalonia.Demo/Pages/Overview.axaml
+++ b/demo/Semi.Avalonia.Demo/Pages/Overview.axaml
@@ -353,12 +353,12 @@
                        <StackPanel>
                            <TextBlock Text="Install via nuget: " />
                            <Border Margin="0,16" Classes="CodeBlock">
-                                <SelectableTextBlock FontFamily="Consolas" Text="{Binding $parent[local:Overview].MainInstall}" />
+                                <SelectableTextBlock  Text="{Binding $parent[local:Overview].MainInstall}" />
                            </Border>
                            <TextBlock Text="Reference styles: " />
                            <Border Margin="0,16" Classes="CodeBlock">
                                <SelectableTextBlock
-                                    FontFamily="Consolas"
+                                    
                                    Text="{Binding $parent[local:Overview].MainStyle}"
                                    TextWrapping="Wrap" />
                            </Border>
@@ -368,12 +368,12 @@
                        <StackPanel>
                            <TextBlock Text="Install via nuget: " />
                            <Border Margin="0,16" Classes="CodeBlock">
-                                <SelectableTextBlock FontFamily="Consolas" Text="{Binding $parent[local:Overview].ColorPickerInstall}" />
+                                <SelectableTextBlock  Text="{Binding $parent[local:Overview].ColorPickerInstall}" />
                            </Border>
                            <TextBlock Text="Reference styles: " />
                            <Border Margin="0,16" Classes="CodeBlock">
                                <SelectableTextBlock
-                                    FontFamily="Consolas"
+                                    
                                    Text="{Binding $parent[local:Overview].ColorPickerStyle}"
                                    TextWrapping="Wrap" />
                            </Border>
@@ -383,12 +383,12 @@
                        <StackPanel>
                            <TextBlock Text="Install via nuget: " />
                            <Border Margin="0,16" Classes="CodeBlock">
-                                <SelectableTextBlock FontFamily="Consolas" Text="{Binding $parent[local:Overview].DataGridInstall}" />
+                                <SelectableTextBlock  Text="{Binding $parent[local:Overview].DataGridInstall}" />
                            </Border>
                            <TextBlock Text="Reference styles: " />
                            <Border Margin="0,16" Classes="CodeBlock">
                                <SelectableTextBlock
-                                    FontFamily="Consolas"
+                                    
                                    Text="{Binding $parent[local:Overview].DataGridStyle}"
                                    TextWrapping="Wrap" />
                            </Border>
@@ -398,12 +398,12 @@
                        <StackPanel>
                            <TextBlock Text="Install via nuget: " />
                            <Border Margin="0,16" Classes="CodeBlock">
-                                <SelectableTextBlock FontFamily="Consolas" Text="{Binding $parent[local:Overview].TreeDataGridInstall}" />
+                                <SelectableTextBlock  Text="{Binding $parent[local:Overview].TreeDataGridInstall}" />
                            </Border>
                            <TextBlock Text="Reference styles: " />
                            <Border Margin="0,16" Classes="CodeBlock">
                                <SelectableTextBlock
-                                    FontFamily="Consolas"
+                                    
                                    Text="{Binding $parent[local:Overview].TreeDataGridStyle}"
                                    TextWrapping="Wrap" />
                            </Border>
@@ -413,12 +413,12 @@
                        <StackPanel>
                            <TextBlock Text="Install via nuget: " />
                            <Border Margin="0,16" Classes="CodeBlock">
-                                <SelectableTextBlock FontFamily="Consolas" Text="{Binding $parent[local:Overview].DockInstall}" />
+                                <SelectableTextBlock  Text="{Binding $parent[local:Overview].DockInstall}" />
                            </Border>
                            <TextBlock Text="Reference styles: " />
                            <Border Margin="0,16" Classes="CodeBlock">
                                <SelectableTextBlock
-                                    FontFamily="Consolas"
+                                    
                                    Text="{Binding $parent[local:Overview].DockStyle}"
                                    TextWrapping="Wrap" />
                            </Border>
@@ -428,12 +428,12 @@
                        <StackPanel>
                            <TextBlock Text="Install via nuget: " />
                            <Border Margin="0,16" Classes="CodeBlock">
-                                <SelectableTextBlock FontFamily="Consolas" Text="{Binding $parent[local:Overview].TabaloniaInstall}" />
+                                <SelectableTextBlock  Text="{Binding $parent[local:Overview].TabaloniaInstall}" />
                            </Border>
                            <TextBlock Text="Reference styles: " />
                            <Border Margin="0,16" Classes="CodeBlock">
                                <SelectableTextBlock
-                                    FontFamily="Consolas"
+                                    
                                    Text="{Binding $parent[local:Overview].TabaloniaStyle}"
                                    TextWrapping="Wrap" />
                            </Border>
@@ -443,12 +443,12 @@
                        <StackPanel>
                            <TextBlock Text="Install via nuget: " />
                            <Border Margin="0,16" Classes="CodeBlock">
-                                <SelectableTextBlock FontFamily="Consolas" Text="{Binding $parent[local:Overview].AvaloniaEditInstall}" />
+                                <SelectableTextBlock  Text="{Binding $parent[local:Overview].AvaloniaEditInstall}" />
                            </Border>
                            <TextBlock Text="Reference styles: " />
                            <Border Margin="0,16" Classes="CodeBlock">
                                <SelectableTextBlock
-                                    FontFamily="Consolas"
+                                    
                                    Text="{Binding $parent[local:Overview].AvaloniaEditStyle}"
                                    TextWrapping="Wrap" />
                            </Border>
--- a/demo/Semi.Avalonia.Demo/Pages/PaletteDemo.axaml.cs
+++ b/demo/Semi.Avalonia.Demo/Pages/PaletteDemo.axaml.cs
@@ -1,6 +1,7 @@
 using System.Threading.Tasks;
 using Avalonia.Controls;
 using Avalonia.Controls.Primitives;
+using Avalonia.Input.Platform;
 using Avalonia.Threading;
 using Semi.Avalonia.Demo.ViewModels;

--- a/demo/Semi.Avalonia.Demo/Pages/PipsPagerDemo.axaml
+++ b/demo/Semi.Avalonia.Demo/Pages/PipsPagerDemo.axaml
@@ -0,0 +1,99 @@
+<UserControl
+    x:Class="Semi.Avalonia.Demo.Pages.PipsPagerDemo"
+    xmlns="https://github.com/avaloniaui"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    d:DesignHeight="600"
+    d:DesignWidth="800"
+    mc:Ignorable="d">
+    <ScrollViewer>
+        <StackPanel HorizontalAlignment="Left" Spacing="16" Margin="0,0,0,20">
+
+            <!-- Horizontal PipsPager -->
+            <TextBlock Classes="H6" Text="Horizontal" />
+            <PipsPager
+                NumberOfPages="8"
+                Orientation="Horizontal" />
+
+            <!-- Vertical PipsPager -->
+            <TextBlock Classes="H6" Text="Vertical" />
+            <PipsPager
+                NumberOfPages="8"
+                Orientation="Vertical" />
+
+            <!-- Linked with Carousel -->
+            <TextBlock Classes="H6" Text="Linked with Carousel" />
+            <Panel>
+                <Carousel
+                    Name="DemoCarousel"
+                    Height="160">
+                    <Border Background="#EAF5FF">
+                        <TextBlock
+                            HorizontalAlignment="Center"
+                            VerticalAlignment="Center"
+                            Foreground="#1C1F23"
+                            Text="Page 1" />
+                    </Border>
+                    <Border Background="#F9F9F9">
+                        <TextBlock
+                            HorizontalAlignment="Center"
+                            VerticalAlignment="Center"
+                            Foreground="#1C1F23"
+                            Text="Page 2" />
+                    </Border>
+                    <Border Background="#FFF8EA">
+                        <TextBlock
+                            HorizontalAlignment="Center"
+                            VerticalAlignment="Center"
+                            Foreground="#1C1F23"
+                            Text="Page 3" />
+                    </Border>
+                    <Border Background="#FEF2ED">
+                        <TextBlock
+                            HorizontalAlignment="Center"
+                            VerticalAlignment="Center"
+                            Foreground="#1C1F23"
+                            Text="Page 4" />
+                    </Border>
+                    <Border Background="#F0F5FF">
+                        <TextBlock
+                            HorizontalAlignment="Center"
+                            VerticalAlignment="Center"
+                            Foreground="#1C1F23"
+                            Text="Page 5" />
+                    </Border>
+                </Carousel>
+                <ThemeVariantScope RequestedThemeVariant="Light">
+                    <PipsPager
+                        Name="LinkedPager"
+                        NumberOfPages="5"
+                        Orientation="Horizontal"
+                        HorizontalAlignment="Center"
+                        VerticalAlignment="Bottom"
+                        Margin="0,0,0,8"
+                        SelectedPageIndex="{Binding #DemoCarousel.SelectedIndex}" />
+                </ThemeVariantScope>
+            </Panel>
+
+            <!-- Various page counts -->
+            <TextBlock Classes="H6" Text="Various Page Counts" />
+            <StackPanel Spacing="12">
+                <StackPanel Orientation="Horizontal" Spacing="8">
+                    <TextBlock VerticalAlignment="Center" Width="80" Text="3 pages" />
+                    <PipsPager NumberOfPages="3" Orientation="Horizontal" />
+                </StackPanel>
+                <StackPanel Orientation="Horizontal" Spacing="8">
+                    <TextBlock VerticalAlignment="Center" Width="80" Text="5 pages" />
+                    <PipsPager NumberOfPages="5" Orientation="Horizontal" />
+                </StackPanel>
+                <StackPanel Orientation="Horizontal" Spacing="8">
+                    <TextBlock VerticalAlignment="Center" Width="80" Text="10 pages" />
+                    <PipsPager NumberOfPages="10" Orientation="Horizontal" />
+                </StackPanel>
+            </StackPanel>
+
+        </StackPanel>
+    </ScrollViewer>
+</UserControl>
+
--- a/demo/Semi.Avalonia.Demo/Pages/PipsPagerDemo.axaml.cs
+++ b/demo/Semi.Avalonia.Demo/Pages/PipsPagerDemo.axaml.cs
@@ -0,0 +1,12 @@
+using Avalonia.Controls;
+
+namespace Semi.Avalonia.Demo.Pages;
+
+public partial class PipsPagerDemo : UserControl
+{
+    public PipsPagerDemo()
+    {
+        InitializeComponent();
+    }
+}
+
--- a/demo/Semi.Avalonia.Demo/Pages/SliderDemo.axaml
+++ b/demo/Semi.Avalonia.Demo/Pages/SliderDemo.axaml
@@ -22,6 +22,15 @@
            TickFrequency="10"
            TickPlacement="Outside"
            Value="0" />
+        <Slider
+            Value="0"
+            Minimum="0"
+            Maximum="100"
+            TickPlacement="BottomRight"
+            IsSnapToTickEnabled="True"
+            IsDirectionReversed="True"
+            Ticks="0,20,25,40,75,100"
+            Width="300" />
        <Slider
            Width="300"
            Classes="ToolTip"
--- a/demo/Semi.Avalonia.Demo/Pages/TabbedPageDemo.axaml
+++ b/demo/Semi.Avalonia.Demo/Pages/TabbedPageDemo.axaml
@@ -0,0 +1,80 @@
+<UserControl
+    x:Class="Semi.Avalonia.Demo.Pages.TabbedPageDemo"
+    xmlns="https://github.com/avaloniaui"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    d:DesignHeight="600"
+    d:DesignWidth="800"
+    mc:Ignorable="d">
+    <DockPanel>
+        <ScrollViewer DockPanel.Dock="Right" Width="260">
+            <StackPanel Margin="12" Spacing="8">
+                <TextBlock Text="Configuration" FontWeight="SemiBold" FontSize="16"
+                           Foreground="{DynamicResource SemiColorText0}" />
+
+                <TextBlock Text="Tab Management" FontWeight="SemiBold" FontSize="13" />
+                <StackPanel Spacing="6">
+                    <Button Content="Add Tab" Click="OnAddTab" HorizontalAlignment="Stretch" />
+                    <Button Content="Remove Latest Tab" Click="OnRemoveTab" HorizontalAlignment="Stretch" />
+                </StackPanel>
+
+                <Separator />
+
+                <TextBlock Text="Tab Placement" FontWeight="SemiBold" FontSize="13" />
+                <ComboBox Name="PlacementCombo" SelectedIndex="0"
+                          SelectionChanged="OnPlacementChanged" HorizontalAlignment="Stretch">
+                    <ComboBoxItem Content="Top" />
+                    <ComboBoxItem Content="Bottom" />
+                    <ComboBoxItem Content="Left" />
+                    <ComboBoxItem Content="Right" />
+                </ComboBox>
+
+                <Separator />
+
+                <TextBlock Text="Status" FontWeight="SemiBold" FontSize="14" />
+                <TextBlock Name="StatusText"
+                           Text="3 tabs | Selected: Home (0)"
+                           Opacity="0.7"
+                           TextWrapping="Wrap" />
+            </StackPanel>
+        </ScrollViewer>
+
+        <Border DockPanel.Dock="Right" Width="1" Background="{DynamicResource SemiColorBackground0}" />
+
+        <Border Margin="12"
+                BorderBrush="{DynamicResource SemiColorBorder}"
+                BorderThickness="1"
+                CornerRadius="6"
+                ClipToBounds="True">
+            <TabbedPage Name="DemoTabs"
+                        TabPlacement="Top"
+                        SelectionChanged="OnSelectionChanged">
+                <ContentPage Header="Home">
+                    <StackPanel Margin="16" Spacing="8">
+                        <TextBlock Text="Home Tab" FontSize="24" FontWeight="Bold" />
+                        <TextBlock Text="Welcome to the Home tab. This is a TabbedPage sample."
+                                   TextWrapping="Wrap" />
+                        <TextBlock Text="Use the panel on the right to add or remove tabs dynamically."
+                                   TextWrapping="Wrap" Opacity="0.7" />
+                    </StackPanel>
+                </ContentPage>
+                <ContentPage Header="Search">
+                    <StackPanel Margin="16" Spacing="8">
+                        <TextBlock Text="Search Tab" FontSize="24" FontWeight="Bold" />
+                        <TextBox PlaceholderText="Type to search..." />
+                        <TextBlock Text="Search results will appear here." Opacity="0.7" />
+                    </StackPanel>
+                </ContentPage>
+                <ContentPage Header="Settings">
+                    <StackPanel Margin="16" Spacing="8">
+                        <TextBlock Text="Settings Tab" FontSize="24" FontWeight="Bold" />
+                        <CheckBox Content="Enable notifications" />
+                        <CheckBox Content="Dark mode" />
+                        <CheckBox Content="Auto-save" IsChecked="True" />
+                    </StackPanel>
+                </ContentPage>
+            </TabbedPage>
+        </Border>
+    </DockPanel>
+</UserControl>
--- a/demo/Semi.Avalonia.Demo/Pages/TabbedPageDemo.axaml.cs
+++ b/demo/Semi.Avalonia.Demo/Pages/TabbedPageDemo.axaml.cs
@@ -0,0 +1,84 @@
+using System.Collections;
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Interactivity;
+using Avalonia.Media;
+
+namespace Semi.Avalonia.Demo.Pages;
+
+public partial class TabbedPageDemo : UserControl
+{
+    private int _tabCounter = 3;
+
+    public TabbedPageDemo()
+    {
+        InitializeComponent();
+    }
+
+    private void OnAddTab(object? sender, RoutedEventArgs e)
+    {
+        var idx = ++_tabCounter;
+        var page = new ContentPage
+        {
+            Header = $"Tab {idx}",
+            Content = new StackPanel
+            {
+                Margin = new Thickness(16),
+                Spacing = 8,
+                Children =
+                {
+                    new TextBlock
+                    {
+                        Text = $"Tab {idx}",
+                        FontSize = 24,
+                        FontWeight = FontWeight.Bold,
+                    },
+                    new TextBlock
+                    {
+                        Text = $"This tab was added dynamically (tab #{idx}).",
+                        Opacity = 0.7,
+                        TextWrapping = TextWrapping.Wrap,
+                    }
+                }
+            }
+        };
+
+        ((IList)DemoTabs.Pages!).Add(page);
+        UpdateStatus();
+    }
+
+    private void OnRemoveTab(object? sender, RoutedEventArgs e)
+    {
+        var pages = (IList)DemoTabs.Pages!;
+        if (pages.Count > 1)
+        {
+            pages.RemoveAt(pages.Count - 1);
+            UpdateStatus();
+        }
+    }
+
+    private void OnPlacementChanged(object? sender, SelectionChangedEventArgs e)
+    {
+        if (DemoTabs == null) return;
+        DemoTabs.TabPlacement = PlacementCombo.SelectedIndex switch
+        {
+            1 => TabPlacement.Bottom,
+            2 => TabPlacement.Left,
+            3 => TabPlacement.Right,
+            _ => TabPlacement.Top
+        };
+    }
+
+    private void OnSelectionChanged(object? sender, PageSelectionChangedEventArgs e)
+    {
+        UpdateStatus();
+    }
+
+    private void UpdateStatus()
+    {
+        if (StatusText == null) return;
+        var pages = (IList)DemoTabs.Pages!;
+        var pageName = (DemoTabs.SelectedPage as ContentPage)?.Header?.ToString() ?? "—";
+        StatusText.Text = $"{pages.Count} tab{(pages.Count != 1 ? "s" : "")} | Selected: {pageName} ({DemoTabs.SelectedIndex})";
+    }
+}
--- a/demo/Semi.Avalonia.Demo/Pages/TextBoxDemo.axaml
+++ b/demo/Semi.Avalonia.Demo/Pages/TextBoxDemo.axaml
@@ -23,36 +23,36 @@
                <TextBox
                    Width="100"
                    Classes="Large"
-                    Watermark="Large" />
+                    PlaceholderText="Large" />
                <TextBox
                    Width="100"
-                    Watermark="Default" />
+                    PlaceholderText="Default" />
                <TextBox
                    Width="100"
                    Classes="Small"
-                    Watermark="Small" />
+                    PlaceholderText="Small" />
            </StackPanel>

            <StackPanel Orientation="Horizontal">
                <TextBox
                    Width="100"
                    IsEnabled="False"
-                    Watermark="Disabled" />
+                    PlaceholderText="Disabled" />
                <TextBox
                    Width="100"
                    Classes="Bordered"
-                    Watermark="Bordered" />
+                    PlaceholderText="Bordered" />
                <TextBox
                    Width="100"
                    Classes="Bordered"
                    IsEnabled="False" />
            </StackPanel>
-            <TextBox Width="300" Classes="TextArea" Watermark="TextArea TextBox" />
+            <TextBox Width="300" Classes="TextArea" PlaceholderText="TextArea TextBox" />
            <TextBox Width="300" Classes="TextArea ClearButton" Text="TextArea with ClearButton - text should be clearable" />
            <TextBox
                Width="300"
                Theme="{StaticResource LooklessTextBox}"
-                Watermark="Lookless TextBox"
+                PlaceholderText="Lookless TextBox"
                InnerLeftContent="https://"
                InnerRightContent=".com" />
        </StackPanel>
--- a/demo/Semi.Avalonia.Demo/Pages/TreeDataGridDemo.axaml
+++ b/demo/Semi.Avalonia.Demo/Pages/TreeDataGridDemo.axaml
@@ -1,126 +0,0 @@
-<UserControl xmlns="https://github.com/avaloniaui"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-             xmlns:vm="clr-namespace:Semi.Avalonia.Demo.ViewModels"
-             xmlns:converters="clr-namespace:Semi.Avalonia.Demo.Converters"
-             mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
-             x:Class="Semi.Avalonia.Demo.Pages.TreeDataGridDemo"
-             x:DataType="vm:TreeDataGridDemoViewModel">
-    <UserControl.Resources>
-        <converters:FileIconConverter x:Key="FileIconConverter">
-            <StaticResource x:Key="file" ResourceKey="SemiIconFile" />
-            <StaticResource x:Key="folderOpen" ResourceKey="SemiIconFolderOpen" />
-            <StaticResource x:Key="folderClosed" ResourceKey="SemiIconFolder" />
-        </converters:FileIconConverter>
-    </UserControl.Resources>
-    <TabControl>
-        <TabItem Header="Songs">
-            <TreeDataGrid
-                AutoDragDropRows="True"
-                DataContext="{Binding SongsContext}"
-                Source="{Binding Songs}">
-                <TreeDataGrid.Resources>
-                    <DataTemplate x:Key="AlbumCell" DataType="vm:SongViewModel">
-                        <TextBlock
-                            HorizontalAlignment="Stretch"
-                            VerticalAlignment="Center"
-                            Background="Transparent"
-                            Text="{Binding Album}" />
-                    </DataTemplate>
-                    <DataTemplate x:Key="AlbumEditCell" DataType="vm:SongViewModel">
-                        <ComboBox
-                            VerticalAlignment="Center"
-                            Classes="Small"
-                            ItemsSource="{x:Static vm:Song.Albums}"
-                            SelectedItem="{Binding Album}" />
-                    </DataTemplate>
-                    <DataTemplate x:Key="CommentsCell" DataType="vm:SongViewModel">
-                        <TextBlock VerticalAlignment="Center" Text="{Binding CountOfComment}" />
-                    </DataTemplate>
-                    <DataTemplate x:Key="CommentsEditCell" DataType="vm:SongViewModel">
-                        <NumericUpDown
-                            Width="100"
-                            HorizontalAlignment="Left"
-                            VerticalAlignment="Center"
-                            Classes="Small"
-                            Value="{Binding CountOfComment}" />
-                    </DataTemplate>
-                </TreeDataGrid.Resources>
-                <TreeDataGrid.Styles>
-                    <Style Selector="TreeDataGrid TreeDataGridRow:nth-last-child(2n)">
-                        <Setter Property="Background" Value="{DynamicResource SemiColorFill0}" />
-                    </Style>
-                </TreeDataGrid.Styles>
-            </TreeDataGrid>
-        </TabItem>
-        <TabItem Header="Files">
-            <Grid DataContext="{Binding FilesContext}" RowDefinitions="Auto, *">
-                <DockPanel Margin="0,4" DockPanel.Dock="Top">
-                    <ComboBox
-                        DockPanel.Dock="Left"
-                        ItemsSource="{Binding Drives}"
-                        SelectedItem="{Binding SelectedDrive}" />
-                    <TextBox
-                        Margin="4,0,0,0"
-                        VerticalContentAlignment="Center"
-                        KeyDown="SelectedPath_KeyDown"
-                        Text="{Binding SelectedPath, Mode=OneWay}" />
-                </DockPanel>
-                <TreeDataGrid
-                    Name="fileViewer"
-                    Grid.Row="1"
-                    Source="{Binding Source}">
-                    <TreeDataGrid.Resources>
-
-                        <!--  Template for Name column cells  -->
-                        <DataTemplate x:Key="FileNameCell" DataType="vm:FileNodeViewModel">
-                            <StackPanel Orientation="Horizontal">
-                                <PathIcon
-                                    Theme="{StaticResource InnerPathIcon}"
-                                    Margin="8,0">
-                                    <PathIcon.Data>
-                                        <MultiBinding Converter="{StaticResource FileIconConverter}">
-                                            <Binding Path="IsDirectory" />
-                                            <Binding Path="IsExpanded" />
-                                        </MultiBinding>
-                                    </PathIcon.Data>
-                                </PathIcon>
-                                <TextBlock VerticalAlignment="Center" Text="{Binding Name}" />
-                            </StackPanel>
-                        </DataTemplate>
-
-                        <!--  Edit template for Name column cells  -->
-                        <DataTemplate x:Key="FileNameEditCell" DataType="vm:FileNodeViewModel">
-                            <StackPanel Orientation="Horizontal">
-                                <Image Margin="0,0,4,0" VerticalAlignment="Center">
-                                    <Image.Source>
-                                        <MultiBinding Converter="{StaticResource FileIconConverter}">
-                                            <Binding Path="IsDirectory" />
-                                            <Binding Path="IsExpanded" />
-                                        </MultiBinding>
-                                    </Image.Source>
-                                </Image>
-                                <TextBox
-                                    VerticalAlignment="Center"
-                                    Classes="Small"
-                                    Text="{Binding Name}">
-                                    <TextBox.Styles>
-                                        <Style Selector="DataValidationErrors">
-                                            <Setter Property="Theme" Value="{DynamicResource TooltipDataValidationErrors}" />
-                                        </Style>
-                                    </TextBox.Styles>
-                                </TextBox>
-                            </StackPanel>
-                        </DataTemplate>
-                    </TreeDataGrid.Resources>
-                    <TreeDataGrid.Styles>
-                        <Style Selector="TreeDataGrid TreeDataGridRow:nth-child(2n)">
-                            <Setter Property="Background" Value="{DynamicResource SemiColorFill0}" />
-                        </Style>
-                    </TreeDataGrid.Styles>
-                </TreeDataGrid>
-            </Grid>
-        </TabItem>
-    </TabControl>
-</UserControl>
--- a/demo/Semi.Avalonia.Demo/Pages/TreeDataGridDemo.axaml.cs
+++ b/demo/Semi.Avalonia.Demo/Pages/TreeDataGridDemo.axaml.cs
@@ -1,22 +0,0 @@
-using Avalonia.Controls;
-using Avalonia.Input;
-using Semi.Avalonia.Demo.ViewModels;
-
-namespace Semi.Avalonia.Demo.Pages;
-
-public partial class TreeDataGridDemo : UserControl
-{
-    public TreeDataGridDemo()
-    {
-        InitializeComponent();
-        this.DataContext = new TreeDataGridDemoViewModel();
-    }
-
-    private void SelectedPath_KeyDown(object? sender, KeyEventArgs e)
-    {
-        if (e.Key == Key.Enter && DataContext is TreeDataGridDemoViewModel vm)
-        {
-            vm.FilesContext.SelectedPath = (sender as TextBox)?.Text;
-        }
-    }
-}
--- a/demo/Semi.Avalonia.Demo/Pages/VariablesDemo.axaml
+++ b/demo/Semi.Avalonia.Demo/Pages/VariablesDemo.axaml
@@ -1,4 +1,4 @@
-<UserControl xmlns="https://github.com/avaloniaui"
+<UserControl xmlns="https://github.com/avaloniaui"
             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
@@ -17,7 +17,7 @@
            Margin="8"
            Classes="ClearButton"
            Text="{Binding SearchText}"
-            Watermark="Input Variable Category/ResourceKey/Type/Value/Description" />
+            PlaceholderText="Input Variable Category/ResourceKey/Type/Value/Description" />

        <DataGrid
            Grid.Row="1"
@@ -86,8 +86,7 @@
                <DataGridTemplateColumn
                    Width="100"
                    x:DataType="vm:VariableItem"
-                    Header="CopyText"
-                    SortMemberPath="Duration">
+                    Header="CopyText">
                    <DataGridTemplateColumn.CellTemplate>
                        <DataTemplate DataType="vm:VariableItem">
                            <Button
--- a/demo/Semi.Avalonia.Demo/Pages/VariablesDemo.axaml.cs
+++ b/demo/Semi.Avalonia.Demo/Pages/VariablesDemo.axaml.cs
@@ -1,5 +1,6 @@
-using System.Threading.Tasks;
+using System.Threading.Tasks;
 using Avalonia.Controls;
+using Avalonia.Input.Platform;
 using Semi.Avalonia.Demo.ViewModels;

 namespace Semi.Avalonia.Demo.Pages;
--- a/demo/Semi.Avalonia.Demo/Semi.Avalonia.Demo.csproj
+++ b/demo/Semi.Avalonia.Demo/Semi.Avalonia.Demo.csproj
@@ -11,22 +11,21 @@
    </ItemGroup>

    <ItemGroup>
-        <PackageReference Include="Avalonia" Version="$(AvaloniaVersion)"/>
-        <PackageReference Include="Avalonia.Controls.ColorPicker" Version="$(AvaloniaVersion)"/>
-        <PackageReference Include="Avalonia.Controls.DataGrid" Version="$(DataGridVersion)"/>
-        <!--Condition below is needed to remove Avalonia.Diagnostics package from build output in Release configuration.-->
-        <PackageReference Include="Avalonia.Diagnostics" Version="$(AvaloniaVersion)">
+        <PackageReference Include="Avalonia"/>
+        <PackageReference Include="Avalonia.Controls.ColorPicker"/>
+        <PackageReference Include="Avalonia.Controls.DataGrid"/>
+        <!--Condition below is needed to remove AvaloniaUI.DiagnosticsSupport package from build output in Release configuration.-->
+        <PackageReference Include="AvaloniaUI.DiagnosticsSupport">
            <IncludeAssets Condition="'$(Configuration)' != 'Debug'">None</IncludeAssets>
            <PrivateAssets Condition="'$(Configuration)' != 'Debug'">All</PrivateAssets>
        </PackageReference>
-        <PackageReference Include="CommunityToolkit.Mvvm" Version="$(CommunityToolkitVersion)"/>
-        <PackageReference Include="Irihi.Avalonia.Shared" Version="0.3.0" />
+        <PackageReference Include="CommunityToolkit.Mvvm"/>
    </ItemGroup>

    <ItemGroup>
        <ProjectReference Include="..\..\src\Semi.Avalonia\Semi.Avalonia.csproj"/>
        <ProjectReference Include="..\..\src\Semi.Avalonia.ColorPicker\Semi.Avalonia.ColorPicker.csproj"/>
        <ProjectReference Include="..\..\src\Semi.Avalonia.DataGrid\Semi.Avalonia.DataGrid.csproj"/>
-        <ProjectReference Include="..\..\src\Semi.Avalonia.TreeDataGrid\Semi.Avalonia.TreeDataGrid.csproj"/>
+<!--        <ProjectReference Include="..\..\src\Semi.Avalonia.TreeDataGrid\Semi.Avalonia.TreeDataGrid.csproj"/>-->
    </ItemGroup>
 </Project>
--- a/demo/Semi.Avalonia.Demo/ViewModels/TreeDataGridDemo/FilesPageViewModel.cs
+++ b/demo/Semi.Avalonia.Demo/ViewModels/TreeDataGridDemo/FilesPageViewModel.cs
@@ -1,363 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.ComponentModel;
-using System.Diagnostics;
-using System.IO;
-using System.Linq;
-using System.Runtime.InteropServices;
-using Avalonia.Controls;
-using Avalonia.Controls.Models.TreeDataGrid;
-using Avalonia.Controls.Selection;
-using Avalonia.Threading;
-using CommunityToolkit.Mvvm.ComponentModel;
-
-namespace Semi.Avalonia.Demo.ViewModels;
-
-public partial class FilesPageViewModel : ObservableObject
-{
-    public IList<string> Drives { get; }
-    public HierarchicalTreeDataGridSource<FileNodeViewModel> Source { get; }
-    [ObservableProperty] private string _selectedDrive;
-    private string? _selectedPath;
-    [ObservableProperty] private FileNodeViewModel? _root;
-
-    public string? SelectedPath
-    {
-        get => _selectedPath;
-        set => SetSelectedPath(value);
-    }
-
-    partial void OnSelectedDriveChanged(string value)
-    {
-        Root = new FileNodeViewModel(value, true, true);
-        if (Source is not null)
-        {
-            Source.Items = [Root];
-        }
-    }
-
-    public FilesPageViewModel()
-    {
-        Drives = DriveInfo.GetDrives().Select(x => x.Name).ToList();
-        if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
-        {
-            SelectedDrive = @"C:\";
-        }
-        else
-        {
-            SelectedDrive = Drives.FirstOrDefault() ?? "/";
-        }
-
-        Source = new HierarchicalTreeDataGridSource<FileNodeViewModel>([])
-        {
-            Columns =
-            {
-                new CheckBoxColumn<FileNodeViewModel>(
-                    null,
-                    x => x.IsChecked,
-                    (o, v) => o.IsChecked = v,
-                    options: new CheckBoxColumnOptions<FileNodeViewModel>
-                    {
-                        CanUserResizeColumn = false,
-                    }),
-                new HierarchicalExpanderColumn<FileNodeViewModel>(
-                    new TemplateColumn<FileNodeViewModel>(
-                        "Name",
-                        "FileNameCell",
-                        "FileNameEditCell",
-                        new GridLength(1, GridUnitType.Star),
-                        new TemplateColumnOptions<FileNodeViewModel>
-                        {
-                            CompareAscending = FileNodeViewModel.SortAscending(vm => vm.Name),
-                            CompareDescending = FileNodeViewModel.SortDescending(vm => vm.Name),
-                            IsTextSearchEnabled = true,
-                            TextSearchValueSelector = vm => vm.Name
-                        }),
-                    vm => vm.Children,
-                    vm => vm.HasChildren,
-                    vm => vm.IsExpanded),
-                new TextColumn<FileNodeViewModel, long?>(
-                    "Size",
-                    vm => vm.Size,
-                    options: new TextColumnOptions<FileNodeViewModel>
-                    {
-                        CompareAscending = FileNodeViewModel.SortAscending(x => x.Size),
-                        CompareDescending = FileNodeViewModel.SortDescending(x => x.Size),
-                    }),
-                new TextColumn<FileNodeViewModel, DateTimeOffset?>(
-                    "Modified",
-                    x => x.Modified,
-                    options: new TextColumnOptions<FileNodeViewModel>
-                    {
-                        CompareAscending = FileNodeViewModel.SortAscending(x => x.Modified),
-                        CompareDescending = FileNodeViewModel.SortDescending(x => x.Modified),
-                    }),
-            }
-        };
-        Source.RowSelection!.SingleSelect = false;
-        Source.RowSelection.SelectionChanged += SelectionChanged;
-    }
-
-    private void SelectionChanged(object? sender, TreeSelectionModelSelectionChangedEventArgs<FileNodeViewModel> e)
-    {
-        var selectedPath = Source.RowSelection?.SelectedItem?.Path;
-        this.SetProperty(ref _selectedPath, selectedPath, nameof(SelectedPath));
-
-        foreach (var i in e.DeselectedItems)
-            Trace.WriteLine($"Deselected '{i?.Path}'");
-        foreach (var i in e.SelectedItems)
-            Trace.WriteLine($"Selected '{i?.Path}'");
-    }
-    private void SetSelectedPath(string? path)
-    {
-        if (string.IsNullOrEmpty(path))
-        {
-            Source.RowSelection!.Clear();
-            return;
-        }
-
-        var components = new Stack<string>();
-        DirectoryInfo? d = null;
-
-        if (File.Exists(path))
-        {
-            var f = new FileInfo(path);
-            components.Push(f.Name);
-            d = f.Directory;
-        }
-        else if (Directory.Exists(path))
-        {
-            d = new DirectoryInfo(path);
-        }
-
-        while (d is not null)
-        {
-            components.Push(d.Name);
-            d = d.Parent;
-        }
-
-        var index = IndexPath.Unselected;
-
-        if (components.Count > 0)
-        {
-            var drive = components.Pop();
-            var driveIndex = Drives.FindIndex(x => string.Equals(x, drive, StringComparison.OrdinalIgnoreCase));
-
-            if (driveIndex >= 0)
-                SelectedDrive = Drives[driveIndex];
-
-            var node = Root;
-            index = new IndexPath(0);
-
-            while (node is not null && components.Count > 0)
-            {
-                node.IsExpanded = true;
-
-                var component = components.Pop();
-                var i = node.Children.FindIndex(x => string.Equals(x.Name, component, StringComparison.OrdinalIgnoreCase));
-                node = i >= 0 ? node.Children[i] : null;
-                index = i >= 0 ? index.Append(i) : default;
-            }
-        }
-
-        Source.Items = [Root!];
-        Source.RowSelection!.SelectedIndex = index;
-    }
-}
-
-public partial class FileNodeViewModel : ObservableObject, IEditableObject
-{
-    [ObservableProperty] private string _path;
-    [ObservableProperty] private string _name;
-    private string? _undoName;
-    [ObservableProperty] private long? _size;
-    [ObservableProperty] private DateTimeOffset? _modified;
-    private FileSystemWatcher? _watcher;
-    private ObservableCollection<FileNodeViewModel>? _children;
-    [ObservableProperty] private bool _hasChildren = true;
-    [ObservableProperty] private bool _isExpanded;
-
-    public FileNodeViewModel(string path, bool isDirectory, bool isRoot = false)
-    {
-        Path = path;
-        Name = isRoot ? path : System.IO.Path.GetFileName(Path);
-        IsExpanded = isRoot;
-        IsDirectory = isDirectory;
-        HasChildren = isDirectory;
-
-        if (!isDirectory)
-        {
-            var info = new FileInfo(path);
-            Size = info.Length;
-            Modified = info.LastWriteTimeUtc;
-        }
-    }
-
-    public bool IsChecked { get; set; }
-    public bool IsDirectory { get; }
-    public IReadOnlyList<FileNodeViewModel> Children => _children ??= LoadChildren();
-
-    private ObservableCollection<FileNodeViewModel> LoadChildren()
-    {
-        if (!IsDirectory)
-        {
-            throw new NotSupportedException();
-        }
-
-        var options = new EnumerationOptions { IgnoreInaccessible = true };
-        var result = new ObservableCollection<FileNodeViewModel>();
-
-        foreach (var d in Directory.EnumerateDirectories(Path, "*", options))
-        {
-            result.Add(new FileNodeViewModel(d, true));
-        }
-
-        foreach (var f in Directory.EnumerateFiles(Path, "*", options))
-        {
-            result.Add(new FileNodeViewModel(f, false));
-        }
-
-        _watcher = new FileSystemWatcher
-        {
-            Path = Path,
-            NotifyFilter = NotifyFilters.FileName | NotifyFilters.Size | NotifyFilters.LastWrite,
-        };
-
-        _watcher.Changed += OnChanged;
-        _watcher.Created += OnCreated;
-        _watcher.Deleted += OnDeleted;
-        _watcher.Renamed += OnRenamed;
-        _watcher.EnableRaisingEvents = true;
-
-        if (result.Count == 0)
-            HasChildren = false;
-
-        return result;
-    }
-
-    public static Comparison<FileNodeViewModel?> SortAscending<T>(Func<FileNodeViewModel, T> selector)
-    {
-        return (x, y) =>
-        {
-            if (x is null && y is null)
-                return 0;
-            else if (x is null)
-                return -1;
-            else if (y is null)
-                return 1;
-            if (x.IsDirectory == y.IsDirectory)
-                return Comparer<T>.Default.Compare(selector(x), selector(y));
-            else if (x.IsDirectory)
-                return -1;
-            else
-                return 1;
-        };
-    }
-
-    public static Comparison<FileNodeViewModel?> SortDescending<T>(Func<FileNodeViewModel, T> selector)
-    {
-        return (x, y) =>
-        {
-            if (x is null && y is null)
-                return 0;
-            else if (x is null)
-                return 1;
-            else if (y is null)
-                return -1;
-            if (x.IsDirectory == y.IsDirectory)
-                return Comparer<T>.Default.Compare(selector(y), selector(x));
-            else if (x.IsDirectory)
-                return -1;
-            else
-                return 1;
-        };
-    }
-
-    void IEditableObject.BeginEdit() => _undoName = Name;
-    void IEditableObject.CancelEdit() => Name = _undoName ?? string.Empty;
-    void IEditableObject.EndEdit() => _undoName = null;
-
-    private void OnChanged(object sender, FileSystemEventArgs e)
-    {
-        if (e.ChangeType == WatcherChangeTypes.Changed && File.Exists(e.FullPath))
-        {
-            Dispatcher.UIThread.Post(() =>
-            {
-                foreach (var child in _children!)
-                {
-                    if (child.Path == e.FullPath)
-                    {
-                        if (!child.IsDirectory)
-                        {
-                            var info = new FileInfo(e.FullPath);
-                            child.Size = info.Length;
-                            child.Modified = info.LastWriteTimeUtc;
-                        }
-
-                        break;
-                    }
-                }
-            });
-        }
-    }
-
-    private void OnCreated(object sender, FileSystemEventArgs e)
-    {
-        Dispatcher.UIThread.Post(() =>
-        {
-            var node = new FileNodeViewModel(
-                e.FullPath,
-                File.GetAttributes(e.FullPath).HasFlag(FileAttributes.Directory));
-            _children!.Add(node);
-        });
-    }
-
-    private void OnDeleted(object sender, FileSystemEventArgs e)
-    {
-        Dispatcher.UIThread.Post(() =>
-        {
-            for (var i = 0; i < _children!.Count; ++i)
-            {
-                if (_children[i].Path == e.FullPath)
-                {
-                    _children.RemoveAt(i);
-                    Debug.WriteLine($"Removed {e.FullPath}");
-                    break;
-                }
-            }
-        });
-    }
-
-    private void OnRenamed(object sender, RenamedEventArgs e)
-    {
-        Dispatcher.UIThread.Post(() =>
-        {
-            foreach (var child in _children!)
-            {
-                if (child.Path == e.OldFullPath)
-                {
-                    child.Path = e.FullPath;
-                    child.Name = e.Name ?? string.Empty;
-                    break;
-                }
-            }
-        });
-    }
-}
-
-internal static class ListExtensions
-{
-    public static int FindIndex<T>(this IEnumerable<T> source, Func<T, bool> predicate)
-    {
-        int i = 0;
-        foreach (var item in source)
-        {
-            if (predicate(item))
-                return i;
-            i++;
-        }
-
-        return -1;
-    }
-}
--- a/demo/Semi.Avalonia.Demo/ViewModels/TreeDataGridDemo/SongsPageViewModel.cs
+++ b/demo/Semi.Avalonia.Demo/ViewModels/TreeDataGridDemo/SongsPageViewModel.cs
@@ -1,54 +0,0 @@
-using System.Collections.ObjectModel;
-using System.Linq;
-using Avalonia.Controls;
-using Avalonia.Controls.Models.TreeDataGrid;
-using CommunityToolkit.Mvvm.ComponentModel;
-
-namespace Semi.Avalonia.Demo.ViewModels;
-
-public class SongsPageViewModel : ObservableObject
-{
-    public FlatTreeDataGridSource<SongViewModel> Songs { get; }
-
-    public SongsPageViewModel()
-    {
-        var songs = new ObservableCollection<SongViewModel>(Song.Songs.Select(a => new SongViewModel()
-        {
-            Title = a.Title,
-            Artist = a.Artist,
-            Album = a.Album,
-            CountOfComment = a.CountOfComment,
-            IsSelected = false
-        }));
-
-        Songs = new FlatTreeDataGridSource<SongViewModel>(songs)
-        {
-            Columns =
-            {
-                new CheckBoxColumn<SongViewModel>(
-                    "IsSelected",
-                    a => a.IsSelected,
-                    (model, b) => { model.IsSelected = b; },
-                    new GridLength(108, GridUnitType.Pixel)),
-                new TextColumn<SongViewModel, string>(
-                    "Title",
-                    a => a.Title,
-                    (o, a) => o.Title = a,
-                    new GridLength(6, GridUnitType.Star)),
-                new TextColumn<SongViewModel, string>("Artist",
-                    a => a.Artist,
-                    (o, a) => o.Artist = a,
-                    new GridLength(6, GridUnitType.Star)),
-                new TemplateColumn<SongViewModel>("Album",
-                    "AlbumCell",
-                    "AlbumEditCell",
-                    new GridLength(6, GridUnitType.Star)),
-                new TemplateColumn<SongViewModel>(
-                    "Comments",
-                    "CommentsCell",
-                    "CommentsEditCell",
-                    new GridLength(6, GridUnitType.Star)),
-            }
-        };
-    }
-}
--- a/demo/Semi.Avalonia.Demo/ViewModels/TreeDataGridDemo/TreeDataGridDemoViewModel.cs
+++ b/demo/Semi.Avalonia.Demo/ViewModels/TreeDataGridDemo/TreeDataGridDemoViewModel.cs
@@ -1,9 +0,0 @@
-using CommunityToolkit.Mvvm.ComponentModel;
-
-namespace Semi.Avalonia.Demo.ViewModels;
-
-public class TreeDataGridDemoViewModel : ObservableObject
-{
-    public SongsPageViewModel SongsContext { get; } = new();
-    public FilesPageViewModel FilesContext { get; } = new();
-}
--- a/demo/Semi.Avalonia.Demo/ViewModels/VariablesDemoViewModel.cs
+++ b/demo/Semi.Avalonia.Demo/ViewModels/VariablesDemoViewModel.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Globalization;
 using Avalonia;
--- a/demo/Semi.Avalonia.Demo/Views/MainView.axaml
+++ b/demo/Semi.Avalonia.Demo/Views/MainView.axaml
@@ -16,9 +16,9 @@
            <Setter Property="Template">
                <ControlTemplate TargetType="TabItem">
                    <TextBlock
-                        FontWeight="Bold"
-                        FontSize="12"
                        Margin="4"
+                        FontSize="12"
+                        FontWeight="Bold"
                        Text="{TemplateBinding Header}" />
                </ControlTemplate>
            </Setter>
@@ -37,48 +37,44 @@
                <StackPanel Orientation="Horizontal" Spacing="8">
                    <ToggleSwitch
                        Name="ExpandButton"
-                        Theme="{DynamicResource IconBorderlessToggleSwitch}"
-                        Content="{StaticResource SemiIconSidebar}" />
+                        Content="{StaticResource SemiIconSidebar}"
+                        Theme="{DynamicResource IconBorderlessToggleSwitch}" />
                    <SelectableTextBlock
                        VerticalAlignment="Center"
                        Classes="H6"
                        Text="Semi Avalonia"
                        Theme="{DynamicResource TitleSelectableTextBlock}" />
-                    <SelectableTextBlock
-                        VerticalAlignment="Center"
-                        Text="/" />
+                    <SelectableTextBlock VerticalAlignment="Center" Text="/" />
                    <SelectableTextBlock
                        VerticalAlignment="Center"
                        Classes="Secondary"
                        Text="{ReflectionBinding #tab.SelectedItem.Header}" />
                </StackPanel>
-                <StackPanel Orientation="Horizontal" HorizontalAlignment="Right">
+                <StackPanel HorizontalAlignment="Right" Orientation="Horizontal">
                    <Button
-                        Theme="{DynamicResource IconBorderlessButton}"
                        Command="{Binding OpenUrlCommand}"
                        CommandParameter="{Binding DocumentationUrl}"
-                        Content="{StaticResource SemiIconGlobe}" />
+                        Content="{StaticResource SemiIconGlobe}"
+                        Theme="{DynamicResource IconBorderlessButton}" />

                    <Button
-                        Theme="{DynamicResource IconBorderlessButton}"
                        Command="{Binding OpenUrlCommand}"
                        CommandParameter="{Binding RepoUrl}"
-                        Content="{StaticResource SemiIconGithubLogo}" />
+                        Content="{StaticResource SemiIconGithubLogo}"
+                        Theme="{DynamicResource IconBorderlessButton}" />

                    <ToggleSwitch
-                        Theme="{DynamicResource IconBorderlessToggleSwitch}"
                        Command="{Binding ToggleThemeCommand}"
+                        OffContent="{StaticResource SemiIconSun}"
                        OnContent="{StaticResource SemiIconMoon}"
-                        OffContent="{StaticResource SemiIconSun}" />
+                        Theme="{DynamicResource IconBorderlessToggleSwitch}" />

-                    <Button
-                        Theme="{DynamicResource IconBorderlessButton}"
-                        Content="{StaticResource SemiIconMenu}">
+                    <Button Content="{StaticResource SemiIconMenu}" Theme="{DynamicResource IconBorderlessButton}">
                        <Button.Flyout>
-                            <MenuFlyout Placement="Bottom" ItemsSource="{Binding MenuItems}" />
+                            <MenuFlyout ItemsSource="{Binding MenuItems}" Placement="Bottom" />
                        </Button.Flyout>
                        <Button.Styles>
-                            <Style Selector="MenuItem" x:DataType="views:MenuItemViewModel">
+                            <Style x:DataType="views:MenuItemViewModel" Selector="MenuItem">
                                <Setter Property="Header" Value="{Binding Header}" />
                                <Setter Property="ItemsSource" Value="{Binding Items}" />
                                <Setter Property="Command" Value="{Binding Command}" />
@@ -94,8 +90,8 @@
            Grid.Row="1"
            Margin="8"
            Padding="20,0,0,0"
-            TabStripPlacement="Left"
            Classes.Dismiss="{Binding #ExpandButton.IsChecked}"
+            TabStripPlacement="Left"
            Theme="{DynamicResource ScrollLineTabControl}">
            <TabControl.Styles>
                <Style Selector=".Dismiss /template/ ScrollViewer#PART_ScrollViewer">
@@ -113,9 +109,7 @@
            <TabItem Header="About Us">
                <pages:AboutUs />
            </TabItem>
-            <TabItem
-                Theme="{DynamicResource CategoryTabItem}"
-                Header="Resource Browser" />
+            <TabItem Header="Resource Browser" Theme="{DynamicResource CategoryTabItem}" />
            <TabItem Header="Palette">
                <pages:PaletteDemo />
            </TabItem>
@@ -128,21 +122,17 @@
            <TabItem Header="Icon">
                <pages:IconDemo />
            </TabItem>
-            <TabItem
-                Theme="{DynamicResource CategoryTabItem}"
-                Header="Separate Pack" />
+            <TabItem Header="Separate Pack" Theme="{DynamicResource CategoryTabItem}" />
            <TabItem Header="ColorPicker">
                <pages:ColorPickerDemo />
            </TabItem>
            <TabItem Header="DataGrid">
                <pages:DataGridDemo />
            </TabItem>
-            <TabItem Header="TreeDataGrid">
-                <pages:TreeDataGridDemo />
-            </TabItem>
-            <TabItem
-                Theme="{DynamicResource CategoryTabItem}"
-                Header="Basic" />
+            <!-- <TabItem Header="TreeDataGrid"> -->
+            <!--     <pages:TreeDataGridDemo /> -->
+            <!-- </TabItem> -->
+            <TabItem Header="Basic" Theme="{DynamicResource CategoryTabItem}" />
            <TabItem Header="TextBlock">
                <pages:TextBlockDemo />
            </TabItem>
@@ -155,9 +145,7 @@
            <TabItem Header="PathIcon">
                <pages:PathIconDemo />
            </TabItem>
-            <TabItem
-                Theme="{DynamicResource CategoryTabItem}"
-                Header="Button" />
+            <TabItem Header="Button" Theme="{DynamicResource CategoryTabItem}" />
            <TabItem Header="Button">
                <pages:ButtonDemo />
            </TabItem>
@@ -173,9 +161,7 @@
            <TabItem Header="ToggleSwitch">
                <pages:ToggleSwitchDemo />
            </TabItem>
-            <TabItem
-                Theme="{DynamicResource CategoryTabItem}"
-                Header="Input" />
+            <TabItem Header="Input" Theme="{DynamicResource CategoryTabItem}" />
            <TabItem Header="TextBox">
                <pages:TextBoxDemo />
            </TabItem>
@@ -197,9 +183,7 @@
            <TabItem Header="ManagedFileChooser">
                <pages:ManagedFileChooserDemo />
            </TabItem>
-            <TabItem
-                Theme="{DynamicResource CategoryTabItem}"
-                Header="Date/Time" />
+            <TabItem Header="Date/Time" Theme="{DynamicResource CategoryTabItem}" />
            <TabItem Header="Calendar">
                <pages:CalendarDemo />
            </TabItem>
@@ -212,9 +196,22 @@
            <TabItem Header="TimePicker">
                <pages:TimePickerDemo />
            </TabItem>
-            <TabItem
-                Theme="{DynamicResource CategoryTabItem}"
-                Header="Navigation" />
+            <TabItem Header="Navigation" Theme="{DynamicResource CategoryTabItem}" />
+            <TabItem Header="ContentPage">
+                <pages:ContentPageDemo />
+            </TabItem>
+            <TabItem Header="CarouselPage">
+                <pages:CarouselPageDemo />
+            </TabItem>
+            <TabItem Header="DrawerPage">
+                <pages:DrawerPageDemo />
+            </TabItem>
+            <TabItem Header="NavigationPage">
+                <pages:NavigationPageDemo />
+            </TabItem>
+            <TabItem Header="TabbedPage">
+                <pages:TabbedPageDemo />
+            </TabItem>
            <TabItem Header="TabControl">
                <pages:TabControlDemo />
            </TabItem>
@@ -224,12 +221,13 @@
            <TabItem Header="TreeView">
                <pages:TreeViewDemo />
            </TabItem>
-            <TabItem
-                Theme="{DynamicResource CategoryTabItem}"
-                Header="Show" />
+            <TabItem Header="Show" Theme="{DynamicResource CategoryTabItem}" />
            <TabItem Header="Carousel">
                <pages:CarouselDemo />
            </TabItem>
+            <TabItem Header="PipsPager">
+                <pages:PipsPagerDemo />
+            </TabItem>
            <TabItem Header="Expander">
                <pages:ExpanderDemo />
            </TabItem>
@@ -251,9 +249,7 @@
            <TabItem Header="ToolTip">
                <pages:ToolTipDemo />
            </TabItem>
-            <TabItem
-                Theme="{DynamicResource CategoryTabItem}"
-                Header="Feedback" />
+            <TabItem Header="Feedback" Theme="{DynamicResource CategoryTabItem}" />
            <TabItem Header="DataValidationErrors">
                <pages:DataValidationErrorsDemo />
            </TabItem>
@@ -266,9 +262,10 @@
            <TabItem Header="RefreshContainer">
                <pages:RefreshContainerDemo />
            </TabItem>
-            <TabItem
-                Theme="{DynamicResource CategoryTabItem}"
-                Header="Other" />
+            <TabItem Header="Other" Theme="{DynamicResource CategoryTabItem}" />
+            <TabItem Header="CommandBar">
+                <pages:CommandBarDemo />
+            </TabItem>
            <TabItem Header="GridSplitter">
                <pages:GridSplitterDemo />
            </TabItem>
--- a/demo/Semi.Avalonia.Demo/Views/MainWindow.axaml
+++ b/demo/Semi.Avalonia.Demo/Views/MainWindow.axaml
@@ -5,10 +5,12 @@
    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
    xmlns:views="clr-namespace:Semi.Avalonia.Demo.Views"
-    Title="Semi.Avalonia.Demo"
+    Title="Semi Avalonia Demo"
    d:DesignHeight="450"
    d:DesignWidth="800"
+    ExtendClientAreaToDecorationsHint="True"
+    ExtendClientAreaTitleBarHeightHint="40"
    Icon="/Assets/irihi.ico"
    mc:Ignorable="d">
-    <views:MainView />
+    <views:MainView Margin="{Binding $parent[Window].WindowDecorationMargin}" />
 </Window>
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@@ -1,17 +1,22 @@
 <Project>
    <PropertyGroup>
-        <TargetFrameworks>netstandard2.0;net6.0;net8.0</TargetFrameworks>
        <Nullable>enable</Nullable>
        <LangVersion>latest</LangVersion>
-        <Version>11.3.7.1</Version>
+        <AvaloniaUseCompiledBindingsByDefault>true</AvaloniaUseCompiledBindingsByDefault>
+    </PropertyGroup>
+
+    <PropertyGroup Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net8.0'))">
+        <IsAotCompatible>true</IsAotCompatible>
+    </PropertyGroup>
+
+    <PropertyGroup>
        <Authors>IRIHI Technology Co., Ltd.</Authors>
        <Description>Avalonia Theme inspired by Semi Design.</Description>
        <RepositoryUrl>https://github.com/irihitech/Semi.Avalonia</RepositoryUrl>
+        <PackageProjectUrl>https://github.com/irihitech/Semi.Avalonia</PackageProjectUrl>
        <PackageLicenseExpression>MIT</PackageLicenseExpression>
        <PackageIcon>irihi.png</PackageIcon>
        <PackageProjectUrl>https://github.com/irihitech/Semi.Avalonia</PackageProjectUrl>
-        <AvaloniaVersion>11.3.7</AvaloniaVersion>
-        <AvaloniaUseCompiledBindingsByDefault>true</AvaloniaUseCompiledBindingsByDefault>
        <PackageReadmeFile>README.md</PackageReadmeFile>
    </PropertyGroup>

--- a/src/Directory.Packages.props
+++ b/src/Directory.Packages.props
@@ -0,0 +1,14 @@
+<Project>
+    <PropertyGroup>
+        <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
+        <AvaloniaVersion>12.0.0-rc1</AvaloniaVersion>
+        <DataGridVersion>12.0.0-rc1</DataGridVersion>
+    </PropertyGroup>
+    <ItemGroup>
+        <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.1.1"/>
+        <PackageVersion Include="Irihi.Avalonia.Shared" Version="0.4.0-rc1"/>
+    </ItemGroup>
+</Project>
--- a/src/Semi.Avalonia.ColorPicker/ColorPickerSemiTheme.axaml
+++ b/src/Semi.Avalonia.ColorPicker/ColorPickerSemiTheme.axaml
@@ -6,6 +6,7 @@
        <ResourceDictionary>
            <ResourceDictionary.ThemeDictionaries>
                <ResourceInclude x:Key="Default" Source="Light.axaml" />
+                <ResourceInclude x:Key="Light" Source="Light.axaml" />
                <ResourceInclude x:Key="Dark" Source="Dark.axaml" />
            </ResourceDictionary.ThemeDictionaries>
            <ResourceDictionary.MergedDictionaries>
--- a/src/Semi.Avalonia.ColorPicker/Controls/ColorPicker.axaml
+++ b/src/Semi.Avalonia.ColorPicker/Controls/ColorPicker.axaml
@@ -1,8 +1,8 @@
 <ResourceDictionary
    xmlns="https://github.com/avaloniaui"
    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:iri="https://irihi.tech/shared"
    xmlns:converters="using:Avalonia.Controls.Converters">
-    <converters:CornerRadiusFilterConverter x:Key="LeftCornerRadiusFilterConverter" Filter="TopLeft, BottomLeft" />
    <converters:ToBrushConverter x:Key="ToBrushConverter" />

    <ControlTheme x:Key="{x:Type ColorPicker}" TargetType="ColorPicker">
@@ -16,11 +16,11 @@
                    <Border
                        Margin="1,1,0,1"
                        Background="{DynamicResource ColorControlCheckeredBackgroundBrush}"
-                        CornerRadius="{TemplateBinding CornerRadius, Converter={StaticResource LeftCornerRadiusFilterConverter}}" />
+                        CornerRadius="{TemplateBinding CornerRadius, Converter={iri:CornerRadiusMixerConverter Left}}" />
                    <Border
                        Margin="1,1,0,1"
                        Background="{TemplateBinding HsvColor, Converter={StaticResource ToBrushConverter}}"
-                        CornerRadius="{TemplateBinding CornerRadius, Converter={StaticResource LeftCornerRadiusFilterConverter}}" />
+                        CornerRadius="{TemplateBinding CornerRadius, Converter={iri:CornerRadiusMixerConverter Left}}" />
                </Panel>
            </Template>
        </Setter>
--- a/src/Semi.Avalonia.ColorPicker/Controls/ColorPreviewer.axaml
+++ b/src/Semi.Avalonia.ColorPicker/Controls/ColorPreviewer.axaml
@@ -1,11 +1,9 @@
 <ResourceDictionary
    xmlns="https://github.com/avaloniaui"
    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:converters="using:Avalonia.Controls.Converters"
+    xmlns:iri="https://irihi.tech/shared"
    xmlns:pc="using:Avalonia.Controls.Primitives.Converters">
    <pc:AccentColorConverter x:Key="AccentColorConverter" />
-    <converters:CornerRadiusFilterConverter x:Key="LeftCornerRadiusFilterConverter" Filter="TopLeft, BottomLeft" />
-    <converters:CornerRadiusFilterConverter x:Key="RightCornerRadiusFilterConverter" Filter="TopRight, BottomRight" />

    <ControlTheme x:Key="{x:Type ColorPreviewer}" TargetType="ColorPreviewer">
        <Setter Property="Height" Value="{DynamicResource ColorPreviewerHeight}" />
@@ -34,7 +32,7 @@
                                Background="{TemplateBinding HsvColor,
                                Converter={StaticResource AccentColorConverter},
                                ConverterParameter='-2'}"
-                                CornerRadius="{TemplateBinding CornerRadius,Converter={StaticResource LeftCornerRadiusFilterConverter}}"
+                                CornerRadius="{TemplateBinding CornerRadius,Converter={iri:CornerRadiusMixerConverter Left}}"
                                Tag="-2" />
                            <Border
                                Name="PART_AccentDecrement1Border"
@@ -70,7 +68,7 @@
                                Background="{TemplateBinding HsvColor,
                                Converter={StaticResource AccentColorConverter},
                                ConverterParameter='2'}"
-                                CornerRadius="{TemplateBinding CornerRadius,Converter={StaticResource RightCornerRadiusFilterConverter}}"
+                                CornerRadius="{TemplateBinding CornerRadius,Converter={iri:CornerRadiusMixerConverter Right}}"
                                Tag="2" />
                        </Grid>
                        <!--  Preview color: Must be last for drop shadow Z-index  -->
--- a/src/Semi.Avalonia.ColorPicker/Semi.Avalonia.ColorPicker.csproj
+++ b/src/Semi.Avalonia.ColorPicker/Semi.Avalonia.ColorPicker.csproj
@@ -1,19 +1,16 @@
 <Project Sdk="Microsoft.NET.Sdk">

-    <Import Project="../Package.props"/>
-
    <PropertyGroup>
+        <TargetFrameworks>net8.0;net10.0</TargetFrameworks>
+        <Version>12.0.0-rc1</Version>
+        <PackageReleaseNotes>Update to Semi.Avalonia.ColorPicker 12.0.0-rc1</PackageReleaseNotes>
        <Title>Semi.Avalonia.ColorPicker</Title>
-        <PackageReleaseNotes>Update to Semi.Avalonia.ColorPicker 11.3.7.1</PackageReleaseNotes>
-    </PropertyGroup>
-
-    <PropertyGroup Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net8.0'))">
-        <IsAotCompatible>true</IsAotCompatible>
    </PropertyGroup>

    <ItemGroup>
-        <PackageReference Include="Avalonia.Controls.ColorPicker" Version="$(AvaloniaVersion)"/>
-        <None Include="README.md" Pack="true" PackagePath="\" />
+        <PackageReference Include="Avalonia.Controls.ColorPicker"/>
+        <PackageReference Include="Irihi.Avalonia.Shared"/>
+        <None Include="README.md" Pack="true" PackagePath="\"/>
    </ItemGroup>

 </Project>
--- a/src/Semi.Avalonia.ColorPicker/SemiColorDarkPalette.cs
+++ b/src/Semi.Avalonia.ColorPicker/SemiColorDarkPalette.cs
@@ -1,6 +1,7 @@
 using Avalonia.Controls;
 using Avalonia.Media;
 using Avalonia.Utilities;
+using Irihi.Avalonia.Shared.Helpers;

 namespace Semi.Avalonia.ColorPicker;

@@ -220,8 +221,8 @@ public class SemiColorDarkPalette: IColorPalette
    public Color GetColor(int colorIndex, int shadeIndex)
    {
        return Colors[
-            MathUtilities.Clamp(colorIndex, 0, ColorCount - 1),
-            MathUtilities.Clamp(shadeIndex, 0, ShadeCount - 1)
+            MathHelpers.SafeClamp(colorIndex, 0, ColorCount - 1),
+            MathHelpers.SafeClamp(shadeIndex, 0, ShadeCount - 1)
        ];
    }

--- a/src/Semi.Avalonia.ColorPicker/SemiColorLightPalette.cs
+++ b/src/Semi.Avalonia.ColorPicker/SemiColorLightPalette.cs
@@ -1,6 +1,7 @@
 using Avalonia.Controls;
 using Avalonia.Media;
 using Avalonia.Utilities;
+using Irihi.Avalonia.Shared.Helpers;

 namespace Semi.Avalonia.ColorPicker;

@@ -220,8 +221,8 @@ public class SemiColorLightPalette: IColorPalette
    public Color GetColor(int colorIndex, int shadeIndex)
    {
        return Colors[
-            MathUtilities.Clamp(colorIndex, 0, ColorCount - 1),
-            MathUtilities.Clamp(shadeIndex, 0, ShadeCount - 1)
+            MathHelpers.SafeClamp(colorIndex, 0, ColorCount - 1),
+            MathHelpers.SafeClamp(shadeIndex, 0, ShadeCount - 1)
        ];
    }

--- a/src/Semi.Avalonia.ColorPicker/irihi.png
+++ b/src/Semi.Avalonia.ColorPicker/irihi.png
--- a/src/Semi.Avalonia.DataGrid/DataGrid.axaml
+++ b/src/Semi.Avalonia.DataGrid/DataGrid.axaml
@@ -86,7 +86,7 @@
                        <Rectangle
                            Name="PART_RightGridLine"
                            Grid.Column="1"
-                            Width="1"
+                            Width="{DynamicResource DataGridGridLineThickness}"
                            VerticalAlignment="Stretch"
                            Fill="{DynamicResource DataGridLineBrush}" />
                    </Grid>
@@ -145,7 +145,7 @@
                        <Rectangle
                            Name="VerticalSeparator"
                            Grid.Column="1"
-                            Width="1"
+                            Width="{DynamicResource DataGridGridLineThickness}"
                            VerticalAlignment="Stretch"
                            Fill="{TemplateBinding SeparatorBrush}"
                            IsVisible="{TemplateBinding AreSeparatorsVisible}" />
@@ -209,7 +209,7 @@
                    <Rectangle
                        Grid.Row="0"
                        Grid.RowSpan="2"
-                        Height="1"
+                        Height="{DynamicResource DataGridGridLineThickness}"
                        VerticalAlignment="Bottom"
                        Fill="{DynamicResource DataGridLineBrush}"
                        StrokeThickness="1" />
@@ -250,7 +250,7 @@
                        Grid.Row="2"
                        Grid.Column="0"
                        Grid.ColumnSpan="2"
-                        Height="1"
+                        Height="{DynamicResource DataGridGridLineThickness}"
                        Margin="1,0,1,0"
                        HorizontalAlignment="Stretch"
                        Fill="{TemplateBinding SeparatorBrush}"
@@ -315,7 +315,7 @@
                            Name="PART_BottomGridLine"
                            Grid.Row="2"
                            Grid.Column="1"
-                            Height="1"
+                            Height="{DynamicResource DataGridGridLineThickness}"
                            HorizontalAlignment="Stretch" />
                    </DataGridFrozenGrid>
                </Border>
@@ -452,7 +452,7 @@
                        Grid.Row="1"
                        Grid.Column="0"
                        Grid.ColumnSpan="5"
-                        Height="1"
+                        Height="{DynamicResource DataGridGridLineThickness}"
                        Fill="{DynamicResource DataGridLineBrush}" />
                </DataGridFrozenGrid>
            </ControlTemplate>
@@ -498,7 +498,7 @@
                            Grid.Row="0"
                            Grid.Column="0"
                            Grid.ColumnSpan="3"
-                            Height="1"
+                            Height="{DynamicResource DataGridGridLineThickness}"
                            VerticalAlignment="Bottom"
                            Fill="{DynamicResource DataGridLineBrush}" />

--- a/src/Semi.Avalonia.DataGrid/DataGridSemiTheme.axaml
+++ b/src/Semi.Avalonia.DataGrid/DataGridSemiTheme.axaml
@@ -6,6 +6,7 @@
        <ResourceDictionary>
            <ResourceDictionary.ThemeDictionaries>
                <ResourceInclude x:Key="Default" Source="Light.axaml" />
+                <ResourceInclude x:Key="Light" Source="Light.axaml" />
                <ResourceInclude x:Key="Dark" Source="Dark.axaml" />
            </ResourceDictionary.ThemeDictionaries>
            <ResourceDictionary.MergedDictionaries>
--- a/src/Semi.Avalonia.DataGrid/Semi.Avalonia.DataGrid.csproj
+++ b/src/Semi.Avalonia.DataGrid/Semi.Avalonia.DataGrid.csproj
@@ -1,30 +1,15 @@
 <Project Sdk="Microsoft.NET.Sdk">

    <PropertyGroup>
-        <TargetFrameworks>netstandard2.0;net6.0;net8.0</TargetFrameworks>
-        <Nullable>enable</Nullable>
-        <LangVersion>latest</LangVersion>
-        <Version>11.3.7</Version>
-        <PackageReleaseNotes>Update to Semi.Avalonia.DataGrid 11.3.7.1</PackageReleaseNotes>
-        <Authors>IRIHI Technology Co., Ltd.</Authors>
-        <Description>Avalonia Theme inspired by Semi Design.</Description>
-        <RepositoryUrl>https://github.com/irihitech/Semi.Avalonia</RepositoryUrl>
-        <PackageLicenseExpression>MIT</PackageLicenseExpression>
-        <PackageIcon>irihi.png</PackageIcon>
-        <PackageProjectUrl>https://github.com/irihitech/Semi.Avalonia</PackageProjectUrl>
+        <TargetFrameworks>net8.0;net10.0</TargetFrameworks>
+        <Version>12.0.0-rc1</Version>
+        <PackageReleaseNotes>Update to Semi.Avalonia.DataGrid 12.0.0-rc1</PackageReleaseNotes>
        <Title>Semi.Avalonia.DataGrid</Title>
-        <PackageReadmeFile>README.md</PackageReadmeFile>
-    </PropertyGroup>
-
-    <PropertyGroup Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net8.0'))">
-        <IsAotCompatible>true</IsAotCompatible>
    </PropertyGroup>

    <ItemGroup>
-        <PackageReference Include="Avalonia.Controls.DataGrid" Version="11.3.7"/>
-        <None Include="..\..\irihi.png" Pack="true" PackagePath="\" Link="Properties\irihi.png"/>
-        <None Include="..\..\LICENSE" Pack="true" PackagePath="\" Link="Properties\LICENSE"/>
-        <None Include="README.md" Pack="true" PackagePath="\" />
+        <PackageReference Include="Avalonia.Controls.DataGrid"/>
+        <None Include="README.md" Pack="true" PackagePath="\"/>
    </ItemGroup>

 </Project>
--- a/src/Semi.Avalonia.DataGrid/Shared.axaml
+++ b/src/Semi.Avalonia.DataGrid/Shared.axaml
@@ -19,4 +19,7 @@
    <StaticResource x:Key="DataGridRowGroupHeaderVisualStrokeThickness" ResourceKey="SemiBorderSpacingControl" />

    <StaticResource x:Key="DataGridDisabledCornerRadius" ResourceKey="SemiBorderRadiusSmall" />
+
+    <!-- Grid line thickness -->
+    <x:Double x:Key="DataGridGridLineThickness">1</x:Double>
 </ResourceDictionary>
--- a/src/Semi.Avalonia.TreeDataGrid/Semi.Avalonia.TreeDataGrid.csproj
+++ b/src/Semi.Avalonia.TreeDataGrid/Semi.Avalonia.TreeDataGrid.csproj
@@ -2,28 +2,14 @@

    <PropertyGroup>
        <TargetFramework>net6.0</TargetFramework>
-        <Nullable>enable</Nullable>
-        <LangVersion>latest</LangVersion>
-        <Version>11.0.10.4</Version>
-        <PackageReleaseNotes>Update to 11.0.10.4</PackageReleaseNotes>
-        <Authors>IRIHI Technology Co., Ltd.</Authors>
-        <Description>Avalonia Theme inspired by Semi Design.</Description>
-        <RepositoryUrl>https://github.com/irihitech/Semi.Avalonia</RepositoryUrl>
-        <PackageLicenseExpression>MIT</PackageLicenseExpression>
-        <PackageIcon>irihi.png</PackageIcon>
-        <PackageProjectUrl>https://github.com/irihitech/Semi.Avalonia</PackageProjectUrl>
-        <PackageReadmeFile>README.md</PackageReadmeFile>
-    </PropertyGroup>
-
-    <PropertyGroup Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net8.0'))">
-        <IsAotCompatible>true</IsAotCompatible>
+        <Version>11.1.1.1</Version>
+        <PackageReleaseNotes>Update to Semi.Avalonia.TreeDataGrid 11.1.1.1</PackageReleaseNotes>
+        <Title>Semi.Avalonia.TreeDataGrid</Title>
    </PropertyGroup>

    <ItemGroup>
-        <PackageReference Include="Avalonia.Controls.TreeDataGrid" Version="11.0.10"/>
-        <None Include="..\..\irihi.png" Pack="true" PackagePath="\" Link="Properties\irihi.png"/>
-        <None Include="..\..\LICENSE" Pack="true" PackagePath="\" Link="Properties\LICENSE"/>
-        <None Include="README.md" Pack="true" PackagePath="\" />
+        <PackageReference Include="Avalonia.Controls.TreeDataGrid"/>
+        <None Include="README.md" Pack="true" PackagePath="\"/>
    </ItemGroup>

 </Project>
--- a/src/Semi.Avalonia/Animations/SemiPopupAnimations.axaml
+++ b/src/Semi.Avalonia/Animations/SemiPopupAnimations.axaml
@@ -2,9 +2,9 @@
    x:Class="Semi.Avalonia.SemiPopupAnimations"
    xmlns="https://github.com/avaloniaui"
    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:converters="clr-namespace:Semi.Avalonia.Converters">
+    xmlns:semi="https://irihi.tech/semi">
    <Style Selector="Popup LayoutTransformControl#PART_LayoutTransform">
-        <Setter Property="RenderTransformOrigin" Value="{Binding $parent[Popup].Placement, Converter={x:Static converters:PlacementToRenderTransformOriginConverter.Instance}}" />
+        <Setter Property="RenderTransformOrigin" Value="{Binding $parent[Popup].Placement, Converter={semi:PlacementToRenderTransformOriginConverter}}" />
    </Style>

    <Style Selector="Popup[IsOpen=True] LayoutTransformControl#PART_LayoutTransform">
--- a/src/Semi.Avalonia/Controls/AutoCompleteBox.axaml
+++ b/src/Semi.Avalonia/Controls/AutoCompleteBox.axaml
@@ -1,14 +1,16 @@
 <ResourceDictionary
    xmlns="https://github.com/avaloniaui"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:iri="https://irihi.tech/shared">
    <Design.PreviewWith>
        <StackPanel Margin="20" Spacing="20">
            <TextBox Text="Hello" />
-            <AutoCompleteBox Width="100" />
+            <AutoCompleteBox Width="100" PlaceholderText="Hello" />
        </StackPanel>
    </Design.PreviewWith>
    <ControlTheme x:Key="{x:Type AutoCompleteBox}" TargetType="AutoCompleteBox">
        <Setter Property="VerticalAlignment" Value="Center" />
+        <Setter Property="PlaceholderForeground" Value="{DynamicResource TextBoxPlaceholderForeground}" />
        <Setter Property="MinHeight" Value="{DynamicResource AutoCompleteBoxDefaultHeight}" />
        <Setter Property="MaxDropDownHeight" Value="{DynamicResource AutoCompleteMaxDropdownHeight}" />
        <Setter Property="Template">
@@ -19,11 +21,13 @@
                            Name="PART_TextBox"
                            VerticalAlignment="Stretch"
                            MinHeight="{TemplateBinding MinHeight}"
+                            ClearSelectionOnLostFocus="{TemplateBinding ClearSelectionOnLostFocus}"
                            DataValidationErrors.Errors="{TemplateBinding (DataValidationErrors.Errors)}"
                            Theme="{DynamicResource NonErrorTextBox}"
                            InnerLeftContent="{TemplateBinding InnerLeftContent}"
                            InnerRightContent="{TemplateBinding InnerRightContent}"
-                            Watermark="{TemplateBinding Watermark}" />
+                            PlaceholderForeground="{TemplateBinding PlaceholderForeground}"
+                            PlaceholderText="{TemplateBinding PlaceholderText}" />
                        <Popup
                            Name="PART_Popup"
                            MaxHeight="{TemplateBinding MaxDropDownHeight}"
@@ -54,43 +58,13 @@
        </Setter>

        <Style Selector="^.Bordered">
-            <Setter Property="Template">
-                <ControlTemplate TargetType="AutoCompleteBox">
-                    <Panel>
-                        <TextBox
-                            Name="PART_TextBox"
-                            VerticalAlignment="Stretch"
-                            MinHeight="0"
-                            Classes="Bordered"
-                            DataValidationErrors.Errors="{TemplateBinding (DataValidationErrors.Errors)}"
-                            Watermark="{TemplateBinding Watermark}" />
-                        <Popup
-                            Name="PART_Popup"
-                            MaxHeight="{TemplateBinding MaxDropDownHeight}"
-                            InheritsTransform="True"
-                            IsLightDismissEnabled="True"
-                            PlacementTarget="{TemplateBinding}">
-                            <Border
-                                MinWidth="{Binding Bounds.Width, RelativeSource={RelativeSource TemplatedParent}}"
-                                Margin="{DynamicResource AutoCompleteBoxPopupMargin}"
-                                Padding="{DynamicResource AutoCompleteBoxPopupPadding}"
-                                HorizontalAlignment="Stretch"
-                                Background="{DynamicResource AutoCompleteBoxPopupBackground}"
-                                BorderBrush="{DynamicResource AutoCompleteBoxPopupBorderBrush}"
-                                BorderThickness="{DynamicResource AutoCompleteBoxPopupBorderThickness}"
-                                BoxShadow="{DynamicResource AutoCompleteBoxPopupBoxShadow}"
-                                CornerRadius="{DynamicResource AutoCompleteBoxPopupCornerRadius}">
-                                <ListBox
-                                    Name="PART_SelectingItemsControl"
-                                    Foreground="{TemplateBinding Foreground}"
-                                    ItemTemplate="{TemplateBinding ItemTemplate}"
-                                    ScrollViewer.HorizontalScrollBarVisibility="Auto"
-                                    ScrollViewer.VerticalScrollBarVisibility="Auto" />
-                            </Border>
-                        </Popup>
-                    </Panel>
-                </ControlTemplate>
-            </Setter>
+            <Style Selector="^ /template/ TextBox#PART_TextBox">
+                <Setter Property="MinHeight" Value="0" />
+                <Setter Property="iri:ClassHelper.Classes" Value="Bordered" />
+            </Style>
+            <Style Selector="^ /template/ ListBox#PART_SelectingItemsControl">
+                <Setter Property="ScrollViewer.IsScrollChainingEnabled" Value="False" />
+            </Style>
        </Style>
        <Style Selector="^.Large">
            <Setter Property="MinHeight" Value="{DynamicResource AutoCompleteBoxLargeHeight}" />
--- a/src/Semi.Avalonia/Controls/CalendarDatePicker.axaml
+++ b/src/Semi.Avalonia/Controls/CalendarDatePicker.axaml
@@ -9,6 +9,7 @@
    <ControlTheme x:Key="{x:Type CalendarDatePicker}" TargetType="CalendarDatePicker">
        <Setter Property="Background" Value="{DynamicResource CalendarDatePickerBackground}" />
        <Setter Property="Foreground" Value="{DynamicResource CalendarDatePickerForeground}" />
+        <Setter Property="PlaceholderForeground" Value="{DynamicResource TextBoxPlaceholderForeground}" />
        <Setter Property="BorderBrush" Value="{DynamicResource CalendarDatePickerBorderBrush}" />
        <Setter Property="BorderThickness" Value="{DynamicResource CalendarDatePickerBorderThickness}" />
        <Setter Property="CornerRadius" Value="{DynamicResource CalendarDatePickerCornerRadius}" />
@@ -52,8 +53,9 @@
                                CornerRadius="{TemplateBinding CornerRadius}"
                                Foreground="{TemplateBinding Foreground}"
                                Theme="{DynamicResource NonErrorTextBox}"
-                                UseFloatingWatermark="{TemplateBinding UseFloatingWatermark}"
-                                Watermark="{TemplateBinding Watermark}">
+                                UseFloatingPlaceholder="{TemplateBinding UseFloatingPlaceholder}"
+                                PlaceholderForeground="{TemplateBinding PlaceholderForeground}"
+                                PlaceholderText="{TemplateBinding PlaceholderText}">
                                <TextBox.Styles>
                                    <Style Selector="TextBox#PART_TextBox:pointerover /template/ Border#PART_ContentPresenterBorder">
                                        <!--  By default the TextBox has its own focused state, override this to disable it here  -->
--- a/src/Semi.Avalonia/Controls/CaptionButtons.axaml
+++ b/src/Semi.Avalonia/Controls/CaptionButtons.axaml
@@ -1,100 +0,0 @@
-<ResourceDictionary
-    xmlns="https://github.com/avaloniaui"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <Design.PreviewWith>
-        <CaptionButtons />
-    </Design.PreviewWith>
-
-    <ControlTheme x:Key="CaptionButton" TargetType="Button">
-        <Setter Property="Foreground" Value="{DynamicResource CaptionButtonForeground}" />
-        <Setter Property="Background" Value="Transparent" />
-        <Setter Property="CornerRadius" Value="{StaticResource CaptionButtonCornerRadius}" />
-        <Setter Property="Padding" Value="{StaticResource CaptionButtonPadding}" />
-        <Setter Property="Width" Value="{StaticResource CaptionButtonWidth}" />
-        <Setter Property="Height" Value="{StaticResource CaptionButtonHeight}" />
-        <Setter Property="Cursor" Value="Hand" />
-        <Setter Property="VerticalAlignment" Value="Stretch" />
-        <Setter Property="Template">
-            <ControlTemplate TargetType="Button">
-                <ContentPresenter
-                    Name="PART_ContentPresenter"
-                    Padding="{TemplateBinding Padding}"
-                    Foreground="{TemplateBinding Foreground}"
-                    Background="{TemplateBinding Background}"
-                    BorderBrush="{TemplateBinding BorderBrush}"
-                    BorderThickness="{TemplateBinding BorderThickness}"
-                    Content="{TemplateBinding Content}"
-                    ContentTemplate="{TemplateBinding ContentTemplate}"
-                    CornerRadius="{TemplateBinding CornerRadius}" />
-            </ControlTemplate>
-        </Setter>
-
-        <Style Selector="^:pointerover">
-            <Setter Property="Background" Value="{DynamicResource CaptionButtonPointeroverBackground}" />
-        </Style>
-
-        <Style Selector="^:pressed">
-            <Setter Property="Background" Value="{DynamicResource CaptionButtonPressedBackground}" />
-        </Style>
-    </ControlTheme>
-
-    <ControlTheme x:Key="{x:Type CaptionButtons}" TargetType="CaptionButtons">
-        <Setter Property="Foreground" Value="{DynamicResource CaptionButtonForeground}" />
-        <Setter Property="Template">
-            <ControlTemplate TargetType="CaptionButtons">
-                <StackPanel Orientation="Horizontal">
-                    <Button Name="PART_FullScreenButton" Theme="{StaticResource CaptionButton}">
-                        <PathIcon
-                            Name="PART_FullScreenButtonIcon"
-                            Theme="{StaticResource InnerPathIcon}"
-                            Data="{StaticResource WindowExpandGlyph}"
-                            Foreground="{Binding $parent[Button].Foreground}" />
-                    </Button>
-                    <Button Name="PART_MinimizeButton" Theme="{StaticResource CaptionButton}">
-                        <PathIcon
-                            Name="PART_MinimizeButtonIcon"
-                            Theme="{StaticResource InnerPathIcon}"
-                            Data="{StaticResource WindowMinimizeGlyph}"
-                            Foreground="{Binding $parent[Button].Foreground}" />
-                    </Button>
-                    <Button Name="PART_RestoreButton" Theme="{StaticResource CaptionButton}">
-                        <PathIcon
-                            Name="PART_RestoreButtonIcon"
-                            Theme="{StaticResource InnerPathIcon}"
-                            Data="{StaticResource WindowMaximizeGlyph}"
-                            Foreground="{Binding $parent[Button].Foreground}" />
-                    </Button>
-                    <Button Name="PART_CloseButton" Theme="{StaticResource CaptionButton}">
-                        <PathIcon
-                            Name="PART_CloseButtonIcon"
-                            Theme="{StaticResource InnerPathIcon}"
-                            Data="{StaticResource WindowCloseIconGlyph}"
-                            Foreground="{Binding $parent[Button].Foreground}" />
-                    </Button>
-                </StackPanel>
-            </ControlTemplate>
-        </Setter>
-
-        <Style Selector="^ /template/ Button#PART_CloseButton:pointerover">
-            <Setter Property="Foreground" Value="{DynamicResource CaptionButtonCloseForeground}" />
-            <Setter Property="Background" Value="{DynamicResource CaptionButtonClosePointeroverBackground}" />
-        </Style>
-        <Style Selector="^ /template/ Button#PART_CloseButton:pressed">
-            <Setter Property="Foreground" Value="{DynamicResource CaptionButtonCloseForeground}" />
-            <Setter Property="Background" Value="{DynamicResource CaptionButtonClosePressedBackground}" />
-        </Style>
-
-        <Style Selector="^:maximized /template/ PathIcon#PART_RestoreButtonIcon">
-            <Setter Property="Data" Value="{StaticResource WindowRestoreGlyph}" />
-        </Style>
-        <Style Selector="^:fullscreen /template/ PathIcon#PART_FullScreenButtonIcon">
-            <Setter Property="Data" Value="{StaticResource WindowCollapseGlyph}" />
-        </Style>
-        <Style Selector="^:fullscreen /template/ Button#PART_RestoreButton">
-            <Setter Property="IsVisible" Value="False" />
-        </Style>
-        <Style Selector="^:fullscreen /template/ Button#PART_MinimizeButton">
-            <Setter Property="IsVisible" Value="False" />
-        </Style>
-    </ControlTheme>
-</ResourceDictionary>
--- a/src/Semi.Avalonia/Controls/Carousel.axaml
+++ b/src/Semi.Avalonia/Controls/Carousel.axaml
@@ -1,7 +1,7 @@
 <ResourceDictionary
    xmlns="https://github.com/avaloniaui"
    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:converter="clr-namespace:Semi.Avalonia.Converters">
+    xmlns:semi="https://irihi.tech/semi">
    <Design.PreviewWith>
        <StackPanel Spacing="20" Width="800" Height="800">
            <StackPanel.Styles>
@@ -156,7 +156,7 @@
                    Theme="{DynamicResource InnerPathIcon}"
                    Width="{TemplateBinding Width}"
                    Height="{TemplateBinding Height}"
-                    Data="{DynamicResource CarouselButtonGlyph}"
+                    Data="{TemplateBinding Content}"
                    Foreground="{TemplateBinding Foreground}" />
            </ControlTemplate>
        </Setter>
@@ -197,8 +197,8 @@
                        HorizontalAlignment="Center"
                        VerticalAlignment="Center"
                        ItemContainerTheme="{DynamicResource CarouselIndicatorDotListBoxItem}"
-                        ItemsSource="{TemplateBinding ItemCount, Converter={x:Static converter:ItemConverter.ItemToObjectConverter}}"
-                        IsVisible="{TemplateBinding ItemCount, Converter={x:Static converter:ItemConverter.ItemVisibleConverter}}"
+                        ItemsSource="{TemplateBinding ItemCount, Converter={x:Static semi:ItemConverter.ItemToObjectConverter}}"
+                        IsVisible="{TemplateBinding ItemCount, Converter={x:Static semi:ItemConverter.ItemVisibleConverter}}"
                        SelectedIndex="{TemplateBinding SelectedIndex, Mode=TwoWay}">
                        <ListBox.ItemsPanel>
                            <ItemsPanelTemplate>
@@ -213,7 +213,8 @@
                        Theme="{DynamicResource CarouselButton}"
                        Margin="{DynamicResource CarouselButtonMargin}"
                        Foreground="{DynamicResource CarouselButtonForeground}"
-                        IsVisible="{TemplateBinding ItemCount, Converter={x:Static converter:ItemConverter.ItemVisibleConverter}}"
+                        Content="{StaticResource SemiIconChevronLeft}"
+                        IsVisible="{TemplateBinding ItemCount, Converter={x:Static semi:ItemConverter.ItemVisibleConverter}}"
                        Command="{Binding $parent[Carousel].Previous}" />
                    <Button
                        Grid.Row="0"
@@ -222,9 +223,9 @@
                        Theme="{DynamicResource CarouselButton}"
                        Margin="{DynamicResource CarouselButtonMargin}"
                        Foreground="{DynamicResource CarouselButtonForeground}"
-                        IsVisible="{TemplateBinding ItemCount, Converter={x:Static converter:ItemConverter.ItemVisibleConverter}}"
-                        Command="{Binding $parent[Carousel].Next}"
-                        RenderTransform="rotate(180deg)" />
+                        Content="{StaticResource SemiIconChevronRight}"
+                        IsVisible="{TemplateBinding ItemCount, Converter={x:Static semi:ItemConverter.ItemVisibleConverter}}"
+                        Command="{Binding $parent[Carousel].Next}" />
                </Grid>
            </ControlTemplate>
        </Setter>
--- a/src/Semi.Avalonia/Controls/CarouselPage.axaml
+++ b/src/Semi.Avalonia/Controls/CarouselPage.axaml
@@ -0,0 +1,19 @@
+<ResourceDictionary
+    xmlns="https://github.com/avaloniaui"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <ControlTheme x:Key="{x:Type CarouselPage}" TargetType="CarouselPage">
+        <Setter Property="Background" Value="Transparent" />
+        <Setter Property="Template">
+            <ControlTemplate>
+                <Carousel
+                    Name="PART_Carousel"
+                    Background="{TemplateBinding Background}"
+                    ItemTemplate="{TemplateBinding PageTemplate}"
+                    PageTransition="{TemplateBinding PageTransition}"
+                    ItemsPanel="{TemplateBinding ItemsPanel}"
+                    HorizontalAlignment="Stretch"
+                    VerticalAlignment="Stretch" />
+            </ControlTemplate>
+        </Setter>
+    </ControlTheme>
+</ResourceDictionary>
--- a/src/Semi.Avalonia/Controls/ComboBox.axaml
+++ b/src/Semi.Avalonia/Controls/ComboBox.axaml
@@ -92,7 +92,7 @@
                            VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
                            Foreground="{TemplateBinding Foreground}"
                            Text="{TemplateBinding Text, Mode=TwoWay}"
-                            Watermark="{TemplateBinding PlaceholderText}"
+                            PlaceholderText="{TemplateBinding PlaceholderText}"
                            IsVisible="{TemplateBinding IsEditable}" />

                        <Button
--- a/src/Semi.Avalonia/Controls/CommandBar.axaml
+++ b/src/Semi.Avalonia/Controls/CommandBar.axaml
@@ -0,0 +1,369 @@
+<ResourceDictionary
+    xmlns="https://github.com/avaloniaui"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:collections="clr-namespace:Avalonia.Collections;assembly=Avalonia.Base">
+
+    <Design.PreviewWith>
+        <GroupBox Height="500">
+            <GroupBox.Header>
+                <StackPanel>
+                    <ComboBox
+                        Name="lc"
+                        ItemsSource="{DynamicResource LabelPositionList}"
+                        SelectedValue="{x:Static CommandBarDefaultLabelPosition.Bottom}">
+                        <ComboBox.Resources>
+                            <collections:AvaloniaList x:TypeArguments="CommandBarDefaultLabelPosition" x:Key="LabelPositionList">
+                                <CommandBarDefaultLabelPosition>Bottom</CommandBarDefaultLabelPosition>
+                                <CommandBarDefaultLabelPosition>Collapsed</CommandBarDefaultLabelPosition>
+                                <CommandBarDefaultLabelPosition>Right</CommandBarDefaultLabelPosition>
+                            </collections:AvaloniaList>
+                        </ComboBox.Resources>
+                    </ComboBox>
+                    <ToggleSwitch Name="idfe" IsChecked="True" />
+                    <Slider Name="ws" Width="500" Minimum="0" Maximum="500" Value="200" />
+                </StackPanel>
+            </GroupBox.Header>
+            <StackPanel Orientation="Horizontal" VerticalAlignment="Top">
+                <CommandBar
+                    DefaultLabelPosition="{Binding #lc.SelectedValue}"
+                    IsDynamicOverflowEnabled="{Binding #idfe.IsChecked}"
+                    Width="{Binding #ws.Value}">
+                    <AppBarButton Label="New" Icon="{DynamicResource SemiIconPlus}" />
+                    <AppBarButton Label="Save" Icon="{DynamicResource SemiIconSave}" />
+                    <AppBarSeparator />
+                    <AppBarToggleButton Label="Bold" Icon="{DynamicResource SemiIconBold}" />
+                    <AppBarToggleButton Label="Italic" Icon="{DynamicResource SemiIconItalic}" />
+                    <AppBarToggleButton IsEnabled="False" IsChecked="True" Label="Underline" Icon="{DynamicResource SemiIconUnderline}" />
+                    <AppBarSeparator />
+                    <AppBarButton Label="Share" Icon="{DynamicResource SemiIconShare}" />
+                    <AppBarButton Label="Export" Icon="{DynamicResource SemiIconExport}" />
+                    <AppBarButton Label="Print" Icon="{DynamicResource SemiIconPrint}" />
+                    <AppBarSeparator />
+                    <AppBarButton Label="Delete" Icon="{DynamicResource SemiIconDelete}" />
+                </CommandBar>
+            </StackPanel>
+        </GroupBox>
+    </Design.PreviewWith>
+
+    <ControlTheme x:Key="AppBarButtonBaseTheme" TargetType="Button">
+        <Setter Property="Template">
+            <ControlTemplate TargetType="Button">
+                <Border
+                    Name="PART_Border"
+                    Background="{TemplateBinding Background}"
+                    BorderBrush="{TemplateBinding BorderBrush}"
+                    BorderThickness="{TemplateBinding BorderThickness}"
+                    CornerRadius="{TemplateBinding CornerRadius}"
+                    Padding="{TemplateBinding Padding}">
+                    <StackPanel
+                        Name="PART_LayoutRoot"
+                        Spacing="{DynamicResource AppBarButtonPanelSpacing}"
+                        HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                        VerticalAlignment="{TemplateBinding VerticalContentAlignment}">
+                        <ContentPresenter
+                            Name="PART_IconPresenter"
+                            Foreground="{TemplateBinding Foreground}">
+                            <ContentPresenter.DataTemplates>
+                                <DataTemplate DataType="Geometry">
+                                    <PathIcon
+                                        Theme="{DynamicResource InnerPathIcon}"
+                                        Data="{Binding}" />
+                                </DataTemplate>
+                            </ContentPresenter.DataTemplates>
+                        </ContentPresenter>
+                        <TextBlock
+                            Name="PART_Label"
+                            Foreground="{TemplateBinding Foreground}"
+                            FontSize="{DynamicResource AppBarButtonLabelFontSize}"
+                            TextTrimming="CharacterEllipsis" />
+                    </StackPanel>
+                </Border>
+            </ControlTemplate>
+        </Setter>
+
+        <Setter Property="Background" Value="{DynamicResource AppBarButtonBackground}" />
+        <Setter Property="Foreground" Value="{DynamicResource AppBarButtonForeground}" />
+        <Setter Property="BorderBrush" Value="Transparent" />
+        <Setter Property="BorderThickness" Value="0" />
+        <Setter Property="Padding" Value="{DynamicResource AppBarButtonPadding}" />
+        <Setter Property="Width" Value="{DynamicResource AppBarButtonWidth}" />
+        <Setter Property="MinHeight" Value="{DynamicResource AppBarButtonMinHeight}" />
+
+        <Setter Property="CornerRadius" Value="{DynamicResource AppBarButtonCornerRadius}" />
+        <Setter Property="HorizontalContentAlignment" Value="Center" />
+        <Setter Property="VerticalContentAlignment" Value="Center" />
+        <Setter Property="Cursor" Value="Hand" />
+
+        <Style Selector="^:pointerover /template/ Border#PART_Border">
+            <Setter Property="Background" Value="{DynamicResource AppBarButtonPointeroverBackground}" />
+        </Style>
+
+        <Style Selector="^:pressed /template/ Border#PART_Border">
+            <Setter Property="Background" Value="{DynamicResource AppBarButtonPressedBackground}" />
+        </Style>
+
+        <Style Selector="^:disabled">
+            <Style Selector="^ /template/ ContentPresenter#PART_IconPresenter">
+                <Setter Property="Foreground" Value="{DynamicResource AppBarButtonDisabledForeground}" />
+            </Style>
+            <Style Selector="^ /template/ TextBlock#PART_Label">
+                <Setter Property="Foreground" Value="{DynamicResource AppBarButtonDisabledForeground}" />
+            </Style>
+        </Style>
+    </ControlTheme>
+
+    <!--  AppBarButton  -->
+    <ControlTheme
+        x:Key="{x:Type AppBarButton}"
+        BasedOn="{StaticResource AppBarButtonBaseTheme}"
+        TargetType="AppBarButton">
+
+        <Style Selector="^ /template/ TextBlock#PART_Label">
+            <Setter Property="Text" Value="{TemplateBinding Label}" />
+        </Style>
+        <Style Selector="^ /template/ ContentPresenter#PART_IconPresenter">
+            <Setter Property="Content" Value="{TemplateBinding Icon}" />
+        </Style>
+
+        <!--  IsCompact: hide label, use compact width  -->
+        <Style Selector="^[IsCompact=True]">
+            <Setter Property="Width" Value="{DynamicResource AppBarButtonCompactWidth}" />
+            <Style Selector="^ /template/ TextBlock#PART_Label">
+                <Setter Property="IsVisible" Value="False" />
+            </Style>
+        </Style>
+
+        <!--  LabelPosition=Collapsed: hide label, use compact width  -->
+        <Style Selector="^[LabelPosition=Collapsed]">
+            <Setter Property="Width" Value="{DynamicResource AppBarButtonCompactWidth}" />
+            <Style Selector="^ /template/ TextBlock#PART_Label">
+                <Setter Property="IsVisible" Value="False" />
+            </Style>
+        </Style>
+
+        <!--  LabelPosition=Right: horizontal layout, auto-width  -->
+        <Style Selector="^[LabelPosition=Right]">
+            <Setter Property="Width" Value="{x:Static x:Double.NaN}" />
+            <Setter Property="MinWidth" Value="{DynamicResource AppBarButtonCompactWidth}" />
+            <Style Selector="^ /template/ StackPanel#PART_LayoutRoot">
+                <Setter Property="Orientation" Value="Horizontal" />
+            </Style>
+            <Style Selector="^ /template/ ContentPresenter#PART_IconPresenter">
+                <Setter Property="VerticalAlignment" Value="Center" />
+            </Style>
+            <Style Selector="^ /template/ TextBlock#PART_Label">
+                <Setter Property="VerticalAlignment" Value="Center" />
+            </Style>
+        </Style>
+
+        <!--  IsInOverflow: full-width horizontal layout for use inside overflow popup  -->
+        <Style Selector="^[IsInOverflow=True]">
+            <Setter Property="HorizontalContentAlignment" Value="Left" />
+            <Setter Property="Width" Value="{x:Static x:Double.NaN}" />
+            <Setter Property="MinHeight" Value="{DynamicResource AppBarButtonOverflowMinHeight}" />
+            <Setter Property="Padding" Value="{DynamicResource AppBarButtonOverflowPadding}" />
+            <Style Selector="^ /template/ StackPanel#PART_LayoutRoot">
+                <Setter Property="Orientation" Value="Horizontal" />
+            </Style>
+            <Style Selector="^ /template/ ContentPresenter#PART_IconPresenter">
+                <Setter Property="VerticalAlignment" Value="Center" />
+            </Style>
+            <Style Selector="^ /template/ TextBlock#PART_Label">
+                <Setter Property="VerticalAlignment" Value="Center" />
+            </Style>
+        </Style>
+    </ControlTheme>
+
+    <!--  AppBarToggleButton  -->
+    <ControlTheme
+        x:Key="{x:Type AppBarToggleButton}"
+        BasedOn="{StaticResource AppBarButtonBaseTheme}"
+        TargetType="AppBarToggleButton">
+
+        <Style Selector="^ /template/ TextBlock#PART_Label">
+            <Setter Property="Text" Value="{TemplateBinding Label}" />
+        </Style>
+        <Style Selector="^ /template/ ContentPresenter#PART_IconPresenter">
+            <Setter Property="Content" Value="{TemplateBinding Icon}" />
+        </Style>
+
+        <Style Selector="^:checked">
+            <Style Selector="^ /template/ Border#PART_Border">
+                <Setter Property="Background" Value="{DynamicResource AppBarToggleButtonCheckedBackground}" />
+            </Style>
+            <Style Selector="^ /template/ ContentPresenter#PART_IconPresenter">
+                <Setter Property="Foreground" Value="{DynamicResource AppBarToggleButtonCheckedForeground}" />
+            </Style>
+            <Style Selector="^:pointerover /template/ Border#PART_Border">
+                <Setter Property="Background" Value="{DynamicResource AppBarToggleButtonCheckedPointeroverBackground}" />
+            </Style>
+            <Style Selector="^:pressed /template/ Border#PART_Border">
+                <Setter Property="Background" Value="{DynamicResource AppBarToggleButtonCheckedPressedBackground}" />
+            </Style>
+            <Style Selector="^:disabled /template/ ContentPresenter#PART_IconPresenter">
+                <Setter Property="Foreground" Value="{DynamicResource AppBarToggleButtonCheckedDisabledForeground}" />
+            </Style>
+        </Style>
+
+        <!--  IsCompact: hide label, use compact width  -->
+        <Style Selector="^[IsCompact=True]">
+            <Setter Property="Width" Value="{DynamicResource AppBarButtonCompactWidth}" />
+            <Style Selector="^ /template/ TextBlock#PART_Label">
+                <Setter Property="IsVisible" Value="False" />
+            </Style>
+        </Style>
+
+        <!--  LabelPosition=Collapsed: hide label, use compact width  -->
+        <Style Selector="^[LabelPosition=Collapsed]">
+            <Setter Property="Width" Value="{DynamicResource AppBarButtonCompactWidth}" />
+            <Style Selector="^ /template/ TextBlock#PART_Label">
+                <Setter Property="IsVisible" Value="False" />
+            </Style>
+        </Style>
+
+        <!--  LabelPosition=Right: horizontal layout, auto-width  -->
+        <Style Selector="^[LabelPosition=Right]">
+            <Setter Property="Width" Value="{x:Static x:Double.NaN}" />
+            <Setter Property="MinWidth" Value="{DynamicResource AppBarButtonCompactWidth}" />
+            <Style Selector="^ /template/ StackPanel#PART_LayoutRoot">
+                <Setter Property="Orientation" Value="Horizontal" />
+            </Style>
+            <Style Selector="^ /template/ ContentPresenter#PART_IconPresenter">
+                <Setter Property="VerticalAlignment" Value="Center" />
+            </Style>
+            <Style Selector="^ /template/ TextBlock#PART_Label">
+                <Setter Property="VerticalAlignment" Value="Center" />
+            </Style>
+        </Style>
+
+        <!--  IsInOverflow: full-width horizontal layout for use inside overflow popup  -->
+        <Style Selector="^[IsInOverflow=True]">
+            <Setter Property="HorizontalContentAlignment" Value="Left" />
+            <Setter Property="Width" Value="{x:Static x:Double.NaN}" />
+            <Setter Property="MinHeight" Value="{DynamicResource AppBarButtonOverflowMinHeight}" />
+            <Setter Property="Padding" Value="{DynamicResource AppBarButtonOverflowPadding}" />
+            <Style Selector="^ /template/ StackPanel#PART_LayoutRoot">
+                <Setter Property="Orientation" Value="Horizontal" />
+            </Style>
+            <Style Selector="^ /template/ ContentPresenter#PART_IconPresenter">
+                <Setter Property="VerticalAlignment" Value="Center" />
+            </Style>
+            <Style Selector="^ /template/ TextBlock#PART_Label">
+                <Setter Property="VerticalAlignment" Value="Center" />
+            </Style>
+        </Style>
+    </ControlTheme>
+
+    <!--  AppBarSeparator  -->
+    <ControlTheme x:Key="{x:Type AppBarSeparator}" TargetType="AppBarSeparator">
+        <Setter Property="Background" Value="{DynamicResource AppBarSeparatorBackground}" />
+        <Setter Property="Width" Value="{DynamicResource AppBarSeparatorWidth}" />
+        <Setter Property="MinHeight" Value="{DynamicResource AppBarSeparatorMinHeight}" />
+        <Setter Property="Margin" Value="{DynamicResource AppBarSeparatorMargin}" />
+        <Setter Property="Template">
+            <ControlTemplate TargetType="AppBarSeparator">
+                <Border
+                    Background="{TemplateBinding Background}"
+                    Width="{TemplateBinding Width}"
+                    MinHeight="{TemplateBinding MinHeight}" />
+            </ControlTemplate>
+        </Setter>
+
+        <!--  IsInOverflow: horizontal line separator  -->
+        <Style Selector="^[IsInOverflow=True]">
+            <Setter Property="HorizontalAlignment" Value="Stretch" />
+            <Setter Property="Width" Value="{x:Static x:Double.NaN}" />
+            <Setter Property="Height" Value="{DynamicResource AppBarSeparatorOverflowHeight}" />
+            <Setter Property="MinHeight" Value="0" />
+            <Setter Property="Margin" Value="{DynamicResource AppBarSeparatorOverflowMargin}" />
+        </Style>
+    </ControlTheme>
+
+    <!--  CommandBar  -->
+    <ControlTheme x:Key="{x:Type CommandBar}" TargetType="CommandBar">
+        <Setter Property="Background" Value="{DynamicResource CommandBarBackground}" />
+        <Setter Property="Foreground" Value="{DynamicResource CommandBarForeground}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource CommandBarBorderBrush}" />
+        <Setter Property="BorderThickness" Value="{DynamicResource CommandBarBorderThickness}" />
+        <Setter Property="CornerRadius" Value="{DynamicResource CommandBarCornerRadius}" />
+        <Setter Property="MinHeight" Value="{DynamicResource CommandBarMinHeight}" />
+        <Setter Property="Padding" Value="{DynamicResource CommandBarPadding}" />
+        <Setter Property="HorizontalAlignment" Value="Stretch" />
+        <Setter Property="Template">
+            <ControlTemplate TargetType="CommandBar">
+                <Border
+                    Background="{TemplateBinding Background}"
+                    BorderBrush="{TemplateBinding BorderBrush}"
+                    BorderThickness="{TemplateBinding BorderThickness}"
+                    CornerRadius="{TemplateBinding CornerRadius}"
+                    MinHeight="{TemplateBinding MinHeight}"
+                    Padding="{TemplateBinding Padding}">
+                    <Panel>
+                        <DockPanel>
+                            <!--  Overflow button (docked right)  -->
+                            <AppBarButton
+                                Name="PART_OverflowButton"
+                                DockPanel.Dock="Right"
+                                Icon="{DynamicResource CommandBarOverflowButtonGlyph}"
+                                IsCompact="True"
+                                IsVisible="{TemplateBinding IsOverflowButtonVisible}" />
+
+                            <!--  Custom content (docked left)  -->
+                            <ContentPresenter
+                                Name="PART_ContentPresenter"
+                                DockPanel.Dock="Left"
+                                Content="{TemplateBinding Content}"
+                                VerticalAlignment="Center" />
+
+                            <!--  Primary commands (fills remaining space, right-aligned)  -->
+                            <ItemsControl
+                                Name="PART_PrimaryCommands"
+                                ItemsSource="{Binding VisiblePrimaryCommands, RelativeSource={RelativeSource TemplatedParent}}"
+                                HorizontalAlignment="Right"
+                                VerticalAlignment="Stretch"
+                                ClipToBounds="True">
+                                <ItemsControl.ItemsPanel>
+                                    <ItemsPanelTemplate>
+                                        <StackPanel Orientation="Horizontal" Spacing="2" />
+                                    </ItemsPanelTemplate>
+                                </ItemsControl.ItemsPanel>
+                            </ItemsControl>
+                        </DockPanel>
+
+                        <!--  Overflow popup  -->
+                        <Popup
+                            Name="PART_OverflowPopup"
+                            IsOpen="{TemplateBinding IsOpen, Mode=TwoWay}"
+                            PlacementTarget="{Binding #PART_OverflowButton}"
+                            Placement="Bottom"
+                            IsLightDismissEnabled="True"
+                            WindowManagerAddShadowHint="False">
+                            <Border
+                                MinHeight="{DynamicResource CommandBarOverflowMinHeight}"
+                                MaxWidth="{DynamicResource CommandBarOverflowMaxWidth}"
+                                MaxHeight="{DynamicResource CommandBarOverflowMaxHeight}"
+                                Margin="{DynamicResource CommandBarOverflowMargin}"
+                                Padding="{DynamicResource CommandBarOverflowPadding}"
+                                Background="{DynamicResource CommandBarOverflowBackground}"
+                                BorderBrush="{DynamicResource CommandBarOverflowBorderBrush}"
+                                BorderThickness="{DynamicResource CommandBarBorderThickness}"
+                                BoxShadow="{DynamicResource CommandBarOverflowBoxShadow}"
+                                CornerRadius="{DynamicResource CommandBarOverflowCornerRadius}">
+
+                                <ItemsControl
+                                    ItemsSource="{Binding OverflowItems, RelativeSource={RelativeSource TemplatedParent}}">
+                                    <ItemsControl.ItemsPanel>
+                                        <ItemsPanelTemplate>
+                                            <StackPanel />
+                                        </ItemsPanelTemplate>
+                                    </ItemsControl.ItemsPanel>
+                                </ItemsControl>
+                            </Border>
+                        </Popup>
+                    </Panel>
+                </Border>
+            </ControlTemplate>
+        </Setter>
+    </ControlTheme>
+
+</ResourceDictionary>
--- a/src/Semi.Avalonia/Controls/ContentPage.axaml
+++ b/src/Semi.Avalonia/Controls/ContentPage.axaml
@@ -0,0 +1,43 @@
+<ResourceDictionary
+    xmlns="https://github.com/avaloniaui"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <Design.PreviewWith>
+        <ContentPage
+            Width="400"
+            Height="300"
+            Background="White">
+            <TextBlock
+                HorizontalAlignment="Center"
+                VerticalAlignment="Center"
+                Text="ContentPage" />
+        </ContentPage>
+    </Design.PreviewWith>
+
+    <ControlTheme x:Key="{x:Type ContentPage}" TargetType="ContentPage">
+        <Setter Property="Background" Value="{DynamicResource ContentPageBackground}" />
+        <Setter Property="Foreground" Value="{DynamicResource ContentPageForeground}" />
+        <Setter Property="HorizontalContentAlignment" Value="Stretch" />
+        <Setter Property="VerticalContentAlignment" Value="Stretch" />
+        <Setter Property="Template">
+            <ControlTemplate TargetType="ContentPage">
+                <Grid RowDefinitions="Auto,*,Auto" Background="{TemplateBinding Background}">
+                    <ContentPresenter
+                        Name="PART_TopCommandBar"
+                        Grid.Row="0"
+                        Content="{TemplateBinding TopCommandBar}" />
+                    <ContentPresenter
+                        Name="PART_ContentPresenter"
+                        Grid.Row="1"
+                        Content="{TemplateBinding Content}"
+                        ContentTemplate="{TemplateBinding ContentTemplate}"
+                        HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                        VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" />
+                    <ContentPresenter
+                        Name="PART_BottomCommandBar"
+                        Grid.Row="2"
+                        Content="{TemplateBinding BottomCommandBar}" />
+                </Grid>
+            </ControlTemplate>
+        </Setter>
+    </ControlTheme>
+</ResourceDictionary>
--- a/src/Semi.Avalonia/Controls/DatePicker.axaml
+++ b/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="298"
+                            MinWidth="{TemplateBinding MinWidth}"
+                            MaxWidth="{TemplateBinding MaxWidth}"
                            MinHeight="{TemplateBinding MinHeight}"
                            HorizontalAlignment="Stretch"
                            VerticalAlignment="Stretch"
@@ -239,7 +241,8 @@
                            Margin="0,0,9,0"
                            Command="{Binding $parent[DatePicker].Clear}"
                            Content="{DynamicResource IconButtonClearData}"
-                            IsVisible="False" />
+                            IsVisible="False"
+                            Focusable="False" />
                    </Grid>
                </DataValidationErrors>
            </ControlTemplate>
@@ -258,7 +261,7 @@
            <Setter Property="Foreground" Value="{DynamicResource DateTimePickerButtonDisabledIconForeground}" />
        </Style>

-        <!--  Changes foreground for watermark text when SelectedDate is null  -->
+        <!--  Changes foreground for placeholder text when SelectedDate is null  -->
        <Style Selector="^:hasnodate /template/ Button#PART_FlyoutButton TextBlock">
            <Setter Property="Foreground" Value="{DynamicResource DateTimePickerEmptyForeground}" />
        </Style>
--- a/src/Semi.Avalonia/Controls/DrawerPage.axaml
+++ b/src/Semi.Avalonia/Controls/DrawerPage.axaml
@@ -0,0 +1,147 @@
+<ResourceDictionary
+    xmlns="https://github.com/avaloniaui"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <Design.PreviewWith>
+        <DrawerPage Width="400" Height="300" />
+    </Design.PreviewWith>
+
+    <ControlTheme x:Key="{x:Type DrawerPage}" TargetType="DrawerPage">
+        <Setter Property="Background" Value="{DynamicResource DrawerPageBackground}" />
+        <Setter Property="Foreground" Value="{DynamicResource DrawerPageForeground}" />
+        <Setter Property="DrawerBackground" Value="{DynamicResource DrawerPageDrawerBackground}" />
+        <Setter Property="DrawerLength" Value="{DynamicResource DrawerPageDrawerLength}" />
+        <Setter Property="CompactDrawerLength" Value="{DynamicResource DrawerPageCompactDrawerLength}" />
+        <Setter Property="HorizontalContentAlignment" Value="Stretch" />
+        <Setter Property="VerticalContentAlignment" Value="Stretch" />
+        <Setter Property="Template">
+            <ControlTemplate TargetType="DrawerPage">
+                <Grid RowDefinitions="Auto,*" Background="{TemplateBinding Background}">
+
+                    <!--  Top bar with pane toggle button  -->
+                    <Border
+                        Name="PART_TopBar"
+                        Grid.Row="0"
+                        MinHeight="{DynamicResource DrawerPageTopBarMinHeight}"
+                        Padding="{DynamicResource DrawerPageTopBarPadding}"
+                        Background="{DynamicResource DrawerPageTopBarBackground}"
+                        BorderBrush="{DynamicResource DrawerPageTopBarBorderBrush}"
+                        BorderThickness="{DynamicResource DrawerPageTopBarBorderThickness}">
+                        <Grid ColumnDefinitions="Auto,Auto,*">
+                            <!--  Pane toggle button (hamburger)  -->
+                            <ToggleButton
+                                Name="PART_PaneButton"
+                                Grid.Column="0"
+                                Width="{DynamicResource DrawerPagePaneButtonSize}"
+                                Height="{DynamicResource DrawerPagePaneButtonSize}"
+                                Margin="{DynamicResource DrawerPagePaneButtonMargin}"
+                                VerticalAlignment="Center"
+                                Background="{DynamicResource DrawerPagePaneButtonBackground}"
+                                Foreground="{DynamicResource DrawerPagePaneButtonForeground}"
+                                IsChecked="{TemplateBinding IsOpen, Mode=TwoWay}">
+                                <PathIcon
+                                    Width="16"
+                                    Height="16"
+                                    Data="{DynamicResource DrawerPageMenuGlyph}"
+                                    Foreground="{DynamicResource DrawerPagePaneButtonForeground}" />
+                            </ToggleButton>
+
+                            <!--  Drawer icon (shown in top bar)  -->
+                            <ContentPresenter
+                                Name="PART_PaneIconPresenter"
+                                Grid.Column="1"
+                                VerticalAlignment="Center"
+                                Content="{TemplateBinding DrawerIcon}"
+                                ContentTemplate="{TemplateBinding DrawerIconTemplate}" />
+                        </Grid>
+                    </Border>
+
+                    <!--  Main area: SplitView + Backdrop  -->
+                    <Panel Grid.Row="1">
+                        <SplitView
+                            Name="PART_SplitView"
+                            CompactPaneLength="{TemplateBinding CompactDrawerLength}"
+                            DisplayMode="{TemplateBinding DisplayMode}"
+                            IsPaneOpen="{TemplateBinding IsOpen, Mode=TwoWay}"
+                            OpenPaneLength="{TemplateBinding DrawerLength}"
+                            PaneBackground="{TemplateBinding DrawerBackground}">
+                            <SplitView.Pane>
+                                <DockPanel>
+                                    <!--  Drawer header  -->
+                                    <ContentPresenter
+                                        Name="PART_DrawerHeader"
+                                        DockPanel.Dock="Top"
+                                        Background="{TemplateBinding DrawerHeaderBackground}"
+                                        Content="{TemplateBinding DrawerHeader}" />
+
+                                    <!--  Drawer footer  -->
+                                    <ContentPresenter
+                                        Name="PART_DrawerFooter"
+                                        DockPanel.Dock="Bottom"
+                                        Background="{TemplateBinding DrawerFooterBackground}"
+                                        Content="{TemplateBinding DrawerFooter}" />
+
+                                    <!--  Compact pane icon (compact mode)  -->
+                                    <ContentPresenter
+                                        Name="PART_CompactPaneIconPresenter"
+                                        DockPanel.Dock="Top"
+                                        IsVisible="False"
+                                        Content="{TemplateBinding DrawerIcon}"
+                                        ContentTemplate="{TemplateBinding DrawerIconTemplate}" />
+
+                                    <!--  Bottom pane icon  -->
+                                    <ContentPresenter
+                                        Name="PART_BottomPaneIconPresenter"
+                                        DockPanel.Dock="Bottom"
+                                        IsVisible="False" 
+                                        Content="{TemplateBinding DrawerIcon}"
+                                        ContentTemplate="{TemplateBinding DrawerIconTemplate}" />
+
+                                    <!--  Drawer main content  -->
+                                    <ContentPresenter
+                                        Name="PART_DrawerPresenter"
+                                        Content="{TemplateBinding Drawer}"
+                                        ContentTemplate="{TemplateBinding DrawerTemplate}" />
+                                </DockPanel>
+                            </SplitView.Pane>
+
+                            <!--  Main page content  -->
+                            <ContentPresenter
+                                Name="PART_ContentPresenter"
+                                Content="{TemplateBinding Content}"
+                                ContentTemplate="{TemplateBinding ContentTemplate}"
+                                HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" />
+                        </SplitView>
+
+                        <!--  Backdrop overlay (shown in overlay/flyout modes)  -->
+                        <Border
+                            Name="PART_Backdrop"
+                            Background="{TemplateBinding BackdropBrush}"
+                            IsHitTestVisible="False"
+                            IsVisible="False" />
+
+                        <!--  Compact pane toggle  -->
+                        <ToggleButton
+                            Name="PART_CompactPaneToggle"
+                            IsVisible="False" />
+                    </Panel>
+                </Grid>
+            </ControlTemplate>
+        </Setter>
+
+        <!--  Pseudo-class: right-side drawer  -->
+        <Style Selector="^:placement-right /template/ SplitView#PART_SplitView">
+            <Setter Property="PanePlacement" Value="Right" />
+        </Style>
+
+        <!--  Pseudo-class: top drawer  -->
+        <Style Selector="^:placement-top /template/ SplitView#PART_SplitView">
+            <Setter Property="PanePlacement" Value="Top" />
+        </Style>
+
+        <!--  Pseudo-class: bottom drawer  -->
+        <Style Selector="^:placement-bottom /template/ SplitView#PART_SplitView">
+            <Setter Property="PanePlacement" Value="Bottom" />
+        </Style>
+    </ControlTheme>
+</ResourceDictionary>
--- a/src/Semi.Avalonia/Controls/EmbeddableControlRoot.axaml
+++ b/src/Semi.Avalonia/Controls/EmbeddableControlRoot.axaml
@@ -10,7 +10,7 @@
                <Panel>
                    <Border Name="PART_TransparencyFallback" IsHitTestVisible="False" />
                    <Border Background="{TemplateBinding Background}">
-                        <VisualLayerManager>
+                        <VisualLayerManager Name="PART_VisualLayerManager">
                            <ContentPresenter
                                Name="PART_ContentPresenter"
                                Margin="{TemplateBinding Padding}"
--- a/src/Semi.Avalonia/Controls/GroupBox.axaml
+++ b/src/Semi.Avalonia/Controls/GroupBox.axaml
@@ -0,0 +1,5 @@
+<ResourceDictionary
+    xmlns="https://github.com/avaloniaui"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <StaticResource x:Key="{x:Type GroupBox}" ResourceKey="GroupBox"/>
+</ResourceDictionary>
--- a/src/Semi.Avalonia/Controls/HeaderedContentControl.axaml
+++ b/src/Semi.Avalonia/Controls/HeaderedContentControl.axaml
@@ -1,7 +1,7 @@
 <ResourceDictionary
    xmlns="https://github.com/avaloniaui"
    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:converters="clr-namespace:Avalonia.Controls.Converters;assembly=Avalonia.Controls">
+    xmlns:iri="https://irihi.tech/shared">
    <Design.PreviewWith>
        <StackPanel Spacing="20">
            <HeaderedContentControl
@@ -23,7 +23,6 @@
            </HeaderedContentControl>
        </StackPanel>
    </Design.PreviewWith>
-    <converters:MarginMultiplierConverter x:Key="SeparatorBorderMultiplier" Top="True" Indent="1" />

    <ControlTheme x:Key="{x:Type HeaderedContentControl}" TargetType="HeaderedContentControl">
        <Setter Property="Padding" Value="3" />
@@ -97,7 +96,7 @@
                            Name="SeparatorBorder"
                            Grid.Row="1"
                            BorderBrush="{TemplateBinding BorderBrush}"
-                            BorderThickness="{TemplateBinding BorderThickness, Converter={StaticResource SeparatorBorderMultiplier}}">
+                            BorderThickness="{TemplateBinding BorderThickness, Converter={iri:ThicknessMixerConverter Top}}">
                            <Border.IsVisible>
                                <MultiBinding Converter="{x:Static BoolConverters.And}">
                                    <TemplateBinding Property="Header" Converter="{x:Static ObjectConverters.IsNotNull}" />
--- a/src/Semi.Avalonia/Controls/ManagedFileChooser.axaml
+++ b/src/Semi.Avalonia/Controls/ManagedFileChooser.axaml
@@ -1,9 +1,9 @@
 <ResourceDictionary
    xmlns="https://github.com/avaloniaui"
    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:converters="using:Semi.Avalonia.Converters"
-    xmlns:dialogs="clr-namespace:Avalonia.Dialogs;assembly=Avalonia.Dialogs"
-    xmlns:internal="clr-namespace:Avalonia.Dialogs.Internal;assembly=Avalonia.Dialogs"
+    xmlns:iri="https://irihi.tech/shared"
+    xmlns:dialogs="using:Avalonia.Dialogs"
+    xmlns:internal="using:Avalonia.Dialogs.Internal"
    xmlns:cvt="using:Avalonia.Controls.Converters">
    <Design.PreviewWith>
        <Border
@@ -14,11 +14,11 @@
        </Border>
    </Design.PreviewWith>

-    <converters:KeyToPathConverter x:Key="Icons">
+    <iri:ResourceConverter x:Key="Icons">
        <StreamGeometry x:Key="Icon_Folder">M19,20H4C2.89,20 2,19.1 2,18V6C2,4.89 2.89,4 4,4H10L12,6H19A2,2 0 0,1 21,8H21L4,8V18L6.14,10H23.21L20.93,18.5C20.7,19.37 19.92,20 19,20Z</StreamGeometry>
        <StreamGeometry x:Key="Icon_File">M13,9H18.5L13,3.5V9M6,2H14L20,8V20A2,2 0 0,1 18,22H6C4.89,22 4,21.1 4,20V4C4,2.89 4.89,2 6,2M15,18V16H6V18H15M18,14V12H6V14H18Z</StreamGeometry>
        <StreamGeometry x:Key="Icon_Volume">M6,2H18A2,2 0 0,1 20,4V20A2,2 0 0,1 18,22H6A2,2 0 0,1 4,20V4A2,2 0 0,1 6,2M12,4A6,6 0 0,0 6,10C6,13.31 8.69,16 12.1,16L11.22,13.77C10.95,13.29 11.11,12.68 11.59,12.4L12.45,11.9C12.93,11.63 13.54,11.79 13.82,12.27L15.74,14.69C17.12,13.59 18,11.9 18,10A6,6 0 0,0 12,4M12,9A1,1 0 0,1 13,10A1,1 0 0,1 12,11A1,1 0 0,1 11,10A1,1 0 0,1 12,9M7,18A1,1 0 0,0 6,19A1,1 0 0,0 7,20A1,1 0 0,0 8,19A1,1 0 0,0 7,18M12.09,13.27L14.58,19.58L17.17,18.08L12.95,12.77L12.09,13.27Z</StreamGeometry>
-    </converters:KeyToPathConverter>
+    </iri:ResourceConverter>
    <ControlTheme x:Key="{x:Type dialogs:ManagedFileChooser}" TargetType="dialogs:ManagedFileChooser">
        <Setter Property="Template">
            <ControlTemplate x:DataType="internal:ManagedFileChooserViewModel" TargetType="dialogs:ManagedFileChooser">
@@ -77,7 +77,7 @@
                            <TextBox
                                IsVisible="{Binding !SelectingFolder}"
                                Text="{Binding FileName}"
-                                Watermark="{DynamicResource STRING_CHOOSER_FILE_NAME}" />
+                                PlaceholderText="{DynamicResource STRING_CHOOSER_FILE_NAME}" />
                        </DockPanel>
                        <CheckBox
                            VerticalAlignment="Center"
--- a/src/Semi.Avalonia/Controls/Menu.axaml
+++ b/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"
--- a/src/Semi.Avalonia/Controls/NavigationPage.axaml
+++ b/src/Semi.Avalonia/Controls/NavigationPage.axaml
@@ -0,0 +1,94 @@
+<ResourceDictionary
+    xmlns="https://github.com/avaloniaui"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <Design.PreviewWith>
+        <NavigationPage Width="400" Height="300" />
+    </Design.PreviewWith>
+
+    <ControlTheme x:Key="{x:Type NavigationPage}" TargetType="NavigationPage">
+        <Setter Property="Background" Value="{DynamicResource NavigationPageBackground}" />
+        <Setter Property="Foreground" Value="{DynamicResource NavigationPageForeground}" />
+        <Setter Property="BarHeight" Value="{DynamicResource NavigationPageBarMinHeight}" />
+        <Setter Property="Template">
+            <ControlTemplate TargetType="NavigationPage">
+                <Grid RowDefinitions="Auto,*,Auto" Background="{TemplateBinding Background}">
+                    <!--  Top command bar  -->
+                    <ContentPresenter
+                        Name="PART_TopCommandBar"
+                        Grid.Row="0" />
+
+                    <!--  Content host (pages + navigation bar)  -->
+                    <Panel Name="PART_ContentHost" Grid.Row="1">
+                        <!--  Previous page (back animation target)  -->
+                        <ContentPresenter Name="PART_PageBackPresenter" />
+
+                        <!--  Current page  -->
+                        <ContentPresenter Name="PART_PagePresenter" />
+
+                        <!--  Modal back page  -->
+                        <ContentPresenter Name="PART_ModalBackPresenter" />
+
+                        <!--  Modal page  -->
+                        <ContentPresenter Name="PART_ModalPresenter" />
+
+                        <!--  Navigation bar (overlaid on content by default)  -->
+                        <Border
+                            Name="PART_NavigationBar"
+                            MinHeight="{TemplateBinding BarHeight}"
+                            Padding="{DynamicResource NavigationPageBarPadding}"
+                            VerticalAlignment="Top"
+                            Background="{DynamicResource NavigationPageBarBackground}"
+                            BorderBrush="{DynamicResource NavigationPageBarBorderBrush}"
+                            BorderThickness="{DynamicResource NavigationPageBarBorderThickness}">
+                            <Grid ColumnDefinitions="Auto,*,Auto">
+                                <Button
+                                    Name="PART_BackButton"
+                                    Grid.Column="0"
+                                    MinHeight="{DynamicResource NavigationPageBarMinHeight}"
+                                    MinWidth="{DynamicResource NavigationPageBarMinHeight}"
+                                    Padding="8"
+                                    VerticalAlignment="Center"
+                                    IsVisible="{TemplateBinding IsBackButtonEffectivelyVisible}"
+                                    Background="{DynamicResource NavigationPageBackButtonBackground}"
+                                    Theme="{StaticResource BorderlessButton}">
+                                    <Panel Background="Transparent">
+                                        <PathIcon
+                                            Theme="{StaticResource InnerPathIcon}"
+                                            Classes="Large"
+                                            Data="{DynamicResource NavigationPageBackButtonGlyph}"
+                                            Foreground="{DynamicResource NavigationPageBackButtonForeground}"
+                                            IsVisible="{Binding CurrentPage?.(NavigationPage.BackButtonContent), RelativeSource={RelativeSource TemplatedParent}, Converter={x:Static ObjectConverters.IsNull}, FallbackValue=False}" />
+                                        <ContentPresenter
+                                            Content="{Binding CurrentPage?.(NavigationPage.BackButtonContent), RelativeSource={RelativeSource TemplatedParent}, FallbackValue={x:Null}}"
+                                            IsVisible="{Binding CurrentPage?.(NavigationPage.BackButtonContent), RelativeSource={RelativeSource TemplatedParent}, Converter={x:Static ObjectConverters.IsNotNull}, FallbackValue=False}"
+                                            VerticalAlignment="Center"
+                                            HorizontalAlignment="Center" />
+                                    </Panel>
+                                </Button>
+                                <ContentPresenter
+                                    Grid.Column="1"
+                                    HorizontalAlignment="Center"
+                                    VerticalAlignment="Center" />
+                            </Grid>
+                        </Border>
+                    </Panel>
+
+                    <!--  Bottom command bar  -->
+                    <ContentPresenter
+                        Name="PART_BottomCommandBar"
+                        Grid.Row="2" />
+                </Grid>
+            </ControlTemplate>
+        </Setter>
+
+        <!--  Navigation bar is inset (content flows under the bar)  -->
+        <Style Selector="^:nav-bar-inset /template/ Border#PART_NavigationBar">
+            <Setter Property="BorderThickness" Value="0" />
+        </Style>
+
+        <!--  Compact navigation bar  -->
+        <Style Selector="^:nav-bar-compact /template/ Border#PART_NavigationBar">
+            <Setter Property="MinHeight" Value="0" />
+        </Style>
+    </ControlTheme>
+</ResourceDictionary>
--- a/src/Semi.Avalonia/Controls/NumericUpDown.axaml
+++ b/src/Semi.Avalonia/Controls/NumericUpDown.axaml
@@ -6,6 +6,7 @@
        <Setter Property="VerticalContentAlignment" Value="Center" />
        <Setter Property="CornerRadius" Value="{DynamicResource NumericUpDownCornerRadius}" />
        <Setter Property="MinHeight" Value="{DynamicResource NumericUpDownDefaultHeight}" />
+        <Setter Property="PlaceholderForeground" Value="{DynamicResource TextBoxPlaceholderForeground}" />
        <Setter Property="Template">
            <ControlTemplate TargetType="NumericUpDown">
                <DataValidationErrors>
@@ -38,7 +39,8 @@
                            Theme="{DynamicResource NonErrorTextBox}"
                            InnerLeftContent="{TemplateBinding InnerLeftContent}"
                            InnerRightContent="{TemplateBinding InnerRightContent}"
-                            Watermark="{TemplateBinding Watermark}" />
+                            PlaceholderForeground="{TemplateBinding PlaceholderForeground}"
+                            PlaceholderText="{TemplateBinding PlaceholderText}" />
                    </ButtonSpinner>
                </DataValidationErrors>
            </ControlTemplate>
--- a/src/Semi.Avalonia/Controls/PipsPager.axaml
+++ b/src/Semi.Avalonia/Controls/PipsPager.axaml
@@ -0,0 +1,130 @@
+<ResourceDictionary
+    xmlns="https://github.com/avaloniaui"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    
+    <Design.PreviewWith>
+        <StackPanel Margin="20" >
+            <PipsPager NumberOfPages="10" />
+        </StackPanel>
+    </Design.PreviewWith>
+    
+    <ControlTheme x:Key="PipsPagerButton" TargetType="Button">
+        <Setter Property="Width" Value="24" />
+        <Setter Property="Height" Value="24" />
+        <Setter Property="Foreground" Value="{DynamicResource PipsPagerButtonForeground}" />
+        <Setter Property="Cursor" Value="Hand" />
+        <Setter Property="Template">
+            <ControlTemplate TargetType="Button">
+                <PathIcon
+                    Theme="{DynamicResource InnerPathIcon}"
+                    Width="{TemplateBinding Width}"
+                    Height="{TemplateBinding Height}"
+                    Data="{TemplateBinding Content}"
+                    Foreground="{TemplateBinding Foreground}" />
+            </ControlTemplate>
+        </Setter>
+        <Style Selector="^:pointerover /template/ PathIcon">
+            <Setter Property="Foreground" Value="{DynamicResource PipsPagerButtonPointeroverForeground}" />
+        </Style>
+    </ControlTheme>
+    
+    <ControlTheme x:Key="PipsPagerIndicatorDotListBoxItem" TargetType="ListBoxItem">
+        <Setter Property="Foreground" Value="{DynamicResource PipsPagerIndicatorForeground}" />
+        <Setter Property="Margin" Value="4" />
+        <Setter Property="Cursor" Value="Hand" />
+        <Setter Property="Template">
+            <ControlTemplate TargetType="ListBoxItem">
+                <Ellipse
+                    Name="Container"
+                    Width="{DynamicResource CarouselIndicatorDotWidth}"
+                    Height="{DynamicResource CarouselIndicatorDotHeight}"
+                    Fill="{TemplateBinding Foreground}" />
+            </ControlTemplate>
+        </Setter>
+        <Style Selector="^:pointerover">
+            <Setter Property="Foreground" Value="{DynamicResource PipsPagerIndicatorPointeroverForeground}" />
+        </Style>
+        <Style Selector="^:pressed">
+            <Setter Property="Foreground" Value="{DynamicResource PipsPagerIndicatorPressedForeground}" />
+        </Style>
+        <Style Selector="^:selected">
+            <Setter Property="Foreground" Value="{DynamicResource PipsPagerIndicatorSelectedForeground}" />
+        </Style>
+    </ControlTheme>
+
+    <ControlTheme x:Key="{x:Type PipsPager}" TargetType="PipsPager">
+        <Setter Property="IsTabStop" Value="False" />
+        <Setter Property="PreviousButtonStyle" Value="{StaticResource PipsPagerButton}" />
+        <Setter Property="NextButtonStyle" Value="{StaticResource PipsPagerButton}" />
+        <Setter Property="Template">
+            <ControlTemplate>
+                <StackPanel
+                    Name="PART_RootPanel"
+                    Orientation="{TemplateBinding Orientation}"
+                    Background="{TemplateBinding Background}"
+                    ClipToBounds="False">
+                    <Button
+                        Name="PART_PreviousButton"
+                        Theme="{TemplateBinding PreviousButtonStyle}"
+                        IsVisible="{TemplateBinding IsPreviousButtonVisible}"
+                        Foreground="{DynamicResource PipsPagerButtonForeground}"
+                        Content="{StaticResource SemiIconSmallTriangleLeft}" />
+
+                    <ListBox
+                        Name="PART_PipsPagerList"
+                        HorizontalAlignment="Center"
+                        VerticalAlignment="Center"
+                        ScrollViewer.HorizontalScrollBarVisibility="Hidden"
+                        ScrollViewer.VerticalScrollBarVisibility="Hidden"
+                        ItemsSource="{Binding TemplateSettings.Pips, RelativeSource={RelativeSource TemplatedParent}}"
+                        SelectedIndex="{TemplateBinding SelectedPageIndex, Mode=TwoWay}"
+                        AutoScrollToSelectedItem="False"
+                        ItemContainerTheme="{StaticResource PipsPagerIndicatorDotListBoxItem}">
+                        <ListBox.ItemsPanel>
+                            <ItemsPanelTemplate>
+                                <StackPanel Orientation="{Binding $parent[PipsPager].Orientation}" />
+                            </ItemsPanelTemplate>
+                        </ListBox.ItemsPanel>
+                    </ListBox>
+
+                    <Button
+                        Name="PART_NextButton"
+                        Theme="{TemplateBinding NextButtonStyle}"
+                        Foreground="{DynamicResource PipsPagerButtonForeground}"
+                        Content="{StaticResource SemiIconSmallTriangleRight}"
+                        IsVisible="{TemplateBinding IsNextButtonVisible}" />
+                </StackPanel>
+            </ControlTemplate>
+        </Setter>
+
+        <Style Selector="^:horizontal /template/ StackPanel#PART_RootPanel">
+            <Setter Property="Orientation" Value="Horizontal" />
+        </Style>
+
+        <Style Selector="^:vertical">
+
+            <Style Selector="^ /template/ StackPanel#PART_RootPanel">
+                <Setter Property="Orientation" Value="Vertical" />
+                <Setter Property="HorizontalAlignment" Value="Center" />
+            </Style>
+
+            <Style Selector="^ /template/ Button#PART_PreviousButton">
+                <Setter Property="Content" Value="{DynamicResource SemiIconSmallTriangleTop}" />
+            </Style>
+            <Style Selector="^ /template/ Button#PART_NextButton">
+                <Setter Property="Content" Value="{DynamicResource SemiIconSmallTriangleDown}" />
+            </Style>
+        </Style>
+
+        <Style Selector="^:first-page /template/ Button#PART_PreviousButton">
+            <Setter Property="Opacity" Value="0" />
+            <Setter Property="IsHitTestVisible" Value="False" />
+        </Style>
+
+        <Style Selector="^:last-page /template/ Button#PART_NextButton">
+            <Setter Property="Opacity" Value="0" />
+            <Setter Property="IsHitTestVisible" Value="False" />
+        </Style>
+    </ControlTheme>
+
+</ResourceDictionary>
--- a/src/Semi.Avalonia/Controls/Popup.axaml
+++ b/src/Semi.Avalonia/Controls/Popup.axaml
@@ -7,12 +7,13 @@
        <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}">
                    <Panel>
                        <Border Name="PART_TransparencyFallback" IsHitTestVisible="False" />
-                        <VisualLayerManager IsPopup="True">
+                        <VisualLayerManager Name="PART_VisualLayerManager">
                            <LayoutTransformControl Name="PART_LayoutTransform">
                                <ContentPresenter
                                    Name="PART_ContentPresenter"
@@ -29,10 +30,14 @@
    </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}">
-                    <VisualLayerManager IsPopup="True">
+                    <VisualLayerManager Name="PART_VisualLayerManager">
                        <LayoutTransformControl Name="PART_LayoutTransform">
                            <ContentPresenter
                                Name="PART_ContentPresenter"
--- a/src/Semi.Avalonia/Controls/ProgressBar.axaml
+++ b/src/Semi.Avalonia/Controls/ProgressBar.axaml
@@ -1,8 +1,8 @@
 <ResourceDictionary
    xmlns="https://github.com/avaloniaui"
    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:converters="using:Avalonia.Controls.Converters"
-    xmlns:semiConverters="clr-namespace:Semi.Avalonia.Converters">
+    xmlns:semi="https://irihi.tech/semi"
+    xmlns:converters="using:Avalonia.Controls.Converters">
    <Design.PreviewWith>
        <StackPanel Margin="20" Spacing="20">
            <ProgressBar
@@ -338,8 +338,6 @@
        </Style>
    </ControlTheme>

-    <semiConverters:PositionToAngleConverter x:Key="AngleConverter" />
-
    <ControlTheme x:Key="ProgressRing" TargetType="ProgressBar">
        <Setter Property="Foreground" Value="{DynamicResource ProgressBarIndicatorBrush}" />
        <Setter Property="Background" Value="{DynamicResource ProgressBarBackground}" />
@@ -365,8 +363,7 @@
                        StrokeJoin="Round"
                        StrokeLineCap="Round"
                        StrokeThickness="{Binding BorderThickness.Left, RelativeSource={RelativeSource TemplatedParent}}"
-                        SweepAngle="{TemplateBinding Percentage,
-                                                     Converter={StaticResource AngleConverter}}" />
+                        SweepAngle="{TemplateBinding Percentage,Converter={semi:PositionToAngleConverter}}" />
                    <Arc
                        Name="IndeterminateIndicator"
                        Opacity="0"
@@ -376,8 +373,7 @@
                        StrokeJoin="Round"
                        StrokeLineCap="Round"
                        StrokeThickness="{Binding BorderThickness.Left, RelativeSource={RelativeSource TemplatedParent}}"
-                        SweepAngle="{TemplateBinding Percentage,
-                                                     Converter={StaticResource AngleConverter}}" />
+                        SweepAngle="{TemplateBinding Percentage,Converter={semi:PositionToAngleConverter}}" />
                    <TextBlock
                        Name="PART_ProgressText"
                        HorizontalAlignment="Center"
@@ -443,4 +439,4 @@
            </Style.Animations>
        </Style>
    </ControlTheme>
-</ResourceDictionary>
+</ResourceDictionary>
--- a/src/Semi.Avalonia/Controls/ScrollViewer.axaml
+++ b/src/Semi.Avalonia/Controls/ScrollViewer.axaml
@@ -1,7 +1,6 @@
 <ResourceDictionary
    xmlns="https://github.com/avaloniaui"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:converters="using:Avalonia.Controls.Converters">
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
    <Design.PreviewWith>
        <StackPanel>
            <ScrollBar Width="200" Orientation="Horizontal" />
@@ -54,6 +53,7 @@
                                MinWidth="{StaticResource ScrollBarThickness}"
                                VerticalAlignment="Center"
                                Focusable="False"
+                                AutomationProperties.Name="Column left"
                                Theme="{StaticResource ScrollBarRepeatButton}">
                                <PathIcon
                                    Theme="{StaticResource InnerPathIcon}"
@@ -76,6 +76,7 @@
                                        VerticalAlignment="Stretch"
                                        CornerRadius="0"
                                        Focusable="False"
+                                        AutomationProperties.Name="Page left"
                                        Theme="{StaticResource ScrollBarRepeatButton}" />
                                </Track.DecreaseButton>
                                <Track.IncreaseButton>
@@ -86,9 +87,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 +99,7 @@
                                VerticalAlignment="Center"
                                VerticalContentAlignment="Center"
                                Focusable="False"
+                                AutomationProperties.Name="Column right"
                                Theme="{DynamicResource ScrollBarRepeatButton}">
                                <PathIcon
                                    Theme="{DynamicResource InnerPathIcon}"
@@ -124,6 +127,7 @@
                                HorizontalContentAlignment="Center"
                                VerticalContentAlignment="Center"
                                Focusable="False"
+                                AutomationProperties.Name="Line up"
                                Theme="{StaticResource ScrollBarRepeatButton}">
                                <PathIcon
                                    Theme="{StaticResource InnerPathIcon}"
@@ -147,6 +151,7 @@
                                        VerticalAlignment="Stretch"
                                        CornerRadius="0"
                                        Focusable="False"
+                                        AutomationProperties.Name="Page up"
                                        Theme="{StaticResource ScrollBarRepeatButton}" />
                                </Track.DecreaseButton>
                                <Track.IncreaseButton>
@@ -157,9 +162,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 +174,7 @@
                                HorizontalContentAlignment="Center"
                                VerticalContentAlignment="Center"
                                Focusable="False"
+                                AutomationProperties.Name="Line down"
                                Theme="{StaticResource ScrollBarRepeatButton}">
                                <PathIcon
                                    Theme="{StaticResource InnerPathIcon}"
--- a/src/Semi.Avalonia/Controls/SelectableTextBlock.axaml
+++ b/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}"
--- a/src/Semi.Avalonia/Controls/Slider.axaml
+++ b/src/Semi.Avalonia/Controls/Slider.axaml
@@ -92,11 +92,12 @@
                                VerticalAlignment="Bottom"
                                Fill="{DynamicResource SliderTickForeground}"
                                IsVisible="False"
-                                Maximum="{TemplateBinding Slider.Maximum}"
-                                Minimum="{TemplateBinding Slider.Minimum}"
-                                Orientation="{TemplateBinding Slider.Orientation}"
+                                Maximum="{TemplateBinding Maximum}"
+                                Minimum="{TemplateBinding Minimum}"
+                                Orientation="{TemplateBinding Orientation}"
                                Placement="Top"
-                                TickFrequency="{TemplateBinding Slider.TickFrequency}"
+                                IsDirectionReversed="{TemplateBinding IsDirectionReversed}"
+                                TickFrequency="{TemplateBinding TickFrequency}"
                                Ticks="{TemplateBinding Ticks}" />
                            <TickBar
                                Name="BottomTickBar"
@@ -106,11 +107,12 @@
                                VerticalAlignment="Top"
                                Fill="{DynamicResource SliderTickForeground}"
                                IsVisible="False"
-                                Maximum="{TemplateBinding Slider.Maximum}"
-                                Minimum="{TemplateBinding Slider.Minimum}"
-                                Orientation="{TemplateBinding Slider.Orientation}"
+                                Maximum="{TemplateBinding Maximum}"
+                                Minimum="{TemplateBinding Minimum}"
+                                Orientation="{TemplateBinding Orientation}"
                                Placement="Bottom"
-                                TickFrequency="{TemplateBinding Slider.TickFrequency}"
+                                IsDirectionReversed="{TemplateBinding IsDirectionReversed}"
+                                TickFrequency="{TemplateBinding TickFrequency}"
                                Ticks="{TemplateBinding Ticks}" />
                            <Track
                                Name="PART_Track"
@@ -169,11 +171,12 @@
                                HorizontalAlignment="Right"
                                Fill="{DynamicResource SliderTickForeground}"
                                IsVisible="False"
-                                Maximum="{TemplateBinding Slider.Maximum}"
-                                Minimum="{TemplateBinding Slider.Minimum}"
-                                Orientation="{TemplateBinding Slider.Orientation}"
+                                Maximum="{TemplateBinding Maximum}"
+                                Minimum="{TemplateBinding Minimum}"
+                                Orientation="{TemplateBinding Orientation}"
                                Placement="Left"
-                                TickFrequency="{TemplateBinding Slider.TickFrequency}"
+                                IsDirectionReversed="{TemplateBinding IsDirectionReversed}"
+                                TickFrequency="{TemplateBinding TickFrequency}"
                                Ticks="{TemplateBinding Ticks}" />
                            <TickBar
                                Name="RightTickBar"
@@ -183,11 +186,12 @@
                                HorizontalAlignment="Left"
                                Fill="{DynamicResource SliderTickForeground}"
                                IsVisible="False"
-                                Maximum="{TemplateBinding Slider.Maximum}"
-                                Minimum="{TemplateBinding Slider.Minimum}"
-                                Orientation="{TemplateBinding Slider.Orientation}"
+                                Maximum="{TemplateBinding Maximum}"
+                                Minimum="{TemplateBinding Minimum}"
+                                Orientation="{TemplateBinding Orientation}"
                                Placement="Right"
-                                TickFrequency="{TemplateBinding Slider.TickFrequency}"
+                                IsDirectionReversed="{TemplateBinding IsDirectionReversed}"
+                                TickFrequency="{TemplateBinding TickFrequency}"
                                Ticks="{TemplateBinding Ticks}" />
                            <Track
                                Name="PART_Track"
--- a/src/Semi.Avalonia/Controls/SplitButton.axaml
+++ b/src/Semi.Avalonia/Controls/SplitButton.axaml
@@ -1,10 +1,13 @@
 <ResourceDictionary
    xmlns="https://github.com/avaloniaui"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:iri="https://irihi.tech/shared">
    <Design.PreviewWith>
        <StackPanel Width="500" Height="500" Margin="20" Spacing="8">
            <SplitButton
-                Theme="{DynamicResource SolidSplitButton}"
+                Theme="{DynamicResource OutlineSplitButton}"
+                Classes="Danger"
+                CornerRadius="12"
                Content="Hello" />
            <ToggleSplitButton
                IsChecked="True"
@@ -73,47 +76,40 @@
        <Setter Property="Cursor" Value="Hand" />
        <Setter Property="Template">
            <ControlTemplate TargetType="SplitButton">
-                <Border
-                    BackgroundSizing="OuterBorderEdge"
-                    ClipToBounds="True"
-                    CornerRadius="{TemplateBinding CornerRadius}">
-                    <DockPanel>
-                        <Button
-                            Name="PART_SecondaryButton"
-                            Padding="4,0"
-                            BorderThickness="{TemplateBinding BorderThickness}"
-                            CornerRadius="0"
-                            DockPanel.Dock="Right"
-                            Theme="{DynamicResource SemiSplitButtonElement}">
-                            <PathIcon
-                                Theme="{DynamicResource InnerPathIcon}"
-                                Data="{DynamicResource SplitButtonIconGlyph}"
-                                Foreground="{Binding $parent[Button].Foreground}" />
-                        </Button>
-                        <Rectangle
-                            Name="SeparatorBorder"
-                            Width="{DynamicResource SplitButtonSeparatorWidth}"
-                            VerticalAlignment="Stretch"
-                            DockPanel.Dock="Right"
-                            Fill="Transparent"
-                            StrokeThickness="0" />
-                        <Button
-                            Name="PART_PrimaryButton"
-                            Padding="{TemplateBinding Padding}"
-                            HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
-                            VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
-                            BorderThickness="{TemplateBinding BorderThickness}"
-                            Command="{TemplateBinding Command}"
-                            CommandParameter="{TemplateBinding CommandParameter}"
-                            Content="{TemplateBinding Content}"
-                            ContentTemplate="{TemplateBinding ContentTemplate}"
-                            CornerRadius="0"
-                            FontFamily="{TemplateBinding FontFamily}"
-                            FontSize="{TemplateBinding FontSize}"
-                            FontWeight="{TemplateBinding FontWeight}"
-                            Theme="{DynamicResource SemiSplitButtonElement}" />
-                    </DockPanel>
-                </Border>
+                <Grid 
+                    ColumnDefinitions="*,Auto"
+                    ColumnSpacing="{DynamicResource SplitButtonSeparatorWidth}">
+                    <Button
+                        Name="PART_PrimaryButton"
+                        Grid.Column="0"
+                        Padding="{TemplateBinding Padding}"
+                        HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                        VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
+                        BorderThickness="{TemplateBinding BorderThickness}"
+                        Command="{TemplateBinding Command}"
+                        CommandParameter="{TemplateBinding CommandParameter}"
+                        Content="{TemplateBinding Content}"
+                        ContentTemplate="{TemplateBinding ContentTemplate}"
+                        CornerRadius="{TemplateBinding CornerRadius, Converter={iri:CornerRadiusMixerConverter Left}}"
+                        FontFamily="{TemplateBinding FontFamily}"
+                        FontSize="{TemplateBinding FontSize}"
+                        FontWeight="{TemplateBinding FontWeight}"
+                        Theme="{DynamicResource SemiSplitButtonElement}" />
+                    <Button
+                        Name="PART_SecondaryButton"
+                        Grid.Column="1"
+                        Padding="0"
+                        MinHeight="{TemplateBinding MinHeight}"
+                        MinWidth="{Binding $self.MinHeight}"
+                        BorderThickness="{TemplateBinding BorderThickness}"
+                        CornerRadius="{TemplateBinding CornerRadius, Converter={iri:CornerRadiusMixerConverter Right}}"
+                        Theme="{DynamicResource SemiSplitButtonElement}">
+                        <PathIcon
+                            Theme="{DynamicResource InnerPathIcon}"
+                            Data="{DynamicResource SplitButtonIconGlyph}"
+                            Foreground="{Binding $parent[Button].Foreground}" />
+                    </Button>
+                </Grid>
            </ControlTemplate>
        </Setter>

--- a/src/Semi.Avalonia/Controls/SplitView.axaml
+++ b/src/Semi.Avalonia/Controls/SplitView.axaml
@@ -1,4 +1,7 @@
-<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+<ResourceDictionary 
+    xmlns="https://github.com/avaloniaui" 
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    x:CompileBindings="True">
    <ControlTheme x:Key="{x:Type SplitView}" TargetType="SplitView">
        <Setter Property="OpenPaneLength" Value="{DynamicResource SplitViewOpenPaneThemeLength}" />
        <Setter Property="CompactPaneLength" Value="{DynamicResource SplitViewCompactPaneThemeLength}" />
@@ -49,7 +52,7 @@
            <Style Selector="^:overlay">
                <Style Selector="^ /template/ Panel#PART_PaneRoot">
                    <Setter Property="Width" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.ClosedPaneWidth}" />
-                    <Setter Property="Grid.ColumnSpan" Value="1" />
+                    <Setter Property="Grid.ColumnSpan" Value="2" />
                    <Setter Property="Grid.Column" Value="0" />
                </Style>
                <Style Selector="^ /template/ Panel#ContentRoot">
@@ -72,8 +75,7 @@

            <Style Selector="^:compactoverlay">
                <Style Selector="^ /template/ Panel#PART_PaneRoot">
-                    <!--  ColumnSpan should be 2  -->
-                    <Setter Property="Grid.ColumnSpan" Value="1" />
+                    <Setter Property="Grid.ColumnSpan" Value="2" />
                    <Setter Property="Grid.Column" Value="0" />
                    <Setter Property="Width" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.ClosedPaneWidth}" />
                </Style>
--- a/src/Semi.Avalonia/Controls/TabControl.axaml
+++ b/src/Semi.Avalonia/Controls/TabControl.axaml
@@ -36,13 +36,19 @@
                                ItemsPanel="{TemplateBinding ItemsPanel}" />
                            <Border Name="PART_BorderSeparator" />
                        </Panel>
-                        <ContentPresenter
-                            Name="PART_SelectedContentHost"
-                            Margin="{TemplateBinding Padding}"
-                            HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
-                            VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
-                            Content="{TemplateBinding SelectedContent}"
-                            ContentTemplate="{TemplateBinding SelectedContentTemplate}" />
+                        <Panel ClipToBounds="True">
+                            <ContentPresenter
+                                Name="PART_SelectedContentHost2"
+                                Margin="{TemplateBinding Padding}"
+                                HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
+                                IsVisible="False" />
+                            <ContentPresenter
+                                Name="PART_SelectedContentHost"
+                                Margin="{TemplateBinding Padding}"
+                                HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" />
+                        </Panel>
                    </DockPanel>
                </Border>
            </ControlTemplate>
@@ -149,13 +155,19 @@
                                Name="PART_ItemsPresenter"
                                ItemsPanel="{TemplateBinding ItemsPanel}" />
                        </Panel>
-                        <ContentPresenter
-                            Name="PART_SelectedContentHost"
-                            Margin="{TemplateBinding Padding}"
-                            HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
-                            VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
-                            Content="{TemplateBinding SelectedContent}"
-                            ContentTemplate="{TemplateBinding SelectedContentTemplate}" />
+                        <Panel ClipToBounds="True">
+                            <ContentPresenter
+                                Name="PART_SelectedContentHost2"
+                                Margin="{TemplateBinding Padding}"
+                                HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
+                                IsVisible="False" />
+                            <ContentPresenter
+                                Name="PART_SelectedContentHost"
+                                Margin="{TemplateBinding Padding}"
+                                HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" />
+                        </Panel>
                    </DockPanel>
                </Border>
            </ControlTemplate>
@@ -200,13 +212,19 @@
                            </ScrollViewer>
                            <Border Name="PART_BorderSeparator" />
                        </Panel>
-                        <ContentPresenter
-                            Name="PART_SelectedContentHost"
-                            Margin="{TemplateBinding Padding}"
-                            HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
-                            VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
-                            Content="{TemplateBinding SelectedContent}"
-                            ContentTemplate="{TemplateBinding SelectedContentTemplate}" />
+                        <Panel ClipToBounds="True">
+                            <ContentPresenter
+                                Name="PART_SelectedContentHost2"
+                                Margin="{TemplateBinding Padding}"
+                                HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
+                                IsVisible="False" />
+                            <ContentPresenter
+                                Name="PART_SelectedContentHost"
+                                Margin="{TemplateBinding Padding}"
+                                HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" />
+                        </Panel>
                    </DockPanel>
                </Border>
            </ControlTemplate>
@@ -335,13 +353,19 @@
                                    ItemsPanel="{TemplateBinding ItemsPanel}" />
                            </ScrollViewer>
                        </Panel>
-                        <ContentPresenter
-                            Name="PART_SelectedContentHost"
-                            Margin="{TemplateBinding Padding}"
-                            HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
-                            VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
-                            Content="{TemplateBinding SelectedContent}"
-                            ContentTemplate="{TemplateBinding SelectedContentTemplate}" />
+                        <Panel ClipToBounds="True">
+                            <ContentPresenter
+                                Name="PART_SelectedContentHost2"
+                                Margin="{TemplateBinding Padding}"
+                                HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
+                                IsVisible="False" />
+                            <ContentPresenter
+                                Name="PART_SelectedContentHost"
+                                Margin="{TemplateBinding Padding}"
+                                HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" />
+                        </Panel>
                    </DockPanel>
                </Border>
            </ControlTemplate>
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Zhang Dian	665dca3bd3	fix: fix the draft release version tag.	2026-03-21 18:18:49 +08:00
Zhang Dian	f5e56511ac	chore: bump to 12.0.0-rc1.	2026-03-21 18:08:48 +08:00
Dong Bin	b3b7459088	Pr3/carousel page (#772 ) * feat: add CarouselPage and PipsPager. * feat: add PipsPager control and integrate into index * feat: add PipsPagerDemo and integrate into MainView --------- Co-authored-by: Zhang Dian <54255897+zdpcdt@users.noreply.github.com>	2026-03-21 17:58:35 +08:00
Zhang Dian	96f7f3d1e1	Adjust Resource Structure (#771 ) * chore: update GitHub Actions to use latest versions of actions. * feat: update theme resource structure and remove Schemes. * refactor: simplify locale resource handling and remove redundant code. * feat: add Light theme resource to ColorPicker and DataGrid semi themes. * feat: replace SetResources with BulkSetResources.	2026-03-21 17:57:56 +08:00
Zhang Dian	64e2b50a1d	fix: add ContentTemplate binding for DrawerIcon in DrawerPage.axaml.	2026-03-20 15:47:53 +08:00
Zhang Dian	fbfe5b0b6a	fix: add Name to VisualLayerManager for 12.0.0-rc1.	2026-03-20 15:11:30 +08:00
Zhang Dian	bd4d4e2096	chore: update package versions to 12.0.0-rc1.	2026-03-20 15:05:00 +08:00
Dong Bin	01e213d741	Implement DataGrid V12 (#770 ) * feat: bring datagrid demo back. * feat: add FunctionalColorGroupControl and ShadowGroupControl with data binding * Add 10 TFM Co-authored-by: Zhang Dian <54255897+zdpcdt@users.noreply.github.com> * feat: Use new property Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com> * fix: fix changelog. Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com> * fix: fix sort member path. Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com> * chore: remove useless property. --------- Co-authored-by: Zhang Dian <54255897+zdpcdt@users.noreply.github.com> Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>	2026-03-19 13:28:13 +08:00
Zhang Dian	87fed4febd	chore: bump to 12.0.0-preview2.	2026-03-15 22:09:39 +08:00
Zhang Dian	646272dc21	Fix Android Demo Issues (#767 ) * fix: fix android demo issues. * feat: enable CoreCLR usage on Android.	2026-03-15 22:09:39 +08:00
Zhang Dian	672560643b	fix: Watermark -> Placeholder. (#769 )	2026-03-15 03:40:20 +08:00
Zhang Dian	d6d03133b4	feat: refactor WindowDrawnDecorations with new styling and structure. (#768 )	2026-03-15 03:39:24 +08:00
Copilot	1d59cff87d	Implement Semi Design theme for page-based navigation controls (ContentPage / DrawerPage / NavigationPage / TabbedPage) (#766 ) * Initial plan * Implement Semi Design theme for ContentPage, DrawerPage, NavigationPage, TabbedPage Co-authored-by: zdpcdt <54255897+zdpcdt@users.noreply.github.com> * fix: bind ItemsSource to Pages in TabControl of TabbedPage. * chore: split demo navigation pages. * demo: improve NavigationPage demo pages with interactive controls Co-authored-by: zdpcdt <54255897+zdpcdt@users.noreply.github.com> * fix: use comma-separated Padding syntax and remove trailing newline Co-authored-by: zdpcdt <54255897+zdpcdt@users.noreply.github.com> * feat: implement semi design theme for navigation controls in demo pages. * feat: enhance demo pages with foreground color for better visibility * feat: add back button visibility control and improve navigation page layout. * chore: remove DrawerPage unused static resources. * feat: add HighContrast resources for ContentPage, DrawerPage, NavigationPage, TabbedPage Co-authored-by: zdpcdt <54255897+zdpcdt@users.noreply.github.com> * feat: implement CardTabbedPage & ButtonTabbedPage themes. --------- Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: zdpcdt <54255897+zdpcdt@users.noreply.github.com> Co-authored-by: Dong Bin <popmessiah@hotmail.com>	2026-03-15 03:37:50 +08:00
Zhang Dian	141eeefd2e	Sync upstream update. (#764 )	2026-03-13 18:38:00 +08:00
Zhang Dian	c84c8a3c90	fix: fix :checked:disabled color in AppBarToggleButton.	2026-03-12 16:34:24 +08:00
Zhang Dian	dd5f5182fa	fix CommandBar issues (#763 ) * feat: extract shared theme from AppBarButton & AppBarToggleButton. * feat: enhance CommandBar with dynamic overflow and adjustable width. * fix: fix Width in IsCompact mode.	2026-03-12 15:56:39 +08:00
Zhang Dian	d865f2aeb4	chore: enable developer tools in debug mode and update diagnostics package references.	2026-03-10 19:07:27 +08:00
Copilot	44152ef731	Sync 45 new icons from Semi Design commit ba384587 (#761 ) * Initial plan * Sync 45 new icons from Semi Design commit ba384587 Co-authored-by: zdpcdt <54255897+zdpcdt@users.noreply.github.com> * fix: correct geometry paths for Semi icons. * fix: update EyeClosedSolidStroked & IconHornStroked paths for Semi icons in StrokedIcons.axaml. * fix: resolve copilot review. --------- Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: zdpcdt <54255897+zdpcdt@users.noreply.github.com> (cherry picked from commit `77dffc55b1`)	2026-03-10 16:49:34 +08:00
Zhang Dian	25f75d605c	feat: add Semi theme styling for CommandBar, AppBarButton, AppBarTogg… (#759 ) * feat: add Semi theme styling for CommandBar, AppBarButton, AppBarToggleButton, AppBarSeparator Co-authored-by: zdpcdt <54255897+zdpcdt@users.noreply.github.com> * feat: add Semi theme icons for CommandBar buttons and update styles. * feat: add dynamic label position selection to CommandBar demo. --------- Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>	2026-03-10 16:49:03 +08:00
Dong Bin	c144056ab0	feat: add basic implementation of window decorations.	2026-03-08 23:33:23 +08:00
Zhang Dian	65e4d0d4a4	feat: upgrade Avalonia to 12.0.0-preview2.	2026-03-06 15:09:57 +08:00
rabbitism	de3ffc97b6	chore: bump to 12.0 preview	2026-02-18 11:04:28 +08:00
Zhang Dian	7da8a03f84	chore: add Avalonia Nightly repo (cherry picked from commit 3e03cf32b5a071879315c9742aea5831339e41b9)	2026-02-18 11:04:28 +08:00
Zhang Dian	ab03be1aea	misc: bump nightly version.	2026-02-18 11:04:28 +08:00
Zhang Dian	4ec2d0cf86	Update AutoCompleteBox style to use ClassHelper for Bordered TextBox (#747 ) * feat: update AutoCompleteBox style to use ClassHelper for Bordered TextBox. * Update src/Semi.Avalonia/Controls/AutoCompleteBox.axaml Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * feat: unitize Bordered style selectors. --------- Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>	2026-02-18 11:04:23 +08:00
Dong Bin	757f91a140	Implement PlaceholderText (#727 ) * feat: replace Watermark with PlaceholderText in AutoCompleteBox and related controls * fix: remove duplicate PlaceholderForeground setter.	2026-02-18 11:04:01 +08:00
Zhang Dian	f6d068b722	adjust CornerRadius & MinWidth for SplitButton (#725 ) * feat: support CornerRadius for SplitButton. * Update src/Semi.Avalonia/Controls/SplitButton.axaml Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * feat: refactor SplitButton layout to use Grid for better structure. --------- Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>	2026-02-18 11:04:01 +08:00
Zhang Dian	3a6452cccd	misc: update XML namespace references and converters in XAML files. (#726 )	2026-02-18 11:04:01 +08:00
Zhang Dian	5ea834d57e	chore: fix conflict typos.	2026-02-18 11:04:01 +08:00
Zhang Dian	1d9fe693a3	misc: add SemiBorderRadiusSpacingExtraSmall for tokens.	2026-02-18 11:04:01 +08:00
Zhang Dian	2b867f9c6f	misc: remove useless theme.	2026-02-18 11:04:00 +08:00
Zhang Dian	5ea42844ea	misc: using AvaloniaUseCompiledBindingsByDefault.	2026-02-18 11:04:00 +08:00
Zhang Dian	f819531465	feat: colorpicker reference Shared package.	2026-02-18 11:04:00 +08:00
Zhang Dian	8f24b2f332	feat: add GroupBox.	2026-02-18 11:04:00 +08:00
Zhang Dian	a309729c11	chore: ready for 12.0.x.	2026-02-18 11:03:55 +08:00
Zhang Dian	d57c843032	misc: bump version.	2026-02-09 23:54:05 +08:00
Zhang Dian	a56b1e374a	fix: update TextBox padding for improved layout consistency. (#748 )	2026-02-09 23:29:28 +08:00
Zhang Dian	664d05db45	feat: add ClearSelectionOnLostFocus property to AutoCompleteBox. (#746 )	2026-02-09 23:28:15 +08:00
Zhang Dian	fdbfd91b8f	feat: Properly handle nc hit test for caption buttons. (#745 )	2026-02-09 21:33:12 +08:00
Zhang Dian	3b0b007a40	fix: reverse TickBar when Slider direction is reversed. (#744 )	2026-02-09 18:29:13 +08:00
Zhang Dian	c1eff9ddf8	fix: add AutomationProperties names to ScrollViewer controls. (#738 )	2026-02-09 15:17:21 +08:00
xoma-zver	4285e6e227	feat: add Inter font resource reference to SemiFontFamilyRegular (#722 )	2026-02-09 14:51:29 +08:00
Zhang Dian	edacd88fa7	fix: update MenuFlyout to use ShowMode for context menus in SelectableTextBlock and TextBox (#739 )	2026-02-09 14:46:29 +08:00
Zhang Dian	136d577667	fix: fix DatePicker & TimePicker to respect custom Width property. (#737 )	2026-02-09 14:45:17 +08:00
Zhang Dian	4ef1520e64	fix: remove inline text decorations from Popup styles.	2026-01-16 17:40:11 +08:00
Dong Bin	5e751ccdbb	Disable scroll chaining in AutoCompleteBox popup. (#716 ) * feat: disable scroll chaining in popup. * feat: disable scroll chaining in MenuScrollViewer	2026-01-09 15:45:00 +08:00
Dong Bin	13dcdbdd07	chore: mark old versions as EOL. (#715 )	2026-01-04 23:42:51 +08:00
Zhang Dian	185fe8c984	fix: fix the reference version of TDG.	2025-12-30 16:33:43 +08:00
Zhang Dian	622c8c23b7	ci: add adroid workload.	2025-12-30 16:04:07 +08:00
Zhang Dian	104ba2f1f4	misc: bump version.	2025-12-30 15:26:35 +08:00
Zhang Dian	4895d2f51b	fix: ClearButton shouble not be focusable.	2025-12-29 16:02:00 +08:00
Shatyuka	414736443d	fix: controls under TextBox inheriting Ibeam cursor (#710 )	2025-12-22 19:32:57 +08:00
Copilot	65d2f88cab	Make DataGrid cell grid lines use dynamic resources for thickness (#666 ) * Initial plan * Implement dynamic resources for DataGrid grid line thickness and color Co-authored-by: rabbitism <14807942+rabbitism@users.noreply.github.com> * Revert DynamicResource to StaticResource for DataGridLineBrush in theme files Co-authored-by: rabbitism <14807942+rabbitism@users.noreply.github.com> --------- Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: rabbitism <14807942+rabbitism@users.noreply.github.com>	2025-12-16 17:08:07 +08:00
Zhang Dian	0a622772f4	ci: specify project path for dotnet restore in publish.yml.	2025-12-10 15:11:49 +08:00
Dong Bin	5ef8f7ddaf	fix: replace icon resource include with semi:Icons in Index.axaml (#707 )	2025-12-09 16:06:04 +08:00
Zhang Dian	ba9dd0a574	chore: turn on CPM & slnx.	2025-12-09 13:58:01 +08:00
Dong Bin	f784a2c927	fix: try to fix wasm deployment issue. (#698 )	2025-11-17 11:23:45 +08:00
Zhang Dian	69cc9b9ca3	misc: bump version.	2025-11-15 15:18:45 +08:00